diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 00000000000000..01678608d90bfc --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,376 @@ +Name SHA1 +---- ---- +origin 2f27fce67173bbb05d5a0ee03dae5c021202c912 +fixes 8276a39ecaa639daf904414cb7a65101a4af0881 +vfs-brauner-fixes 72a6e22c604c95ddb3b10b5d3bb85b6ff4dbc34f +fscrypt-current 256abd8e550ce977b728be79a74e1729438b4948 +fsverity-current 256abd8e550ce977b728be79a74e1729438b4948 +btrfs-fixes a064948e242ca9bdf449528c54b4df2372215e74 +vfs-fixes 8c86f1a45749d6185244fe56a182c2b9a23c3a7f +erofs-fixes da3ea35007d0af457a0afc87e84fddaebc4e0b63 +nfsd-fixes 40927f3d0972bf86357a32a5749be71a551241b6 +v9fs-fixes 0c3836482481200ead7b416ca80c68a29cfdaabd +overlayfs-fixes 77a28aa476873048024ad56daf8f4f17d58ee48e +bcachefs b72bcc914244522e06871cad395f78c5c565526a +fscrypt 256abd8e550ce977b728be79a74e1729438b4948 +afs abcbd3bfbbfe97a8912d0c929d4aa18f50d9bc52 +btrfs e7c10ac01f314fb1376315c85b8246fb714d0df4 +ceph ede0b1d30b82829d6bc7924be18c7ae09cb1eb33 +cifs 5ac1f99fdd09d80223e8f47dffaea41a6563aace +configfs 4425c1d9b44ded655d2668e1ce95a62bccf7b21b +dlm 652b0ae675fede81420758e3af7c5174cdaa8404 +erofs fc0644e8500541afb17189d7a6cbafe9a20893c5 +exfat dbbd9a77c3defc390fb2751ed92468ada78ebf3f +exportfs 0c3836482481200ead7b416ca80c68a29cfdaabd +ext3 802e492f2fda38547f11e3b2d9d2f12bdb3e38b2 +ext4 ff2beee206d23f49d022650122f81285849033e4 +f2fs 755f18261376987fe100b86764c5079fba61d2bb +fsverity 256abd8e550ce977b728be79a74e1729438b4948 +fuse 9dc504f244895def513a0f2982c909103d4ab345 +gfs2 6888c1e85f5db129e6ddcff879bb127bbfdb5c64 +jfs 2b59ffad47db1c46af25ccad157bb3b25147c35c +ksmbd c5a709f08d40b1a082e44ffcde1aea4d2822ddd5 +nfs 67784a74e258a467225f0e68335df77acd67b7ab +nfs-anna 0f4f77d364b57af16ded5519c02f59e58aa4201c +nfsd ae9194e1d7a5be65e3312145bf139b47af2b6ead +ntfs3 689ecd06ef8dcd894a41c9787cf9da940bb6f24e +orangefs 96319dacaf15f666bcba7275953d780e23fe9e75 +overlayfs 6c4a5f96450415735c31ed70ff354f0ee5cbf67b +ubifs 92a286e90203ce3e6c3a6d945fa36da419c3671f +v9fs 2211561723a66e37596b1fc401c792ef36e3dea0 +v9fs-ericvh 0c3836482481200ead7b416ca80c68a29cfdaabd +xfs 90fa22da6d6b41dc17435aff7b800f9ca3c00401 +zonefs c4b3c1332f55c48785e6661cebeb7269a92a45fd +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner c72f8f06a2e8c395a570958aa4e49f7ad0c88254 +vfs de12c3391bce10504c0e7bd767516c74110cfce1 +mm-hotfixes 3356b5a839fed0e539529d64f3cf6b9c780f1c0b +fs-current 65ca1300d8e1632f8335fc5603b920e590e72052 +kbuild-current 431c1646e1f86b949fa3685efc50b660a364c2b6 +arc-current e67572cd2204894179d89bd7b984072f19313b03 +arm-current 0c66c6f4e21cb22220cbd8821c5c73fc157d20dc +arm64-fixes c060f93253cad63ea9d41b5b1186a1da32541dec +arm-soc-fixes 0e7af99aef5f58b4bae00e45fd1c2626a987f7bb +davinci-current 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +sophgo-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +m68k-current b90fae5df91744e45e683c17bb1a38e466770df3 +powerpc-fixes 734ad0af3609464f8f93e00b6c0de1e112f44559 +s390-fixes 1642285e511c2a40b14e87a41aa8feace6123036 +net 9410645520e9b820069761f3450ef6661418e279 +bpf b831f83e40a24f07c8dcba5be408d93beedc820f +ipsec 9b0874286768d7f380b08e4f1fa9b96c526b0bad +netfilter 7f3287db654395f9c5ddd246325ff7889f550286 +ipvs 031ae72825cef43e4650140b800ad58bf7a6a466 +wireless 9410645520e9b820069761f3450ef6661418e279 +ath 2f833e8948d6c88a3a257d4e426c9897b4907d5a +wpan addf89774e48c992316449ffab4f29c2309ebefb +rdma-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +sound-current 134536c21275bb3410cd1f10c5e369d30702741d +sound-asoc-fixes 4f9a71435953f941969a4f017e2357db62d85a86 +regmap-fixes 10a650193899c3b013df5b1bdb4dc827606f826e +regulator-fixes 1a5caec7f80ca2e659c03f45378ee26915f4eda2 +spi-fixes 2a8787c1cdc7be24fdd8953ecd1a8743a1006235 +pci-current fc8c818e756991f5f50b8dfab07f970a18da2556 +driver-core.current 47ac09b91befbb6a235ab620c32af719f8208399 +tty.current 47ac09b91befbb6a235ab620c32af719f8208399 +usb.current da3ea35007d0af457a0afc87e84fddaebc4e0b63 +usb-serial-fixes 7d47d22444bb7dc1b6d768904a22070ef35e1fc0 +phy 431c1646e1f86b949fa3685efc50b660a364c2b6 +staging.current 8400291e289ee6b2bf9779ff1c83a291501f017b +iio-fixes 979f93ded95059ef7f9cd133d783ce57f8f351bd +counter-current 8400291e289ee6b2bf9779ff1c83a291501f017b +char-misc.current da3ea35007d0af457a0afc87e84fddaebc4e0b63 +soundwire-fixes 233a95fd574fde1c375c486540a90304a2d2d49f +thunderbolt-fixes 98f7e32f20d28ec452afb208f9cffc08448a2652 +input-current 3870e2850b56306d1d1e435c5a1ccbccd7c59291 +crypto-current ce212d2afca47acd366a2e74c76fe82c31f785ab +vfio-fixes 5a88a3f67e37e39f933b38ebb4985ba5822e9eca +kselftest-fixes 170c966cbe274e664288cfc12ee919d5e706dc50 +dmaengine-fixes 431c1646e1f86b949fa3685efc50b660a364c2b6 +backlight-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +mtd-fixes bd92c1e07beb2f85cbe977a8cb9910adf237d649 +mfd-fixes 68f860426d500cfb697b505799244c7dfff604b1 +v4l-dvb-fixes 63de936b513f7a9ce559194d3269ac291f4f4662 +reset-fixes ab35896730a5e8fdf885a23fa2e27f286c5f94b2 +mips-fixes 5be63fc19fcaa4c236b307420483578a56986a37 +at91-fixes e9408fa234fb2c0f087d718c7172212bb0dd7e6f +omap-fixes 5062d9c0cbbc202e495e9b20f147f64ef5cc2897 +kvm-fixes 59cbd4eea48fdbc68fc17a29ad71188fea74b28b +kvms390-fixes cff59d8631e1409ffdd22d9d717e15810181b32c +hwmon-fixes 20471071f198c8626dbe3951ac9834055b387844 +nvdimm-fixes d5240fa65db071909e9d1d5adcc5fd1abc8e96fe +cxl-fixes da3ea35007d0af457a0afc87e84fddaebc4e0b63 +dma-mapping-fixes 75961ffb5cb3e5196f19cae7683f35cc88b50800 +drivers-x86-fixes d6de45e3c6f3713d3825d3e2860c11d24e0f941f +samsung-krzk-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +pinctrl-samsung-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +devicetree-fixes b739dffa5d570b411d4bdf4bb9b8dfd6b7d72305 +dt-krzk-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +scsi-fixes 0f9592ae26ffe044cfb2b2d071ccf4427be57ed4 +drm-fixes 135be1dc46c64c454f2828dbb7f239d035f47180 +drm-intel-fixes 98f7e32f20d28ec452afb208f9cffc08448a2652 +mmc-fixes aea62c744a9ae2a8247c54ec42138405216414da +rtc-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +gnss-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +hyperv-fixes 895384881ec960aa4c602397a69f0a44a8169405 +risc-v-fixes 7c1e5b9690b0e14acead4ff98d8a6c40f2dff54b +riscv-dt-fixes 7d9d88890f04ee7cbf15820b089469d58c4816c4 +riscv-soc-fixes 61f2e8a3a94175dbbaad6a54f381b2a505324610 +fpga-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +spdx 47ac09b91befbb6a235ab620c32af719f8208399 +gpio-brgl-fixes da3ea35007d0af457a0afc87e84fddaebc4e0b63 +gpio-intel-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +pinctrl-intel-fixes a366e46da10d7bfa1a52c3bd31f342a3d0e8e7fe +auxdisplay-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +kunit-fixes 12cb32a52eb607dc4d0e45fe6f4cf946d08da0fd +memblock-fixes 8043832e2a123fd9372007a29192f2f3ba328cd6 +renesas-fixes 8c987693dc2d292d777f1be63cb35233049ae25e +perf-current e162cb25c410afc42051a582c46a47dde597f51c +efi-fixes ae835a96d72cd025421910edb0e8faf706998727 +zstd-fixes 77618db346455129424fadbbaec596a09feaf3bb +battery-fixes 7c626ce4bae1ac14f60076d00eafe71af30450ba +iommufd-fixes cf1e515c9a40caa8bddb920970d3257bb01c1421 +rust-fixes cff56ff737e2da095ca9f228e2c5afc903bfca69 +w1-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +pmdomain-fixes 9ec87c5957ea9bf68d36f5e098605b585b2571e4 +i2c-host-fixes e2c85d85a05f16af2223fcc0195ff50a7938b372 +sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +clk-fixes a4d89b11aca3ffa73e234f06685261ce85e5fb41 +pwrseq-fixes 431c1646e1f86b949fa3685efc50b660a364c2b6 +thead-dt-fixes 8400291e289ee6b2bf9779ff1c83a291501f017b +drm-misc-fixes d92b90f9a54d9300a6e883258e79f36dab53bfae +mm-stable 684826f8271ad97580b138b9ffd462005e470b99 +mm-nonmm-stable 5e06e08939df1cafef97a8e04f4b88c2806b538a +kbuild c589902e95d40b3ed4c50960a4e860b848702491 +clang-format c147f663b6a5813b9860f3917cc473fb2c462d8d +perf 1de5b5dcb8353f36581c963df2d359a5f151a0be +compiler-attributes 8400291e289ee6b2bf9779ff1c83a291501f017b +dma-mapping a5fb217f13f74b2af2ab366ffad522bae717f93c +asm-generic b82c1d235a30622177ce10dcb94dfd691a49922f +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm 9016915e3c5f0613c123d142ec64fa82a18fdba2 +arm64 75078ba2b38a38d94017bd334f71aaed205e30a4 +arm-perf 7c626ce4bae1ac14f60076d00eafe71af30450ba +arm-soc 7c590fea8c11f3a08f9cd27179336465d3ffbe03 +amlogic 034835342aab1cc7dc1733a98cd2a6d159ee242a +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed b4c322c2783aedd652183bcec6d545ad45eba6d9 +at91 ee735afc2dae82b8250ebb6da9f700356c5eb1c7 +broadcom 7eff0651abbbe76e0c23d8532ffae1373425123c +davinci 973d248c43f237e53116009dec70091c8e836c11 +drivers-memory 32960b4f25c248f13758b8bbe6cc4260828442a1 +imx-mxs 79e1b8171ca476abb9b8eceef81cd1b6f58b75e9 +mediatek 4f4b3263feeeb32fed0bcefe96fc20c5a13be202 +mvebu dea56c781ed3d1621b7a8fb7707037f644847c42 +omap ba1b153f6d27093b3087ebc7f57db7e21b40353a +qcom 2adcf3941db724e1750da7094c34431d9b6b7fcb +renesas 5379c9e0a6ad7d4690e7f496c48c0d44ebb30dd9 +reset 487b1b32e317b85c2948eb4013f3e089a0433d49 +rockchip bae9cc0db17298604c56256a6af6ca0180b0fbdf +samsung-krzk 6a8afff2166fabeacb2161f942f32933fc6c2d88 +scmi 8aaf45bcb48e250a9e74a8407713b604d2a4fb0e +sophgo 4ea8511c034b203136234649baed2093efdd7504 +stm32 b14c9f6bd0bac289e9bbdd5f8e20adb39d9e0fca +sunxi 34180094bc07e78c35fc8b29c26e16617967d4df +tee cd88a296582cf314e04792b73ede0b39f3193fe2 +tegra 6726d2c6a157479c358ded2c7ab9bfb5134b622f +thead-dt 2d98fea7491a00dccd61fee019843b262e60f819 +ti 657b48ad4c7aa141a092c698fd1da078de7b6318 +xilinx 31dba0dd2fa7fbb391f73bac629a53ce077d3786 +clk a9b0a2b6841af683231348a9d75b7904e722e26f +clk-imx 32c055ef563c3a4a73a477839f591b1b170bde8e +clk-renesas 3aeccbe08171b79f82fb802393a6324c7b732669 +csky 2c40c1c6adab90ee4660caf03722b3a3ec67767b +loongarch 6f6f567ee081c180b77309f7fab0223f1835fae3 +m68k b90fae5df91744e45e683c17bb1a38e466770df3 +m68knommu aa99969ef591ca44cbafb320ceceb106792baee3 +microblaze d829e7ee63546b580ed9ddee374ae73bb4a8c079 +mips 439667fb943cfea46d7bde5c7b29c89efec3cbc7 +openrisc 4dc70e1aadfadf968676d983587c6f5d455aba85 +parisc-hd 5d698966fa7b452035c44c937d704910bf3440dd +powerpc 39190ac7cff1fd15135fa8e658030d9646fdb5f2 +risc-v 21d98d658f9e5967dc30c321bc258b50740c6665 +riscv-dt 8400291e289ee6b2bf9779ff1c83a291501f017b +riscv-soc 8400291e289ee6b2bf9779ff1c83a291501f017b +s390 e84a8303f1ba16d8214ee0e6cf349b92c2e08388 +sh 8fe76a1c2264a02155895cda9f97a6a5a9b97d91 +sparc d21dffe51baabf6729a95585181507f24bd695a0 +uml 381d2f95c8aa575d5d42bf1fe0ea9a70c4bec0cf +xtensa b7cf2a1d9881823133acc48427815a48b35b49f4 +fs-next a44000f2b0d897a20cdc28cf0d2b418b8af8009f +printk b794563ea12fb46d9499da9e30c33d9607e33697 +pci 2374573159edb97630d45dd7dc22a527e0bd215f +pstore 1bf8012fc6997f2117f6919369cde16659db60e0 +hid 183650fd5428d82c3e363a865f747bd12e2f6ae2 +i2c da9902f2dd23908e665912fb3d8bb60d6d255824 +i2c-host f56f4ba2fc1dbefd3242946f2fad35338a60e3bc +i3c 61850725779709369c7e907ae8c7c75dc7cec4f3 +dmi 4d1b28a8119c615f1e932520f9ee1f80bdda5204 +hwmon-staging 2cb4acf2140be8a4f299c0b887cc314845ef6ec8 +jc_docs 052f172ef127e3b76f31e11f71e957e552cdb94d +v4l-dvb 3f52e32445a1f63b788bc8969b7dc2386a80a24d +v4l-dvb-next b36c41c51e9d763393634359b90f02414ef470a3 +pm 1e39c60d14b867bcf98b292c954f8ccc132e403b +cpufreq-arm 6b612d1bac67b0f483fde7779a45f6310274d4eb +cpupower 313312c84b42d7b8ee1fb03ab30befc2bd0db211 +devfreq d47552124bb0b9527da7a95357ae7d2e6046c4f6 +pmdomain c6ccb691d484544636bc4a097574c5c135ccccda +opp a84372012e9329daba8082efac98f3bc0b443aa2 +thermal 7d8abc5f3b5ce0f53d499279d8defc0f72bf7557 +rdma 7acad3c442df6d5158c5b732a7a0ccf3a01d9b30 +net-next 9410645520e9b820069761f3450ef6661418e279 +bpf-next aa7e60b62ee2184d48ef3ef0f59afef6525da3f5 +ipsec-next e62d39332d4b9400a69ba902797aa17a1a0037e7 +mlx5-next c772a2c690182410642ead740f7a84b3a7544b2b +netfilter-next 9410645520e9b820069761f3450ef6661418e279 +ipvs-next 4201f3938914d8df3c761754b9726770c4225d66 +bluetooth eb3ad76a07b6cdaaa156766da5fe6c384a12930b +wireless-next fe57beb026ef5f9614adfa23ee6f3c21faede2cf +ath-next fe57beb026ef5f9614adfa23ee6f3c21faede2cf +wpan-next ace2b533135566227c6a392b15c63a20d68a556e +wpan-staging ace2b533135566227c6a392b15c63a20d68a556e +mtd 869acb874f2b61c34063b677c2bd29595bf446a1 +nand 475aadeba5df687524bd9bc5c77cba44c1736e08 +spi-nor ac5bfa968b60fba409942ab594ad98479b4e1223 +crypto ce212d2afca47acd366a2e74c76fe82c31f785ab +drm ae2c6d8b3b88c176dff92028941a4023f1b4cb91 +drm-exynos 94ebc3d3235c5c516f67315059ce657e5090e94b +drm-misc ba2b9de0c1ac2abfbe663414a292c5881e64c361 +amdgpu 9d00d05e757965039aed65a444c5c3f91ce218cf +drm-intel ec2231b8dd2dc515912ff7816c420153b4a95e92 +drm-msm 15302579373ed2c8ada629e9e7bcf9569393a48d +drm-msm-lumag 15302579373ed2c8ada629e9e7bcf9569393a48d +drm-xe 8a677d5b0a20ed4715cb4a8b0f8a08712ec0997c +etnaviv 704d3d60fec451f37706368d9d3e320322978986 +fbdev de5e89b6654ea0b021a5737e0f55fc6bed625550 +regmap 7da49f45bf04d15ea04564fb513846831db3173a +sound 64c0ce555ad2d84f497f5f584ddd31e87ac690a2 +ieee1394 f1cba5212e252243a539e079813bc96fbf53e241 +sound-asoc 6fcf05c805fffec66ee4b7bdd33bc8f008d8aedc +modules b319cea80539df9bea0ad98cb5e4b2fcb7e1a34b +input c7c878ff329239e28d7ab9fae7f7f49f114b12ff +block 3685ba991cefc3a57e9c1acbf92d32b3573f4d83 +device-mapper c8691cd0fc11197515ed148de0780d927bfca38b +libata e5dd410acb34c7341a0a93b429dcf3dabf9e3323 +pcmcia 0630e3bc0e91b57288921df2927859b23184ca45 +mmc cd3689b6772fbc1a4513934a5204fd2fa5b4426b +mfd d7548a14ed7c45edf2b73e0c527597d2709739e5 +backlight fea88a13a5d14b9f56fa338b47f2044806b3e64d +battery e50a57d16f897e45de1112eb6478577b197fab52 +regulator 88df17649d5a57199e0c03e77dab83022790038f +security 81119f9b5e61905c1407d9acd161cbbec660dd9a +apparmor 8400291e289ee6b2bf9779ff1c83a291501f017b +integrity fa8a4ce432e82cc138e61fab7f44d60f9e720d47 +selinux 83f8b733c9b74d0907b292dec39e8f3d071c8b70 +smack 2749749afa071f8a0e405605de9da615e771a7ce +tomoyo dc1c8034e31b14a2e5e212104ec508aec44ce1b9 +tpmdd e1567fe754813ecd77d2f38fd843ddf95d151b52 +watchdog 134d2531ef82043e8bf219497a4f1eb8fe21a6b7 +iommu 97162f6093d263aa1c2c7e883912f922ea633512 +audit 8c1867a2f0fd4235b84da6b204519e830b551988 +devicetree 8887042373e20b4f959aa4773ae02257069346d5 +dt-krzk 08fd3b6e0df4968af2d8a9dce944a6731c22a709 +mailbox a8bd68e4329f9a0ad1b878733e0f80be6a971649 +spi 58be528df758d3f00c10d6d381d9e02d5c68f23d +tip 154470612df5058df23664e994ba4be6949f7093 +clockevents d7a87891e2f5f02e758ae4ea2b1a4267cf192b30 +edac 61124f42dcaa30f58a8b47a2b69ddb80260677c7 +ftrace 2a07e30c19f391af26517c409fd66e401c6f4ee7 +rcu 355debb83bf79853cde43579f88eed16adb1da29 +paulmck 3b27dde7b75dd0e051369456bd6d6b4c42195ee7 +kvm 0cdcc99eeaedf2422c80d75760293fdbb476cec1 +kvm-arm 17a0005644994087794f6552d7a5e105d6976184 +kvms390 f9b56b2c31e5733c04464da1b73bafb9eff6569f +kvm-ppc 46765aaec4d78b9fef59e647ab228283991de075 +kvm-riscv 5aa09297a3dcc798d038bd7436f8c90f664045a6 +kvm-x86 3cc25d5adcfd2a2c33baa0b2a1979c2dbc9b990b +xen-tip c3dea3d54f4d399f8044547f0f1abdccbdfb0fee +percpu 79125d57644c97abfb7efd7549655d79080b297d +workqueues 90c6d73ac19d6b7bca4cb1aff3505e2a99c1fdb4 +sched-ext 902d67a2d40f5b0815f4f627b26d91f96cc51fb3 +drivers-x86 837acb691c844d0525f4ac86f2a2ce55a9706908 +chrome-platform d1b35e6d34e9b46fbf98444dd7aa114c032e9ac0 +chrome-platform-firmware 8400291e289ee6b2bf9779ff1c83a291501f017b +hsi c3eddf5e8c30adb6f43fc0b149e88b9feb76f381 +leds-lj 64c38866500b0bda4363fb994d545557dffb017c +ipmi 64dce81f8c373c681e62d5ffe0397c45a35d48a2 +driver-core 6a36d828bdef0e02b1e6c12e2160f5b83be6aab5 +usb 68d4209158f43a558c5553ea95ab0c8975eab18c +thunderbolt 10904df3f20cf36e418e78ab73c2fbcecda512b8 +usb-serial 4c0d9477ba69a417c698aec1d3012e188cf97add +tty 5ed771f174726ae879945d4f148a9005ac909cb7 +char-misc 0cf7befa3ea2e7284d8ba5b8f45a546865b09edb +accel f03eee5fc922158654405318a02db9982c0ddf07 +coresight 988d40a4d4e7d671305bea501562a5d1a1d479fa +fastrpc 8400291e289ee6b2bf9779ff1c83a291501f017b +fpga 8de36789bd038ae24e29c40cbbc9e7d59604f54f +icc a5733950fe35d56a935257995d8093a3b4867f61 +iio fec496684388685647652ab4213454fbabdab099 +phy-next 3c2ea12a625dbf5a864f4920235fa1c739d06e7d +soundwire 5aedb8d8336b0a0421b58ca27d1b572aa6695b5b +extcon 2e01ac83c1c7166e58043ff2bdb0dc7dbfcfd11a +gnss 8400291e289ee6b2bf9779ff1c83a291501f017b +vfio aab439ffa1ca1067c0114773d4044828fab582af +w1 8400291e289ee6b2bf9779ff1c83a291501f017b +spmi 7c626ce4bae1ac14f60076d00eafe71af30450ba +staging b4fdf9b1cd8b21a6569290a06b2a7df0eb071d6e +counter-next 0d0f611bdf8e1d06df7ecb44b424a6fb093e2efc +siox db418d5f1ca5b7bafc8eaa9393ea18a7901bb0ed +mux 5be63fc19fcaa4c236b307420483578a56986a37 +dmaengine e0bee4bcdc3238ebcae6e5960544b9e3d0a62abf +cgroup df57390127a21e87ca2bf943244362921a382c10 +scsi 5fe9a493006d41bf72514f8fa0e96ee9083bc7c6 +scsi-mkp 359aeb86480da0cba043a79c87a65806f158e931 +vhost 1bc6f4910ae955971097f3f2ae0e7e63fa4250ae +rpmsg 752ce45a66ec3217490a02ef5165be7fbbcb0fc6 +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl 6b5e97c020060c2b8ad286002415106ab7034435 +gpio-intel 8400291e289ee6b2bf9779ff1c83a291501f017b +pinctrl b8b23101552df8bab3756a2ff9169d8b9619ce02 +pinctrl-intel 1652e95b17d5666375949524c708afef2574a01e +pinctrl-renesas 1325820dd085809645bdd89a2fd408a05b4a5492 +pinctrl-samsung 39dbbd4e6778ac5580313ba34409855250633c61 +pwm d242feaf81d63b25d8c1fb1a68738dc33966a376 +ktest 2351e8c65404aabc433300b6bf90c7a37e8bbc4d +kselftest a0474b8d5974e142461ac7584c996feea167bcc1 +kunit 8400291e289ee6b2bf9779ff1c83a291501f017b +kunit-next 7fcc9b53216cd87f73cc6dbb404220350ddc93b8 +livepatching 9fbf78b6d6cecc2e9833c2f74eb2edc027c9b4cb +rtc 60a06efc56d7d336d13fae58f9e90c8a4e21619e +nvdimm 447b167bb60d0bb95967c4d93dac9af1cca437db +at24 36e071d2a1522eeb3d38fb9c257cac8e5907979f +ntb 92aee2f6d1564aa13fc1432ca03ef041b5b6f803 +seccomp de9c2c66ad8e787abec7c9d7eff4f8c3cdd28aed +fsi c5eeb63edac9497f9a0d46d3b75cf8b293771ecf +slimbus 8400291e289ee6b2bf9779ff1c83a291501f017b +nvmem 8400291e289ee6b2bf9779ff1c83a291501f017b +xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af +hyperv 94e86b174d103d941b4afc4f016af8af9e5352fa +auxdisplay 8400291e289ee6b2bf9779ff1c83a291501f017b +kgdb 9bccbe7b20876a34c70b13430ea1b308fc8d5a7e +hmm 6613476e225e090cc9aad49be7fa504e290dd33d +cfi 8400291e289ee6b2bf9779ff1c83a291501f017b +mhi 84a5ae5b23ba6320bbdfeccfe9a3ad31b2cc41d9 +memblock cb088e38aab4c7e9ce711c18c66e851c8f4227bb +cxl b5209da36b19b573cf25fe7e698e3a45b0f40a75 +zstd 3f832dfb8a8eafee3cecd479d99651a64a61485a +efi 04736f7d1945722117def1462fd3602c72c02272 +unicode 156bb2c569cd869583c593d27a5bd69e7b2a4264 +slab ecc4d6af979b3bd4d239ff80bbba455c90d3f4f3 +random 210860e7f7337e47e77577fa5bb168767e2d8a1e +landlock 1ca980815e1f284dddcb5e678c91bbd3e3f3a6a6 +rust a2f11547052001bd448ccec81dd1e68409078fbb +sysctl 559d4c6a9d3b60f239493239070eb304edaea594 +execve 44f65d900698278a8451988abe0d5ca37fd46882 +bitmap d7bcc37436c7d373a715d48a7cd74cd3b1724a68 +hte 9e4259716f60c96c069a38e826884ad783dc4eb4 +kspp c00ac1f9fd7bfe87ff17b7a85f23118f3a3f0af2 +kspp-gustavo 6613476e225e090cc9aad49be7fa504e290dd33d +nolibc 248f6b935bbd8f7bc211cce2b6fd76be4c449848 +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd 79805c1bbbf9846fe91c16933d64614cbbff1dee +turbostat 527aa0ca1c0c42e78b04ff2fba245742dbe89b3c +pwrseq 8b7e0a6c443e855374a426dcdfd0a19912d70df3 +header_cleanup 5f4c01f1e3c7b0c8d1e5dd6f080531de7aa5e47b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 00000000000000..ad759f9e1b6321 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,378 @@ +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 +vfs-brauner-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.fixes +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 +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 +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +v9fs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +overlayfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes +bcachefs git git://evilpiepirate.org/bcachefs.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.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 +exportfs git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#exportfs-next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +v9fs-ericvh git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs-brauner git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +fs-current git linux-next +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.kernel.org/pub/scm/linux/kernel/git/rmk/linux.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 +sophgo-fixes git https://github.com/sophgo/linux.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 +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +ath git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-current +wpan git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +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 https://git.linuxtv.org/media_stage.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/khilman/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 +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 https://gitlab.freedesktop.org/drm/kernel.git#drm-fixes +drm-intel-fixes git https://gitlab.freedesktop.org/drm/i915/kernel#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 +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 +auxdisplay-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools#perf-tools +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +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 +w1-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +i2c-host-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host-fixes +sparc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-linus +clk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-fixes +pwrseq-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-current +thead-dt-fixes git https://github.com/pdp7/linux.git#thead-dt-fixes +drm-misc-fixes git https://gitlab.freedesktop.org/drm/misc/kernel.git#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 +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.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/mediatek/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/khilman/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 +sophgo git https://github.com/sophgo/linux.git#for-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 +thead-dt git https://github.com/pdp7/linux.git#thead-dt-for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +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 +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.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 +fs-next git linux-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 +i2c-host git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host +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 +pmdomain git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#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 +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +ath-next git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-next +wpan-next git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +wpan-staging git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git https://gitlab.freedesktop.org/drm/kernel.git#drm-next +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next +drm-misc git https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git https://gitlab.freedesktop.org/drm/i915/kernel#for-linux-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 +drm-xe git https://gitlab.freedesktop.org/drm/xe/kernel#drm-xe-next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 git https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux#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 +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 git://git.code.sf.net/p/tomoyo/tomoyo.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/iommu/linux.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.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#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 https://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 +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/rcu/linux.git#next +paulmck git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#non-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-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm +kvm-riscv git https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 git https://github.com/kvm-x86/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sched-ext git git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.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 +chrome-platform-firmware git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fastrpc git git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +w1 git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +spmi git git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-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 +siox git git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#siox/for-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/ukleinek/linux.git#pwm/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 git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#for-next +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#slab/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/sysctl/sysctl.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 +nolibc git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#nolibc +tsm git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux#tsm-next +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +turbostat git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +pwrseq git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-next +header_cleanup git git://evilpiepirate.org/bcachefs.git#header_cleanup diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 00000000000000..36579486ed098b --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,13478 @@ +$ date -R +Wed, 18 Sep 2024 07:47:08 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 61% (5431/8849) Updating files: 62% (5487/8849) Updating files: 63% (5575/8849) Updating files: 64% (5664/8849) Updating files: 65% (5752/8849) Updating files: 66% (5841/8849) Updating files: 67% (5929/8849) Updating files: 68% (6018/8849) Updating files: 69% (6106/8849) Updating files: 70% (6195/8849) Updating files: 71% (6283/8849) Updating files: 72% (6372/8849) Updating files: 73% (6460/8849) Updating files: 74% (6549/8849) Updating files: 75% (6637/8849) Updating files: 76% (6726/8849) Updating files: 77% (6814/8849) Updating files: 78% (6903/8849) Updating files: 79% (6991/8849) Updating files: 80% (7080/8849) Updating files: 81% (7168/8849) Updating files: 82% (7257/8849) Updating files: 83% (7345/8849) Updating files: 84% (7434/8849) Updating files: 85% (7522/8849) Updating files: 86% (7611/8849) Updating files: 87% (7699/8849) Updating files: 88% (7788/8849) Updating files: 89% (7876/8849) Updating files: 90% (7965/8849) Updating files: 91% (8053/8849) Updating files: 92% (8142/8849) Updating files: 93% (8230/8849) Updating files: 94% (8319/8849) Updating files: 95% (8407/8849) Updating files: 96% (8496/8849) Updating files: 97% (8584/8849) Updating files: 98% (8673/8849) Updating files: 99% (8761/8849) Updating files: 100% (8849/8849) Updating files: 100% (8849/8849), done. +HEAD is now at a430d95c5efa Merge tag 'lsm-pr-20240911' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm +Merging origin/master (2f27fce67173 Merge tag 'sound-6.12-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating a430d95c5efa..2f27fce67173 +Fast-forward (no commit created; -m option ignored) + Documentation/PCI/pci.rst | 2 +- + Documentation/accel/qaic/qaic.rst | 2 +- + Documentation/admin-guide/bug-bisect.rst | 166 +- + Documentation/admin-guide/bug-hunting.rst | 17 +- + .../admin-guide/device-mapper/dm-crypt.rst | 13 +- + Documentation/admin-guide/kernel-parameters.txt | 12 + + Documentation/admin-guide/media/vivid.rst | 2 +- + Documentation/admin-guide/tainted-kernels.rst | 2 + + .../arch/arm/stm32/stm32-dma-mdma-chaining.rst | 4 +- + Documentation/arch/arm64/cpu-hotplug.rst | 2 +- + Documentation/arch/powerpc/ultravisor.rst | 2 +- + Documentation/arch/riscv/vector.rst | 2 +- + Documentation/arch/x86/mds.rst | 2 +- + Documentation/arch/x86/x86_64/fsgs.rst | 4 +- + Documentation/block/bfq-iosched.rst | 22 +- + Documentation/core-api/memory-allocation.rst | 5 +- + Documentation/dev-tools/kcsan.rst | 3 +- + Documentation/dev-tools/kunit/style.rst | 29 +- + .../arm/amlogic/amlogic,meson-gx-ao-secure.yaml | 16 +- + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 3 + + .../devicetree/bindings/arm/atmel-sysregs.txt | 6 +- + Documentation/devicetree/bindings/arm/fsl.yaml | 38 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 19 + + .../devicetree/bindings/arm/rockchip.yaml | 42 +- + .../devicetree/bindings/arm/rockchip/pmu.yaml | 2 + + .../devicetree/bindings/arm/stm32/stm32.yaml | 8 + + Documentation/devicetree/bindings/arm/sunxi.yaml | 9 +- + Documentation/devicetree/bindings/arm/tegra.yaml | 42 + + Documentation/devicetree/bindings/arm/ti/k3.yaml | 1 + + .../bindings/clock/amlogic,c3-pll-clkc.yaml | 7 +- + .../bindings/clock/qcom,ipq5332-gcc.yaml | 2 + + .../devicetree/bindings/clock/qcom,rpmcc.yaml | 2 +- + .../bindings/clock/qcom,sm4450-camcc.yaml | 63 + + .../bindings/clock/qcom,sm4450-dispcc.yaml | 71 + + .../bindings/clock/qcom,sm8150-camcc.yaml | 77 + + .../bindings/clock/qcom,sm8450-gpucc.yaml | 2 + + .../bindings/clock/renesas,rzv2h-cpg.yaml | 80 + + .../bindings/clock/samsung,exynosautov9-clock.yaml | 19 + + .../clock/samsung,exynosautov920-clock.yaml | 162 + + .../devicetree/bindings/firmware/arm,scmi.yaml | 20 +- + .../bindings/firmware/nxp,imx95-scmi.yaml | 43 + + .../devicetree/bindings/iio/adc/adi,ad4000.yaml | 197 + + .../bindings/interrupt-controller/apple,aic.yaml | 14 +- + .../interrupt-controller/brcm,bcm2836-l1-intc.txt | 37 - + .../interrupt-controller/brcm,bcm2836-l1-intc.yaml | 51 + + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 + + .../devicetree/bindings/media/s5p-mfc.txt | 0 + .../memory-controllers/fsl/fsl,imx-weim.yaml | 25 +- + .../memory-controllers/renesas,rpc-if.yaml | 4 +- + .../devicetree/bindings/mfd/mediatek,mt6357.yaml | 21 + + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 2 +- + .../bindings/pinctrl/atmel,at91-pinctrl.txt | 178 - + .../bindings/pinctrl/atmel,at91rm9200-pinctrl.yaml | 184 + + .../bindings/power/renesas,rcar-sysc.yaml | 1 + + .../bindings/power/rockchip-io-domain.yaml | 24 + + .../regulator/mediatek,mt6397-regulator.yaml | 238 ++ + .../bindings/regulator/microchip,mcp16502.yaml | 20 + + .../bindings/regulator/mt6397-regulator.txt | 220 -- + .../bindings/regulator/qcom,qca6390-pmu.yaml | 22 +- + .../bindings/remoteproc/qcom,glink-rpm-edge.yaml | 2 +- + .../bindings/remoteproc/qcom,rpm-proc.yaml | 4 +- + .../bindings/reset/amlogic,meson-reset.yaml | 1 + + .../bindings/reset/mobileye,eyeq5-reset.yaml | 43 - + .../devicetree/bindings/reset/renesas,rst.yaml | 1 + + .../reset/socionext,uniphier-glue-reset.yaml | 8 +- + .../devicetree/bindings/riscv/sophgo.yaml | 5 + + .../bindings/soc/bcm/brcm,bcm2711-avs-monitor.yaml | 44 + + .../bindings/soc/fsl/cpm_qe/fsl,qe-tsa.yaml | 210 ++ + .../bindings/soc/fsl/cpm_qe/fsl,qe-ucc-qmc.yaml | 197 + + .../bindings/soc/qcom/qcom,pmic-glink.yaml | 5 + + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 74 +- + .../devicetree/bindings/soc/qcom/qcom,smd.yaml | 2 +- + .../devicetree/bindings/soc/renesas/renesas.yaml | 14 + + .../devicetree/bindings/soc/rockchip/grf.yaml | 16 + + .../bindings/soc/samsung/exynos-usi.yaml | 15 +- + .../bindings/soc/ti/ti,am654-serdes-ctrl.yaml | 3 +- + .../bindings/sound/amlogic,axg-sound-card.yaml | 7 + + .../bindings/sound/amlogic,gx-sound-card.yaml | 7 + + .../devicetree/bindings/sound/cirrus,cs4271.yaml | 101 + + Documentation/devicetree/bindings/sound/cs4271.txt | 57 - + Documentation/devicetree/bindings/sound/da7213.txt | 45 - + .../devicetree/bindings/sound/dlg,da7213.yaml | 103 + + .../bindings/sound/fsl,imx-audio-es8328.yaml | 111 + + .../devicetree/bindings/sound/fsl,saif.yaml | 83 + + .../devicetree/bindings/sound/imx-audio-es8328.txt | 60 - + .../bindings/sound/mediatek,mt8365-afe.yaml | 130 + + .../bindings/sound/mediatek,mt8365-mt6357.yaml | 107 + + .../bindings/sound/microchip,sama7g5-spdifrx.yaml | 5 +- + .../devicetree/bindings/sound/mxs-saif.txt | 41 - + .../devicetree/bindings/sound/pcm512x.txt | 53 - + .../bindings/sound/qcom,apq8016-sbc-sndcard.yaml | 205 ++ + .../bindings/sound/qcom,lpass-wsa-macro.yaml | 22 +- + .../devicetree/bindings/sound/qcom,sm8250.yaml | 137 - + .../devicetree/bindings/sound/realtek,rt5616.yaml | 12 + + .../devicetree/bindings/sound/renesas,rsnd.yaml | 6 + + .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 4 + + .../devicetree/bindings/sound/samsung,odroid.yaml | 5 - + .../devicetree/bindings/sound/ti,pcm512x.yaml | 101 + + .../bindings/sound/ti,tlv320dac3100.yaml | 127 + + .../devicetree/bindings/sound/ti,tpa6130a2.yaml | 55 + + .../devicetree/bindings/sound/tlv320aic31xx.txt | 77 - + .../devicetree/bindings/sound/tpa6130a2.txt | 27 - + .../devicetree/bindings/spi/cdns,xspi.yaml | 32 +- + .../bindings/spi/mediatek,spi-mt65xx.yaml | 1 + + .../bindings/spi/microchip,mpfs-spi.yaml | 7 +- + .../devicetree/bindings/spi/nxp,sc18is.yaml | 51 + + .../devicetree/bindings/spi/spi-nxp-fspi.yaml | 1 + + .../devicetree/bindings/spi/spi-rockchip.yaml | 1 + + .../devicetree/bindings/spi/spi-sc18is602.txt | 23 - + .../bindings/timer/brcm,bcm2835-system-timer.txt | 22 - + .../bindings/timer/brcm,bcm2835-system-timer.yaml | 50 + + .../bindings/timer/rockchip,rk-timer.yaml | 1 + + .../devicetree/bindings/trivial-devices.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/doc-guide/checktransupdate.rst | 54 + + Documentation/doc-guide/index.rst | 1 + + Documentation/dontdiff | 2 +- + Documentation/driver-api/driver-model/devres.rst | 2 +- + Documentation/driver-api/iio/buffers.rst | 8 +- + Documentation/driver-api/iio/core.rst | 14 +- + Documentation/fault-injection/fault-injection.rst | 22 +- + Documentation/filesystems/9p.rst | 2 +- + Documentation/filesystems/autofs.rst | 4 +- + Documentation/filesystems/journalling.rst | 6 +- + Documentation/gpu/komeda-kms.rst | 2 +- + Documentation/leds/leds-mlxcpld.rst | 2 +- + Documentation/mm/hmm.rst | 10 +- + Documentation/mm/vmalloced-kernel-stacks.rst | 8 +- + Documentation/nvme/feature-and-quirk-policy.rst | 6 +- + Documentation/process/backporting.rst | 6 +- + Documentation/process/coding-style.rst | 2 +- + Documentation/process/email-clients.rst | 2 +- + Documentation/process/maintainer-tip.rst | 2 +- + Documentation/process/submitting-patches.rst | 8 + + Documentation/scheduler/completion.rst | 2 +- + Documentation/scheduler/index.rst | 1 + + Documentation/scheduler/sched-design-CFS.rst | 10 +- + Documentation/scheduler/sched-eevdf.rst | 43 + + Documentation/sound/alsa-configuration.rst | 3 + + Documentation/sound/hd-audio/notes.rst | 6 - + Documentation/sound/index.rst | 1 + + .../sound/kernel-api/writing-an-alsa-driver.rst | 25 - + Documentation/sound/utimers.rst | 126 + + Documentation/sphinx/kerneldoc-preamble.sty | 2 + + Documentation/spi/spi-summary.rst | 83 + + Documentation/timers/timers-howto.rst | 2 +- + .../ko_KR/core-api/wrappers/memory-barriers.rst | 18 + + Documentation/translations/ko_KR/index.rst | 16 +- + .../translations/ko_KR/{ => process}/howto.rst | 0 + .../translations/sp_SP/scheduler/index.rst | 1 + + .../sp_SP/scheduler/sched-design-CFS.rst | 10 +- + .../translations/sp_SP/scheduler/sched-eevdf.rst | 58 + + .../translations/zh_CN/admin-guide/index.rst | 1 - + .../zh_CN/admin-guide/reporting-issues.rst | 4 +- + .../translations/zh_CN/dev-tools/index.rst | 2 +- + .../translations/zh_CN/dev-tools/kcsan.rst | 320 ++ + .../zh_CN/doc-guide/checktransupdate.rst | 55 + + .../translations/zh_CN/doc-guide/index.rst | 1 + + Documentation/translations/zh_CN/index.rst | 2 +- + .../translations/zh_CN/kbuild/gcc-plugins.rst | 126 + + .../translations/zh_CN/kbuild/headers_install.rst | 39 + + Documentation/translations/zh_CN/kbuild/index.rst | 35 + + Documentation/translations/zh_CN/process/index.rst | 3 +- + .../{admin-guide => process}/security-bugs.rst | 42 +- + .../zh_CN/process/submitting-patches.rst | 2 +- + .../zh_TW/admin-guide/reporting-issues.rst | 4 +- + .../zh_TW/process/submitting-patches.rst | 2 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 + + Documentation/virt/kvm/index.rst | 1 + + Documentation/virt/kvm/loongarch/hypercalls.rst | 89 + + Documentation/virt/kvm/loongarch/index.rst | 10 + + Documentation/watchdog/watchdog-api.rst | 2 +- + MAINTAINERS | 44 +- + arch/arm/boot/dts/amlogic/meson8b-ec100.dts | 2 - + arch/arm/boot/dts/arm/arm-realview-eb-mp.dtsi | 2 +- + arch/arm/boot/dts/arm/arm-realview-pb11mp.dts | 2 +- + arch/arm/boot/dts/arm/arm-realview-pba8.dts | 2 +- + arch/arm/boot/dts/arm/arm-realview-pbx-a9.dts | 2 +- + arch/arm/boot/dts/aspeed/Makefile | 3 + + .../boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts | 20 +- + .../dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts | 154 + + .../aspeed/aspeed-bmc-arm-stardragon4800-rep2.dts | 4 - + .../dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts | 12 +- + .../boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 4 - + .../dts/aspeed/aspeed-bmc-facebook-catalina.dts | 1110 ++++++ + .../dts/aspeed/aspeed-bmc-facebook-greatlakes.dts | 2 +- + .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 177 +- + .../dts/aspeed/aspeed-bmc-facebook-minerva.dts | 518 ++- + .../dts/aspeed/aspeed-bmc-ibm-blueridge-4u.dts | 21 + + .../boot/dts/aspeed/aspeed-bmc-ibm-blueridge.dts | 1686 +++++++++ + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts | 5 - + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-everest.dts | 5 - + arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-fuji.dts | 3876 ++++++++++++++++++++ + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-rainier.dts | 5 - + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 6 +- + .../boot/dts/aspeed/aspeed-bmc-inspur-fp5280g2.dts | 4 - + .../boot/dts/aspeed/aspeed-bmc-inspur-on5263m5.dts | 4 - + .../boot/dts/aspeed/aspeed-bmc-intel-s2600wf.dts | 4 - + .../arm/boot/dts/aspeed/aspeed-bmc-opp-lanyang.dts | 4 - + arch/arm/boot/dts/aspeed/aspeed-bmc-opp-nicole.dts | 4 - + .../arm/boot/dts/aspeed/aspeed-bmc-opp-romulus.dts | 4 - + arch/arm/boot/dts/aspeed/aspeed-bmc-opp-swift.dts | 4 - + arch/arm/boot/dts/aspeed/aspeed-bmc-opp-tacoma.dts | 5 - + .../boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts | 9 - + arch/arm/boot/dts/aspeed/aspeed-bmc-opp-zaius.dts | 2 - + .../dts/aspeed/aspeed-bmc-supermicro-x11spi.dts | 4 - + arch/arm/boot/dts/aspeed/aspeed-g4.dtsi | 7 +- + arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 18 +- + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 29 +- + arch/arm/boot/dts/aspeed/ibm-power11-quad.dtsi | 1539 ++++++++ + arch/arm/boot/dts/broadcom/bcm21664-garnet.dts | 4 + + arch/arm/boot/dts/broadcom/bcm21664.dtsi | 362 +- + arch/arm/boot/dts/broadcom/bcm2166x-common.dtsi | 334 ++ + arch/arm/boot/dts/broadcom/bcm23550.dtsi | 382 +- + arch/arm/boot/dts/broadcom/bcm2837.dtsi | 2 +- + .../arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts | 12 +- + .../dts/broadcom/bcm958625-meraki-mx6x-common.dtsi | 12 +- + .../intel/socfpga/socfpga_cyclone5_vining_fpga.dts | 4 +- + .../boot/dts/marvell/armada-385-clearfog-gtr.dtsi | 8 +- + .../boot/dts/microchip/at91-sam9x60_curiosity.dts | 2 - + arch/arm/boot/dts/microchip/at91-sam9x60ek.dts | 4 - + .../boot/dts/microchip/at91-sama5d27_wlsom1.dtsi | 13 + + .../boot/dts/microchip/at91-sama5d29_curiosity.dts | 13 + + arch/arm/boot/dts/microchip/at91-sama5d2_icp.dts | 13 + + .../boot/dts/microchip/at91-sama7g54_curiosity.dts | 13 + + arch/arm/boot/dts/microchip/at91-sama7g5ek.dts | 53 + + arch/arm/boot/dts/microchip/at91rm9200.dtsi | 2 +- + arch/arm/boot/dts/microchip/at91sam9260.dtsi | 2 +- + arch/arm/boot/dts/microchip/at91sam9261.dtsi | 2 +- + arch/arm/boot/dts/microchip/at91sam9263.dtsi | 2 +- + arch/arm/boot/dts/microchip/at91sam9g20ek_2mmc.dts | 4 +- + .../at91sam9g25-gardena-smart-gateway.dts | 24 +- + arch/arm/boot/dts/microchip/at91sam9g45.dtsi | 2 +- + arch/arm/boot/dts/microchip/at91sam9n12.dtsi | 2 +- + arch/arm/boot/dts/microchip/at91sam9n12ek.dts | 6 +- + arch/arm/boot/dts/microchip/at91sam9rl.dtsi | 2 +- + arch/arm/boot/dts/microchip/at91sam9x5.dtsi | 2 +- + arch/arm/boot/dts/microchip/at91sam9x5cm.dtsi | 4 +- + arch/arm/boot/dts/microchip/sam9x60.dtsi | 40 +- + arch/arm/boot/dts/microchip/sama5d3.dtsi | 2 +- + arch/arm/boot/dts/microchip/sama5d4.dtsi | 2 +- + arch/arm/boot/dts/microchip/sama7g5.dtsi | 2 +- + arch/arm/boot/dts/nuvoton/nuvoton-npcm730-kudo.dts | 32 +- + arch/arm/boot/dts/nuvoton/nuvoton-npcm750-evb.dts | 6 +- + .../nuvoton-wpcm450-supermicro-x9sci-ln4f.dts | 6 +- + arch/arm/boot/dts/nvidia/tegra114-asus-tf701t.dts | 1588 ++++++-- + arch/arm/boot/dts/nvidia/tegra20-trimslice.dts | 30 +- + arch/arm/boot/dts/nxp/imx/imx1.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx27.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx53-mba53.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx53-qsb-hdmi.dtso | 6 - + arch/arm/boot/dts/nxp/imx/imx53-tqma53.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6q-cm-fx6.dts | 15 +- + arch/arm/boot/dts/nxp/imx/imx6q-prti6q.dts | 15 +- + arch/arm/boot/dts/nxp/imx/imx6q-tbs2910.dts | 9 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi | 15 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-apf6dev.dtsi | 9 +- + .../boot/dts/nxp/imx/imx6qdl-aristainetos2.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi | 15 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-cubox-i.dtsi | 9 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw52xx.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw53xx.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw54xx.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw553x.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw560x.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw5903.dtsi | 10 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw5904.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw5910.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw5912.dtsi | 4 +- + .../arm/boot/dts/nxp/imx/imx6qdl-hummingboard.dtsi | 9 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-icore-rqs.dtsi | 8 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-mba6a.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-mba6b.dtsi | 11 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-sabreauto.dtsi | 13 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6.dtsi | 14 - + arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6a.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-tqma6b.dtsi | 20 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-tx6.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-var-dart.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-wandboard.dtsi | 9 +- + arch/arm/boot/dts/nxp/imx/imx6sl-evk.dts | 12 +- + arch/arm/boot/dts/nxp/imx/imx6sl-warp.dts | 8 +- + arch/arm/boot/dts/nxp/imx/imx6sx-sabreauto.dts | 9 +- + arch/arm/boot/dts/nxp/imx/imx6sx-sdb.dtsi | 9 +- + arch/arm/boot/dts/nxp/imx/imx6sx-udoo-neo.dtsi | 5 + + arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi | 4 +- + .../boot/dts/nxp/imx/imx6ul-ccimx6ulsbcexpress.dts | 4 +- + .../arm/boot/dts/nxp/imx/imx6ul-ccimx6ulsbcpro.dts | 14 +- + arch/arm/boot/dts/nxp/imx/imx6ul-ccimx6ulsom.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6ul-geam.dts | 6 +- + arch/arm/boot/dts/nxp/imx/imx6ul-isiot.dtsi | 4 +- + .../boot/dts/nxp/imx/imx6ul-kontron-bl-common.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6ul-liteboard.dts | 2 +- + .../nxp/imx/imx6ul-phytec-segin-peb-wlbt-05.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6ul-phytec-segin.dtsi | 6 +- + .../boot/dts/nxp/imx/imx6ul-tqma6ul-common.dtsi | 2 +- + .../boot/dts/nxp/imx/imx6ul-tx6ul-mainboard.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi | 18 +- + .../boot/dts/nxp/imx/imx6ull-myir-mys-6ulx.dtsi | 8 +- + .../dts/nxp/imx/imx6ull-seeed-npi-dev-board.dtsi | 20 +- + arch/arm/boot/dts/nxp/imx/imx6ull-seeed-npi.dtsi | 6 +- + arch/arm/boot/dts/nxp/imx/imx6ulz-bsh-smm-m2.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx7-mba7.dtsi | 8 +- + arch/arm/boot/dts/nxp/imx/imx7d-nitrogen7.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx7d-pico.dtsi | 20 +- + arch/arm/boot/dts/nxp/imx/imx7d-remarkable2.dts | 8 +- + arch/arm/boot/dts/nxp/imx/imx7d-sdb-reva.dts | 30 +- + arch/arm/boot/dts/nxp/imx/imx7d-sdb.dts | 608 ++- + arch/arm/boot/dts/nxp/imx/imx7d-zii-rmu2.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx7s-warp.dts | 4 +- + arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi | 6 +- + .../arm/boot/dts/nxp/lpc/lpc4357-ea4357-devkit.dts | 4 +- + arch/arm/boot/dts/nxp/lpc/lpc4357-myd-lpc4357.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx23-evk.dts | 4 +- + arch/arm/boot/dts/nxp/mxs/imx23-olinuxino.dts | 4 +- + arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts | 4 +- + arch/arm/boot/dts/nxp/mxs/imx23-stmp378x_devb.dts | 4 +- + arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts | 4 +- + arch/arm/boot/dts/nxp/mxs/imx23.dtsi | 4 +- + arch/arm/boot/dts/nxp/mxs/imx28-apx4devkit.dts | 18 +- + arch/arm/boot/dts/nxp/mxs/imx28-cfa10037.dts | 4 +- + arch/arm/boot/dts/nxp/mxs/imx28-lwe.dtsi | 38 +- + arch/arm/boot/dts/nxp/mxs/imx28-tx28.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28.dtsi | 4 +- + arch/arm/boot/dts/qcom/pma8084.dtsi | 16 +- + .../boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts | 4 - + arch/arm/boot/dts/qcom/qcom-apq8064-cm-qs600.dts | 25 +- + arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts | 25 +- + arch/arm/boot/dts/qcom/qcom-apq8064-pins.dtsi | 394 +- + .../qcom/qcom-apq8064-sony-xperia-lagan-yuga.dts | 10 +- + arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 39 +- + arch/arm/boot/dts/qcom/qcom-apq8084.dtsi | 2 +- + arch/arm/boot/dts/qcom/qcom-ipq4018-ap120c-ac.dtsi | 34 +- + arch/arm/boot/dts/qcom/qcom-ipq4018-jalapeno.dts | 27 +- + arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk01.1.dtsi | 26 +- + arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk04.1.dtsi | 14 +- + .../boot/dts/qcom/qcom-ipq4019-ap.dk07.1-c1.dts | 8 +- + .../boot/dts/qcom/qcom-ipq4019-ap.dk07.1-c2.dts | 2 +- + arch/arm/boot/dts/qcom/qcom-ipq4019-ap.dk07.1.dtsi | 6 +- + arch/arm/boot/dts/qcom/qcom-ipq8064-ap148.dts | 11 +- + arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts | 76 +- + arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi | 116 +- + .../dts/qcom/qcom-msm8226-microsoft-common.dtsi | 26 + + .../dts/qcom/qcom-msm8226-microsoft-moneypenny.dts | 3 + + arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 136 +- + .../boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts | 3 + + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 4 +- + .../qcom/qcom-msm8974pro-samsung-klte-common.dtsi | 13 + + arch/arm/boot/dts/rockchip/rk3128.dtsi | 26 +- + arch/arm/boot/dts/rockchip/rv1108-elgin-r1.dts | 4 +- + arch/arm/boot/dts/rockchip/rv1126-pinctrl.dtsi | 256 ++ + arch/arm/boot/dts/rockchip/rv1126.dtsi | 151 + + arch/arm/boot/dts/st/Makefile | 3 + + arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi | 20 +- + arch/arm/boot/dts/st/stm32mp135f-dhcor-dhsbc.dts | 44 + + arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi | 3 + + arch/arm/boot/dts/st/stm32mp151a-prtt1a.dts | 12 +- + arch/arm/boot/dts/st/stm32mp151a-prtt1c.dts | 108 +- + arch/arm/boot/dts/st/stm32mp151a-prtt1l.dtsi | 126 +- + arch/arm/boot/dts/st/stm32mp151a-prtt1s.dts | 16 +- + arch/arm/boot/dts/st/stm32mp151c-mecio1r0.dts | 48 + + arch/arm/boot/dts/st/stm32mp151c-mect1s.dts | 290 ++ + arch/arm/boot/dts/st/stm32mp153c-mecio1r1.dts | 48 + + arch/arm/boot/dts/st/stm32mp15x-mecio1-io.dtsi | 527 +++ + arch/arm/boot/dts/st/stm32mp15xx-dhcom-pdk2.dtsi | 12 +- + arch/arm/boot/dts/ti/omap/am335x-bone-common.dtsi | 66 +- + arch/arm/boot/dts/ti/omap/am335x-boneblue.dts | 12 +- + arch/arm/boot/dts/ti/omap/am335x-nano.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-regor.dtsi | 10 +- + arch/arm/boot/dts/ti/omap/am335x-wega.dtsi | 7 +- + arch/arm/boot/dts/xilinx/zynq-zturn-common.dtsi | 4 +- + arch/arm/configs/at91_dt_defconfig | 1 + + arch/arm/configs/shmobile_defconfig | 1 + + arch/arm/mach-at91/Kconfig | 22 +- + arch/arm/mach-at91/Makefile | 1 + + arch/arm/mach-at91/generic.h | 2 + + arch/arm/mach-at91/pm.c | 29 + + arch/arm/mach-at91/sam9x7.c | 33 + + arch/arm/mach-bcm/Kconfig | 1 + + arch/arm/mach-davinci/Makefile | 1 - + arch/arm/mach-davinci/common.h | 1 - + arch/arm/mach-davinci/cpuidle.c | 99 - + arch/arm/mach-davinci/cpuidle.h | 15 - + arch/arm/mach-davinci/devices-da8xx.c | 1 - + arch/arm/mach-davinci/mux.h | 5 - + arch/arm/mach-dove/common.c | 4 +- + arch/arm/mach-imx/mach-imx6sx.c | 22 - + arch/arm/mach-imx/mach-imx7d.c | 2 +- + arch/arm/mach-mvebu/board-v7.c | 3 + + arch/arm/mach-omap1/omap-dma.c | 13 - + arch/arm/mach-omap1/pm.h | 4 - + arch/arm/mach-omap2/omap_device.c | 2 +- + arch/arm/mach-orion5x/board-mss2.c | 2 +- + arch/arm/mach-orion5x/dns323-setup.c | 6 +- + arch/arm/mach-orion5x/kurobox_pro-setup.c | 2 +- + arch/arm/mach-orion5x/mv2120-setup.c | 2 +- + arch/arm/mach-orion5x/net2big-setup.c | 2 +- + arch/arm/mach-orion5x/terastation_pro2-setup.c | 2 +- + arch/arm/mach-orion5x/ts209-setup.c | 2 +- + arch/arm/mach-orion5x/ts409-setup.c | 2 +- + arch/arm/mach-s3c/irq-uart-s3c64xx.h | 2 - + arch/arm/mach-s3c/mach-crag6410-module.c | 2 +- + arch/arm/mach-s3c/pm.h | 2 - + arch/arm/mach-s3c/s3c64xx.h | 11 - + arch/arm/mach-versatile/platsmp-realview.c | 1 + + arch/arm/mach-versatile/spc.c | 2 +- + arch/arm64/boot/dts/allwinner/Makefile | 3 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 16 + + .../dts/allwinner/sun50i-h5-nanopi-neo-plus2.dts | 37 + + arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 2 + + .../allwinner/sun50i-h700-anbernic-rg35xx-2024.dts | 27 +- + .../allwinner/sun50i-h700-anbernic-rg35xx-sp.dts | 34 + + arch/arm64/boot/dts/amlogic/Makefile | 1 + + arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi | 14 + + arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi | 10 + + .../boot/dts/amlogic/amlogic-c3-c302x-aw409.dts | 231 ++ + .../boot/dts/amlogic/amlogic-c3-c308l-aw419.dts | 260 ++ + arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 503 ++- + arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 8 + + arch/arm64/boot/dts/amlogic/meson-axg-s400.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-g12a-fbx8am.dts | 4 + + .../boot/dts/amlogic/meson-g12a-radxa-zero.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-g12a-sei510.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 4 + + .../dts/amlogic/meson-g12b-bananapi-cm4-cm4io.dts | 4 + + .../meson-g12b-bananapi-cm4-mnt-reform2.dts | 4 + + .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 4 + + .../boot/dts/amlogic/meson-g12b-dreambox.dtsi | 6 + + .../arm64/boot/dts/amlogic/meson-g12b-gsking-x.dts | 4 + + .../boot/dts/amlogic/meson-g12b-gtking-pro.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 4 + + .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 4 + + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 4 + + .../boot/dts/amlogic/meson-g12b-odroid-n2l.dts | 4 + + .../boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 4 + + .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 4 + + .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 4 + + .../arm64/boot/dts/amlogic/meson-gx-p23x-q20x.dtsi | 4 + + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 4 + + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 4 + + .../boot/dts/amlogic/meson-gxbb-nexbox-a95x.dts | 4 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 4 + + .../boot/dts/amlogic/meson-gxbb-vega-s95.dtsi | 4 + + .../boot/dts/amlogic/meson-gxbb-wetek-hub.dts | 4 + + .../boot/dts/amlogic/meson-gxbb-wetek-play2.dts | 4 + + .../dts/amlogic/meson-gxl-s805x-libretech-ac.dts | 4 + + .../boot/dts/amlogic/meson-gxl-s805x-p241.dts | 4 + + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 4 + + .../amlogic/meson-gxl-s905x-libretech-cc-v2.dts | 4 + + .../dts/amlogic/meson-gxl-s905x-libretech-cc.dts | 4 + + .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 4 + + .../boot/dts/amlogic/meson-gxl-s905x-vero4k.dts | 5 + + .../boot/dts/amlogic/meson-gxlx-s905l-p271.dts | 4 - + .../boot/dts/amlogic/meson-gxm-khadas-vim2.dts | 4 + + .../arm64/boot/dts/amlogic/meson-gxm-nexbox-a1.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-gxm-rbox-pro.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-khadas-vim3.dtsi | 4 + + .../dts/amlogic/meson-libretech-cottonwood.dtsi | 4 + + .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 145 + + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 136 + + .../boot/dts/amlogic/meson-sm1-a95xf3-air-gbit.dts | 4 + + .../boot/dts/amlogic/meson-sm1-a95xf3-air.dts | 4 + + .../boot/dts/amlogic/meson-sm1-bananapi-m2-pro.dts | 4 + + .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-sm1-h96-max.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-sm1-odroid.dtsi | 4 + + arch/arm64/boot/dts/amlogic/meson-sm1-sei610.dts | 4 + + .../boot/dts/amlogic/meson-sm1-x96-air-gbit.dts | 4 + + arch/arm64/boot/dts/amlogic/meson-sm1-x96-air.dts | 4 + + arch/arm64/boot/dts/apm/apm-storm.dtsi | 2 +- + arch/arm64/boot/dts/arm/foundation-v8.dtsi | 4 +- + arch/arm64/boot/dts/arm/fvp-base-revc.dts | 4 +- + arch/arm64/boot/dts/arm/rtsm_ve-aemv8a.dts | 4 +- + arch/arm64/boot/dts/broadcom/Makefile | 1 + + arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts | 64 + + arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 283 ++ + .../boot/dts/exynos/exynos7885-jackpotlte.dts | 2 +- + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 46 + + arch/arm64/boot/dts/exynos/exynosautov920.dtsi | 40 +- + arch/arm64/boot/dts/exynos/google/gs101.dtsi | 15 + + arch/arm64/boot/dts/freescale/Makefile | 9 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a-frdm.dts | 12 +- + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 5 +- + .../fsl-ls1028a-kontron-sl28-var3-ads2.dts | 12 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 29 +- + arch/arm64/boot/dts/freescale/fsl-ls1043-post.dtsi | 3 + + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 15 +- + arch/arm64/boot/dts/freescale/fsl-ls1046-post.dtsi | 4 + + arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 13 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 7 + + .../arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts | 6 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 17 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 34 +- + .../freescale/fsl-lx2160a-tqmlx2160a-mblx2160a.dts | 4 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 17 +- + arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 18 +- + arch/arm64/boot/dts/freescale/imx8-ss-img.dtsi | 2 - + arch/arm64/boot/dts/freescale/imx8-ss-lvds0.dtsi | 63 + + arch/arm64/boot/dts/freescale/imx8-ss-lvds1.dtsi | 114 + + arch/arm64/boot/dts/freescale/imx8-ss-mipi0.dtsi | 129 + + arch/arm64/boot/dts/freescale/imx8-ss-mipi1.dtsi | 138 + + arch/arm64/boot/dts/freescale/imx8dx-colibri.dtsi | 11 + + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 6 - + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 16 + + .../arm64/boot/dts/freescale/imx8mm-beacon-kit.dts | 4 +- + .../dts/freescale/imx8mm-data-modul-edm-sbc.dts | 19 +- + .../boot/dts/freescale/imx8mm-emtop-baseboard.dts | 50 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 15 +- + .../dts/freescale/imx8mm-phyboard-polis-rdk.dts | 1 + + .../imx8mm-phygate-tauri-l-rs232-rs232.dtso | 7 +- + .../imx8mm-phygate-tauri-l-rs232-rs485.dtso | 7 +- + .../imx8mm-phygate-tauri-l-rs232-rts-cts.dtso | 6 - + .../boot/dts/freescale/imx8mm-phygate-tauri-l.dts | 1 + + .../arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 1 - + arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 1 - + .../freescale/imx8mm-venice-gw72xx-0x-imx219.dtso | 16 + + .../imx8mm-venice-gw72xx-0x-rs232-rts.dtso | 6 +- + .../freescale/imx8mm-venice-gw72xx-0x-rs422.dtso | 8 +- + .../freescale/imx8mm-venice-gw72xx-0x-rs485.dtso | 8 +- + .../freescale/imx8mm-venice-gw73xx-0x-imx219.dtso | 16 + + .../imx8mm-venice-gw73xx-0x-rs232-rts.dtso | 2 +- + .../freescale/imx8mm-venice-gw73xx-0x-rs422.dtso | 4 +- + .../freescale/imx8mm-venice-gw73xx-0x-rs485.dtso | 4 +- + ...e-gw7905-0x.dts => imx8mm-venice-gw75xx-0x.dts} | 6 +- + ...enice-gw7905.dtsi => imx8mm-venice-gw75xx.dtsi} | 0 + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 2 + + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 2 + + .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 2 + + .../boot/dts/freescale/imx8mm-venice-gw7904.dts | 2 + + .../dts/freescale/imx8mn-beacon-baseboard.dtsi | 16 + + .../arm64/boot/dts/freescale/imx8mn-beacon-kit.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 15 +- + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 2 + + .../arm64/boot/dts/freescale/imx8mp-beacon-kit.dts | 48 + + .../dts/freescale/imx8mp-data-modul-edm-sbc.dts | 47 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 46 + + .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 66 + + .../boot/dts/freescale/imx8mp-phycore-no-eth.dtso | 16 + + .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 10 + + .../boot/dts/freescale/imx8mp-var-som-symphony.dts | 11 + + arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi | 359 ++ + .../dts/freescale/imx8mp-venice-gw74xx-imx219.dtso | 16 +- + ...e-gw7905-2x.dts => imx8mp-venice-gw75xx-2x.dts} | 6 +- + ...enice-gw7905.dtsi => imx8mp-venice-gw75xx.dtsi} | 0 + .../boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 10 + + .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 10 + + .../boot/dts/freescale/imx8mp-verdin-mallow.dtsi | 10 + + .../boot/dts/freescale/imx8mp-verdin-wifi.dtsi | 1 - + .../boot/dts/freescale/imx8mp-verdin-yavia.dtsi | 10 + + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 8 + + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 67 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 24 +- + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 284 +- + arch/arm64/boot/dts/freescale/imx8qm-ss-lvds.dtsi | 76 + + arch/arm64/boot/dts/freescale/imx8qm-ss-mipi.dtsi | 19 + + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 27 + + .../boot/dts/freescale/imx8x-colibri-aster.dtsi | 36 + + .../boot/dts/freescale/imx8x-colibri-eval-v3.dtsi | 36 + + .../boot/dts/freescale/imx8x-colibri-iris.dtsi | 36 + + arch/arm64/boot/dts/freescale/imx8x-colibri.dtsi | 212 +- + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 185 +- + arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts | 468 +++ + arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts | 2 - + .../boot/dts/freescale/imx93-kontron-bl-osm-s.dts | 163 + + .../boot/dts/freescale/imx93-kontron-osm-s.dtsi | 628 ++++ + .../dts/freescale/imx93-tqma9352-mba93xxca.dts | 301 +- + .../dts/freescale/imx93-tqma9352-mba93xxla.dts | 320 +- + arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi | 172 +- + arch/arm64/boot/dts/freescale/imx93.dtsi | 47 + + arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts | 340 ++ + arch/arm64/boot/dts/freescale/imx95.dtsi | 454 ++- + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 9 +- + .../boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi | 1 + + .../boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi | 1 + + .../boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi | 1 + + .../boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi | 1 + + .../boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi | 1 + + .../boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi | 1 + + .../boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi | 1 + + arch/arm64/boot/dts/freescale/s32g2.dtsi | 50 + + arch/arm64/boot/dts/freescale/s32g274a-evb.dts | 1 + + arch/arm64/boot/dts/freescale/s32g274a-rdb2.dts | 1 + + arch/arm64/boot/dts/freescale/s32g3.dtsi | 52 +- + arch/arm64/boot/dts/freescale/s32g399a-rdb3.dts | 3 +- + arch/arm64/boot/dts/freescale/s32v234.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt6357.dtsi | 5 + + arch/arm64/boot/dts/mediatek/mt6358.dtsi | 5 + + arch/arm64/boot/dts/mediatek/mt6359.dtsi | 5 + + arch/arm64/boot/dts/mediatek/mt7981b.dtsi | 42 + + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 13 +- + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 26 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 13 +- + arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi | 5 +- + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 345 +- + arch/arm64/boot/dts/mediatek/mt8188.dtsi | 482 +++ + .../boot/dts/mediatek/mt8195-cherry-dojo-r1.dts | 11 +- + .../boot/dts/mediatek/mt8195-cherry-tomato-r2.dts | 11 +- + .../boot/dts/mediatek/mt8195-cherry-tomato-r3.dts | 11 +- + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 6 +- + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 15 +- + arch/arm64/boot/dts/mediatek/mt8365-evk.dts | 86 + + arch/arm64/boot/dts/mediatek/mt8365.dtsi | 43 +- + .../boot/dts/mediatek/mt8395-genio-1200-evk.dts | 2 - + .../dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts | 1 + + .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 2 + + arch/arm64/boot/dts/nuvoton/ma35d1-iot-512m.dts | 80 +- + arch/arm64/boot/dts/nuvoton/ma35d1-som-256m.dts | 83 +- + arch/arm64/boot/dts/nuvoton/ma35d1.dtsi | 151 +- + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 64 + + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 53 +- + .../arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi | 135 - + .../arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi | 142 +- + arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi | 125 + + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 108 +- + .../arm64/boot/dts/nvidia/tegra234-p3737-0000.dtsi | 90 - + .../dts/nvidia/tegra234-p3740-0002+p3701-0008.dts | 230 +- + .../arm64/boot/dts/nvidia/tegra234-p3740-0002.dtsi | 215 -- + .../dts/nvidia/tegra234-p3768-0000+p3767-0000.dts | 17 - + .../boot/dts/nvidia/tegra234-p3768-0000+p3767.dtsi | 26 + + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 33 + + arch/arm64/boot/dts/qcom/Makefile | 10 + + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 7 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 2 +- + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 2 +- + .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 27 + + .../dts/qcom/msm8916-samsung-fortuna-common.dtsi | 2 + + .../boot/dts/qcom/msm8916-samsung-grandmax.dts | 24 +- + arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts | 1 + + .../boot/dts/qcom/msm8916-samsung-j3-common.dtsi | 62 + + .../boot/dts/qcom/msm8916-samsung-j3ltetw.dts | 31 + + arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts | 20 + + .../boot/dts/qcom/msm8916-wingtech-wt86518.dts | 87 + + .../boot/dts/qcom/msm8916-wingtech-wt86528.dts | 158 + + .../boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi | 215 ++ + arch/arm64/boot/dts/qcom/msm8916.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8929-pm8916.dtsi | 162 + + .../boot/dts/qcom/msm8929-wingtech-wt82918hd.dts | 17 + + arch/arm64/boot/dts/qcom/msm8929.dtsi | 7 + + .../boot/dts/qcom/msm8939-longcheer-l9100.dts | 27 + + arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts | 2 +- + .../boot/dts/qcom/msm8939-wingtech-wt82918.dts | 17 + + .../boot/dts/qcom/msm8939-wingtech-wt82918.dtsi | 252 ++ + .../boot/dts/qcom/msm8939-wingtech-wt82918hd.dts | 17 + + arch/arm64/boot/dts/qcom/msm8939.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8953.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8976.dtsi | 7 +- + arch/arm64/boot/dts/qcom/msm8992-lg-h815.dts | 231 ++ + arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 29 +- + arch/arm64/boot/dts/qcom/pm8950.dtsi | 10 +- + arch/arm64/boot/dts/qcom/pmi8950.dtsi | 3 +- + arch/arm64/boot/dts/qcom/pmi8994.dtsi | 3 + + arch/arm64/boot/dts/qcom/qcm2290.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 33 + + arch/arm64/boot/dts/qcom/qcs404.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sa8155p.dtsi | 4 + + arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 83 + + arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi | 25 + + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 1006 +++++ + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 38 + + arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi | 18 +- + arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 64 + + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 181 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 16 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 83 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdx75-idp.dts | 6 + + arch/arm64/boot/dts/qcom/sdx75.dtsi | 65 +- + arch/arm64/boot/dts/qcom/sm4450.dtsi | 38 + + arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 343 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm7125-xiaomi-common.dtsi | 2 + + arch/arm64/boot/dts/qcom/sm8150-mtp.dts | 5 - + arch/arm64/boot/dts/qcom/sm8150.dtsi | 13 + + arch/arm64/boot/dts/qcom/sm8250.dtsi | 31 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 16 +- + arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 113 +- + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 26 +- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 252 ++ + arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 26 +- + arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 28 +- + arch/arm64/boot/dts/qcom/sm8650.dtsi | 291 ++ + .../dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts | 807 ++++ + .../boot/dts/qcom/x1e80100-asus-vivobook-s15.dts | 4 - + arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 96 + + .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 21 +- + .../boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 835 +++++ + .../boot/dts/qcom/x1e80100-microsoft-romulus13.dts | 13 + + .../boot/dts/qcom/x1e80100-microsoft-romulus15.dts | 13 + + arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi | 10 + + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 14 +- + arch/arm64/boot/dts/qcom/x1e80100.dtsi | 484 ++- + arch/arm64/boot/dts/renesas/Makefile | 5 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 6 + + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 26 + + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 3 + + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 8 + + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 22 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 2 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 128 +- + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 207 +- + .../dts/renesas/r8a779g2-white-hawk-single.dts | 51 + + .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts | 212 ++ + arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 147 +- + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 4 + + arch/arm64/boot/dts/renesas/r9a07g043u.dtsi | 53 +- + .../dts/renesas/r9a07g043u11-smarc-du-adv7513.dtso | 62 + + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 8 +- + arch/arm64/boot/dts/renesas/r9a07g044c2-smarc.dts | 3 + + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 8 +- + arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 130 +- + arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 513 +++ + .../boot/dts/renesas/r9a09g057h44-rzv2h-evk.dts | 256 ++ + arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi | 3 - + .../boot/dts/renesas/rz-smarc-du-adv7513.dtsi | 76 + + .../boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi | 6 + + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 86 +- + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 30 + + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 43 +- + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 33 + + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 86 +- + arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 5 + + arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 7 + + .../boot/dts/renesas/white-hawk-cpu-common.dtsi | 18 + + arch/arm64/boot/dts/rockchip/Makefile | 9 + + .../boot/dts/rockchip/px30-firefly-jd4-core-mb.dts | 179 + + .../boot/dts/rockchip/px30-firefly-jd4-core.dtsi | 320 ++ + .../boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts | 32 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 20 + + arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 3019 +++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3399-eaidk-610.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-evb.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-gru.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-hugsun-x99.dts | 1 - + .../boot/dts/rockchip/rk3399-khadas-edge.dtsi | 1 - + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-leez-p710.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-nanopi4.dtsi | 1 - + .../{rk3399-op1-opp.dtsi => rk3399-op1.dtsi} | 2 + + arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi | 133 - + arch/arm64/boot/dts/rockchip/rk3399-orangepi.dts | 1 - + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 5 +- + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-puma.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 1 - + .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 49 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-4se.dts | 17 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 2 - + .../boot/dts/rockchip/rk3399-rock-pi-4a-plus.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4a.dts | 2 +- + .../boot/dts/rockchip/rk3399-rock-pi-4b-plus.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4b.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4c.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-rock960.dtsi | 3 +- + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3399-sapphire.dtsi | 1 - + .../rockchip/{rk3399-t-opp.dtsi => rk3399-t.dtsi} | 2 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 3084 +--------------- + .../boot/dts/rockchip/rk3399pro-rock-pi-n10.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3566-lckfb-tspi.dts | 725 ++++ + arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts | 663 ++++ + arch/arm64/boot/dts/rockchip/rk3566-quartz64-b.dts | 2 + + .../boot/dts/rockchip/rk3566-radxa-zero-3.dtsi | 1 - + .../boot/dts/rockchip/rk3568-fastrhino-r66s.dts | 2 +- + .../boot/dts/rockchip/rk3568-fastrhino-r68s.dts | 18 +- + arch/arm64/boot/dts/rockchip/rk3568-mecsbc.dts | 14 + + arch/arm64/boot/dts/rockchip/rk3568-odroid-m1.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3568-qnap-ts433.dts | 571 ++- + .../arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 4 - + arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 4 + + .../rockchip/rk3568-wolfvision-pf5-display-vz.dtso | 17 + + .../rockchip/rk3568-wolfvision-pf5-display.dtsi | 121 + + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 43 + + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 9 + + .../boot/dts/rockchip/rk3588-base-pinctrl.dtsi | 10 +- + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 112 + + .../dts/rockchip/rk3588-coolpi-cm5-genbook.dts | 349 ++ + .../boot/dts/rockchip/rk3588-nanopc-t6-lts.dts | 60 + + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 909 +---- + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 1041 ++++++ + .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 7 + + .../boot/dts/rockchip/rk3588s-gameforce-ace.dts | 1237 +++++++ + arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts | 903 +++++ + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 54 +- + arch/arm64/boot/dts/sprd/sc2731.dtsi | 5 +- + arch/arm64/boot/dts/sprd/sc9836-openphone.dts | 3 +- + arch/arm64/boot/dts/sprd/sc9836.dtsi | 3 +- + arch/arm64/boot/dts/sprd/sc9860.dtsi | 3 +- + arch/arm64/boot/dts/sprd/sc9863a.dtsi | 8 +- + arch/arm64/boot/dts/sprd/sharkl64.dtsi | 3 +- + arch/arm64/boot/dts/sprd/sp9860g-1h10.dts | 3 +- + arch/arm64/boot/dts/sprd/ums512.dtsi | 4 +- + arch/arm64/boot/dts/sprd/whale2.dtsi | 43 +- + arch/arm64/boot/dts/ti/Makefile | 7 + + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am62-thermal.dtsi | 34 + + arch/arm64/boot/dts/ti/k3-am625.dtsi | 4 + + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 18 + + arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi | 8 + + arch/arm64/boot/dts/ti/k3-am62a.dtsi | 2 + + .../boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 3 +- + .../boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62p-main.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 2 - + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 3 +- + arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi | 6 +- + arch/arm64/boot/dts/ti/k3-am642-evm-nand.dtso | 6 +- + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 7 + + .../boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 146 + + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 3 + + arch/arm64/boot/dts/ti/k3-am642-sr-som.dtsi | 6 +- + .../boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts | 104 +- + .../boot/dts/ti/k3-am65-iot2050-common-pg2.dtsi | 5 - + arch/arm64/boot/dts/ti/k3-am65-iot2050-common.dtsi | 51 + + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 12 +- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 16 +- + arch/arm64/boot/dts/ti/k3-am65.dtsi | 12 +- + arch/arm64/boot/dts/ti/k3-am6528-iot2050-basic.dts | 5 - + arch/arm64/boot/dts/ti/k3-am654-idk.dtso | 69 +- + ...-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtso | 27 + + .../k3-am6548-iot2050-advanced-m2-bkey-usb3.dtso | 47 + + arch/arm64/boot/dts/ti/k3-am67a-beagley-ai.dts | 393 ++ + arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 1 + + arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi | 37 +- + arch/arm64/boot/dts/ti/k3-am69-sk.dts | 53 + + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 21 +- + arch/arm64/boot/dts/ti/k3-j721e-beagleboneai64.dts | 4 +- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 10 +- + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 41 +- + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 37 + + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 8 +- + .../boot/dts/ti/k3-j721s2-evm-gesi-exp-board.dtso | 2 +- + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 37 +- + arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 8 +- + arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 246 ++ + arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 62 + + arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 58 +- + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 38 +- + arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 14 +- + arch/arm64/boot/dts/ti/k3-j784s4.dtsi | 8 +- + arch/arm64/boot/dts/toshiba/tmpv7708.dtsi | 44 +- + arch/arm64/configs/defconfig | 10 + + arch/loongarch/Kconfig | 1 + + arch/loongarch/include/asm/cpu-features.h | 1 + + arch/loongarch/include/asm/cpu.h | 2 + + arch/loongarch/include/asm/hardirq.h | 3 +- + arch/loongarch/include/asm/irq.h | 29 +- + arch/loongarch/include/asm/loongarch.h | 18 +- + arch/loongarch/include/asm/smp.h | 2 + + arch/loongarch/kernel/cpu-probe.c | 3 +- + arch/loongarch/kernel/irq.c | 12 + + arch/loongarch/kernel/paravirt.c | 5 + + arch/loongarch/kernel/smp.c | 6 + + arch/m68k/configs/amiga_defconfig | 2 - + arch/m68k/configs/apollo_defconfig | 2 - + arch/m68k/configs/atari_defconfig | 2 - + arch/m68k/configs/bvme6000_defconfig | 2 - + arch/m68k/configs/hp300_defconfig | 2 - + arch/m68k/configs/mac_defconfig | 2 - + arch/m68k/configs/multi_defconfig | 2 - + arch/m68k/configs/mvme147_defconfig | 2 - + arch/m68k/configs/mvme16x_defconfig | 2 - + arch/m68k/configs/q40_defconfig | 2 - + arch/m68k/configs/sun3_defconfig | 2 - + arch/m68k/configs/sun3x_defconfig | 2 - + arch/m68k/include/asm/cmpxchg.h | 15 +- + arch/m68k/kernel/process.c | 2 +- + arch/m68k/q40/q40ints.c | 2 +- + arch/mips/kernel/smp.c | 2 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/riscv/boot/dts/sophgo/cv1812h-huashan-pi.dts | 9 + + arch/riscv/boot/dts/sophgo/cv18xx.dtsi | 16 + + .../riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts | 77 + + arch/riscv/boot/dts/sophgo/sg2042.dtsi | 148 +- + arch/riscv/boot/dts/thead/th1520-beaglev-ahead.dts | 17 +- + .../boot/dts/thead/th1520-lichee-module-4a.dtsi | 12 - + arch/riscv/boot/dts/thead/th1520-lichee-pi-4a.dts | 5 + + arch/riscv/boot/dts/thead/th1520.dtsi | 83 +- + arch/riscv/configs/defconfig | 7 + + arch/x86/Kconfig | 1 + + arch/x86/include/asm/apic.h | 46 +- + arch/x86/include/asm/bug.h | 12 + + arch/x86/include/asm/entry-common.h | 13 +- + arch/x86/include/asm/extable.h | 1 - + arch/x86/include/asm/fpu/signal.h | 2 +- + arch/x86/include/asm/fred.h | 23 +- + arch/x86/include/asm/hardirq.h | 8 +- + arch/x86/include/asm/idtentry.h | 6 +- + arch/x86/include/asm/irq_vectors.h | 4 +- + arch/x86/include/asm/mmu_context.h | 8 +- + arch/x86/include/asm/msr.h | 25 +- + arch/x86/include/asm/mtrr.h | 2 - + arch/x86/include/asm/pgtable_types.h | 2 - + arch/x86/include/asm/processor.h | 3 +- + arch/x86/include/asm/switch_to.h | 6 +- + arch/x86/include/asm/syscall.h | 7 +- + arch/x86/include/asm/tlbflush.h | 9 +- + arch/x86/include/asm/uv/uv_irq.h | 1 - + arch/x86/include/uapi/asm/elf.h | 16 + + arch/x86/kernel/Makefile | 8 + + arch/x86/kernel/amd_nb.c | 7 + + arch/x86/kernel/apic/apic.c | 81 +- + arch/x86/kernel/apic/apic_flat_64.c | 119 +- + arch/x86/kernel/apic/io_apic.c | 747 ++-- + arch/x86/kernel/cpu/common.c | 22 +- + arch/x86/kernel/cpu/cpuid-deps.c | 1 - + arch/x86/kernel/cpu/feat_ctl.c | 2 +- + arch/x86/kernel/cpu/mce/dev-mcelog.c | 2 +- + arch/x86/kernel/cpu/mshyperv.c | 11 - + arch/x86/kernel/cpu/sgx/main.c | 2 +- + arch/x86/kernel/eisa.c | 8 +- + arch/x86/kernel/fpu/signal.c | 27 +- + arch/x86/kernel/fpu/xstate.c | 102 + + arch/x86/kernel/fpu/xstate.h | 2 + + arch/x86/kernel/fred.c | 45 +- + arch/x86/kernel/head64.c | 3 +- + arch/x86/kernel/i8253.c | 11 +- + arch/x86/kernel/machine_kexec_64.c | 27 + + arch/x86/kernel/mpparse.c | 13 +- + arch/x86/kernel/process_64.c | 42 +- + arch/x86/kernel/relocate_kernel_64.S | 10 +- + arch/x86/kernel/setup.c | 7 +- + arch/x86/kernel/signal.c | 29 +- + arch/x86/kernel/signal_64.c | 6 +- + arch/x86/kernel/smpboot.c | 2 +- + arch/x86/kernel/traps.c | 87 +- + arch/x86/kernel/tsc.c | 10 +- + arch/x86/mm/cpu_entry_area.c | 2 +- + arch/x86/mm/ident_map.c | 23 +- + arch/x86/mm/ioremap.c | 3 +- + arch/x86/mm/srat.c | 6 +- + arch/x86/mm/tlb.c | 19 +- + block/blk-mq.c | 2 +- + drivers/base/regmap/regcache-flat.c | 2 +- + drivers/base/regmap/regcache-maple.c | 2 +- + drivers/base/regmap/regcache-rbtree.c | 2 +- + drivers/base/regmap/regcache.c | 4 + + drivers/base/regmap/regmap-irq.c | 37 +- + drivers/base/regmap/regmap-kunit.c | 19 +- + drivers/base/regmap/regmap.c | 1 + + drivers/bus/Kconfig | 2 +- + drivers/bus/arm-integrator-lm.c | 1 + + drivers/bus/imx-weim.c | 14 +- + drivers/bus/sunxi-rsb.c | 34 +- + drivers/bus/ti-sysc.c | 7 +- + drivers/char/ipmi/ipmi_ssif.c | 2 +- + drivers/clocksource/acpi_pm.c | 32 + + drivers/clocksource/arm_arch_timer.c | 11 +- + drivers/clocksource/asm9260_timer.c | 1 + + drivers/clocksource/i8253.c | 53 +- + drivers/clocksource/ingenic-ost.c | 7 +- + drivers/clocksource/jcore-pit.c | 7 +- + drivers/clocksource/timer-cadence-ttc.c | 6 +- + drivers/clocksource/timer-qcom.c | 7 +- + drivers/dma-buf/st-dma-fence.c | 2 +- + drivers/firmware/arm_ffa/driver.c | 240 +- + drivers/firmware/arm_scmi/Kconfig | 120 +- + drivers/firmware/arm_scmi/Makefile | 14 +- + drivers/firmware/arm_scmi/base.c | 6 +- + drivers/firmware/arm_scmi/clock.c | 1 + + drivers/firmware/arm_scmi/common.h | 206 +- + drivers/firmware/arm_scmi/driver.c | 241 +- + drivers/firmware/arm_scmi/msg.c | 32 +- + drivers/firmware/arm_scmi/perf.c | 2 +- + drivers/firmware/arm_scmi/pinctrl.c | 1 + + drivers/firmware/arm_scmi/power.c | 2 +- + drivers/firmware/arm_scmi/reset.c | 2 +- + drivers/firmware/arm_scmi/sensors.c | 2 +- + drivers/firmware/arm_scmi/shmem.c | 85 +- + drivers/firmware/arm_scmi/system.c | 2 +- + drivers/firmware/arm_scmi/transports/Kconfig | 123 + + drivers/firmware/arm_scmi/transports/Makefile | 16 + + .../firmware/arm_scmi/{ => transports}/mailbox.c | 84 +- + drivers/firmware/arm_scmi/{ => transports}/optee.c | 131 +- + drivers/firmware/arm_scmi/{ => transports}/smc.c | 62 +- + .../firmware/arm_scmi/{ => transports}/virtio.c | 103 +- + drivers/firmware/arm_scmi/vendors/imx/Kconfig | 25 + + drivers/firmware/arm_scmi/vendors/imx/Makefile | 3 + + drivers/firmware/arm_scmi/vendors/imx/imx-sm-bbm.c | 383 ++ + .../firmware/arm_scmi/vendors/imx/imx-sm-misc.c | 318 ++ + drivers/firmware/arm_scmi/vendors/imx/imx95.rst | 886 +++++ + drivers/firmware/arm_scmi/voltage.c | 6 +- + drivers/firmware/imx/Kconfig | 11 + + drivers/firmware/imx/Makefile | 1 + + drivers/firmware/imx/sm-misc.c | 119 + + drivers/firmware/qcom/Kconfig | 11 - + drivers/firmware/qcom/qcom_scm.c | 72 +- + drivers/firmware/raspberrypi.c | 3 +- + drivers/firmware/tegra/bpmp.c | 20 +- + drivers/firmware/turris-mox-rwtm.c | 386 +- + .../gpu/drm/bridge/synopsys/dw-hdmi-ahb-audio.c | 30 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 4 +- + drivers/gpu/drm/i915/i915_utils.c | 2 +- + drivers/gpu/drm/v3d/v3d_bo.c | 2 +- + drivers/hwmon/k10temp.c | 1 + + drivers/input/keyboard/Kconfig | 11 + + drivers/input/keyboard/Makefile | 1 + + drivers/input/keyboard/imx-sm-bbm-key.c | 225 ++ + drivers/iommu/intel/irq_remapping.c | 11 +- + drivers/irqchip/Kconfig | 1 + + drivers/irqchip/Makefile | 2 +- + drivers/irqchip/irq-apple-aic.c | 59 +- + drivers/irqchip/irq-armada-370-xp.c | 865 ++--- + drivers/irqchip/irq-atmel-aic.c | 3 +- + drivers/irqchip/irq-atmel-aic5.c | 3 +- + drivers/irqchip/irq-clps711x.c | 2 +- + drivers/irqchip/irq-davinci-cp-intc.c | 3 +- + drivers/irqchip/irq-ftintc010.c | 2 +- + drivers/irqchip/irq-gic-v3.c | 2 +- + drivers/irqchip/irq-gic-v4.c | 2 +- + drivers/irqchip/irq-ixp4xx.c | 3 +- + drivers/irqchip/irq-loongarch-avec.c | 425 +++ + drivers/irqchip/irq-loongarch-cpu.c | 7 +- + drivers/irqchip/irq-loongson-eiointc.c | 9 +- + drivers/irqchip/irq-loongson-htvec.c | 2 + + drivers/irqchip/irq-loongson-liointc.c | 2 + + drivers/irqchip/irq-loongson-pch-lpc.c | 2 + + drivers/irqchip/irq-loongson-pch-msi.c | 83 +- + drivers/irqchip/irq-loongson-pch-pic.c | 2 + + drivers/irqchip/irq-loongson.h | 27 + + drivers/irqchip/irq-mbigen.c | 24 +- + drivers/irqchip/irq-omap-intc.c | 3 +- + drivers/irqchip/irq-sa11x0.c | 3 +- + drivers/irqchip/irq-versatile-fpga.c | 2 +- + drivers/isdn/mISDN/dsp_cmx.c | 2 +- + drivers/memory/atmel-ebi.c | 35 +- + drivers/memory/emif.c | 31 +- + drivers/memory/mtk-smi.c | 6 +- + drivers/memory/omap-gpmc.c | 24 +- + drivers/memory/pl172.c | 58 +- + drivers/memory/pl353-smc.c | 57 +- + drivers/memory/renesas-rpc-if.c | 2 +- + drivers/memory/samsung/exynos5422-dmc.c | 90 +- + drivers/memory/stm32-fmc2-ebi.c | 23 +- + drivers/memory/tegra/mc.c | 11 +- + drivers/memory/tegra/tegra124-emc.c | 7 +- + drivers/memory/tegra/tegra186-emc.c | 5 - + drivers/memory/tegra/tegra20-emc.c | 7 +- + drivers/memory/tegra/tegra210-emc-cc-r21021.c | 455 +-- + drivers/memory/tegra/tegra30-emc.c | 7 +- + drivers/memory/ti-aemif.c | 74 +- + drivers/mfd/axp20x.c | 2 + + drivers/net/ethernet/marvell/mvmdio.c | 2 +- + drivers/platform/cznic/turris-omnia-mcu-trng.c | 4 +- + drivers/platform/olpc/olpc-xo175-ec.c | 4 +- + drivers/platform/x86/intel/pmc/adl.c | 2 + + drivers/platform/x86/intel/pmc/cnp.c | 2 + + drivers/platform/x86/intel/pmc/core.c | 45 + + drivers/platform/x86/intel/pmc/core.h | 8 + + drivers/platform/x86/intel/pmc/icl.c | 2 + + drivers/platform/x86/intel/pmc/mtl.c | 2 + + drivers/platform/x86/intel/pmc/spt.c | 2 + + drivers/platform/x86/intel/pmc/tgl.c | 2 + + drivers/regulator/Kconfig | 7 - + drivers/regulator/Makefile | 1 - + drivers/regulator/act8865-regulator.c | 4 +- + drivers/regulator/axp20x-regulator.c | 4 + + drivers/regulator/bd718x7-regulator.c | 19 +- + drivers/regulator/bd9576-regulator.c | 8 +- + drivers/regulator/bd96801-regulator.c | 19 +- + drivers/regulator/core.c | 316 +- + drivers/regulator/da903x-regulator.c | 2 +- + drivers/regulator/da9052-regulator.c | 22 +- + drivers/regulator/da9055-regulator.c | 28 +- + drivers/regulator/da9063-regulator.c | 4 +- + drivers/regulator/da9121-regulator.c | 20 +- + drivers/regulator/da9211-regulator.c | 2 +- + drivers/regulator/devres.c | 18 +- + drivers/regulator/fan53555.c | 2 +- + drivers/regulator/fixed-helper.c | 2 + + drivers/regulator/fixed.c | 8 +- + drivers/regulator/helpers.c | 8 +- + drivers/regulator/hi6421-regulator.c | 14 +- + drivers/regulator/hi6421v530-regulator.c | 27 +- + drivers/regulator/hi6421v600-regulator.c | 10 +- + drivers/regulator/internal.h | 13 +- + drivers/regulator/irq_helpers.c | 17 +- + drivers/regulator/max5970-regulator.c | 2 +- + drivers/regulator/max77650-regulator.c | 31 +- + drivers/regulator/max77802-regulator.c | 4 +- + drivers/regulator/max77826-regulator.c | 4 +- + drivers/regulator/max77857-regulator.c | 2 +- + drivers/regulator/max8973-regulator.c | 7 +- + drivers/regulator/max8997-regulator.c | 16 +- + drivers/regulator/mcp16502.c | 17 +- + drivers/regulator/mp5416.c | 4 +- + drivers/regulator/mt6357-regulator.c | 2 +- + drivers/regulator/mtk-dvfsrc-regulator.c | 10 +- + drivers/regulator/of_regulator.c | 150 +- + drivers/regulator/pcap-regulator.c | 12 +- + drivers/regulator/pfuze100-regulator.c | 10 +- + drivers/regulator/qcom-refgen-regulator.c | 4 +- + drivers/regulator/qcom-rpmh-regulator.c | 17 +- + drivers/regulator/qcom_smd-regulator.c | 13 +- + drivers/regulator/qcom_spmi-regulator.c | 12 +- + drivers/regulator/rt5120-regulator.c | 4 +- + drivers/regulator/s2mps11.c | 17 +- + drivers/regulator/s5m8767.c | 17 +- + drivers/regulator/scmi-regulator.c | 8 +- + drivers/regulator/sm5703-regulator.c | 170 - + drivers/regulator/tps6287x-regulator.c | 2 +- + drivers/regulator/tps65023-regulator.c | 6 +- + drivers/regulator/wm831x-isink.c | 8 +- + drivers/regulator/wm8400-regulator.c | 2 +- + drivers/reset/Kconfig | 13 + + drivers/reset/Makefile | 1 + + drivers/reset/core.c | 17 +- + drivers/reset/reset-berlin.c | 3 +- + drivers/reset/reset-eyeq.c | 570 +++ + drivers/reset/reset-k210.c | 3 +- + drivers/reset/reset-lpc18xx.c | 43 +- + drivers/reset/reset-meson.c | 6 + + drivers/rtc/Kconfig | 11 + + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-imx-sm-bbm.c | 162 + + drivers/soc/Makefile | 2 +- + drivers/soc/amlogic/meson-gx-socinfo.c | 10 + + drivers/soc/atmel/soc.c | 23 + + drivers/soc/atmel/soc.h | 9 + + drivers/soc/fsl/qbman/qman_ccsr.c | 2 - + drivers/soc/fsl/qbman/qman_portal.c | 5 +- + drivers/soc/fsl/qe/Kconfig | 17 +- + drivers/soc/fsl/qe/qe_common.c | 80 + + drivers/soc/fsl/qe/qmc.c | 663 +++- + drivers/soc/fsl/qe/tsa.c | 657 +++- + drivers/soc/fsl/qe/tsa.h | 3 + + drivers/soc/fsl/qe/ucc.c | 1 + + drivers/soc/mediatek/mtk-mutex.c | 52 +- + drivers/soc/mediatek/mtk-pmic-wrap.c | 118 +- + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/apr.c | 5 +- + drivers/soc/qcom/icc-bwmon.c | 6 +- + drivers/soc/qcom/ice.c | 14 +- + drivers/soc/qcom/llcc-qcom.c | 32 +- + drivers/soc/qcom/ocmem.c | 7 +- + drivers/soc/qcom/qcom-pbs.c | 16 +- + drivers/soc/qcom/qcom_aoss.c | 8 +- + drivers/soc/qcom/qcom_pd_mapper.c | 15 + + drivers/soc/qcom/smd-rpm.c | 41 +- + drivers/soc/qcom/smp2p.c | 25 +- + drivers/soc/qcom/socinfo.c | 4 + + drivers/soc/qcom/trace-smp2p.h | 98 + + drivers/soc/qcom/trace_icc-bwmon.h | 48 + + drivers/soc/rockchip/grf.c | 32 +- + drivers/soc/rockchip/io-domain.c | 40 + + drivers/soc/tegra/pmc.c | 12 +- + drivers/soc/ti/k3-ringacc.c | 12 +- + drivers/soc/ti/knav_dma.c | 22 +- + drivers/soc/ti/knav_qmss_queue.c | 105 +- + drivers/soc/ti/pm33xx.c | 52 +- + drivers/soc/ti/pruss.c | 176 +- + drivers/soc/versatile/Kconfig | 4 +- + drivers/soc/versatile/soc-integrator.c | 1 + + drivers/soc/versatile/soc-realview.c | 20 +- + drivers/soundwire/intel.h | 7 + + drivers/soundwire/intel_ace2x.c | 20 + + drivers/soundwire/intel_auxdevice.c | 14 + + drivers/spi/Kconfig | 2 +- + drivers/spi/atmel-quadspi.c | 31 +- + drivers/spi/spi-axi-spi-engine.c | 17 +- + drivers/spi/spi-bcm63xx.c | 9 +- + drivers/spi/spi-bcmbca-hsspi.c | 25 +- + drivers/spi/spi-bitbang.c | 24 + + drivers/spi/spi-cadence-quadspi.c | 9 +- + drivers/spi/spi-cadence-xspi.c | 692 +++- + drivers/spi/spi-davinci.c | 8 +- + drivers/spi/spi-geni-qcom.c | 63 +- + drivers/spi/spi-gpio.c | 12 +- + drivers/spi/spi-meson-spicc.c | 22 +- + drivers/spi/spi-mt65xx.c | 40 +- + drivers/spi/spi-mxs.c | 11 +- + drivers/spi/spi-nxp-fspi.c | 57 +- + drivers/spi/spi-ppc4xx.c | 22 +- + drivers/spi/spi-rpc-if.c | 7 + + drivers/spi/spi-s3c64xx.c | 1 + + drivers/spi/spi-slave-mt27xx.c | 12 +- + drivers/spi/spi-slave-system-control.c | 2 +- + drivers/spi/spi-slave-time.c | 2 +- + drivers/spi/spi-wpcm-fiu.c | 17 +- + drivers/spi/spi-zynq-qspi.c | 2 +- + drivers/spi/spi-zynqmp-gqspi.c | 32 +- + drivers/spi/spi.c | 27 +- + drivers/spi/spidev.c | 2 +- + drivers/tty/serial/8250/8250_core.c | 6 +- + drivers/tty/serial/amba-pl011.c | 2 +- + drivers/tty/serial/serial_core.c | 16 +- + drivers/tty/tty_io.c | 2 +- + fs/binfmt_elf.c | 4 +- + fs/proc/base.c | 15 +- + fs/proc/consoles.c | 7 +- + fs/select.c | 11 +- + fs/signalfd.c | 4 +- + fs/xfs/xfs_buf.h | 2 +- + include/dt-bindings/arm/qcom,ids.h | 4 + + include/dt-bindings/clock/exynos7885.h | 32 +- + include/dt-bindings/clock/exynos850.h | 1 + + include/dt-bindings/clock/qcom,gcc-msm8998.h | 5 + + include/dt-bindings/clock/qcom,gcc-sc8180x.h | 4 + + include/dt-bindings/clock/qcom,sm4450-camcc.h | 106 + + include/dt-bindings/clock/qcom,sm4450-dispcc.h | 51 + + include/dt-bindings/clock/qcom,sm4450-gpucc.h | 62 + + include/dt-bindings/clock/qcom,sm8150-camcc.h | 135 + + include/dt-bindings/clock/qcom,sm8650-dispcc.h | 103 +- + include/dt-bindings/clock/renesas,r9a09g057-cpg.h | 21 + + include/dt-bindings/clock/samsung,exynosautov9.h | 11 + + include/dt-bindings/clock/samsung,exynosautov920.h | 191 + + include/dt-bindings/interconnect/qcom,ipq5332.h | 46 + + include/dt-bindings/mailbox/qcom-ipcc.h | 2 + + include/dt-bindings/soc/qe-fsl,tsa.h | 13 + + include/kunit/visibility.h | 1 + + include/linux/acpi_pmtmr.h | 13 + + include/linux/arm_ffa.h | 12 + + include/linux/console.h | 158 +- + include/linux/cpuhotplug.h | 3 +- + include/linux/firmware/imx/sm.h | 23 + + include/linux/i8253.h | 2 +- + include/linux/interrupt.h | 6 +- + include/linux/ioremap.h | 1 + + include/linux/irq.h | 6 - + include/linux/irqdomain.h | 8 + + include/linux/jiffies.h | 2 +- + include/linux/mfd/axp20x.h | 3 + + include/linux/omap-gpmc.h | 10 - + include/linux/pci_ids.h | 1 + + include/linux/platform_data/ti-aemif.h | 45 - + include/linux/posix-timers.h | 2 +- + include/linux/printk.h | 33 +- + include/linux/regmap.h | 4 + + include/linux/sched/signal.h | 7 +- + include/linux/scmi_imx_protocol.h | 59 + + include/linux/serial_core.h | 117 +- + include/linux/smp.h | 2 +- + include/linux/soundwire/sdw_intel.h | 8 + + include/linux/spi/spi.h | 12 +- + include/linux/spi/spi_bitbang.h | 1 + + include/linux/timekeeper_internal.h | 2 +- + include/linux/ubsan.h | 5 + + include/soc/fsl/qe/qe.h | 23 +- + include/sound/aci.h | 1 + + include/sound/asoundef.h | 6 +- + include/sound/control.h | 27 +- + include/sound/core.h | 69 +- + include/sound/cs35l56.h | 6 +- + include/sound/es1688.h | 1 + + include/sound/memalloc.h | 7 +- + include/sound/pcm.h | 49 +- + include/sound/seq_kernel.h | 4 - + include/sound/snd_wavefront.h | 4 - + include/sound/soc-acpi-intel-match.h | 2 + + include/sound/soc-acpi.h | 6 +- + include/sound/soc-card.h | 2 - + include/sound/soc-component.h | 3 - + include/sound/soc-dai.h | 6 +- + include/sound/soc-dpcm.h | 19 - + include/sound/soc.h | 7 +- + include/sound/soc_sdw_utils.h | 247 ++ + include/sound/soundfont.h | 6 +- + include/sound/tas2563-tlv.h | 279 ++ + include/sound/tas2781-tlv.h | 260 -- + include/sound/tas2781.h | 71 +- + include/sound/ump.h | 12 + + include/sound/vx_core.h | 1 - + include/trace/events/asoc.h | 3 +- + include/uapi/linux/elf.h | 1 + + include/uapi/linux/spi/spi.h | 5 +- + include/uapi/sound/asequencer.h | 2 + + include/uapi/sound/asound.h | 17 +- + init/init_task.c | 2 +- + kernel/cpu.c | 22 +- + kernel/fork.c | 2 +- + kernel/irq/chip.c | 2 +- + kernel/irq/cpuhotplug.c | 4 +- + kernel/irq/irq_sim.c | 1 - + kernel/irq/irqdomain.c | 210 +- + kernel/irq/manage.c | 21 +- + kernel/irq/migration.c | 4 +- + kernel/irq/msi.c | 2 +- + kernel/irq/proc.c | 17 +- + kernel/kcov.c | 31 + + kernel/locking/lockdep.c | 83 +- + kernel/module/Makefile | 2 +- + kernel/panic.c | 9 + + kernel/printk/internal.h | 207 +- + kernel/printk/nbcon.c | 936 ++++- + kernel/printk/printk.c | 714 +++- + kernel/printk/printk_ringbuffer.h | 7 +- + kernel/printk/printk_safe.c | 25 +- + kernel/rcu/tiny.c | 2 +- + kernel/rcu/tree.c | 2 +- + kernel/rcu/tree_exp.h | 7 + + kernel/rcu/tree_stall.h | 9 + + kernel/sched/fair.c | 2 +- + kernel/sched/syscalls.c | 8 + + kernel/signal.c | 34 +- + kernel/softirq.c | 15 +- + kernel/sys.c | 2 + + kernel/time/alarmtimer.c | 9 +- + kernel/time/clockevents.c | 2 +- + kernel/time/clocksource.c | 45 +- + kernel/time/hrtimer.c | 24 +- + kernel/time/ntp.c | 10 +- + kernel/time/ntp_internal.h | 4 +- + kernel/time/posix-cpu-timers.c | 215 +- + kernel/time/posix-timers.c | 73 +- + kernel/time/posix-timers.h | 3 +- + kernel/time/timekeeping.c | 4 +- + kernel/time/timer.c | 64 +- + lib/Kconfig.debug | 26 +- + lib/Kconfig.ubsan | 4 +- + lib/debugobjects.c | 27 +- + lib/irq_poll.c | 2 +- + lib/math/Makefile | 1 + + lib/math/tests/Makefile | 3 + + lib/math/tests/int_pow_kunit.c | 52 + + net/batman-adv/types.h | 2 +- + net/core/dev.c | 4 +- + scripts/checktransupdate.py | 212 +- + scripts/get_maintainer.pl | 17 +- + scripts/sphinx-pre-install | 2 - + sound/aoa/soundbus/i2sbus/core.c | 4 +- + sound/core/Kconfig | 19 +- + sound/core/compress_offload.c | 2 +- + sound/core/control.c | 212 +- + sound/core/control_compat.c | 47 +- + sound/core/control_led.c | 4 +- + sound/core/init.c | 2 +- + sound/core/memalloc.c | 214 +- + sound/core/memalloc_local.h | 16 - + sound/core/misc.c | 71 - + sound/core/oss/mixer_oss.c | 10 +- + sound/core/oss/pcm_plugin.h | 5 +- + sound/core/pcm.c | 6 + + sound/core/pcm_lib.c | 3 + + sound/core/pcm_memory.c | 68 +- + sound/core/pcm_misc.c | 18 +- + sound/core/pcm_native.c | 18 +- + sound/core/pcm_timer.c | 3 +- + sound/core/seq/oss/seq_oss_device.h | 4 - + sound/core/seq/seq_clientmgr.c | 26 +- + sound/core/seq/seq_ports.c | 5 + + sound/core/seq/seq_ports.h | 2 + + sound/core/seq/seq_queue.h | 1 - + sound/core/seq/seq_timer.h | 2 - + sound/core/seq/seq_ump_client.c | 79 +- + sound/core/seq/seq_ump_convert.c | 11 +- + sound/core/timer.c | 229 +- + sound/core/ump.c | 120 +- + sound/drivers/aloop.c | 7 +- + sound/drivers/dummy.c | 5 +- + sound/drivers/mpu401/mpu401.c | 16 +- + sound/drivers/mpu401/mpu401_uart.c | 31 +- + sound/drivers/mtpav.c | 14 +- + sound/drivers/mts64.c | 18 +- + sound/drivers/opl3/opl3_lib.c | 18 +- + sound/drivers/opl3/opl3_midi.c | 95 +- + sound/drivers/opl3/opl3_oss.c | 12 +- + sound/drivers/opl3/opl3_synth.c | 4 +- + sound/drivers/opl4/opl4_lib.c | 8 +- + sound/drivers/opl4/yrw801.c | 2 +- + sound/drivers/pcsp/pcsp.c | 21 +- + sound/drivers/pcsp/pcsp_lib.c | 38 +- + sound/drivers/pcsp/pcsp_mixer.c | 2 +- + sound/drivers/portman2x4.c | 19 +- + sound/drivers/serial-u16550.c | 41 +- + sound/drivers/virmidi.c | 8 +- + sound/drivers/vx/vx_core.c | 64 +- + sound/drivers/vx/vx_hwdep.c | 4 +- + sound/drivers/vx/vx_pcm.c | 23 +- + sound/drivers/vx/vx_uer.c | 3 +- + sound/hda/Kconfig | 5 +- + sound/hda/intel-dsp-config.c | 111 +- + sound/hda/intel-sdw-acpi.c | 5 +- + sound/i2c/cs8427.c | 37 +- + sound/i2c/other/ak4113.c | 2 - + sound/i2c/other/ak4114.c | 12 - + sound/i2c/other/ak4117.c | 13 - + sound/i2c/other/ak4xxx-adda.c | 2 - + sound/i2c/other/pt2258.c | 6 +- + sound/i2c/tea6330t.c | 3 - + sound/isa/ad1816a/ad1816a.c | 16 +- + sound/isa/ad1816a/ad1816a_lib.c | 16 +- + sound/isa/als100.c | 16 +- + sound/isa/azt2320.c | 14 +- + sound/isa/cmi8328.c | 42 +- + sound/isa/cmi8330.c | 36 +- + sound/isa/cs423x/cs4236.c | 31 +- + sound/isa/cs423x/cs4236_lib.c | 56 +- + sound/isa/es1688/es1688.c | 2 +- + sound/isa/es1688/es1688_lib.c | 55 +- + sound/isa/es18xx.c | 87 +- + sound/isa/gus/gus_dma.c | 37 +- + sound/isa/gus/gus_io.c | 215 +- + sound/isa/gus/gus_irq.c | 7 +- + sound/isa/gus/gus_main.c | 29 +- + sound/isa/gus/gus_mem.c | 2 +- + sound/isa/gus/gus_pcm.c | 33 +- + sound/isa/gus/gus_reset.c | 8 +- + sound/isa/gus/gus_uart.c | 21 +- + sound/isa/gus/gus_volume.c | 7 +- + sound/isa/gus/gusclassic.c | 4 +- + sound/isa/gus/gusextreme.c | 4 +- + sound/isa/gus/gusmax.c | 16 +- + sound/isa/gus/interwave.c | 61 +- + sound/isa/msnd/msnd.c | 46 +- + sound/isa/msnd/msnd_midi.c | 4 - + sound/isa/msnd/msnd_pinnacle.c | 184 +- + sound/isa/opl3sa2.c | 46 +- + sound/isa/opti9xx/miro.c | 163 +- + sound/isa/opti9xx/opti92x-ad1848.c | 62 +- + sound/isa/sb/emu8000.c | 11 +- + sound/isa/sb/emu8000_patch.c | 1 - + sound/isa/sb/emu8000_synth.c | 2 +- + sound/isa/sb/jazz16.c | 49 +- + sound/isa/sb/sb16.c | 42 +- + sound/isa/sb/sb16_csp.c | 38 +- + sound/isa/sb/sb16_main.c | 13 +- + sound/isa/sb/sb8.c | 12 +- + sound/isa/sb/sb_common.c | 27 +- + sound/isa/sb/sb_mixer.c | 4 +- + sound/isa/sc6000.c | 177 +- + sound/isa/sscape.c | 96 +- + sound/isa/wavefront/wavefront.c | 61 +- + sound/isa/wavefront/wavefront_fx.c | 36 +- + sound/isa/wavefront/wavefront_midi.c | 15 +- + sound/isa/wavefront/wavefront_synth.c | 196 +- + sound/isa/wss/wss_lib.c | 178 +- + sound/pci/ali5451/ali5451.c | 2 +- + sound/pci/asihpi/asihpi.c | 101 +- + sound/pci/asihpi/hpimsgx.c | 2 +- + sound/pci/asihpi/hpioctl.c | 2 +- + sound/pci/azt3328.c | 2 +- + sound/pci/cmipci.c | 32 +- + sound/pci/emu10k1/emu10k1_patch.c | 5 +- + sound/pci/emu10k1/emupcm.c | 31 +- + sound/pci/hda/cs35l41_hda_spi.c | 1 + + sound/pci/hda/hda_component.c | 19 +- + sound/pci/hda/hda_component.h | 2 +- + sound/pci/hda/hda_intel.c | 21 +- + sound/pci/hda/hda_intel.h | 1 + + sound/pci/hda/patch_cmedia.c | 269 ++ + sound/pci/hda/patch_realtek.c | 375 +- + sound/pci/hda/samsung_helper.c | 310 -- + sound/pci/hda/tas2781_hda_i2c.c | 2 +- + sound/pci/intel8x0.c | 3 - + sound/pci/intel8x0m.c | 3 - + sound/pci/korg1212/korg1212.c | 30 +- + sound/pci/lx6464es/lx_core.c | 8 +- + sound/pci/lx6464es/lx_core.h | 3 - + sound/pci/pcxhr/pcxhr_mix22.c | 2 +- + sound/pci/riptide/riptide.c | 193 +- + sound/pci/rme9652/hdsp.c | 24 +- + sound/pci/rme9652/hdspm.c | 36 +- + sound/pci/trident/trident.h | 5 - + sound/pci/trident/trident_memory.c | 10 +- + sound/pcmcia/pdaudiocf/pdaudiocf.c | 21 +- + sound/pcmcia/pdaudiocf/pdaudiocf_core.c | 36 +- + sound/pcmcia/pdaudiocf/pdaudiocf_irq.c | 3 +- + sound/pcmcia/vx/vxp_ops.c | 10 +- + sound/pcmcia/vx/vxpocket.c | 27 +- + sound/ppc/awacs.c | 4 +- + sound/ppc/daca.c | 2 +- + sound/ppc/keywest.c | 5 +- + sound/ppc/pmac.c | 52 +- + sound/ppc/powermac.c | 2 +- + sound/ppc/tumbler.c | 21 +- + sound/sh/aica.c | 7 +- + sound/sh/sh_dac_audio.c | 8 +- + sound/soc/Kconfig | 2 + + sound/soc/Makefile | 1 + + sound/soc/adi/axi-i2s.c | 6 +- + sound/soc/adi/axi-spdif.c | 2 +- + sound/soc/amd/acp-config.c | 12 + + sound/soc/amd/acp-pcm-dma.c | 2 +- + sound/soc/amd/acp/Kconfig | 22 + + sound/soc/amd/acp/Makefile | 4 + + sound/soc/amd/acp/acp-i2s.c | 182 +- + sound/soc/amd/acp/acp-legacy-common.c | 40 +- + sound/soc/amd/acp/acp-legacy-mach.c | 7 - + sound/soc/amd/acp/acp-mach-common.c | 2 +- + sound/soc/amd/acp/acp-mach.h | 1 + + sound/soc/amd/acp/acp-pci.c | 4 + + sound/soc/amd/acp/acp-pdm.c | 7 +- + sound/soc/amd/acp/acp-platform.c | 117 +- + sound/soc/amd/acp/acp-rembrandt.c | 2 +- + sound/soc/amd/acp/acp-renoir.c | 2 +- + sound/soc/amd/acp/acp-sdw-sof-mach.c | 509 +++ + sound/soc/amd/acp/acp-sof-mach.c | 7 - + sound/soc/amd/acp/acp63.c | 2 +- + sound/soc/amd/acp/acp70.c | 87 +- + sound/soc/amd/acp/amd-acp63-acpi-match.c | 90 + + sound/soc/amd/acp/amd.h | 27 +- + sound/soc/amd/acp/chip_offset_byte.h | 84 +- + sound/soc/amd/acp/soc_amd_sdw_common.h | 44 + + sound/soc/amd/mach-config.h | 2 + + sound/soc/amd/ps/ps-pdm-dma.c | 2 +- + sound/soc/amd/ps/ps-sdw-dma.c | 2 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 2 +- + sound/soc/amd/renoir/acp3x-pdm-dma.c | 2 +- + sound/soc/amd/vangogh/acp5x-pcm-dma.c | 2 +- + sound/soc/amd/yc/acp6x-pdm-dma.c | 2 +- + sound/soc/apple/mca.c | 2 +- + sound/soc/atmel/atmel-i2s.c | 2 +- + sound/soc/atmel/atmel_wm8904.c | 2 +- + sound/soc/atmel/mchp-i2s-mcc.c | 44 +- + sound/soc/atmel/mchp-pdmc.c | 99 +- + sound/soc/atmel/mchp-spdifrx.c | 2 +- + sound/soc/atmel/mchp-spdiftx.c | 2 +- + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/atmel/sam9x5_wm8731.c | 2 +- + sound/soc/atmel/tse850-pcm5142.c | 2 +- + sound/soc/au1x/ac97c.c | 2 +- + sound/soc/au1x/i2sc.c | 2 +- + sound/soc/au1x/psc-ac97.c | 2 +- + sound/soc/au1x/psc-i2s.c | 2 +- + sound/soc/bcm/bcm63xx-i2s-whistler.c | 2 +- + sound/soc/bcm/cygnus-ssp.c | 2 +- + sound/soc/cirrus/edb93xx.c | 2 +- + sound/soc/cirrus/ep93xx-i2s.c | 2 +- + sound/soc/codecs/Kconfig | 7 + + sound/soc/codecs/Makefile | 2 + + sound/soc/codecs/ak4613.c | 4 +- + sound/soc/codecs/cs-amp-lib-test.c | 44 + + sound/soc/codecs/cs35l34.c | 21 - + sound/soc/codecs/cs35l36.c | 34 +- + sound/soc/codecs/cs35l41.c | 34 +- + sound/soc/codecs/cs35l45.c | 2 +- + sound/soc/codecs/cs35l56-shared.c | 25 +- + sound/soc/codecs/cs42l42-sdw.c | 12 +- + sound/soc/codecs/cs42l43.c | 2 +- + sound/soc/codecs/cs43130.c | 113 +- + sound/soc/codecs/cs47l15.c | 2 +- + sound/soc/codecs/cs47l24.c | 2 +- + sound/soc/codecs/cs47l35.c | 2 +- + sound/soc/codecs/cs47l85.c | 2 +- + sound/soc/codecs/cs47l90.c | 2 +- + sound/soc/codecs/cs47l92.c | 2 +- + sound/soc/codecs/cs53l30.c | 24 +- + sound/soc/codecs/es8326.c | 6 +- + sound/soc/codecs/inno_rk3036.c | 2 +- + sound/soc/codecs/lpass-rx-macro.c | 2 +- + sound/soc/codecs/lpass-tx-macro.c | 2 +- + sound/soc/codecs/lpass-va-macro.c | 2 +- + sound/soc/codecs/lpass-wsa-macro.c | 27 +- + sound/soc/codecs/msm8916-wcd-digital.c | 2 +- + sound/soc/codecs/mt6357.c | 1855 ++++++++++ + sound/soc/codecs/mt6357.h | 660 ++++ + sound/soc/codecs/peb2466.c | 14 +- + sound/soc/codecs/rk817_codec.c | 2 +- + sound/soc/codecs/rt1318.c | 3 +- + sound/soc/codecs/rt1320-sdw.c | 2147 ++++++++++- + sound/soc/codecs/rt1320-sdw.h | 3 + + sound/soc/codecs/rt5682.c | 4 +- + sound/soc/codecs/rt5682s.c | 4 +- + sound/soc/codecs/spdif_receiver.c | 3 +- + sound/soc/codecs/spdif_transmitter.c | 3 +- + sound/soc/codecs/sti-sas.c | 21 +- + sound/soc/codecs/tas2552.c | 1 - + sound/soc/codecs/tas2764.c | 1 - + sound/soc/codecs/tas2770.c | 1 - + sound/soc/codecs/tas2780.c | 1 - + sound/soc/codecs/tas2781-comlib.c | 35 +- + sound/soc/codecs/tas2781-fmwlib.c | 61 +- + sound/soc/codecs/tas2781-i2c.c | 953 ++++- + sound/soc/codecs/tas5086.c | 9 +- + sound/soc/codecs/tlv320aic31xx.c | 102 +- + sound/soc/codecs/tlv320aic32x4.c | 9 + + sound/soc/codecs/wcd934x.c | 4 +- + sound/soc/codecs/wcd937x.c | 2 +- + sound/soc/codecs/wcd937x.h | 34 +- + sound/soc/codecs/wcd938x.c | 20 +- + sound/soc/codecs/wcd938x.h | 4 +- + sound/soc/codecs/wcd939x.c | 2 +- + sound/soc/codecs/wcd939x.h | 6 +- + sound/soc/codecs/wm5102.c | 2 +- + sound/soc/codecs/wm5110.c | 2 +- + sound/soc/codecs/wm8994.c | 2 +- + sound/soc/codecs/wm8997.c | 2 +- + sound/soc/codecs/wm8998.c | 2 +- + sound/soc/codecs/wsa881x.c | 44 +- + sound/soc/codecs/wsa883x.c | 75 +- + sound/soc/codecs/wsa884x.c | 240 +- + sound/soc/dwc/dwc-i2s.c | 18 +- + sound/soc/fsl/fsl_asrc.c | 2 +- + sound/soc/fsl/fsl_aud2htx.c | 2 +- + sound/soc/fsl/fsl_audmix.c | 14 +- + sound/soc/fsl/fsl_dma.c | 2 +- + sound/soc/fsl/fsl_easrc.c | 2 +- + sound/soc/fsl/fsl_esai.c | 2 +- + sound/soc/fsl/fsl_micfil.c | 2 +- + sound/soc/fsl/fsl_mqs.c | 13 +- + sound/soc/fsl/fsl_rpmsg.c | 11 +- + sound/soc/fsl/fsl_sai.c | 2 +- + sound/soc/fsl/fsl_spdif.c | 13 +- + sound/soc/fsl/fsl_ssi.c | 8 +- + sound/soc/fsl/fsl_xcvr.c | 4 +- + sound/soc/fsl/imx-audmux.c | 8 +- + sound/soc/fsl/imx-card.c | 3 - + sound/soc/fsl/imx-pcm-rpmsg.c | 16 +- + sound/soc/fsl/imx-sgtl5000.c | 2 +- + sound/soc/fsl/lpc3xxx-i2s.c | 11 +- + sound/soc/fsl/lpc3xxx-pcm.c | 2 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 2 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 4 +- + sound/soc/fsl/p1022_ds.c | 2 +- + sound/soc/fsl/p1022_rdk.c | 2 +- + sound/soc/fsl/pcm030-audio-fabric.c | 2 +- + sound/soc/generic/audio-graph-card.c | 16 +- + .../soc/generic/audio-graph-card2-custom-sample.c | 2 +- + sound/soc/generic/audio-graph-card2.c | 15 +- + sound/soc/generic/simple-card.c | 4 +- + sound/soc/generic/test-component.c | 11 +- + sound/soc/img/img-i2s-in.c | 2 +- + sound/soc/img/img-i2s-out.c | 2 +- + sound/soc/img/img-parallel-out.c | 2 +- + sound/soc/img/img-spdif-in.c | 2 +- + sound/soc/img/img-spdif-out.c | 2 +- + sound/soc/img/pistachio-internal-dac.c | 2 +- + sound/soc/intel/Kconfig | 120 - + sound/soc/intel/Makefile | 1 - + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 2 +- + sound/soc/intel/atom/sst/sst_acpi.c | 2 +- + sound/soc/intel/avs/core.c | 8 +- + sound/soc/intel/avs/pcm.c | 22 +- + sound/soc/intel/boards/Kconfig | 156 +- + sound/soc/intel/boards/Makefile | 31 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 720 ---- + sound/soc/intel/boards/bxt_rt298.c | 670 ---- + sound/soc/intel/boards/bytcht_cx2072x.c | 4 + + sound/soc/intel/boards/bytcht_da7213.c | 4 + + sound/soc/intel/boards/bytcht_es8316.c | 4 +- + sound/soc/intel/boards/bytcr_rt5640.c | 4 +- + sound/soc/intel/boards/bytcr_rt5651.c | 4 +- + sound/soc/intel/boards/bytcr_wm5102.c | 2 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 4 + + sound/soc/intel/boards/cht_bsw_rt5672.c | 4 + + sound/soc/intel/boards/ehl_rt5660.c | 3 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 688 ---- + sound/soc/intel/boards/kbl_da7219_max98927.c | 1175 ------ + sound/soc/intel/boards/kbl_rt5660.c | 567 --- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 1073 ------ + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 869 ----- + sound/soc/intel/boards/skl_hda_dsp_common.c | 168 - + sound/soc/intel/boards/skl_hda_dsp_common.h | 67 - + sound/soc/intel/boards/skl_hda_dsp_generic.c | 242 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 704 ---- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 751 ---- + sound/soc/intel/boards/skl_rt286.c | 568 --- + sound/soc/intel/boards/sof_board_helpers.c | 152 + + sound/soc/intel/boards/sof_board_helpers.h | 3 + + sound/soc/intel/boards/sof_es8336.c | 14 +- + sound/soc/intel/boards/sof_pcm512x.c | 5 +- + sound/soc/intel/boards/sof_rt5682.c | 7 + + sound/soc/intel/boards/sof_sdw.c | 1408 +------ + sound/soc/intel/boards/sof_sdw_common.h | 172 +- + sound/soc/intel/boards/sof_sdw_hdmi.c | 16 +- + sound/soc/intel/boards/sof_ssp_amp.c | 6 + + sound/soc/intel/boards/sof_wm8804.c | 6 +- + sound/soc/intel/catpt/device.c | 2 +- + sound/soc/intel/common/Makefile | 1 + + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 105 + + sound/soc/intel/common/soc-acpi-intel-arl-match.c | 263 ++ + sound/soc/intel/common/soc-acpi-intel-cnl-match.c | 6 - + sound/soc/intel/common/soc-acpi-intel-ehl-match.c | 1 - + sound/soc/intel/common/soc-acpi-intel-hda-match.c | 18 +- + sound/soc/intel/common/soc-acpi-intel-icl-match.c | 6 - + sound/soc/intel/common/soc-acpi-intel-kbl-match.c | 11 - + sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 104 + + sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 145 + + sound/soc/intel/common/soc-acpi-intel-skl-match.c | 5 - + sound/soc/intel/skylake/Makefile | 15 - + sound/soc/intel/skylake/bxt-sst.c | 629 ---- + sound/soc/intel/skylake/cnl-sst-dsp.c | 266 -- + sound/soc/intel/skylake/cnl-sst-dsp.h | 103 - + sound/soc/intel/skylake/cnl-sst.c | 508 --- + sound/soc/intel/skylake/skl-debug.c | 248 -- + sound/soc/intel/skylake/skl-i2s.h | 87 - + sound/soc/intel/skylake/skl-messages.c | 1419 ------- + sound/soc/intel/skylake/skl-nhlt.c | 269 -- + sound/soc/intel/skylake/skl-pcm.c | 1507 -------- + sound/soc/intel/skylake/skl-ssp-clk.c | 428 --- + sound/soc/intel/skylake/skl-ssp-clk.h | 108 - + sound/soc/intel/skylake/skl-sst-cldma.c | 373 -- + sound/soc/intel/skylake/skl-sst-cldma.h | 243 -- + sound/soc/intel/skylake/skl-sst-dsp.c | 462 --- + sound/soc/intel/skylake/skl-sst-dsp.h | 256 -- + sound/soc/intel/skylake/skl-sst-ipc.c | 1071 ------ + sound/soc/intel/skylake/skl-sst-ipc.h | 169 - + sound/soc/intel/skylake/skl-sst-utils.c | 425 --- + sound/soc/intel/skylake/skl-sst.c | 599 --- + sound/soc/intel/skylake/skl-topology.c | 3605 ------------------ + sound/soc/intel/skylake/skl-topology.h | 524 --- + sound/soc/intel/skylake/skl.c | 1177 ------ + sound/soc/intel/skylake/skl.h | 207 -- + sound/soc/kirkwood/kirkwood-i2s.c | 2 +- + sound/soc/loongson/loongson_card.c | 125 +- + sound/soc/loongson/loongson_dma.c | 25 +- + sound/soc/loongson/loongson_i2s.c | 115 +- + sound/soc/loongson/loongson_i2s.h | 24 +- + sound/soc/loongson/loongson_i2s_pci.c | 51 +- + sound/soc/mediatek/Kconfig | 20 + + sound/soc/mediatek/Makefile | 1 + + sound/soc/mediatek/common/mtk-btcvsd.c | 2 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 2 +- + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 18 +- + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 2 +- + sound/soc/mediatek/mt7986/mt7986-afe-pcm.c | 9 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 2 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 2 +- + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 2 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 4 +- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 2 +- + sound/soc/mediatek/mt8365/Makefile | 15 + + sound/soc/mediatek/mt8365/mt8365-afe-clk.c | 421 +++ + sound/soc/mediatek/mt8365/mt8365-afe-clk.h | 32 + + sound/soc/mediatek/mt8365/mt8365-afe-common.h | 448 +++ + sound/soc/mediatek/mt8365/mt8365-afe-pcm.c | 2274 ++++++++++++ + sound/soc/mediatek/mt8365/mt8365-dai-adda.c | 311 ++ + sound/soc/mediatek/mt8365/mt8365-dai-dmic.c | 310 ++ + sound/soc/mediatek/mt8365/mt8365-dai-i2s.c | 846 +++++ + sound/soc/mediatek/mt8365/mt8365-dai-pcm.c | 293 ++ + sound/soc/mediatek/mt8365/mt8365-mt6357.c | 343 ++ + sound/soc/mediatek/mt8365/mt8365-reg.h | 993 +++++ + sound/soc/meson/aiu-fifo.h | 2 - + sound/soc/meson/aiu.c | 2 +- + sound/soc/meson/axg-card.c | 13 +- + sound/soc/meson/gx-card.c | 3 +- + sound/soc/meson/meson-card-utils.c | 4 +- + sound/soc/mxs/mxs-sgtl5000.c | 2 +- + sound/soc/pxa/mmp-sspa.c | 2 +- + sound/soc/pxa/pxa2xx-ac97.c | 2 +- + sound/soc/qcom/common.c | 1 - + sound/soc/qcom/lpass-apq8016.c | 2 +- + sound/soc/qcom/lpass-ipq806x.c | 2 +- + sound/soc/qcom/lpass-sc7180.c | 2 +- + sound/soc/qcom/lpass-sc7280.c | 2 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 31 +- + sound/soc/qcom/qdsp6/q6routing.c | 2 +- + sound/soc/qcom/sm8250.c | 8 + + sound/soc/rockchip/rockchip_i2s.c | 2 +- + sound/soc/rockchip/rockchip_i2s_tdm.c | 2 +- + sound/soc/rockchip/rockchip_pdm.c | 2 +- + sound/soc/rockchip/rockchip_rt5645.c | 2 +- + sound/soc/rockchip/rockchip_spdif.c | 2 +- + sound/soc/samsung/arndale.c | 2 +- + sound/soc/samsung/i2s.c | 2 +- + sound/soc/samsung/odroid.c | 2 +- + sound/soc/samsung/pcm.c | 2 +- + sound/soc/samsung/snow.c | 2 +- + sound/soc/samsung/spdif.c | 2 +- + sound/soc/sdw_utils/Kconfig | 6 + + sound/soc/sdw_utils/Makefile | 11 + + .../soc_sdw_bridge_cs35l56.c} | 56 +- + .../soc_sdw_cs42l42.c} | 13 +- + .../soc_sdw_cs42l43.c} | 38 +- + .../soc_sdw_cs_amp.c} | 18 +- + .../sof_sdw_dmic.c => sdw_utils/soc_sdw_dmic.c} | 10 +- + .../sof_sdw_maxim.c => sdw_utils/soc_sdw_maxim.c} | 56 +- + .../soc_sdw_rt5682.c} | 12 +- + .../sof_sdw_rt700.c => sdw_utils/soc_sdw_rt700.c} | 12 +- + .../sof_sdw_rt711.c => sdw_utils/soc_sdw_rt711.c} | 38 +- + .../soc_sdw_rt712_sdca.c} | 10 +- + .../soc_sdw_rt722_sdca.c} | 10 +- + .../soc_sdw_rt_amp.c} | 43 +- + .../soc_sdw_rt_amp_coeff_tables.h} | 6 +- + .../soc_sdw_rt_dmic.c} | 11 +- + .../soc_sdw_rt_sdca_jack_common.c} | 40 +- + sound/soc/sdw_utils/soc_sdw_utils.c | 1170 ++++++ + sound/soc/sh/Kconfig | 1 + + sound/soc/sh/fsi.c | 2 +- + sound/soc/sh/hac.c | 2 +- + sound/soc/sh/rcar/adg.c | 4 +- + sound/soc/sh/rcar/core.c | 19 +- + sound/soc/sh/rcar/dma.c | 75 +- + sound/soc/sh/rcar/rsnd.h | 10 - + sound/soc/sh/rcar/ssi.c | 2 +- + sound/soc/sh/rz-ssi.c | 291 +- + sound/soc/sh/siu_dai.c | 2 +- + sound/soc/soc-ac97.c | 4 +- + sound/soc/soc-card-test.c | 57 - + sound/soc/soc-card.c | 10 - + sound/soc/soc-component.c | 12 - + sound/soc/soc-core.c | 21 +- + sound/soc/soc-dai.c | 58 - + sound/soc/soc-dapm.c | 5 +- + sound/soc/soc-pcm.c | 364 +- + sound/soc/soc-topology-test.c | 132 +- + sound/soc/soc-topology.c | 9 +- + sound/soc/sof/amd/Kconfig | 11 + + sound/soc/sof/amd/Makefile | 4 +- + sound/soc/sof/amd/acp-common.c | 3 + + sound/soc/sof/amd/acp-dsp-offset.h | 24 +- + sound/soc/sof/amd/acp-loader.c | 2 +- + sound/soc/sof/amd/acp.c | 88 +- + sound/soc/sof/amd/acp.h | 11 +- + sound/soc/sof/amd/acp70.c | 142 + + sound/soc/sof/amd/pci-acp63.c | 2 +- + sound/soc/sof/amd/pci-acp70.c | 112 + + sound/soc/sof/amd/pci-rmb.c | 1 - + sound/soc/sof/amd/pci-rn.c | 1 - + sound/soc/sof/amd/pci-vangogh.c | 1 - + sound/soc/sof/imx/imx8.c | 2 +- + sound/soc/sof/imx/imx8m.c | 2 +- + sound/soc/sof/imx/imx8ulp.c | 2 +- + sound/soc/sof/intel/Kconfig | 17 + + sound/soc/sof/intel/Makefile | 2 + + sound/soc/sof/intel/bdw.c | 2 +- + sound/soc/sof/intel/byt.c | 2 +- + sound/soc/sof/intel/hda-dsp.c | 1 + + sound/soc/sof/intel/hda-stream.c | 4 +- + sound/soc/sof/intel/hda.c | 282 +- + sound/soc/sof/intel/hda.h | 1 + + sound/soc/sof/intel/lnl.c | 27 + + sound/soc/sof/intel/mtl.c | 16 +- + sound/soc/sof/intel/mtl.h | 2 + + sound/soc/sof/intel/pci-ptl.c | 77 + + sound/soc/sof/intel/shim.h | 1 + + sound/soc/sof/mediatek/mt8186/mt8186.c | 2 +- + sound/soc/sof/mediatek/mt8195/mt8195.c | 2 +- + sound/soc/sof/pcm.c | 2 +- + sound/soc/sof/sof-audio.h | 8 +- + sound/soc/sof/sof-priv.h | 16 +- + sound/soc/sof/topology.c | 8 +- + sound/soc/sprd/sprd-mcdt.c | 2 +- + sound/soc/starfive/jh7110_pwmdac.c | 2 +- + sound/soc/starfive/jh7110_tdm.c | 2 +- + sound/soc/stm/stm32_adfsdm.c | 2 +- + sound/soc/stm/stm32_i2s.c | 6 +- + sound/soc/stm/stm32_sai_sub.c | 2 +- + sound/soc/stm/stm32_spdifrx.c | 2 +- + sound/soc/sunxi/sun4i-codec.c | 30 +- + sound/soc/sunxi/sun4i-i2s.c | 2 +- + sound/soc/sunxi/sun4i-spdif.c | 2 +- + sound/soc/sunxi/sun50i-dmic.c | 2 +- + sound/soc/sunxi/sun8i-codec.c | 2 +- + sound/soc/tegra/tegra186_asrc.c | 2 +- + sound/soc/tegra/tegra186_dspk.c | 2 +- + sound/soc/tegra/tegra20_ac97.c | 2 +- + sound/soc/tegra/tegra20_i2s.c | 2 +- + sound/soc/tegra/tegra210_admaif.c | 2 +- + sound/soc/tegra/tegra210_adx.c | 2 +- + sound/soc/tegra/tegra210_ahub.c | 2 +- + sound/soc/tegra/tegra210_amx.c | 2 +- + sound/soc/tegra/tegra210_dmic.c | 2 +- + sound/soc/tegra/tegra210_i2s.c | 18 +- + sound/soc/tegra/tegra210_mixer.c | 2 +- + sound/soc/tegra/tegra210_mvc.c | 2 +- + sound/soc/tegra/tegra210_ope.c | 2 +- + sound/soc/tegra/tegra210_sfc.c | 2 +- + sound/soc/tegra/tegra30_ahub.c | 2 +- + sound/soc/tegra/tegra30_i2s.c | 2 +- + sound/soc/tegra/tegra_audio_graph_card.c | 2 +- + sound/soc/tegra/tegra_pcm.c | 2 +- + sound/soc/ti/ams-delta.c | 2 +- + sound/soc/ti/davinci-i2s.c | 2 +- + sound/soc/ti/davinci-mcasp.c | 2 +- + sound/soc/ti/omap-mcbsp.c | 2 +- + sound/soc/uniphier/aio-ld11.c | 2 +- + sound/soc/uniphier/aio-pxs2.c | 2 +- + sound/soc/uniphier/evea.c | 2 +- + sound/soc/ux500/mop500.c | 2 +- + sound/soc/ux500/ux500_msp_dai.c | 2 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 2 +- + sound/soc/xilinx/xlnx_spdif.c | 2 +- + sound/soc/xtensa/xtfpga-i2s.c | 2 +- + sound/sparc/amd7930.c | 8 +- + sound/sparc/cs4231.c | 78 +- + sound/synth/emux/emux_hwdep.c | 6 +- + sound/synth/emux/emux_oss.c | 11 +- + sound/synth/emux/emux_seq.c | 13 +- + sound/synth/emux/emux_synth.c | 12 +- + sound/synth/emux/soundfont.c | 67 +- + sound/usb/caiaq/audio.c | 15 +- + sound/usb/card.c | 8 + + sound/usb/clock.c | 62 +- + sound/usb/endpoint.c | 3 + + sound/usb/format.c | 6 +- + sound/usb/helper.c | 34 + + sound/usb/helper.h | 10 +- + sound/usb/midi.c | 6 +- + sound/usb/midi2.c | 36 +- + sound/usb/mixer.c | 37 +- + sound/usb/mixer.h | 1 + + sound/usb/mixer_quirks.c | 593 ++- + sound/usb/mixer_scarlett.c | 4 +- + sound/usb/power.c | 3 +- + sound/usb/power.h | 1 + + sound/usb/quirks-table.h | 2455 +++++-------- + sound/usb/quirks.c | 62 +- + sound/usb/stream.c | 21 +- + sound/usb/usbaudio.h | 12 + + sound/usb/usx2y/us122l.c | 45 +- + sound/usb/usx2y/usX2Yhwdep.c | 25 +- + sound/usb/usx2y/usb_stream.c | 95 +- + sound/usb/usx2y/usb_stream.h | 1 + + sound/usb/usx2y/usbusx2y.c | 7 +- + sound/usb/usx2y/usbusx2yaudio.c | 67 +- + sound/usb/usx2y/usx2yhwdeppcm.c | 54 +- + tools/arch/x86/kcpuid/cpuid.csv | 1352 +++++-- + tools/arch/x86/kcpuid/kcpuid.c | 105 +- + tools/include/nolibc/Makefile | 1 + + tools/include/nolibc/arch-aarch64.h | 4 +- + tools/include/nolibc/arch-arm.h | 8 +- + tools/include/nolibc/arch-i386.h | 4 +- + tools/include/nolibc/arch-loongarch.h | 4 +- + tools/include/nolibc/arch-mips.h | 8 +- + tools/include/nolibc/arch-powerpc.h | 6 +- + tools/include/nolibc/arch-riscv.h | 4 +- + tools/include/nolibc/arch-s390.h | 4 +- + tools/include/nolibc/arch-x86_64.h | 8 +- + tools/include/nolibc/compiler.h | 24 +- + tools/include/nolibc/crt.h | 25 +- + tools/include/nolibc/nolibc.h | 3 +- + tools/include/nolibc/stackprotector.h | 4 +- + tools/include/nolibc/stdbool.h | 16 + + tools/include/nolibc/string.h | 1 + + tools/sound/dapm-graph | 44 +- + tools/spi/spidev_fdx.c | 2 +- + tools/testing/kunit/kunit_kernel.py | 3 +- + tools/testing/selftests/Makefile | 2 +- + tools/testing/selftests/acct/.gitignore | 3 + + tools/testing/selftests/acct/Makefile | 5 + + tools/testing/selftests/acct/acct_syscall.c | 78 + + tools/testing/selftests/alsa/Makefile | 4 +- + tools/testing/selftests/alsa/global-timer.c | 87 + + tools/testing/selftests/alsa/utimer-test.c | 164 + + tools/testing/selftests/core/Makefile | 2 +- + tools/testing/selftests/core/unshare_test.c | 94 + + tools/testing/selftests/cpufreq/cpufreq.sh | 15 + + tools/testing/selftests/cpufreq/main.sh | 13 +- + .../drivers/s390x/uvdevice/test_uvdevice.c | 6 - + tools/testing/selftests/exec/execveat.c | 2 +- + .../filesystems/statmount/statmount_test_ns.c | 7 +- + .../ftrace/test.d/00basic/test_ownership.tc | 46 +- + .../ftrace/test.d/dynevent/add_remove_uprobe.tc | 26 + + .../ftrace/test.d/ftrace/func_set_ftrace_file.tc | 9 +- + .../ftrace/test.d/kprobe/kprobe_args_char.tc | 2 +- + .../ftrace/test.d/kprobe/kprobe_args_string.tc | 2 +- + tools/testing/selftests/hid/hid_bpf.c | 6 - + tools/testing/selftests/kselftest.h | 10 +- + tools/testing/selftests/kselftest_harness.h | 18 +- + tools/testing/selftests/lib/Makefile | 3 +- + tools/testing/selftests/lib/config | 1 - + tools/testing/selftests/lib/strscpy.sh | 3 - + tools/testing/selftests/mm/Makefile | 1 + + tools/testing/selftests/mm/pkey-helpers.h | 13 +- + tools/testing/selftests/mm/pkey_sighandler_tests.c | 481 +++ + tools/testing/selftests/mm/protection_keys.c | 10 - + tools/testing/selftests/nolibc/Makefile | 41 +- + tools/testing/selftests/nolibc/nolibc-test.c | 9 +- + tools/testing/selftests/nolibc/run-tests.sh | 16 +- + tools/testing/selftests/resctrl/cat_test.c | 7 +- + tools/testing/selftests/rtc/rtctest.c | 7 - + tools/testing/selftests/rust/config | 3 +- + tools/testing/selftests/timers/change_skew.c | 3 - + tools/testing/selftests/timers/posix_timers.c | 548 ++- + tools/testing/selftests/timers/skew_consistency.c | 2 - + tools/testing/selftests/timers/threadtest.c | 4 +- + tools/testing/selftests/tpm2/test_async.sh | 2 +- + tools/testing/selftests/tpm2/test_smoke.sh | 2 +- + tools/testing/selftests/tpm2/test_space.sh | 2 +- + tools/testing/selftests/user/Makefile | 9 - + tools/testing/selftests/user/config | 1 - + tools/testing/selftests/user/test_user_copy.sh | 18 - + 1983 files changed, 87265 insertions(+), 48238 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm4450-camcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm4450-dispcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8150-camcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/renesas,rzv2h-cpg.yaml + create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynosautov920-clock.yaml + create mode 100644 Documentation/devicetree/bindings/firmware/nxp,imx95-scmi.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad4000.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/brcm,bcm2836-l1-intc.yaml + delete mode 100644 Documentation/devicetree/bindings/media/s5p-mfc.txt + delete mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/atmel,at91rm9200-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6397-regulator.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/mt6397-regulator.txt + delete mode 100644 Documentation/devicetree/bindings/reset/mobileye,eyeq5-reset.yaml + create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2711-avs-monitor.yaml + create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-tsa.yaml + create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,qe-ucc-qmc.yaml + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs4271.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/cs4271.txt + delete mode 100644 Documentation/devicetree/bindings/sound/da7213.txt + create mode 100644 Documentation/devicetree/bindings/sound/dlg,da7213.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,imx-audio-es8328.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,saif.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/imx-audio-es8328.txt + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt8365-afe.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt8365-mt6357.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/mxs-saif.txt + delete mode 100644 Documentation/devicetree/bindings/sound/pcm512x.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,apq8016-sbc-sndcard.yaml + create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm512x.yaml + create mode 100644 Documentation/devicetree/bindings/sound/ti,tlv320dac3100.yaml + create mode 100644 Documentation/devicetree/bindings/sound/ti,tpa6130a2.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/tlv320aic31xx.txt + delete mode 100644 Documentation/devicetree/bindings/sound/tpa6130a2.txt + create mode 100644 Documentation/devicetree/bindings/spi/nxp,sc18is.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-sc18is602.txt + delete mode 100644 Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/brcm,bcm2835-system-timer.yaml + create mode 100644 Documentation/doc-guide/checktransupdate.rst + create mode 100644 Documentation/scheduler/sched-eevdf.rst + create mode 100644 Documentation/sound/utimers.rst + create mode 100644 Documentation/translations/ko_KR/core-api/wrappers/memory-barriers.rst + rename Documentation/translations/ko_KR/{ => process}/howto.rst (100%) + create mode 100644 Documentation/translations/sp_SP/scheduler/sched-eevdf.rst + create mode 100644 Documentation/translations/zh_CN/dev-tools/kcsan.rst + create mode 100644 Documentation/translations/zh_CN/doc-guide/checktransupdate.rst + create mode 100644 Documentation/translations/zh_CN/kbuild/gcc-plugins.rst + create mode 100644 Documentation/translations/zh_CN/kbuild/headers_install.rst + create mode 100644 Documentation/translations/zh_CN/kbuild/index.rst + rename Documentation/translations/zh_CN/{admin-guide => process}/security-bugs.rst (57%) + create mode 100644 Documentation/virt/kvm/loongarch/hypercalls.rst + create mode 100644 Documentation/virt/kvm/loongarch/index.rst + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-catalina.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-blueridge-4u.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-blueridge.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-fuji.dts + create mode 100644 arch/arm/boot/dts/aspeed/ibm-power11-quad.dtsi + create mode 100644 arch/arm/boot/dts/broadcom/bcm2166x-common.dtsi + create mode 100644 arch/arm/boot/dts/st/stm32mp151c-mecio1r0.dts + create mode 100644 arch/arm/boot/dts/st/stm32mp151c-mect1s.dts + create mode 100644 arch/arm/boot/dts/st/stm32mp153c-mecio1r1.dts + create mode 100644 arch/arm/boot/dts/st/stm32mp15x-mecio1-io.dtsi + create mode 100644 arch/arm/mach-at91/sam9x7.c + delete mode 100644 arch/arm/mach-davinci/cpuidle.c + delete mode 100644 arch/arm/mach-davinci/cpuidle.h + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h700-anbernic-rg35xx-sp.dts + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-c3-c308l-aw419.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-lvds0.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-lvds1.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-mipi0.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-mipi1.dtsi + rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw7905-0x.dts => imx8mm-venice-gw75xx-0x.dts} (67%) + rename arch/arm64/boot/dts/freescale/{imx8mm-venice-gw7905.dtsi => imx8mm-venice-gw75xx.dtsi} (100%) + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-phycore-no-eth.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-var-som-symphony.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-var-som.dtsi + rename arch/arm64/boot/dts/freescale/{imx8mp-venice-gw7905-2x.dts => imx8mp-venice-gw75xx-2x.dts} (67%) + rename arch/arm64/boot/dts/freescale/{imx8mp-venice-gw7905.dtsi => imx8mp-venice-gw75xx.dtsi} (100%) + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-ss-lvds.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-ss-mipi.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93-kontron-bl-osm-s.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93-kontron-osm-s.dtsi + delete mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3737-0000.dtsi + delete mode 100644 arch/arm64/boot/dts/nvidia/tegra234-p3740-0002.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-j3-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-j3ltetw.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-wingtech-wt86518.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-wingtech-wt86528.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-wingtech-wt865x8.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8929-pm8916.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8929-wingtech-wt82918hd.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8929.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8939-wingtech-wt82918hd.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8992-lg-h815.dts + create mode 100644 arch/arm64/boot/dts/qcom/x1e78100-lenovo-thinkpad-t14s.dts + create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus13.dts + create mode 100644 arch/arm64/boot/dts/qcom/x1e80100-microsoft-romulus15.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g043u11-smarc-du-adv7513.dtso + create mode 100644 arch/arm64/boot/dts/renesas/r9a09g057.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a09g057h44-rzv2h-evk.dts + create mode 100644 arch/arm64/boot/dts/renesas/rz-smarc-du-adv7513.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core-mb.dts + create mode 100644 arch/arm64/boot/dts/rockchip/px30-firefly-jd4-core.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3328-nanopi-r2s-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3399-base.dtsi + rename arch/arm64/boot/dts/rockchip/{rk3399-op1-opp.dtsi => rk3399-op1.dtsi} (99%) + delete mode 100644 arch/arm64/boot/dts/rockchip/rk3399-opp.dtsi + rename arch/arm64/boot/dts/rockchip/{rk3399-t-opp.dtsi => rk3399-t.dtsi} (98%) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-lckfb-tspi.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-odroid-m1s.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-display-vz.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-wolfvision-pf5-display.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-coolpi-cm5-genbook.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6-lts.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-gameforce-ace.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2-bkey-ekey-pcie.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am6548-iot2050-advanced-m2-bkey-usb3.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am67a-beagley-ai.dts + create mode 100644 arch/x86/include/uapi/asm/elf.h + create mode 100644 drivers/firmware/arm_scmi/transports/Kconfig + create mode 100644 drivers/firmware/arm_scmi/transports/Makefile + rename drivers/firmware/arm_scmi/{ => transports}/mailbox.c (85%) + rename drivers/firmware/arm_scmi/{ => transports}/optee.c (89%) + rename drivers/firmware/arm_scmi/{ => transports}/smc.c (86%) + rename drivers/firmware/arm_scmi/{ => transports}/virtio.c (94%) + create mode 100644 drivers/firmware/arm_scmi/vendors/imx/Kconfig + create mode 100644 drivers/firmware/arm_scmi/vendors/imx/Makefile + create mode 100644 drivers/firmware/arm_scmi/vendors/imx/imx-sm-bbm.c + create mode 100644 drivers/firmware/arm_scmi/vendors/imx/imx-sm-misc.c + create mode 100644 drivers/firmware/arm_scmi/vendors/imx/imx95.rst + create mode 100644 drivers/firmware/imx/sm-misc.c + create mode 100644 drivers/input/keyboard/imx-sm-bbm-key.c + create mode 100644 drivers/irqchip/irq-loongarch-avec.c + create mode 100644 drivers/irqchip/irq-loongson.h + delete mode 100644 drivers/regulator/sm5703-regulator.c + create mode 100644 drivers/reset/reset-eyeq.c + create mode 100644 drivers/rtc/rtc-imx-sm-bbm.c + create mode 100644 drivers/soc/qcom/trace-smp2p.h + create mode 100644 drivers/soc/qcom/trace_icc-bwmon.h + create mode 100644 include/dt-bindings/clock/qcom,sm4450-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm4450-dispcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm4450-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8150-camcc.h + mode change 100644 => 120000 include/dt-bindings/clock/qcom,sm8650-dispcc.h + create mode 100644 include/dt-bindings/clock/renesas,r9a09g057-cpg.h + create mode 100644 include/dt-bindings/clock/samsung,exynosautov920.h + create mode 100644 include/dt-bindings/interconnect/qcom,ipq5332.h + create mode 100644 include/dt-bindings/soc/qe-fsl,tsa.h + create mode 100644 include/linux/firmware/imx/sm.h + delete mode 100644 include/linux/platform_data/ti-aemif.h + create mode 100644 include/linux/scmi_imx_protocol.h + create mode 100644 include/sound/soc_sdw_utils.h + create mode 100644 include/sound/tas2563-tlv.h + create mode 100644 lib/math/tests/Makefile + create mode 100644 lib/math/tests/int_pow_kunit.c + delete mode 100644 sound/core/memalloc_local.h + delete mode 100644 sound/pci/hda/samsung_helper.c + create mode 100644 sound/soc/amd/acp/acp-sdw-sof-mach.c + create mode 100644 sound/soc/amd/acp/amd-acp63-acpi-match.c + create mode 100644 sound/soc/amd/acp/soc_amd_sdw_common.h + create mode 100644 sound/soc/codecs/mt6357.c + create mode 100644 sound/soc/codecs/mt6357.h + delete mode 100644 sound/soc/intel/boards/bxt_da7219_max98357a.c + delete mode 100644 sound/soc/intel/boards/bxt_rt298.c + delete mode 100644 sound/soc/intel/boards/kbl_da7219_max98357a.c + delete mode 100644 sound/soc/intel/boards/kbl_da7219_max98927.c + delete mode 100644 sound/soc/intel/boards/kbl_rt5660.c + delete mode 100644 sound/soc/intel/boards/kbl_rt5663_max98927.c + delete mode 100644 sound/soc/intel/boards/kbl_rt5663_rt5514_max98927.c + delete mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.c + delete mode 100644 sound/soc/intel/boards/skl_hda_dsp_common.h + delete mode 100644 sound/soc/intel/boards/skl_nau88l25_max98357a.c + delete mode 100644 sound/soc/intel/boards/skl_nau88l25_ssm4567.c + delete mode 100644 sound/soc/intel/boards/skl_rt286.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-ptl-match.c + delete mode 100644 sound/soc/intel/skylake/Makefile + delete mode 100644 sound/soc/intel/skylake/bxt-sst.c + delete mode 100644 sound/soc/intel/skylake/cnl-sst-dsp.c + delete mode 100644 sound/soc/intel/skylake/cnl-sst-dsp.h + delete mode 100644 sound/soc/intel/skylake/cnl-sst.c + delete mode 100644 sound/soc/intel/skylake/skl-debug.c + delete mode 100644 sound/soc/intel/skylake/skl-i2s.h + delete mode 100644 sound/soc/intel/skylake/skl-messages.c + delete mode 100644 sound/soc/intel/skylake/skl-nhlt.c + delete mode 100644 sound/soc/intel/skylake/skl-pcm.c + delete mode 100644 sound/soc/intel/skylake/skl-ssp-clk.c + delete mode 100644 sound/soc/intel/skylake/skl-ssp-clk.h + delete mode 100644 sound/soc/intel/skylake/skl-sst-cldma.c + delete mode 100644 sound/soc/intel/skylake/skl-sst-cldma.h + delete mode 100644 sound/soc/intel/skylake/skl-sst-dsp.c + delete mode 100644 sound/soc/intel/skylake/skl-sst-dsp.h + delete mode 100644 sound/soc/intel/skylake/skl-sst-ipc.c + delete mode 100644 sound/soc/intel/skylake/skl-sst-ipc.h + delete mode 100644 sound/soc/intel/skylake/skl-sst-utils.c + delete mode 100644 sound/soc/intel/skylake/skl-sst.c + delete mode 100644 sound/soc/intel/skylake/skl-topology.c + delete mode 100644 sound/soc/intel/skylake/skl-topology.h + delete mode 100644 sound/soc/intel/skylake/skl.c + delete mode 100644 sound/soc/intel/skylake/skl.h + create mode 100644 sound/soc/mediatek/mt8365/Makefile + create mode 100644 sound/soc/mediatek/mt8365/mt8365-afe-clk.c + create mode 100644 sound/soc/mediatek/mt8365/mt8365-afe-clk.h + create mode 100644 sound/soc/mediatek/mt8365/mt8365-afe-common.h + create mode 100644 sound/soc/mediatek/mt8365/mt8365-afe-pcm.c + create mode 100644 sound/soc/mediatek/mt8365/mt8365-dai-adda.c + create mode 100644 sound/soc/mediatek/mt8365/mt8365-dai-dmic.c + create mode 100644 sound/soc/mediatek/mt8365/mt8365-dai-i2s.c + create mode 100644 sound/soc/mediatek/mt8365/mt8365-dai-pcm.c + create mode 100644 sound/soc/mediatek/mt8365/mt8365-mt6357.c + create mode 100644 sound/soc/mediatek/mt8365/mt8365-reg.h + create mode 100644 sound/soc/sdw_utils/Kconfig + create mode 100644 sound/soc/sdw_utils/Makefile + rename sound/soc/{intel/boards/bridge_cs35l56.c => sdw_utils/soc_sdw_bridge_cs35l56.c} (63%) + rename sound/soc/{intel/boards/sof_sdw_cs42l42.c => sdw_utils/soc_sdw_cs42l42.c} (82%) + rename sound/soc/{intel/boards/sof_sdw_cs42l43.c => sdw_utils/soc_sdw_cs42l43.c} (73%) + rename sound/soc/{intel/boards/sof_sdw_cs_amp.c => sdw_utils/soc_sdw_cs_amp.c} (66%) + rename sound/soc/{intel/boards/sof_sdw_dmic.c => sdw_utils/soc_sdw_dmic.c} (71%) + rename sound/soc/{intel/boards/sof_sdw_maxim.c => sdw_utils/soc_sdw_maxim.c} (63%) + rename sound/soc/{intel/boards/sof_sdw_rt5682.c => sdw_utils/soc_sdw_rt5682.c} (82%) + rename sound/soc/{intel/boards/sof_sdw_rt700.c => sdw_utils/soc_sdw_rt700.c} (81%) + rename sound/soc/{intel/boards/sof_sdw_rt711.c => sdw_utils/soc_sdw_rt711.c} (70%) + rename sound/soc/{intel/boards/sof_sdw_rt712_sdca.c => sdw_utils/soc_sdw_rt712_sdca.c} (74%) + rename sound/soc/{intel/boards/sof_sdw_rt722_sdca.c => sdw_utils/soc_sdw_rt722_sdca.c} (68%) + rename sound/soc/{intel/boards/sof_sdw_rt_amp.c => sdw_utils/soc_sdw_rt_amp.c} (84%) + rename sound/soc/{intel/boards/sof_sdw_amp_coeff_tables.h => sdw_utils/soc_sdw_rt_amp_coeff_tables.h} (97%) + rename sound/soc/{intel/boards/sof_sdw_rt_dmic.c => sdw_utils/soc_sdw_rt_dmic.c} (70%) + rename sound/soc/{intel/boards/sof_sdw_rt_sdca_jack_common.c => sdw_utils/soc_sdw_rt_sdca_jack_common.c} (78%) + create mode 100644 sound/soc/sdw_utils/soc_sdw_utils.c + create mode 100644 sound/soc/sof/amd/acp70.c + create mode 100644 sound/soc/sof/amd/pci-acp70.c + create mode 100644 sound/soc/sof/intel/pci-ptl.c + create mode 100644 tools/include/nolibc/stdbool.h + create mode 100644 tools/testing/selftests/acct/.gitignore + create mode 100644 tools/testing/selftests/acct/Makefile + create mode 100644 tools/testing/selftests/acct/acct_syscall.c + create mode 100644 tools/testing/selftests/alsa/global-timer.c + create mode 100644 tools/testing/selftests/alsa/utimer-test.c + create mode 100644 tools/testing/selftests/core/unshare_test.c + create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/add_remove_uprobe.tc + delete mode 100755 tools/testing/selftests/lib/strscpy.sh + create mode 100644 tools/testing/selftests/mm/pkey_sighandler_tests.c + delete mode 100644 tools/testing/selftests/user/Makefile + delete mode 100644 tools/testing/selftests/user/config + delete mode 100755 tools/testing/selftests/user/test_user_copy.sh +Merging fixes/fixes (8276a39ecaa6 mm: fix PHYSMEM_END build error on m68k) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Merge made by the 'ort' strategy. + arch/powerpc/include/asm/asm-compat.h | 6 ++++++ + arch/powerpc/include/asm/atomic.h | 5 +++-- + arch/powerpc/include/asm/uaccess.h | 7 +------ + include/linux/mm.h | 6 +++++- + 4 files changed, 15 insertions(+), 9 deletions(-) +Merging vfs-brauner-fixes/vfs.fixes (72a6e22c604c fscache: delete fscache_cookie_lru_timer when fscache exits to avoid UAF) +$ git merge -m Merge branch 'vfs.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Already up to date. +Merging fscrypt-current/for-current (256abd8e550c Linux 6.10-rc7) +$ 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 (256abd8e550c Linux 6.10-rc7) +$ 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 btrfs-fixes/next-fixes (a064948e242c Merge branch 'misc-6.12' 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/btrfs_inode.h | 1 + + fs/btrfs/ctree.h | 2 ++ + fs/btrfs/defrag.c | 2 ++ + fs/btrfs/file.c | 34 +++++++++++++++++++++++++++++++--- + fs/btrfs/tree-checker.c | 2 +- + 5 files changed, 37 insertions(+), 4 deletions(-) +Merging vfs-fixes/fixes (8c86f1a45749 close_range(): fix the logics in descriptor table trimming) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Auto-merging fs/file.c +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + fs/file.c | 93 ++++++++++++++++++------------------------------- + include/linux/fdtable.h | 8 ++--- + kernel/fork.c | 32 ++++++++--------- + 3 files changed, 51 insertions(+), 82 deletions(-) +Merging erofs-fixes/fixes (da3ea35007d0 Linux 6.11-rc7) +$ 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 nfsd-fixes/nfsd-fixes (40927f3d0972 nfsd: fix nfsd4_deleg_getattr_conflict in presence of third party lease) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (0c3836482481 Linux 6.10) +$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging overlayfs-fixes/ovl-fixes (77a28aa47687 ovl: relax WARN_ON in ovl_verify_area()) +$ git merge -m Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging bcachefs/for-next (b72bcc914244 bcachefs: return err ptr instead of null in read sb clean) +$ git merge -m Merge branch 'for-next' of git://evilpiepirate.org/bcachefs.git bcachefs/for-next +Auto-merging fs/bcachefs/fs-io-buffered.c +Auto-merging fs/bcachefs/fs.c +Auto-merging fs/inode.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + Documentation/filesystems/bcachefs/CodingStyle.rst | 2 +- + fs/bcachefs/Kconfig | 7 + + fs/bcachefs/Makefile | 1 + + fs/bcachefs/acl.c | 7 +- + fs/bcachefs/alloc_background.c | 45 +- + fs/bcachefs/alloc_background.h | 3 +- + fs/bcachefs/alloc_foreground.c | 59 +- + fs/bcachefs/alloc_foreground.h | 5 +- + fs/bcachefs/backpointers.c | 104 +++- + fs/bcachefs/backpointers.h | 35 +- + fs/bcachefs/bcachefs.h | 14 +- + fs/bcachefs/bcachefs_format.h | 2 + + fs/bcachefs/bset.c | 184 +++--- + fs/bcachefs/bset.h | 4 +- + fs/bcachefs/btree_cache.c | 276 ++++++--- + fs/bcachefs/btree_cache.h | 3 + + fs/bcachefs/btree_gc.c | 21 +- + fs/bcachefs/btree_io.c | 8 +- + fs/bcachefs/btree_io.h | 4 +- + fs/bcachefs/btree_iter.c | 63 +- + fs/bcachefs/btree_iter.h | 96 +-- + fs/bcachefs/btree_key_cache.c | 415 +++---------- + fs/bcachefs/btree_key_cache_types.h | 18 +- + fs/bcachefs/btree_locking.h | 13 +- + fs/bcachefs/btree_trans_commit.c | 2 +- + fs/bcachefs/btree_types.h | 60 +- + fs/bcachefs/btree_update.c | 12 +- + fs/bcachefs/btree_update_interior.c | 37 +- + fs/bcachefs/btree_update_interior.h | 2 + + fs/bcachefs/buckets.c | 35 +- + fs/bcachefs/buckets.h | 15 +- + fs/bcachefs/buckets_types.h | 8 - + fs/bcachefs/checksum.c | 97 +-- + fs/bcachefs/clock.h | 9 - + fs/bcachefs/darray.c | 4 +- + fs/bcachefs/darray.h | 24 +- + fs/bcachefs/data_update.c | 2 +- + fs/bcachefs/dirent.c | 66 +-- + fs/bcachefs/ec.c | 323 +++++++--- + fs/bcachefs/ec.h | 11 +- + fs/bcachefs/ec_format.h | 9 +- + fs/bcachefs/ec_types.h | 1 + + fs/bcachefs/errcode.h | 14 +- + fs/bcachefs/extents.c | 33 +- + fs/bcachefs/extents.h | 24 +- + fs/bcachefs/fs-common.c | 5 +- + fs/bcachefs/fs-io-buffered.c | 41 +- + fs/bcachefs/fs-io-direct.c | 2 +- + fs/bcachefs/fs-io-pagecache.c | 78 +-- + fs/bcachefs/fs-io-pagecache.h | 4 +- + fs/bcachefs/fs-io.c | 174 ++---- + fs/bcachefs/fs-ioctl.c | 4 +- + fs/bcachefs/fs.c | 435 +++++++++----- + fs/bcachefs/fs.h | 18 +- + fs/bcachefs/inode.c | 2 +- + fs/bcachefs/io_read.c | 18 +- + fs/bcachefs/io_write.c | 7 +- + fs/bcachefs/journal_io.c | 6 +- + fs/bcachefs/journal_reclaim.c | 7 +- + fs/bcachefs/opts.c | 85 ++- + fs/bcachefs/opts.h | 61 +- + fs/bcachefs/rcu_pending.c | 650 +++++++++++++++++++++ + fs/bcachefs/rcu_pending.h | 27 + + fs/bcachefs/rebalance.c | 3 + + fs/bcachefs/recovery.c | 22 +- + fs/bcachefs/recovery_passes.c | 10 +- + fs/bcachefs/replicas.c | 10 +- + fs/bcachefs/replicas_format.h | 9 +- + fs/bcachefs/sb-clean.c | 2 +- + fs/bcachefs/sb-members.c | 57 ++ + fs/bcachefs/sb-members.h | 22 +- + fs/bcachefs/str_hash.h | 2 +- + fs/bcachefs/subvolume.h | 45 ++ + fs/bcachefs/subvolume_types.h | 3 +- + fs/bcachefs/super-io.c | 12 +- + fs/bcachefs/super.c | 85 +-- + fs/bcachefs/sysfs.c | 55 +- + fs/bcachefs/thread_with_file.c | 2 +- + fs/bcachefs/time_stats.c | 14 + + fs/bcachefs/time_stats.h | 3 +- + fs/bcachefs/trace.h | 465 ++++++++++++++- + fs/bcachefs/util.c | 16 +- + fs/bcachefs/util.h | 2 +- + fs/bcachefs/xattr.c | 81 +-- + fs/bcachefs/xattr_format.h | 2 +- + fs/inode.c | 8 - + include/linux/fs.h | 9 +- + include/linux/generic-radix-tree.h | 105 +++- + lib/generic-radix-tree.c | 80 +-- + 89 files changed, 3195 insertions(+), 1730 deletions(-) + create mode 100644 fs/bcachefs/rcu_pending.c + create mode 100644 fs/bcachefs/rcu_pending.h +Merging fscrypt/for-next (256abd8e550c Linux 6.10-rc7) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (e7c10ac01f31 Merge branch 'for-next-next-v6.12-20240916' into for-next-20240916) + 8c92c9840a6d ("btrfs: tree-checker: fix the wrong output of data backref objectid") + 90cee4871c72 ("btrfs: fix race setting file private on concurrent lseek using same fd") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. + fs/btrfs/dev-replace.c | 2 ++ + fs/btrfs/fs.h | 2 ++ + fs/btrfs/volumes.c | 8 +++++--- + 3 files changed, 9 insertions(+), 3 deletions(-) +Merging ceph/master (ede0b1d30b82 libceph: use min() to simplify code in ceph_dns_resolve_name()) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Merge made by the 'ort' strategy. + fs/ceph/caps.c | 3 ++- + fs/ceph/mds_client.h | 3 --- + fs/ceph/super.h | 2 -- + include/linux/ceph/osd_client.h | 2 -- + net/ceph/messenger.c | 2 +- + 5 files changed, 3 insertions(+), 9 deletions(-) +Merging cifs/for-next (5ac1f99fdd09 smb: client: fix compression heuristic functions) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging fs/smb/client/cifsglob.h +Auto-merging fs/smb/client/cifssmb.c +Auto-merging fs/smb/client/file.c +Auto-merging fs/smb/client/smb2ops.c +Auto-merging fs/smb/client/smb2pdu.c +Auto-merging fs/smb/client/smbdirect.c +Merge made by the 'ort' strategy. + fs/smb/client/Kconfig | 14 + + fs/smb/client/Makefile | 2 + + fs/smb/client/cifs_debug.c | 7 +- + fs/smb/client/cifsacl.c | 226 ++-- + fs/smb/client/cifsacl.h | 99 +- + fs/smb/client/cifsfs.h | 1 - + fs/smb/client/cifsglob.h | 25 +- + fs/smb/client/cifspdu.h | 6 - + fs/smb/client/cifsproto.h | 28 +- + fs/smb/client/cifssmb.c | 14 +- + fs/smb/client/compress.c | 390 +++++++ + fs/smb/client/compress.h | 90 ++ + fs/smb/client/compress/lz77.c | 235 ++++ + fs/smb/client/compress/lz77.h | 15 + + fs/smb/client/connect.c | 5 +- + fs/smb/client/file.c | 7 +- + fs/smb/client/fs_context.c | 20 +- + fs/smb/client/inode.c | 42 +- + fs/smb/client/link.c | 3 + + fs/smb/client/misc.c | 9 +- + fs/smb/client/smb1ops.c | 2 +- + fs/smb/client/smb2file.c | 6 +- + fs/smb/client/smb2inode.c | 6 +- + fs/smb/client/smb2maperror.c | 2 +- + fs/smb/client/smb2misc.c | 2 +- + fs/smb/client/smb2ops.c | 98 +- + fs/smb/client/smb2pdu.c | 19 +- + fs/smb/client/smb2pdu.h | 8 +- + fs/smb/client/smb2proto.h | 2 +- + fs/smb/client/smb2transport.c | 2 +- + fs/smb/client/smbdirect.c | 6 +- + fs/smb/client/transport.c | 4 + + fs/smb/client/xattr.c | 4 +- + fs/smb/{client => common}/smb2status.h | 6 + + fs/smb/common/smbacl.h | 121 +++ + fs/smb/server/oplock.c | 2 +- + fs/smb/server/server.c | 2 +- + fs/smb/server/smb2misc.c | 2 +- + fs/smb/server/smb2pdu.c | 2 +- + fs/smb/server/smb_common.c | 2 +- + fs/smb/server/smbacl.h | 111 +- + fs/smb/server/smbstatus.h | 1822 -------------------------------- + fs/smb/server/transport_rdma.c | 2 +- + 43 files changed, 1206 insertions(+), 2265 deletions(-) + create mode 100644 fs/smb/client/compress.c + create mode 100644 fs/smb/client/compress.h + create mode 100644 fs/smb/client/compress/lz77.c + create mode 100644 fs/smb/client/compress/lz77.h + rename fs/smb/{client => common}/smb2status.h (99%) + create mode 100644 fs/smb/common/smbacl.h + delete mode 100644 fs/smb/server/smbstatus.h +Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Auto-merging fs/configfs/dir.c +Auto-merging fs/configfs/inode.c +Merge made by the 'ort' strategy. + fs/configfs/configfs_internal.h | 4 ++-- + fs/configfs/dir.c | 42 +++++++++++++++++++++++++++++++---------- + fs/configfs/inode.c | 24 ----------------------- + 3 files changed, 34 insertions(+), 36 deletions(-) +Merging dlm/next (652b0ae675fe dlm: add missing -ENOMEM if alloc_workqueue() fails) +$ 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/config.c | 2 +- + fs/dlm/dlm_internal.h | 5 ++ + fs/dlm/lock.c | 134 +++++++++++++++++++++++++++----------------------- + fs/dlm/lock.h | 2 + + fs/dlm/lockspace.c | 97 ++++++++++++++++++------------------ + fs/dlm/lowcomms.c | 36 +------------- + fs/dlm/main.c | 12 +++++ + fs/dlm/member.c | 2 + + fs/dlm/memory.c | 28 +++++------ + fs/dlm/memory.h | 4 +- + fs/dlm/recover.c | 9 ++-- + 11 files changed, 164 insertions(+), 167 deletions(-) +Merging erofs/dev (fc0644e85005 erofs: ensure regular inodes for file-backed mounts) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Merge made by the 'ort' strategy. + fs/erofs/super.c | 13 ++++++++++--- + 1 file changed, 10 insertions(+), 3 deletions(-) +Merging exfat/dev (d70a477a063e exfat: resolve memory leak from exfat_create_upcase_table()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/balloc.c | 10 ++--- + fs/exfat/exfat_fs.h | 24 ++++++++---- + fs/exfat/file.c | 110 ++++++++++++++++++++++++++++++++-------------------- + fs/exfat/inode.c | 94 +++++++++++++------------------------------- + fs/exfat/namei.c | 17 +++++++- + fs/exfat/nls.c | 5 ++- + fs/exfat/super.c | 41 +++++++++++++++++++- + 7 files changed, 175 insertions(+), 126 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at b247a4929990 Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git +Merging next-20240917 version of exfat +$ git merge -m next-20240917/exfat dbbd9a77c3defc390fb2751ed92468ada78ebf3f +Auto-merging fs/exfat/file.c +Auto-merging fs/exfat/inode.c +CONFLICT (content): Merge conflict in fs/exfat/inode.c +Resolved 'fs/exfat/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 6a0b48a7a56b] next-20240917/exfat +$ git diff -M --stat --summary HEAD^.. + fs/exfat/balloc.c | 10 ++--- + fs/exfat/exfat_fs.h | 24 ++++++++---- + fs/exfat/file.c | 40 +++++++++++--------- + fs/exfat/inode.c | 94 +++++++++++++--------------------------------- + fs/exfat/namei.c | 17 ++++++++- + fs/exfat/super.c | 41 +++++++++++++++++++- + include/uapi/linux/exfat.h | 25 ++++++++++++ + 7 files changed, 150 insertions(+), 101 deletions(-) + create mode 100644 include/uapi/linux/exfat.h +Merging exportfs/exportfs-next (0c3836482481 Linux 6.10) +$ git merge -m Merge branch 'exportfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux exportfs/exportfs-next +Already up to date. +Merging ext3/for_next (802e492f2fda Merge fanotify HSM events implementation.) +$ 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/bcachefs/fs-io-pagecache.c +Auto-merging fs/bcachefs/fs.c +CONFLICT (content): Merge conflict in fs/bcachefs/fs.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/super.c +Auto-merging fs/namei.c +Auto-merging fs/quota/dquot.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/mm.h +Auto-merging mm/filemap.c +Auto-merging mm/memory.c +Auto-merging mm/shmem.c +Auto-merging security/selinux/hooks.c +Resolved 'fs/bcachefs/fs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 3dcab35d9d39] Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git +$ git diff -M --stat --summary HEAD^.. + fs/bcachefs/fs-io-pagecache.c | 4 ++ + fs/bcachefs/fs.c | 2 +- + fs/btrfs/ioctl.c | 9 +++ + fs/btrfs/super.c | 3 +- + fs/ext4/super.c | 6 +- + fs/isofs/rock.h | 2 +- + fs/namei.c | 9 +++ + fs/notify/fanotify/fanotify.c | 32 ++++++++-- + fs/notify/fanotify/fanotify.h | 15 +++++ + fs/notify/fanotify/fanotify_user.c | 111 ++++++++++++++++++++++++++------ + fs/notify/fsnotify.c | 39 ++++++++--- + fs/notify/inotify/inotify_user.c | 2 +- + fs/notify/mark.c | 8 ++- + fs/ocfs2/super.c | 6 +- + fs/quota/dquot.c | 14 ++-- + fs/quota/quota_v1.c | 3 +- + fs/quota/quota_v2.c | 9 +-- + fs/xfs/xfs_file.c | 4 ++ + fs/xfs/xfs_super.c | 2 +- + include/linux/fanotify.h | 20 ++++-- + include/linux/fs.h | 1 + + include/linux/fsnotify.h | 58 +++++++++++++++-- + include/linux/fsnotify_backend.h | 59 ++++++++++++++++- + include/linux/mm.h | 1 + + include/linux/quota.h | 2 +- + include/uapi/linux/fanotify.h | 18 ++++++ + mm/filemap.c | 128 +++++++++++++++++++++++++++++++++++-- + mm/memory.c | 22 +++++++ + mm/nommu.c | 7 ++ + mm/readahead.c | 13 ++++ + mm/shmem.c | 7 +- + security/selinux/hooks.c | 3 +- + 32 files changed, 526 insertions(+), 93 deletions(-) +Merging ext4/dev (ff2beee206d2 ext4: convert EXT4_B2C(sbi->s_stripe) users to EXT4_NUM_B2C) +$ 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/dir.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/inline.c +CONFLICT (content): Merge conflict in fs/ext4/inline.c +Auto-merging fs/ext4/inode.c +CONFLICT (content): Merge conflict in fs/ext4/inode.c +Auto-merging fs/ext4/super.c +Resolved 'fs/ext4/inline.c' using previous resolution. +Resolved 'fs/ext4/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 295aa4fdb837] Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/ext4.rst | 10 - + fs/ext4/bitmap.c | 8 +- + fs/ext4/dir.c | 14 +- + fs/ext4/ext4.h | 31 +- + fs/ext4/extents.c | 827 +++++++++++++++++++------------------ + fs/ext4/extents_status.c | 240 ++++------- + fs/ext4/extents_status.h | 28 +- + fs/ext4/fast_commit.c | 47 ++- + fs/ext4/file.c | 20 +- + fs/ext4/ialloc.c | 35 +- + fs/ext4/indirect.c | 7 - + fs/ext4/inline.c | 46 ++- + fs/ext4/inode.c | 292 ++++++------- + fs/ext4/mballoc.c | 25 +- + fs/ext4/migrate.c | 7 +- + fs/ext4/move_extent.c | 90 ++-- + fs/ext4/namei.c | 16 +- + fs/ext4/readpage.c | 16 +- + fs/ext4/resize.c | 3 +- + fs/ext4/super.c | 65 ++- + fs/ext4/xattr.c | 31 +- + fs/ext4/xattr.h | 7 +- + fs/jbd2/checkpoint.c | 21 +- + fs/jbd2/journal.c | 97 ++--- + include/linux/jbd2.h | 4 +- + 25 files changed, 991 insertions(+), 996 deletions(-) +Merging f2fs/dev (755f18261376 f2fs: allow F2FS_IPU_NOCACHE for pinned file) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/data.c +CONFLICT (content): Merge conflict in fs/f2fs/data.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/verity.c +Resolved 'fs/f2fs/data.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 391381a644f4] Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-fs-f2fs | 56 +++++++++ + fs/f2fs/checkpoint.c | 17 +-- + fs/f2fs/compress.c | 63 ++++++---- + fs/f2fs/data.c | 162 ++++++++++++++------------ + fs/f2fs/debug.c | 2 +- + fs/f2fs/dir.c | 8 +- + fs/f2fs/extent_cache.c | 4 +- + fs/f2fs/f2fs.h | 150 ++++++++++++++---------- + fs/f2fs/file.c | 199 +++++++++++++++++++++----------- + fs/f2fs/gc.c | 113 +++++++++++++----- + fs/f2fs/gc.h | 29 +++++ + fs/f2fs/inline.c | 31 +++-- + fs/f2fs/inode.c | 9 +- + fs/f2fs/namei.c | 68 ----------- + fs/f2fs/node.c | 46 ++++---- + fs/f2fs/segment.c | 72 +++++++++--- + fs/f2fs/segment.h | 5 +- + fs/f2fs/super.c | 119 +++++++++++-------- + fs/f2fs/sysfs.c | 82 +++++++++---- + fs/f2fs/verity.c | 5 +- + fs/f2fs/xattr.c | 14 ++- + include/linux/f2fs_fs.h | 4 +- + include/trace/events/f2fs.h | 3 +- + 23 files changed, 798 insertions(+), 463 deletions(-) +Merging fsverity/for-next (256abd8e550c Linux 6.10-rc7) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (9dc504f24489 virtio_fs: allow idmapped mounts) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/dev.c +Auto-merging fs/fuse/file.c +Auto-merging fs/namespace.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/fuse/Makefile | 3 + + fs/fuse/acl.c | 10 +-- + fs/fuse/dax.c | 4 +- + fs/fuse/dev.c | 218 ++++++++++++++++++++++++++++------------------ + fs/fuse/dir.c | 172 +++++++++++++++++++++--------------- + fs/fuse/file.c | 214 ++++++++++++++++++++++----------------------- + fs/fuse/fuse_i.h | 28 +++--- + fs/fuse/fuse_trace.h | 132 ++++++++++++++++++++++++++++ + fs/fuse/inode.c | 19 ++-- + fs/fuse/ioctl.c | 2 +- + fs/fuse/readdir.c | 4 +- + fs/fuse/virtio_fs.c | 42 +++------ + fs/fuse/xattr.c | 8 +- + fs/namespace.c | 4 + + include/linux/fs.h | 1 + + include/uapi/linux/fuse.h | 22 ++++- + 16 files changed, 554 insertions(+), 329 deletions(-) + create mode 100644 fs/fuse/fuse_trace.h +Merging gfs2/for-next (6888c1e85f5d gfs2: Remove gfs2_aspace_writepage()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/aops.c | 30 ------------------------------ + fs/gfs2/glock.c | 9 ++++++--- + fs/gfs2/log.c | 12 ++---------- + fs/gfs2/meta_io.c | 24 +++++++++++++++++------- + fs/gfs2/ops_fstype.c | 3 ++- + 5 files changed, 27 insertions(+), 51 deletions(-) +Merging jfs/jfs-next (2b59ffad47db jfs: Fix uninit-value access of new_ea in ea_buffer) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Merge made by the 'ort' strategy. + fs/jfs/jfs_discard.c | 11 +++++++++-- + fs/jfs/jfs_dmap.c | 11 +++++++---- + fs/jfs/jfs_imap.c | 2 +- + fs/jfs/xattr.c | 2 ++ + 4 files changed, 19 insertions(+), 7 deletions(-) +Merging ksmbd/ksmbd-for-next (c5a709f08d40 ksmbd: handle caseless file creation) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Auto-merging fs/smb/server/oplock.c +Merge made by the 'ort' strategy. + fs/smb/server/connection.c | 4 +++- + fs/smb/server/connection.h | 1 + + fs/smb/server/oplock.c | 55 ++++++++++++++-------------------------------- + fs/smb/server/vfs.c | 19 +++++++--------- + fs/smb/server/vfs_cache.c | 3 +++ + 5 files changed, 31 insertions(+), 51 deletions(-) +Merging nfs/linux-next (67784a74e258 Merge tag 'ata-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux) +$ 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 (0f4f77d364b5 nfs: add 'noalignwrite' option for lock-less 'lost writes' prevention) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Merge made by the 'ort' strategy. + fs/nfs/client.c | 6 ++---- + fs/nfs/dir.c | 6 +++--- + fs/nfs/fs_context.c | 8 ++++++++ + fs/nfs/getroot.c | 2 +- + fs/nfs/internal.h | 1 - + fs/nfs/nfs4_fs.h | 2 +- + fs/nfs/nfs4proc.c | 16 ++++++++++++++-- + fs/nfs/nfs4state.c | 22 +++++++++------------- + fs/nfs/nfs4xdr.c | 6 +++--- + fs/nfs/read.c | 3 +-- + fs/nfs/super.c | 3 +++ + fs/nfs/write.c | 9 +++++---- + include/linux/nfs_fs_sb.h | 4 ++-- + include/linux/nfs_xdr.h | 2 +- + include/linux/sunrpc/sched.h | 16 +++++++++------- + net/sunrpc/cache.c | 10 +++------- + net/sunrpc/clnt.c | 7 +------ + 17 files changed, 66 insertions(+), 57 deletions(-) +Merging nfsd/nfsd-next (ae9194e1d7a5 xdrgen: Prevent reordering of encoder and decoder functions) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging .mailmap +Auto-merging include/linux/nfs_xdr.h +Merge made by the 'ort' strategy. + .mailmap | 3 + + Documentation/sunrpc/xdr/nfs4.x | 166 +++++++ + fs/lockd/host.c | 2 +- + fs/lockd/svc.c | 9 +- + fs/nfs/callback.c | 2 + + fs/nfsd/Makefile | 2 +- + fs/nfsd/auth.c | 14 +- + fs/nfsd/auth.h | 2 +- + fs/nfsd/blocklayout.c | 6 +- + fs/nfsd/blocklayoutxdr.h | 2 +- + fs/nfsd/cache.h | 2 +- + fs/nfsd/export.c | 37 +- + fs/nfsd/export.h | 7 +- + fs/nfsd/filecache.c | 36 +- + fs/nfsd/filecache.h | 1 + + fs/nfsd/netns.h | 7 +- + fs/nfsd/nfs3proc.c | 44 ++ + fs/nfsd/nfs4callback.c | 56 ++- + fs/nfsd/nfs4idmap.c | 13 +- + fs/nfsd/nfs4layouts.c | 1 + + fs/nfsd/nfs4proc.c | 100 ++-- + fs/nfsd/nfs4recover.c | 13 +- + fs/nfsd/nfs4state.c | 308 ++++++++----- + fs/nfsd/nfs4xdr.c | 134 +++++- + fs/nfsd/nfs4xdr_gen.c | 239 ++++++++++ + fs/nfsd/nfs4xdr_gen.h | 25 + + fs/nfsd/nfsctl.c | 19 +- + fs/nfsd/nfsd.h | 49 +- + fs/nfsd/nfsfh.c | 58 ++- + fs/nfsd/nfsfh.h | 2 + + fs/nfsd/nfsproc.c | 49 +- + fs/nfsd/nfssvc.c | 126 ++--- + fs/nfsd/state.h | 7 +- + fs/nfsd/trace.h | 124 ++++- + fs/nfsd/vfs.c | 45 +- + fs/nfsd/vfs.h | 4 +- + fs/nfsd/xdr4.h | 1 + + fs/nfsd/xdr4cb.h | 10 +- + include/linux/lockd/lockd.h | 2 +- + include/linux/nfs4.h | 24 +- + include/linux/nfs_xdr.h | 5 - + include/linux/sunrpc/svc.h | 44 +- + include/linux/sunrpc/svc_rdma.h | 2 + + include/linux/sunrpc/svcauth.h | 1 - + include/linux/sunrpc/svcsock.h | 2 - + include/linux/sunrpc/xdrgen/_builtins.h | 243 ++++++++++ + include/linux/sunrpc/xdrgen/_defs.h | 26 ++ + include/linux/sunrpc/xdrgen/nfs4.h | 96 ++++ + include/linux/time64.h | 5 + + include/trace/events/rpcrdma.h | 23 + + include/trace/misc/nfs.h | 1 + + net/sunrpc/sunrpc.h | 4 + + net/sunrpc/svc.c | 130 +++--- + net/sunrpc/svc_xprt.c | 9 - + net/sunrpc/svcauth.c | 1 - + net/sunrpc/svcsock.c | 1 - + net/sunrpc/xprtrdma/svc_rdma_transport.c | 18 +- + tools/net/sunrpc/xdrgen/.gitignore | 2 + + tools/net/sunrpc/xdrgen/README | 244 ++++++++++ + tools/net/sunrpc/xdrgen/__init__.py | 2 + + tools/net/sunrpc/xdrgen/generators/__init__.py | 113 +++++ + tools/net/sunrpc/xdrgen/generators/constant.py | 20 + + tools/net/sunrpc/xdrgen/generators/enum.py | 44 ++ + .../net/sunrpc/xdrgen/generators/header_bottom.py | 33 ++ + tools/net/sunrpc/xdrgen/generators/header_top.py | 45 ++ + tools/net/sunrpc/xdrgen/generators/pointer.py | 272 +++++++++++ + tools/net/sunrpc/xdrgen/generators/program.py | 168 +++++++ + tools/net/sunrpc/xdrgen/generators/source_top.py | 32 ++ + tools/net/sunrpc/xdrgen/generators/struct.py | 272 +++++++++++ + tools/net/sunrpc/xdrgen/generators/typedef.py | 255 +++++++++++ + tools/net/sunrpc/xdrgen/generators/union.py | 243 ++++++++++ + tools/net/sunrpc/xdrgen/grammars/xdr.lark | 119 +++++ + tools/net/sunrpc/xdrgen/subcmds/__init__.py | 2 + + tools/net/sunrpc/xdrgen/subcmds/declarations.py | 76 +++ + tools/net/sunrpc/xdrgen/subcmds/definitions.py | 78 ++++ + tools/net/sunrpc/xdrgen/subcmds/lint.py | 33 ++ + tools/net/sunrpc/xdrgen/subcmds/source.py | 118 +++++ + .../xdrgen/templates/C/constants/definition.j2 | 3 + + .../xdrgen/templates/C/enum/declaration/close.j2 | 4 + + .../sunrpc/xdrgen/templates/C/enum/decoder/enum.j2 | 19 + + .../xdrgen/templates/C/enum/definition/close.j2 | 2 + + .../templates/C/enum/definition/enumerator.j2 | 2 + + .../xdrgen/templates/C/enum/definition/open.j2 | 3 + + .../sunrpc/xdrgen/templates/C/enum/encoder/enum.j2 | 14 + + .../C/header_bottom/declaration/header.j2 | 3 + + .../templates/C/header_bottom/definition/header.j2 | 3 + + .../templates/C/header_top/declaration/header.j2 | 14 + + .../templates/C/header_top/definition/header.j2 | 10 + + .../templates/C/pointer/declaration/close.j2 | 4 + + .../xdrgen/templates/C/pointer/decoder/basic.j2 | 6 + + .../xdrgen/templates/C/pointer/decoder/close.j2 | 3 + + .../C/pointer/decoder/fixed_length_array.j2 | 8 + + .../C/pointer/decoder/fixed_length_opaque.j2 | 6 + + .../xdrgen/templates/C/pointer/decoder/open.j2 | 22 + + .../templates/C/pointer/decoder/optional_data.j2 | 6 + + .../C/pointer/decoder/variable_length_array.j2 | 13 + + .../C/pointer/decoder/variable_length_opaque.j2 | 6 + + .../C/pointer/decoder/variable_length_string.j2 | 6 + + .../xdrgen/templates/C/pointer/definition/basic.j2 | 5 + + .../xdrgen/templates/C/pointer/definition/close.j2 | 2 + + .../C/pointer/definition/fixed_length_array.j2 | 5 + + .../C/pointer/definition/fixed_length_opaque.j2 | 5 + + .../xdrgen/templates/C/pointer/definition/open.j2 | 6 + + .../C/pointer/definition/optional_data.j2 | 5 + + .../C/pointer/definition/variable_length_array.j2 | 8 + + .../C/pointer/definition/variable_length_opaque.j2 | 5 + + .../C/pointer/definition/variable_length_string.j2 | 5 + + .../xdrgen/templates/C/pointer/encoder/basic.j2 | 10 + + .../xdrgen/templates/C/pointer/encoder/close.j2 | 3 + + .../C/pointer/encoder/fixed_length_array.j2 | 12 + + .../C/pointer/encoder/fixed_length_opaque.j2 | 6 + + .../xdrgen/templates/C/pointer/encoder/open.j2 | 20 + + .../templates/C/pointer/encoder/optional_data.j2 | 6 + + .../C/pointer/encoder/variable_length_array.j2 | 15 + + .../C/pointer/encoder/variable_length_opaque.j2 | 8 + + .../C/pointer/encoder/variable_length_string.j2 | 8 + + .../templates/C/program/declaration/argument.j2 | 2 + + .../templates/C/program/declaration/result.j2 | 2 + + .../xdrgen/templates/C/program/decoder/argument.j2 | 21 + + .../xdrgen/templates/C/program/decoder/result.j2 | 22 + + .../xdrgen/templates/C/program/definition/close.j2 | 2 + + .../xdrgen/templates/C/program/definition/open.j2 | 6 + + .../templates/C/program/definition/procedure.j2 | 2 + + .../xdrgen/templates/C/program/encoder/argument.j2 | 16 + + .../xdrgen/templates/C/program/encoder/result.j2 | 21 + + .../sunrpc/xdrgen/templates/C/source_top/client.j2 | 8 + + .../sunrpc/xdrgen/templates/C/source_top/server.j2 | 8 + + .../xdrgen/templates/C/struct/declaration/close.j2 | 4 + + .../xdrgen/templates/C/struct/decoder/basic.j2 | 6 + + .../xdrgen/templates/C/struct/decoder/close.j2 | 3 + + .../C/struct/decoder/fixed_length_array.j2 | 8 + + .../C/struct/decoder/fixed_length_opaque.j2 | 6 + + .../xdrgen/templates/C/struct/decoder/open.j2 | 12 + + .../templates/C/struct/decoder/optional_data.j2 | 6 + + .../C/struct/decoder/variable_length_array.j2 | 13 + + .../C/struct/decoder/variable_length_opaque.j2 | 6 + + .../C/struct/decoder/variable_length_string.j2 | 6 + + .../xdrgen/templates/C/struct/definition/basic.j2 | 5 + + .../xdrgen/templates/C/struct/definition/close.j2 | 2 + + .../C/struct/definition/fixed_length_array.j2 | 5 + + .../C/struct/definition/fixed_length_opaque.j2 | 5 + + .../xdrgen/templates/C/struct/definition/open.j2 | 6 + + .../templates/C/struct/definition/optional_data.j2 | 5 + + .../C/struct/definition/variable_length_array.j2 | 8 + + .../C/struct/definition/variable_length_opaque.j2 | 5 + + .../C/struct/definition/variable_length_string.j2 | 5 + + .../xdrgen/templates/C/struct/encoder/basic.j2 | 10 + + .../xdrgen/templates/C/struct/encoder/close.j2 | 3 + + .../C/struct/encoder/fixed_length_array.j2 | 12 + + .../C/struct/encoder/fixed_length_opaque.j2 | 6 + + .../xdrgen/templates/C/struct/encoder/open.j2 | 12 + + .../templates/C/struct/encoder/optional_data.j2 | 6 + + .../C/struct/encoder/variable_length_array.j2 | 15 + + .../C/struct/encoder/variable_length_opaque.j2 | 8 + + .../C/struct/encoder/variable_length_string.j2 | 8 + + .../templates/C/typedef/declaration/basic.j2 | 8 + + .../C/typedef/declaration/fixed_length_array.j2 | 4 + + .../C/typedef/declaration/fixed_length_opaque.j2 | 4 + + .../C/typedef/declaration/variable_length_array.j2 | 4 + + .../typedef/declaration/variable_length_opaque.j2 | 4 + + .../typedef/declaration/variable_length_string.j2 | 4 + + .../xdrgen/templates/C/typedef/decoder/basic.j2 | 17 + + .../C/typedef/decoder/fixed_length_array.j2 | 25 + + .../C/typedef/decoder/fixed_length_opaque.j2 | 17 + + .../C/typedef/decoder/variable_length_array.j2 | 26 ++ + .../C/typedef/decoder/variable_length_opaque.j2 | 17 + + .../C/typedef/decoder/variable_length_string.j2 | 17 + + .../xdrgen/templates/C/typedef/definition/basic.j2 | 6 + + .../C/typedef/definition/fixed_length_array.j2 | 6 + + .../C/typedef/definition/fixed_length_opaque.j2 | 6 + + .../C/typedef/definition/variable_length_array.j2 | 9 + + .../C/typedef/definition/variable_length_opaque.j2 | 6 + + .../C/typedef/definition/variable_length_string.j2 | 6 + + .../xdrgen/templates/C/typedef/encoder/basic.j2 | 21 + + .../C/typedef/encoder/fixed_length_array.j2 | 25 + + .../C/typedef/encoder/fixed_length_opaque.j2 | 17 + + .../C/typedef/encoder/variable_length_array.j2 | 30 ++ + .../C/typedef/encoder/variable_length_opaque.j2 | 17 + + .../C/typedef/encoder/variable_length_string.j2 | 17 + + .../xdrgen/templates/C/union/decoder/basic.j2 | 6 + + .../xdrgen/templates/C/union/decoder/break.j2 | 2 + + .../xdrgen/templates/C/union/decoder/case_spec.j2 | 2 + + .../xdrgen/templates/C/union/decoder/close.j2 | 4 + + .../templates/C/union/decoder/default_spec.j2 | 2 + + .../xdrgen/templates/C/union/decoder/open.j2 | 12 + + .../templates/C/union/decoder/optional_data.j2 | 6 + + .../templates/C/union/decoder/switch_spec.j2 | 7 + + .../C/union/decoder/variable_length_array.j2 | 13 + + .../C/union/decoder/variable_length_opaque.j2 | 6 + + .../C/union/decoder/variable_length_string.j2 | 6 + + .../xdrgen/templates/C/union/decoder/void.j2 | 3 + + .../templates/C/union/definition/case_spec.j2 | 2 + + .../xdrgen/templates/C/union/definition/close.j2 | 8 + + .../templates/C/union/definition/default_spec.j2 | 2 + + .../xdrgen/templates/C/union/definition/open.j2 | 6 + + .../templates/C/union/definition/switch_spec.j2 | 3 + + .../xdrgen/templates/C/union/encoder/basic.j2 | 10 + + .../xdrgen/templates/C/union/encoder/break.j2 | 2 + + .../xdrgen/templates/C/union/encoder/case_spec.j2 | 2 + + .../xdrgen/templates/C/union/encoder/close.j2 | 4 + + .../templates/C/union/encoder/default_spec.j2 | 2 + + .../xdrgen/templates/C/union/encoder/open.j2 | 12 + + .../templates/C/union/encoder/switch_spec.j2 | 7 + + .../xdrgen/templates/C/union/encoder/void.j2 | 3 + + tools/net/sunrpc/xdrgen/tests/test.x | 36 ++ + tools/net/sunrpc/xdrgen/xdr_ast.py | 510 +++++++++++++++++++++ + tools/net/sunrpc/xdrgen/xdr_parse.py | 36 ++ + tools/net/sunrpc/xdrgen/xdrgen | 132 ++++++ + 208 files changed, 5744 insertions(+), 545 deletions(-) + create mode 100644 Documentation/sunrpc/xdr/nfs4.x + create mode 100644 fs/nfsd/nfs4xdr_gen.c + create mode 100644 fs/nfsd/nfs4xdr_gen.h + create mode 100644 include/linux/sunrpc/xdrgen/_builtins.h + create mode 100644 include/linux/sunrpc/xdrgen/_defs.h + create mode 100644 include/linux/sunrpc/xdrgen/nfs4.h + create mode 100644 tools/net/sunrpc/xdrgen/.gitignore + create mode 100644 tools/net/sunrpc/xdrgen/README + create mode 100644 tools/net/sunrpc/xdrgen/__init__.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/__init__.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/constant.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/enum.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/header_bottom.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/header_top.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/pointer.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/program.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/source_top.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/struct.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/typedef.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/union.py + create mode 100644 tools/net/sunrpc/xdrgen/grammars/xdr.lark + create mode 100644 tools/net/sunrpc/xdrgen/subcmds/__init__.py + create mode 100644 tools/net/sunrpc/xdrgen/subcmds/declarations.py + create mode 100644 tools/net/sunrpc/xdrgen/subcmds/definitions.py + create mode 100644 tools/net/sunrpc/xdrgen/subcmds/lint.py + create mode 100644 tools/net/sunrpc/xdrgen/subcmds/source.py + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/constants/definition.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/declaration/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/decoder/enum.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/definition/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/definition/enumerator.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/definition/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/encoder/enum.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/header_bottom/declaration/header.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/header_bottom/definition/header.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/header_top/declaration/header.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/header_top/definition/header.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/declaration/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/optional_data.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/optional_data.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/optional_data.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/declaration/argument.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/declaration/result.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/decoder/result.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/definition/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/definition/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/definition/procedure.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/encoder/argument.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/source_top/server.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/declaration/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/optional_data.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/optional_data.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/optional_data.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/definition/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/definition/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/definition/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/definition/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/definition/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/definition/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/break.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/case_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/default_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/optional_data.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/switch_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/void.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/definition/case_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/definition/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/definition/default_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/definition/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/definition/switch_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/break.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/case_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/default_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/switch_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/void.j2 + create mode 100644 tools/net/sunrpc/xdrgen/tests/test.x + create mode 100644 tools/net/sunrpc/xdrgen/xdr_ast.py + create mode 100644 tools/net/sunrpc/xdrgen/xdr_parse.py + create mode 100755 tools/net/sunrpc/xdrgen/xdrgen +Merging ntfs3/master (689ecd06ef8d fs/ntfs3: Rename ntfs3_setattr into ntfs_setattr) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/ntfs_fs.h +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 96 ++++++++++++++++++--- + fs/ntfs3/file.c | 196 ++++++++++++++++++++++++++++++------------ + fs/ntfs3/frecord.c | 93 +++++++++++++++++--- + fs/ntfs3/fslog.c | 19 +++- + fs/ntfs3/inode.c | 15 ++-- + fs/ntfs3/lib/lzx_decompress.c | 3 +- + fs/ntfs3/lznt.c | 3 + + fs/ntfs3/namei.c | 4 +- + fs/ntfs3/ntfs_fs.h | 8 +- + fs/ntfs3/record.c | 26 +++--- + fs/ntfs3/run.c | 8 +- + fs/ntfs3/super.c | 57 ++++++------ + fs/ntfs3/xattr.c | 2 +- + 13 files changed, 391 insertions(+), 139 deletions(-) +Merging orangefs/for-next (96319dacaf15 orangefs: Constify struct kobj_type) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Merge made by the 'ort' strategy. + fs/orangefs/orangefs-sysfs.c | 14 +++++++------- + 1 file changed, 7 insertions(+), 7 deletions(-) +Merging overlayfs/overlayfs-next (6c4a5f964504 ovl: fail if trusted xattrs are needed but caller lacks permission) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Auto-merging fs/overlayfs/copy_up.c +Merge made by the 'ort' strategy. + Documentation/filesystems/overlayfs.rst | 7 ++++-- + fs/overlayfs/copy_up.c | 43 ++++++++++++++++++++++++++++++--- + fs/overlayfs/params.c | 38 +++++++++++++++++++++++++---- + fs/overlayfs/super.c | 10 ++------ + 4 files changed, 79 insertions(+), 19 deletions(-) +Merging ubifs/next (92a286e90203 ubi: Fix ubi_init() ubiblock_exit() section mismatch) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (2211561723a6 9p: Enable multipage folios) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Merge made by the 'ort' strategy. + fs/9p/fid.c | 5 ++--- + fs/9p/vfs_inode.c | 1 + + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging v9fs-ericvh/ericvh/for-next (0c3836482481 Linux 6.10) +$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (90fa22da6d6b xfs: ensure st_blocks never goes to zero during COW writes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/xfs_bmap_util.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_super.c +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_ag.c | 94 +--- + fs/xfs/libxfs/xfs_ag.h | 14 - + fs/xfs/libxfs/xfs_alloc_btree.c | 6 +- + fs/xfs/libxfs/xfs_alloc_btree.h | 3 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 8 +- + fs/xfs/libxfs/xfs_bmap.c | 101 +++-- + fs/xfs/libxfs/xfs_bmap_btree.c | 24 +- + fs/xfs/libxfs/xfs_bmap_btree.h | 207 ++++++--- + fs/xfs/libxfs/xfs_defer.c | 1 - + fs/xfs/libxfs/xfs_fs.h | 31 +- + fs/xfs/libxfs/xfs_ialloc.c | 9 +- + fs/xfs/libxfs/xfs_ialloc.h | 4 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 6 +- + fs/xfs/libxfs/xfs_ialloc_btree.h | 3 +- + fs/xfs/libxfs/xfs_inode_fork.c | 40 +- + fs/xfs/libxfs/xfs_inode_util.c | 2 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 5 +- + fs/xfs/libxfs/xfs_refcount_btree.h | 3 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 7 +- + fs/xfs/libxfs/xfs_rmap_btree.h | 3 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 274 ++++++++---- + fs/xfs/libxfs/xfs_rtbitmap.h | 61 +-- + fs/xfs/libxfs/xfs_sb.c | 92 ++-- + fs/xfs/libxfs/xfs_sb.h | 3 + + fs/xfs/libxfs/xfs_trans_resv.c | 4 +- + fs/xfs/libxfs/xfs_types.h | 12 - + fs/xfs/scrub/bmap_repair.c | 2 +- + fs/xfs/scrub/common.h | 29 +- + fs/xfs/scrub/inode_repair.c | 12 +- + fs/xfs/scrub/rtsummary.c | 11 +- + fs/xfs/scrub/rtsummary.h | 2 +- + fs/xfs/scrub/rtsummary_repair.c | 12 +- + fs/xfs/scrub/scrub.h | 29 +- + fs/xfs/scrub/tempfile.c | 2 +- + fs/xfs/xfs_bmap_item.c | 17 + + fs/xfs/xfs_bmap_util.c | 38 +- + fs/xfs/xfs_discard.c | 17 +- + fs/xfs/xfs_exchrange.c | 143 +++++- + fs/xfs/xfs_exchrange.h | 16 +- + fs/xfs/xfs_file.c | 72 ++- + fs/xfs/xfs_fsmap.c | 403 +++++++++++------ + fs/xfs/xfs_fsmap.h | 6 +- + fs/xfs/xfs_fsops.c | 2 +- + fs/xfs/xfs_icache.c | 89 ++-- + fs/xfs/xfs_inode.c | 86 +--- + fs/xfs/xfs_inode.h | 12 +- + fs/xfs/xfs_ioctl.c | 134 +----- + fs/xfs/xfs_log.c | 2 +- + fs/xfs/xfs_log_recover.c | 2 +- + fs/xfs/xfs_mount.c | 2 +- + fs/xfs/xfs_mount.h | 5 +- + fs/xfs/xfs_mru_cache.c | 3 +- + fs/xfs/xfs_qm.c | 48 +- + fs/xfs/xfs_qm.h | 3 + + fs/xfs/xfs_qm_syscalls.c | 13 +- + fs/xfs/xfs_quotaops.c | 53 ++- + fs/xfs/xfs_rtalloc.c | 868 +++++++++++++++++-------------------- + fs/xfs/xfs_super.c | 13 +- + fs/xfs/xfs_symlink.c | 2 +- + fs/xfs/xfs_trace.h | 61 ++- + 60 files changed, 1772 insertions(+), 1454 deletions(-) +Merging zonefs/for-next (c4b3c1332f55 zonefs: add support for FS_IOC_GETFSSYSFSPATH) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Merge made by the 'ort' strategy. + fs/zonefs/sysfs.c | 1 + + 1 file changed, 1 insertion(+) +Merging file-locks/locks-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ 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 (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Already up to date. +Merging vfs-brauner/vfs.all (c72f8f06a2e8 Merge branch 'vfs.procfs' into vfs.all Signed-off-by: Christian Brauner ) +$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging block/fops.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/super.c +CONFLICT (content): Merge conflict in fs/btrfs/super.c +Auto-merging fs/ext4/super.c +CONFLICT (content): Merge conflict in fs/ext4/super.c +Auto-merging fs/fcntl.c +Auto-merging fs/inode.c +Auto-merging fs/xfs/libxfs/xfs_attr_leaf.c +Auto-merging fs/xfs/libxfs/xfs_ialloc.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging fs/xfs/xfs_icache.c +Auto-merging fs/xfs/xfs_mount.c +Auto-merging fs/xfs/xfs_super.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_super.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging include/linux/pagemap.h +Auto-merging mm/filemap.c +Auto-merging mm/readahead.c +Auto-merging mm/shmem.c +Resolved 'fs/btrfs/super.c' using previous resolution. +Resolved 'fs/ext4/super.c' using previous resolution. +Resolved 'fs/xfs/xfs_super.c' using previous resolution. +Resolved 'include/linux/fs.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next fc342716a64a] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/iomap/design.rst | 4 +- + Documentation/filesystems/multigrain-ts.rst | 121 +++++++++++++ + block/fops.c | 2 +- + fs/attr.c | 52 +++++- + fs/btrfs/file.c | 25 +-- + fs/btrfs/super.c | 2 +- + fs/ext4/super.c | 3 +- + fs/gfs2/file.c | 2 +- + fs/inode.c | 261 +++++++++++++++++++++++++--- + fs/iomap/buffered-io.c | 199 +++++++++++++-------- + fs/iomap/direct-io.c | 42 ++++- + fs/stat.c | 42 ++++- + fs/xfs/libxfs/xfs_attr_leaf.c | 15 +- + fs/xfs/libxfs/xfs_ialloc.c | 5 + + fs/xfs/libxfs/xfs_shared.h | 3 + + fs/xfs/libxfs/xfs_trans_inode.c | 6 +- + fs/xfs/xfs_file.c | 2 +- + fs/xfs/xfs_icache.c | 6 +- + fs/xfs/xfs_iomap.c | 19 +- + fs/xfs/xfs_iops.c | 22 +-- + fs/xfs/xfs_mount.c | 8 +- + fs/xfs/xfs_super.c | 31 +++- + fs/zonefs/file.c | 2 +- + include/linux/fs.h | 34 +++- + include/linux/huge_mm.h | 28 ++- + include/linux/iomap.h | 13 +- + include/linux/pagemap.h | 124 +++++++++++-- + include/trace/events/timestamp.h | 124 +++++++++++++ + mm/filemap.c | 36 ++-- + mm/huge_memory.c | 65 ++++++- + mm/readahead.c | 83 ++++++--- + mm/shmem.c | 2 +- + 33 files changed, 1112 insertions(+), 272 deletions(-) + create mode 100644 Documentation/filesystems/multigrain-ts.rst + create mode 100644 include/trace/events/timestamp.h +Merging vfs/for-next (de12c3391bce add struct fd constructors, get rid of __to_fd()) +$ 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 arch/x86/kernel/cpu/sgx/main.c +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging drivers/gpu/drm/drm_syncobj.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/coda/inode.c +CONFLICT (content): Merge conflict in fs/coda/inode.c +Auto-merging fs/eventpoll.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/fcntl.c +Auto-merging fs/fhandle.c +Auto-merging fs/file.c +Auto-merging fs/fuse/dev.c +Auto-merging fs/locks.c +Auto-merging fs/namei.c +Auto-merging fs/namespace.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/notify/inotify/inotify_user.c +Auto-merging fs/open.c +Auto-merging fs/read_write.c +Auto-merging fs/select.c +Auto-merging fs/signalfd.c +Auto-merging fs/smb/client/ioctl.c +Auto-merging fs/stat.c +Auto-merging fs/xfs/xfs_exchrange.c +Auto-merging fs/xfs/xfs_ioctl.c +Auto-merging include/linux/file.h +Auto-merging io_uring/sqpoll.c +Auto-merging kernel/bpf/btf.c +Auto-merging kernel/events/core.c +Auto-merging kernel/module/main.c +Auto-merging kernel/signal.c +Auto-merging kernel/sys.c +Auto-merging mm/filemap.c +Auto-merging mm/memcontrol-v1.c +Auto-merging mm/readahead.c +Auto-merging net/core/net_namespace.c +Auto-merging net/socket.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging sound/core/pcm_native.c +Auto-merging virt/kvm/eventfd.c +Resolved 'fs/coda/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 25ce33e32ffe] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/osf_sys.c | 4 +- + arch/arm/kernel/sys_oabi-compat.c | 10 +-- + arch/powerpc/kvm/book3s_64_vio.c | 4 +- + arch/powerpc/kvm/powerpc.c | 12 +-- + arch/powerpc/platforms/cell/spu_syscalls.c | 8 +- + arch/x86/kernel/cpu/sgx/main.c | 4 +- + arch/x86/kvm/svm/sev.c | 16 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 8 +- + drivers/gpu/drm/drm_syncobj.c | 6 +- + drivers/infiniband/core/ucma.c | 6 +- + drivers/infiniband/core/uverbs_cmd.c | 10 +-- + drivers/media/mc/mc-request.c | 6 +- + drivers/media/rc/lirc_dev.c | 8 +- + drivers/vfio/group.c | 6 +- + drivers/vfio/virqfd.c | 6 +- + drivers/virt/acrn/irqfd.c | 6 +- + drivers/xen/privcmd.c | 10 +-- + fs/btrfs/ioctl.c | 4 +- + fs/eventfd.c | 4 +- + fs/eventpoll.c | 30 ++++---- + fs/ext4/ioctl.c | 6 +- + fs/f2fs/file.c | 6 +- + fs/fcntl.c | 38 +++++----- + fs/fhandle.c | 4 +- + fs/file.c | 26 +++---- + fs/fsopen.c | 6 +- + fs/fuse/dev.c | 6 +- + fs/ioctl.c | 30 ++++---- + fs/kernel_read_file.c | 4 +- + fs/locks.c | 14 ++-- + fs/namei.c | 10 +-- + fs/namespace.c | 12 +-- + fs/notify/fanotify/fanotify_user.c | 12 +-- + fs/notify/inotify/inotify_user.c | 12 +-- + fs/ocfs2/cluster/heartbeat.c | 6 +- + fs/open.c | 24 +++--- + fs/overlayfs/file.c | 68 +++++++++-------- + fs/quota/quota.c | 8 +- + fs/read_write.c | 118 ++++++++++++++--------------- + fs/readdir.c | 20 ++--- + fs/remap_range.c | 2 +- + fs/select.c | 8 +- + fs/signalfd.c | 6 +- + fs/smb/client/ioctl.c | 8 +- + fs/splice.c | 22 +++--- + fs/stat.c | 8 +- + fs/statfs.c | 4 +- + fs/sync.c | 14 ++-- + fs/timerfd.c | 8 +- + fs/utimes.c | 4 +- + fs/xattr.c | 36 ++++----- + fs/xfs/xfs_exchrange.c | 4 +- + fs/xfs/xfs_handle.c | 6 +- + fs/xfs/xfs_ioctl.c | 28 +++---- + include/linux/cleanup.h | 2 +- + include/linux/file.h | 57 +++++++------- + io_uring/sqpoll.c | 10 +-- + ipc/mqueue.c | 50 ++++++------ + kernel/bpf/bpf_inode_storage.c | 14 ++-- + kernel/bpf/btf.c | 6 +- + kernel/bpf/syscall.c | 42 +++++----- + kernel/bpf/token.c | 10 +-- + kernel/cgroup/cgroup.c | 4 +- + kernel/events/core.c | 14 ++-- + kernel/module/main.c | 2 +- + kernel/nsproxy.c | 12 +-- + kernel/pid.c | 10 +-- + kernel/signal.c | 6 +- + kernel/sys.c | 10 +-- + kernel/taskstats.c | 4 +- + kernel/watch_queue.c | 4 +- + mm/fadvise.c | 4 +- + mm/filemap.c | 6 +- + mm/memcontrol-v1.c | 12 +-- + mm/readahead.c | 10 +-- + net/core/net_namespace.c | 6 +- + net/socket.c | 14 ++-- + security/integrity/ima/ima_main.c | 4 +- + security/landlock/syscalls.c | 22 +++--- + security/loadpin/loadpin.c | 4 +- + sound/core/pcm_native.c | 6 +- + virt/kvm/eventfd.c | 6 +- + virt/kvm/vfio.c | 8 +- + 83 files changed, 559 insertions(+), 556 deletions(-) +$ git am -3 ../patches/0001-fixe-up-for-introduce-fd_file-convert-all-accessors-.patch +Applying: fixe up for "introduce fd_file(), convert all accessors to it." +$ git reset HEAD^ +Unstaged changes after reset: +M fs/namespace.c +$ git add -A . +$ git commit -v -a --amend +[fs-next e9d4014927ac] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git + Date: Wed Sep 18 08:37:59 2024 +1000 +$ git am -3 ../patches/0001-fix-up-3-for-introduce-fd_file-convert-all-accessors.patch +Applying: fix up 3 for "introduce fd_file(), convert all accessors to it." +$ git reset HEAD^ +Unstaged changes after reset: +M fs/xfs/xfs_exchrange.c +$ git add -A . +$ git commit -v -a --amend +[fs-next a44000f2b0d8] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git + Date: Wed Sep 18 08:37:59 2024 +1000 +Merging mm-hotfixes/mm-hotfixes-unstable (3356b5a839fe mm-hugetlb-simplify-refs-in-memfd_alloc_folio-v2) +$ 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 kernel/padata.c +Auto-merging kernel/resource.c +Auto-merging mm/filemap.c +Auto-merging mm/gup.c +Auto-merging mm/memory.c +Merge made by the 'ort' strategy. + fs/ocfs2/buffer_head_io.c | 4 ++-- + fs/ocfs2/journal.c | 7 +++--- + fs/ocfs2/quota_local.c | 8 +++++-- + include/linux/hugetlb.h | 10 ++++++++ + kernel/padata.c | 9 +------- + kernel/resource.c | 58 ++++++++++++++++++++++++++++++++++++++++------- + mm/damon/vaddr.c | 2 ++ + mm/filemap.c | 4 ++++ + mm/gup.c | 1 + + mm/huge_memory.c | 2 ++ + mm/hugetlb.c | 37 ++++++++++++++++++++++++++++-- + mm/internal.h | 11 ++++++++- + mm/madvise.c | 2 +- + mm/memfd.c | 20 ++++++++-------- + mm/memory.c | 8 +++---- + mm/vmscan.c | 2 +- + mm/zsmalloc.c | 25 ++++++++++++++------ + 17 files changed, 161 insertions(+), 49 deletions(-) +Merging fs-current (65ca1300d8e1 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch '' of linux-next fs-current +Merge made by the 'ort' strategy. + fs/btrfs/btrfs_inode.h | 1 + + fs/btrfs/ctree.h | 2 ++ + fs/btrfs/defrag.c | 2 ++ + fs/btrfs/file.c | 34 ++++++++++++++++-- + fs/btrfs/tree-checker.c | 2 +- + fs/file.c | 93 ++++++++++++++++++------------------------------- + include/linux/fdtable.h | 8 ++--- + kernel/fork.c | 32 ++++++++--------- + 8 files changed, 88 insertions(+), 86 deletions(-) +Merging kbuild-current/fixes (431c1646e1f8 Linux 6.11-rc6) +$ 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 (e67572cd2204 Linux 6.9-rc6) +$ 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 (0c66c6f4e21c ARM: 9359/1: flush: check if the folio is reserved for no-mapping addresses) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (c060f93253ca arm64: stacktrace: fix the usage of ftrace_graph_ret_addr()) +$ 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 (0e7af99aef5f Merge tag 'riscv-soc-fixes-for-v6.11-final' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/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 (6613476e225e Linux 6.8-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 (8400291e289e Linux 6.11-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 sophgo-fixes/fixes (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (b90fae5df917 m68k: defconfig: Update defconfigs for v6.11-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (734ad0af3609 powerpc/qspinlock: Fix deadlock in MCS queue) +$ 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 (1642285e511c s390/boot: Fix KASLR base offset off by __START_KERNEL bytes) +$ 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 net/main (9410645520e9 Merge tag 'net-next-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Already up to date. +Merging bpf/master (b831f83e40a2 Merge tag 'bpf-6.11-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (9b0874286768 Merge branch 'mctp-serial-tx-escapes') +$ 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/main (7f3287db6543 netfilter: nft_socket: make cgroupsv2 matching work with namespaces) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (031ae72825ce ila: call nf_unregister_net_hooks() sooner) +$ 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 (9410645520e9 Merge tag 'net-next-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging ath/for-current (2f833e8948d6 Revert "wifi: ath11k: support hibernation") +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current +Already up to date. +Merging wpan/master (addf89774e48 ieee802154: Fix build error) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Merge made by the 'ort' strategy. + drivers/net/ieee802154/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging rdma-fixes/for-rc (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (134536c21275 Merge tag 'asoc-fix-v6.11-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (4f9a71435953 ASoC: meson: axg-card: fix 'use-after-free') +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Already up to date. +Merging regmap-fixes/for-linus (10a650193899 Merge remote-tracking branch 'regmap/for-6.10' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. +Merging regulator-fixes/for-linus (1a5caec7f80c regulator: core: Stub devm_regulator_bulk_get_const() if !CONFIG_REGULATOR) +$ 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 (2a8787c1cdc7 spi: nxp-fspi: fix the KASAN report out-of-bounds bug) +$ 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 (fc8c818e7569 PCI: Fix potential deadlock in pcim_intx()) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (47ac09b91bef Linux 6.11-rc4) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (47ac09b91bef Linux 6.11-rc4) +$ 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 (da3ea35007d0 Linux 6.11-rc7) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (7d47d22444bb USB: serial: pl2303: add device id for Macrosilicon MS3020) +$ 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/pl2303.c | 1 + + drivers/usb/serial/pl2303.h | 4 ++++ + 2 files changed, 5 insertions(+) +Merging phy/fixes (431c1646e1f8 Linux 6.11-rc6) +$ 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 (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (979f93ded950 iio: light: opt3001: add missing full-scale range value) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/accel/bma400_core.c | 3 ++- + drivers/iio/light/opt3001.c | 4 ++++ + drivers/iio/light/veml6030.c | 3 +-- + 3 files changed, 7 insertions(+), 3 deletions(-) +Merging counter-current/counter-current (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (da3ea35007d0 Linux 6.11-rc7) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (233a95fd574f soundwire: stream: Revert "soundwire: stream: fix programming slave ports for non-continous port maps") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (98f7e32f20d2 Linux 6.11) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (3870e2850b56 Input: i8042 - add TUXEDO Stellaris 15 Slim Gen6 AMD to i8042 quirk table) +$ 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/serio/i8042-acpipnpio.h | 37 +++++++++++++++++++++++++++++++++++ + 1 file changed, 37 insertions(+) +Merging crypto-current/master (ce212d2afca4 crypto: n2 - Set err to EINVAL if snprintf fails for hmac) +$ 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 (5a88a3f67e37 vfio/pci: Init the count variable in collecting hot-reset devices) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (170c966cbe27 selftests: ksft: Fix finished() helper exit code on skipped tests) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging dmaengine-fixes/fixes (431c1646e1f8 Linux 6.11-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) +$ 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 (bd92c1e07beb mtd: hyperbus: rpc-if: Add missing MODULE_DEVICE_TABLE) +$ 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/hyperbus/rpc-if.c | 7 +++++++ + 1 file changed, 7 insertions(+) +Merging mfd-fixes/for-mfd-fixes (68f860426d50 mfd: axp20x: AXP717: Fix missing IRQ status registers range) +$ 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 (63de936b513f media: atomisp: Fix streaming no longer working on BYT / ISP2400 devices) +$ git merge -m Merge branch 'fixes' of https://git.linuxtv.org/media_stage.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (ab35896730a5 reset: hisilicon: hi6220: add missing MODULE_DESCRIPTION() macro) +$ 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 (5be63fc19fca Linux 6.11-rc5) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (e9408fa234fb MAINTAINERS: Update DTS path for ARM/Microchip (AT91) SoC) +$ 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 (5062d9c0cbbc ARM: dts: omap3-n900: correct the accelerometer orientation) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (59cbd4eea48f KVM: Remove HIGH_RES_TIMERS dependency) +$ 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 (cff59d8631e1 s390/uv: Panic for set and remove shared access UVC errors) +$ 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 (20471071f198 hwmon: (pmbus) Conditionally clear individual status bits for pmbus rev >= 1.2) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (d5240fa65db0 nvdimm/pmem: Set dax flag for all 'PFN_MAP' cases) +$ 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 (da3ea35007d0 Linux 6.11-rc7) +$ 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 dma-mapping-fixes/for-linus (75961ffb5cb3 swiotlb: initialise restricted pool list_head when SWIOTLB_DYNAMIC=y) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging drivers-x86-fixes/fixes (d6de45e3c6f3 platform/x86: asus-wmi: Disable OOBE experience on Zenbook S 16) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (8400291e289e Linux 6.11-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 (8400291e289e Linux 6.11-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 (b739dffa5d57 of/irq: Prevent device address out-of-bounds read in interrupt map walk) +$ 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 (8400291e289e Linux 6.11-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 (0f9592ae26ff scsi: ufs: ufs-mediatek: Add UFSHCD_QUIRK_BROKEN_LSDBS_CAP) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (135be1dc46c6 Merge tag 'drm-xe-fixes-2024-09-12' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (98f7e32f20d2 Linux 6.11) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (aea62c744a9a mmc: cqhci: Fix checking of CQHCI_HALT state) +$ 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 (8400291e289e Linux 6.11-rc1) +$ 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 (8400291e289e Linux 6.11-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 (895384881ec9 hv: vmbus: Constify struct kobj_type and struct attribute_group) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging risc-v-fixes/fixes (7c1e5b9690b0 riscv: Disable preemption while handling PR_RISCV_CTX_SW_FENCEI_OFF) +$ 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 (7d9d88890f04 MAINTAINERS: invert Misc RISC-V SoC Support's pattern) +$ 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 +Auto-merging MAINTAINERS +Auto-merging arch/riscv/boot/dts/starfive/jh7110-common.dtsi +Merge made by the 'ort' strategy. + MAINTAINERS | 10 ++++------ + arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 6 ------ + 2 files changed, 4 insertions(+), 12 deletions(-) +Merging riscv-soc-fixes/riscv-soc-fixes (61f2e8a3a941 riscv: dts: starfive: jh7110-common: Fix lower rate of CPUfreq by setting PLL0 rate to 1.5GHz) +$ 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 (1613e604df0c Linux 6.10-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 (47ac09b91bef Linux 6.11-rc4) +$ 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 (da3ea35007d0 Linux 6.11-rc7) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (8400291e289e Linux 6.11-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 (a366e46da10d pinctrl: meteorlake: Add Arrow Lake-H/U ACPI ID) +$ 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 auxdisplay-fixes/fixes (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (12cb32a52eb6 kunit: Fix missing kerneldoc comment) +$ 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 memblock-fixes/fixes (8043832e2a12 memblock: use numa_valid_node() helper to check for invalid node ID) +$ 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 renesas-fixes/fixes (8c987693dc2d ARM: dts: renesas: rcar-gen2: Add missing #interrupt-cells to DA9063 nodes) +$ 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 perf-current/perf-tools (e162cb25c410 perf daemon: Fix the build on more 32-bit architectures) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (ae835a96d72c x86/efistub: Revert to heap allocated boot_params for PE entrypoint) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (77618db34645 zstd: Fix array-index-out-of-bounds UBSAN warning) +$ 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 (7c626ce4bae1 Linux 6.11-rc3) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (cf1e515c9a40 iommufd/selftest: Make dirty_ops static) +$ 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 (cff56ff737e2 MAINTAINERS: update Andreas Hindborg's email address) +$ 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 w1-fixes/fixes (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (9ec87c5957ea OPP: Fix support for required OPPs for multiple PM domains) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging i2c-host-fixes/i2c/i2c-host-fixes (e2c85d85a05f i2c: qcom-geni: Use IRQF_NO_AUTOEN flag in request_irq()) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-aspeed.c | 16 +++++----- + drivers/i2c/busses/i2c-isch.c | 3 +- + drivers/i2c/busses/i2c-qcom-geni.c | 4 +-- + drivers/i2c/busses/i2c-xiic.c | 60 ++++++++++++++++++++++---------------- + 4 files changed, 45 insertions(+), 38 deletions(-) +Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging clk-fixes/clk-fixes (a4d89b11aca3 clk: qcom: clk-alpha-pll: Simplify the zonda_pll_adjust_l_val()) +$ git merge -m Merge branch 'clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Already up to date. +Merging pwrseq-fixes/pwrseq/for-current (431c1646e1f8 Linux 6.11-rc6) +$ git merge -m Merge branch 'pwrseq/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current +Already up to date. +Merging thead-dt-fixes/thead-dt-fixes (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'thead-dt-fixes' of https://github.com/pdp7/linux.git thead-dt-fixes/thead-dt-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (d92b90f9a54d drm/vboxvideo: Replace fake VLA at end of vbva_mouse_pointer_shape with real VLA) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + Documentation/gpu/drm-kms-helpers.rst | 4 ++-- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 10 ++++++++-- + drivers/gpu/drm/vboxvideo/hgsmi_base.c | 10 +++++++++- + drivers/gpu/drm/vboxvideo/vboxvideo.h | 4 +--- + 4 files changed, 20 insertions(+), 8 deletions(-) +Merging mm-stable/mm-stable (684826f8271a zram: free secondary algorithms names) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/kvm/nested.c +Auto-merging arch/loongarch/include/asm/Kbuild +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/mmu_context.h +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging drivers/block/zram/zram_drv.h +Auto-merging fs/exec.c +Auto-merging fs/proc/internal.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/writeback.h +Auto-merging init/Kconfig +Auto-merging kernel/events/uprobes.c +CONFLICT (content): Merge conflict in kernel/events/uprobes.c +Auto-merging kernel/fork.c +Auto-merging kernel/resource.c +CONFLICT (content): Merge conflict in kernel/resource.c +Auto-merging kernel/sched/fair.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/maple_tree.c +Auto-merging mm/damon/vaddr.c +Auto-merging mm/filemap.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/madvise.c +Auto-merging mm/memcontrol.c +Auto-merging mm/memory.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/mmap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/shmem.c +Auto-merging mm/slab_common.c +Auto-merging mm/userfaultfd.c +Auto-merging mm/vmalloc.c +Auto-merging mm/vmscan.c +Auto-merging mm/zsmalloc.c +Auto-merging tools/testing/selftests/mm/Makefile +Auto-merging tools/testing/selftests/mm/mseal_test.c +Recorded preimage for 'kernel/events/uprobes.c' +Resolved 'kernel/resource.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'kernel/events/uprobes.c'. +[master 4c01cd2085b0] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-block-zram | 7 + + Documentation/admin-guide/blockdev/zram.rst | 64 +- + Documentation/admin-guide/cgroup-v1/memory.rst | 32 +- + Documentation/admin-guide/cgroup-v2.rst | 43 +- + Documentation/admin-guide/kernel-parameters.txt | 24 + + Documentation/admin-guide/mm/damon/start.rst | 4 +- + Documentation/admin-guide/mm/damon/usage.rst | 8 +- + Documentation/admin-guide/mm/transhuge.rst | 64 +- + Documentation/arch/x86/x86_64/boot-options.rst | 12 - + Documentation/core-api/printk-formats.rst | 4 +- + Documentation/dev-tools/kfence.rst | 7 + + .../features/vm/PG_uncached/arch-support.txt | 30 - + Documentation/filesystems/vfs.rst | 3 +- + Documentation/mm/damon/design.rst | 2 +- + Documentation/mm/damon/maintainer-profile.rst | 82 +- + Documentation/mm/page_migration.rst | 22 +- + Documentation/mm/transhuge.rst | 6 +- + Documentation/mm/unevictable-lru.rst | 8 +- + .../zh_CN/admin-guide/mm/damon/start.rst | 4 +- + .../zh_CN/admin-guide/mm/damon/usage.rst | 8 +- + .../translations/zh_CN/mm/page_migration.rst | 6 +- + .../zh_TW/admin-guide/mm/damon/start.rst | 4 +- + .../zh_TW/admin-guide/mm/damon/usage.rst | 8 +- + MAINTAINERS | 14 + + arch/alpha/kernel/osf_sys.c | 2 +- + arch/arc/mm/mmap.c | 3 +- + arch/arm/mm/fault-armv.c | 6 +- + arch/arm/mm/mmap.c | 7 +- + arch/arm64/Kconfig | 4 +- + arch/arm64/include/asm/Kbuild | 1 + + arch/arm64/include/asm/mmzone.h | 13 - + arch/arm64/include/asm/pgtable.h | 30 + + arch/arm64/include/asm/topology.h | 1 + + arch/arm64/kvm/nested.c | 1 - + arch/csky/abiv1/mmap.c | 3 +- + arch/csky/kernel/vdso.c | 28 +- + arch/hexagon/kernel/vdso.c | 14 +- + arch/loongarch/configs/loongson3_defconfig | 1 - + arch/loongarch/include/asm/Kbuild | 1 + + arch/loongarch/include/asm/mmzone.h | 16 - + arch/loongarch/include/asm/topology.h | 1 + + arch/loongarch/kernel/numa.c | 21 - + arch/loongarch/mm/mmap.c | 5 +- + arch/mips/Kconfig | 5 - + arch/mips/include/asm/mach-ip27/mmzone.h | 1 - + arch/mips/include/asm/mach-loongson64/mmzone.h | 4 - + arch/mips/loongson64/numa.c | 28 +- + arch/mips/mm/mmap.c | 5 +- + arch/mips/sgi-ip27/ip27-memory.c | 12 +- + arch/mips/sgi-ip27/ip27-smp.c | 2 + + arch/nios2/mm/init.c | 12 +- + arch/parisc/kernel/sys_parisc.c | 5 +- + arch/parisc/mm/hugetlbpage.c | 2 +- + arch/powerpc/configs/ppc64_defconfig | 1 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 3 + + arch/powerpc/include/asm/mmu_context.h | 9 - + arch/powerpc/include/asm/mmzone.h | 6 - + arch/powerpc/include/asm/pgtable.h | 1 + + arch/powerpc/kernel/vdso.c | 35 +- + arch/powerpc/mm/book3s64/pgtable.c | 20 + + arch/powerpc/mm/book3s64/slice.c | 10 +- + arch/powerpc/mm/numa.c | 22 +- + arch/powerpc/mm/pgtable-frag.c | 6 +- + arch/powerpc/mm/pgtable.c | 6 + + arch/powerpc/platforms/pseries/papr-vpd.c | 5 +- + arch/riscv/include/asm/Kbuild | 1 + + arch/riscv/include/asm/mmzone.h | 13 - + arch/riscv/include/asm/topology.h | 4 + + arch/s390/include/asm/Kbuild | 1 + + arch/s390/include/asm/mmzone.h | 17 - + arch/s390/include/asm/page.h | 2 - + arch/s390/include/asm/pgtable.h | 1 + + arch/s390/kernel/numa.c | 3 - + arch/s390/kernel/uv.c | 23 +- + arch/s390/mm/fault.c | 16 +- + arch/s390/mm/mmap.c | 4 +- + arch/s390/pci/pci_mmio.c | 22 +- + arch/sh/include/asm/mmzone.h | 3 - + arch/sh/kernel/vsyscall/vsyscall.c | 14 +- + arch/sh/mm/init.c | 7 +- + arch/sh/mm/mmap.c | 5 +- + arch/sh/mm/numa.c | 3 - + arch/sparc/include/asm/mmzone.h | 4 - + arch/sparc/include/asm/pgtable_64.h | 1 + + arch/sparc/kernel/sys_sparc_32.c | 2 +- + arch/sparc/kernel/sys_sparc_64.c | 4 +- + arch/sparc/mm/init_64.c | 11 +- + arch/x86/Kconfig | 15 +- + arch/x86/boot/compressed/misc.c | 2 +- + arch/x86/boot/compressed/misc.h | 2 +- + arch/x86/include/asm/Kbuild | 1 + + arch/x86/include/asm/mmu_context.h | 5 - + arch/x86/include/asm/mmzone.h | 6 - + arch/x86/include/asm/mmzone_32.h | 17 - + arch/x86/include/asm/mmzone_64.h | 18 - + arch/x86/include/asm/numa.h | 26 +- + arch/x86/include/asm/pgtable.h | 150 +- + arch/x86/include/asm/pgtable_64.h | 1 - + arch/x86/include/asm/sparsemem.h | 9 - + arch/x86/kernel/sys_x86_64.c | 21 +- + arch/x86/mm/Makefile | 1 - + arch/x86/mm/amdtopology.c | 1 + + arch/x86/mm/numa.c | 626 +----- + arch/x86/mm/numa_internal.h | 24 - + arch/x86/mm/pat/memtype.c | 25 +- + arch/x86/mm/pgtable.c | 18 + + arch/x86/um/vdso/vma.c | 12 +- + arch/x86/xen/mmu_pv.c | 7 +- + arch/xtensa/kernel/syscall.c | 3 +- + drivers/acpi/numa/srat.c | 1 + + drivers/base/Kconfig | 1 + + drivers/base/arch_numa.c | 224 +- + drivers/block/zram/Kconfig | 79 +- + drivers/block/zram/Makefile | 8 + + drivers/block/zram/backend_842.c | 61 + + drivers/block/zram/backend_842.h | 10 + + drivers/block/zram/backend_deflate.c | 146 ++ + drivers/block/zram/backend_deflate.h | 10 + + drivers/block/zram/backend_lz4.c | 127 ++ + drivers/block/zram/backend_lz4.h | 10 + + drivers/block/zram/backend_lz4hc.c | 128 ++ + drivers/block/zram/backend_lz4hc.h | 10 + + drivers/block/zram/backend_lzo.c | 59 + + drivers/block/zram/backend_lzo.h | 10 + + drivers/block/zram/backend_lzorle.c | 59 + + drivers/block/zram/backend_lzorle.h | 10 + + drivers/block/zram/backend_zstd.c | 226 ++ + drivers/block/zram/backend_zstd.h | 10 + + drivers/block/zram/zcomp.c | 192 +- + drivers/block/zram/zcomp.h | 71 +- + drivers/block/zram/zram_drv.c | 141 +- + drivers/block/zram/zram_drv.h | 1 + + drivers/cxl/Kconfig | 2 +- + drivers/dax/Kconfig | 2 +- + drivers/dax/device.c | 6 +- + drivers/firmware/efi/libstub/efistub.h | 2 +- + drivers/firmware/efi/libstub/unaccepted_memory.c | 3 +- + drivers/firmware/efi/unaccepted_memory.c | 18 +- + drivers/gpu/drm/drm_exec.c | 3 +- + drivers/of/of_numa.c | 5 +- + drivers/vdpa/vdpa_user/iova_domain.c | 19 +- + drivers/vdpa/vdpa_user/iova_domain.h | 1 + + drivers/vfio/pci/vfio_pci_core.c | 60 +- + drivers/vfio/vfio_iommu_type1.c | 16 +- + drivers/virt/acrn/mm.c | 16 +- + fs/Kconfig | 4 + + fs/exec.c | 81 +- + fs/proc/internal.h | 3 +- + fs/proc/page.c | 11 +- + fs/userfaultfd.c | 171 +- + fs/xfs/scrub/xfile.c | 6 +- + fs/xfs/xfs_buf_mem.c | 2 +- + fs/xfs/xfs_log_recover.c | 2 +- + include/asm-generic/mm_hooks.h | 11 +- + include/asm-generic/mmzone.h | 5 + + include/asm-generic/numa.h | 8 +- + include/linux/alloc_tag.h | 26 +- + include/linux/cgroup-defs.h | 11 +- + include/linux/cgroup.h | 3 + + include/linux/cma.h | 16 + + include/linux/damon.h | 3 +- + include/linux/err.h | 9 + + include/linux/fs.h | 1 - + include/linux/gfp.h | 25 +- + include/linux/gfp_types.h | 8 +- + include/linux/huge_mm.h | 130 +- + include/linux/hugetlb.h | 17 +- + include/linux/kernel-page-flags.h | 3 +- + include/linux/kfence.h | 2 +- + include/linux/khugepaged.h | 1 + + include/linux/maple_tree.h | 20 +- + include/linux/memcontrol.h | 67 +- + include/linux/memory_hotplug.h | 48 - + include/linux/migrate.h | 3 + + include/linux/mm.h | 300 ++- + include/linux/mm_types.h | 22 +- + include/linux/mm_types_task.h | 3 - + include/linux/mmzone.h | 35 +- + include/linux/numa.h | 8 + + include/linux/numa_memblks.h | 58 + + include/linux/page-flags.h | 202 +- + include/linux/page_counter.h | 27 +- + include/linux/pagewalk.h | 58 + + include/linux/percpu.h | 1 - + include/linux/pgalloc_tag.h | 31 - + include/linux/pgtable.h | 18 + + include/linux/rmap.h | 11 +- + include/linux/sched/mm.h | 27 +- + include/linux/sched/task_stack.h | 18 +- + include/linux/set_memory.h | 8 +- + include/linux/shmem_fs.h | 15 +- + include/linux/slab.h | 14 +- + include/linux/swap.h | 44 +- + include/linux/userfaultfd_k.h | 19 + + include/linux/vm_event_item.h | 26 + + include/linux/vmalloc.h | 4 + + include/linux/vmstat.h | 1 + + include/linux/writeback.h | 3 + + include/linux/zstd.h | 167 ++ + include/linux/zswap.h | 16 +- + include/trace/events/filemap.h | 84 + + include/trace/events/mmflags.h | 36 +- + include/trace/events/oom.h | 4 +- + include/uapi/linux/kernel-page-flags.h | 2 +- + init/Kconfig | 2 +- + ipc/shm.c | 8 +- + kernel/Makefile | 1 - + kernel/cgroup/cgroup-internal.h | 2 + + kernel/cgroup/cgroup.c | 23 +- + kernel/events/uprobes.c | 35 +- + kernel/exit.c | 57 + + kernel/fork.c | 4 +- + kernel/numa.c | 26 - + kernel/resource.c | 13 +- + kernel/resource_kunit.c | 143 ++ + kernel/sched/core.c | 4 +- + kernel/sched/fair.c | 14 +- + kernel/vmcore_info.c | 8 +- + lib/Kconfig.debug | 1 + + lib/fortify_kunit.c | 3 +- + lib/lz4/lz4hc_compress.c | 1 + + lib/maple_tree.c | 835 ++++---- + lib/test_hmm.c | 5 +- + lib/test_printf.c | 26 - + lib/vsprintf.c | 21 - + lib/zstd/compress/zstd_compress.c | 2 + + lib/zstd/zstd_compress_module.c | 49 + + lib/zstd/zstd_decompress_module.c | 36 + + mm/Kconfig | 86 +- + mm/Makefile | 8 +- + mm/cma.c | 57 +- + mm/compaction.c | 47 +- + mm/damon/core.c | 24 +- + mm/damon/dbgfs.c | 2 +- + mm/damon/sysfs.c | 2 +- + mm/damon/tests/.kunitconfig | 22 + + mm/damon/{core-test.h => tests/core-kunit.h} | 35 +- + mm/damon/{dbgfs-test.h => tests/dbgfs-kunit.h} | 10 + + mm/damon/{sysfs-test.h => tests/sysfs-kunit.h} | 0 + mm/damon/{vaddr-test.h => tests/vaddr-kunit.h} | 2 +- + mm/damon/vaddr.c | 2 +- + mm/debug.c | 31 +- + mm/debug_vm_pgtable.c | 50 +- + mm/filemap.c | 67 +- + mm/folio-compat.c | 12 - + mm/gup.c | 68 +- + mm/huge_memory.c | 597 ++++-- + mm/hugetlb.c | 472 ++--- + mm/hugetlb_cgroup.c | 4 +- + mm/hugetlb_vmemmap.c | 40 +- + mm/internal.h | 216 +- + mm/kfence/core.c | 53 +- + mm/kfence/kfence.h | 1 + + mm/kfence/report.c | 15 +- + mm/khugepaged.c | 75 +- + mm/kmemleak.c | 159 +- + mm/ksm.c | 146 +- + mm/madvise.c | 13 +- + mm/memblock.c | 2 +- + mm/memcontrol-v1.c | 126 +- + mm/memcontrol-v1.h | 26 +- + mm/memcontrol.c | 492 ++--- + mm/memory-failure.c | 92 +- + mm/memory-tiers.c | 22 +- + mm/memory.c | 562 +++-- + mm/memory_hotplug.c | 85 +- + mm/mempolicy.c | 8 +- + mm/migrate.c | 278 ++- + mm/migrate_device.c | 108 +- + mm/mm_init.c | 12 +- + mm/mmap.c | 2158 ++------------------ + mm/mmu_notifier.c | 2 + + mm/mmzone.c | 2 +- + mm/mprotect.c | 86 +- + mm/mremap.c | 32 +- + mm/mseal.c | 55 +- + mm/nommu.c | 11 +- + mm/numa.c | 69 + + {arch/x86/mm => mm}/numa_emulation.c | 42 +- + mm/numa_memblks.c | 571 ++++++ + mm/page-writeback.c | 2 +- + mm/page_alloc.c | 349 ++-- + mm/page_counter.c | 48 +- + mm/page_io.c | 113 +- + mm/page_isolation.c | 36 +- + mm/pagewalk.c | 202 ++ + mm/percpu.c | 31 - + mm/rmap.c | 71 +- + mm/shmem.c | 450 ++-- + mm/shmem_quota.c | 3 - + mm/show_mem.c | 11 +- + mm/shrinker_debug.c | 2 +- + mm/slab_common.c | 27 +- + mm/swap.c | 298 ++- + mm/swap.h | 44 +- + mm/swap_cgroup.c | 2 + + mm/swap_state.c | 78 +- + mm/swapfile.c | 1512 ++++++++------ + mm/userfaultfd.c | 170 +- + mm/util.c | 102 +- + mm/vma.c | 2068 +++++++++++++++++++ + mm/vma.h | 558 +++++ + mm/vma_internal.h | 49 + + mm/vmalloc.c | 139 +- + mm/vmscan.c | 67 +- + mm/vmstat.c | 28 + + mm/z3fold.c | 2 +- + mm/zsmalloc.c | 15 +- + mm/zswap.c | 315 ++- + samples/kmemleak/kmemleak-test.c | 2 + + scripts/Makefile.kasan | 43 +- + tools/mm/page-types.c | 13 +- + tools/testing/memblock/internal.h | 2 +- + tools/testing/radix-tree/.gitignore | 1 + + tools/testing/radix-tree/Makefile | 72 +- + tools/testing/radix-tree/maple.c | 109 +- + tools/testing/radix-tree/xarray.c | 10 +- + tools/testing/selftests/cgroup/cgroup_util.c | 22 + + tools/testing/selftests/cgroup/cgroup_util.h | 2 + + tools/testing/selftests/cgroup/test_memcontrol.c | 264 ++- + tools/testing/selftests/cgroup/test_zswap.c | 79 +- + tools/testing/selftests/damon/.gitignore | 1 + + tools/testing/selftests/damon/Makefile | 2 + + tools/testing/selftests/damon/damon_nr_regions.py | 0 + .../selftests/damon/damos_apply_interval.py | 0 + tools/testing/selftests/damon/damos_quota.py | 0 + tools/testing/selftests/damon/damos_quota_goal.py | 0 + .../testing/selftests/damon/damos_tried_regions.py | 0 + .../selftests/damon/debugfs_target_ids_pid_leak.sh | 0 + ...ebugfs_target_ids_read_before_terminate_race.sh | 0 + .../sysfs_update_schemes_tried_regions_hang.py | 0 + ..._update_schemes_tried_regions_wss_estimation.py | 0 + tools/testing/selftests/mm/Makefile | 2 +- + .../selftests/mm/charge_reserved_hugetlb.sh | 2 +- + tools/testing/selftests/mm/hugepage-mmap.c | 18 +- + tools/testing/selftests/mm/hugepage-shm.c | 18 +- + tools/testing/selftests/mm/hugepage-vmemmap.c | 17 +- + tools/testing/selftests/mm/khugepaged.c | 4 +- + tools/testing/selftests/mm/map_hugetlb.c | 18 +- + tools/testing/selftests/mm/migration.c | 17 +- + tools/testing/selftests/mm/mseal_test.c | 197 +- + tools/testing/selftests/mm/run_vmtests.sh | 2 +- + tools/testing/selftests/mm/split_huge_page_test.c | 71 + + tools/testing/selftests/mm/thp_settings.c | 46 +- + tools/testing/selftests/mm/thp_settings.h | 9 +- + tools/testing/selftests/mm/vm_util.c | 22 + + tools/testing/selftests/mm/vm_util.h | 1 + + tools/testing/selftests/mm/write_to_hugetlbfs.c | 23 +- + .../{radix-tree/generated => shared}/autoconf.h | 0 + tools/testing/{radix-tree => shared}/linux.c | 26 +- + tools/testing/{radix-tree => shared}/linux/bug.h | 0 + tools/testing/{radix-tree => shared}/linux/cpu.h | 0 + tools/testing/{radix-tree => shared}/linux/idr.h | 0 + tools/testing/{radix-tree => shared}/linux/init.h | 0 + .../testing/{radix-tree => shared}/linux/kconfig.h | 0 + .../testing/{radix-tree => shared}/linux/kernel.h | 0 + .../{radix-tree => shared}/linux/kmemleak.h | 0 + .../{radix-tree => shared}/linux/local_lock.h | 0 + .../testing/{radix-tree => shared}/linux/lockdep.h | 0 + .../{radix-tree => shared}/linux/maple_tree.h | 0 + .../testing/{radix-tree => shared}/linux/percpu.h | 0 + .../testing/{radix-tree => shared}/linux/preempt.h | 0 + .../{radix-tree => shared}/linux/radix-tree.h | 0 + .../{radix-tree => shared}/linux/rcupdate.h | 0 + .../testing/{radix-tree => shared}/linux/xarray.h | 0 + tools/testing/shared/maple-shared.h | 9 + + tools/testing/shared/maple-shim.c | 7 + + tools/testing/shared/shared.h | 33 + + tools/testing/shared/shared.mk | 72 + + .../trace/events/maple_tree.h | 0 + tools/testing/shared/xarray-shared.c | 5 + + tools/testing/shared/xarray-shared.h | 4 + + tools/testing/vma/.gitignore | 7 + + tools/testing/vma/Makefile | 18 + + tools/testing/vma/linux/atomic.h | 12 + + tools/testing/vma/linux/mmzone.h | 38 + + tools/testing/vma/vma.c | 1563 ++++++++++++++ + tools/testing/vma/vma_internal.h | 923 +++++++++ + virt/kvm/kvm_main.c | 19 +- + 379 files changed, 16275 insertions(+), 8499 deletions(-) + delete mode 100644 Documentation/features/vm/PG_uncached/arch-support.txt + delete mode 100644 arch/arm64/include/asm/mmzone.h + delete mode 100644 arch/loongarch/include/asm/mmzone.h + delete mode 100644 arch/riscv/include/asm/mmzone.h + delete mode 100644 arch/s390/include/asm/mmzone.h + delete mode 100644 arch/x86/include/asm/mmzone.h + delete mode 100644 arch/x86/include/asm/mmzone_32.h + delete mode 100644 arch/x86/include/asm/mmzone_64.h + create mode 100644 drivers/block/zram/backend_842.c + create mode 100644 drivers/block/zram/backend_842.h + create mode 100644 drivers/block/zram/backend_deflate.c + create mode 100644 drivers/block/zram/backend_deflate.h + create mode 100644 drivers/block/zram/backend_lz4.c + create mode 100644 drivers/block/zram/backend_lz4.h + create mode 100644 drivers/block/zram/backend_lz4hc.c + create mode 100644 drivers/block/zram/backend_lz4hc.h + create mode 100644 drivers/block/zram/backend_lzo.c + create mode 100644 drivers/block/zram/backend_lzo.h + create mode 100644 drivers/block/zram/backend_lzorle.c + create mode 100644 drivers/block/zram/backend_lzorle.h + create mode 100644 drivers/block/zram/backend_zstd.c + create mode 100644 drivers/block/zram/backend_zstd.h + create mode 100644 include/asm-generic/mmzone.h + create mode 100644 include/linux/numa_memblks.h + delete mode 100644 kernel/numa.c + create mode 100644 mm/damon/tests/.kunitconfig + rename mm/damon/{core-test.h => tests/core-kunit.h} (93%) + rename mm/damon/{dbgfs-test.h => tests/dbgfs-kunit.h} (94%) + rename mm/damon/{sysfs-test.h => tests/sysfs-kunit.h} (100%) + rename mm/damon/{vaddr-test.h => tests/vaddr-kunit.h} (99%) + create mode 100644 mm/numa.c + rename {arch/x86/mm => mm}/numa_emulation.c (94%) + create mode 100644 mm/numa_memblks.c + create mode 100644 mm/vma.c + create mode 100644 mm/vma.h + create mode 100644 mm/vma_internal.h + mode change 100644 => 100755 tools/testing/selftests/damon/damon_nr_regions.py + mode change 100644 => 100755 tools/testing/selftests/damon/damos_apply_interval.py + mode change 100644 => 100755 tools/testing/selftests/damon/damos_quota.py + mode change 100644 => 100755 tools/testing/selftests/damon/damos_quota_goal.py + mode change 100644 => 100755 tools/testing/selftests/damon/damos_tried_regions.py + mode change 100644 => 100755 tools/testing/selftests/damon/debugfs_target_ids_pid_leak.sh + mode change 100644 => 100755 tools/testing/selftests/damon/debugfs_target_ids_read_before_terminate_race.sh + mode change 100644 => 100755 tools/testing/selftests/damon/sysfs_update_schemes_tried_regions_hang.py + mode change 100644 => 100755 tools/testing/selftests/damon/sysfs_update_schemes_tried_regions_wss_estimation.py + rename tools/testing/{radix-tree/generated => shared}/autoconf.h (100%) + rename tools/testing/{radix-tree => shared}/linux.c (91%) + rename tools/testing/{radix-tree => shared}/linux/bug.h (100%) + rename tools/testing/{radix-tree => shared}/linux/cpu.h (100%) + rename tools/testing/{radix-tree => shared}/linux/idr.h (100%) + rename tools/testing/{radix-tree => shared}/linux/init.h (100%) + rename tools/testing/{radix-tree => shared}/linux/kconfig.h (100%) + rename tools/testing/{radix-tree => shared}/linux/kernel.h (100%) + rename tools/testing/{radix-tree => shared}/linux/kmemleak.h (100%) + rename tools/testing/{radix-tree => shared}/linux/local_lock.h (100%) + rename tools/testing/{radix-tree => shared}/linux/lockdep.h (100%) + rename tools/testing/{radix-tree => shared}/linux/maple_tree.h (100%) + rename tools/testing/{radix-tree => shared}/linux/percpu.h (100%) + rename tools/testing/{radix-tree => shared}/linux/preempt.h (100%) + rename tools/testing/{radix-tree => shared}/linux/radix-tree.h (100%) + rename tools/testing/{radix-tree => shared}/linux/rcupdate.h (100%) + rename tools/testing/{radix-tree => shared}/linux/xarray.h (100%) + create mode 100644 tools/testing/shared/maple-shared.h + create mode 100644 tools/testing/shared/maple-shim.c + create mode 100644 tools/testing/shared/shared.h + create mode 100644 tools/testing/shared/shared.mk + rename tools/testing/{radix-tree => shared}/trace/events/maple_tree.h (100%) + create mode 100644 tools/testing/shared/xarray-shared.c + create mode 100644 tools/testing/shared/xarray-shared.h + create mode 100644 tools/testing/vma/.gitignore + create mode 100644 tools/testing/vma/Makefile + create mode 100644 tools/testing/vma/linux/atomic.h + create mode 100644 tools/testing/vma/linux/mmzone.h + create mode 100644 tools/testing/vma/vma.c + create mode 100644 tools/testing/vma/vma_internal.h +Merging mm-nonmm-stable/mm-nonmm-stable (5e06e08939df list: test: increase coverage of list_test_list_replace*()) +$ 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 +Auto-merging MAINTAINERS +Auto-merging arch/riscv/Kconfig +Auto-merging fs/nilfs2/dir.c +Auto-merging fs/nilfs2/inode.c +Auto-merging fs/nilfs2/recovery.c +Auto-merging fs/nilfs2/segment.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/ocfs2/dir.c +Auto-merging fs/proc/task_mmu.c +Auto-merging init/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging lib/math/Makefile +Auto-merging mm/memory-tiers.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-devices-memory | 6 +- + Documentation/ABI/testing/sysfs-devices-system-cpu | 6 +- + Documentation/admin-guide/mm/memory-hotplug.rst | 5 +- + Documentation/core-api/cpu_hotplug.rst | 10 +- + Documentation/staging/xz.rst | 141 +++++------- + LICENSES/deprecated/0BSD | 23 ++ + MAINTAINERS | 14 ++ + arch/arm/lib/xor-neon.c | 1 + + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 2 +- + arch/arm64/boot/Makefile | 5 +- + arch/powerpc/boot/xz_config.h | 3 - + arch/riscv/Kconfig | 1 + + arch/riscv/Makefile | 6 +- + arch/riscv/boot/Makefile | 3 + + arch/x86/mm/testmmiotrace.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 2 +- + drivers/gpu/drm/msm/msm_debugfs.c | 2 - + drivers/gpu/drm/msm/msm_drv.c | 3 +- + drivers/gpu/drm/msm/msm_drv.h | 4 - + drivers/gpu/drm/xe/xe_debugfs.c | 7 +- + drivers/gpu/drm/xe/xe_gt.h | 10 +- + drivers/infiniband/core/sa_query.c | 2 +- + drivers/input/misc/wistron_btns.c | 2 +- + drivers/iommu/iommufd/selftest.c | 1 + + drivers/misc/xilinx_tmr_inject.c | 1 + + drivers/mtd/nand/raw/nandsim.c | 2 +- + drivers/nvme/host/fault_inject.c | 1 + + drivers/scsi/bfa/bfa_fcs.c | 2 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/ufs/core/ufs-fault-injection.c | 1 + + fs/nfs/nfs4xdr.c | 11 +- + fs/nilfs2/alloc.h | 2 +- + fs/nilfs2/bmap.c | 2 +- + fs/nilfs2/bmap.h | 20 +- + fs/nilfs2/btnode.c | 63 +++++- + fs/nilfs2/btree.c | 12 +- + fs/nilfs2/btree.h | 1 + + fs/nilfs2/cpfile.c | 54 ++--- + fs/nilfs2/dat.c | 17 +- + fs/nilfs2/dir.c | 44 +--- + fs/nilfs2/inode.c | 79 ++----- + fs/nilfs2/ioctl.c | 109 +++++++++- + fs/nilfs2/mdt.c | 6 +- + fs/nilfs2/nilfs.h | 27 ++- + fs/nilfs2/page.c | 21 +- + fs/nilfs2/page.h | 4 +- + fs/nilfs2/recovery.c | 11 +- + fs/nilfs2/segment.c | 236 +++++++++++---------- + fs/nilfs2/segment.h | 10 +- + fs/nilfs2/sufile.c | 52 +++-- + fs/nilfs2/super.c | 9 + + fs/nilfs2/the_nilfs.c | 5 - + fs/nilfs2/the_nilfs.h | 6 - + fs/ocfs2/aops.c | 2 +- + fs/ocfs2/dir.c | 12 +- + fs/ocfs2/dlmglue.c | 7 +- + fs/ocfs2/localalloc.c | 19 ++ + fs/ocfs2/quota_global.c | 15 +- + fs/ocfs2/refcounttree.c | 13 +- + fs/ocfs2/super.c | 4 +- + fs/ocfs2/xattr.c | 15 +- + fs/proc/inode.c | 31 +-- + fs/proc/task_mmu.c | 15 -- + fs/squashfs/decompressor_multi_percpu.c | 6 +- + include/linux/decompress/unxz.h | 5 +- + include/linux/fault-inject.h | 36 +++- + include/linux/lru_cache.h | 4 +- + include/linux/mmc/host.h | 1 + + include/linux/ratelimit_types.h | 2 +- + include/linux/string_choices.h | 6 + + include/linux/xz.h | 83 ++++---- + include/ufs/ufshcd.h | 1 + + init/Kconfig | 5 +- + kernel/crash_core.c | 33 +-- + kernel/crash_reserve.c | 3 + + kernel/futex/core.c | 1 + + kernel/kexec_internal.h | 3 +- + kernel/kthread.c | 10 +- + kernel/locking/test-ww_mutex.c | 1 + + kernel/user_namespace.c | 5 +- + kernel/watchdog.c | 5 +- + lib/Kconfig.debug | 12 +- + lib/Makefile | 1 + + lib/bcd.c | 4 +- + lib/checksum_kunit.c | 9 +- + lib/closure.c | 2 +- + lib/decompress_unxz.c | 40 ++-- + lib/dim/Makefile | 2 +- + lib/dynamic_debug.c | 4 +- + lib/fault-inject.c | 1 + + lib/glob.c | 2 + + lib/list-test.c | 10 + + lib/lru_cache.c | 10 +- + lib/math/Makefile | 1 + + lib/math/div64.c | 117 ++++++---- + lib/math/test_mul_u64_u64_div_u64.c | 99 +++++++++ + lib/percpu_counter.c | 2 +- + lib/rhashtable.c | 2 +- + lib/test_fpu_glue.c | 2 +- + lib/test_objpool.c | 3 +- + lib/xz/Kconfig | 13 +- + lib/xz/xz_crc32.c | 11 +- + lib/xz/xz_dec_bcj.c | 191 +++++++++++++++-- + lib/xz/xz_dec_lzma2.c | 15 +- + lib/xz/xz_dec_stream.c | 13 +- + lib/xz/xz_dec_syms.c | 14 +- + lib/xz/xz_dec_test.c | 12 +- + lib/xz/xz_lzma2.h | 5 +- + lib/xz/xz_private.h | 40 ++-- + lib/xz/xz_stream.h | 5 +- + mm/fail_page_alloc.c | 1 + + mm/failslab.c | 1 + + mm/memory-tiers.c | 3 +- + scripts/Makefile.lib | 13 +- + scripts/decode_stacktrace.sh | 51 +++-- + scripts/gdb/linux/kasan.py | 44 ++++ + scripts/gdb/linux/proc.py | 4 +- + scripts/gdb/linux/rbtree.py | 12 ++ + scripts/gdb/linux/stackdepot.py | 27 +++ + scripts/gdb/linux/timerlist.py | 31 +-- + scripts/gdb/vmlinux-gdb.py | 1 + + scripts/macro_checker.py | 131 ++++++++++++ + scripts/xz_wrap.sh | 160 +++++++++++++- + tools/mm/Makefile | 2 +- + tools/testing/fault-injection/failcmd.sh | 12 ++ + 125 files changed, 1693 insertions(+), 855 deletions(-) + create mode 100644 LICENSES/deprecated/0BSD + create mode 100644 lib/math/test_mul_u64_u64_div_u64.c + create mode 100644 scripts/gdb/linux/kasan.py + create mode 100755 scripts/macro_checker.py + mode change 100644 => 100755 tools/testing/fault-injection/failcmd.sh +Merging kbuild/for-next (c589902e95d4 kbuild: remove append operation on cmd_ld_ko_o) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging .gitignore +Auto-merging Documentation/dontdiff +Auto-merging Makefile +Auto-merging arch/arc/Kconfig +Auto-merging lib/Kconfig.debug +Auto-merging scripts/Makefile.lib +Merge made by the 'ort' strategy. + .gitignore | 3 +- + Documentation/dontdiff | 1 + + Documentation/kbuild/kconfig-language.rst | 6 +- + Documentation/process/changes.rst | 7 + + Makefile | 3 +- + arch/arc/Kconfig | 2 +- + arch/x86/configs/tiny.config | 4 - + drivers/of/fdt.c | 2 +- + drivers/of/unittest.c | 4 +- + kernel/configs/tiny.config | 6 - + lib/Kconfig.debug | 15 + + scripts/Makefile.build | 58 ++-- + scripts/Makefile.dtbs | 142 +++++++++ + scripts/Makefile.host | 5 + + scripts/Makefile.lib | 119 +------ + scripts/Makefile.modfinal | 9 +- + scripts/Makefile.modinst | 8 +- + scripts/Makefile.package | 3 +- + scripts/Makefile.vmlinux | 18 ++ + scripts/Makefile.vmlinux_o | 3 + + scripts/basic/fixdep.c | 15 +- + scripts/generate_builtin_ranges.awk | 508 ++++++++++++++++++++++++++++++ + scripts/include/hash.h | 28 ++ + scripts/include/hashtable.h | 50 +++ + scripts/include/list.h | 69 ++++ + scripts/include/xalloc.h | 53 ++++ + scripts/kallsyms.c | 46 +-- + scripts/kconfig/confdata.c | 3 + + scripts/kconfig/expr.c | 482 ++++++++++++---------------- + scripts/kconfig/expr.h | 27 +- + scripts/kconfig/internal.h | 6 + + scripts/kconfig/lexer.l | 1 + + scripts/kconfig/lkc.h | 6 - + scripts/kconfig/mconf.c | 1 + + scripts/kconfig/menu.c | 38 +-- + scripts/kconfig/nconf.c | 1 + + scripts/kconfig/nconf.gui.c | 1 + + scripts/kconfig/parser.y | 13 +- + scripts/kconfig/preprocess.c | 1 + + scripts/kconfig/qconf.cc | 2 +- + scripts/kconfig/symbol.c | 9 +- + scripts/kconfig/util.c | 63 +--- + scripts/link-vmlinux.sh | 2 +- + scripts/mod/mk_elfconfig.c | 25 -- + scripts/mod/modpost.c | 125 ++++---- + scripts/mod/modpost.h | 28 +- + scripts/mod/sumversion.c | 6 +- + scripts/mod/symsearch.c | 6 +- + scripts/module-common.c | 25 ++ + scripts/package/PKGBUILD | 52 ++- + scripts/package/install-extmod-build | 55 +++- + scripts/subarch.include | 2 +- + scripts/verify_builtin_ranges.awk | 370 ++++++++++++++++++++++ + 53 files changed, 1793 insertions(+), 744 deletions(-) + create mode 100644 scripts/Makefile.dtbs + create mode 100755 scripts/generate_builtin_ranges.awk + create mode 100644 scripts/include/hash.h + create mode 100644 scripts/include/xalloc.h + create mode 100644 scripts/module-common.c + create mode 100755 scripts/verify_builtin_ranges.awk +Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Merge made by the 'ort' strategy. + .clang-format | 39 ++++++++++++++++++++++++++++++--------- + 1 file changed, 30 insertions(+), 9 deletions(-) +Merging perf/perf-tools-next (1de5b5dcb835 perf trace: Mark the 'head' arg in the set_robust_list syscall as coming from user space) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Merge made by the 'ort' strategy. + tools/build/Build | 3 - + tools/build/Makefile | 11 +- + tools/build/Makefile.feature | 2 +- + tools/build/Makefile.include | 12 +- + tools/build/feature/Makefile | 11 +- + tools/build/feature/test-all.c | 4 - + tools/build/feature/test-llvm-perf.cpp | 14 + + tools/include/linux/coresight-pmu.h | 17 +- + tools/include/linux/string.h | 2 + + tools/lib/api/Makefile | 4 - + tools/lib/api/fs/tracing_path.c | 2 +- + tools/lib/bpf/.gitignore | 1 + + tools/lib/bpf/Makefile | 13 +- + tools/lib/perf/.gitignore | 5 + + tools/lib/string.c | 13 + + tools/lib/subcmd/Makefile | 6 +- + tools/lib/subcmd/parse-options.c | 8 +- + tools/lib/symbol/Makefile | 4 - + tools/perf/Build | 1 + + tools/perf/Documentation/perf-annotate.txt | 3 + + tools/perf/Documentation/perf-check.txt | 82 + + tools/perf/Documentation/perf-ftrace.txt | 48 +- + tools/perf/Documentation/perf-kvm.txt | 6 +- + tools/perf/Documentation/perf-list.txt | 1 + + tools/perf/Documentation/perf-mem.txt | 94 +- + tools/perf/Documentation/perf-record.txt | 14 +- + tools/perf/Documentation/perf-report.txt | 1 + + tools/perf/Documentation/perf-sched.txt | 9 + + tools/perf/Documentation/perf-script.txt | 5 +- + tools/perf/Documentation/perf-stat.txt | 8 + + tools/perf/Documentation/perf-top.txt | 4 +- + tools/perf/Documentation/perf-trace.txt | 4 +- + tools/perf/Documentation/topdown.txt | 30 + + tools/perf/Makefile | 8 +- + tools/perf/Makefile.config | 51 +- + tools/perf/Makefile.perf | 6 + + tools/perf/arch/arm/util/cs-etm.c | 12 +- + tools/perf/arch/arm/util/pmu.c | 3 + + tools/perf/arch/arm64/annotate/instructions.c | 3 +- + tools/perf/arch/arm64/util/arm-spe.c | 108 +- + tools/perf/arch/arm64/util/hisi-ptt.c | 1 - + tools/perf/arch/loongarch/annotate/instructions.c | 6 +- + tools/perf/arch/powerpc/annotate/instructions.c | 254 ++ + tools/perf/arch/powerpc/util/dwarf-regs.c | 53 + + tools/perf/arch/s390/annotate/instructions.c | 5 +- + tools/perf/arch/x86/Makefile | 6 +- + tools/perf/arch/x86/annotate/instructions.c | 389 +++ + tools/perf/arch/x86/entry/syscalls/syscall_32.tbl | 470 ++++ + tools/perf/arch/x86/util/event.c | 4 +- + tools/perf/arch/x86/util/evlist.c | 6 + + tools/perf/arch/x86/util/intel-bts.c | 1 - + tools/perf/arch/x86/util/intel-pt.c | 1 - + tools/perf/bench/synthesize.c | 2 +- + tools/perf/builtin-annotate.c | 77 +- + tools/perf/builtin-buildid-list.c | 10 + + tools/perf/builtin-c2c.c | 47 +- + tools/perf/builtin-check.c | 180 ++ + tools/perf/builtin-daemon.c | 2 +- + tools/perf/builtin-diff.c | 38 +- + tools/perf/builtin-evlist.c | 18 +- + tools/perf/builtin-ftrace.c | 462 +++- + tools/perf/builtin-help.c | 2 +- + tools/perf/builtin-inject.c | 761 +++--- + tools/perf/builtin-kmem.c | 22 +- + tools/perf/builtin-kvm.c | 22 +- + tools/perf/builtin-kwork.c | 36 +- + tools/perf/builtin-list.c | 2 +- + tools/perf/builtin-lock.c | 44 +- + tools/perf/builtin-mem.c | 161 +- + tools/perf/builtin-record.c | 79 +- + tools/perf/builtin-report.c | 106 +- + tools/perf/builtin-sched.c | 232 +- + tools/perf/builtin-script.c | 184 +- + tools/perf/builtin-stat.c | 42 +- + tools/perf/builtin-timechart.c | 25 +- + tools/perf/builtin-top.c | 10 +- + tools/perf/builtin-trace.c | 497 +++- + tools/perf/builtin-version.c | 43 +- + tools/perf/builtin.h | 17 + + tools/perf/check-headers.sh | 1 + + tools/perf/perf.c | 1 + + tools/perf/pmu-events/Build | 12 +- + .../arch/arm64/ampere/ampereone/instruction.json | 3 - + .../yitian710/sys/ali_drw.json | 0 + .../yitian710/sys/metrics.json | 0 + .../pmu-events/arch/powerpc/power10/cache.json | 20 +- + .../arch/powerpc/power10/datasource.json | 40 + + .../pmu-events/arch/powerpc/power10/frontend.json | 30 + + .../pmu-events/arch/powerpc/power10/locks.json | 10 + + .../pmu-events/arch/powerpc/power10/memory.json | 30 + + .../pmu-events/arch/powerpc/power10/others.json | 118 +- + .../pmu-events/arch/powerpc/power10/pipeline.json | 45 + + .../perf/pmu-events/arch/powerpc/power10/pmc.json | 10 + + .../arch/x86/cascadelakex/uncore-cache.json | 60 +- + .../arch/x86/meteorlake/metricgroups.json | 142 ++ + .../arch/x86/meteorlake/mtl-metrics.json | 2535 ++++++++++++++++++++ + .../pmu-events/arch/x86/skylakex/uncore-cache.json | 60 +- + .../arch/x86/snowridgex/uncore-cache.json | 57 - + tools/perf/pmu-events/empty-pmu-events.c | 886 ++++--- + tools/perf/pmu-events/jevents.py | 27 +- + tools/perf/pmu-events/models.py | 73 + + tools/perf/pmu-events/pmu-events.h | 9 + + tools/perf/scripts/python/arm-cs-trace-disasm.py | 9 +- + tools/perf/tests/bp_account.c | 4 +- + tools/perf/tests/bp_signal.c | 3 +- + tools/perf/tests/bp_signal_overflow.c | 3 +- + tools/perf/tests/builtin-test.c | 1 + + tools/perf/tests/cpumap.c | 6 +- + tools/perf/tests/dlfilter-test.c | 2 +- + tools/perf/tests/dwarf-unwind.c | 2 +- + tools/perf/tests/event_update.c | 9 +- + tools/perf/tests/make | 4 + + tools/perf/tests/parse-events.c | 6 +- + tools/perf/tests/pmu-events.c | 12 +- + tools/perf/tests/pmu.c | 9 +- + tools/perf/tests/shell/annotate.sh | 3 +- + tools/perf/tests/shell/base_probe/settings.sh | 48 - + .../shell/base_probe/test_adding_blacklisted.sh | 67 + + .../tests/shell/base_probe/test_adding_kernel.sh | 3 - + tools/perf/tests/shell/base_probe/test_basic.sh | 80 + + .../tests/shell/base_probe/test_invalid_options.sh | 79 + + .../tests/shell/base_probe/test_line_semantics.sh | 55 + + tools/perf/tests/shell/base_report/setup.sh | 32 + + .../tests/shell/base_report/stderr-whitelist.txt | 5 + + tools/perf/tests/shell/base_report/test_basic.sh | 190 ++ + .../tests/shell/common/check_errors_whitelisted.pl | 51 + + tools/perf/tests/shell/common/init.sh | 31 +- + tools/perf/tests/shell/common/settings.sh | 28 +- + tools/perf/tests/shell/ftrace.sh | 89 + + .../perf/tests/shell/lib/perf_metric_validation.py | 10 +- + tools/perf/tests/shell/lib/probe_vfs_getname.sh | 11 +- + .../perf/tests/shell/perftool-testsuite_report.sh | 23 + + tools/perf/tests/shell/pipe_test.sh | 129 +- + .../tests/shell/record+probe_libc_inet_pton.sh | 5 +- + .../tests/shell/record+script_probe_vfs_getname.sh | 5 +- + tools/perf/tests/shell/record.sh | 59 +- + tools/perf/tests/shell/record_bpf_filter.sh | 86 +- + tools/perf/tests/shell/record_lbr.sh | 161 ++ + tools/perf/tests/shell/script.sh | 3 + + tools/perf/tests/shell/test_stat_intel_tpebs.sh | 19 + + tools/perf/tests/shell/test_task_analyzer.sh | 7 +- + .../tests/shell/test_uprobe_from_different_cu.sh | 7 + + tools/perf/tests/shell/trace_btf_enum.sh | 62 + + tools/perf/tests/stat.c | 6 +- + tools/perf/tests/tests-scripts.c | 37 +- + tools/perf/tests/tests.h | 1 + + tools/perf/tests/thread-map.c | 2 +- + tools/perf/tests/vmlinux-kallsyms.c | 4 +- + tools/perf/tests/workloads/Build | 1 + + tools/perf/tests/workloads/landlock.c | 66 + + tools/perf/tests/wp.c | 5 + + tools/perf/trace/beauty/beauty.h | 11 + + tools/perf/trace/beauty/perf_event_open.c | 6 +- + tools/perf/trace/beauty/sockaddr.c | 2 +- + tools/perf/trace/beauty/timespec.c | 2 +- + tools/perf/ui/browsers/annotate-data.c | 376 ++- + tools/perf/ui/browsers/annotate.c | 20 +- + tools/perf/ui/browsers/hists.c | 18 +- + tools/perf/ui/hist.c | 10 +- + tools/perf/ui/stdio/hist.c | 4 +- + tools/perf/util/Build | 10 +- + tools/perf/util/annotate-data.c | 1180 ++++----- + tools/perf/util/annotate-data.h | 86 +- + tools/perf/util/annotate.c | 360 ++- + tools/perf/util/annotate.h | 33 +- + tools/perf/util/arm-spe.c | 55 +- + tools/perf/util/auxtrace.c | 16 +- + tools/perf/util/auxtrace.h | 21 +- + tools/perf/util/block-info.c | 66 +- + tools/perf/util/block-info.h | 8 +- + tools/perf/util/bpf-event.c | 4 +- + tools/perf/util/bpf-filter.c | 631 ++++- + tools/perf/util/bpf-filter.h | 19 +- + tools/perf/util/bpf-filter.l | 28 +- + tools/perf/util/bpf-filter.y | 28 +- + tools/perf/util/bpf_counter_cgroup.c | 6 +- + tools/perf/util/bpf_ftrace.c | 8 +- + tools/perf/util/bpf_kwork.c | 9 +- + tools/perf/util/bpf_kwork_top.c | 7 +- + tools/perf/util/bpf_lock_contention.c | 45 +- + tools/perf/util/bpf_map.c | 3 - + tools/perf/util/bpf_off_cpu.c | 16 +- + .../util/bpf_skel/augmented_raw_syscalls.bpf.c | 222 +- + tools/perf/util/bpf_skel/bperf_cgroup.bpf.c | 2 +- + tools/perf/util/bpf_skel/func_latency.bpf.c | 7 +- + tools/perf/util/bpf_skel/kwork_top.bpf.c | 2 +- + tools/perf/util/bpf_skel/kwork_trace.bpf.c | 5 +- + tools/perf/util/bpf_skel/lock_contention.bpf.c | 53 +- + tools/perf/util/bpf_skel/lock_data.h | 4 +- + tools/perf/util/bpf_skel/off_cpu.bpf.c | 9 +- + tools/perf/util/bpf_skel/sample-filter.h | 13 +- + tools/perf/util/bpf_skel/sample_filter.bpf.c | 105 +- + tools/perf/util/bpf_skel/vmlinux/vmlinux.h | 7 + + tools/perf/util/branch.h | 1 + + tools/perf/util/build-id.c | 40 +- + tools/perf/util/build-id.h | 8 +- + tools/perf/util/callchain.c | 35 + + tools/perf/util/callchain.h | 6 + + tools/perf/util/cap.c | 59 +- + tools/perf/util/cap.h | 23 +- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 36 +- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.h | 2 +- + tools/perf/util/cs-etm.c | 673 +++--- + tools/perf/util/cs-etm.h | 12 +- + tools/perf/util/data-convert-bt.c | 34 +- + tools/perf/util/data-convert-json.c | 47 +- + tools/perf/util/data.c | 7 +- + tools/perf/util/debuginfo.h | 2 + + tools/perf/util/disasm.c | 852 +++++-- + tools/perf/util/disasm.h | 19 +- + tools/perf/util/disasm_bpf.c | 195 ++ + tools/perf/util/disasm_bpf.h | 12 + + tools/perf/util/dso.c | 4 +- + tools/perf/util/dso.h | 4 +- + tools/perf/util/dsos.c | 12 +- + tools/perf/util/dsos.h | 2 +- + tools/perf/util/dump-insn.c | 2 +- + tools/perf/util/dump-insn.h | 2 +- + tools/perf/util/dwarf-aux.c | 18 +- + tools/perf/util/dwarf-aux.h | 2 + + tools/perf/util/env.c | 15 + + tools/perf/util/env.h | 3 + + tools/perf/util/event.c | 54 +- + tools/perf/util/event.h | 38 +- + tools/perf/util/events_stats.h | 15 +- + tools/perf/util/evlist.c | 89 +- + tools/perf/util/evlist.h | 7 +- + tools/perf/util/evsel.c | 122 +- + tools/perf/util/evsel.h | 27 +- + tools/perf/util/evsel_fprintf.c | 2 - + tools/perf/util/ftrace.h | 3 + + tools/perf/util/header.c | 159 +- + tools/perf/util/header.h | 25 +- + tools/perf/util/hisi-ptt.c | 6 +- + tools/perf/util/hist.c | 63 +- + tools/perf/util/hist.h | 4 +- + tools/perf/util/include/dwarf-regs.h | 11 + + tools/perf/util/intel-bts.c | 37 +- + .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 5 +- + tools/perf/util/intel-pt.c | 30 +- + tools/perf/util/intel-tpebs.c | 432 ++++ + tools/perf/util/intel-tpebs.h | 35 + + tools/perf/util/jit.h | 3 +- + tools/perf/util/jitdump.c | 10 +- + tools/perf/util/llvm-c-helpers.cpp | 197 ++ + tools/perf/util/llvm-c-helpers.h | 60 + + tools/perf/util/machine.c | 120 +- + tools/perf/util/machine.h | 36 +- + tools/perf/util/map.c | 25 +- + tools/perf/util/map.h | 22 +- + tools/perf/util/map_symbol.c | 18 + + tools/perf/util/map_symbol.h | 3 + + tools/perf/util/mem-events.c | 20 +- + tools/perf/util/mem-events.h | 4 +- + tools/perf/util/mem-info.c | 13 + + tools/perf/util/mem-info.h | 1 + + tools/perf/util/metricgroup.c | 10 +- + tools/perf/util/mmap.c | 4 - + tools/perf/util/parse-events.c | 69 +- + tools/perf/util/parse-events.h | 11 +- + tools/perf/util/parse-events.l | 3 +- + tools/perf/util/pmu.c | 75 +- + tools/perf/util/pmu.h | 8 +- + tools/perf/util/pmus.c | 22 +- + tools/perf/util/pmus.h | 1 + + tools/perf/util/print-events.c | 3 +- + tools/perf/util/print_insn.c | 14 +- + tools/perf/util/s390-cpumsf.c | 11 +- + .../util/scripting-engines/trace-event-python.c | 16 +- + tools/perf/util/session.c | 394 +-- + tools/perf/util/session.h | 61 +- + tools/perf/util/setup.py | 4 +- + tools/perf/util/sort.c | 66 +- + tools/perf/util/sort.h | 3 +- + tools/perf/util/srcline.c | 59 +- + tools/perf/util/stat-display.c | 3 +- + tools/perf/util/stat-shadow.c | 2 +- + tools/perf/util/symbol.c | 8 +- + tools/perf/util/symbol_conf.h | 2 +- + tools/perf/util/synthetic-events.c | 181 +- + tools/perf/util/synthetic-events.h | 87 +- + tools/perf/util/syscalltbl.c | 4 + + tools/perf/util/thread.c | 4 + + tools/perf/util/thread.h | 1 + + tools/perf/util/time-utils.c | 4 +- + tools/perf/util/tool.c | 294 +++ + tools/perf/util/tool.h | 19 +- + tools/perf/util/trace_augment.h | 6 + + tools/perf/util/tsc.c | 2 +- + tools/perf/util/util.c | 12 +- + 290 files changed, 15195 insertions(+), 4267 deletions(-) + delete mode 100644 tools/build/Build + create mode 100644 tools/build/feature/test-llvm-perf.cpp + create mode 100644 tools/lib/perf/.gitignore + create mode 100644 tools/perf/Documentation/perf-check.txt + create mode 100644 tools/perf/arch/x86/entry/syscalls/syscall_32.tbl + create mode 100644 tools/perf/builtin-check.c + rename tools/perf/pmu-events/arch/arm64/{freescale => thead}/yitian710/sys/ali_drw.json (100%) + rename tools/perf/pmu-events/arch/arm64/{freescale => thead}/yitian710/sys/metrics.json (100%) + create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/meteorlake/mtl-metrics.json + create mode 100755 tools/perf/pmu-events/models.py + delete mode 100644 tools/perf/tests/shell/base_probe/settings.sh + create mode 100755 tools/perf/tests/shell/base_probe/test_adding_blacklisted.sh + create mode 100755 tools/perf/tests/shell/base_probe/test_basic.sh + create mode 100755 tools/perf/tests/shell/base_probe/test_invalid_options.sh + create mode 100755 tools/perf/tests/shell/base_probe/test_line_semantics.sh + create mode 100755 tools/perf/tests/shell/base_report/setup.sh + create mode 100644 tools/perf/tests/shell/base_report/stderr-whitelist.txt + create mode 100755 tools/perf/tests/shell/base_report/test_basic.sh + create mode 100755 tools/perf/tests/shell/common/check_errors_whitelisted.pl + create mode 100755 tools/perf/tests/shell/ftrace.sh + create mode 100755 tools/perf/tests/shell/perftool-testsuite_report.sh + create mode 100755 tools/perf/tests/shell/record_lbr.sh + create mode 100755 tools/perf/tests/shell/test_stat_intel_tpebs.sh + create mode 100755 tools/perf/tests/shell/trace_btf_enum.sh + create mode 100644 tools/perf/tests/workloads/landlock.c + create mode 100644 tools/perf/util/disasm_bpf.c + create mode 100644 tools/perf/util/disasm_bpf.h + create mode 100644 tools/perf/util/intel-tpebs.c + create mode 100644 tools/perf/util/intel-tpebs.h + create mode 100644 tools/perf/util/llvm-c-helpers.cpp + create mode 100644 tools/perf/util/llvm-c-helpers.h + create mode 100644 tools/perf/util/tool.c + create mode 100644 tools/perf/util/trace_augment.h +Merging compiler-attributes/compiler-attributes (8400291e289e Linux 6.11-rc1) +$ 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 (a5fb217f13f7 dma-mapping: reflow dma_supported) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/mips/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/x86/Kconfig +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + arch/Kconfig | 9 + + arch/alpha/Kconfig | 2 +- + arch/arm/Kconfig | 2 +- + arch/arm64/Kconfig | 1 + + arch/arm64/mm/init.c | 39 ++- + arch/mips/Kconfig | 2 +- + arch/parisc/Kconfig | 2 +- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/mm/mem.c | 5 +- + arch/s390/Kconfig | 2 +- + arch/s390/mm/init.c | 2 +- + arch/sparc/Kconfig | 2 +- + arch/x86/Kconfig | 2 +- + drivers/accel/qaic/qaic_drv.c | 4 +- + drivers/dma/idma64.c | 4 +- + drivers/dma/pl330.c | 5 +- + drivers/dma/qcom/bam_dma.c | 6 +- + drivers/dma/sh/rcar-dmac.c | 4 +- + drivers/dma/ste_dma40.c | 6 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 6 +- + drivers/iommu/Kconfig | 2 +- + drivers/iommu/dma-iommu.c | 104 +++---- + drivers/iommu/intel/Kconfig | 1 - + drivers/macintosh/macio_asic.c | 4 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 3 +- + drivers/media/pci/intel/ipu6/Kconfig | 7 +- + drivers/media/pci/intel/ipu6/ipu6.c | 4 +- + drivers/mmc/host/mmci_stm32_sdmmc.c | 3 +- + drivers/net/ethernet/microsoft/mana/gdma_main.c | 6 +- + drivers/scsi/lpfc/lpfc_init.c | 7 +- + drivers/scsi/scsi_lib.c | 11 +- + drivers/vdpa/Kconfig | 10 +- + drivers/xen/Kconfig | 4 +- + include/linux/device.h | 7 +- + include/linux/dma-direct.h | 2 +- + include/linux/dma-map-ops.h | 19 +- + include/linux/dma-mapping.h | 25 +- + include/linux/iommu-dma.h | 155 ++++++++++ + include/trace/events/dma.h | 341 +++++++++++++++++++++ + kernel/dma/Kconfig | 7 +- + kernel/dma/Makefile | 4 +- + kernel/dma/direct.c | 8 +- + kernel/dma/dummy.c | 21 ++ + kernel/dma/mapping.c | 115 ++++++- + kernel/dma/ops_helpers.c | 14 +- + kernel/dma/pool.c | 4 +- + kernel/dma/remap.c | 6 +- + kernel/dma/swiotlb.c | 6 +- + 49 files changed, 782 insertions(+), 226 deletions(-) + create mode 100644 include/linux/iommu-dma.h + create mode 100644 include/trace/events/dma.h +Merging asm-generic/master (b82c1d235a30 syscalls: add back legacy __NR_nfsservctl macro) +$ 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 (0bb80ecc33a8 Linux 6.6-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 (9016915e3c5f Merge branches 'amba', 'fixes' and 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (75078ba2b38a Merge branch 'for-next/timers' into for-next/core) +$ 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 (7c626ce4bae1 Linux 6.11-rc3) +$ 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 (7c590fea8c11 soc: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +CONFLICT (modify/delete): sound/soc/cirrus/edb93xx.c deleted in arm-soc/for-next and modified in HEAD. Version HEAD of sound/soc/cirrus/edb93xx.c left in tree. +Auto-merging sound/soc/cirrus/ep93xx-i2s.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f sound/soc/cirrus/edb93xx.c +rm 'sound/soc/cirrus/edb93xx.c' +$ git commit --no-edit -v -a +[master 1bcd96d89fb7] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/arm/cirrus/cirrus,ep9301.yaml | 38 + + .../bindings/ata/cirrus,ep9312-pata.yaml | 42 + + .../bindings/dma/cirrus,ep9301-dma-m2m.yaml | 84 ++ + .../bindings/dma/cirrus,ep9301-dma-m2p.yaml | 144 ++ + .../bindings/input/cirrus,ep9307-keypad.yaml | 87 ++ + .../devicetree/bindings/mtd/technologic,nand.yaml | 45 + + .../devicetree/bindings/net/cirrus,ep9301-eth.yaml | 59 + + .../devicetree/bindings/pwm/cirrus,ep9301-pwm.yaml | 53 + + .../bindings/soc/cirrus/cirrus,ep9301-syscon.yaml | 94 ++ + .../bindings/sound/cirrus,ep9301-i2s.yaml | 16 + + .../devicetree/bindings/spi/cirrus,ep9301-spi.yaml | 70 + + arch/arm/Makefile | 1 - + arch/arm/arm-soc-for-next-contents.txt | 241 ++++ + arch/arm/boot/dts/cirrus/Makefile | 4 + + arch/arm/boot/dts/cirrus/ep93xx-bk3.dts | 125 ++ + arch/arm/boot/dts/cirrus/ep93xx-edb9302.dts | 181 +++ + arch/arm/boot/dts/cirrus/ep93xx-ts7250.dts | 145 ++ + arch/arm/boot/dts/cirrus/ep93xx.dtsi | 444 ++++++ + arch/arm/mach-ep93xx/Kconfig | 20 +- + arch/arm/mach-ep93xx/Makefile | 11 - + arch/arm/mach-ep93xx/clock.c | 733 ---------- + arch/arm/mach-ep93xx/core.c | 1018 -------------- + arch/arm/mach-ep93xx/dma.c | 114 -- + arch/arm/mach-ep93xx/edb93xx.c | 368 ----- + arch/arm/mach-ep93xx/ep93xx-regs.h | 38 - + arch/arm/mach-ep93xx/gpio-ep93xx.h | 111 -- + arch/arm/mach-ep93xx/hardware.h | 25 - + arch/arm/mach-ep93xx/irqs.h | 76 -- + arch/arm/mach-ep93xx/platform.h | 42 - + arch/arm/mach-ep93xx/soc.h | 212 --- + arch/arm/mach-ep93xx/timer-ep93xx.c | 143 -- + arch/arm/mach-ep93xx/ts72xx.c | 422 ------ + arch/arm/mach-ep93xx/ts72xx.h | 94 -- + arch/arm/mach-ep93xx/vision_ep9307.c | 321 ----- + drivers/ata/pata_ep93xx.c | 105 +- + drivers/clk/Kconfig | 8 + + drivers/clk/Makefile | 1 + + drivers/clk/clk-ep93xx.c | 850 ++++++++++++ + drivers/dma/ep93xx_dma.c | 287 +++- + drivers/gpio/gpio-ep93xx.c | 359 ++--- + drivers/input/keyboard/ep93xx_keypad.c | 74 +- + drivers/mtd/nand/raw/Kconfig | 6 + + drivers/mtd/nand/raw/Makefile | 1 + + drivers/mtd/nand/raw/technologic-nand-controller.c | 222 +++ + drivers/net/ethernet/cirrus/ep93xx_eth.c | 63 +- + drivers/pinctrl/Kconfig | 7 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/pinctrl-ep93xx.c | 1434 ++++++++++++++++++++ + drivers/power/reset/Kconfig | 10 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/ep93xx-restart.c | 84 ++ + drivers/pwm/pwm-ep93xx.c | 26 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/cirrus/Kconfig | 17 + + drivers/soc/cirrus/Makefile | 2 + + drivers/soc/cirrus/soc-ep93xx.c | 252 ++++ + drivers/spi/spi-ep93xx.c | 68 +- + drivers/watchdog/ts72xx_wdt.c | 8 + + include/dt-bindings/clock/cirrus,ep9301-syscon.h | 46 + + include/linux/clk-provider.h | 14 + + include/linux/platform_data/dma-ep93xx.h | 94 -- + include/linux/platform_data/eth-ep93xx.h | 10 - + include/linux/platform_data/keypad-ep93xx.h | 32 - + include/linux/platform_data/spi-ep93xx.h | 15 - + include/linux/soc/cirrus/ep93xx.h | 47 +- + sound/soc/cirrus/Kconfig | 9 - + sound/soc/cirrus/Makefile | 4 - + sound/soc/cirrus/edb93xx.c | 116 -- + sound/soc/cirrus/ep93xx-i2s.c | 19 - + sound/soc/cirrus/ep93xx-pcm.c | 19 +- + 71 files changed, 5376 insertions(+), 4558 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/cirrus/cirrus,ep9301.yaml + create mode 100644 Documentation/devicetree/bindings/ata/cirrus,ep9312-pata.yaml + create mode 100644 Documentation/devicetree/bindings/dma/cirrus,ep9301-dma-m2m.yaml + create mode 100644 Documentation/devicetree/bindings/dma/cirrus,ep9301-dma-m2p.yaml + create mode 100644 Documentation/devicetree/bindings/input/cirrus,ep9307-keypad.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/technologic,nand.yaml + create mode 100644 Documentation/devicetree/bindings/net/cirrus,ep9301-eth.yaml + create mode 100644 Documentation/devicetree/bindings/pwm/cirrus,ep9301-pwm.yaml + create mode 100644 Documentation/devicetree/bindings/soc/cirrus/cirrus,ep9301-syscon.yaml + create mode 100644 Documentation/devicetree/bindings/spi/cirrus,ep9301-spi.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/cirrus/ep93xx-bk3.dts + create mode 100644 arch/arm/boot/dts/cirrus/ep93xx-edb9302.dts + create mode 100644 arch/arm/boot/dts/cirrus/ep93xx-ts7250.dts + create mode 100644 arch/arm/boot/dts/cirrus/ep93xx.dtsi + delete mode 100644 arch/arm/mach-ep93xx/Makefile + delete mode 100644 arch/arm/mach-ep93xx/clock.c + delete mode 100644 arch/arm/mach-ep93xx/core.c + delete mode 100644 arch/arm/mach-ep93xx/dma.c + delete mode 100644 arch/arm/mach-ep93xx/edb93xx.c + delete mode 100644 arch/arm/mach-ep93xx/ep93xx-regs.h + delete mode 100644 arch/arm/mach-ep93xx/gpio-ep93xx.h + delete mode 100644 arch/arm/mach-ep93xx/hardware.h + delete mode 100644 arch/arm/mach-ep93xx/irqs.h + delete mode 100644 arch/arm/mach-ep93xx/platform.h + delete mode 100644 arch/arm/mach-ep93xx/soc.h + delete mode 100644 arch/arm/mach-ep93xx/timer-ep93xx.c + delete mode 100644 arch/arm/mach-ep93xx/ts72xx.c + delete mode 100644 arch/arm/mach-ep93xx/ts72xx.h + delete mode 100644 arch/arm/mach-ep93xx/vision_ep9307.c + create mode 100644 drivers/clk/clk-ep93xx.c + create mode 100644 drivers/mtd/nand/raw/technologic-nand-controller.c + create mode 100644 drivers/pinctrl/pinctrl-ep93xx.c + create mode 100644 drivers/power/reset/ep93xx-restart.c + create mode 100644 drivers/soc/cirrus/Kconfig + create mode 100644 drivers/soc/cirrus/Makefile + create mode 100644 drivers/soc/cirrus/soc-ep93xx.c + create mode 100644 include/dt-bindings/clock/cirrus,ep9301-syscon.h + delete mode 100644 include/linux/platform_data/dma-ep93xx.h + delete mode 100644 include/linux/platform_data/eth-ep93xx.h + delete mode 100644 include/linux/platform_data/keypad-ep93xx.h + delete mode 100644 include/linux/platform_data/spi-ep93xx.h + delete mode 100644 sound/soc/cirrus/edb93xx.c +Merging amlogic/for-next (034835342aab Merge branch 'v6.12/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. +Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) +$ 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 (b4c322c2783a ARM: dts: aspeed: catalina: Update io expander line names) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Already up to date. +Merging at91/at91-next (ee735afc2dae Merge branch 'at91-soc' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. + .../bindings/clock/atmel,at91rm9200-pmc.yaml | 2 + + .../bindings/clock/atmel,at91sam9x5-sckc.yaml | 4 +- + .../soc/microchip/atmel,at91rm9200-tcb.yaml | 20 +- + drivers/clk/at91/Makefile | 1 + + drivers/clk/at91/clk-sam9x60-pll.c | 42 +- + drivers/clk/at91/pmc.h | 18 + + drivers/clk/at91/sam9x60.c | 7 + + drivers/clk/at91/sam9x7.c | 946 +++++++++++++++++++++ + drivers/clk/at91/sama7g5.c | 47 +- + include/dt-bindings/clock/at91.h | 4 + + 10 files changed, 1048 insertions(+), 43 deletions(-) + create mode 100644 drivers/clk/at91/sam9x7.c +Merging broadcom/next (7eff0651abbb Merge branch 'soc/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. +Merging davinci/davinci/for-next (973d248c43f2 ARM: davinci: remove unused cpuidle code) +$ 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 (32960b4f25c2 memory: pl353-smc: simplify with scoped for each OF child loop) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merging imx-mxs/for-next (79e1b8171ca4 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (4f4b3263feee Merge branch 'v6.11-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (dea56c781ed3 ARM: dove: Drop a write-only variable) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Already up to date. +Merging omap/for-next (ba1b153f6d27 Merge branch 'omap-for-v6.12/drivers' into tmp/omap-next-20240904.164705) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (2adcf3941db7 Merge branches 'arm32-for-6.12', 'arm64-defconfig-fixes-for-6.11', 'arm64-defconfig-for-6.12', 'arm64-fixes-for-6.11', 'arm64-for-6.12', 'clk-fixes-for-6.11', 'clk-for-6.12', 'drivers-fixes-for-6.11' and 'drivers-for-6.12' 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 drivers/clk/qcom/clk-alpha-pll.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/qcom,a53pll.yaml | 4 + + .../bindings/clock/qcom,qcs404-turingcc.yaml | 47 + + .../bindings/clock/qcom,sc8280xp-lpasscc.yaml | 13 +- + .../bindings/clock/qcom,sm8450-camcc.yaml | 19 +- + .../bindings/clock/qcom,sm8450-videocc.yaml | 11 +- + .../devicetree/bindings/clock/qcom,turingcc.txt | 19 - + .../devicetree/bindings/usb/qcom,dwc3.yaml | 2 +- + arch/arm64/boot/dts/qcom/msm8939.dtsi | 2 +- + drivers/clk/qcom/Kconfig | 51 +- + drivers/clk/qcom/Makefile | 5 +- + drivers/clk/qcom/a53-pll.c | 1 + + drivers/clk/qcom/camcc-sm4450.c | 1688 +++++++++++++++ + drivers/clk/qcom/camcc-sm8150.c | 2159 ++++++++++++++++++++ + drivers/clk/qcom/clk-alpha-pll.c | 86 +- + drivers/clk/qcom/clk-alpha-pll.h | 7 + + drivers/clk/qcom/clk-rpmh.c | 2 + + drivers/clk/qcom/dispcc-sm4450.c | 770 +++++++ + drivers/clk/qcom/dispcc-sm8250.c | 12 +- + drivers/clk/qcom/dispcc-sm8550.c | 198 +- + drivers/clk/qcom/dispcc-sm8650.c | 1796 ---------------- + drivers/clk/qcom/gcc-ipq5332.c | 36 +- + drivers/clk/qcom/gcc-ipq6018.c | 2 +- + drivers/clk/qcom/gcc-ipq806x.c | 4 +- + drivers/clk/qcom/gcc-ipq8074.c | 4 +- + drivers/clk/qcom/gcc-mdm9615.c | 4 +- + drivers/clk/qcom/gcc-msm8660.c | 4 +- + drivers/clk/qcom/gcc-msm8960.c | 6 +- + drivers/clk/qcom/gcc-msm8994.c | 54 +- + drivers/clk/qcom/gcc-msm8996.c | 2 +- + drivers/clk/qcom/gcc-msm8998.c | 64 +- + drivers/clk/qcom/gcc-sc8180x.c | 442 ++-- + drivers/clk/qcom/gcc-sm8250.c | 6 +- + drivers/clk/qcom/gcc-sm8450.c | 4 +- + drivers/clk/qcom/gpucc-sm4450.c | 805 ++++++++ + drivers/clk/qcom/lcc-ipq806x.c | 8 +- + drivers/clk/qcom/lcc-msm8960.c | 8 +- + drivers/clk/qcom/mmcc-apq8084.c | 50 +- + drivers/clk/qcom/mmcc-msm8960.c | 30 +- + drivers/clk/qcom/mmcc-msm8974.c | 52 +- + drivers/clk/qcom/mmcc-msm8994.c | 8 +- + drivers/clk/qcom/mmcc-msm8996.c | 8 +- + drivers/clk/qcom/videocc-sm8550.c | 4 +- + include/dt-bindings/clock/qcom,gcc-sc8180x.h | 1 + + 43 files changed, 6219 insertions(+), 2279 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,qcs404-turingcc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,turingcc.txt + create mode 100644 drivers/clk/qcom/camcc-sm4450.c + create mode 100644 drivers/clk/qcom/camcc-sm8150.c + create mode 100644 drivers/clk/qcom/dispcc-sm4450.c + delete mode 100644 drivers/clk/qcom/dispcc-sm8650.c + create mode 100644 drivers/clk/qcom/gpucc-sm4450.c +Merging renesas/next (5379c9e0a6ad Merge branch 'renesas-dts-for-v6.12' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. +Merging reset/reset/next (487b1b32e317 reset: eyeq: add platform driver) +$ 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 (bae9cc0db172 Merge branch 'v6.12-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. + .../bindings/clock/rockchip,rk3576-cru.yaml | 56 + + .../bindings/clock/rockchip,rk3588-cru.yaml | 4 - + drivers/clk/rockchip/Kconfig | 7 + + drivers/clk/rockchip/Makefile | 1 + + drivers/clk/rockchip/clk-pll.c | 6 +- + drivers/clk/rockchip/clk-px30.c | 10 +- + drivers/clk/rockchip/clk-rk3036.c | 5 +- + drivers/clk/rockchip/clk-rk3228.c | 7 +- + drivers/clk/rockchip/clk-rk3288.c | 5 +- + drivers/clk/rockchip/clk-rk3308.c | 5 +- + drivers/clk/rockchip/clk-rk3328.c | 5 +- + drivers/clk/rockchip/clk-rk3368.c | 5 +- + drivers/clk/rockchip/clk-rk3399.c | 10 +- + drivers/clk/rockchip/clk-rk3576.c | 1820 ++++++++++++++++++++ + drivers/clk/rockchip/clk-rk3588.c | 42 +- + drivers/clk/rockchip/clk.c | 3 +- + drivers/clk/rockchip/clk.h | 54 + + drivers/clk/rockchip/rst-rk3576.c | 651 +++++++ + include/dt-bindings/clock/px30-cru.h | 4 - + include/dt-bindings/clock/rk3036-cru.h | 2 - + include/dt-bindings/clock/rk3228-cru.h | 2 - + include/dt-bindings/clock/rk3288-cru.h | 2 - + include/dt-bindings/clock/rk3308-cru.h | 2 - + include/dt-bindings/clock/rk3328-cru.h | 2 - + include/dt-bindings/clock/rk3368-cru.h | 2 - + include/dt-bindings/clock/rk3399-cru.h | 4 - + include/dt-bindings/clock/rockchip,rk3576-cru.h | 592 +++++++ + include/dt-bindings/reset/rockchip,rk3576-cru.h | 564 ++++++ + 28 files changed, 3794 insertions(+), 78 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/rockchip,rk3576-cru.yaml + create mode 100644 drivers/clk/rockchip/clk-rk3576.c + create mode 100644 drivers/clk/rockchip/rst-rk3576.c + create mode 100644 include/dt-bindings/clock/rockchip,rk3576-cru.h + create mode 100644 include/dt-bindings/reset/rockchip,rk3576-cru.h +Merging samsung-krzk/for-next (6a8afff2166f Merge branch 'next/drivers' 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. + drivers/clk/samsung/Makefile | 1 + + drivers/clk/samsung/clk-exynos7885.c | 93 ++- + drivers/clk/samsung/clk-exynos850.c | 7 +- + drivers/clk/samsung/clk-exynosautov9.c | 83 +++ + drivers/clk/samsung/clk-exynosautov920.c | 1173 ++++++++++++++++++++++++++++++ + drivers/clk/samsung/clk-pll.c | 62 +- + drivers/clk/samsung/clk-pll.h | 2 + + 7 files changed, 1397 insertions(+), 24 deletions(-) + create mode 100644 drivers/clk/samsung/clk-exynosautov920.c +Merging scmi/for-linux-next (8aaf45bcb48e Merge branch 'for-next/scmi/updates' of ssh://gitolite.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. + Documentation/devicetree/bindings/sram/sram.yaml | 6 ++ + drivers/firmware/arm_scmi/common.h | 32 ++++++++-- + drivers/firmware/arm_scmi/shmem.c | 78 +++++++++++++++++++++--- + drivers/firmware/arm_scmi/transports/mailbox.c | 13 ++-- + drivers/firmware/arm_scmi/transports/optee.c | 11 +++- + drivers/firmware/arm_scmi/transports/smc.c | 11 +++- + 6 files changed, 130 insertions(+), 21 deletions(-) +Merging sophgo/for-next (4ea8511c034b riscv: dts: sophgo: cv1812h: add pinctrl support) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sophgo/cv1800b-milkv-duo.dts | 49 ++++++++++++++++++++++++ + arch/riscv/boot/dts/sophgo/cv1800b.dtsi | 10 +++++ + arch/riscv/boot/dts/sophgo/cv1812h.dtsi | 10 +++++ + 3 files changed, 69 insertions(+) +Merging stm32/stm32-next (b14c9f6bd0ba ARM: dts: stm32: Use SAI to generate bit and frame clock on STM32MP15xx DHCOM PDK2) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/st/stm32mp151.dtsi | 2 ++ + 1 file changed, 2 insertions(+) +Merging sunxi/sunxi/for-next (34180094bc07 Merge branch 'sunxi/dt-for-6.12' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (cd88a296582c Merge branch 'optee_notif_wait_timeout_for_v6.11' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. +Merging tegra/for-next (6726d2c6a157 Merge branch for-6.12/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. +Merging thead-dt/thead-dt-for-next (2d98fea7491a riscv: dts: thead: change TH1520 SPI node to use clock controller) +$ git merge -m Merge branch 'thead-dt-for-next' of https://github.com/pdp7/linux.git thead-dt/thead-dt-for-next +Already up to date. +Merging ti/ti-next (657b48ad4c7a Merge branches 'ti-drivers-soc-next', 'ti-k3-config-next' and 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. +Merging xilinx/for-next (31dba0dd2fa7 Merge branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + arch/arm/mach-zynq/common.h | 1 - + drivers/firmware/xilinx/zynqmp-debug.c | 162 +++++++++++++++++++++++++++++++- + drivers/firmware/xilinx/zynqmp.c | 4 +- + drivers/soc/xilinx/xlnx_event_manager.c | 4 +- + include/linux/firmware/xlnx-zynqmp.h | 13 ++- + 5 files changed, 174 insertions(+), 10 deletions(-) +Merging clk/clk-next (a9b0a2b6841a Merge branch 'clk-fixes' 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 +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging drivers/clk/Kconfig +Auto-merging drivers/clk/Makefile +Auto-merging drivers/of/platform.c +Merge made by the 'ort' strategy. + Documentation/dev-tools/kunit/api/clk.rst | 10 + + Documentation/dev-tools/kunit/api/index.rst | 21 + + Documentation/dev-tools/kunit/api/of.rst | 13 + + .../dev-tools/kunit/api/platformdevice.rst | 10 + + .../bindings/arm/mediatek/mediatek,bdpsys.txt | 24 - + .../bindings/arm/mediatek/mediatek,camsys.txt | 24 - + .../bindings/arm/mediatek/mediatek,imgsys.txt | 30 - + .../bindings/arm/mediatek/mediatek,ipesys.txt | 22 - + .../bindings/arm/mediatek/mediatek,ipu.txt | 43 -- + .../bindings/arm/mediatek/mediatek,jpgdecsys.txt | 22 - + .../bindings/arm/mediatek/mediatek,mcucfg.txt | 23 - + .../bindings/arm/mediatek/mediatek,mfgcfg.txt | 25 - + .../bindings/arm/mediatek/mediatek,mipi0a.txt | 28 - + .../bindings/arm/mediatek/mediatek,vcodecsys.txt | 27 - + .../bindings/arm/mediatek/mediatek,vdecsys.txt | 29 - + .../bindings/arm/mediatek/mediatek,vencltsys.txt | 22 - + .../bindings/arm/mediatek/mediatek,vencsys.txt | 26 - + .../bindings/clock/baikal,bt1-ccu-div.yaml | 8 +- + .../bindings/clock/cirrus,lochnagar.yaml | 6 +- + .../devicetree/bindings/clock/imx8mp-audiomix.yaml | 3 + + .../bindings/clock/mediatek,apmixedsys.yaml | 2 +- + .../{arm/mediatek => clock}/mediatek,infracfg.yaml | 2 +- + .../mediatek => clock}/mediatek,mt8186-clock.yaml | 2 +- + .../mediatek,mt8186-sys-clock.yaml | 2 +- + .../mediatek => clock}/mediatek,mt8192-clock.yaml | 2 +- + .../mediatek,mt8192-sys-clock.yaml | 2 +- + .../mediatek => clock}/mediatek,mt8195-clock.yaml | 2 +- + .../mediatek,mt8195-sys-clock.yaml | 2 +- + .../{arm/mediatek => clock}/mediatek,pericfg.yaml | 2 +- + .../devicetree/bindings/clock/mediatek,syscon.yaml | 93 +++ + .../bindings/clock/nxp,imx95-blk-ctl.yaml | 1 + + .../devicetree/bindings/clock/nxp,lpc3220-clk.txt | 30 - + .../devicetree/bindings/clock/nxp,lpc3220-clk.yaml | 51 ++ + .../bindings/clock/nxp,lpc3220-usb-clk.txt | 22 - + .../bindings/clock/nxp,lpc3220-usb-clk.yaml | 35 + + .../bindings/clock/renesas,cpg-clocks.yaml | 8 +- + .../bindings/clock/renesas,cpg-mssr.yaml | 1 + + .../devicetree/bindings/clock/st,stm32mp1-rcc.yaml | 10 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + drivers/base/dd.c | 1 + + drivers/clk/.kunitconfig | 2 + + drivers/clk/Kconfig | 11 + + drivers/clk/Makefile | 11 +- + drivers/clk/at91/dt-compat.c | 5 +- + drivers/clk/bcm/clk-bcm53573-ilp.c | 2 +- + drivers/clk/clk-conf.c | 43 +- + drivers/clk/clk-devres.c | 28 + + drivers/clk/clk-fixed-rate_test.c | 380 +++++++++ + drivers/clk/clk-fixed-rate_test.h | 8 + + drivers/clk/clk-lmk04832.c | 43 +- + drivers/clk/clk-scmi.c | 16 +- + drivers/clk/clk.c | 4 +- + drivers/clk/clk_kunit_helpers.c | 207 +++++ + drivers/clk/clk_parent_data_test.h | 10 + + drivers/clk/clk_test.c | 453 ++++++++++- + drivers/clk/davinci/da8xx-cfgchip.c | 7 +- + drivers/clk/hisilicon/clk-hi3559a.c | 7 +- + drivers/clk/imx/Kconfig | 1 + + drivers/clk/imx/clk-composite-7ulp.c | 7 + + drivers/clk/imx/clk-composite-8m.c | 51 +- + drivers/clk/imx/clk-composite-93.c | 15 +- + drivers/clk/imx/clk-fracn-gppll.c | 6 + + drivers/clk/imx/clk-imx6ul.c | 4 +- + drivers/clk/imx/clk-imx7d.c | 6 +- + drivers/clk/imx/clk-imx8-acm.c | 38 +- + drivers/clk/imx/clk-imx8mm.c | 2 +- + drivers/clk/imx/clk-imx8mn.c | 1 + + drivers/clk/imx/clk-imx8mp-audiomix.c | 86 ++- + drivers/clk/imx/clk-imx8mp.c | 8 +- + drivers/clk/imx/clk-imx8qxp.c | 51 +- + drivers/clk/imx/clk-imx95-blk-ctl.c | 30 + + drivers/clk/imx/clk-imxrt1050.c | 1 + + drivers/clk/imx/clk.c | 1 + + drivers/clk/imx/clk.h | 4 + + drivers/clk/kunit_clk_fixed_rate_test.dtso | 19 + + drivers/clk/kunit_clk_parent_data_test.dtso | 28 + + drivers/clk/mediatek/reset.c | 61 +- + drivers/clk/mediatek/reset.h | 10 - + drivers/clk/meson/a1-peripherals.c | 3 +- + drivers/clk/meson/a1-pll.c | 3 +- + drivers/clk/meson/axg-aoclk.c | 1 + + drivers/clk/meson/axg-audio.c | 39 +- + drivers/clk/meson/axg-audio.h | 2 + + drivers/clk/meson/axg.c | 1 + + drivers/clk/meson/c3-peripherals.c | 3 +- + drivers/clk/meson/c3-pll.c | 3 +- + drivers/clk/meson/clk-cpu-dyndiv.c | 3 +- + drivers/clk/meson/clk-dualdiv.c | 5 +- + drivers/clk/meson/clk-mpll.c | 5 +- + drivers/clk/meson/clk-phase.c | 8 +- + drivers/clk/meson/clk-pll.c | 7 +- + drivers/clk/meson/clk-regmap.c | 13 +- + drivers/clk/meson/g12a-aoclk.c | 1 + + drivers/clk/meson/g12a.c | 1 + + drivers/clk/meson/gxbb-aoclk.c | 1 + + drivers/clk/meson/gxbb.c | 1 + + drivers/clk/meson/meson-aoclk.c | 3 +- + drivers/clk/meson/meson-clkc-utils.c | 3 +- + drivers/clk/meson/meson-eeclk.c | 3 +- + drivers/clk/meson/s4-peripherals.c | 3 +- + drivers/clk/meson/s4-pll.c | 3 +- + drivers/clk/meson/sclk-div.c | 3 +- + drivers/clk/meson/vclk.c | 5 +- + drivers/clk/meson/vid-pll-div.c | 3 +- + drivers/clk/mmp/clk-mix.c | 10 +- + drivers/clk/renesas/Kconfig | 9 + + drivers/clk/renesas/Makefile | 2 + + drivers/clk/renesas/clk-mstp.c | 2 +- + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 37 +- + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 30 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 38 +- + drivers/clk/renesas/r8a779h0-cpg-mssr.c | 41 +- + drivers/clk/renesas/r9a07g043-cpg.c | 12 + + drivers/clk/renesas/r9a08g045-cpg.c | 20 + + drivers/clk/renesas/r9a09g057-cpg.c | 164 ++++ + drivers/clk/renesas/rcar-gen4-cpg.c | 208 +++-- + drivers/clk/renesas/rcar-gen4-cpg.h | 36 +- + drivers/clk/renesas/rzg2l-cpg.c | 71 +- + drivers/clk/renesas/rzv2h-cpg.c | 853 +++++++++++++++++++++ + drivers/clk/renesas/rzv2h-cpg.h | 190 +++++ + drivers/clk/rockchip/clk-rk3576.c | 2 - + drivers/clk/starfive/clk-starfive-jh7110-vout.c | 2 +- + drivers/clk/ti/clk-dra7-atl.c | 1 + + drivers/clk/versatile/clk-sp810.c | 2 +- + drivers/clk/visconti/pll.c | 6 +- + drivers/of/.kunitconfig | 1 + + drivers/of/Kconfig | 10 + + drivers/of/Makefile | 3 + + drivers/of/kunit_overlay_test.dtso | 9 + + drivers/of/of_kunit_helpers.c | 77 ++ + drivers/of/overlay_test.c | 115 +++ + drivers/of/platform.c | 9 +- + include/dt-bindings/clock/axg-audio-clkc.h | 7 + + include/dt-bindings/clock/nxp,imx95-clock.h | 3 + + include/dt-bindings/clock/rockchip,rk3576-cru.h | 12 +- + include/dt-bindings/reset/rockchip,rk3576-cru.h | 12 +- + include/kunit/clk.h | 28 + + include/kunit/of.h | 115 +++ + include/kunit/platform_device.h | 20 + + include/linux/clk.h | 33 + + lib/kunit/Makefile | 4 +- + lib/kunit/platform-test.c | 224 ++++++ + lib/kunit/platform.c | 302 ++++++++ + 143 files changed, 4354 insertions(+), 847 deletions(-) + create mode 100644 Documentation/dev-tools/kunit/api/clk.rst + create mode 100644 Documentation/dev-tools/kunit/api/of.rst + create mode 100644 Documentation/dev-tools/kunit/api/platformdevice.rst + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,bdpsys.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,camsys.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,imgsys.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ipesys.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,ipu.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,jpgdecsys.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mcucfg.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mfgcfg.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,mipi0a.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vcodecsys.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vdecsys.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vencltsys.txt + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,vencsys.txt + rename Documentation/devicetree/bindings/{arm/mediatek => clock}/mediatek,infracfg.yaml (96%) + rename Documentation/devicetree/bindings/{arm/mediatek => clock}/mediatek,mt8186-clock.yaml (94%) + rename Documentation/devicetree/bindings/{arm/mediatek => clock}/mediatek,mt8186-sys-clock.yaml (94%) + rename Documentation/devicetree/bindings/{arm/mediatek => clock}/mediatek,mt8192-clock.yaml (98%) + rename Documentation/devicetree/bindings/{arm/mediatek => clock}/mediatek,mt8192-sys-clock.yaml (94%) + rename Documentation/devicetree/bindings/{arm/mediatek => clock}/mediatek,mt8195-clock.yaml (98%) + rename Documentation/devicetree/bindings/{arm/mediatek => clock}/mediatek,mt8195-sys-clock.yaml (95%) + rename Documentation/devicetree/bindings/{arm/mediatek => clock}/mediatek,pericfg.yaml (96%) + create mode 100644 Documentation/devicetree/bindings/clock/mediatek,syscon.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/nxp,lpc3220-clk.txt + create mode 100644 Documentation/devicetree/bindings/clock/nxp,lpc3220-clk.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/nxp,lpc3220-usb-clk.txt + create mode 100644 Documentation/devicetree/bindings/clock/nxp,lpc3220-usb-clk.yaml + create mode 100644 drivers/clk/clk-fixed-rate_test.c + create mode 100644 drivers/clk/clk-fixed-rate_test.h + create mode 100644 drivers/clk/clk_kunit_helpers.c + create mode 100644 drivers/clk/clk_parent_data_test.h + create mode 100644 drivers/clk/kunit_clk_fixed_rate_test.dtso + create mode 100644 drivers/clk/kunit_clk_parent_data_test.dtso + create mode 100644 drivers/clk/renesas/r9a09g057-cpg.c + create mode 100644 drivers/clk/renesas/rzv2h-cpg.c + create mode 100644 drivers/clk/renesas/rzv2h-cpg.h + create mode 100644 drivers/of/kunit_overlay_test.dtso + create mode 100644 drivers/of/of_kunit_helpers.c + create mode 100644 drivers/of/overlay_test.c + create mode 100644 include/kunit/clk.h + create mode 100644 include/kunit/of.h + create mode 100644 include/kunit/platform_device.h + create mode 100644 lib/kunit/platform-test.c + create mode 100644 lib/kunit/platform.c +Merging clk-imx/for-next (32c055ef563c clk: imx6ul: fix clock parent for IMX6UL_CLK_ENETx_REF_SEL) +$ 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 (3aeccbe08171 clk: renesas: r9a09g057: Add clock and reset entries for GTM/RIIC/SDHI/WDT) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging csky/linux-next (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ 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 (6f6f567ee081 Docs/LoongArch: Add advanced extended IRQ model description) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging arch/loongarch/include/asm/loongarch.h +Merge made by the 'ort' strategy. + Documentation/arch/loongarch/irq-chip-model.rst | 32 +++ + .../zh_CN/arch/loongarch/irq-chip-model.rst | 32 +++ + arch/loongarch/Kconfig | 6 +- + arch/loongarch/include/asm/atomic.h | 2 + + arch/loongarch/include/asm/cpu-features.h | 2 + + arch/loongarch/include/asm/cpu.h | 30 +-- + arch/loongarch/include/asm/loongarch.h | 1 + + arch/loongarch/include/asm/mmu_context.h | 35 +++- + arch/loongarch/include/asm/percpu.h | 124 ++++-------- + arch/loongarch/include/asm/pgtable.h | 30 ++- + arch/loongarch/include/asm/set_memory.h | 21 ++ + arch/loongarch/include/uapi/asm/hwcap.h | 1 + + arch/loongarch/include/uapi/asm/sigcontext.h | 1 - + arch/loongarch/kernel/acpi.c | 4 + + arch/loongarch/kernel/cpu-probe.c | 134 +++++++------ + arch/loongarch/kernel/proc.c | 10 +- + arch/loongarch/kernel/syscall.c | 4 - + arch/loongarch/mm/Makefile | 3 +- + arch/loongarch/mm/fault.c | 41 ++++ + arch/loongarch/mm/pageattr.c | 218 +++++++++++++++++++++ + arch/loongarch/pci/acpi.c | 1 + + drivers/acpi/Kconfig | 2 +- + tools/objtool/arch/loongarch/decode.c | 11 +- + tools/objtool/check.c | 23 ++- + tools/objtool/include/objtool/elf.h | 1 + + 25 files changed, 570 insertions(+), 199 deletions(-) + create mode 100644 arch/loongarch/include/asm/set_memory.h + create mode 100644 arch/loongarch/mm/pageattr.c +Merging m68k/for-next (b90fae5df917 m68k: defconfig: Update defconfigs for v6.11-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (aa99969ef591 m68k: remove trailing space after + newline) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/kernel/setup_no.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging microblaze/next (d829e7ee6354 microblaze: Export xmb_manager functions) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'ort' strategy. + arch/microblaze/kernel/microblaze_ksyms.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) +Merging mips/mips-next (439667fb943c mips: Remove posix_types.h include from sigcontext.h) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs) +$ 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 (5d698966fa7b parisc: Allow mmap(MAP_STACK) memory to automatically expand upwards) +$ 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 arch/parisc/Kconfig +Auto-merging fs/exec.c +Merge made by the 'ort' strategy. + arch/parisc/Kconfig | 2 +- + arch/parisc/include/asm/mman.h | 14 ++ + arch/parisc/include/asm/processor.h | 2 +- + arch/parisc/kernel/entry.S | 6 +- + arch/parisc/kernel/smp.c | 2 +- + arch/parisc/kernel/syscall.S | 14 +- + arch/parisc/kernel/time.c | 251 ++++++++++++++---------------------- + arch/parisc/kernel/traps.c | 2 +- + drivers/parisc/pdc_stable.c | 2 +- + fs/exec.c | 3 +- + 10 files changed, 131 insertions(+), 167 deletions(-) +Merging powerpc/next (39190ac7cff1 powerpc/atomic: Use YZ constraints for DS-form instructions) + 39190ac7cff1 ("powerpc/atomic: Use YZ constraints for DS-form instructions") +$ 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/configs/ppc64_defconfig +Auto-merging arch/powerpc/include/asm/asm-compat.h +Auto-merging arch/powerpc/include/asm/book3s/64/pgtable.h +Auto-merging arch/powerpc/include/asm/mmu_context.h +Auto-merging arch/powerpc/mm/mem.c +Merge made by the 'ort' strategy. + CREDITS | 6 + + MAINTAINERS | 9 +- + arch/powerpc/Kconfig | 32 ++- + arch/powerpc/Kconfig.debug | 6 - + arch/powerpc/configs/ppc64_defconfig | 1 + + arch/powerpc/include/asm/asm-compat.h | 2 - + arch/powerpc/include/asm/book3s/32/pgtable.h | 3 +- + arch/powerpc/include/asm/book3s/64/hash-4k.h | 20 ++ + arch/powerpc/include/asm/book3s/64/pgtable.h | 26 --- + arch/powerpc/include/asm/code-patching.h | 37 ++++ + arch/powerpc/include/asm/eeh.h | 1 + + arch/powerpc/include/asm/mmu_context.h | 3 - + arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 3 +- + arch/powerpc/include/asm/nohash/pgalloc.h | 8 +- + arch/powerpc/include/asm/percpu.h | 2 +- + arch/powerpc/include/asm/rtas.h | 1 + + arch/powerpc/include/asm/thread_info.h | 4 + + arch/powerpc/kernel/Makefile | 1 + + arch/powerpc/kernel/cacheinfo.c | 2 +- + arch/powerpc/kernel/eeh.c | 13 +- + arch/powerpc/kernel/exceptions-64s.S | 17 -- + arch/powerpc/kernel/head_8xx.S | 78 ++++--- + arch/powerpc/kernel/head_book3s_32.S | 146 ++++++------- + arch/powerpc/kernel/kprobes.c | 65 +----- + arch/powerpc/kernel/module_64.c | 5 +- + arch/powerpc/kernel/optprobes.c | 2 +- + arch/powerpc/kernel/process.c | 22 +- + arch/powerpc/kernel/rethook.c | 73 +++++++ + arch/powerpc/kernel/secvar-sysfs.c | 2 +- + arch/powerpc/kernel/stacktrace.c | 6 +- + arch/powerpc/kernel/static_call.c | 2 +- + arch/powerpc/kernel/traps.c | 2 +- + arch/powerpc/kernel/vdso/gettimeofday.S | 4 - + arch/powerpc/kvm/book3s_hv.c | 18 +- + arch/powerpc/lib/code-patching.c | 70 ++++-- + arch/powerpc/lib/test-code-patching.c | 41 ++++ + arch/powerpc/mm/book3s32/mmu.c | 2 + + arch/powerpc/mm/book3s64/hash_utils.c | 2 +- + arch/powerpc/mm/mem.c | 14 ++ + arch/powerpc/mm/nohash/8xx.c | 9 +- + arch/powerpc/platforms/44x/ppc476.c | 2 +- + arch/powerpc/platforms/512x/mpc512x_lpbfifo.c | 2 +- + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 1 - + arch/powerpc/platforms/85xx/sgy_cts1000.c | 2 +- + arch/powerpc/platforms/8xx/Kconfig | 7 + + arch/powerpc/platforms/Kconfig.cputype | 11 +- + arch/powerpc/platforms/cell/spufs/file.c | 17 -- + arch/powerpc/platforms/maple/maple.h | 1 - + arch/powerpc/platforms/pasemi/gpio_mdio.c | 2 +- + arch/powerpc/platforms/pasemi/pasemi.h | 1 - + arch/powerpc/platforms/powermac/pfunc_base.c | 2 +- + arch/powerpc/platforms/powermac/smp.c | 2 +- + arch/powerpc/platforms/powernv/eeh-powernv.c | 3 +- + arch/powerpc/platforms/powernv/opal-dump.c | 2 +- + arch/powerpc/platforms/powernv/opal-elog.c | 2 +- + arch/powerpc/platforms/powernv/opal-lpc.c | 2 +- + arch/powerpc/platforms/powernv/opal-prd.c | 2 +- + arch/powerpc/platforms/powernv/pci.h | 1 - + arch/powerpc/platforms/pseries/dlpar.c | 240 +++++++++++++++++++-- + arch/powerpc/platforms/pseries/dtl.c | 1 - + arch/powerpc/platforms/pseries/eeh_pseries.c | 39 +++- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 2 +- + arch/powerpc/platforms/pseries/hotplug-memory.c | 16 +- + arch/powerpc/platforms/pseries/papr_scm.c | 2 +- + arch/powerpc/platforms/pseries/pmem.c | 2 +- + arch/powerpc/platforms/pseries/vas-sysfs.c | 4 +- + arch/powerpc/sysdev/fsl_msi.c | 2 +- + arch/powerpc/sysdev/pmi.c | 2 +- + arch/powerpc/xmon/xmon.c | 2 +- + drivers/macintosh/via-pmu-backlight.c | 2 +- + drivers/macintosh/via-pmu.c | 2 +- + .../testing/selftests/powerpc/benchmarks/Makefile | 2 +- + .../selftests/powerpc/benchmarks/exec_target.c | 16 +- + 73 files changed, 775 insertions(+), 381 deletions(-) + create mode 100644 arch/powerpc/kernel/rethook.c +Merging risc-v/for-next (21d98d658f9e ACPI: RISCV: Make acpi_numa_get_nid() to be static) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/configs/defconfig +Auto-merging arch/riscv/include/asm/irq.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/irq.h +Auto-merging arch/riscv/kernel/acpi_numa.c +Auto-merging arch/riscv/mm/init.c +Auto-merging tools/testing/selftests/riscv/mm/mmap_test.h +CONFLICT (content): Merge conflict in tools/testing/selftests/riscv/mm/mmap_test.h +Resolved 'arch/riscv/include/asm/irq.h' using previous resolution. +Recorded preimage for 'tools/testing/selftests/riscv/mm/mmap_test.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'tools/testing/selftests/riscv/mm/mmap_test.h'. +[master 19531d5cf239] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/riscv/extensions.yaml | 7 + + arch/riscv/Kconfig | 8 + + arch/riscv/configs/defconfig | 12 +- + arch/riscv/errata/sifive/errata_cip_453.S | 8 +- + arch/riscv/include/asm/acpi.h | 2 - + arch/riscv/include/asm/cacheflush.h | 18 ++- + arch/riscv/include/asm/exec.h | 8 + + arch/riscv/include/asm/fence.h | 1 + + arch/riscv/include/asm/hwcap.h | 1 + + arch/riscv/include/asm/irq.h | 5 + + arch/riscv/include/asm/page.h | 29 +++- + arch/riscv/include/asm/pgtable.h | 28 ++-- + arch/riscv/include/asm/set_memory.h | 2 +- + arch/riscv/include/asm/thread_info.h | 11 +- + arch/riscv/include/asm/vmalloc.h | 1 + + arch/riscv/include/asm/xip_fixup.h | 30 +++- + arch/riscv/kernel/acpi_numa.c | 2 +- + arch/riscv/kernel/asm-offsets.c | 7 + + arch/riscv/kernel/cacheinfo.c | 5 + + arch/riscv/kernel/cpufeature.c | 1 + + arch/riscv/kernel/elf_kexec.c | 6 + + arch/riscv/kernel/entry.S | 91 ++++++++++- + arch/riscv/kernel/module.c | 4 +- + arch/riscv/kernel/perf_callchain.c | 46 +----- + arch/riscv/kernel/pi/Makefile | 4 +- + arch/riscv/kernel/pi/archrandom_early.c | 30 ++++ + arch/riscv/kernel/pi/cmdline_early.c | 10 +- + arch/riscv/kernel/pi/fdt_early.c | 167 ++++++++++++++++++++- + arch/riscv/kernel/pi/pi.h | 20 +++ + arch/riscv/kernel/process.c | 9 ++ + arch/riscv/kernel/smp.c | 43 +++++- + arch/riscv/kernel/stacktrace.c | 43 ++++++ + arch/riscv/kernel/vdso/Makefile | 2 +- + arch/riscv/kernel/vendor_extensions/andes.c | 2 +- + arch/riscv/kernel/vmcore_info.c | 7 + + arch/riscv/kernel/vmlinux-xip.lds.S | 5 +- + arch/riscv/lib/memset.S | 2 + + arch/riscv/lib/strcmp.S | 1 + + arch/riscv/lib/strncmp.S | 1 + + arch/riscv/mm/init.c | 28 ++-- + arch/riscv/mm/pgtable.c | 13 ++ + drivers/perf/riscv_pmu.c | 2 - + tools/testing/selftests/riscv/mm/mmap_test.h | 2 + + 43 files changed, 591 insertions(+), 133 deletions(-) + create mode 100644 arch/riscv/include/asm/exec.h + create mode 100644 arch/riscv/kernel/pi/archrandom_early.c + create mode 100644 arch/riscv/kernel/pi/pi.h +Merging riscv-dt/riscv-dt-for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Already up to date. +Merging riscv-soc/riscv-soc-for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Already up to date. +Merging s390/for-next (e84a8303f1ba 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 +Merge made by the 'ort' strategy. + arch/s390/Kconfig | 36 +- + arch/s390/Makefile.postlink | 38 + + arch/s390/boot/Makefile | 34 +- + arch/s390/boot/als.c | 49 +- + arch/s390/boot/boot.h | 2 +- + arch/s390/boot/head.S | 4 +- + arch/s390/boot/ipl_parm.c | 2 +- + arch/s390/boot/kaslr.c | 2 +- + arch/s390/boot/pgm_check_info.c | 160 +- + arch/s390/boot/physmem_info.c | 26 +- + arch/s390/boot/printk.c | 124 ++ + arch/s390/boot/startup.c | 7 +- + arch/s390/configs/debug_defconfig | 4 + + arch/s390/configs/defconfig | 4 + + arch/s390/crypto/Kconfig | 10 + + arch/s390/crypto/Makefile | 1 + + arch/s390/crypto/aes_s390.c | 120 +- + arch/s390/crypto/hmac_s390.c | 359 ++++ + arch/s390/crypto/paes_s390.c | 4 +- + arch/s390/crypto/sha.h | 1 + + arch/s390/crypto/sha3_256_s390.c | 11 +- + arch/s390/crypto/sha3_512_s390.c | 11 +- + arch/s390/crypto/sha_common.c | 20 +- + arch/s390/hypfs/hypfs.h | 1 - + arch/s390/hypfs/hypfs_diag.c | 7 +- + arch/s390/include/asm/arch_hweight.h | 15 +- + arch/s390/include/asm/atomic_ops.h | 7 +- + arch/s390/include/asm/barrier.h | 4 +- + arch/s390/include/asm/cpacf.h | 281 ++- + arch/s390/include/asm/ctlreg.h | 5 +- + arch/s390/include/asm/diag.h | 9 + + arch/s390/include/asm/facility.h | 6 +- + arch/s390/include/asm/ftrace.h | 17 +- + arch/s390/include/asm/hiperdispatch.h | 14 + + arch/s390/include/asm/irq.h | 2 + + arch/s390/include/asm/lowcore.h | 4 +- + arch/s390/include/asm/march.h | 38 + + arch/s390/include/asm/percpu.h | 7 +- + arch/s390/include/asm/perf_event.h | 24 - + arch/s390/include/asm/pkey.h | 4 +- + arch/s390/include/asm/preempt.h | 7 +- + arch/s390/include/asm/processor.h | 1 + + arch/s390/include/asm/sclp.h | 1 + + arch/s390/include/asm/setup.h | 4 + + arch/s390/include/asm/smp.h | 4 + + arch/s390/include/asm/topology.h | 3 + + arch/s390/include/asm/trace/hiperdispatch.h | 58 + + arch/s390/include/uapi/asm/pkey.h | 5 + + arch/s390/kernel/Makefile | 7 +- + arch/s390/kernel/asm-offsets.c | 3 +- + arch/s390/kernel/cpacf.c | 119 ++ + arch/s390/kernel/diag.c | 17 + + arch/s390/kernel/dis.c | 20 +- + arch/s390/kernel/early.c | 38 +- + arch/s390/kernel/early_printk.c | 16 +- + arch/s390/kernel/earlypgm.S | 23 - + arch/s390/kernel/entry.S | 36 +- + arch/s390/kernel/ftrace.c | 106 +- + arch/s390/kernel/ftrace.h | 2 - + arch/s390/kernel/hiperdispatch.c | 430 ++++ + arch/s390/kernel/irq.c | 1 + + arch/s390/kernel/kprobes.c | 15 +- + arch/s390/kernel/mcount.S | 5 +- + arch/s390/kernel/perf_cpum_cf.c | 4 + + arch/s390/kernel/perf_cpum_sf.c | 309 +-- + arch/s390/kernel/perf_pai_crypto.c | 16 + + arch/s390/kernel/perf_pai_ext.c | 9 + + arch/s390/kernel/smp.c | 21 + + arch/s390/kernel/stacktrace.c | 19 - + arch/s390/kernel/topology.c | 76 +- + arch/s390/kernel/wti.c | 215 ++ + arch/s390/mm/cmm.c | 18 +- + arch/s390/mm/dump_pagetables.c | 191 +- + arch/s390/tools/opcodes.txt | 52 +- + drivers/crypto/Kconfig | 77 +- + drivers/s390/char/sclp_early.c | 1 + + drivers/s390/crypto/Makefile | 16 +- + drivers/s390/crypto/ap_bus.c | 59 +- + drivers/s390/crypto/ap_queue.c | 20 +- + drivers/s390/crypto/pkey_api.c | 2907 +++++++-------------------- + drivers/s390/crypto/pkey_base.c | 362 ++++ + drivers/s390/crypto/pkey_base.h | 195 ++ + drivers/s390/crypto/pkey_cca.c | 629 ++++++ + drivers/s390/crypto/pkey_ep11.c | 578 ++++++ + drivers/s390/crypto/pkey_pckmo.c | 557 +++++ + drivers/s390/crypto/pkey_sysfs.c | 648 ++++++ + drivers/s390/crypto/zcrypt_api.c | 29 +- + drivers/s390/crypto/zcrypt_ccamisc.c | 8 +- + drivers/s390/crypto/zcrypt_ccamisc.h | 6 +- + drivers/s390/crypto/zcrypt_ep11misc.c | 28 +- + drivers/s390/crypto/zcrypt_ep11misc.h | 14 +- + drivers/s390/crypto/zcrypt_msgtype50.c | 10 +- + drivers/s390/crypto/zcrypt_msgtype6.c | 37 +- + 93 files changed, 6273 insertions(+), 3233 deletions(-) + create mode 100644 arch/s390/Makefile.postlink + create mode 100644 arch/s390/boot/printk.c + create mode 100644 arch/s390/crypto/hmac_s390.c + create mode 100644 arch/s390/include/asm/hiperdispatch.h + create mode 100644 arch/s390/include/asm/march.h + create mode 100644 arch/s390/include/asm/trace/hiperdispatch.h + create mode 100644 arch/s390/kernel/cpacf.c + delete mode 100644 arch/s390/kernel/earlypgm.S + create mode 100644 arch/s390/kernel/hiperdispatch.c + create mode 100644 arch/s390/kernel/wti.c + create mode 100644 drivers/s390/crypto/pkey_base.c + create mode 100644 drivers/s390/crypto/pkey_base.h + create mode 100644 drivers/s390/crypto/pkey_cca.c + create mode 100644 drivers/s390/crypto/pkey_ep11.c + create mode 100644 drivers/s390/crypto/pkey_pckmo.c + create mode 100644 drivers/s390/crypto/pkey_sysfs.c +$ git am -3 ../patches/0001-fixup-for-s390-mm-ptdump-Generate-address-marker-arr.patch +Applying: fixup for "s390/mm/ptdump: Generate address marker array dynamically" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/s390/mm/dump_pagetables.c +$ git add -A . +$ git commit -v -a --amend +[master e2d045fff89c] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git + Date: Wed Sep 18 10:05:02 2024 +1000 +Merging sh/for-next (8fe76a1c2264 sh: push-switch: Add missing MODULE_DESCRIPTION() macro) +$ 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 sparc/for-next (d21dffe51baa arch/sparc: remove unused varible paddrbase in function leon_swprobe()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Merge made by the 'ort' strategy. + arch/sparc/mm/leon_mm.c | 8 +------- + 1 file changed, 1 insertion(+), 7 deletions(-) +Merging uml/next (381d2f95c8aa um: fix time-travel syscall scheduling hack) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Merge made by the 'ort' strategy. + .../virt/uml/user_mode_linux_howto_v2.rst | 37 ++++ + arch/um/Kconfig | 1 - + arch/um/drivers/vector_kern.c | 212 +++++++++++---------- + arch/um/drivers/vector_kern.h | 4 +- + arch/um/drivers/vector_user.c | 83 ++++++++ + arch/um/include/asm/pgtable.h | 7 - + arch/um/include/asm/processor-generic.h | 20 +- + arch/um/include/asm/sysrq.h | 8 - + arch/um/include/shared/skas/mm_id.h | 5 +- + arch/um/include/shared/skas/skas.h | 2 - + arch/um/kernel/exec.c | 3 - + arch/um/kernel/process.c | 8 +- + arch/um/kernel/reboot.c | 2 +- + arch/um/kernel/skas/mmu.c | 12 +- + arch/um/kernel/skas/process.c | 4 +- + arch/um/kernel/skas/syscall.c | 34 ++-- + arch/um/kernel/sysrq.c | 1 - + arch/um/kernel/time.c | 2 +- + arch/um/kernel/tlb.c | 14 +- + arch/um/os-Linux/file.c | 8 +- + arch/um/os-Linux/skas/mem.c | 2 +- + arch/um/os-Linux/skas/process.c | 2 +- + arch/x86/um/sysrq_32.c | 1 - + arch/x86/um/sysrq_64.c | 1 - + 24 files changed, 285 insertions(+), 188 deletions(-) + delete mode 100644 arch/um/include/asm/sysrq.h +Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging fs-next (a44000f2b0d8 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch '' of linux-next fs-next +Auto-merging arch/alpha/kernel/osf_sys.c +Auto-merging fs/nfs/nfs4xdr.c +Auto-merging fs/ocfs2/super.c +Auto-merging fs/xfs/xfs_log_recover.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/huge_mm.h +CONFLICT (content): Merge conflict in include/linux/huge_mm.h +Auto-merging include/linux/mm.h +Auto-merging kernel/cgroup/cgroup.c +Auto-merging mm/filemap.c +CONFLICT (content): Merge conflict in mm/filemap.c +Auto-merging mm/huge_memory.c +Auto-merging mm/memcontrol-v1.c +Auto-merging mm/memory.c +Auto-merging mm/nommu.c +Auto-merging mm/shmem.c +Resolved 'include/linux/huge_mm.h' using previous resolution. +Resolved 'mm/filemap.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 36f8f9bc1bbf] Merge branch '' of linux-next +$ git diff -M --stat --summary HEAD^.. + .mailmap | 3 + + Documentation/ABI/testing/sysfs-fs-f2fs | 56 + + Documentation/admin-guide/ext4.rst | 10 - + Documentation/filesystems/bcachefs/CodingStyle.rst | 2 +- + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/iomap/design.rst | 4 +- + Documentation/filesystems/multigrain-ts.rst | 121 ++ + Documentation/filesystems/overlayfs.rst | 7 +- + Documentation/sunrpc/xdr/nfs4.x | 166 ++ + arch/alpha/kernel/osf_sys.c | 4 +- + arch/arm/kernel/sys_oabi-compat.c | 10 +- + arch/powerpc/kvm/book3s_64_vio.c | 4 +- + arch/powerpc/kvm/powerpc.c | 12 +- + arch/powerpc/platforms/cell/spu_syscalls.c | 8 +- + arch/x86/kernel/cpu/sgx/main.c | 4 +- + arch/x86/kvm/svm/sev.c | 16 +- + block/fops.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 8 +- + drivers/gpu/drm/drm_syncobj.c | 6 +- + drivers/infiniband/core/ucma.c | 6 +- + drivers/infiniband/core/uverbs_cmd.c | 10 +- + drivers/media/mc/mc-request.c | 6 +- + drivers/media/rc/lirc_dev.c | 8 +- + drivers/vfio/group.c | 6 +- + drivers/vfio/virqfd.c | 6 +- + drivers/virt/acrn/irqfd.c | 6 +- + drivers/xen/privcmd.c | 10 +- + fs/9p/fid.c | 5 +- + fs/9p/vfs_inode.c | 1 + + fs/attr.c | 52 +- + fs/bcachefs/Kconfig | 7 + + fs/bcachefs/Makefile | 1 + + fs/bcachefs/acl.c | 7 +- + fs/bcachefs/alloc_background.c | 45 +- + fs/bcachefs/alloc_background.h | 3 +- + fs/bcachefs/alloc_foreground.c | 59 +- + fs/bcachefs/alloc_foreground.h | 5 +- + fs/bcachefs/backpointers.c | 104 +- + fs/bcachefs/backpointers.h | 35 +- + fs/bcachefs/bcachefs.h | 14 +- + fs/bcachefs/bcachefs_format.h | 2 + + fs/bcachefs/bset.c | 184 +- + fs/bcachefs/bset.h | 4 +- + fs/bcachefs/btree_cache.c | 276 ++- + fs/bcachefs/btree_cache.h | 3 + + fs/bcachefs/btree_gc.c | 21 +- + fs/bcachefs/btree_io.c | 8 +- + fs/bcachefs/btree_io.h | 4 +- + fs/bcachefs/btree_iter.c | 63 +- + fs/bcachefs/btree_iter.h | 96 +- + fs/bcachefs/btree_key_cache.c | 415 +---- + fs/bcachefs/btree_key_cache_types.h | 18 +- + fs/bcachefs/btree_locking.h | 13 +- + fs/bcachefs/btree_trans_commit.c | 2 +- + fs/bcachefs/btree_types.h | 60 +- + fs/bcachefs/btree_update.c | 12 +- + fs/bcachefs/btree_update_interior.c | 37 +- + fs/bcachefs/btree_update_interior.h | 2 + + fs/bcachefs/buckets.c | 35 +- + fs/bcachefs/buckets.h | 15 +- + fs/bcachefs/buckets_types.h | 8 - + fs/bcachefs/checksum.c | 97 +- + fs/bcachefs/clock.h | 9 - + fs/bcachefs/darray.c | 4 +- + fs/bcachefs/darray.h | 24 +- + fs/bcachefs/data_update.c | 2 +- + fs/bcachefs/dirent.c | 66 +- + fs/bcachefs/ec.c | 323 +++- + fs/bcachefs/ec.h | 11 +- + fs/bcachefs/ec_format.h | 9 +- + fs/bcachefs/ec_types.h | 1 + + fs/bcachefs/errcode.h | 14 +- + fs/bcachefs/extents.c | 33 +- + fs/bcachefs/extents.h | 24 +- + fs/bcachefs/fs-common.c | 5 +- + fs/bcachefs/fs-io-buffered.c | 41 +- + fs/bcachefs/fs-io-direct.c | 2 +- + fs/bcachefs/fs-io-pagecache.c | 82 +- + fs/bcachefs/fs-io-pagecache.h | 4 +- + fs/bcachefs/fs-io.c | 174 +- + fs/bcachefs/fs-ioctl.c | 4 +- + fs/bcachefs/fs.c | 435 +++-- + fs/bcachefs/fs.h | 18 +- + fs/bcachefs/inode.c | 2 +- + fs/bcachefs/io_read.c | 18 +- + fs/bcachefs/io_write.c | 7 +- + fs/bcachefs/journal_io.c | 6 +- + fs/bcachefs/journal_reclaim.c | 7 +- + fs/bcachefs/opts.c | 85 +- + fs/bcachefs/opts.h | 61 +- + fs/bcachefs/rcu_pending.c | 650 +++++++ + fs/bcachefs/rcu_pending.h | 27 + + fs/bcachefs/rebalance.c | 3 + + fs/bcachefs/recovery.c | 22 +- + fs/bcachefs/recovery_passes.c | 10 +- + fs/bcachefs/replicas.c | 10 +- + fs/bcachefs/replicas_format.h | 9 +- + fs/bcachefs/sb-clean.c | 2 +- + fs/bcachefs/sb-members.c | 57 + + fs/bcachefs/sb-members.h | 22 +- + fs/bcachefs/str_hash.h | 2 +- + fs/bcachefs/subvolume.h | 45 + + fs/bcachefs/subvolume_types.h | 3 +- + fs/bcachefs/super-io.c | 12 +- + fs/bcachefs/super.c | 85 +- + fs/bcachefs/sysfs.c | 55 +- + fs/bcachefs/thread_with_file.c | 2 +- + fs/bcachefs/time_stats.c | 14 + + fs/bcachefs/time_stats.h | 3 +- + fs/bcachefs/trace.h | 465 ++++- + fs/bcachefs/util.c | 16 +- + fs/bcachefs/util.h | 2 +- + fs/bcachefs/xattr.c | 81 +- + fs/bcachefs/xattr_format.h | 2 +- + fs/btrfs/dev-replace.c | 2 + + fs/btrfs/file.c | 25 +- + fs/btrfs/fs.h | 2 + + fs/btrfs/ioctl.c | 13 +- + fs/btrfs/super.c | 3 +- + fs/btrfs/volumes.c | 8 +- + fs/ceph/caps.c | 3 +- + fs/ceph/mds_client.h | 3 - + fs/ceph/super.h | 2 - + fs/configfs/configfs_internal.h | 4 +- + fs/configfs/dir.c | 42 +- + fs/configfs/inode.c | 24 - + fs/dlm/config.c | 2 +- + fs/dlm/dlm_internal.h | 5 + + fs/dlm/lock.c | 134 +- + fs/dlm/lock.h | 2 + + fs/dlm/lockspace.c | 97 +- + fs/dlm/lowcomms.c | 36 +- + fs/dlm/main.c | 12 + + fs/dlm/member.c | 2 + + fs/dlm/memory.c | 28 +- + fs/dlm/memory.h | 4 +- + fs/dlm/recover.c | 9 +- + fs/erofs/super.c | 13 +- + fs/eventfd.c | 4 +- + fs/eventpoll.c | 30 +- + fs/exfat/balloc.c | 10 +- + fs/exfat/exfat_fs.h | 24 +- + fs/exfat/file.c | 40 +- + fs/exfat/inode.c | 94 +- + fs/exfat/namei.c | 17 +- + fs/exfat/super.c | 41 +- + fs/ext4/bitmap.c | 8 +- + fs/ext4/dir.c | 14 +- + fs/ext4/ext4.h | 31 +- + fs/ext4/extents.c | 827 ++++----- + fs/ext4/extents_status.c | 240 +-- + fs/ext4/extents_status.h | 28 +- + fs/ext4/fast_commit.c | 47 +- + fs/ext4/file.c | 20 +- + fs/ext4/ialloc.c | 35 +- + fs/ext4/indirect.c | 7 - + fs/ext4/inline.c | 46 +- + fs/ext4/inode.c | 292 ++-- + fs/ext4/ioctl.c | 6 +- + fs/ext4/mballoc.c | 25 +- + fs/ext4/migrate.c | 7 +- + fs/ext4/move_extent.c | 90 +- + fs/ext4/namei.c | 16 +- + fs/ext4/readpage.c | 16 +- + fs/ext4/resize.c | 3 +- + fs/ext4/super.c | 72 +- + fs/ext4/xattr.c | 31 +- + fs/ext4/xattr.h | 7 +- + fs/f2fs/checkpoint.c | 17 +- + fs/f2fs/compress.c | 63 +- + fs/f2fs/data.c | 162 +- + fs/f2fs/debug.c | 2 +- + fs/f2fs/dir.c | 8 +- + fs/f2fs/extent_cache.c | 4 +- + fs/f2fs/f2fs.h | 150 +- + fs/f2fs/file.c | 205 ++- + fs/f2fs/gc.c | 113 +- + fs/f2fs/gc.h | 29 + + fs/f2fs/inline.c | 31 +- + fs/f2fs/inode.c | 9 +- + fs/f2fs/namei.c | 68 - + fs/f2fs/node.c | 46 +- + fs/f2fs/segment.c | 72 +- + fs/f2fs/segment.h | 5 +- + fs/f2fs/super.c | 119 +- + fs/f2fs/sysfs.c | 82 +- + fs/f2fs/verity.c | 5 +- + fs/f2fs/xattr.c | 14 +- + fs/fcntl.c | 38 +- + fs/fhandle.c | 4 +- + fs/file.c | 26 +- + fs/fsopen.c | 6 +- + fs/fuse/Makefile | 3 + + fs/fuse/acl.c | 10 +- + fs/fuse/dax.c | 4 +- + fs/fuse/dev.c | 224 ++- + fs/fuse/dir.c | 172 +- + fs/fuse/file.c | 214 +-- + fs/fuse/fuse_i.h | 28 +- + fs/fuse/fuse_trace.h | 132 ++ + fs/fuse/inode.c | 19 +- + fs/fuse/ioctl.c | 2 +- + fs/fuse/readdir.c | 4 +- + fs/fuse/virtio_fs.c | 42 +- + fs/fuse/xattr.c | 8 +- + fs/gfs2/aops.c | 30 - + fs/gfs2/file.c | 2 +- + fs/gfs2/glock.c | 9 +- + fs/gfs2/log.c | 12 +- + fs/gfs2/meta_io.c | 24 +- + fs/gfs2/ops_fstype.c | 3 +- + fs/inode.c | 269 ++- + fs/ioctl.c | 30 +- + fs/iomap/buffered-io.c | 199 ++- + fs/iomap/direct-io.c | 42 +- + fs/isofs/rock.h | 2 +- + fs/jbd2/checkpoint.c | 21 +- + fs/jbd2/journal.c | 97 +- + fs/jfs/jfs_discard.c | 11 +- + fs/jfs/jfs_dmap.c | 11 +- + fs/jfs/jfs_imap.c | 2 +- + fs/jfs/xattr.c | 2 + + fs/kernel_read_file.c | 4 +- + fs/lockd/host.c | 2 +- + fs/lockd/svc.c | 9 +- + fs/locks.c | 14 +- + fs/namei.c | 19 +- + fs/namespace.c | 22 +- + fs/nfs/callback.c | 2 + + fs/nfs/client.c | 6 +- + fs/nfs/dir.c | 6 +- + fs/nfs/fs_context.c | 8 + + fs/nfs/getroot.c | 2 +- + fs/nfs/internal.h | 1 - + fs/nfs/nfs4_fs.h | 2 +- + fs/nfs/nfs4proc.c | 16 +- + fs/nfs/nfs4state.c | 22 +- + fs/nfs/nfs4xdr.c | 6 +- + fs/nfs/read.c | 3 +- + fs/nfs/super.c | 3 + + fs/nfs/write.c | 9 +- + fs/nfsd/Makefile | 2 +- + fs/nfsd/auth.c | 14 +- + fs/nfsd/auth.h | 2 +- + fs/nfsd/blocklayout.c | 6 +- + fs/nfsd/blocklayoutxdr.h | 2 +- + fs/nfsd/cache.h | 2 +- + fs/nfsd/export.c | 37 +- + fs/nfsd/export.h | 7 +- + fs/nfsd/filecache.c | 36 +- + fs/nfsd/filecache.h | 1 + + fs/nfsd/netns.h | 7 +- + fs/nfsd/nfs3proc.c | 44 + + fs/nfsd/nfs4callback.c | 56 +- + fs/nfsd/nfs4idmap.c | 13 +- + fs/nfsd/nfs4layouts.c | 1 + + fs/nfsd/nfs4proc.c | 100 +- + fs/nfsd/nfs4recover.c | 13 +- + fs/nfsd/nfs4state.c | 308 ++-- + fs/nfsd/nfs4xdr.c | 134 +- + fs/nfsd/nfs4xdr_gen.c | 239 +++ + fs/nfsd/nfs4xdr_gen.h | 25 + + fs/nfsd/nfsctl.c | 19 +- + fs/nfsd/nfsd.h | 49 +- + fs/nfsd/nfsfh.c | 58 +- + fs/nfsd/nfsfh.h | 2 + + fs/nfsd/nfsproc.c | 49 +- + fs/nfsd/nfssvc.c | 126 +- + fs/nfsd/state.h | 7 +- + fs/nfsd/trace.h | 124 +- + fs/nfsd/vfs.c | 45 +- + fs/nfsd/vfs.h | 4 +- + fs/nfsd/xdr4.h | 1 + + fs/nfsd/xdr4cb.h | 10 +- + fs/notify/fanotify/fanotify.c | 32 +- + fs/notify/fanotify/fanotify.h | 15 + + fs/notify/fanotify/fanotify_user.c | 123 +- + fs/notify/fsnotify.c | 39 +- + fs/notify/inotify/inotify_user.c | 14 +- + fs/notify/mark.c | 8 +- + fs/ntfs3/attrib.c | 96 +- + fs/ntfs3/file.c | 196 ++- + fs/ntfs3/frecord.c | 93 +- + fs/ntfs3/fslog.c | 19 +- + fs/ntfs3/inode.c | 15 +- + fs/ntfs3/lib/lzx_decompress.c | 3 +- + fs/ntfs3/lznt.c | 3 + + fs/ntfs3/namei.c | 4 +- + fs/ntfs3/ntfs_fs.h | 8 +- + fs/ntfs3/record.c | 26 +- + fs/ntfs3/run.c | 8 +- + fs/ntfs3/super.c | 57 +- + fs/ntfs3/xattr.c | 2 +- + fs/ocfs2/cluster/heartbeat.c | 6 +- + fs/ocfs2/super.c | 6 +- + fs/open.c | 24 +- + fs/orangefs/orangefs-sysfs.c | 14 +- + fs/overlayfs/copy_up.c | 43 +- + fs/overlayfs/file.c | 68 +- + fs/overlayfs/params.c | 38 +- + fs/overlayfs/super.c | 10 +- + fs/quota/dquot.c | 14 +- + fs/quota/quota.c | 8 +- + fs/quota/quota_v1.c | 3 +- + fs/quota/quota_v2.c | 9 +- + fs/read_write.c | 118 +- + fs/readdir.c | 20 +- + fs/remap_range.c | 2 +- + fs/select.c | 8 +- + fs/signalfd.c | 6 +- + fs/smb/client/Kconfig | 14 + + fs/smb/client/Makefile | 2 + + fs/smb/client/cifs_debug.c | 7 +- + fs/smb/client/cifsacl.c | 226 +-- + fs/smb/client/cifsacl.h | 99 +- + fs/smb/client/cifsfs.h | 1 - + fs/smb/client/cifsglob.h | 25 +- + fs/smb/client/cifspdu.h | 6 - + fs/smb/client/cifsproto.h | 28 +- + fs/smb/client/cifssmb.c | 14 +- + fs/smb/client/compress.c | 390 +++++ + fs/smb/client/compress.h | 90 + + fs/smb/client/compress/lz77.c | 235 +++ + fs/smb/client/compress/lz77.h | 15 + + fs/smb/client/connect.c | 5 +- + fs/smb/client/file.c | 7 +- + fs/smb/client/fs_context.c | 20 +- + fs/smb/client/inode.c | 42 +- + fs/smb/client/ioctl.c | 8 +- + fs/smb/client/link.c | 3 + + fs/smb/client/misc.c | 9 +- + fs/smb/client/smb1ops.c | 2 +- + fs/smb/client/smb2file.c | 6 +- + fs/smb/client/smb2inode.c | 6 +- + fs/smb/client/smb2maperror.c | 2 +- + fs/smb/client/smb2misc.c | 2 +- + fs/smb/client/smb2ops.c | 98 +- + fs/smb/client/smb2pdu.c | 19 +- + fs/smb/client/smb2pdu.h | 8 +- + fs/smb/client/smb2proto.h | 2 +- + fs/smb/client/smb2transport.c | 2 +- + fs/smb/client/smbdirect.c | 6 +- + fs/smb/client/transport.c | 4 + + fs/smb/client/xattr.c | 4 +- + fs/smb/{client => common}/smb2status.h | 6 + + fs/smb/common/smbacl.h | 121 ++ + fs/smb/server/connection.c | 4 +- + fs/smb/server/connection.h | 1 + + fs/smb/server/oplock.c | 57 +- + fs/smb/server/server.c | 2 +- + fs/smb/server/smb2misc.c | 2 +- + fs/smb/server/smb2pdu.c | 2 +- + fs/smb/server/smb_common.c | 2 +- + fs/smb/server/smbacl.h | 111 +- + fs/smb/server/smbstatus.h | 1822 -------------------- + fs/smb/server/transport_rdma.c | 2 +- + fs/smb/server/vfs.c | 19 +- + fs/smb/server/vfs_cache.c | 3 + + fs/splice.c | 22 +- + fs/stat.c | 50 +- + fs/statfs.c | 4 +- + fs/sync.c | 14 +- + fs/timerfd.c | 8 +- + fs/utimes.c | 4 +- + fs/xattr.c | 36 +- + fs/xfs/libxfs/xfs_ag.c | 94 +- + fs/xfs/libxfs/xfs_ag.h | 14 - + fs/xfs/libxfs/xfs_alloc_btree.c | 6 +- + fs/xfs/libxfs/xfs_alloc_btree.h | 3 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 23 +- + fs/xfs/libxfs/xfs_bmap.c | 101 +- + fs/xfs/libxfs/xfs_bmap_btree.c | 24 +- + fs/xfs/libxfs/xfs_bmap_btree.h | 207 ++- + fs/xfs/libxfs/xfs_defer.c | 1 - + fs/xfs/libxfs/xfs_fs.h | 31 +- + fs/xfs/libxfs/xfs_ialloc.c | 14 +- + fs/xfs/libxfs/xfs_ialloc.h | 4 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 6 +- + fs/xfs/libxfs/xfs_ialloc_btree.h | 3 +- + fs/xfs/libxfs/xfs_inode_fork.c | 40 +- + fs/xfs/libxfs/xfs_inode_util.c | 2 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 5 +- + fs/xfs/libxfs/xfs_refcount_btree.h | 3 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 7 +- + fs/xfs/libxfs/xfs_rmap_btree.h | 3 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 274 ++- + fs/xfs/libxfs/xfs_rtbitmap.h | 61 +- + fs/xfs/libxfs/xfs_sb.c | 92 +- + fs/xfs/libxfs/xfs_sb.h | 3 + + fs/xfs/libxfs/xfs_shared.h | 3 + + fs/xfs/libxfs/xfs_trans_inode.c | 6 +- + fs/xfs/libxfs/xfs_trans_resv.c | 4 +- + fs/xfs/libxfs/xfs_types.h | 12 - + fs/xfs/scrub/bmap_repair.c | 2 +- + fs/xfs/scrub/common.h | 29 +- + fs/xfs/scrub/inode_repair.c | 12 +- + fs/xfs/scrub/rtsummary.c | 11 +- + fs/xfs/scrub/rtsummary.h | 2 +- + fs/xfs/scrub/rtsummary_repair.c | 12 +- + fs/xfs/scrub/scrub.h | 29 +- + fs/xfs/scrub/tempfile.c | 2 +- + fs/xfs/xfs_bmap_item.c | 17 + + fs/xfs/xfs_bmap_util.c | 38 +- + fs/xfs/xfs_discard.c | 17 +- + fs/xfs/xfs_exchrange.c | 147 +- + fs/xfs/xfs_exchrange.h | 16 +- + fs/xfs/xfs_file.c | 78 +- + fs/xfs/xfs_fsmap.c | 403 +++-- + fs/xfs/xfs_fsmap.h | 6 +- + fs/xfs/xfs_fsops.c | 2 +- + fs/xfs/xfs_handle.c | 6 +- + fs/xfs/xfs_icache.c | 95 +- + fs/xfs/xfs_inode.c | 86 +- + fs/xfs/xfs_inode.h | 12 +- + fs/xfs/xfs_ioctl.c | 162 +- + fs/xfs/xfs_iomap.c | 19 +- + fs/xfs/xfs_iops.c | 22 +- + fs/xfs/xfs_log.c | 2 +- + fs/xfs/xfs_log_recover.c | 2 +- + fs/xfs/xfs_mount.c | 10 +- + fs/xfs/xfs_mount.h | 5 +- + fs/xfs/xfs_mru_cache.c | 3 +- + fs/xfs/xfs_qm.c | 48 +- + fs/xfs/xfs_qm.h | 3 + + fs/xfs/xfs_qm_syscalls.c | 13 +- + fs/xfs/xfs_quotaops.c | 53 +- + fs/xfs/xfs_rtalloc.c | 868 +++++----- + fs/xfs/xfs_super.c | 44 +- + fs/xfs/xfs_symlink.c | 2 +- + fs/xfs/xfs_trace.h | 61 +- + fs/zonefs/file.c | 2 +- + fs/zonefs/sysfs.c | 1 + + include/linux/ceph/osd_client.h | 2 - + include/linux/cleanup.h | 2 +- + include/linux/f2fs_fs.h | 4 +- + include/linux/fanotify.h | 20 +- + include/linux/file.h | 57 +- + include/linux/fs.h | 45 +- + include/linux/fsnotify.h | 58 +- + include/linux/fsnotify_backend.h | 59 +- + include/linux/generic-radix-tree.h | 105 +- + include/linux/huge_mm.h | 28 +- + include/linux/iomap.h | 13 +- + include/linux/jbd2.h | 4 +- + include/linux/lockd/lockd.h | 2 +- + include/linux/mm.h | 1 + + include/linux/nfs4.h | 24 +- + include/linux/nfs_fs_sb.h | 4 +- + include/linux/nfs_xdr.h | 7 +- + include/linux/pagemap.h | 124 +- + include/linux/quota.h | 2 +- + include/linux/sunrpc/sched.h | 16 +- + include/linux/sunrpc/svc.h | 44 +- + include/linux/sunrpc/svc_rdma.h | 2 + + include/linux/sunrpc/svcauth.h | 1 - + include/linux/sunrpc/svcsock.h | 2 - + include/linux/sunrpc/xdrgen/_builtins.h | 243 +++ + include/linux/sunrpc/xdrgen/_defs.h | 26 + + include/linux/sunrpc/xdrgen/nfs4.h | 96 ++ + include/linux/time64.h | 5 + + include/trace/events/f2fs.h | 3 +- + include/trace/events/rpcrdma.h | 23 + + include/trace/events/timestamp.h | 124 ++ + include/trace/misc/nfs.h | 1 + + include/uapi/linux/exfat.h | 25 + + include/uapi/linux/fanotify.h | 18 + + include/uapi/linux/fuse.h | 22 +- + io_uring/sqpoll.c | 10 +- + ipc/mqueue.c | 50 +- + kernel/bpf/bpf_inode_storage.c | 14 +- + kernel/bpf/btf.c | 6 +- + kernel/bpf/syscall.c | 42 +- + kernel/bpf/token.c | 10 +- + kernel/cgroup/cgroup.c | 4 +- + kernel/events/core.c | 14 +- + kernel/module/main.c | 2 +- + kernel/nsproxy.c | 12 +- + kernel/pid.c | 10 +- + kernel/signal.c | 6 +- + kernel/sys.c | 10 +- + kernel/taskstats.c | 4 +- + kernel/watch_queue.c | 4 +- + lib/generic-radix-tree.c | 80 +- + mm/fadvise.c | 4 +- + mm/filemap.c | 170 +- + mm/huge_memory.c | 65 +- + mm/memcontrol-v1.c | 12 +- + mm/memory.c | 22 + + mm/nommu.c | 7 + + mm/readahead.c | 106 +- + mm/shmem.c | 9 +- + net/ceph/messenger.c | 2 +- + net/core/net_namespace.c | 6 +- + net/socket.c | 14 +- + net/sunrpc/cache.c | 10 +- + net/sunrpc/clnt.c | 7 +- + net/sunrpc/sunrpc.h | 4 + + net/sunrpc/svc.c | 130 +- + net/sunrpc/svc_xprt.c | 9 - + net/sunrpc/svcauth.c | 1 - + net/sunrpc/svcsock.c | 1 - + net/sunrpc/xprtrdma/svc_rdma_transport.c | 18 +- + security/integrity/ima/ima_main.c | 4 +- + security/landlock/syscalls.c | 22 +- + security/loadpin/loadpin.c | 4 +- + security/selinux/hooks.c | 3 +- + sound/core/pcm_native.c | 6 +- + tools/net/sunrpc/xdrgen/.gitignore | 2 + + tools/net/sunrpc/xdrgen/README | 244 +++ + tools/net/sunrpc/xdrgen/__init__.py | 2 + + tools/net/sunrpc/xdrgen/generators/__init__.py | 113 ++ + tools/net/sunrpc/xdrgen/generators/constant.py | 20 + + tools/net/sunrpc/xdrgen/generators/enum.py | 44 + + .../net/sunrpc/xdrgen/generators/header_bottom.py | 33 + + tools/net/sunrpc/xdrgen/generators/header_top.py | 45 + + tools/net/sunrpc/xdrgen/generators/pointer.py | 272 +++ + tools/net/sunrpc/xdrgen/generators/program.py | 168 ++ + tools/net/sunrpc/xdrgen/generators/source_top.py | 32 + + tools/net/sunrpc/xdrgen/generators/struct.py | 272 +++ + tools/net/sunrpc/xdrgen/generators/typedef.py | 255 +++ + tools/net/sunrpc/xdrgen/generators/union.py | 243 +++ + tools/net/sunrpc/xdrgen/grammars/xdr.lark | 119 ++ + tools/net/sunrpc/xdrgen/subcmds/__init__.py | 2 + + tools/net/sunrpc/xdrgen/subcmds/declarations.py | 76 + + tools/net/sunrpc/xdrgen/subcmds/definitions.py | 78 + + tools/net/sunrpc/xdrgen/subcmds/lint.py | 33 + + tools/net/sunrpc/xdrgen/subcmds/source.py | 118 ++ + .../xdrgen/templates/C/constants/definition.j2 | 3 + + .../xdrgen/templates/C/enum/declaration/close.j2 | 4 + + .../sunrpc/xdrgen/templates/C/enum/decoder/enum.j2 | 19 + + .../xdrgen/templates/C/enum/definition/close.j2 | 2 + + .../templates/C/enum/definition/enumerator.j2 | 2 + + .../xdrgen/templates/C/enum/definition/open.j2 | 3 + + .../sunrpc/xdrgen/templates/C/enum/encoder/enum.j2 | 14 + + .../C/header_bottom/declaration/header.j2 | 3 + + .../templates/C/header_bottom/definition/header.j2 | 3 + + .../templates/C/header_top/declaration/header.j2 | 14 + + .../templates/C/header_top/definition/header.j2 | 10 + + .../templates/C/pointer/declaration/close.j2 | 4 + + .../xdrgen/templates/C/pointer/decoder/basic.j2 | 6 + + .../xdrgen/templates/C/pointer/decoder/close.j2 | 3 + + .../C/pointer/decoder/fixed_length_array.j2 | 8 + + .../C/pointer/decoder/fixed_length_opaque.j2 | 6 + + .../xdrgen/templates/C/pointer/decoder/open.j2 | 22 + + .../templates/C/pointer/decoder/optional_data.j2 | 6 + + .../C/pointer/decoder/variable_length_array.j2 | 13 + + .../C/pointer/decoder/variable_length_opaque.j2 | 6 + + .../C/pointer/decoder/variable_length_string.j2 | 6 + + .../xdrgen/templates/C/pointer/definition/basic.j2 | 5 + + .../xdrgen/templates/C/pointer/definition/close.j2 | 2 + + .../C/pointer/definition/fixed_length_array.j2 | 5 + + .../C/pointer/definition/fixed_length_opaque.j2 | 5 + + .../xdrgen/templates/C/pointer/definition/open.j2 | 6 + + .../C/pointer/definition/optional_data.j2 | 5 + + .../C/pointer/definition/variable_length_array.j2 | 8 + + .../C/pointer/definition/variable_length_opaque.j2 | 5 + + .../C/pointer/definition/variable_length_string.j2 | 5 + + .../xdrgen/templates/C/pointer/encoder/basic.j2 | 10 + + .../xdrgen/templates/C/pointer/encoder/close.j2 | 3 + + .../C/pointer/encoder/fixed_length_array.j2 | 12 + + .../C/pointer/encoder/fixed_length_opaque.j2 | 6 + + .../xdrgen/templates/C/pointer/encoder/open.j2 | 20 + + .../templates/C/pointer/encoder/optional_data.j2 | 6 + + .../C/pointer/encoder/variable_length_array.j2 | 15 + + .../C/pointer/encoder/variable_length_opaque.j2 | 8 + + .../C/pointer/encoder/variable_length_string.j2 | 8 + + .../templates/C/program/declaration/argument.j2 | 2 + + .../templates/C/program/declaration/result.j2 | 2 + + .../xdrgen/templates/C/program/decoder/argument.j2 | 21 + + .../xdrgen/templates/C/program/decoder/result.j2 | 22 + + .../xdrgen/templates/C/program/definition/close.j2 | 2 + + .../xdrgen/templates/C/program/definition/open.j2 | 6 + + .../templates/C/program/definition/procedure.j2 | 2 + + .../xdrgen/templates/C/program/encoder/argument.j2 | 16 + + .../xdrgen/templates/C/program/encoder/result.j2 | 21 + + .../sunrpc/xdrgen/templates/C/source_top/client.j2 | 8 + + .../sunrpc/xdrgen/templates/C/source_top/server.j2 | 8 + + .../xdrgen/templates/C/struct/declaration/close.j2 | 4 + + .../xdrgen/templates/C/struct/decoder/basic.j2 | 6 + + .../xdrgen/templates/C/struct/decoder/close.j2 | 3 + + .../C/struct/decoder/fixed_length_array.j2 | 8 + + .../C/struct/decoder/fixed_length_opaque.j2 | 6 + + .../xdrgen/templates/C/struct/decoder/open.j2 | 12 + + .../templates/C/struct/decoder/optional_data.j2 | 6 + + .../C/struct/decoder/variable_length_array.j2 | 13 + + .../C/struct/decoder/variable_length_opaque.j2 | 6 + + .../C/struct/decoder/variable_length_string.j2 | 6 + + .../xdrgen/templates/C/struct/definition/basic.j2 | 5 + + .../xdrgen/templates/C/struct/definition/close.j2 | 2 + + .../C/struct/definition/fixed_length_array.j2 | 5 + + .../C/struct/definition/fixed_length_opaque.j2 | 5 + + .../xdrgen/templates/C/struct/definition/open.j2 | 6 + + .../templates/C/struct/definition/optional_data.j2 | 5 + + .../C/struct/definition/variable_length_array.j2 | 8 + + .../C/struct/definition/variable_length_opaque.j2 | 5 + + .../C/struct/definition/variable_length_string.j2 | 5 + + .../xdrgen/templates/C/struct/encoder/basic.j2 | 10 + + .../xdrgen/templates/C/struct/encoder/close.j2 | 3 + + .../C/struct/encoder/fixed_length_array.j2 | 12 + + .../C/struct/encoder/fixed_length_opaque.j2 | 6 + + .../xdrgen/templates/C/struct/encoder/open.j2 | 12 + + .../templates/C/struct/encoder/optional_data.j2 | 6 + + .../C/struct/encoder/variable_length_array.j2 | 15 + + .../C/struct/encoder/variable_length_opaque.j2 | 8 + + .../C/struct/encoder/variable_length_string.j2 | 8 + + .../templates/C/typedef/declaration/basic.j2 | 8 + + .../C/typedef/declaration/fixed_length_array.j2 | 4 + + .../C/typedef/declaration/fixed_length_opaque.j2 | 4 + + .../C/typedef/declaration/variable_length_array.j2 | 4 + + .../typedef/declaration/variable_length_opaque.j2 | 4 + + .../typedef/declaration/variable_length_string.j2 | 4 + + .../xdrgen/templates/C/typedef/decoder/basic.j2 | 17 + + .../C/typedef/decoder/fixed_length_array.j2 | 25 + + .../C/typedef/decoder/fixed_length_opaque.j2 | 17 + + .../C/typedef/decoder/variable_length_array.j2 | 26 + + .../C/typedef/decoder/variable_length_opaque.j2 | 17 + + .../C/typedef/decoder/variable_length_string.j2 | 17 + + .../xdrgen/templates/C/typedef/definition/basic.j2 | 6 + + .../C/typedef/definition/fixed_length_array.j2 | 6 + + .../C/typedef/definition/fixed_length_opaque.j2 | 6 + + .../C/typedef/definition/variable_length_array.j2 | 9 + + .../C/typedef/definition/variable_length_opaque.j2 | 6 + + .../C/typedef/definition/variable_length_string.j2 | 6 + + .../xdrgen/templates/C/typedef/encoder/basic.j2 | 21 + + .../C/typedef/encoder/fixed_length_array.j2 | 25 + + .../C/typedef/encoder/fixed_length_opaque.j2 | 17 + + .../C/typedef/encoder/variable_length_array.j2 | 30 + + .../C/typedef/encoder/variable_length_opaque.j2 | 17 + + .../C/typedef/encoder/variable_length_string.j2 | 17 + + .../xdrgen/templates/C/union/decoder/basic.j2 | 6 + + .../xdrgen/templates/C/union/decoder/break.j2 | 2 + + .../xdrgen/templates/C/union/decoder/case_spec.j2 | 2 + + .../xdrgen/templates/C/union/decoder/close.j2 | 4 + + .../templates/C/union/decoder/default_spec.j2 | 2 + + .../xdrgen/templates/C/union/decoder/open.j2 | 12 + + .../templates/C/union/decoder/optional_data.j2 | 6 + + .../templates/C/union/decoder/switch_spec.j2 | 7 + + .../C/union/decoder/variable_length_array.j2 | 13 + + .../C/union/decoder/variable_length_opaque.j2 | 6 + + .../C/union/decoder/variable_length_string.j2 | 6 + + .../xdrgen/templates/C/union/decoder/void.j2 | 3 + + .../templates/C/union/definition/case_spec.j2 | 2 + + .../xdrgen/templates/C/union/definition/close.j2 | 8 + + .../templates/C/union/definition/default_spec.j2 | 2 + + .../xdrgen/templates/C/union/definition/open.j2 | 6 + + .../templates/C/union/definition/switch_spec.j2 | 3 + + .../xdrgen/templates/C/union/encoder/basic.j2 | 10 + + .../xdrgen/templates/C/union/encoder/break.j2 | 2 + + .../xdrgen/templates/C/union/encoder/case_spec.j2 | 2 + + .../xdrgen/templates/C/union/encoder/close.j2 | 4 + + .../templates/C/union/encoder/default_spec.j2 | 2 + + .../xdrgen/templates/C/union/encoder/open.j2 | 12 + + .../templates/C/union/encoder/switch_spec.j2 | 7 + + .../xdrgen/templates/C/union/encoder/void.j2 | 3 + + tools/net/sunrpc/xdrgen/tests/test.x | 36 + + tools/net/sunrpc/xdrgen/xdr_ast.py | 510 ++++++ + tools/net/sunrpc/xdrgen/xdr_parse.py | 36 + + tools/net/sunrpc/xdrgen/xdrgen | 132 ++ + virt/kvm/eventfd.c | 6 +- + virt/kvm/vfio.c | 8 +- + 660 files changed, 17450 insertions(+), 9355 deletions(-) + create mode 100644 Documentation/filesystems/multigrain-ts.rst + create mode 100644 Documentation/sunrpc/xdr/nfs4.x + create mode 100644 fs/bcachefs/rcu_pending.c + create mode 100644 fs/bcachefs/rcu_pending.h + create mode 100644 fs/fuse/fuse_trace.h + create mode 100644 fs/nfsd/nfs4xdr_gen.c + create mode 100644 fs/nfsd/nfs4xdr_gen.h + create mode 100644 fs/smb/client/compress.c + create mode 100644 fs/smb/client/compress.h + create mode 100644 fs/smb/client/compress/lz77.c + create mode 100644 fs/smb/client/compress/lz77.h + rename fs/smb/{client => common}/smb2status.h (99%) + create mode 100644 fs/smb/common/smbacl.h + delete mode 100644 fs/smb/server/smbstatus.h + create mode 100644 include/linux/sunrpc/xdrgen/_builtins.h + create mode 100644 include/linux/sunrpc/xdrgen/_defs.h + create mode 100644 include/linux/sunrpc/xdrgen/nfs4.h + create mode 100644 include/trace/events/timestamp.h + create mode 100644 include/uapi/linux/exfat.h + create mode 100644 tools/net/sunrpc/xdrgen/.gitignore + create mode 100644 tools/net/sunrpc/xdrgen/README + create mode 100644 tools/net/sunrpc/xdrgen/__init__.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/__init__.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/constant.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/enum.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/header_bottom.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/header_top.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/pointer.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/program.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/source_top.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/struct.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/typedef.py + create mode 100644 tools/net/sunrpc/xdrgen/generators/union.py + create mode 100644 tools/net/sunrpc/xdrgen/grammars/xdr.lark + create mode 100644 tools/net/sunrpc/xdrgen/subcmds/__init__.py + create mode 100644 tools/net/sunrpc/xdrgen/subcmds/declarations.py + create mode 100644 tools/net/sunrpc/xdrgen/subcmds/definitions.py + create mode 100644 tools/net/sunrpc/xdrgen/subcmds/lint.py + create mode 100644 tools/net/sunrpc/xdrgen/subcmds/source.py + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/constants/definition.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/declaration/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/decoder/enum.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/definition/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/definition/enumerator.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/definition/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/enum/encoder/enum.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/header_bottom/declaration/header.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/header_bottom/definition/header.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/header_top/declaration/header.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/header_top/definition/header.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/declaration/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/optional_data.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/optional_data.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/optional_data.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/declaration/argument.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/declaration/result.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/decoder/argument.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/decoder/result.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/definition/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/definition/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/definition/procedure.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/encoder/argument.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/program/encoder/result.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/source_top/client.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/source_top/server.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/declaration/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/optional_data.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/optional_data.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/optional_data.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/declaration/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/decoder/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/definition/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/definition/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/definition/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/definition/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/definition/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/definition/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/fixed_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/fixed_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/typedef/encoder/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/break.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/case_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/default_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/optional_data.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/switch_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/variable_length_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/variable_length_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/variable_length_string.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/decoder/void.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/definition/case_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/definition/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/definition/default_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/definition/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/definition/switch_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/basic.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/break.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/case_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/close.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/default_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/open.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/switch_spec.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/void.j2 + create mode 100644 tools/net/sunrpc/xdrgen/tests/test.x + create mode 100644 tools/net/sunrpc/xdrgen/xdr_ast.py + create mode 100644 tools/net/sunrpc/xdrgen/xdr_parse.py + create mode 100755 tools/net/sunrpc/xdrgen/xdrgen +Merging printk/for-next (b794563ea12f Merge branch 'for-6.11-fixup' 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 (2374573159ed Merge branch 'pci/tools') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/ast/ast_drv.c +Auto-merging drivers/pci/controller/dwc/pcie-qcom-ep.c +Auto-merging drivers/pci/controller/dwc/pcie-qcom.c +Auto-merging drivers/pci/devres.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pwrctl/pci-pwrctl-pwrseq.c +Auto-merging drivers/pci/remove.c +Auto-merging include/linux/pci_ids.h +Auto-merging kernel/irq/msi.c +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-pci | 72 ++ + .../devicetree/bindings/pci/altera-pcie-msi.txt | 27 - + .../devicetree/bindings/pci/altera-pcie.txt | 50 - + .../bindings/pci/altr,msi-controller.yaml | 65 ++ + .../bindings/pci/altr,pcie-root-port.yaml | 114 +++ + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 42 +- + .../devicetree/bindings/pci/fsl,imx6q-pcie-ep.yaml | 13 +- + .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 16 + + .../bindings/pci/fsl,layerscape-pcie.yaml | 41 +- + .../bindings/pci/hisilicon,kirin-pcie.yaml | 3 +- + .../devicetree/bindings/pci/host-generic-pci.yaml | 2 - + .../bindings/pci/mediatek-pcie-gen3.yaml | 68 +- + Documentation/devicetree/bindings/pci/pci-ep.yaml | 14 +- + .../devicetree/bindings/pci/qcom,pcie-common.yaml | 7 +- + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 1 + + .../devicetree/bindings/pci/qcom,pcie-sc7280.yaml | 27 +- + .../bindings/pci/qcom,pcie-sc8280xp.yaml | 3 - + .../devicetree/bindings/pci/qcom,pcie-sm8450.yaml | 10 +- + .../devicetree/bindings/pci/qcom,pcie.yaml | 3 + + .../devicetree/bindings/pci/rcar-gen4-pci-ep.yaml | 1 + + .../bindings/pci/rcar-gen4-pci-host.yaml | 1 + + .../bindings/pci/renesas,pci-rcar-gen2.yaml | 8 +- + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 8 +- + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 10 + + .../devicetree/bindings/pci/xlnx,nwl-pcie.yaml | 7 + + .../devicetree/bindings/pci/xlnx,xdma-host.yaml | 36 +- + MAINTAINERS | 8 +- + arch/arm64/boot/dts/xilinx/zynqmp-zcu102-revA.dts | 1 + + arch/s390/include/asm/pci.h | 9 +- + arch/s390/pci/Makefile | 3 +- + arch/s390/pci/pci.c | 1 - + arch/s390/pci/pci_sysfs.c | 14 +- + arch/x86/pci/fixup.c | 4 +- + drivers/Makefile | 4 +- + drivers/acpi/pci_mcfg.c | 12 + + drivers/bcma/driver_pci_host.c | 10 +- + drivers/gpu/drm/ast/ast_drv.c | 12 +- + drivers/gpu/drm/vboxvideo/vbox_main.c | 4 + + drivers/pci/Kconfig | 9 + + drivers/pci/Makefile | 1 + + drivers/pci/controller/Kconfig | 2 +- + drivers/pci/controller/cadence/pci-j721e.c | 160 +++- + drivers/pci/controller/cadence/pcie-cadence-host.c | 44 +- + drivers/pci/controller/cadence/pcie-cadence.h | 13 +- + drivers/pci/controller/dwc/Kconfig | 5 + + drivers/pci/controller/dwc/Makefile | 1 + + drivers/pci/controller/dwc/pci-dra7xx.c | 11 +- + drivers/pci/controller/dwc/pci-imx6.c | 1000 +++++++++++--------- + drivers/pci/controller/dwc/pci-keystone.c | 9 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 12 +- + drivers/pci/controller/dwc/pcie-designware.c | 24 +- + drivers/pci/controller/dwc/pcie-designware.h | 35 +- + drivers/pci/controller/dwc/pcie-intel-gw.c | 4 +- + drivers/pci/controller/dwc/pcie-kirin.c | 4 +- + drivers/pci/controller/dwc/pcie-qcom-common.c | 78 ++ + drivers/pci/controller/dwc/pcie-qcom-common.h | 14 + + drivers/pci/controller/dwc/pcie-qcom-ep.c | 41 +- + drivers/pci/controller/dwc/pcie-qcom.c | 133 ++- + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 13 +- + drivers/pci/controller/dwc/pcie-spear13xx.c | 2 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 37 +- + .../pci/controller/mobiveil/pcie-mobiveil-host.c | 11 +- + drivers/pci/controller/pci-aardvark.c | 74 +- + drivers/pci/controller/pci-tegra.c | 10 +- + drivers/pci/controller/pci-xgene.c | 6 +- + drivers/pci/controller/pcie-altera-msi.c | 11 +- + drivers/pci/controller/pcie-altera.c | 3 +- + drivers/pci/controller/pcie-brcmstb.c | 602 ++++++++---- + drivers/pci/controller/pcie-iproc.c | 18 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 193 +++- + drivers/pci/controller/pcie-mediatek.c | 12 +- + drivers/pci/controller/pcie-rcar-host.c | 10 +- + drivers/pci/controller/pcie-xilinx-dma-pl.c | 64 +- + drivers/pci/controller/pcie-xilinx-nwl.c | 150 ++- + drivers/pci/controller/pcie-xilinx.c | 9 +- + drivers/pci/controller/plda/pcie-plda-host.c | 11 +- + drivers/pci/controller/vmd.c | 17 +- + drivers/pci/devres.c | 9 +- + drivers/pci/endpoint/pci-epc-core.c | 14 + + drivers/pci/hotplug/TODO | 5 - + drivers/pci/hotplug/cpqphp_pci.c | 4 +- + drivers/pci/hotplug/shpchp.h | 38 +- + drivers/pci/hotplug/shpchp_core.c | 15 +- + drivers/pci/hotplug/shpchp_ctrl.c | 79 +- + drivers/pci/hotplug/shpchp_hpc.c | 63 +- + drivers/pci/npem.c | 595 ++++++++++++ + drivers/pci/pci-bridge-emul.c | 4 +- + drivers/pci/pci-driver.c | 2 +- + drivers/pci/pci-sysfs.c | 5 + + drivers/pci/pci.c | 75 +- + drivers/pci/pci.h | 46 +- + drivers/pci/pcie/aer_inject.c | 4 +- + drivers/pci/probe.c | 37 +- + drivers/pci/pwrctl/pci-pwrctl-pwrseq.c | 5 + + drivers/pci/quirks.c | 39 +- + drivers/pci/remove.c | 4 +- + include/linux/bcma/bcma_driver_pci.h | 2 +- + include/linux/msi.h | 2 + + include/linux/pci-epc.h | 3 + + include/linux/pci.h | 11 +- + include/linux/pci_ids.h | 2 + + include/uapi/linux/pci_regs.h | 41 +- + kernel/irq/msi.c | 2 +- + sound/pci/hda/hda_intel.c | 2 +- + tools/pci/Makefile | 2 +- + tools/pci/pcitest.c | 2 - + 106 files changed, 3363 insertions(+), 1333 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pci/altera-pcie-msi.txt + delete mode 100644 Documentation/devicetree/bindings/pci/altera-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/altr,msi-controller.yaml + create mode 100644 Documentation/devicetree/bindings/pci/altr,pcie-root-port.yaml + create mode 100644 drivers/pci/controller/dwc/pcie-qcom-common.c + create mode 100644 drivers/pci/controller/dwc/pcie-qcom-common.h + create mode 100644 drivers/pci/npem.c +Merging pstore/for-next/pstore (1bf8012fc699 pstore: replace spinlock_t by raw_spinlock_t) +$ 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. + Documentation/admin-guide/ramoops.rst | 2 +- + fs/pstore/platform.c | 8 ++++---- + include/linux/pstore.h | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) +Merging hid/for-next (183650fd5428 Merge branch 'for-6.12/cp2112' 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 +Auto-merging tools/testing/selftests/hid/hid_bpf.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/elan,ekth6915.yaml | 4 +- + .../devicetree/bindings/input/goodix,gt7986u.yaml | 71 ++ + Documentation/hid/intel-ish-hid.rst | 29 + + drivers/hid/Kconfig | 6 + + drivers/hid/Makefile | 1 + + drivers/hid/amd-sfh-hid/amd_sfh_hid.h | 2 - + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 4 +- + drivers/hid/bpf/hid_bpf_dispatch.c | 6 +- + drivers/hid/hid-apple.c | 2 +- + drivers/hid/hid-asus.c | 2 +- + drivers/hid/hid-aureal.c | 2 +- + drivers/hid/hid-bigbenff.c | 6 +- + drivers/hid/hid-cherry.c | 2 +- + drivers/hid/hid-chicony.c | 4 +- + drivers/hid/hid-cmedia.c | 6 +- + drivers/hid/hid-core.c | 39 +- + drivers/hid/hid-corsair.c | 4 +- + drivers/hid/hid-cougar.c | 4 +- + drivers/hid/hid-cp2112.c | 7 +- + drivers/hid/hid-cypress.c | 2 +- + drivers/hid/hid-dr.c | 8 +- + drivers/hid/hid-elecom.c | 2 +- + drivers/hid/hid-gembird.c | 2 +- + drivers/hid/hid-glorious.c | 2 +- + drivers/hid/hid-goodix-spi.c | 818 +++++++++++++++++++++ + drivers/hid/hid-google-hammer.c | 27 +- + drivers/hid/hid-holtek-kbd.c | 6 +- + drivers/hid/hid-holtek-mouse.c | 4 +- + drivers/hid/hid-ids.h | 18 +- + drivers/hid/hid-input.c | 37 +- + drivers/hid/hid-ite.c | 2 +- + drivers/hid/hid-keytouch.c | 8 +- + drivers/hid/hid-kye.c | 2 +- + drivers/hid/hid-lenovo.c | 2 +- + drivers/hid/hid-lg.c | 30 +- + drivers/hid/hid-logitech-hidpp.c | 4 +- + drivers/hid/hid-macally.c | 4 +- + drivers/hid/hid-magicmouse.c | 4 +- + drivers/hid/hid-maltron.c | 8 +- + drivers/hid/hid-microsoft.c | 2 +- + drivers/hid/hid-monterey.c | 2 +- + drivers/hid/hid-multitouch.c | 30 +- + drivers/hid/hid-nti.c | 2 +- + drivers/hid/hid-ortek.c | 2 +- + drivers/hid/hid-petalynx.c | 2 +- + drivers/hid/hid-picolcd_backlight.c | 5 +- + drivers/hid/hid-playstation.c | 20 + + drivers/hid/hid-prodikeys.c | 2 +- + drivers/hid/hid-pxrc.c | 6 +- + drivers/hid/hid-redragon.c | 2 +- + drivers/hid/hid-saitek.c | 2 +- + drivers/hid/hid-samsung.c | 2 +- + drivers/hid/hid-semitek.c | 4 +- + drivers/hid/hid-sensor-custom.c | 2 +- + drivers/hid/hid-sensor-hub.c | 2 +- + drivers/hid/hid-sigmamicro.c | 4 +- + drivers/hid/hid-sony.c | 14 +- + drivers/hid/hid-steelseries.c | 8 +- + drivers/hid/hid-sunplus.c | 2 +- + drivers/hid/hid-topre.c | 4 +- + drivers/hid/hid-uclogic-core.c | 4 +- + drivers/hid/hid-uclogic-params.c | 4 +- + drivers/hid/hid-uclogic-params.h | 10 +- + drivers/hid/hid-uclogic-rdesc.c | 20 +- + drivers/hid/hid-uclogic-rdesc.h | 20 +- + drivers/hid/hid-viewsonic.c | 8 +- + drivers/hid/hid-vrc2.c | 6 +- + drivers/hid/hid-waltop.c | 30 +- + drivers/hid/hid-winwing.c | 8 +- + drivers/hid/hid-xiaomi.c | 8 +- + drivers/hid/hid-zydacron.c | 2 +- + drivers/hid/hidraw.c | 39 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 42 +- + drivers/hid/i2c-hid/i2c-hid-of-elan.c | 8 + + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 10 +- + drivers/hid/intel-ish-hid/ishtp/bus.h | 1 - + drivers/hid/intel-ish-hid/ishtp/client.h | 1 - + drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 8 +- + drivers/hid/intel-ish-hid/ishtp/loader.c | 121 ++- + drivers/hid/wacom_wac.c | 87 ++- + drivers/hid/wacom_wac.h | 6 +- + include/linux/hid.h | 12 +- + include/linux/hid_bpf.h | 2 +- + include/linux/hidraw.h | 1 + + include/uapi/linux/hidraw.h | 1 + + tools/testing/selftests/hid/.gitignore | 1 + + tools/testing/selftests/hid/Makefile | 2 +- + tools/testing/selftests/hid/hid_bpf.c | 437 +---------- + tools/testing/selftests/hid/hid_common.h | 436 +++++++++++ + tools/testing/selftests/hid/hidraw.c | 237 ++++++ + 90 files changed, 2150 insertions(+), 732 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/goodix,gt7986u.yaml + create mode 100644 drivers/hid/hid-goodix-spi.c + create mode 100644 tools/testing/selftests/hid/hid_common.h + create mode 100644 tools/testing/selftests/hid/hidraw.c +Merging i2c/i2c/for-next (da9902f2dd23 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. + Documentation/devicetree/bindings/eeprom/at24.yaml | 1 + + Documentation/i2c/slave-testunit-backend.rst | 120 +++++++++++++-- + drivers/i2c/Kconfig | 8 - + drivers/i2c/i2c-core-base.c | 59 ++++---- + drivers/i2c/i2c-core-slave.c | 7 +- + drivers/i2c/i2c-slave-testunit.c | 166 +++++++++++++++------ + include/linux/i2c.h | 3 + + 7 files changed, 267 insertions(+), 97 deletions(-) +Merging i2c-host/i2c/i2c-host (f56f4ba2fc1d i2c: designware: Use pci_get_drvdata()) +$ git merge -m Merge branch 'i2c/i2c-host' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host/i2c/i2c-host +Auto-merging arch/arm64/configs/defconfig +Auto-merging arch/riscv/configs/defconfig +Auto-merging drivers/i2c/busses/i2c-aspeed.c +Auto-merging drivers/i2c/busses/i2c-qcom-geni.c +Auto-merging drivers/i2c/i2c-core-base.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/aspeed,i2c.yaml | 5 - + .../devicetree/bindings/i2c/i2c-rk3x.yaml | 1 + + Documentation/devicetree/bindings/i2c/i2c-sprd.txt | 31 -- + .../bindings/i2c/nvidia,tegra20-i2c.yaml | 27 +- + .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 1 + + .../devicetree/bindings/i2c/renesas,riic.yaml | 4 + + .../devicetree/bindings/i2c/sprd,sc9860-i2c.yaml | 65 +++ + .../devicetree/bindings/i2c/tsd,mule-i2c-mux.yaml | 69 +++ + arch/arc/configs/axs101_defconfig | 1 + + arch/arc/configs/axs103_defconfig | 1 + + arch/arc/configs/axs103_smp_defconfig | 1 + + arch/arc/configs/tb10x_defconfig | 1 + + arch/arm/configs/hisi_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm/configs/pxa_defconfig | 1 + + arch/arm/configs/socfpga_defconfig | 1 + + arch/arm/configs/spear13xx_defconfig | 1 + + arch/arm/configs/spear3xx_defconfig | 1 + + arch/arm/configs/spear6xx_defconfig | 1 + + arch/arm64/configs/defconfig | 1 + + arch/mips/configs/generic/board-ocelot.config | 1 + + arch/riscv/configs/defconfig | 1 + + arch/riscv/configs/nommu_k210_defconfig | 1 + + arch/riscv/configs/nommu_k210_sdcard_defconfig | 1 + + drivers/i2c/busses/Kconfig | 40 +- + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-ali1535.c | 3 +- + drivers/i2c/busses/i2c-amd-mp2-plat.c | 2 +- + drivers/i2c/busses/i2c-aspeed.c | 2 +- + drivers/i2c/busses/i2c-designware-common.c | 180 ++++++- + drivers/i2c/busses/i2c-designware-core.h | 39 +- + drivers/i2c/busses/i2c-designware-master.c | 36 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 88 +-- + drivers/i2c/busses/i2c-designware-platdrv.c | 186 ++----- + drivers/i2c/busses/i2c-designware-slave.c | 6 +- + drivers/i2c/busses/i2c-digicolor.c | 2 +- + drivers/i2c/busses/i2c-emev2.c | 25 +- + drivers/i2c/busses/i2c-i801.c | 9 +- + drivers/i2c/busses/i2c-imx-lpi2c.c | 2 +- + drivers/i2c/busses/i2c-imx.c | 11 +- + drivers/i2c/busses/i2c-ismt.c | 10 + + drivers/i2c/busses/i2c-jz4780.c | 22 +- + drivers/i2c/busses/i2c-keba.c | 598 +++++++++++++++++++++ + drivers/i2c/busses/i2c-ljca.c | 6 +- + drivers/i2c/busses/i2c-mpc.c | 23 +- + drivers/i2c/busses/i2c-mt65xx.c | 5 +- + drivers/i2c/busses/i2c-npcm7xx.c | 6 +- + drivers/i2c/busses/i2c-omap.c | 2 +- + drivers/i2c/busses/i2c-piix4.c | 2 +- + drivers/i2c/busses/i2c-pnx.c | 2 +- + drivers/i2c/busses/i2c-pxa-pci.c | 2 +- + drivers/i2c/busses/i2c-pxa.c | 2 +- + drivers/i2c/busses/i2c-qcom-geni.c | 23 +- + drivers/i2c/busses/i2c-qup.c | 2 +- + drivers/i2c/busses/i2c-rcar.c | 12 +- + drivers/i2c/busses/i2c-riic.c | 228 +++++--- + drivers/i2c/busses/i2c-s3c2410.c | 2 +- + drivers/i2c/busses/i2c-virtio.c | 4 +- + drivers/i2c/i2c-core-base.c | 20 +- + drivers/i2c/muxes/Kconfig | 16 + + drivers/i2c/muxes/Makefile | 1 + + drivers/i2c/muxes/i2c-mux-mule.c | 148 +++++ + drivers/net/ethernet/wangxun/Kconfig | 3 +- + 63 files changed, 1481 insertions(+), 509 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-sprd.txt + create mode 100644 Documentation/devicetree/bindings/i2c/sprd,sc9860-i2c.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/tsd,mule-i2c-mux.yaml + create mode 100644 drivers/i2c/busses/i2c-keba.c + create mode 100644 drivers/i2c/muxes/i2c-mux-mule.c +Merging i3c/i3c/next (618507257797 i3c: master: svc: Fix use after free vulnerability in svc_i3c_master Driver Due to Race Condition) +$ 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 | 12 ++++ + drivers/i3c/master/i3c-master-cdns.c | 2 + + drivers/i3c/master/mipi-i3c-hci/Makefile | 3 +- + drivers/i3c/master/mipi-i3c-hci/cmd_v1.c | 12 ++-- + drivers/i3c/master/mipi-i3c-hci/core.c | 36 +++++++++--- + drivers/i3c/master/mipi-i3c-hci/hci.h | 10 ++++ + drivers/i3c/master/mipi-i3c-hci/hci_quirks.c | 44 +++++++++++++++ + drivers/i3c/master/svc-i3c-master.c | 84 +++++++++++++++++++++++++--- + include/linux/i3c/master.h | 16 ++++++ + 9 files changed, 193 insertions(+), 26 deletions(-) + create mode 100644 drivers/i3c/master/mipi-i3c-hci/hci_quirks.c +Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) +$ 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 (2cb4acf2140b hwmon: Remove devm_hwmon_device_unregister() API function) +$ 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 +Auto-merging MAINTAINERS +Auto-merging drivers/hwmon/adt7475.c +Auto-merging drivers/hwmon/k10temp.c +Auto-merging drivers/hwmon/pmbus/pmbus.h +Auto-merging drivers/hwmon/pmbus/pmbus_core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/hwmon/adt7475.yaml | 37 +- + .../devicetree/bindings/hwmon/lltc,ltc2978.yaml | 94 +++ + .../devicetree/bindings/hwmon/ltc2978.txt | 62 -- + .../devicetree/bindings/hwmon/maxim,max31790.yaml | 70 ++ + .../bindings/hwmon/sophgo,sg2042-hwmon-mcu.yaml | 43 + + Documentation/hwmon/hwmon-kernel-api.rst | 7 - + Documentation/hwmon/ina2xx.rst | 4 + + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/lm92.rst | 26 +- + Documentation/hwmon/max1619.rst | 4 - + Documentation/hwmon/oxp-sensors.rst | 56 +- + Documentation/hwmon/sg2042-mcu.rst | 78 ++ + MAINTAINERS | 6 + + drivers/hwmon/Kconfig | 26 +- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/adt7470.c | 22 +- + drivers/hwmon/adt7475.c | 130 +++ + drivers/hwmon/adt7x10.c | 18 +- + drivers/hwmon/amc6821.c | 30 +- + drivers/hwmon/aspeed-g6-pwm-tach.c | 4 +- + drivers/hwmon/aspeed-pwm-tacho.c | 8 +- + drivers/hwmon/chipcap2.c | 33 +- + drivers/hwmon/dell-smm-hwmon.c | 8 + + drivers/hwmon/gsc-hwmon.c | 1 + + drivers/hwmon/hwmon.c | 18 - + drivers/hwmon/ina2xx.c | 895 +++++++++++--------- + drivers/hwmon/ina3221.c | 7 +- + drivers/hwmon/k10temp.c | 26 +- + drivers/hwmon/lm90.c | 7 +- + drivers/hwmon/lm92.c | 457 +++++++---- + drivers/hwmon/lm95234.c | 869 ++++++++------------ + drivers/hwmon/lm95245.c | 110 +-- + drivers/hwmon/ltc2947-core.c | 20 +- + drivers/hwmon/ltc2992.c | 19 +- + drivers/hwmon/max16065.c | 17 +- + drivers/hwmon/max1619.c | 495 ++++++----- + drivers/hwmon/max1668.c | 487 ++++------- + drivers/hwmon/max6639.c | 40 +- + drivers/hwmon/max6697.c | 907 +++++++++------------ + drivers/hwmon/nct6775-platform.c | 1 + + drivers/hwmon/nct7802.c | 69 +- + drivers/hwmon/npcm750-pwm-fan.c | 5 +- + drivers/hwmon/ntc_thermistor.c | 1 + + drivers/hwmon/oxp-sensors.c | 301 ++++++- + drivers/hwmon/pc87360.c | 2 +- + drivers/hwmon/pmbus/max15301.c | 92 +-- + drivers/hwmon/pmbus/mpq7932.c | 2 +- + drivers/hwmon/pmbus/pli1209bc.c | 26 +- + drivers/hwmon/pmbus/pmbus.h | 10 + + drivers/hwmon/pmbus/pmbus_core.c | 92 ++- + drivers/hwmon/pmbus/ucd9000.c | 64 +- + drivers/hwmon/pmbus/zl6100.c | 66 +- + drivers/hwmon/pwm-fan.c | 11 +- + drivers/hwmon/sch5636.c | 3 +- + drivers/hwmon/sch56xx-common.h | 1 - + drivers/hwmon/sg2042-mcu.c | 388 +++++++++ + drivers/hwmon/sht21.c | 5 +- + drivers/hwmon/stts751.c | 2 +- + drivers/hwmon/surface_temp.c | 235 ++++++ + drivers/hwmon/tmp401.c | 17 +- + drivers/hwmon/tmp421.c | 7 +- + drivers/hwmon/tmp464.c | 40 +- + drivers/hwmon/vexpress-hwmon.c | 2 +- + include/linux/hwmon.h | 1 - + include/linux/platform_data/max6697.h | 33 - + 65 files changed, 3740 insertions(+), 2880 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/lltc,ltc2978.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/ltc2978.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/maxim,max31790.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/sophgo,sg2042-hwmon-mcu.yaml + create mode 100644 Documentation/hwmon/sg2042-mcu.rst + create mode 100644 drivers/hwmon/sg2042-mcu.c + create mode 100644 drivers/hwmon/surface_temp.c + delete mode 100644 include/linux/platform_data/max6697.h +Merging jc_docs/docs-next (052f172ef127 Merge branch 'docs-mw' into docs-next) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging .mailmap +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging drivers/ufs/core/ufs-fault-injection.c +Auto-merging include/linux/fault-inject.h +Auto-merging lib/Kconfig.debug +Auto-merging tools/testing/fault-injection/failcmd.sh +Merge made by the 'ort' strategy. + .mailmap | 1 + + Documentation/admin-guide/kernel-parameters.txt | 2 +- + Documentation/{ => dev-tools}/fault-injection/fault-injection.rst | 0 + Documentation/{ => dev-tools}/fault-injection/index.rst | 0 + .../{ => dev-tools}/fault-injection/notifier-error-inject.rst | 0 + .../{ => dev-tools}/fault-injection/nvme-fault-injection.rst | 0 + Documentation/{ => dev-tools}/fault-injection/provoke-crashes.rst | 0 + Documentation/dev-tools/index.rst | 1 + + Documentation/index.rst | 1 - + Documentation/process/4.Coding.rst | 2 +- + Documentation/process/submit-checklist.rst | 2 +- + Documentation/translations/it_IT/process/4.Coding.rst | 2 +- + Documentation/translations/it_IT/process/submit-checklist.rst | 2 +- + Documentation/translations/ja_JP/SubmitChecklist | 2 +- + Documentation/translations/sp_SP/process/submit-checklist.rst | 2 +- + Documentation/translations/zh_CN/index.rst | 2 +- + Documentation/translations/zh_CN/process/4.Coding.rst | 2 +- + Documentation/translations/zh_CN/process/submit-checklist.rst | 2 +- + Documentation/translations/zh_TW/index.rst | 2 +- + Documentation/translations/zh_TW/process/4.Coding.rst | 2 +- + Documentation/translations/zh_TW/process/submit-checklist.rst | 2 +- + MAINTAINERS | 4 ++-- + drivers/block/null_blk/main.c | 2 +- + drivers/misc/lkdtm/core.c | 2 +- + drivers/ufs/core/ufs-fault-injection.c | 2 +- + include/asm-generic/error-injection.h | 5 +++-- + include/linux/fault-inject.h | 2 +- + lib/Kconfig.debug | 4 ++-- + tools/testing/fault-injection/failcmd.sh | 2 +- + 29 files changed, 27 insertions(+), 25 deletions(-) + rename Documentation/{ => dev-tools}/fault-injection/fault-injection.rst (100%) + rename Documentation/{ => dev-tools}/fault-injection/index.rst (100%) + rename Documentation/{ => dev-tools}/fault-injection/notifier-error-inject.rst (100%) + rename Documentation/{ => dev-tools}/fault-injection/nvme-fault-injection.rst (100%) + rename Documentation/{ => dev-tools}/fault-injection/provoke-crashes.rst (100%) +Merging v4l-dvb/master (3f52e32445a1 media: MAINTAINERS: Add "qcom," substring for Qualcomm Camera Subsystem) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging Documentation/admin-guide/media/vivid.rst +Auto-merging MAINTAINERS +Auto-merging drivers/media/pci/intel/ipu6/ipu6.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/mgb4.rst | 23 +- + Documentation/admin-guide/media/rkisp1.rst | 11 +- + Documentation/admin-guide/media/vivid.rst | 4 +- + .../devicetree/bindings/media/amlogic,gx-vdec.yaml | 3 +- + .../bindings/media/i2c/ovti,og01a1b.yaml | 107 ++ + .../devicetree/bindings/media/i2c/sony,imx335.yaml | 4 + + .../bindings/media/qcom,sc7280-venus.yaml | 1 + + .../devicetree/bindings/media/renesas,fcp.yaml | 2 + + .../devicetree/bindings/media/renesas,vin.yaml | 4 + + .../devicetree/bindings/media/renesas,vsp1.yaml | 1 + + .../bindings/media/rockchip,rk3568-vepu.yaml | 1 + + .../devicetree/bindings/media/rockchip-vpu.yaml | 7 +- + Documentation/driver-api/media/mc-core.rst | 67 +- + .../media/cec/cec-ioc-adap-g-caps.rst | 6 + + .../userspace-api/media/cec/cec-ioc-receive.rst | 15 + + Documentation/userspace-api/media/v4l/buffer.rst | 35 - + .../userspace-api/media/v4l/capture.c.rst | 6 +- + .../media/v4l/ext-ctrls-codec-stateless.rst | 20 +- + .../media/v4l/ext-ctrls-image-process.rst | 2 +- + .../userspace-api/media/v4l/metafmt-rkisp1.rst | 57 +- + Documentation/userspace-api/media/v4l/mt2110t.svg | 315 ++++++ + .../userspace-api/media/v4l/pixfmt-reserved.rst | 13 - + .../userspace-api/media/v4l/pixfmt-yuv-planar.rst | 179 +++- + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 40 +- + MAINTAINERS | 3 +- + drivers/media/cec/core/cec-adap.c | 53 +- + drivers/media/cec/core/cec-core.c | 2 +- + drivers/media/common/siano/smscoreapi.c | 15 +- + drivers/media/common/siano/smscoreapi.h | 10 - + drivers/media/common/videobuf2/videobuf2-core.c | 182 ++-- + drivers/media/dvb-frontends/a8293.c | 2 +- + drivers/media/dvb-frontends/af9013.c | 2 +- + drivers/media/dvb-frontends/af9033.c | 2 +- + drivers/media/dvb-frontends/au8522_decoder.c | 2 +- + drivers/media/dvb-frontends/cxd2099.c | 2 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 2 +- + drivers/media/dvb-frontends/lgdt3306a.c | 2 +- + drivers/media/dvb-frontends/lgdt330x.c | 2 +- + drivers/media/dvb-frontends/mn88472.c | 2 +- + drivers/media/dvb-frontends/mn88473.c | 2 +- + drivers/media/dvb-frontends/mxl692.c | 2 +- + drivers/media/dvb-frontends/rtl2830.c | 4 +- + drivers/media/dvb-frontends/rtl2832.c | 4 +- + drivers/media/dvb-frontends/si2165.c | 2 +- + drivers/media/dvb-frontends/si2168.c | 2 +- + drivers/media/dvb-frontends/sp2.c | 2 +- + drivers/media/dvb-frontends/stv090x.c | 2 +- + drivers/media/dvb-frontends/stv6110x.c | 2 +- + drivers/media/dvb-frontends/tda10071.c | 2 +- + drivers/media/dvb-frontends/ts2020.c | 4 +- + drivers/media/i2c/ad5820.c | 4 +- + drivers/media/i2c/adp1653.c | 2 +- + drivers/media/i2c/adv7170.c | 4 +- + drivers/media/i2c/adv7175.c | 4 +- + drivers/media/i2c/adv7183.c | 4 +- + drivers/media/i2c/adv7343.c | 4 +- + drivers/media/i2c/adv7393.c | 4 +- + drivers/media/i2c/adv7511-v4l2.c | 2 +- + drivers/media/i2c/adv7842.c | 2 +- + drivers/media/i2c/ak881x.c | 4 +- + drivers/media/i2c/ar0521.c | 22 +- + drivers/media/i2c/bt819.c | 6 +- + drivers/media/i2c/bt856.c | 2 +- + drivers/media/i2c/bt866.c | 2 +- + drivers/media/i2c/ccs/ccs-reg-access.h | 3 - + drivers/media/i2c/cs3308.c | 2 +- + drivers/media/i2c/cs5345.c | 2 +- + drivers/media/i2c/cs53l32a.c | 2 +- + drivers/media/i2c/cx25840/cx25840-core.c | 2 +- + drivers/media/i2c/ds90ub913.c | 5 +- + drivers/media/i2c/dw9714.c | 4 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 2 +- + drivers/media/i2c/gc05a2.c | 2 +- + drivers/media/i2c/gc08a3.c | 2 +- + drivers/media/i2c/imx274.c | 2 +- + drivers/media/i2c/imx283.c | 33 + + drivers/media/i2c/imx335.c | 9 +- + drivers/media/i2c/imx355.c | 12 +- + drivers/media/i2c/isl7998x.c | 4 +- + drivers/media/i2c/ks0127.c | 6 +- + drivers/media/i2c/lm3560.c | 4 +- + drivers/media/i2c/lm3646.c | 2 +- + drivers/media/i2c/m52790.c | 2 +- + drivers/media/i2c/max2175.c | 4 +- + drivers/media/i2c/max96714.c | 18 +- + drivers/media/i2c/max96717.c | 236 ++++- + drivers/media/i2c/ml86v7667.c | 4 +- + drivers/media/i2c/msp3400-driver.c | 2 +- + drivers/media/i2c/mt9m001.c | 2 +- + drivers/media/i2c/mt9m111.c | 2 +- + drivers/media/i2c/mt9p031.c | 38 +- + drivers/media/i2c/mt9t112.c | 2 +- + drivers/media/i2c/mt9v011.c | 2 +- + drivers/media/i2c/mt9v111.c | 3 +- + drivers/media/i2c/og01a1b.c | 187 +++- + drivers/media/i2c/ov13858.c | 4 +- + drivers/media/i2c/ov2640.c | 2 +- + drivers/media/i2c/ov2659.c | 4 +- + drivers/media/i2c/ov5640.c | 4 +- + drivers/media/i2c/ov5645.c | 17 +- + drivers/media/i2c/ov5647.c | 2 +- + drivers/media/i2c/ov5675.c | 12 +- + drivers/media/i2c/ov6650.c | 2 +- + drivers/media/i2c/ov7640.c | 2 +- + drivers/media/i2c/ov772x.c | 2 +- + drivers/media/i2c/ov7740.c | 2 +- + drivers/media/i2c/ov9640.c | 2 +- + drivers/media/i2c/ov9650.c | 4 +- + drivers/media/i2c/rj54n1cb0c.c | 2 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 15 +- + drivers/media/i2c/s5k5baf.c | 4 +- + drivers/media/i2c/saa6588.c | 2 +- + drivers/media/i2c/saa6752hs.c | 2 +- + drivers/media/i2c/saa7110.c | 2 +- + drivers/media/i2c/saa717x.c | 2 +- + drivers/media/i2c/saa7185.c | 2 +- + drivers/media/i2c/sony-btf-mpx.c | 2 +- + drivers/media/i2c/tc358743.c | 2 +- + drivers/media/i2c/tc358746.c | 12 +- + drivers/media/i2c/tda1997x.c | 2 +- + drivers/media/i2c/tda7432.c | 2 +- + drivers/media/i2c/tda9840.c | 2 +- + drivers/media/i2c/tea6415c.c | 2 +- + drivers/media/i2c/tea6420.c | 2 +- + drivers/media/i2c/thp7312.c | 2 +- + drivers/media/i2c/ths7303.c | 6 +- + drivers/media/i2c/ths8200.c | 4 +- + drivers/media/i2c/tlv320aic23b.c | 2 +- + drivers/media/i2c/tvaudio.c | 2 +- + drivers/media/i2c/tvp5150.c | 6 +- + drivers/media/i2c/tvp7002.c | 2 +- + drivers/media/i2c/tw2804.c | 2 +- + drivers/media/i2c/tw9900.c | 2 +- + drivers/media/i2c/tw9903.c | 2 +- + drivers/media/i2c/tw9906.c | 2 +- + drivers/media/i2c/tw9910.c | 2 +- + drivers/media/i2c/uda1342.c | 2 +- + drivers/media/i2c/upd64031a.c | 2 +- + drivers/media/i2c/upd64083.c | 2 +- + drivers/media/i2c/vp27smpx.c | 2 +- + drivers/media/i2c/vpx3220.c | 6 +- + drivers/media/i2c/wm8739.c | 2 +- + drivers/media/i2c/wm8775.c | 2 +- + drivers/media/pci/intel/ipu6/ipu6.c | 20 +- + drivers/media/pci/mgb4/mgb4_core.c | 2 +- + drivers/media/pci/mgb4/mgb4_core.h | 2 + + drivers/media/pci/mgb4/mgb4_io.h | 29 +- + drivers/media/pci/mgb4/mgb4_sysfs_out.c | 9 +- + drivers/media/pci/mgb4/mgb4_vin.c | 193 +++- + drivers/media/pci/mgb4/mgb4_vin.h | 3 +- + drivers/media/pci/mgb4/mgb4_vout.c | 309 +++++- + drivers/media/pci/mgb4/mgb4_vout.h | 5 +- + drivers/media/pci/solo6x10/solo6x10-p2m.c | 8 +- + drivers/media/platform/allegro-dvt/allegro-core.c | 28 +- + drivers/media/platform/atmel/atmel-isi.c | 8 +- + drivers/media/platform/chips-media/coda/coda-bit.c | 2 +- + drivers/media/platform/imagination/Kconfig | 1 + + .../vcodec/decoder/mtk_vcodec_dec_stateful.c | 2 +- + .../vcodec/decoder/mtk_vcodec_dec_stateless.c | 2 +- + .../vcodec/decoder/vdec/vdec_h264_req_if.c | 9 +- + .../vcodec/decoder/vdec/vdec_h264_req_multi_if.c | 9 +- + .../mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c | 10 +- + .../media/platform/microchip/microchip-isc-base.c | 19 +- + .../platform/microchip/microchip-sama5d2-isc.c | 21 +- + .../platform/microchip/microchip-sama7g5-isc.c | 21 +- + drivers/media/platform/nvidia/tegra-vde/h264.c | 10 +- + drivers/media/platform/nxp/imx-mipi-csis.c | 19 +- + drivers/media/platform/nxp/imx-pxp.h | 9 +- + drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 17 +- + drivers/media/platform/qcom/camss/camss-video.c | 6 - + drivers/media/platform/qcom/camss/camss.c | 5 +- + drivers/media/platform/qcom/venus/core.c | 1 + + drivers/media/platform/qcom/venus/firmware.c | 6 +- + drivers/media/platform/qcom/venus/hfi_cmds.c | 8 +- + drivers/media/platform/qcom/venus/hfi_cmds.h | 16 +- + drivers/media/platform/qcom/venus/hfi_helper.h | 20 +- + drivers/media/platform/qcom/venus/hfi_parser.c | 2 +- + .../media/platform/qcom/venus/hfi_plat_bufs_v6.c | 20 +- + drivers/media/platform/raspberrypi/pisp_be/Kconfig | 1 + + .../media/platform/renesas/rcar-vin/rcar-core.c | 21 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 1 + + drivers/media/platform/renesas/vsp1/vsp1_video.c | 22 + + .../media/platform/rockchip/rkisp1/rkisp1-common.c | 14 + + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 49 +- + .../media/platform/rockchip/rkisp1/rkisp1-csi.c | 5 +- + .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 15 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 9 +- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 1037 ++++++++++++++++++-- + .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 23 + + .../platform/rockchip/rkisp1/rkisp1-resizer.c | 4 +- + .../media/platform/rockchip/rkisp1/rkisp1-stats.c | 51 +- + .../media/platform/samsung/exynos-gsc/gsc-core.c | 10 +- + .../media/platform/samsung/exynos4-is/fimc-core.c | 10 +- + drivers/media/platform/st/sti/bdisp/bdisp-v4l2.c | 10 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 12 + + drivers/media/platform/ti/am437x/am437x-vpfe.c | 12 +- + drivers/media/platform/ti/cal/cal-camerarx.c | 2 +- + drivers/media/platform/ti/cal/cal.c | 8 +- + drivers/media/platform/ti/davinci/vpif_capture.c | 14 +- + drivers/media/platform/verisilicon/Kconfig | 8 + + drivers/media/platform/verisilicon/Makefile | 14 +- + drivers/media/platform/verisilicon/hantro_drv.c | 48 + + drivers/media/platform/verisilicon/hantro_g2.c | 29 + + .../platform/verisilicon/hantro_g2_hevc_dec.c | 20 +- + .../media/platform/verisilicon/hantro_g2_regs.h | 4 + + drivers/media/platform/verisilicon/hantro_hevc.c | 8 + + drivers/media/platform/verisilicon/hantro_hw.h | 38 + + .../media/platform/verisilicon/hantro_postproc.c | 6 +- + drivers/media/platform/verisilicon/hantro_v4l2.c | 6 +- + .../verisilicon/rockchip_vpu981_hw_av1_dec.c | 3 +- + .../platform/verisilicon/rockchip_vpu981_regs.h | 10 +- + .../media/platform/verisilicon/rockchip_vpu_hw.c | 1 - + drivers/media/platform/xilinx/xilinx-vipp.c | 9 +- + drivers/media/radio/radio-tea5764.c | 2 +- + drivers/media/radio/saa7706h.c | 4 +- + drivers/media/radio/si470x/radio-si470x-i2c.c | 2 +- + drivers/media/radio/si4713/si4713.c | 4 +- + drivers/media/radio/tef6862.c | 4 +- + drivers/media/rc/ene_ir.c | 3 - + drivers/media/rc/ite-cir.c | 1 - + drivers/media/rc/meson-ir.c | 27 + + drivers/media/rc/rc-loopback.c | 1 - + drivers/media/test-drivers/vicodec/vicodec-core.c | 6 +- + drivers/media/test-drivers/vidtv/vidtv_demod.c | 2 +- + drivers/media/test-drivers/vidtv/vidtv_tuner.c | 2 +- + drivers/media/test-drivers/vivid/vivid-cec.c | 48 +- + drivers/media/tuners/e4000.c | 2 +- + drivers/media/tuners/fc2580.c | 2 +- + drivers/media/tuners/m88rs6000t.c | 2 +- + drivers/media/tuners/mt2060.c | 2 +- + drivers/media/tuners/mxl301rf.c | 2 +- + drivers/media/tuners/qm1d1b0004.c | 2 +- + drivers/media/tuners/qm1d1c0042.c | 2 +- + drivers/media/tuners/tda18212.c | 2 +- + drivers/media/tuners/tda18250.c | 2 +- + drivers/media/tuners/tua9001.c | 2 +- + drivers/media/tuners/tuner-i2c.h | 4 +- + drivers/media/usb/go7007/s2250-board.c | 2 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 3 +- + drivers/media/v4l2-core/v4l2-subdev.c | 53 +- + .../media/deprecated/atmel/atmel-sama5d2-isc.c | 10 +- + .../media/deprecated/atmel/atmel-sama7g5-isc.c | 10 +- + drivers/staging/media/ipu3/ipu3-v4l2.c | 40 +- + drivers/staging/media/meson/vdec/vdec.c | 2 + + drivers/staging/media/meson/vdec/vdec_1.c | 16 +- + drivers/staging/media/meson/vdec/vdec_hevc.c | 43 +- + drivers/staging/media/meson/vdec/vdec_platform.c | 44 + + drivers/staging/media/meson/vdec/vdec_platform.h | 2 + + drivers/staging/media/starfive/camss/stf-camss.c | 2 - + drivers/staging/media/starfive/camss/stf-capture.c | 4 +- + include/media/cec.h | 2 + + include/media/rc-core.h | 2 - + include/media/v4l2-mc.h | 3 + + include/media/v4l2-subdev.h | 6 + + include/media/videobuf2-core.h | 3 + + include/uapi/linux/cec.h | 9 +- + include/uapi/linux/rkisp1-config.h | 578 +++++++++++ + include/uapi/linux/videodev2.h | 1 + + 258 files changed, 4365 insertions(+), 1053 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,og01a1b.yaml + create mode 100644 Documentation/userspace-api/media/v4l/mt2110t.svg +Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init()) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging MAINTAINERS +Auto-merging drivers/staging/media/atomisp/include/linux/atomisp.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/cec.rst | 87 + + Documentation/userspace-api/media/v4l/biblio.rst | 11 + + .../userspace-api/media/v4l/vidioc-querycap.rst | 11 + + .../userspace-api/media/videodev2.h.rst.exceptions | 1 + + MAINTAINERS | 7 + + drivers/media/cec/core/cec-api.c | 4 +- + drivers/media/cec/core/cec-core.c | 29 - + drivers/media/cec/core/cec-priv.h | 2 - + drivers/media/cec/usb/Kconfig | 1 + + drivers/media/cec/usb/Makefile | 1 + + drivers/media/cec/usb/extron-da-hd-4k-plus/Kconfig | 14 + + .../media/cec/usb/extron-da-hd-4k-plus/Makefile | 8 + + .../cec/usb/extron-da-hd-4k-plus/cec-splitter.c | 657 +++++++ + .../cec/usb/extron-da-hd-4k-plus/cec-splitter.h | 51 + + .../extron-da-hd-4k-plus/extron-da-hd-4k-plus.c | 1836 ++++++++++++++++++++ + .../extron-da-hd-4k-plus/extron-da-hd-4k-plus.h | 118 ++ + drivers/media/v4l2-core/v4l2-dev.c | 15 + + .../staging/media/atomisp/include/linux/atomisp.h | 4 +- + .../media/atomisp/include/linux/atomisp_platform.h | 6 +- + .../media/atomisp/pci/atomisp_csi2_bridge.c | 2 + + drivers/staging/media/atomisp/pci/atomisp_fops.c | 2 + + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 2 +- + .../pci/hive_isp_css_include/assert_support.h | 6 +- + .../pci/hive_isp_css_include/host/csi_rx_public.h | 4 +- + .../pci/hive_isp_css_include/math_support.h | 6 - + drivers/staging/media/atomisp/pci/hmm/hmm.c | 5 - + .../pci/isp/kernels/bnr/bnr_1.0/ia_css_bnr.host.c | 3 +- + .../pci/isp/kernels/de/de_1.0/ia_css_de.host.c | 3 +- + .../pci/isp/kernels/eed1_8/ia_css_eed1_8.host.c | 2 +- + .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c | 3 +- + .../ipu2_io_ls/bayer_io_ls/ia_css_bayer_io.host.c | 9 +- + .../yuv444_io_ls/ia_css_yuv444_io.host.c | 9 +- + .../pci/isp/kernels/xnr/xnr_3.0/ia_css_xnr3.host.c | 12 +- + .../media/atomisp/pci/runtime/binary/src/binary.c | 259 ++- + .../atomisp/pci/runtime/isys/src/virtual_isys.c | 8 +- + drivers/staging/media/atomisp/pci/sh_css.c | 44 +- + .../staging/media/atomisp/pci/sh_css_dvs_info.h | 37 - + .../staging/media/atomisp/pci/sh_css_param_dvs.h | 1 - + include/media/cec.h | 31 + + include/uapi/linux/serio.h | 1 + + include/uapi/linux/videodev2.h | 1 + + 41 files changed, 3012 insertions(+), 301 deletions(-) + create mode 100644 drivers/media/cec/usb/extron-da-hd-4k-plus/Kconfig + create mode 100644 drivers/media/cec/usb/extron-da-hd-4k-plus/Makefile + create mode 100644 drivers/media/cec/usb/extron-da-hd-4k-plus/cec-splitter.c + create mode 100644 drivers/media/cec/usb/extron-da-hd-4k-plus/cec-splitter.h + create mode 100644 drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.c + create mode 100644 drivers/media/cec/usb/extron-da-hd-4k-plus/extron-da-hd-4k-plus.h + delete mode 100644 drivers/staging/media/atomisp/pci/sh_css_dvs_info.h +Merging pm/linux-next (1e39c60d14b8 Merge branch 'pm-sleep' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (6b612d1bac67 cpufreq: ti-cpufreq: Use socinfo to get revision in AM62 family) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (313312c84b42 pm: cpupower: rename raw_pylibcpupower.i) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'ort' strategy. + tools/power/cpupower/bindings/python/Makefile | 4 ++-- + .../bindings/python/{raw_pylibcpupower.i => raw_pylibcpupower.swg} | 0 + 2 files changed, 2 insertions(+), 2 deletions(-) + rename tools/power/cpupower/bindings/python/{raw_pylibcpupower.i => raw_pylibcpupower.swg} (100%) +Merging devfreq/devfreq-next (d47552124bb0 PM / devfreq: imx-bus: Use of_property_present()) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging pmdomain/next (c6ccb691d484 pmdomain: core: Reduce debug summary table width) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Merge made by the 'ort' strategy. + .../bindings/power/rockchip,power-controller.yaml | 1 + + drivers/base/power/common.c | 45 +++ + drivers/cpuidle/cpuidle-psci-domain.c | 17 +- + drivers/cpuidle/cpuidle-psci.c | 26 +- + drivers/cpuidle/dt_idle_genpd.c | 14 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 5 +- + drivers/pmdomain/amlogic/Kconfig | 11 - + drivers/pmdomain/amlogic/Makefile | 1 - + drivers/pmdomain/amlogic/meson-gx-pwrc-vpu.c | 380 --------------------- + drivers/pmdomain/apple/pmgr-pwrstate.c | 2 +- + drivers/pmdomain/bcm/raspberrypi-power.c | 43 ++- + drivers/pmdomain/core.c | 104 ++++-- + drivers/pmdomain/imx/gpc.c | 14 +- + drivers/pmdomain/imx/gpcv2.c | 8 +- + drivers/pmdomain/imx/imx93-pd.c | 22 +- + drivers/pmdomain/mediatek/mtk-pm-domains.c | 6 +- + drivers/pmdomain/qcom/cpr.c | 92 ++--- + drivers/pmdomain/qcom/rpmhpd.c | 11 +- + drivers/pmdomain/qcom/rpmpd.c | 20 +- + drivers/pmdomain/rockchip/pm-domains.c | 118 +++++-- + include/dt-bindings/power/rockchip,rk3576-power.h | 30 ++ + include/linux/pm_domain.h | 16 +- + 22 files changed, 378 insertions(+), 608 deletions(-) + delete mode 100644 drivers/pmdomain/amlogic/meson-gx-pwrc-vpu.c + create mode 100644 include/dt-bindings/power/rockchip,rk3576-power.h +Merging opp/opp/linux-next (a84372012e93 dt-bindings: opp: operating-points-v2-ti-cpu: Update maintainers) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (7d8abc5f3b5c thermal/drivers/imx_sc_thermal: Use dev_err_probe) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging rdma/for-next (7acad3c442df RDMA/nldev: Add missing break in rdma_nl_notify_err_msg()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging include/linux/mlx5/device.h +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h +Resolved 'include/linux/mlx5/mlx5_ifc.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c4d949669edc] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/cache.c | 4 +- + drivers/infiniband/core/core_priv.h | 3 - + drivers/infiniband/core/device.c | 48 ++- + drivers/infiniband/core/iwcm.c | 2 +- + drivers/infiniband/core/mad.c | 19 +- + drivers/infiniband/core/netlink.c | 1 + + drivers/infiniband/core/nldev.c | 187 ++++++++-- + drivers/infiniband/core/umem_dmabuf.c | 72 +++- + drivers/infiniband/core/uverbs_std_types_mr.c | 2 +- + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 23 ++ + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 256 ++++++++----- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 20 +- + drivers/infiniband/hw/bnxt_re/main.c | 215 +++++++---- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 72 +++- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 25 +- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 11 + + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 19 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 11 +- + drivers/infiniband/hw/bnxt_re/roce_hsi.h | 36 +- + drivers/infiniband/hw/cxgb4/cm.c | 5 + + drivers/infiniband/hw/cxgb4/cq.c | 8 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 40 ++- + drivers/infiniband/hw/cxgb4/provider.c | 71 ++-- + drivers/infiniband/hw/cxgb4/qp.c | 32 +- + drivers/infiniband/hw/efa/efa.h | 2 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 3 + + drivers/infiniband/hw/efa/efa_com_cmd.c | 1 + + drivers/infiniband/hw/efa/efa_com_cmd.h | 1 + + drivers/infiniband/hw/efa/efa_main.c | 1 + + drivers/infiniband/hw/efa/efa_verbs.c | 4 +- + drivers/infiniband/hw/erdma/erdma.h | 3 +- + drivers/infiniband/hw/erdma/erdma_cmdq.c | 26 +- + drivers/infiniband/hw/erdma/erdma_eq.c | 89 +++-- + drivers/infiniband/hw/erdma/erdma_main.c | 5 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 29 +- + drivers/infiniband/hw/erdma/erdma_verbs.h | 1 + + drivers/infiniband/hw/hns/hns_roce_ah.c | 14 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 22 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 33 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 16 +- + drivers/infiniband/hw/irdma/verbs.c | 4 +- + drivers/infiniband/hw/mana/main.c | 8 +- + drivers/infiniband/hw/mlx4/alias_GUID.c | 4 +- + drivers/infiniband/hw/mlx4/mad.c | 10 +- + drivers/infiniband/hw/mlx5/Makefile | 1 + + drivers/infiniband/hw/mlx5/cmd.c | 21 ++ + drivers/infiniband/hw/mlx5/cmd.h | 2 + + drivers/infiniband/hw/mlx5/data_direct.c | 227 ++++++++++++ + drivers/infiniband/hw/mlx5/data_direct.h | 23 ++ + drivers/infiniband/hw/mlx5/ib_rep.c | 22 +- + drivers/infiniband/hw/mlx5/main.c | 324 ++++++++++++++--- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 60 +++- + drivers/infiniband/hw/mlx5/mr.c | 418 ++++++++++++++++------ + drivers/infiniband/hw/mlx5/odp.c | 405 ++++++++++++++++----- + drivers/infiniband/hw/mlx5/std_types.c | 76 +++- + drivers/infiniband/hw/mlx5/umr.c | 96 +++-- + drivers/infiniband/hw/mlx5/umr.h | 1 + + drivers/infiniband/hw/qib/qib_init.c | 9 +- + drivers/infiniband/hw/qib/qib_verbs.h | 4 - + drivers/infiniband/sw/rdmavt/mr.c | 6 +- + drivers/infiniband/sw/rxe/rxe_hdr.h | 2 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 4 +- + drivers/infiniband/sw/siw/siw.h | 2 - + drivers/infiniband/sw/siw/siw_main.c | 37 -- + drivers/infiniband/ulp/ipoib/ipoib.h | 4 - + drivers/infiniband/ulp/iser/iscsi_iser.h | 4 - + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 92 +++-- + drivers/infiniband/ulp/rtrs/rtrs-clt.h | 3 +- + drivers/infiniband/ulp/rtrs/rtrs-pri.h | 2 + + drivers/infiniband/ulp/rtrs/rtrs-srv.c | 51 ++- + drivers/infiniband/ulp/rtrs/rtrs-srv.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 76 ++-- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 50 ++- + include/linux/mlx5/device.h | 31 +- + include/linux/mlx5/driver.h | 2 +- + include/linux/mlx5/mlx5_ifc.h | 113 +++++- + include/rdma/ib_umem.h | 18 + + include/rdma/ib_verbs.h | 4 +- + include/rdma/rdma_netlink.h | 12 + + include/uapi/rdma/bnxt_re-abi.h | 13 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 9 + + include/uapi/rdma/mlx5_user_ioctl_verbs.h | 4 + + include/uapi/rdma/rdma_netlink.h | 16 + + 83 files changed, 2803 insertions(+), 901 deletions(-) + create mode 100644 drivers/infiniband/hw/mlx5/data_direct.c + create mode 100644 drivers/infiniband/hw/mlx5/data_direct.h +Merging net-next/main (9410645520e9 Merge tag 'net-next-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (aa7e60b62ee2 Merge branch 'bpf-next/master' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging MAINTAINERS +Auto-merging include/linux/lsm_hook_defs.h +Auto-merging include/linux/security.h +Auto-merging kernel/bpf/btf.c +Auto-merging kernel/events/core.c +Auto-merging lib/Kconfig.debug +Auto-merging net/core/filter.c +Auto-merging scripts/link-vmlinux.sh +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Auto-merging tools/testing/selftests/bpf/prog_tests/btf.c +Merge made by the 'ort' strategy. + Documentation/bpf/btf.rst | 39 +- + Documentation/bpf/libbpf/program_types.rst | 30 +- + Documentation/bpf/verifier.rst | 2 +- + MAINTAINERS | 4 +- + arch/arm64/net/bpf_jit_comp.c | 508 ++++--- + arch/x86/net/bpf_jit_comp.c | 161 ++- + fs/Makefile | 1 + + fs/bpf_fs_kfuncs.c | 185 +++ + include/linux/bpf.h | 39 +- + include/linux/bpf_lsm.h | 8 + + include/linux/bpf_verifier.h | 27 + + include/linux/btf.h | 5 + + include/linux/buildid.h | 4 +- + include/linux/filter.h | 10 + + include/linux/lsm_hook_defs.h | 2 +- + include/linux/security.h | 4 +- + include/uapi/linux/bpf.h | 18 +- + kernel/bpf/Makefile | 6 - + kernel/bpf/arraymap.c | 17 +- + kernel/bpf/bpf_inode_storage.c | 24 +- + kernel/bpf/bpf_lsm.c | 65 +- + kernel/bpf/bpf_struct_ops.c | 9 +- + kernel/bpf/btf.c | 172 ++- + kernel/bpf/btf_iter.c | 2 + + kernel/bpf/btf_relocate.c | 2 + + kernel/bpf/cgroup.c | 2 + + kernel/bpf/core.c | 21 +- + kernel/bpf/hashtab.c | 16 +- + kernel/bpf/helpers.c | 94 +- + kernel/bpf/inode.c | 4 +- + kernel/bpf/local_storage.c | 4 +- + kernel/bpf/map_in_map.c | 38 +- + kernel/bpf/memalloc.c | 12 +- + kernel/bpf/relo_core.c | 2 + + kernel/bpf/reuseport_array.c | 2 +- + kernel/bpf/stackmap.c | 131 +- + kernel/bpf/syscall.c | 212 +-- + kernel/bpf/token.c | 74 +- + kernel/bpf/verifier.c | 1405 +++++++++++++++----- + kernel/events/core.c | 2 +- + kernel/trace/bpf_trace.c | 108 +- + kernel/trace/trace_syscalls.c | 12 +- + lib/Kconfig.debug | 8 +- + lib/buildid.c | 397 ++++-- + net/bpf/bpf_dummy_struct_ops.c | 2 +- + net/core/filter.c | 75 +- + net/core/sock_map.c | 23 +- + net/ipv4/bpf_tcp_ca.c | 26 - + net/xdp/xsk.c | 23 +- + samples/bpf/Makefile | 9 +- + samples/bpf/tracex2.bpf.c | 99 -- + samples/bpf/tracex2_user.c | 187 --- + samples/bpf/tracex4.bpf.c | 4 +- + scripts/link-vmlinux.sh | 14 +- + security/bpf/hooks.c | 1 - + security/security.c | 2 +- + security/selinux/hooks.c | 2 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 4 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 24 +- + tools/bpf/bpftool/bash-completion/bpftool | 2 +- + tools/bpf/bpftool/btf.c | 87 +- + tools/bpf/bpftool/feature.c | 10 +- + tools/bpf/bpftool/net.c | 80 +- + tools/bpf/bpftool/xlated_dumper.c | 4 +- + tools/bpf/runqslower/Makefile | 3 +- + tools/include/uapi/linux/bpf.h | 9 + + tools/lib/bpf/bpf.h | 4 +- + tools/lib/bpf/bpf_helpers.h | 2 +- + tools/lib/bpf/bpf_tracing.h | 25 +- + tools/lib/bpf/btf.c | 8 +- + tools/lib/bpf/btf.h | 2 +- + tools/lib/bpf/btf_dump.c | 2 +- + tools/lib/bpf/btf_relocate.c | 2 +- + tools/lib/bpf/elf.c | 3 + + tools/lib/bpf/libbpf.c | 88 +- + tools/lib/bpf/libbpf.h | 18 +- + tools/lib/bpf/libbpf.map | 1 + + tools/lib/bpf/libbpf_legacy.h | 4 +- + tools/lib/bpf/linker.c | 4 +- + tools/lib/bpf/skel_internal.h | 2 +- + tools/lib/bpf/usdt.bpf.h | 2 +- + tools/testing/selftests/bpf/.gitignore | 6 +- + tools/testing/selftests/bpf/DENYLIST.riscv64 | 3 + + tools/testing/selftests/bpf/Makefile | 151 ++- + tools/testing/selftests/bpf/README.rst | 32 +- + tools/testing/selftests/bpf/bench.c | 13 + + tools/testing/selftests/bpf/bench.h | 1 + + tools/testing/selftests/bpf/benchs/bench_trigger.c | 83 +- + tools/testing/selftests/bpf/bpf_experimental.h | 26 + + tools/testing/selftests/bpf/bpf_kfuncs.h | 11 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 257 +++- + .../selftests/bpf/bpf_testmod/bpf_testmod.h | 12 + + .../selftests/bpf/bpf_testmod/bpf_testmod_kfunc.h | 15 + + tools/testing/selftests/bpf/cgroup_helpers.c | 2 +- + tools/testing/selftests/bpf/config.riscv64 | 84 ++ + tools/testing/selftests/bpf/disasm_helpers.c | 69 + + tools/testing/selftests/bpf/disasm_helpers.h | 12 + + tools/testing/selftests/bpf/get_cgroup_id_user.c | 151 --- + tools/testing/selftests/bpf/jit_disasm_helpers.c | 245 ++++ + tools/testing/selftests/bpf/jit_disasm_helpers.h | 10 + + .../selftests/bpf/map_tests/htab_map_batch_ops.c | 2 +- + .../bpf/map_tests/lpm_trie_map_batch_ops.c | 2 +- + .../selftests/bpf/map_tests/map_percpu_stats.c | 18 + + .../selftests/bpf/map_tests/sk_storage_map.c | 2 +- + tools/testing/selftests/bpf/network_helpers.c | 602 ++++++++- + tools/testing/selftests/bpf/network_helpers.h | 25 +- + .../selftests/bpf/prog_tests/attach_probe.c | 8 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 4 +- + .../selftests/bpf/prog_tests/bpf_iter_setsockopt.c | 2 +- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 4 +- + tools/testing/selftests/bpf/prog_tests/btf.c | 6 +- + .../testing/selftests/bpf/prog_tests/btf_distill.c | 68 + + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 4 +- + tools/testing/selftests/bpf/prog_tests/build_id.c | 118 ++ + .../selftests/bpf/prog_tests/cg_storage_multi.c | 2 +- + .../selftests/bpf/prog_tests/cgroup_ancestor.c | 141 ++ + .../testing/selftests/bpf/prog_tests/cgroup_dev.c | 125 ++ + .../bpf/prog_tests/cgroup_get_current_cgroup_id.c | 46 + + .../selftests/bpf/prog_tests/cgroup_storage.c | 96 ++ + .../testing/selftests/bpf/prog_tests/cgroup_v1v2.c | 16 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 1 + + .../selftests/bpf/prog_tests/core_reloc_raw.c | 125 ++ + .../selftests/bpf/prog_tests/crypto_sanity.c | 1 - + .../testing/selftests/bpf/prog_tests/ctx_rewrite.c | 74 +- + .../selftests/bpf/prog_tests/decap_sanity.c | 1 - + .../selftests/bpf/prog_tests/fexit_stress.c | 3 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 2 +- + tools/testing/selftests/bpf/prog_tests/fs_kfuncs.c | 9 +- + tools/testing/selftests/bpf/prog_tests/iters.c | 5 +- + tools/testing/selftests/bpf/prog_tests/kfree_skb.c | 1 + + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 1 + + tools/testing/selftests/bpf/prog_tests/log_buf.c | 9 +- + .../selftests/bpf/prog_tests/lwt_redirect.c | 1 - + .../testing/selftests/bpf/prog_tests/lwt_reroute.c | 1 + + .../bpf/prog_tests/module_fentry_shadow.c | 3 +- + .../selftests/bpf/prog_tests/nested_trust.c | 4 + + .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 2 +- + .../selftests/bpf/prog_tests/parse_tcp_hdr_opt.c | 1 + + .../selftests/bpf/prog_tests/pro_epilogue.c | 60 + + .../raw_tp_writable_reject_nbd_invalid.c | 3 +- + .../bpf/prog_tests/raw_tp_writable_test_run.c | 5 +- + .../selftests/bpf/prog_tests/read_vsyscall.c | 1 + + .../testing/selftests/bpf/prog_tests/reg_bounds.c | 32 +- + .../selftests/bpf/prog_tests/resolve_btfids.c | 2 +- + .../selftests/bpf/prog_tests/select_reuseport.c | 37 +- + tools/testing/selftests/bpf/prog_tests/sk_lookup.c | 111 +- + tools/testing/selftests/bpf/prog_tests/sock_addr.c | 1 + + .../selftests/bpf/prog_tests/sockmap_listen.c | 8 + + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 385 +++++- + tools/testing/selftests/bpf/prog_tests/tc_opts.c | 2 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 43 +- + tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 1 + + .../bpf/prog_tests/test_bpf_syscall_macro.c | 4 - + .../selftests/bpf/prog_tests/test_bprm_opts.c | 2 +- + tools/testing/selftests/bpf/prog_tests/test_lsm.c | 46 +- + .../bpf/prog_tests/test_mmap_inner_array.c | 57 + + .../selftests/bpf/prog_tests/test_strncmp.c | 2 +- + .../bpf/prog_tests/test_struct_ops_module.c | 2 + + .../selftests/bpf/prog_tests/test_xdp_veth.c | 213 +++ + tools/testing/selftests/bpf/prog_tests/token.c | 4 +- + .../selftests/bpf/prog_tests/unpriv_bpf_disabled.c | 3 +- + .../selftests/bpf/prog_tests/uprobe_multi_test.c | 527 +++++++- + .../selftests/bpf/prog_tests/user_ringbuf.c | 3 +- + tools/testing/selftests/bpf/prog_tests/verifier.c | 14 + + tools/testing/selftests/bpf/progs/arena_atomics.c | 32 +- + tools/testing/selftests/bpf/progs/bpf_cubic.c | 6 +- + tools/testing/selftests/bpf/progs/bpf_dctcp.c | 8 +- + tools/testing/selftests/bpf/progs/bpf_misc.h | 64 +- + .../selftests/bpf/progs/bpf_syscall_macro.c | 2 - + .../testing/selftests/bpf/progs/cg_storage_multi.h | 2 - + .../testing/selftests/bpf/progs/cgroup_ancestor.c | 40 + + tools/testing/selftests/bpf/progs/cgroup_storage.c | 24 + + tools/testing/selftests/bpf/progs/dev_cgroup.c | 4 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 6 +- + tools/testing/selftests/bpf/progs/epilogue_exit.c | 82 ++ + .../selftests/bpf/progs/epilogue_tailcall.c | 58 + + tools/testing/selftests/bpf/progs/err.h | 10 + + .../selftests/bpf/progs/get_cgroup_id_kern.c | 26 +- + tools/testing/selftests/bpf/progs/iters_testmod.c | 125 ++ + .../selftests/bpf/progs/iters_testmod_seq.c | 50 + + .../testing/selftests/bpf/progs/kfunc_call_fail.c | 7 + + .../testing/selftests/bpf/progs/local_kptr_stash.c | 30 +- + tools/testing/selftests/bpf/progs/lsm_tailcall.c | 34 + + .../testing/selftests/bpf/progs/mmap_inner_array.c | 57 + + tools/testing/selftests/bpf/progs/nested_acquire.c | 33 + + tools/testing/selftests/bpf/progs/pro_epilogue.c | 154 +++ + .../selftests/bpf/progs/pro_epilogue_goto_start.c | 149 +++ + tools/testing/selftests/bpf/progs/rbtree_fail.c | 2 +- + tools/testing/selftests/bpf/progs/read_vsyscall.c | 9 +- + .../selftests/bpf/progs/refcounted_kptr_fail.c | 4 +- + tools/testing/selftests/bpf/progs/strobemeta.h | 4 +- + tools/testing/selftests/bpf/progs/syscall.c | 3 +- + .../bpf/progs/tailcall_bpf2bpf_hierarchy1.c | 34 + + .../bpf/progs/tailcall_bpf2bpf_hierarchy2.c | 70 + + .../bpf/progs/tailcall_bpf2bpf_hierarchy3.c | 62 + + .../bpf/progs/tailcall_bpf2bpf_hierarchy_fentry.c | 35 + + .../selftests/bpf/progs/tailcall_freplace.c | 23 + + .../selftests/bpf/progs/task_kfunc_success.c | 56 +- + tools/testing/selftests/bpf/progs/tc_bpf2bpf.c | 22 + + tools/testing/selftests/bpf/progs/tc_dummy.c | 12 + + .../selftests/bpf/progs/test_attach_probe.c | 64 +- + tools/testing/selftests/bpf/progs/test_build_id.c | 31 + + .../selftests/bpf/progs/test_cls_redirect_dynptr.c | 2 +- + .../selftests/bpf/progs/test_core_read_macros.c | 2 +- + tools/testing/selftests/bpf/progs/test_get_xattr.c | 37 +- + .../selftests/bpf/progs/test_global_func15.c | 2 +- + .../selftests/bpf/progs/test_global_map_resize.c | 18 +- + .../bpf/progs/test_libbpf_get_fd_by_id_opts.c | 1 + + .../testing/selftests/bpf/progs/test_rdonly_maps.c | 3 +- + .../selftests/bpf/progs/test_sig_in_xattr.c | 4 + + .../selftests/bpf/progs/test_skb_cgroup_id_kern.c | 45 - + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 27 +- + .../selftests/bpf/progs/test_verify_pkcs7_sig.c | 8 +- + tools/testing/selftests/bpf/progs/token_lsm.c | 4 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 7 + + .../testing/selftests/bpf/progs/unsupported_ops.c | 22 + + .../selftests/bpf/progs/uprobe_multi_consumers.c | 39 + + .../selftests/bpf/progs/uprobe_multi_pid_filter.c | 40 + + .../selftests/bpf/progs/verifier_bits_iter.c | 2 +- + .../selftests/bpf/progs/verifier_bpf_fastcall.c | 900 +++++++++++++ + tools/testing/selftests/bpf/progs/verifier_const.c | 69 + + .../selftests/bpf/progs/verifier_global_subprogs.c | 7 +- + .../testing/selftests/bpf/progs/verifier_int_ptr.c | 15 +- + .../selftests/bpf/progs/verifier_jit_convergence.c | 114 ++ + .../bpf/progs/verifier_kfunc_prog_types.c | 48 + + tools/testing/selftests/bpf/progs/verifier_ldsx.c | 112 ++ + tools/testing/selftests/bpf/progs/verifier_lsm.c | 162 +++ + .../selftests/bpf/progs/verifier_scalar_ids.c | 336 +++-- + tools/testing/selftests/bpf/progs/verifier_sdiv.c | 439 ++++++ + .../selftests/bpf/progs/verifier_spill_fill.c | 24 +- + .../bpf/progs/verifier_subprog_precision.c | 2 +- + .../selftests/bpf/progs/verifier_tailcall_jit.c | 105 ++ + .../selftests/bpf/progs/verifier_vfs_accept.c | 85 ++ + .../selftests/bpf/progs/verifier_vfs_reject.c | 161 +++ + .../testing/selftests/bpf/progs/xdp_redirect_map.c | 6 +- + tools/testing/selftests/bpf/test_cgroup_storage.c | 174 --- + tools/testing/selftests/bpf/test_cpp.cpp | 4 + + tools/testing/selftests/bpf/test_dev_cgroup.c | 85 -- + tools/testing/selftests/bpf/test_loader.c | 508 +++++-- + tools/testing/selftests/bpf/test_lru_map.c | 3 +- + tools/testing/selftests/bpf/test_maps.c | 2 +- + tools/testing/selftests/bpf/test_progs.c | 269 +++- + tools/testing/selftests/bpf/test_progs.h | 17 +- + tools/testing/selftests/bpf/test_skb_cgroup_id.sh | 63 - + .../selftests/bpf/test_skb_cgroup_id_user.c | 183 --- + tools/testing/selftests/bpf/test_xdp_veth.sh | 121 -- + tools/testing/selftests/bpf/testing_helpers.c | 7 +- + tools/testing/selftests/bpf/trace_helpers.c | 104 +- + tools/testing/selftests/bpf/unpriv_helpers.c | 1 - + tools/testing/selftests/bpf/uprobe_multi.c | 41 + + tools/testing/selftests/bpf/uprobe_multi.ld | 11 + + tools/testing/selftests/bpf/verifier/calls.c | 2 +- + tools/testing/selftests/bpf/verifier/map_kptr.c | 2 +- + tools/testing/selftests/bpf/verifier/precise.c | 28 +- + tools/testing/selftests/bpf/veristat.c | 16 +- + tools/testing/selftests/bpf/vmtest.sh | 107 +- + tools/testing/selftests/bpf/xskxceiver.c | 1 + + 257 files changed, 11660 insertions(+), 3402 deletions(-) + create mode 100644 fs/bpf_fs_kfuncs.c + create mode 100644 kernel/bpf/btf_iter.c + create mode 100644 kernel/bpf/btf_relocate.c + create mode 100644 kernel/bpf/relo_core.c + delete mode 100644 samples/bpf/tracex2.bpf.c + delete mode 100644 samples/bpf/tracex2_user.c + create mode 100644 tools/testing/selftests/bpf/DENYLIST.riscv64 + create mode 100644 tools/testing/selftests/bpf/config.riscv64 + create mode 100644 tools/testing/selftests/bpf/disasm_helpers.c + create mode 100644 tools/testing/selftests/bpf/disasm_helpers.h + delete mode 100644 tools/testing/selftests/bpf/get_cgroup_id_user.c + create mode 100644 tools/testing/selftests/bpf/jit_disasm_helpers.c + create mode 100644 tools/testing/selftests/bpf/jit_disasm_helpers.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/build_id.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_ancestor.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_dev.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_get_current_cgroup_id.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/cgroup_storage.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/core_reloc_raw.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/pro_epilogue.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_mmap_inner_array.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/test_xdp_veth.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_ancestor.c + create mode 100644 tools/testing/selftests/bpf/progs/cgroup_storage.c + create mode 100644 tools/testing/selftests/bpf/progs/epilogue_exit.c + create mode 100644 tools/testing/selftests/bpf/progs/epilogue_tailcall.c + create mode 100644 tools/testing/selftests/bpf/progs/iters_testmod.c + create mode 100644 tools/testing/selftests/bpf/progs/lsm_tailcall.c + create mode 100644 tools/testing/selftests/bpf/progs/mmap_inner_array.c + create mode 100644 tools/testing/selftests/bpf/progs/nested_acquire.c + create mode 100644 tools/testing/selftests/bpf/progs/pro_epilogue.c + create mode 100644 tools/testing/selftests/bpf/progs/pro_epilogue_goto_start.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy1.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy2.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy3.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_hierarchy_fentry.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_freplace.c + create mode 100644 tools/testing/selftests/bpf/progs/tc_bpf2bpf.c + create mode 100644 tools/testing/selftests/bpf/progs/tc_dummy.c + create mode 100644 tools/testing/selftests/bpf/progs/test_build_id.c + delete mode 100644 tools/testing/selftests/bpf/progs/test_skb_cgroup_id_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/unsupported_ops.c + create mode 100644 tools/testing/selftests/bpf/progs/uprobe_multi_consumers.c + create mode 100644 tools/testing/selftests/bpf/progs/uprobe_multi_pid_filter.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_bpf_fastcall.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_const.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_jit_convergence.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_lsm.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_tailcall_jit.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_vfs_accept.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_vfs_reject.c + delete mode 100644 tools/testing/selftests/bpf/test_cgroup_storage.c + delete mode 100644 tools/testing/selftests/bpf/test_dev_cgroup.c + delete mode 100755 tools/testing/selftests/bpf/test_skb_cgroup_id.sh + delete mode 100644 tools/testing/selftests/bpf/test_skb_cgroup_id_user.c + delete mode 100755 tools/testing/selftests/bpf/test_xdp_veth.sh + create mode 100644 tools/testing/selftests/bpf/uprobe_multi.ld +Merging ipsec-next/master (e62d39332d4b xfrm: policy: Restore dir assignments in xfrm_hash_rebuild()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (c772a2c69018 net/mlx5: Add IFC related stuff for data direct) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/main (9410645520e9 Merge tag 'net-next-6.12' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (4201f3938914 netfilter: nf_tables: set element timeout update support) +$ 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 (eb3ad76a07b6 Bluetooth: MGMT: Fix possible crash on mgmt_index_removed) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + net/bluetooth/mgmt.c | 23 ++++++++++++++--------- + 1 file changed, 14 insertions(+), 9 deletions(-) +Merging wireless-next/for-next (fe57beb026ef Merge tag 'ath-next-20240909' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging ath-next/for-next (fe57beb026ef Merge tag 'ath-next-20240909' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Already up to date. +Merging wpan-next/master (ace2b5331355 net: ieee802154: mcr20a: Use IRQF_NO_AUTOEN flag in request_irq()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Merge made by the 'ort' strategy. + drivers/net/ieee802154/mcr20a.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging wpan-staging/staging (ace2b5331355 net: ieee802154: mcr20a: Use IRQF_NO_AUTOEN flag in request_irq()) +$ git merge -m Merge branch 'staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (869acb874f2b Merge tag 'nand/for-6.12' 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. + .../devicetree/bindings/mtd/ti,gpmc-nand.yaml | 5 +- + drivers/mtd/devices/powernv_flash.c | 3 + + drivers/mtd/devices/slram.c | 2 + + drivers/mtd/mtdconcat.c | 2 +- + drivers/mtd/nand/raw/arasan-nand-controller.c | 5 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 5 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 4 +- + drivers/mtd/nand/raw/davinci_nand.c | 70 ++++++- + drivers/mtd/nand/raw/denali_dt.c | 29 +-- + drivers/mtd/nand/raw/denali_pci.c | 11 +- + drivers/mtd/nand/raw/marvell_nand.c | 12 +- + drivers/mtd/nand/raw/meson_nand.c | 10 +- + drivers/mtd/nand/raw/mtk_nand.c | 36 ++-- + drivers/mtd/nand/raw/pl35x-nand-controller.c | 5 +- + drivers/mtd/nand/raw/renesas-nand-controller.c | 12 +- + drivers/mtd/nand/raw/rockchip-nand-controller.c | 5 +- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 7 +- + drivers/mtd/nand/raw/sunxi_nand.c | 4 +- + drivers/mtd/nand/spi/core.c | 223 +++++++++++++++++++-- + drivers/mtd/nand/spi/macronix.c | 146 ++++++++++---- + drivers/mtd/nand/spi/winbond.c | 26 +++ + drivers/mtd/parsers/bcm47xxpart.c | 2 +- + drivers/mtd/parsers/ofpart_core.c | 4 +- + drivers/mtd/spi-nor/core.c | 3 +- + drivers/mtd/spi-nor/micron-st.c | 2 + + drivers/mtd/spi-nor/spansion.c | 4 + + drivers/mtd/spi-nor/sst.c | 39 ++-- + drivers/mtd/spi-nor/winbond.c | 26 +++ + include/linux/mtd/nand.h | 90 ++++++++- + include/linux/mtd/spinand.h | 19 ++ + include/linux/platform_data/mtd-davinci-aemif.h | 36 ---- + include/linux/platform_data/mtd-davinci.h | 88 -------- + 32 files changed, 621 insertions(+), 314 deletions(-) + delete mode 100644 include/linux/platform_data/mtd-davinci-aemif.h + delete mode 100644 include/linux/platform_data/mtd-davinci.h +Merging nand/nand/next (475aadeba5df mtd: spinand: macronix: Flag parts needing explicit plane select) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (ac5bfa968b60 mtd: spi-nor: fix flash probing) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (ce212d2afca4 crypto: n2 - Set err to EINVAL if snprintf fails for hmac) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (ae2c6d8b3b88 Merge tag 'drm-xe-next-fixes-2024-09-12' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging .mailmap +Auto-merging Documentation/accel/qaic/qaic.rst +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c +Auto-merging drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c +Auto-merging drivers/gpu/drm/display/drm_dp_mst_topology.c +Auto-merging drivers/gpu/drm/drm_file.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/i915_utils.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Auto-merging drivers/gpu/drm/nouveau/nouveau_drm.c +Auto-merging drivers/gpu/drm/radeon/radeon_drv.c +Auto-merging drivers/gpu/drm/tegra/drm.c +Auto-merging drivers/gpu/drm/v3d/v3d_bo.c +Auto-merging drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +Auto-merging drivers/gpu/drm/xe/xe_debugfs.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_drm_client.c +Auto-merging drivers/gpu/drm/xe/xe_gt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt.c +Auto-merging drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c +Auto-merging drivers/gpu/drm/xe/xe_guc_submit.c +Auto-merging drivers/gpu/drm/xe/xe_oa.c +Auto-merging drivers/gpu/drm/xe/xe_sync.c +Auto-merging fs/pstore/platform.c +CONFLICT (content): Merge conflict in fs/pstore/platform.c +Auto-merging include/drm/drm_accel.h +Auto-merging kernel/panic.c +Auto-merging kernel/printk/printk.c +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c' +Resolved 'drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_gt.c' using previous resolution. +Resolved 'fs/pstore/platform.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c'. +[master 09bf8f128041] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git +$ git diff -M --stat --summary HEAD^.. + .mailmap | 4 + + .../ABI/testing/sysfs-driver-intel-i915-hwmon | 8 + + Documentation/accel/qaic/qaic.rst | 6 - + .../bindings/display/bridge/toshiba,tc358767.yaml | 21 +- + .../bindings/display/mediatek/mediatek,dpi.yaml | 17 + + .../devicetree/bindings/display/msm/hdmi.yaml | 28 +- + .../display/panel/boe,th101mb31ig002-28a.yaml | 21 +- + .../bindings/display/panel/boe,tv101wum-ll2.yaml | 63 + + .../bindings/display/panel/himax,hx8394.yaml | 17 +- + .../bindings/display/panel/ilitek,ili9806e.yaml | 1 + + .../bindings/display/panel/jadard,jd9365da-h3.yaml | 1 + + .../bindings/display/panel/panel-simple.yaml | 4 + + .../bindings/display/panel/sitronix,st7701.yaml | 69 +- + .../bindings/display/renesas,rzg2l-du.yaml | 32 +- + .../devicetree/bindings/phy/qcom,hdmi-phy-qmp.yaml | 1 + + Documentation/gpu/amdgpu/driver-core.rst | 2 +- + Documentation/gpu/introduction.rst | 10 +- + Documentation/gpu/todo.rst | 65 +- + Documentation/gpu/xe/xe_mm.rst | 15 + + MAINTAINERS | 20 +- + arch/powerpc/kernel/nvram_64.c | 8 +- + arch/powerpc/platforms/powernv/opal-kmsg.c | 4 +- + arch/um/kernel/kmsg_dump.c | 2 +- + drivers/accel/drm_accel.c | 110 +- + drivers/accel/ivpu/ivpu_fw.c | 4 + + drivers/dma-buf/dma-fence-array.c | 78 +- + drivers/dma-buf/dma-heap.c | 33 +- + drivers/gpu/drm/Kconfig | 33 +- + drivers/gpu/drm/Makefile | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 22 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 2 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 7 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.h | 9 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 105 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 96 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 144 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 458 +++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 38 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 87 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 62 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 162 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 39 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_pll.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring_mux.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sched.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 102 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 109 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 4 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 4 + + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 38 +- + drivers/gpu/drm/amd/amdgpu/cikd.h | 1 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 397 ++++- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 369 ++++- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.h | 3 + + drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 345 +++- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 77 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 76 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 375 ++++- + .../gpu/drm/amd/amdgpu/gfx_v9_0_cleaner_shader.h | 26 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 694 +++++++- + .../drm/amd/amdgpu/gfx_v9_4_3_cleaner_shader.asm | 153 ++ + .../gpu/drm/amd/amdgpu/gfx_v9_4_3_cleaner_shader.h | 64 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 18 - + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 17 - + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/hdp_v5_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/hdp_v7_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c | 57 +- + drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.h | 11 + + drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c | 57 +- + drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.h | 11 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 36 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 166 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 66 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 21 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 102 ++ + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 104 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 106 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.h | 1 - + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 106 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.h | 1 - + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 112 ++ + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 113 ++ + drivers/gpu/drm/amd/amdgpu/soc15.h | 4 + + drivers/gpu/drm/amd/amdgpu/soc15d.h | 4 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 177 +- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 5 + + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vce_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 112 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 113 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 118 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 113 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 114 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 115 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 113 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 110 +- + drivers/gpu/drm/amd/amdgpu/vid.h | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 142 +- + drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 20 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 48 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 431 ++++- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 21 + + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 22 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 71 - + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 58 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_pm4_headers_ai.h | 5 +- + .../gpu/drm/amd/amdkfd/kfd_pm4_headers_aldebaran.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 47 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 85 +- + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 373 +++++ + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 45 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 132 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 55 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 5 + + drivers/gpu/drm/amd/amdkfd/soc15_int.h | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 167 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 60 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 5 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 30 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 143 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 8 +- + drivers/gpu/drm/amd/display/dc/Makefile | 1 - + drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 27 + + .../gpu/drm/amd/display/dc/bios/command_table2.c | 2 +- + .../amd/display/dc/clk_mgr/dce110/dce110_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 34 +- + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 303 +++- + drivers/gpu/drm/amd/display/dc/core/dc.c | 211 +-- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 225 ++- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 56 +- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 1 + + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 14 +- + drivers/gpu/drm/amd/display/dc/dc.h | 27 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 95 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 24 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 7 - + drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 102 +- + drivers/gpu/drm/amd/display/dc/dc_spl_translate.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 12 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 20 + + .../gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.h | 17 +- + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c | 1469 ++++++++++++++++- + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.h | 1 + + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c | 32 +- + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.h | 4 - + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 6 + + drivers/gpu/drm/amd/display/dc/dce/dce_audio.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 10 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 3 + + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 20 +- + .../display/dc/dce110/dce110_timing_generator.c | 1 + + .../display/dc/dce110/dce110_timing_generator.h | 1 + + .../display/dc/dce110/dce110_timing_generator_v.c | 1 + + .../display/dc/dce120/dce120_timing_generator.c | 1 + + .../amd/display/dc/dce60/dce60_timing_generator.c | 3 +- + .../amd/display/dc/dce80/dce80_timing_generator.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 2 - + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 6 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn303/Makefile | 13 - + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn314/Makefile | 10 - + drivers/gpu/drm/amd/display/dc/dcn401/Makefile | 10 - + drivers/gpu/drm/amd/display/dc/dio/Makefile | 18 + + .../dc/{ => dio}/dcn301/dcn301_dio_link_encoder.c | 0 + .../dc/{ => dio}/dcn301/dcn301_dio_link_encoder.h | 0 + .../{ => dio}/dcn314/dcn314_dio_stream_encoder.c | 0 + .../{ => dio}/dcn314/dcn314_dio_stream_encoder.h | 0 + .../dc/dio/dcn321/dcn321_dio_link_encoder.c | 1 - + .../dc/dio/dcn35/dcn35_dio_stream_encoder.c | 29 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 3 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 5 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 2 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 2 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 11 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 4 +- + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 8 - + .../dc/dml2/dml21/dml21_translation_helper.c | 114 +- + .../dc/dml2/dml21/dml21_translation_helper.h | 1 + + .../drm/amd/display/dc/dml2/dml21/dml21_utils.c | 169 +- + .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 4 +- + .../dc/dml2/dml21/inc/bounding_boxes/dcn3_soc_bb.h | 8 +- + .../dc/dml2/dml21/inc/bounding_boxes/dcn4_soc_bb.h | 25 +- + .../drm/amd/display/dc/dml2/dml21/inc/dml_top.h | 1 - + .../dc/dml2/dml21/inc/dml_top_dchub_registers.h | 1 - + .../dc/dml2/dml21/inc/dml_top_display_cfg_types.h | 3 +- + .../dc/dml2/dml21/inc/dml_top_policy_types.h | 1 - + .../dml2/dml21/inc/dml_top_soc_parameter_types.h | 17 +- + .../amd/display/dc/dml2/dml21/inc/dml_top_types.h | 14 +- + .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c | 127 +- + .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.h | 1 - + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 985 ++++++----- + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.h | 2 +- + .../dml2/dml21/src/dml2_core/dml2_core_factory.c | 3 +- + .../dml2/dml21/src/dml2_core/dml2_core_factory.h | 1 - + .../dc/dml2/dml21/src/dml2_core/dml2_core_shared.c | 222 +-- + .../dc/dml2/dml21/src/dml2_core/dml2_core_shared.h | 38 - + .../dml21/src/dml2_core/dml2_core_shared_types.h | 35 +- + .../dc/dml2/dml21/src/dml2_core/dml2_core_utils.c | 631 +++++++ + .../dc/dml2/dml21/src/dml2_core/dml2_core_utils.h | 39 + + .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 171 +- + .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h | 1 - + .../dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 3 +- + .../dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.h | 1 - + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.c | 1 - + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.h | 1 - + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.c | 1 - + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.h | 1 - + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.c | 12 +- + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.h | 1 - + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.c | 1250 -------------- + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.h | 25 - + .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 568 ++++--- + .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.h | 1 - + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.c | 8 +- + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.h | 1 - + .../src/dml2_standalone_libraries/lib_float_math.c | 1 - + .../src/dml2_standalone_libraries/lib_float_math.h | 1 - + .../dml21/src/dml2_top/dml2_top_optimization.c | 2 - + .../dml21/src/dml2_top/dml2_top_optimization.h | 1 - + .../display/dc/dml2/dml21/src/dml2_top/dml_top.c | 23 +- + .../dc/dml2/dml21/src/dml2_top/dml_top_mcache.c | 23 +- + .../dc/dml2/dml21/src/dml2_top/dml_top_mcache.h | 1 - + .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.c | 1 - + .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.h | 1 - + .../dml21/src/inc/dml2_internal_shared_types.h | 27 +- + .../drm/amd/display/dc/dml2/dml2_internal_types.h | 1 + + .../amd/display/dc/dml2/dml2_translation_helper.c | 56 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c | 10 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 2 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 1 + + .../drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 3 - + .../gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.c | 27 +- + .../gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.h | 3 + + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.c | 3 +- + .../drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 19 +- + .../amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 668 ++++---- + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dwb/Makefile | 9 + + .../display/dc/{ => dwb}/dcn30/dcn30_cm_common.h | 0 + .../drm/amd/display/dc/{ => dwb}/dcn30/dcn30_dwb.c | 0 + .../drm/amd/display/dc/{ => dwb}/dcn30/dcn30_dwb.h | 0 + .../amd/display/dc/{ => dwb}/dcn30/dcn30_dwb_cm.c | 0 + .../gpu/drm/amd/display/dc/dwb/dcn35/dcn35_dwb.c | 1 - + .../amd/display/dc/gpio/dcn401/hw_factory_dcn401.c | 16 +- + drivers/gpu/drm/amd/display/dc/hpo/Makefile | 15 + + .../dc/{ => hpo}/dcn31/dcn31_hpo_dp_link_encoder.c | 0 + .../dc/{ => hpo}/dcn31/dcn31_hpo_dp_link_encoder.h | 0 + .../{ => hpo}/dcn31/dcn31_hpo_dp_stream_encoder.c | 0 + .../{ => hpo}/dcn31/dcn31_hpo_dp_stream_encoder.h | 0 + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 387 ++--- + .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.c | 3 +- + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c | 3 +- + .../gpu/drm/amd/display/dc/hubp/dcn35/dcn35_hubp.c | 2 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 5 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 65 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 25 +- + .../gpu/drm/amd/display/dc/hwss/dcn10/dcn10_init.c | 2 - + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 54 +- + .../gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn201/dcn201_init.c | 1 - + .../gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.c | 2 - + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 21 +- + .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn301/dcn301_init.c | 1 - + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 4 +- + .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c | 3 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 13 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.h | 2 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_init.c | 3 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 108 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.h | 6 +- + .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 3 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 75 +- + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 3 +- + .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 4 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 235 ++- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 3 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 10 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 19 +- + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/audio.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 4 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 13 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/optc.h | 5 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 2 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 10 - + drivers/gpu/drm/amd/display/dc/inc/resource.h | 7 + + .../amd/display/dc/link/accessories/link_dp_cts.c | 13 +- + .../drm/amd/display/dc/link/hwss/link_hwss_dio.c | 5 +- + .../amd/display/dc/link/hwss/link_hwss_hpo_dp.c | 12 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 8 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 45 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 3 +- + .../display/dc/link/protocols/link_dp_capability.c | 69 +- + .../dc/link/protocols/link_edp_panel_control.c | 14 +- + .../dc/link/protocols/link_edp_panel_control.h | 2 +- + drivers/gpu/drm/amd/display/dc/mmhubbub/Makefile | 9 + + .../dc/{ => mmhubbub}/dcn20/dcn20_mmhubbub.c | 0 + .../dc/{ => mmhubbub}/dcn20/dcn20_mmhubbub.h | 0 + drivers/gpu/drm/amd/display/dc/mpc/Makefile | 27 + + .../drm/amd/display/dc/{ => mpc}/dcn10/dcn10_mpc.c | 0 + .../drm/amd/display/dc/{ => mpc}/dcn10/dcn10_mpc.h | 0 + .../drm/amd/display/dc/{ => mpc}/dcn20/dcn20_mpc.c | 0 + .../drm/amd/display/dc/{ => mpc}/dcn20/dcn20_mpc.h | 0 + .../drm/amd/display/dc/{ => mpc}/dcn30/dcn30_mpc.c | 2 +- + .../drm/amd/display/dc/{ => mpc}/dcn30/dcn30_mpc.h | 0 + drivers/gpu/drm/amd/display/dc/opp/Makefile | 16 + + .../drm/amd/display/dc/{ => opp}/dcn10/dcn10_opp.c | 0 + .../drm/amd/display/dc/{ => opp}/dcn10/dcn10_opp.h | 0 + .../drm/amd/display/dc/{ => opp}/dcn20/dcn20_opp.c | 0 + .../drm/amd/display/dc/{ => opp}/dcn20/dcn20_opp.h | 0 + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c | 10 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 7 +- + .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c | 8 +- + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.c | 36 +- + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.h | 6 +- + drivers/gpu/drm/amd/display/dc/resource/Makefile | 2 - + .../display/dc/resource/dce110/dce110_resource.c | 1 + + .../display/dc/resource/dce112/dce112_resource.c | 5 +- + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 3 +- + .../display/dc/resource/dcn201/dcn201_resource.c | 4 +- + .../amd/display/dc/resource/dcn21/dcn21_resource.c | 3 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 1 + + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 11 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.h | 5 + + .../dc/resource/dcn32/dcn32_resource_helpers.c | 14 +- + .../display/dc/resource/dcn321/dcn321_resource.c | 1 + + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 2 + + .../display/dc/resource/dcn401/dcn401_resource.c | 11 +- + .../display/dc/resource/dcn401/dcn401_resource.h | 3 +- + drivers/gpu/drm/amd/display/dc/spl/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 1355 +++++++++------ + drivers/gpu/drm/amd/display/dc/spl/dc_spl.h | 8 - + .../gpu/drm/amd/display/dc/spl/dc_spl_filters.c | 15 + + .../gpu/drm/amd/display/dc/spl/dc_spl_filters.h | 15 + + .../drm/amd/display/dc/spl/dc_spl_isharp_filters.c | 352 +++- + .../drm/amd/display/dc/spl/dc_spl_isharp_filters.h | 35 +- + .../amd/display/dc/spl/dc_spl_scl_easf_filters.c | 1726 ++++++++++++++++++++ + .../amd/display/dc/spl/dc_spl_scl_easf_filters.h | 38 + + .../drm/amd/display/dc/spl/dc_spl_scl_filters.c | 92 +- + .../drm/amd/display/dc/spl/dc_spl_scl_filters.h | 55 +- + drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h | 108 +- + .../gpu/drm/amd/display/dc/spl/spl_custom_float.c | 151 ++ + .../gpu/drm/amd/display/dc/spl/spl_custom_float.h | 29 + + drivers/gpu/drm/amd/display/dc/spl/spl_debug.h | 25 + + .../gpu/drm/amd/display/dc/spl/spl_fixpt31_32.c | 497 ++++++ + .../gpu/drm/amd/display/dc/spl/spl_fixpt31_32.h | 525 ++++++ + drivers/gpu/drm/amd/display/dc/spl/spl_os_types.h | 55 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 3 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 52 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 4 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 4 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 4 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c | 4 + + drivers/gpu/drm/amd/display/include/fixed31_32.h | 6 + + drivers/gpu/drm/amd/display/include/logger_types.h | 1 + + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 18 +- + drivers/gpu/drm/amd/include/amd_shared.h | 75 +- + .../drm/amd/include/asic_reg/uvd/uvd_4_0_sh_mask.h | 2 - + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 6 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 1 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 6 +- + .../drm/amd/pm/powerplay/hwmgr/processpptables.c | 2 + + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 4 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 11 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 886 +++++++++- + drivers/gpu/drm/ast/Makefile | 4 +- + drivers/gpu/drm/ast/ast_dp.c | 404 +++-- + drivers/gpu/drm/ast/ast_dp501.c | 184 ++- + drivers/gpu/drm/ast/ast_drv.h | 43 +- + drivers/gpu/drm/ast/ast_main.c | 6 +- + drivers/gpu/drm/ast/ast_mode.c | 576 ------- + drivers/gpu/drm/ast/ast_post.c | 2 +- + drivers/gpu/drm/ast/ast_reg.h | 22 +- + drivers/gpu/drm/ast/ast_sil164.c | 127 ++ + drivers/gpu/drm/ast/ast_vga.c | 127 ++ + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 5 - + drivers/gpu/drm/bridge/analogix/anx7625.c | 22 +- + drivers/gpu/drm/bridge/ite-it6505.c | 17 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 35 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 103 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 8 +- + drivers/gpu/drm/bridge/nwl-dsi.h | 4 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 66 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 7 +- + drivers/gpu/drm/bridge/tc358767.c | 45 +- + drivers/gpu/drm/ci/arm64.config | 1 + + drivers/gpu/drm/ci/container.yml | 8 + + drivers/gpu/drm/ci/gitlab-ci.yml | 39 +- + drivers/gpu/drm/ci/igt_runner.sh | 11 +- + drivers/gpu/drm/ci/image-tags.yml | 8 +- + drivers/gpu/drm/ci/lava-submit.sh | 1 + + drivers/gpu/drm/ci/test.yml | 142 +- + drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 2 +- + drivers/gpu/drm/ci/xfails/amdgpu-stoney-flakes.txt | 14 +- + drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 5 +- + drivers/gpu/drm/ci/xfails/i915-amly-fails.txt | 12 +- + drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt | 41 +- + drivers/gpu/drm/ci/xfails/i915-amly-skips.txt | 5 +- + drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt | 2 +- + drivers/gpu/drm/ci/xfails/i915-apl-skips.txt | 4 +- + drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 14 +- + drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt | 9 +- + drivers/gpu/drm/ci/xfails/i915-cml-skips.txt | 5 +- + drivers/gpu/drm/ci/xfails/i915-glk-fails.txt | 24 +- + drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt | 8 +- + drivers/gpu/drm/ci/xfails/i915-glk-skips.txt | 4 +- + drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt | 2 + + drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt | 2 +- + drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt | 4 +- + drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 25 +- + drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt | 4 +- + drivers/gpu/drm/ci/xfails/i915-whl-fails.txt | 17 +- + drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt | 2 +- + drivers/gpu/drm/ci/xfails/i915-whl-skips.txt | 5 +- + .../gpu/drm/ci/xfails/mediatek-mt8173-fails.txt | 10 +- + .../gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt | 32 +- + .../gpu/drm/ci/xfails/mediatek-mt8173-skips.txt | 5 +- + .../gpu/drm/ci/xfails/mediatek-mt8183-fails.txt | 28 +- + .../gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt | 20 + + .../gpu/drm/ci/xfails/mediatek-mt8183-skips.txt | 7 +- + drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt | 19 +- + drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt | 7 +- + drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt | 6 +- + drivers/gpu/drm/ci/xfails/msm-apq8016-skips.txt | 3 +- + drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt | 1 - + drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt | 2 +- + drivers/gpu/drm/ci/xfails/msm-apq8096-skips.txt | 5 +- + .../xfails/msm-sc7180-trogdor-kingoftown-fails.txt | 146 -- + .../msm-sc7180-trogdor-kingoftown-flakes.txt | 18 +- + .../xfails/msm-sc7180-trogdor-kingoftown-skips.txt | 6 +- + .../msm-sc7180-trogdor-lazor-limozeen-fails.txt | 146 -- + .../msm-sc7180-trogdor-lazor-limozeen-flakes.txt | 11 +- + .../msm-sc7180-trogdor-lazor-limozeen-skips.txt | 3 +- + drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt | 1 - + drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt | 105 +- + drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt | 5 +- + drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt | 1 + + drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt | 23 + + .../gpu/drm/ci/xfails/panfrost-mt8183-fails.txt | 1 + + .../gpu/drm/ci/xfails/panfrost-mt8183-skips.txt | 23 + + .../gpu/drm/ci/xfails/panfrost-rk3288-fails.txt | 1 + + .../gpu/drm/ci/xfails/panfrost-rk3288-skips.txt | 26 + + .../gpu/drm/ci/xfails/panfrost-rk3399-fails.txt | 1 + + .../gpu/drm/ci/xfails/panfrost-rk3399-flakes.txt | 6 + + .../gpu/drm/ci/xfails/panfrost-rk3399-skips.txt | 26 + + drivers/gpu/drm/ci/xfails/requirements.txt | 2 +- + .../gpu/drm/ci/xfails/rockchip-rk3288-fails.txt | 22 +- + .../gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt | 6 + + .../gpu/drm/ci/xfails/rockchip-rk3288-skips.txt | 57 +- + .../gpu/drm/ci/xfails/rockchip-rk3399-fails.txt | 90 +- + .../gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt | 50 +- + .../gpu/drm/ci/xfails/rockchip-rk3399-skips.txt | 10 +- + .../gpu/drm/ci/xfails/virtio_gpu-none-fails.txt | 65 +- + .../gpu/drm/ci/xfails/virtio_gpu-none-skips.txt | 5 +- + drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 5 - + drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt | 21 + + drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 106 +- + drivers/gpu/drm/display/drm_dp_helper.c | 66 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 128 +- + drivers/gpu/drm/drm_atomic.c | 6 - + drivers/gpu/drm/drm_atomic_helper.c | 2 - + drivers/gpu/drm/drm_bridge.c | 9 +- + drivers/gpu/drm/drm_connector.c | 83 +- + drivers/gpu/drm/drm_crtc_internal.h | 15 + + drivers/gpu/drm/drm_displayid.c | 3 - + drivers/gpu/drm/drm_drv.c | 100 +- + drivers/gpu/drm/drm_edid.c | 24 +- + drivers/gpu/drm/drm_fb_helper.c | 39 +- + drivers/gpu/drm/drm_file.c | 41 +- + drivers/gpu/drm/drm_gem.c | 7 +- + drivers/gpu/drm/drm_internal.h | 5 - + drivers/gpu/drm/drm_mipi_dsi.c | 225 +++ + drivers/gpu/drm/drm_mode_config.c | 2 + + drivers/gpu/drm/drm_modes.c | 1 - + drivers/gpu/drm/drm_panel.c | 18 + + drivers/gpu/drm/drm_panic.c | 406 ++++- + drivers/gpu/drm/drm_panic_qr.rs | 1003 ++++++++++++ + drivers/gpu/drm/drm_prime.c | 84 +- + drivers/gpu/drm/drm_print.c | 13 +- + drivers/gpu/drm/drm_probe_helper.c | 12 +- + drivers/gpu/drm/drm_rect.c | 1 - + drivers/gpu/drm/drm_vblank.c | 83 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_drv.h | 4 - + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 4 +- + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 2 +- + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 2 +- + drivers/gpu/drm/gma500/intel_bios.c | 22 +- + drivers/gpu/drm/gma500/intel_bios.h | 4 +- + drivers/gpu/drm/gma500/intel_gmbus.c | 2 +- + drivers/gpu/drm/gma500/psb_drv.h | 2 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 2 +- + drivers/gpu/drm/gma500/psb_intel_lvds.c | 4 +- + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 26 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.h | 1 - + drivers/gpu/drm/i915/display/dvo_ch7017.c | 14 +- + drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 18 +- + drivers/gpu/drm/i915/display/dvo_ivch.c | 16 +- + drivers/gpu/drm/i915/display/dvo_ns2501.c | 18 +- + drivers/gpu/drm/i915/display/dvo_sil164.c | 18 +- + drivers/gpu/drm/i915/display/dvo_tfp410.c | 18 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 155 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 3 +- + drivers/gpu/drm/i915/display/i9xx_wm.c | 2 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 12 +- + drivers/gpu/drm/i915/display/intel_acpi.c | 17 +- + drivers/gpu/drm/i915/display/intel_acpi.h | 18 +- + drivers/gpu/drm/i915/display/intel_alpm.c | 56 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 6 +- + drivers/gpu/drm/i915/display/intel_audio.c | 39 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 22 +- + drivers/gpu/drm/i915/display/intel_bios.c | 883 +++++----- + drivers/gpu/drm/i915/display/intel_bios.h | 28 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 5 +- + drivers/gpu/drm/i915/display/intel_color.c | 56 +- + drivers/gpu/drm/i915/display/intel_combo_phy.c | 8 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 3 + + drivers/gpu/drm/i915/display/intel_ddi.c | 24 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 3 +- + drivers/gpu/drm/i915/display/intel_display.c | 53 +- + drivers/gpu/drm/i915/display/intel_display.h | 3 + + drivers/gpu/drm/i915/display/intel_display_core.h | 2 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 19 +- + .../i915/display/intel_display_debugfs_params.c | 8 +- + .../i915/display/intel_display_debugfs_params.h | 4 +- + .../gpu/drm/i915/display/intel_display_device.c | 242 ++- + .../gpu/drm/i915/display/intel_display_device.h | 21 +- + .../gpu/drm/i915/display/intel_display_driver.c | 36 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 66 +- + .../gpu/drm/i915/display/intel_display_params.c | 6 +- + .../gpu/drm/i915/display/intel_display_params.h | 4 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 28 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 5 - + .../drm/i915/display/intel_display_power_well.c | 19 +- + drivers/gpu/drm/i915/display/intel_display_reset.c | 7 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 62 +- + drivers/gpu/drm/i915/display/intel_display_wa.h | 8 + + drivers/gpu/drm/i915/display/intel_dmc.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 290 ++-- + drivers/gpu/drm/i915/display/intel_dp.h | 3 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 114 +- + drivers/gpu/drm/i915/display/intel_dp_aux.h | 4 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 70 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 13 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 237 ++- + .../gpu/drm/i915/display/intel_dp_link_training.h | 6 + + drivers/gpu/drm/i915/display/intel_dp_mst.c | 100 +- + drivers/gpu/drm/i915/display/intel_dp_mst.h | 1 + + drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 77 +- + drivers/gpu/drm/i915/display/intel_dp_tunnel.h | 11 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 9 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 3 +- + drivers/gpu/drm/i915/display/intel_dpt.c | 4 + + drivers/gpu/drm/i915/display/intel_dpt.h | 3 + + drivers/gpu/drm/i915/display/intel_dsb.c | 325 +++- + drivers/gpu/drm/i915/display/intel_dsb.h | 16 + + drivers/gpu/drm/i915/display/intel_dsi.h | 2 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 20 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 14 +- + drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +- + drivers/gpu/drm/i915/display/intel_fb.c | 36 + + drivers/gpu/drm/i915/display/intel_fb.h | 2 + + drivers/gpu/drm/i915/display/intel_fbc.c | 555 ++++--- + drivers/gpu/drm/i915/display/intel_fbc.h | 13 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 6 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 2 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 7 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 4 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 23 +- + .../gpu/drm/i915/display/intel_hdcp_gsc_message.c | 67 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 500 +++--- + drivers/gpu/drm/i915/display/intel_hdmi.h | 1 - + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 6 +- + drivers/gpu/drm/i915/display/intel_hti.c | 20 +- + drivers/gpu/drm/i915/display/intel_hti.h | 8 +- + drivers/gpu/drm/i915/display/intel_link_bw.c | 29 +- + drivers/gpu/drm/i915/display/intel_link_bw.h | 2 - + drivers/gpu/drm/i915/display/intel_load_detect.c | 27 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 115 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 5 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 2 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 322 ++-- + drivers/gpu/drm/i915/display/intel_opregion.h | 62 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 3 +- + drivers/gpu/drm/i915/display/intel_pmdemand.c | 2 +- + drivers/gpu/drm/i915/display/intel_pps.c | 567 ++++--- + drivers/gpu/drm/i915/display/intel_pps.h | 10 +- + drivers/gpu/drm/i915/display/intel_psr.c | 852 +++++----- + drivers/gpu/drm/i915/display/intel_psr.h | 8 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 33 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 209 +-- + drivers/gpu/drm/i915/display/intel_tc.c | 3 + + drivers/gpu/drm/i915/display/intel_tv.c | 204 +-- + drivers/gpu/drm/i915/display/intel_tv.h | 6 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 125 +- + drivers/gpu/drm/i915/display/intel_vblank.h | 2 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 41 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 51 +- + drivers/gpu/drm/i915/display/intel_vdsc.h | 4 + + drivers/gpu/drm/i915/display/intel_vrr.c | 130 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 16 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 24 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 5 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 30 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 1 - + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 1 - + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 1 - + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 1 + + drivers/gpu/drm/i915/gt/intel_gt.h | 7 +- + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 2 + + drivers/gpu/drm/i915/gt/intel_gt_types.h | 2 + + drivers/gpu/drm/i915/gt/intel_reset.c | 12 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 25 +- + drivers/gpu/drm/i915/gt/selftest_migrate.c | 2 +- + drivers/gpu/drm/i915/gt/sysfs_engines.c | 5 +- + drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 18 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 7 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 2 +- + drivers/gpu/drm/i915/gvt/edid.c | 28 +- + drivers/gpu/drm/i915/gvt/edid.h | 4 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 18 +- + drivers/gpu/drm/i915/gvt/opregion.c | 2 +- + drivers/gpu/drm/i915/gvt/trace.h | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 3 +- + drivers/gpu/drm/i915/i915_driver.c | 44 +- + drivers/gpu/drm/i915/i915_drv.h | 21 +- + drivers/gpu/drm/i915/i915_gem.c | 2 - + drivers/gpu/drm/i915/i915_gem_gtt.c | 1 - + drivers/gpu/drm/i915/i915_gpu_error.c | 3 +- + drivers/gpu/drm/i915/i915_hwmon.c | 88 + + drivers/gpu/drm/i915/i915_irq.c | 1 - + drivers/gpu/drm/i915/i915_mm.c | 12 +- + drivers/gpu/drm/i915/i915_mm.h | 3 +- + drivers/gpu/drm/i915/i915_module.c | 9 +- + drivers/gpu/drm/i915/i915_params.c | 3 +- + drivers/gpu/drm/i915/i915_pci.c | 7 +- + drivers/gpu/drm/i915/i915_reg.h | 6 + + drivers/gpu/drm/i915/i915_sysfs.c | 4 +- + drivers/gpu/drm/i915/i915_utils.c | 51 +- + drivers/gpu/drm/i915/i915_utils.h | 16 +- + drivers/gpu/drm/i915/i915_vma.h | 1 - + drivers/gpu/drm/i915/intel_device_info.c | 7 - + drivers/gpu/drm/i915/intel_device_info.h | 2 - + drivers/gpu/drm/i915/intel_step.c | 84 +- + drivers/gpu/drm/i915/intel_step.h | 3 - + drivers/gpu/drm/i915/intel_uncore.c | 7 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 2 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- + drivers/gpu/drm/imagination/pvr_device.h | 2 +- + drivers/gpu/drm/imagination/pvr_queue.c | 4 +- + drivers/gpu/drm/imx/ipuv3/parallel-display.c | 14 +- + drivers/gpu/drm/lima/lima_sched.c | 2 +- + drivers/gpu/drm/loongson/lsdc_ttm.c | 8 +- + drivers/gpu/drm/mediatek/mtk_crtc.c | 82 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 36 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 13 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 106 +- + drivers/gpu/drm/mediatek/mtk_ethdr.c | 13 +- + drivers/gpu/drm/mediatek/mtk_plane.c | 29 +- + drivers/gpu/drm/mediatek/mtk_plane.h | 3 +- + drivers/gpu/drm/mgag200/Makefile | 1 + + drivers/gpu/drm/mgag200/mgag200_bmc.c | 111 +- + drivers/gpu/drm/mgag200/mgag200_drv.c | 40 + + drivers/gpu/drm/mgag200/mgag200_drv.h | 58 +- + drivers/gpu/drm/mgag200/mgag200_g200.c | 5 + + drivers/gpu/drm/mgag200/mgag200_g200eh.c | 11 +- + drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 11 +- + drivers/gpu/drm/mgag200/mgag200_g200er.c | 22 +- + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 22 +- + drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 13 +- + drivers/gpu/drm/mgag200/mgag200_g200se.c | 22 +- + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 13 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 183 ++- + drivers/gpu/drm/mgag200/mgag200_reg.h | 7 + + drivers/gpu/drm/mgag200/mgag200_vga_bmc.c | 156 ++ + drivers/gpu/drm/msm/Makefile | 1 + + drivers/gpu/drm/msm/adreno/a3xx_catalog.c | 11 + + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 14 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 16 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 2 + + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 30 +- + drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 141 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 21 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 87 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 2 + + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 46 +- + .../gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h | 2 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 15 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 51 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 18 + + .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 18 + + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 18 + + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 18 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 41 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h | 18 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hwio.h | 7 + + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 12 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 2 +- + drivers/gpu/drm/msm/dp/dp_display.c | 10 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 12 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 1 + + drivers/gpu/drm/msm/hdmi/hdmi.h | 8 + + drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 5 + + drivers/gpu/drm/msm/hdmi/hdmi_phy_8998.c | 779 +++++++++ + drivers/gpu/drm/msm/msm_drv.h | 4 - + drivers/gpu/drm/msm/msm_gpu.c | 1 - + drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 1118 ++++++++++++- + drivers/gpu/drm/msm/registers/display/hdmi.xml | 89 + + drivers/gpu/drm/mxsfb/lcdif_kms.c | 5 +- + drivers/gpu/drm/nouveau/Kbuild | 1 - + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 57 +- + drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/disp.c | 7 +- + drivers/gpu/drm/nouveau/dispnv04/disp.h | 2 +- + drivers/gpu/drm/nouveau/dispnv04/hw.c | 9 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 4 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/base507c.c | 21 +- + drivers/gpu/drm/nouveau/dispnv50/base827c.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/base907c.c | 10 +- + drivers/gpu/drm/nouveau/dispnv50/core507d.c | 8 +- + drivers/gpu/drm/nouveau/dispnv50/corec37d.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/corec57d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/crc907d.c | 4 +- + drivers/gpu/drm/nouveau/dispnv50/crcc37d.c | 4 +- + drivers/gpu/drm/nouveau/dispnv50/crcc57d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/dac507d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/dac907d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 79 +- + drivers/gpu/drm/nouveau/dispnv50/disp.h | 14 +- + drivers/gpu/drm/nouveau/dispnv50/head507d.c | 24 +- + drivers/gpu/drm/nouveau/dispnv50/head827d.c | 10 +- + drivers/gpu/drm/nouveau/dispnv50/head907d.c | 26 +- + drivers/gpu/drm/nouveau/dispnv50/head917d.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/headc37d.c | 18 +- + drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 12 +- + drivers/gpu/drm/nouveau/dispnv50/ovly507e.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/ovly827e.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/ovly907e.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/pior507d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/sor507d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/sor907d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/sorc37d.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/wimmc37b.c | 7 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc37e.c | 24 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc57e.c | 10 +- + drivers/gpu/drm/nouveau/dispnv50/wndwc67e.c | 2 +- + drivers/gpu/drm/nouveau/include/nvif/cl0080.h | 7 - + drivers/gpu/drm/nouveau/include/nvif/class.h | 3 - + drivers/gpu/drm/nouveau/include/nvif/client.h | 11 +- + drivers/gpu/drm/nouveau/include/nvif/device.h | 37 +- + drivers/gpu/drm/nouveau/include/nvif/driver.h | 5 - + drivers/gpu/drm/nouveau/include/nvif/if0000.h | 10 - + drivers/gpu/drm/nouveau/include/nvif/if0002.h | 39 - + drivers/gpu/drm/nouveau/include/nvif/if0003.h | 34 - + drivers/gpu/drm/nouveau/include/nvif/ioctl.h | 27 - + drivers/gpu/drm/nouveau/include/nvif/object.h | 24 +- + drivers/gpu/drm/nouveau/include/nvif/os.h | 19 + + drivers/gpu/drm/nouveau/include/nvkm/core/client.h | 1 - + drivers/gpu/drm/nouveau/include/nvkm/core/device.h | 1 - + drivers/gpu/drm/nouveau/include/nvkm/core/layout.h | 1 - + drivers/gpu/drm/nouveau/include/nvkm/core/object.h | 14 - + drivers/gpu/drm/nouveau/include/nvkm/core/oclass.h | 2 - + drivers/gpu/drm/nouveau/include/nvkm/core/os.h | 19 - + drivers/gpu/drm/nouveau/include/nvkm/core/pci.h | 1 - + drivers/gpu/drm/nouveau/include/nvkm/core/tegra.h | 1 - + drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h | 29 - + drivers/gpu/drm/nouveau/nouveau_abi16.c | 330 +++- + drivers/gpu/drm/nouveau/nouveau_abi16.h | 6 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_bios.h | 1 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 10 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 50 +- + drivers/gpu/drm/nouveau/nouveau_bo0039.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_bo5039.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_bo74c1.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo85b5.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo9039.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_bo90b5.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_boa0b5.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 98 +- + drivers/gpu/drm/nouveau/nouveau_chan.h | 8 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_dma.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 402 ++--- + drivers/gpu/drm/nouveau/nouveau_drv.h | 61 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 17 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 21 +- + drivers/gpu/drm/nouveau/nouveau_hwmon.c | 46 +- + drivers/gpu/drm/nouveau/nouveau_led.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 38 +- + drivers/gpu/drm/nouveau/nouveau_mem.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_nvif.c | 2 - + drivers/gpu/drm/nouveau/nouveau_platform.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_sched.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_ttm.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_usif.c | 194 --- + drivers/gpu/drm/nouveau/nouveau_usif.h | 10 - + drivers/gpu/drm/nouveau/nouveau_vga.c | 22 +- + drivers/gpu/drm/nouveau/nouveau_vga.h | 1 - + drivers/gpu/drm/nouveau/nv04_fence.c | 2 +- + drivers/gpu/drm/nouveau/nv10_fence.c | 4 +- + drivers/gpu/drm/nouveau/nv17_fence.c | 12 +- + drivers/gpu/drm/nouveau/nv50_fence.c | 4 +- + drivers/gpu/drm/nouveau/nv84_fence.c | 16 +- + drivers/gpu/drm/nouveau/nvc0_fence.c | 4 +- + drivers/gpu/drm/nouveau/nvif/client.c | 32 +- + drivers/gpu/drm/nouveau/nvif/device.c | 15 +- + drivers/gpu/drm/nouveau/nvif/driver.c | 32 +- + drivers/gpu/drm/nouveau/nvif/object.c | 40 - + drivers/gpu/drm/nouveau/nvkm/core/client.c | 64 +- + drivers/gpu/drm/nouveau/nvkm/core/ioctl.c | 91 +- + drivers/gpu/drm/nouveau/nvkm/core/object.c | 50 - + drivers/gpu/drm/nouveau/nvkm/core/oproxy.c | 42 - + drivers/gpu/drm/nouveau/nvkm/core/uevent.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/Kbuild | 1 - + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 481 +++--- + drivers/gpu/drm/nouveau/nvkm/engine/device/pci.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/priv.h | 2 - + drivers/gpu/drm/nouveau/nvkm/engine/device/tegra.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/user.c | 93 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/chan.c | 24 - + drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild | 11 - + drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 867 ---------- + drivers/gpu/drm/nouveau/nvkm/engine/pm/g84.c | 165 -- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c | 243 --- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h | 20 - + drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c | 66 - + drivers/gpu/drm/nouveau/nvkm/engine/pm/gf117.c | 80 - + drivers/gpu/drm/nouveau/nvkm/engine/pm/gk104.c | 184 --- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c | 157 -- + drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c | 138 -- + drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c | 123 -- + drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h | 15 - + drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c | 175 -- + drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h | 105 -- + drivers/gpu/drm/omapdrm/dss/base.c | 3 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 5 + + drivers/gpu/drm/panel/Kconfig | 12 +- + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c | 2 + + .../gpu/drm/panel/panel-boe-th101mb31ig002-28a.c | 317 ++-- + drivers/gpu/drm/panel/panel-boe-tv101wum-ll2.c | 241 +++ + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 190 +-- + drivers/gpu/drm/panel/panel-edp.c | 40 +- + drivers/gpu/drm/panel/panel-himax-hx8394.c | 153 +- + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 14 +- + drivers/gpu/drm/panel/panel-ilitek-ili9806e.c | 165 ++ + drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 372 ++++- + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 147 +- + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 79 +- + drivers/gpu/drm/panel/panel-newvision-nv3051d.c | 367 ++--- + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 2 +- + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 211 +-- + drivers/gpu/drm/panel/panel-novatek-nt36672e.c | 69 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 10 +- + drivers/gpu/drm/panel/panel-simple.c | 97 +- + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 1074 +++++++----- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 2 +- + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 29 +- + .../gpu/drm/panel/panel-startek-kd070fhfid015.c | 115 +- + drivers/gpu/drm/panel/panel-visionox-vtdr6130.c | 204 ++- + drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- + drivers/gpu/drm/panthor/panthor_mmu.c | 2 +- + drivers/gpu/drm/panthor/panthor_sched.c | 2 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 4 +- + drivers/gpu/drm/radeon/cik.c | 14 +- + drivers/gpu/drm/radeon/dce6_afmt.c | 2 +- + drivers/gpu/drm/radeon/evergreen.c | 12 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 62 +- + drivers/gpu/drm/radeon/ni.c | 2 +- + drivers/gpu/drm/radeon/r100.c | 94 +- + drivers/gpu/drm/radeon/r300.c | 6 +- + drivers/gpu/drm/radeon/r420.c | 6 +- + drivers/gpu/drm/radeon/r520.c | 2 +- + drivers/gpu/drm/radeon/r600.c | 12 +- + drivers/gpu/drm/radeon/r600_cs.c | 2 +- + drivers/gpu/drm/radeon/r600_dpm.c | 4 +- + drivers/gpu/drm/radeon/r600_hdmi.c | 2 +- + drivers/gpu/drm/radeon/radeon.h | 7 +- + drivers/gpu/drm/radeon/radeon_acpi.c | 10 +- + drivers/gpu/drm/radeon/radeon_agp.c | 2 +- + drivers/gpu/drm/radeon/radeon_atombios.c | 38 +- + drivers/gpu/drm/radeon/radeon_audio.c | 4 +- + drivers/gpu/drm/radeon/radeon_combios.c | 38 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 7 +- + drivers/gpu/drm/radeon/radeon_device.c | 13 +- + drivers/gpu/drm/radeon/radeon_display.c | 76 +- + drivers/gpu/drm/radeon/radeon_drv.c | 27 +- + drivers/gpu/drm/radeon/radeon_fbdev.c | 26 +- + drivers/gpu/drm/radeon/radeon_fence.c | 8 +- + drivers/gpu/drm/radeon/radeon_gem.c | 4 +- + drivers/gpu/drm/radeon/radeon_i2c.c | 2 +- + drivers/gpu/drm/radeon/radeon_ib.c | 2 +- + drivers/gpu/drm/radeon/radeon_irq_kms.c | 12 +- + drivers/gpu/drm/radeon/radeon_kms.c | 8 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 2 +- + drivers/gpu/drm/radeon/radeon_mode.h | 4 +- + drivers/gpu/drm/radeon/radeon_object.c | 9 +- + drivers/gpu/drm/radeon/radeon_pm.c | 20 +- + drivers/gpu/drm/radeon/radeon_ring.c | 2 +- + drivers/gpu/drm/radeon/radeon_ttm.c | 6 +- + drivers/gpu/drm/radeon/rs400.c | 6 +- + drivers/gpu/drm/radeon/rs600.c | 14 +- + drivers/gpu/drm/radeon/rs690.c | 2 +- + drivers/gpu/drm/radeon/rv515.c | 4 +- + drivers/gpu/drm/radeon/rv770.c | 2 +- + drivers/gpu/drm/radeon/si.c | 4 +- + drivers/gpu/drm/renesas/rcar-du/Kconfig | 8 - + drivers/gpu/drm/renesas/rcar-du/Makefile | 2 - + drivers/gpu/drm/renesas/rz-du/Kconfig | 8 + + drivers/gpu/drm/renesas/rz-du/Makefile | 2 + + drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c | 8 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 11 + + drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c | 3 +- + .../renesas/{rcar-du => rz-du}/rzg2l_mipi_dsi.c | 0 + .../{rcar-du => rz-du}/rzg2l_mipi_dsi_regs.h | 0 + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 2 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 32 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 107 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.h | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 8 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.h | 1 + + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 2 + + drivers/gpu/drm/scheduler/sched_main.c | 27 +- + drivers/gpu/drm/sti/sti_dvo.c | 1 - + drivers/gpu/drm/sti/sti_hda.c | 1 - + drivers/gpu/drm/sti/sti_hdmi.c | 25 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 1 - + drivers/gpu/drm/sti/sti_tvout.c | 1 - + drivers/gpu/drm/sti/sti_vtg.c | 1 - + drivers/gpu/drm/stm/drv.c | 7 +- + drivers/gpu/drm/stm/ltdc.c | 107 +- + drivers/gpu/drm/stm/lvds.c | 1 - + drivers/gpu/drm/tegra/drm.c | 6 + + drivers/gpu/drm/tegra/drm.h | 2 +- + drivers/gpu/drm/tegra/gr3d.c | 46 +- + drivers/gpu/drm/tegra/hub.c | 7 +- + drivers/gpu/drm/tegra/output.c | 29 +- + drivers/gpu/drm/tests/drm_gem_shmem_test.c | 27 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 2 +- + drivers/gpu/drm/tiny/gm12u320.c | 13 +- + drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 6 +- + drivers/gpu/drm/ttm/tests/ttm_resource_test.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 462 +++--- + drivers/gpu/drm/ttm/ttm_bo_util.c | 151 ++ + drivers/gpu/drm/ttm/ttm_device.c | 29 +- + drivers/gpu/drm/ttm/ttm_pool.c | 2 +- + drivers/gpu/drm/ttm/ttm_resource.c | 255 ++- + drivers/gpu/drm/udl/udl_edid.c | 2 +- + drivers/gpu/drm/v3d/v3d_bo.c | 12 + + drivers/gpu/drm/v3d/v3d_drv.c | 11 +- + drivers/gpu/drm/v3d/v3d_drv.h | 12 +- + drivers/gpu/drm/v3d/v3d_perfmon.c | 40 +- + drivers/gpu/drm/v3d/v3d_performance_counters.h | 16 +- + drivers/gpu/drm/v3d/v3d_sched.c | 79 +- + drivers/gpu/drm/v3d/v3d_submit.c | 263 ++- + drivers/gpu/drm/vc4/vc4_bo.c | 14 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 14 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 32 +- + drivers/gpu/drm/vc4/vc4_gem.c | 11 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 44 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 4 +- + drivers/gpu/drm/vc4/vc4_irq.c | 2 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 24 +- + drivers/gpu/drm/vc4/vc4_validate.c | 8 +- + drivers/gpu/drm/vc4/vc4_vec.c | 10 +- + drivers/gpu/drm/vkms/vkms_drv.c | 6 +- + drivers/gpu/drm/vkms/vkms_drv.h | 1 - + drivers/gpu/drm/vkms/vkms_formats.c | 14 +- + drivers/gpu/drm/xe/Makefile | 44 +- + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 1 + + drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 19 +- + drivers/gpu/drm/xe/compat-i915-headers/i915_vma.h | 7 +- + .../gpu/drm/xe/compat-i915-headers/intel_step.h | 10 +- + drivers/gpu/drm/xe/display/intel_fb_bo.c | 9 + + drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 7 +- + drivers/gpu/drm/xe/display/xe_display.c | 108 +- + drivers/gpu/drm/xe/display/xe_display.h | 4 + + drivers/gpu/drm/xe/display/xe_display_wa.c | 16 + + drivers/gpu/drm/xe/display/xe_dsb_buffer.c | 1 - + drivers/gpu/drm/xe/display/xe_fb_pin.c | 51 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 9 +- + drivers/gpu/drm/xe/display/xe_plane_initial.c | 6 + + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 1 + + drivers/gpu/drm/xe/regs/xe_gsc_regs.h | 4 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 17 +- + drivers/gpu/drm/xe/regs/xe_regs.h | 12 +- + drivers/gpu/drm/xe/regs/xe_sriov_regs.h | 23 - + drivers/gpu/drm/xe/tests/Makefile | 6 +- + drivers/gpu/drm/xe/tests/xe_bo.c | 53 +- + drivers/gpu/drm/xe/tests/xe_bo_test.c | 21 - + drivers/gpu/drm/xe/tests/xe_bo_test.h | 14 - + drivers/gpu/drm/xe/tests/xe_dma_buf.c | 30 +- + drivers/gpu/drm/xe/tests/xe_dma_buf_test.c | 20 - + drivers/gpu/drm/xe/tests/xe_dma_buf_test.h | 13 - + drivers/gpu/drm/xe/tests/xe_kunit_helpers.c | 39 + + drivers/gpu/drm/xe/tests/xe_kunit_helpers.h | 2 + + drivers/gpu/drm/xe/tests/xe_live_test_mod.c | 11 + + drivers/gpu/drm/xe/tests/xe_migrate.c | 436 ++++- + drivers/gpu/drm/xe/tests/xe_migrate_test.c | 20 - + drivers/gpu/drm/xe/tests/xe_migrate_test.h | 13 - + drivers/gpu/drm/xe/tests/xe_mocs.c | 44 +- + drivers/gpu/drm/xe/tests/xe_mocs_test.c | 21 - + drivers/gpu/drm/xe/tests/xe_mocs_test.h | 14 - + drivers/gpu/drm/xe/tests/xe_pci.c | 82 +- + drivers/gpu/drm/xe/tests/xe_pci_test.c | 4 +- + drivers/gpu/drm/xe/tests/xe_pci_test.h | 3 +- + drivers/gpu/drm/xe/tests/xe_rtp_test.c | 219 ++- + drivers/gpu/drm/xe/tests/xe_test.h | 10 +- + drivers/gpu/drm/xe/tests/xe_wa_test.c | 1 + + drivers/gpu/drm/xe/xe_assert.h | 2 +- + drivers/gpu/drm/xe/xe_bo.c | 53 +- + drivers/gpu/drm/xe/xe_bo.h | 15 +- + drivers/gpu/drm/xe/xe_bo_types.h | 7 +- + drivers/gpu/drm/xe/xe_debugfs.c | 3 +- + drivers/gpu/drm/xe/xe_debugfs.h | 4 + + drivers/gpu/drm/xe/xe_devcoredump.c | 121 +- + drivers/gpu/drm/xe/xe_devcoredump_types.h | 8 + + drivers/gpu/drm/xe/xe_device.c | 27 +- + drivers/gpu/drm/xe/xe_device.h | 26 +- + drivers/gpu/drm/xe/xe_device_types.h | 50 +- + drivers/gpu/drm/xe/xe_drm_client.c | 2 +- + drivers/gpu/drm/xe/xe_exec.c | 22 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 240 +-- + drivers/gpu/drm/xe/xe_exec_queue.h | 10 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 8 +- + drivers/gpu/drm/xe/xe_execlist.c | 26 +- + drivers/gpu/drm/xe/xe_execlist_types.h | 2 + + drivers/gpu/drm/xe/xe_gen_wa_oob.c | 16 +- + drivers/gpu/drm/xe/xe_ggtt.c | 494 ++++-- + drivers/gpu/drm/xe/xe_ggtt.h | 24 +- + drivers/gpu/drm/xe/xe_ggtt_types.h | 54 +- + drivers/gpu/drm/xe/xe_gpu_scheduler.c | 23 +- + drivers/gpu/drm/xe/xe_gpu_scheduler.h | 12 + + drivers/gpu/drm/xe/xe_gsc.c | 61 +- + drivers/gpu/drm/xe/xe_gsc.h | 3 + + drivers/gpu/drm/xe/xe_gsc_debugfs.c | 71 + + drivers/gpu/drm/xe/xe_gsc_debugfs.h | 14 + + drivers/gpu/drm/xe/xe_gsc_proxy.c | 45 +- + drivers/gpu/drm/xe/xe_gt.c | 14 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 13 + + drivers/gpu/drm/xe/xe_gt_mcr.c | 40 +- + drivers/gpu/drm/xe/xe_gt_pagefault.c | 55 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 8 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 216 ++- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 1 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config_types.h | 5 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c | 1258 +++++++++++++- + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.h | 3 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_control_types.h | 107 ++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 6 + + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 70 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 1 + + drivers/gpu/drm/xe/xe_gt_stats.c | 49 + + drivers/gpu/drm/xe/xe_gt_stats.h | 29 + + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 2 + + drivers/gpu/drm/xe/xe_gt_topology.c | 27 +- + drivers/gpu/drm/xe/xe_gt_types.h | 43 +- + drivers/gpu/drm/xe/xe_guc.c | 4 +- + drivers/gpu/drm/xe/xe_guc.h | 10 + + drivers/gpu/drm/xe/xe_guc_ads.c | 6 + + drivers/gpu/drm/xe/xe_guc_ct.c | 13 +- + drivers/gpu/drm/xe/xe_guc_hwconfig.c | 97 ++ + drivers/gpu/drm/xe/xe_guc_hwconfig.h | 3 + + drivers/gpu/drm/xe/xe_guc_id_mgr.c | 4 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 2 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 96 +- + drivers/gpu/drm/xe/xe_heci_gsc.c | 28 +- + drivers/gpu/drm/xe/xe_heci_gsc.h | 10 +- + drivers/gpu/drm/xe/xe_huc.c | 19 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 164 +- + drivers/gpu/drm/xe/xe_hw_engine.h | 10 + + drivers/gpu/drm/xe/xe_hw_engine_group.c | 372 +++++ + drivers/gpu/drm/xe/xe_hw_engine_group.h | 29 + + drivers/gpu/drm/xe/xe_hw_engine_group_types.h | 51 + + drivers/gpu/drm/xe/xe_hw_engine_types.h | 4 +- + drivers/gpu/drm/xe/xe_hwmon.c | 95 +- + drivers/gpu/drm/xe/xe_irq.c | 2 + + drivers/gpu/drm/xe/xe_lmtt.c | 4 +- + drivers/gpu/drm/xe/xe_lrc.c | 37 +- + drivers/gpu/drm/xe/xe_migrate.c | 553 ++++--- + drivers/gpu/drm/xe/xe_migrate.h | 43 +- + drivers/gpu/drm/xe/xe_mmio.c | 253 +-- + drivers/gpu/drm/xe/xe_mmio.h | 1 - + drivers/gpu/drm/xe/xe_module.c | 54 +- + drivers/gpu/drm/xe/xe_module.h | 2 +- + drivers/gpu/drm/xe/xe_oa.c | 7 +- + drivers/gpu/drm/xe/xe_oa_types.h | 2 +- + drivers/gpu/drm/xe/xe_observation.c | 2 +- + drivers/gpu/drm/xe/xe_pat.c | 2 +- + drivers/gpu/drm/xe/xe_pci.c | 24 +- + drivers/gpu/drm/xe/xe_pm.c | 130 +- + drivers/gpu/drm/xe/xe_pm.h | 2 + + drivers/gpu/drm/xe/xe_preempt_fence.c | 12 +- + drivers/gpu/drm/xe/xe_pt.c | 1391 +++++++++++----- + drivers/gpu/drm/xe/xe_pt.h | 14 +- + drivers/gpu/drm/xe/xe_pt_types.h | 48 + + drivers/gpu/drm/xe/xe_query.c | 6 +- + drivers/gpu/drm/xe/xe_res_cursor.h | 1 - + drivers/gpu/drm/xe/xe_rtp.c | 44 +- + drivers/gpu/drm/xe/xe_rtp.h | 4 +- + drivers/gpu/drm/xe/xe_rtp_helpers.h | 6 + + drivers/gpu/drm/xe/xe_sa.c | 20 +- + drivers/gpu/drm/xe/xe_sa_types.h | 1 + + drivers/gpu/drm/xe/xe_sched_job.c | 5 +- + drivers/gpu/drm/xe/xe_sriov.c | 2 +- + drivers/gpu/drm/xe/xe_step.c | 57 +- + drivers/gpu/drm/xe/xe_step_types.h | 30 +- + drivers/gpu/drm/xe/xe_sync.c | 29 +- + drivers/gpu/drm/xe/xe_sync.h | 1 - + drivers/gpu/drm/xe/xe_trace.h | 52 + + drivers/gpu/drm/xe/xe_trace_bo.h | 10 +- + drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 1 - + drivers/gpu/drm/xe/xe_tuning.c | 21 +- + drivers/gpu/drm/xe/xe_uc_debugfs.c | 2 + + drivers/gpu/drm/xe/xe_uc_fw.c | 42 +- + drivers/gpu/drm/xe/xe_vm.c | 732 ++++----- + drivers/gpu/drm/xe/xe_vm.h | 2 + + drivers/gpu/drm/xe/xe_vm_types.h | 55 +- + drivers/gpu/drm/xe/xe_wa.c | 5 + + drivers/gpu/drm/xe/xe_wa.h | 7 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 7 + + drivers/gpu/drm/xe/xe_wait_user_fence.c | 2 +- + drivers/gpu/host1x/dev.c | 7 +- + drivers/gpu/host1x/dev.h | 2 + + drivers/gpu/host1x/hw/intr_hw.c | 37 +- + drivers/gpu/host1x/intr.c | 21 +- + drivers/gpu/host1x/intr.h | 5 + + drivers/gpu/vga/vga_switcheroo.c | 3 +- + drivers/hv/hv_common.c | 4 +- + drivers/mtd/mtdoops.c | 6 +- + drivers/video/fbdev/core/fbcon.c | 16 +- + fs/pstore/platform.c | 10 +- + include/drm/display/drm_dp.h | 4 + + include/drm/display/drm_dp_helper.h | 3 + + include/drm/display/drm_dp_mst_helper.h | 14 +- + include/drm/drm_accel.h | 18 +- + include/drm/drm_atomic.h | 2 +- + include/drm/drm_connector.h | 8 - + include/drm/drm_device.h | 5 +- + include/drm/drm_drv.h | 28 - + include/drm/drm_edid.h | 2 - + include/drm/drm_fb_helper.h | 6 - + include/drm/drm_file.h | 5 + + include/drm/drm_fixed.h | 3 +- + include/drm/drm_mipi_dsi.h | 12 + + include/drm/drm_mode_config.h | 16 - + include/drm/drm_panic.h | 21 +- + include/drm/drm_prime.h | 3 + + include/drm/drm_print.h | 54 +- + include/drm/drm_rect.h | 15 + + include/drm/drm_vblank.h | 37 +- + include/drm/gpu_scheduler.h | 2 +- + include/drm/ttm/ttm_bo.h | 48 +- + include/drm/ttm/ttm_resource.h | 97 +- + include/linux/dma-fence-array.h | 6 + + include/linux/dma-heap.h | 21 +- + include/linux/fb.h | 1 + + include/linux/kmsg_dump.h | 22 +- + include/linux/string.h | 12 + + include/uapi/drm/drm_fourcc.h | 25 + + include/uapi/drm/drm_mode.h | 2 + + include/uapi/drm/msm_drm.h | 2 + + include/uapi/drm/xe_drm.h | 10 +- + include/uapi/linux/kfd_ioctl.h | 106 +- + include/uapi/linux/virtio_gpu.h | 1 + + kernel/panic.c | 2 +- + kernel/printk/printk.c | 11 +- + 1267 files changed, 43576 insertions(+), 21751 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/boe,tv101wum-ll2.yaml + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_0_cleaner_shader.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3_cleaner_shader.asm + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3_cleaner_shader.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn303/Makefile + delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn314/Makefile + delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn301/dcn301_dio_link_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn301/dcn301_dio_link_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn314/dcn314_dio_stream_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn314/dcn314_dio_stream_encoder.h (100%) + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_shared.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_utils.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_utils.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.h + rename drivers/gpu/drm/amd/display/dc/{ => dwb}/dcn30/dcn30_cm_common.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dwb}/dcn30/dcn30_dwb.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dwb}/dcn30/dcn30_dwb.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dwb}/dcn30/dcn30_dwb_cm.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hpo}/dcn31/dcn31_hpo_dp_link_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hpo}/dcn31/dcn31_hpo_dp_link_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hpo}/dcn31/dcn31_hpo_dp_stream_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hpo}/dcn31/dcn31_hpo_dp_stream_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mmhubbub}/dcn20/dcn20_mmhubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mmhubbub}/dcn20/dcn20_mmhubbub.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn10/dcn10_mpc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn10/dcn10_mpc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn20/dcn20_mpc.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn20/dcn20_mpc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn30/dcn30_mpc.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn30/dcn30_mpc.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => opp}/dcn10/dcn10_opp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => opp}/dcn10/dcn10_opp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => opp}/dcn20/dcn20_opp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => opp}/dcn20/dcn20_opp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_filters.c + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_filters.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_easf_filters.c + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_easf_filters.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/spl_custom_float.c + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/spl_custom_float.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/spl_debug.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/spl_fixpt31_32.c + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/spl_fixpt31_32.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/spl_os_types.h + create mode 100644 drivers/gpu/drm/ast/ast_sil164.c + create mode 100644 drivers/gpu/drm/ast/ast_vga.c + create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-g12b-fails.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-g12b-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-mt8183-fails.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-mt8183-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3288-fails.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3288-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3399-fails.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3399-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/panfrost-rk3399-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/rockchip-rk3288-flakes.txt + create mode 100644 drivers/gpu/drm/drm_panic_qr.rs + create mode 100644 drivers/gpu/drm/mgag200/mgag200_vga_bmc.c + create mode 100644 drivers/gpu/drm/msm/hdmi/hdmi_phy_8998.c + delete mode 100644 drivers/gpu/drm/nouveau/include/nvif/if0002.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvif/if0003.h + delete mode 100644 drivers/gpu/drm/nouveau/include/nvkm/engine/pm.h + delete mode 100644 drivers/gpu/drm/nouveau/nouveau_usif.c + delete mode 100644 drivers/gpu/drm/nouveau/nouveau_usif.h + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/Kbuild + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/g84.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gf100.h + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gf108.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gf117.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gk104.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gt200.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/gt215.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/nv40.h + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/nv50.c + delete mode 100644 drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h + create mode 100644 drivers/gpu/drm/panel/panel-boe-tv101wum-ll2.c + rename drivers/gpu/drm/renesas/{rcar-du => rz-du}/rzg2l_mipi_dsi.c (100%) + rename drivers/gpu/drm/renesas/{rcar-du => rz-du}/rzg2l_mipi_dsi_regs.h (100%) + create mode 100644 drivers/gpu/drm/xe/display/xe_display_wa.c + delete mode 100644 drivers/gpu/drm/xe/regs/xe_sriov_regs.h + delete mode 100644 drivers/gpu/drm/xe/tests/xe_bo_test.c + delete mode 100644 drivers/gpu/drm/xe/tests/xe_bo_test.h + delete mode 100644 drivers/gpu/drm/xe/tests/xe_dma_buf_test.c + delete mode 100644 drivers/gpu/drm/xe/tests/xe_dma_buf_test.h + delete mode 100644 drivers/gpu/drm/xe/tests/xe_migrate_test.c + delete mode 100644 drivers/gpu/drm/xe/tests/xe_migrate_test.h + delete mode 100644 drivers/gpu/drm/xe/tests/xe_mocs_test.c + delete mode 100644 drivers/gpu/drm/xe/tests/xe_mocs_test.h + create mode 100644 drivers/gpu/drm/xe/xe_gsc_debugfs.c + create mode 100644 drivers/gpu/drm/xe/xe_gsc_debugfs.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_control_types.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_stats.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_stats.h + create mode 100644 drivers/gpu/drm/xe/xe_hw_engine_group.c + create mode 100644 drivers/gpu/drm/xe/xe_hw_engine_group.h + create mode 100644 drivers/gpu/drm/xe/xe_hw_engine_group_types.h +Merging drm-exynos/for-linux-next (94ebc3d3235c drivers:drm:exynos_drm_gsc:Fix wrong assignment in gsc_bind()) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (ba2b9de0c1ac drm/tegra: fix potential uninitialized variable use) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (9d00d05e7579 drm/amd/display: handle nulled pipe context in DCE110's set_drr()) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 47 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 111 ++------ + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 124 +-------- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 23 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 31 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 17 -- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 56 +--- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h | 2 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 32 +-- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 20 +- + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 27 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 17 ++ + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 308 ++++++++++++--------- + drivers/gpu/drm/amd/amdgpu/smuio_v9_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/soc15.c | 10 +- + drivers/gpu/drm/amd/amdgpu/soc24.c | 23 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 15 - + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 86 ++++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 1 + + drivers/gpu/drm/amd/display/dc/basics/dce_calcs.c | 2 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 9 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 6 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 41 ++- + drivers/gpu/drm/amd/display/dc/dc.h | 14 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 12 + + drivers/gpu/drm/amd/display/dc/dc_dsc.h | 4 +- + drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 14 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 3 - + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 3 - + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 9 - + .../drm/amd/display/dc/dml2/display_mode_core.c | 6 +- + .../dc/dml2/dml21/dml21_translation_helper.c | 4 +- + .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 8 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 15 +- + .../drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c | 1 + + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 69 ++++- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 14 + + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 13 + + .../drm/amd/display/dc/link/hwss/link_hwss_dpia.c | 31 ++- + .../gpu/drm/amd/display/dc/link/link_validation.c | 7 + + .../display/dc/link/protocols/link_dp_capability.c | 5 + + .../display/dc/link/protocols/link_dp_training.c | 80 +++++- + .../display/dc/link/protocols/link_dp_training.h | 16 +- + .../dc/link/protocols/link_dp_training_8b_10b.c | 21 +- + .../dc/link/protocols/link_dp_training_dpia.c | 64 +++-- + .../dc/link/protocols/link_dp_training_dpia.h | 19 ++ + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 1 + + .../display/dc/resource/dcn351/dcn351_resource.c | 3 +- + drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 54 +++- + .../drm/amd/display/dc/spl/dc_spl_isharp_filters.c | 85 +++++- + .../drm/amd/display/dc/spl/dc_spl_isharp_filters.h | 9 +- + drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h | 15 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 25 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 1 + + .../drm/amd/display/modules/freesync/freesync.c | 2 +- + drivers/gpu/drm/amd/include/amd_shared.h | 2 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h | 6 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 8 +- + 84 files changed, 1055 insertions(+), 697 deletions(-) +Merging drm-intel/for-linux-next (ec2231b8dd2d drm/i915/dp: Fix AUX IO power enabling for eDP PSR) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel/for-linux-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 13 +++++++++++-- + drivers/gpu/drm/i915/display/intel_psr.c | 32 +++++++++++++++++++++----------- + drivers/gpu/drm/i915/display/intel_psr.h | 2 ++ + 4 files changed, 35 insertions(+), 14 deletions(-) +Merging drm-msm/msm-next (15302579373e drm/msm/dpu: enable writeback on SM6350) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (15302579373e drm/msm/dpu: enable writeback on SM6350) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging drm-xe/drm-xe-next (8a677d5b0a20 drm/xe/display: Remove i915_drv.h include) + 1c129ed07de4 ("drm/xe: fix build warning with CONFIG_PM=n") + 249df8cbecf0 ("drm/xe: fix missing 'xe_vm_put'") + 474f64cb988a ("drm/xe: Fix missing conversion to xe_display_pm_runtime_resume") + 89076b5a8b4e ("drm/xe: prevent potential UAF in pf_provision_vf_ggtt()") + 9db969b36b2f ("drm/xe/xe2hpg: Add Wa_15016589081") + cb85e39dc5d1 ("drm/xe: Suppress missing outer rpm protection warning") + f2710d95724e ("drm/xe: Don't keep stale pointer to bo->ggtt_node") +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel drm-xe/drm-xe-next +Auto-merging drivers/gpu/drm/xe/regs/xe_gt_regs.h +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_drm_client.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_drm_client.c +Auto-merging drivers/gpu/drm/xe/xe_ggtt.c +Auto-merging drivers/gpu/drm/xe/xe_gt.h +Auto-merging drivers/gpu/drm/xe/xe_oa.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_oa.c +Auto-merging drivers/gpu/drm/xe/xe_pm.c +Auto-merging drivers/gpu/drm/xe/xe_wa.c +Resolved 'drivers/gpu/drm/xe/xe_drm_client.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_oa.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a13323c8dfb2] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/xe/Makefile | 1 + + drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 61 +++ + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 36 +- + drivers/gpu/drm/xe/display/xe_display.c | 93 ++++- + drivers/gpu/drm/xe/display/xe_display.h | 12 +- + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 8 + + drivers/gpu/drm/xe/regs/xe_reg_defs.h | 2 +- + drivers/gpu/drm/xe/tests/xe_bo.c | 239 ++++++++++++ + drivers/gpu/drm/xe/tests/xe_mocs.c | 4 +- + drivers/gpu/drm/xe/xe_assert.h | 2 +- + drivers/gpu/drm/xe/xe_bb.c | 3 +- + drivers/gpu/drm/xe/xe_bo.c | 48 ++- + drivers/gpu/drm/xe/xe_bo.h | 6 +- + drivers/gpu/drm/xe/xe_device.c | 83 ++-- + drivers/gpu/drm/xe/xe_device.h | 3 +- + drivers/gpu/drm/xe/xe_device_types.h | 56 ++- + drivers/gpu/drm/xe/xe_drm_client.c | 7 +- + drivers/gpu/drm/xe/xe_execlist.c | 19 +- + drivers/gpu/drm/xe/xe_force_wake.c | 4 +- + drivers/gpu/drm/xe/xe_ggtt.c | 8 +- + drivers/gpu/drm/xe/xe_gsc.c | 23 +- + drivers/gpu/drm/xe/xe_gsc_proxy.c | 4 +- + drivers/gpu/drm/xe/xe_gt.c | 17 +- + drivers/gpu/drm/xe/xe_gt.h | 1 + + drivers/gpu/drm/xe/xe_gt_ccs_mode.c | 2 +- + drivers/gpu/drm/xe/xe_gt_clock.c | 6 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 13 + + drivers/gpu/drm/xe/xe_gt_freq.c | 6 +- + drivers/gpu/drm/xe/xe_gt_idle.c | 130 ++++++- + drivers/gpu/drm/xe/xe_gt_idle.h | 2 + + drivers/gpu/drm/xe/xe_gt_idle_types.h | 2 + + drivers/gpu/drm/xe/xe_gt_mcr.c | 39 +- + drivers/gpu/drm/xe/xe_gt_pagefault.c | 6 + + drivers/gpu/drm/xe/xe_gt_printk.h | 2 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 56 ++- + drivers/gpu/drm/xe/xe_gt_sriov_pf.h | 1 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c | 44 ++- + drivers/gpu/drm/xe/xe_gt_sriov_pf_control_types.h | 2 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 49 +++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.c | 419 +++++++++++++++++++++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.h | 24 ++ + .../gpu/drm/xe/xe_gt_sriov_pf_migration_types.h | 40 ++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 6 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 6 + + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 4 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c | 2 +- + drivers/gpu/drm/xe/xe_gt_sysfs.c | 2 +- + drivers/gpu/drm/xe/xe_gt_throttle.c | 4 +- + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 8 +- + drivers/gpu/drm/xe/xe_gt_topology.c | 8 +- + drivers/gpu/drm/xe/xe_gt_types.h | 22 +- + drivers/gpu/drm/xe/xe_guc.c | 62 +-- + drivers/gpu/drm/xe/xe_guc.h | 6 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 2 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 4 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 34 +- + drivers/gpu/drm/xe/xe_huc.c | 6 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 32 +- + drivers/gpu/drm/xe/xe_hw_engine_types.h | 2 + + drivers/gpu/drm/xe/xe_hwmon.c | 16 +- + drivers/gpu/drm/xe/xe_irq.c | 67 ++-- + drivers/gpu/drm/xe/xe_lmtt.c | 2 +- + drivers/gpu/drm/xe/xe_mmio.c | 139 +++---- + drivers/gpu/drm/xe/xe_mmio.h | 35 +- + drivers/gpu/drm/xe/xe_mocs.c | 16 +- + drivers/gpu/drm/xe/xe_oa.c | 48 +-- + drivers/gpu/drm/xe/xe_pat.c | 21 +- + drivers/gpu/drm/xe/xe_pci.c | 36 +- + drivers/gpu/drm/xe/xe_pcode.c | 4 +- + drivers/gpu/drm/xe/xe_pm.c | 6 +- + drivers/gpu/drm/xe/xe_query.c | 7 +- + drivers/gpu/drm/xe/xe_reg_sr.c | 17 +- + drivers/gpu/drm/xe/xe_rtp.c | 2 +- + drivers/gpu/drm/xe/xe_sa.c | 2 +- + drivers/gpu/drm/xe/xe_sriov.c | 2 +- + drivers/gpu/drm/xe/xe_trace.h | 7 +- + drivers/gpu/drm/xe/xe_trace_bo.h | 2 +- + drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 8 +- + drivers/gpu/drm/xe/xe_uc_fw.c | 17 +- + drivers/gpu/drm/xe/xe_vram.c | 8 +- + drivers/gpu/drm/xe/xe_wa.c | 4 +- + drivers/gpu/drm/xe/xe_wopcm.c | 12 +- + include/drm/intel/xe_pciids.h | 18 +- + 83 files changed, 1793 insertions(+), 496 deletions(-) + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_migration.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_migration_types.h +Merging etnaviv/etnaviv/next (704d3d60fec4 drm/etnaviv: don't block scheduler when GPU is still active) +$ 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 (de5e89b6654e fbdev: omapfb: Fix typo in comment) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging include/linux/fb.h +Merge made by the 'ort' strategy. + drivers/video/fbdev/core/fbmem.c | 30 +++++++++++ + drivers/video/fbdev/efifb.c | 27 +++------- + drivers/video/fbdev/hpfb.c | 1 + + drivers/video/fbdev/hyperv_fb.c | 2 +- + drivers/video/fbdev/imsttfb.c | 4 +- + drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 6 +-- + drivers/video/fbdev/omap/omapfb_main.c | 36 ++++++-------- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 15 +++--- + drivers/video/fbdev/omap2/omapfb/dss/hdmi.h | 2 +- + drivers/video/fbdev/pxa3xx-gcu.c | 4 +- + drivers/video/fbdev/pxafb.c | 1 + + drivers/video/fbdev/xen-fbfront.c | 1 + + include/linux/fb.h | 1 + + include/video/vga.h | 58 ++++++++++++++++------ + 14 files changed, 111 insertions(+), 77 deletions(-) +Merging regmap/for-next (7da49f45bf04 Merge remote-tracking branch 'regmap/for-6.12' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. +Merging sound/for-next (64c0ce555ad2 Merge branch 'for-linus' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging ieee1394/for-next (f1cba5212e25 firewire: core: rename cause flag of tracepoints event) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Merge made by the 'ort' strategy. + Documentation/driver-api/firewire.rst | 2 + + drivers/firewire/core-card.c | 91 +++-- + drivers/firewire/core-cdev.c | 400 +++++++++++---------- + drivers/firewire/core-device.c | 202 +++++------ + drivers/firewire/core-iso.c | 49 ++- + drivers/firewire/core-topology.c | 7 +- + drivers/firewire/core-transaction.c | 151 ++++---- + drivers/firewire/core.h | 28 +- + drivers/firewire/ohci-serdes-test.c | 66 ++++ + drivers/firewire/ohci.c | 574 +++++++++++++++---------------- + drivers/firewire/ohci.h | 200 ++++++++++- + include/linux/firewire.h | 22 ++ + include/trace/events/firewire.h | 4 +- + sound/firewire/amdtp-stream.c | 34 +- + sound/firewire/bebob/bebob_pcm.c | 1 + + sound/firewire/dice/dice-pcm.c | 1 + + sound/firewire/digi00x/digi00x-pcm.c | 1 + + sound/firewire/fireface/ff-pcm.c | 1 + + sound/firewire/fireworks/fireworks_pcm.c | 1 + + sound/firewire/isight.c | 1 + + sound/firewire/motu/motu-pcm.c | 1 + + sound/firewire/oxfw/oxfw-pcm.c | 1 + + sound/firewire/tascam/tascam-pcm.c | 1 + + 23 files changed, 1065 insertions(+), 774 deletions(-) +Merging sound-asoc/for-next (6fcf05c805ff Merge remote-tracking branch 'asoc/for-6.12' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Merge made by the 'ort' strategy. +Merging modules/modules-next (b319cea80539 module: Refine kmemleak scanned areas) +$ 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 MAINTAINERS +Auto-merging scripts/Makefile.modinst +Merge made by the 'ort' strategy. + MAINTAINERS | 3 ++ + kernel/module/Kconfig | 77 +++++++++++++++++++++--------------------- + kernel/module/debug_kmemleak.c | 18 +++------- + kernel/module/sysfs.c | 63 ++++++++++++++++++++++------------ + scripts/Makefile.modinst | 2 ++ + 5 files changed, 90 insertions(+), 73 deletions(-) +Merging input/next (c7c878ff3292 Input: tegra-kbc - use of_property_read_variable_u32_array() and of_property_present()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging MAINTAINERS +Auto-merging drivers/input/keyboard/Kconfig +Auto-merging drivers/input/keyboard/Makefile +Auto-merging drivers/input/misc/wistron_btns.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/adi,adp5588.yaml | 38 +- + .../devicetree/bindings/input/rotary-encoder.txt | 50 - + .../devicetree/bindings/input/rotary-encoder.yaml | 90 + + .../bindings/input/touchscreen/ad7879.txt | 71 - + .../bindings/input/touchscreen/adi,ad7879.yaml | 150 ++ + .../bindings/input/touchscreen/ads7846.txt | 107 - + .../bindings/input/touchscreen/azoteq,iqs7211.yaml | 4 +- + .../bindings/input/touchscreen/colibri-vf50-ts.txt | 34 - + .../bindings/input/touchscreen/edt-ft5x06.yaml | 2 +- + .../bindings/input/touchscreen/goodix.yaml | 2 +- + .../bindings/input/touchscreen/ti,ads7843.yaml | 183 ++ + .../touchscreen/toradex,vf50-touchscreen.yaml | 77 + + .../bindings/input/touchscreen/zinitix,bt400.yaml | 10 + + .../devicetree/bindings/power/wakeup-source.txt | 2 +- + MAINTAINERS | 8 +- + arch/arm/mach-pxa/spitz.c | 163 +- + drivers/input/evdev.c | 7 + + drivers/input/joystick/adc-joystick.c | 16 +- + drivers/input/keyboard/Kconfig | 23 - + drivers/input/keyboard/Makefile | 2 - + drivers/input/keyboard/adc-keys.c | 5 +- + drivers/input/keyboard/adp5588-keys.c | 97 +- + drivers/input/keyboard/atkbd.c | 37 +- + drivers/input/keyboard/gpio_keys.c | 50 +- + drivers/input/keyboard/gpio_keys_polled.c | 4 +- + drivers/input/keyboard/iqs62x-keys.c | 7 +- + drivers/input/keyboard/matrix_keypad.c | 336 ++- + drivers/input/keyboard/mcs_touchkey.c | 268 --- + drivers/input/keyboard/mt6779-keypad.c | 19 +- + drivers/input/keyboard/nomadik-ske-keypad.c | 378 ---- + drivers/input/keyboard/qt1050.c | 15 +- + drivers/input/keyboard/snvs_pwrkey.c | 24 +- + drivers/input/keyboard/spear-keyboard.c | 16 +- + drivers/input/keyboard/tc3589x-keypad.c | 3 +- + drivers/input/keyboard/tegra-kbc.c | 117 +- + drivers/input/matrix-keymap.c | 25 +- + drivers/input/misc/ims-pcu.c | 2 +- + drivers/input/misc/iqs269a.c | 7 +- + drivers/input/misc/nxp-bbnsm-pwrkey.c | 38 + + drivers/input/misc/wistron_btns.c | 4 +- + drivers/input/mouse/Kconfig | 12 + + drivers/input/mouse/Makefile | 1 + + drivers/input/mouse/alps.c | 48 +- + drivers/input/mouse/bcm5974.c | 35 +- + drivers/input/mouse/pixart_ps2.c | 300 +++ + drivers/input/mouse/pixart_ps2.h | 36 + + drivers/input/mouse/psmouse-base.c | 17 + + drivers/input/mouse/psmouse.h | 3 +- + drivers/input/rmi4/rmi_f12.c | 45 +- + drivers/input/serio/ps2-gpio.c | 6 +- + drivers/input/touchscreen/Kconfig | 42 - + drivers/input/touchscreen/Makefile | 6 +- + drivers/input/touchscreen/colibri-vf50-ts.c | 10 +- + drivers/input/touchscreen/cyttsp4_core.c | 2174 -------------------- + drivers/input/touchscreen/cyttsp4_core.h | 448 ---- + drivers/input/touchscreen/cyttsp4_i2c.c | 72 - + drivers/input/touchscreen/cyttsp4_spi.c | 187 -- + drivers/input/touchscreen/cyttsp_core.c | 39 +- + drivers/input/touchscreen/cyttsp_core.h | 5 - + drivers/input/touchscreen/cyttsp_i2c.c | 55 + + drivers/input/touchscreen/cyttsp_i2c_common.c | 86 - + drivers/input/touchscreen/goodix_berlin.h | 1 + + drivers/input/touchscreen/goodix_berlin_core.c | 43 + + drivers/input/touchscreen/goodix_berlin_i2c.c | 1 + + drivers/input/touchscreen/goodix_berlin_spi.c | 1 + + drivers/input/touchscreen/ilitek_ts_i2c.c | 19 +- + drivers/input/touchscreen/mcs5000_ts.c | 288 --- + drivers/input/touchscreen/tsc2004.c | 6 - + drivers/input/touchscreen/tsc2005.c | 6 - + drivers/input/touchscreen/tsc200x-core.c | 249 +-- + drivers/input/touchscreen/tsc200x-core.h | 1 - + drivers/input/touchscreen/usbtouchscreen.c | 956 ++++----- + drivers/input/touchscreen/zforce_ts.c | 474 ++--- + drivers/input/touchscreen/zinitix.c | 134 +- + include/linux/input/matrix_keypad.h | 48 - + include/linux/platform_data/cyttsp4.h | 62 - + include/linux/platform_data/keypad-nomadik-ske.h | 50 - + include/linux/platform_data/mcs.h | 30 - + include/linux/platform_data/zforce_ts.h | 15 - + 79 files changed, 2464 insertions(+), 6038 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/rotary-encoder.txt + create mode 100644 Documentation/devicetree/bindings/input/rotary-encoder.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/ad7879.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/adi,ad7879.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/ads7846.txt + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/colibri-vf50-ts.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/ti,ads7843.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/toradex,vf50-touchscreen.yaml + delete mode 100644 drivers/input/keyboard/mcs_touchkey.c + delete mode 100644 drivers/input/keyboard/nomadik-ske-keypad.c + create mode 100644 drivers/input/mouse/pixart_ps2.c + create mode 100644 drivers/input/mouse/pixart_ps2.h + delete mode 100644 drivers/input/touchscreen/cyttsp4_core.c + delete mode 100644 drivers/input/touchscreen/cyttsp4_core.h + delete mode 100644 drivers/input/touchscreen/cyttsp4_i2c.c + delete mode 100644 drivers/input/touchscreen/cyttsp4_spi.c + delete mode 100644 drivers/input/touchscreen/cyttsp_i2c_common.c + delete mode 100644 drivers/input/touchscreen/mcs5000_ts.c + delete mode 100644 include/linux/platform_data/cyttsp4.h + delete mode 100644 include/linux/platform_data/keypad-nomadik-ske.h + delete mode 100644 include/linux/platform_data/mcs.h + delete mode 100644 include/linux/platform_data/zforce_ts.h +Merging block/for-next (3685ba991cef Merge branch 'for-6.12/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-mq.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging io_uring/sqpoll.c +Merge made by the 'ort' strategy. + block/bdev.c | 4 ++-- + block/bio-integrity.c | 1 - + block/blk-integrity.c | 36 +++++++++++++++++++++++++----------- + block/blk-merge.c | 4 ++++ + block/blk-mq.c | 5 +++-- + block/elevator.c | 4 +++- + drivers/nvme/host/ioctl.c | 6 ++---- + drivers/nvme/host/rdma.c | 6 +++--- + drivers/scsi/scsi_lib.c | 12 +++--------- + include/linux/blk-integrity.h | 15 +++++++++++---- + include/linux/blk-mq.h | 3 --- + include/linux/blk_types.h | 4 +--- + include/uapi/linux/io_uring.h | 6 +++--- + io_uring/fdinfo.c | 3 +-- + io_uring/register.c | 6 +++--- + io_uring/register.h | 2 +- + io_uring/rsrc.c | 23 ++++++++++------------- + io_uring/rsrc.h | 7 +++---- + io_uring/sqpoll.c | 22 ++++++++++++++++------ + 19 files changed, 94 insertions(+), 75 deletions(-) +Merging device-mapper/for-next (c8691cd0fc11 Revert "dm: requeue IO if mapping table not yet available") +$ 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 Documentation/admin-guide/device-mapper/dm-crypt.rst +Auto-merging drivers/md/dm-integrity.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/device-mapper/delay.rst | 43 ++- + .../admin-guide/device-mapper/dm-crypt.rst | 4 + + Documentation/admin-guide/device-mapper/vdo.rst | 7 +- + drivers/md/dm-bufio.c | 3 - + drivers/md/dm-clone-metadata.c | 5 +- + drivers/md/dm-crypt.c | 19 +- + drivers/md/dm-integrity.c | 326 +++++++++++++++++---- + drivers/md/dm-rq.c | 4 +- + drivers/md/dm-thin.c | 2 +- + drivers/md/dm-vdo/dedupe.c | 3 + + drivers/md/dm-vdo/dm-vdo-target.c | 29 +- + drivers/md/dm-vdo/io-submitter.c | 1 - + drivers/md/dm-vdo/message-stats.c | 48 +++ + drivers/md/dm-vdo/message-stats.h | 1 + + drivers/md/dm-vdo/repair.c | 41 +-- + drivers/md/dm-vdo/status-codes.c | 2 +- + drivers/md/dm-vdo/status-codes.h | 2 +- + drivers/md/dm.c | 11 +- + drivers/md/dm.h | 5 - + include/linux/device-mapper.h | 1 - + 20 files changed, 442 insertions(+), 115 deletions(-) +Merging libata/for-next (e5dd410acb34 ata: libata: Clear DID_TIME_OUT for ATA PT commands with sense data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/ata/pata_ep93xx.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/ata/ahci-platform.yaml | 33 +- + .../devicetree/bindings/ata/imx-sata.yaml | 47 ++ + .../devicetree/bindings/ata/qcom-sata.txt | 48 -- + drivers/ata/ahci.c | 2 +- + drivers/ata/ahci_brcm.c | 4 +- + drivers/ata/ahci_imx.c | 402 +++------- + drivers/ata/ata_piix.c | 1 - + drivers/ata/libahci_platform.c | 19 +- + drivers/ata/libata-core.c | 890 ++++++++++----------- + drivers/ata/libata-eh.c | 68 +- + drivers/ata/libata-pmp.c | 3 +- + drivers/ata/libata-sata.c | 137 +++- + drivers/ata/libata-scsi.c | 25 +- + drivers/ata/libata-sff.c | 11 +- + drivers/ata/libata-transport.c | 305 ++++--- + drivers/ata/libata-zpodd.c | 2 +- + drivers/ata/libata.h | 26 +- + drivers/ata/pata_cs5520.c | 6 +- + drivers/ata/pata_ep93xx.c | 2 - + drivers/ata/pata_ftide010.c | 1 + + drivers/ata/pata_hpt366.c | 10 +- + drivers/ata/pata_hpt37x.c | 10 +- + drivers/ata/pata_icside.c | 2 - + drivers/ata/pata_it821x.c | 4 +- + drivers/ata/pata_ixp4xx_cf.c | 1 + + drivers/ata/pata_mpc52xx.c | 1 - + drivers/ata/pata_octeon_cf.c | 1 - + drivers/ata/pata_serverworks.c | 16 +- + drivers/ata/sata_gemini.c | 1 + + drivers/ata/sata_sil.c | 14 +- + drivers/scsi/libsas/sas_ata.c | 1 - + include/linux/libata.h | 155 ++-- + 32 files changed, 1129 insertions(+), 1119 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/ata/qcom-sata.txt +Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) +$ 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 (cd3689b6772f mmc: core: Use dev_err_probe for deferred regulators) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Auto-merging include/linux/mmc/host.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-tee | 15 + + .../bindings/mmc/atmel,sama5d2-sdhci.yaml | 92 ++++ + .../bindings/mmc/nuvoton,ma35d1-sdhci.yaml | 87 ++++ + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 13 +- + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 2 + + .../devicetree/bindings/mmc/sdhci-atmel.txt | 35 -- + .../bindings/mmc/snps,dwcmshc-sdhci.yaml | 95 ++-- + Documentation/driver-api/mmc/index.rst | 1 + + Documentation/driver-api/mmc/mmc-test.rst | 299 +++++++++++++ + MAINTAINERS | 8 + + drivers/misc/Kconfig | 10 + + drivers/misc/Makefile | 1 + + drivers/misc/rpmb-core.c | 231 ++++++++++ + drivers/mmc/core/Kconfig | 1 + + drivers/mmc/core/block.c | 250 ++++++++++- + drivers/mmc/core/mmc.c | 106 ++--- + drivers/mmc/core/mmc_ops.h | 14 + + drivers/mmc/core/regulator.c | 8 +- + drivers/mmc/core/sd.c | 133 +++--- + drivers/mmc/core/sd_ops.c | 3 +- + drivers/mmc/host/Kconfig | 12 + + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/cqhci-core.c | 14 +- + drivers/mmc/host/dw_mmc-rockchip.c | 217 +++++++++- + drivers/mmc/host/mtk-sd.c | 11 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 + + drivers/mmc/host/sdhci-of-dwcmshc.c | 478 ++++++++++++++------- + drivers/mmc/host/sdhci-of-ma35d1.c | 314 ++++++++++++++ + drivers/mmc/host/sdhci-pxav2.c | 2 +- + drivers/mmc/host/sdhci_am654.c | 54 ++- + drivers/mmc/host/tmio_mmc_core.c | 7 +- + drivers/tee/optee/Kconfig | 1 + + drivers/tee/optee/core.c | 96 ++++- + drivers/tee/optee/device.c | 7 + + drivers/tee/optee/ffa_abi.c | 14 + + drivers/tee/optee/optee_ffa.h | 2 + + drivers/tee/optee/optee_private.h | 26 +- + drivers/tee/optee/optee_rpc_cmd.h | 35 ++ + drivers/tee/optee/optee_smc.h | 2 + + drivers/tee/optee/rpc.c | 177 ++++++++ + drivers/tee/optee/smc_abi.c | 14 + + drivers/tee/tee_core.c | 19 +- + include/linux/mmc/core.h | 12 - + include/linux/mmc/host.h | 27 +- + include/linux/rpmb.h | 123 ++++++ + include/linux/tee_core.h | 12 + + 46 files changed, 2633 insertions(+), 449 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-class-tee + create mode 100644 Documentation/devicetree/bindings/mmc/atmel,sama5d2-sdhci.yaml + create mode 100644 Documentation/devicetree/bindings/mmc/nuvoton,ma35d1-sdhci.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/sdhci-atmel.txt + create mode 100644 Documentation/driver-api/mmc/mmc-test.rst + create mode 100644 drivers/misc/rpmb-core.c + create mode 100644 drivers/mmc/host/sdhci-of-ma35d1.c + create mode 100644 include/linux/rpmb.h +Merging mfd/for-mfd-next (d7548a14ed7c mfd: atc260x: Convert a bunch of commas to semicolons) +$ 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 Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/mfd/axp20x.c +CONFLICT (content): Merge conflict in drivers/mfd/axp20x.c +Auto-merging include/linux/mfd/axp20x.h +CONFLICT (content): Merge conflict in include/linux/mfd/axp20x.h +Resolved 'drivers/mfd/axp20x.c' using previous resolution. +Resolved 'include/linux/mfd/axp20x.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b2ea932e4d36] Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mfd/adi,adp5585.yaml | 99 +++++++++ + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + + Documentation/devicetree/bindings/mfd/syscon.yaml | 3 + + .../devicetree/bindings/trivial-devices.yaml | 4 - + MAINTAINERS | 13 +- + drivers/gpio/Kconfig | 7 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-adp5585.c | 229 +++++++++++++++++++++ + drivers/mfd/88pm800.c | 2 +- + drivers/mfd/88pm805.c | 4 +- + drivers/mfd/88pm860x-core.c | 10 +- + drivers/mfd/Kconfig | 12 ++ + drivers/mfd/Makefile | 1 + + drivers/mfd/adp5585.c | 205 ++++++++++++++++++ + drivers/mfd/atc260x-core.c | 4 +- + drivers/mfd/axp20x.c | 25 ++- + drivers/mfd/bd9571mwv.c | 4 +- + drivers/mfd/cros_ec_dev.c | 15 +- + drivers/mfd/da9062-core.c | 12 +- + drivers/mfd/fsl-imx25-tsadc.c | 2 +- + drivers/mfd/gateworks-gsc.c | 2 +- + drivers/mfd/hi655x-pmic.c | 2 +- + drivers/mfd/intel-lpss-pci.c | 39 ++++ + drivers/mfd/intel-m10-bmc-pmci.c | 2 +- + drivers/mfd/intel-m10-bmc-spi.c | 2 +- + drivers/mfd/intel_soc_pmic_bxtwc.c | 14 +- + drivers/mfd/intel_soc_pmic_chtwc.c | 1 - + drivers/mfd/max14577.c | 1 + + drivers/mfd/max77620.c | 5 +- + drivers/mfd/mc13xxx-spi.c | 2 +- + drivers/mfd/mt6360-core.c | 23 +-- + drivers/mfd/qcom-spmi-pmic.c | 5 +- + drivers/mfd/retu-mfd.c | 12 +- + drivers/mfd/rk8xx-core.c | 6 +- + drivers/mfd/rk8xx-i2c.c | 25 +++ + drivers/mfd/rohm-bd71828.c | 8 +- + drivers/mfd/rohm-bd718x7.c | 2 +- + drivers/mfd/rohm-bd9576.c | 6 +- + drivers/mfd/sprd-sc27xx-spi.c | 2 +- + drivers/mfd/syscon.c | 20 +- + drivers/mfd/tc3589x.c | 2 - + drivers/mfd/tps6105x.c | 2 +- + drivers/mfd/tps65086.c | 2 +- + drivers/mfd/tps65090.c | 2 +- + drivers/mfd/tps65218.c | 2 +- + drivers/mfd/tps65219.c | 4 +- + drivers/mfd/tps65910.c | 6 +- + drivers/mfd/tps65912-core.c | 2 +- + drivers/mfd/twl6040.c | 2 +- + drivers/mfd/wcd934x.c | 2 +- + drivers/pwm/Kconfig | 7 + + drivers/pwm/Makefile | 1 + + drivers/pwm/pwm-adp5585.c | 184 +++++++++++++++++ + include/linux/mfd/88pm80x.h | 2 +- + include/linux/mfd/adp5585.h | 126 ++++++++++++ + include/linux/mfd/axp20x.h | 24 +++ + include/linux/mfd/ds1wm.h | 29 --- + 57 files changed, 1087 insertions(+), 144 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/adi,adp5585.yaml + create mode 100644 drivers/gpio/gpio-adp5585.c + create mode 100644 drivers/mfd/adp5585.c + create mode 100644 drivers/pwm/pwm-adp5585.c + create mode 100644 include/linux/mfd/adp5585.h + delete mode 100644 include/linux/mfd/ds1wm.h +Merging backlight/for-backlight-next (fea88a13a5d1 backlight: l4f00242t03: Add check for spi_setup) +$ 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/l4f00242t03.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging battery/for-next (e50a57d16f89 power: supply: hwmon: Fix missing temp1_max_alarm attribute) +$ 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/qcom_battmgr.c +Auto-merging drivers/usb/typec/tcpm/tcpm.c +Auto-merging drivers/usb/typec/tipd/core.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-power | 45 +- + .../bindings/power/supply/sc27xx-fg.yaml | 6 + + .../x-powers,axp20x-battery-power-supply.yaml | 7 + + .../supply/x-powers,axp20x-usb-power-supply.yaml | 72 ++- + drivers/extcon/extcon-intel-cht-wc.c | 15 +- + drivers/phy/ti/phy-tusb1210.c | 11 +- + drivers/power/reset/brcmstb-reboot.c | 59 +- + drivers/power/reset/pwr-mlxbf.c | 16 +- + drivers/power/supply/ab8500_fg.c | 2 +- + drivers/power/supply/axp20x_battery.c | 591 +++++++++++++++++++-- + drivers/power/supply/axp20x_usb_power.c | 368 +++++++++++-- + drivers/power/supply/bq256xx_charger.c | 15 +- + drivers/power/supply/cpcap-charger.c | 2 +- + drivers/power/supply/cros_usbpd-charger.c | 22 +- + drivers/power/supply/lenovo_yoga_c630_battery.c | 7 +- + drivers/power/supply/max17042_battery.c | 5 +- + drivers/power/supply/max1720x_battery.c | 209 +++++++- + drivers/power/supply/max77693_charger.c | 52 ++ + drivers/power/supply/max8998_charger.c | 1 + + drivers/power/supply/mp2629_charger.c | 15 +- + drivers/power/supply/mt6360_charger.c | 13 +- + drivers/power/supply/mt6370-charger.c | 13 +- + drivers/power/supply/power_supply_core.c | 19 +- + drivers/power/supply/power_supply_hwmon.c | 3 +- + drivers/power/supply/power_supply_sysfs.c | 66 +-- + drivers/power/supply/qcom_battmgr.c | 37 +- + drivers/power/supply/qcom_pmi8998_charger.c | 13 +- + drivers/power/supply/rk817_charger.c | 9 +- + drivers/power/supply/rn5t618_power.c | 13 +- + drivers/power/supply/rt9467-charger.c | 16 +- + drivers/power/supply/rt9471.c | 15 +- + drivers/power/supply/twl4030_charger.c | 2 +- + drivers/power/supply/ucs1002_power.c | 26 +- + drivers/usb/typec/anx7411.c | 11 +- + drivers/usb/typec/rt1719.c | 11 +- + drivers/usb/typec/tcpm/tcpm.c | 11 +- + drivers/usb/typec/tipd/core.c | 9 +- + drivers/usb/typec/ucsi/psy.c | 11 +- + include/linux/mfd/max77693-private.h | 5 + + include/linux/power_supply.h | 3 +- + 40 files changed, 1385 insertions(+), 441 deletions(-) +Merging regulator/for-next (88df17649d5a Merge remote-tracking branch 'regulator/for-6.12' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. +Merging security/next (81119f9b5e61 Automated merge of 'dev' into 'next') +$ 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. +Merging apparmor/apparmor-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (fa8a4ce432e8 ima: fix buffer overrun in ima_eventdigest_init_common) +$ 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/ima_template_lib.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) +Merging selinux/next (83f8b733c9b7 Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. +Merging smack/next (2749749afa07 smackfs: Use rcu_assign_pointer() to ensure safe assignment in smk_set_cipso) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_netfilter.c +Merge made by the 'ort' strategy. + security/smack/smack_netfilter.c | 4 ++-- + security/smack/smackfs.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging tomoyo/master (dc1c8034e31b minmax: simplify min()/max()/clamp() implementation) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Already up to date. +Merging tpmdd/next (e1567fe75481 KEYS: prevent NULL pointer dereference in find_asymmetric_key()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + crypto/asymmetric_keys/asymmetric_type.c | 7 ++++--- + drivers/char/tpm/st33zp24/i2c.c | 2 +- + drivers/char/tpm/tpm-dev-common.c | 2 ++ + drivers/char/tpm/tpm2-sessions.c | 1 + + drivers/char/tpm/tpm2-space.c | 3 +++ + drivers/char/tpm/tpm_i2c_atmel.c | 2 +- + drivers/char/tpm/tpm_tis_i2c.c | 2 +- + include/keys/dns_resolver-type.h | 4 ---- + include/linux/key.h | 3 --- + tools/testing/selftests/tpm2/test_smoke.sh | 2 ++ + 11 files changed, 16 insertions(+), 13 deletions(-) +Merging watchdog/master (134d2531ef82 watchdog: Convert comma to semicolon) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Merge made by the 'ort' strategy. + .../bindings/watchdog/cirrus,ep9301-wdt.yaml | 42 ++++ + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 17 +- + .../bindings/watchdog/st,stm32-iwdg.yaml | 6 + + drivers/watchdog/Kconfig | 9 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/iTCO_wdt.c | 4 +- + drivers/watchdog/imx2_wdt.c | 10 +- + drivers/watchdog/imx7ulp_wdt.c | 21 +- + drivers/watchdog/imx_sc_wdt.c | 46 ++-- + drivers/watchdog/marvell_gti_wdt.c | 4 +- + drivers/watchdog/pm8916_wdt.c | 2 +- + drivers/watchdog/rzv2h_wdt.c | 273 +++++++++++++++++++++ + 12 files changed, 388 insertions(+), 47 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/cirrus,ep9301-wdt.yaml + create mode 100644 drivers/watchdog/rzv2h_wdt.c +Merging iommu/next (97162f6093d2 Merge branches 'fixes', 'arm/smmu', 'intel/vt-d', 'amd/amd-vi' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging drivers/iommu/Kconfig +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 17 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 5 + + MAINTAINERS | 1 + + drivers/iommu/Kconfig | 11 + + drivers/iommu/amd/amd_iommu.h | 26 +- + drivers/iommu/amd/amd_iommu_types.h | 35 +- + drivers/iommu/amd/init.c | 16 +- + drivers/iommu/amd/io_pgtable.c | 105 +-- + drivers/iommu/amd/io_pgtable_v2.c | 56 +- + drivers/iommu/amd/iommu.c | 210 +++-- + drivers/iommu/amd/pasid.c | 2 +- + drivers/iommu/arm/arm-smmu-v3/Makefile | 1 + + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c | 83 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 582 +++++++------ + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 137 +++- + drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 909 +++++++++++++++++++++ + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 28 + + drivers/iommu/arm/arm-smmu/arm-smmu.c | 2 +- + drivers/iommu/fsl_pamu_domain.c | 4 +- + drivers/iommu/intel/cache.c | 239 ++++-- + drivers/iommu/intel/dmar.c | 109 +-- + drivers/iommu/intel/iommu.c | 504 +++++------- + drivers/iommu/intel/iommu.h | 128 ++- + drivers/iommu/intel/nested.c | 3 +- + drivers/iommu/intel/pasid.c | 12 +- + drivers/iommu/intel/svm.c | 7 +- + drivers/iommu/io-pgtable-arm.c | 31 +- + drivers/iommu/of_iommu.c | 2 +- + drivers/pci/ats.c | 33 + + include/linux/io-pgtable.h | 4 + + include/linux/pci-ats.h | 3 + + 31 files changed, 2262 insertions(+), 1043 deletions(-) + create mode 100644 drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c +Merging audit/next (8c1867a2f0fd audit: Make use of str_enabled_disabled() helper) +$ 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 (8887042373e2 dt-bindings: cpu: Drop duplicate nvidia,tegra186-ccplex-cluster.yaml) +$ 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/net/bluetooth/qualcomm-bluetooth.yaml +Auto-merging Documentation/devicetree/bindings/power/wakeup-source.txt +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/power/wakeup-source.txt +Auto-merging Documentation/devicetree/bindings/thermal/qcom-tsens.yaml +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/of/platform.c +Auto-merging drivers/of/unittest.c +Resolved 'Documentation/devicetree/bindings/power/wakeup-source.txt' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 169a0c648383] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/arc/archs-pct.txt | 17 -- + .../devicetree/bindings/arc/snps,archs-pct.yaml | 33 +++ + .../bindings/arm/arm,coresight-dummy-source.yaml | 2 +- + .../devicetree/bindings/arm/arm,corstone1000.yaml | 4 +- + .../devicetree/bindings/board/fsl,bcsr.yaml | 32 +++ + .../bindings/board/fsl,fpga-qixis-i2c.yaml | 70 ++++++ + .../devicetree/bindings/board/fsl,fpga-qixis.yaml | 81 +++++++ + .../devicetree/bindings/board/fsl-board.txt | 81 ------- + .../devicetree/bindings/bus/qcom,ebi2.txt | 138 ------------ + .../devicetree/bindings/bus/qcom,ebi2.yaml | 239 +++++++++++++++++++++ + .../devicetree/bindings/clock/idt,versaclock5.yaml | 2 - + .../bindings/clock/mediatek,mt6795-sys-clock.yaml | 54 ----- + .../devicetree/bindings/cpu/idle-states.yaml | 2 +- + .../cpu/nvidia,tegra186-ccplex-cluster.yaml | 37 ---- + .../devicetree/bindings/display/fsl,lcdif.yaml | 20 ++ + .../devicetree/bindings/display/lvds.yaml | 2 +- + .../panel/panel-simple-lvds-dual-ports.yaml | 6 +- + .../bindings/dma/nxp,lpc3220-dmamux.yaml | 49 +++++ + .../devicetree/bindings/dma/ti-dma-crossbar.txt | 2 +- + .../devicetree/bindings/gnss/brcm,bcm4751.yaml | 1 + + .../devicetree/bindings/gnss/gnss-common.yaml | 5 - + .../devicetree/bindings/gnss/mediatek.yaml | 1 + + .../devicetree/bindings/gnss/sirfstar.yaml | 1 + + .../devicetree/bindings/gnss/u-blox,neo-6m.yaml | 1 + + .../devicetree/bindings/iio/accel/lis302.txt | 2 +- + .../devicetree/bindings/incomplete-devices.yaml | 148 +++++++++++++ + .../devicetree/bindings/input/qcom,pm8xxx-vib.yaml | 1 + + .../bindings/interrupt-controller/arm,gic-v3.yaml | 2 +- + .../interrupt-controller/aspeed,ast2400-vic.txt | 23 -- + .../interrupt-controller/aspeed,ast2400-vic.yaml | 62 ++++++ + .../interrupt-controller/fsl,irqsteer.yaml | 2 + + .../bindings/interrupt-controller/qcom,pdc.yaml | 1 + + .../devicetree/bindings/leds/awinic,aw200xx.yaml | 2 +- + .../bindings/mailbox/brcm,iproc-flexrm-mbox.txt | 2 +- + .../bindings/media/i2c/thine,thp7312.yaml | 2 +- + .../bindings/media/samsung,exynos4210-fimc.yaml | 2 +- + .../devicetree/bindings/mfd/rohm,bd96801-pmic.yaml | 2 +- + .../devicetree/bindings/mfd/samsung,s2mps11.yaml | 2 +- + Documentation/devicetree/bindings/mfd/twl6040.txt | 2 +- + .../bindings/misc/aspeed,ast2400-cvic.yaml | 60 ++++++ + .../devicetree/bindings/misc/aspeed,cvic.txt | 35 --- + .../brcm,bluetooth.yaml} | 33 ++- + .../marvell,88w8897.yaml} | 6 +- + .../mediatek,bluetooth.txt} | 0 + .../nokia,h4p-bluetooth.txt} | 0 + .../bindings/net/bluetooth/qualcomm-bluetooth.yaml | 6 +- + .../realtek,bluetooth.yaml} | 5 +- + .../bindings/net/{ => bluetooth}/ti,bluetooth.yaml | 5 +- + .../devicetree/bindings/net/fsl,cpm-enet.yaml | 59 +++++ + .../devicetree/bindings/net/fsl,cpm-mdio.yaml | 55 +++++ + .../devicetree/bindings/net/maxim,ds26522.txt | 13 -- + .../devicetree/bindings/net/maxim,ds26522.yaml | 40 ++++ + .../devicetree/bindings/phy/apm-xgene-phy.txt | 2 +- + .../bindings/phy/mediatek,mt7988-xfi-tphy.yaml | 2 +- + .../devicetree/bindings/phy/mediatek,tphy.yaml | 2 +- + .../bindings/phy/qcom,snps-eusb2-repeater.yaml | 2 +- + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 4 +- + .../devicetree/bindings/power/wakeup-source.txt | 2 +- + .../devicetree/bindings/remoteproc/mtk,scp.yaml | 2 +- + .../devicetree/bindings/rtc/fsl,ls-ftm-alarm.yaml | 2 +- + .../bindings/serial/nvidia,tegra20-hsuart.yaml | 2 +- + .../bindings/serial/serial-peripheral-props.yaml | 41 ++++ + .../devicetree/bindings/serial/serial.yaml | 24 +-- + .../bindings/soc/fsl/cpm_qe/fsl,ucc-hdlc.yaml | 140 ++++++++++++ + .../devicetree/bindings/soc/fsl/cpm_qe/network.txt | 130 ----------- + .../bindings/soc/fsl/fsl,layerscape-scfg.yaml | 3 + + .../devicetree/bindings/soc/fsl/fsl,rcpm.yaml | 87 ++++++++ + Documentation/devicetree/bindings/soc/fsl/rcpm.txt | 69 ------ + .../devicetree/bindings/sound/everest,es8326.yaml | 2 +- + .../devicetree/bindings/sound/serial-midi.yaml | 3 + + .../devicetree/bindings/sound/st,sta350.txt | 2 +- + .../devicetree/bindings/thermal/qcom-tsens.yaml | 2 +- + .../devicetree/bindings/timer/fsl,ftm-timer.txt | 31 --- + .../devicetree/bindings/timer/fsl,ftm-timer.yaml | 59 +++++ + .../bindings/timer/nxp,lpc3220-timer.txt | 26 --- + .../bindings/timer/nxp,lpc3220-timer.yaml | 55 +++++ + .../devicetree/bindings/timer/ti,da830-timer.yaml | 68 ++++++ + .../devicetree/bindings/timer/ti,davinci-timer.txt | 37 ---- + .../devicetree/bindings/trivial-devices.yaml | 20 +- + .../devicetree/bindings/watchdog/davinci-wdt.txt | 24 --- + .../devicetree/bindings/watchdog/lpc18xx-wdt.txt | 19 -- + .../bindings/watchdog/nxp,lpc1850-wwdt.yaml | 52 +++++ + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 1 + + .../bindings/watchdog/ti,davinci-wdt.yaml | 55 +++++ + .../devicetree/bindings/watchdog/zii,rave-wdt.yaml | 49 +++++ + .../devicetree/bindings/watchdog/ziirave-wdt.txt | 19 -- + MAINTAINERS | 11 +- + drivers/of/address.c | 40 ++-- + drivers/of/irq.c | 43 +--- + drivers/of/overlay.c | 12 +- + drivers/of/platform.c | 14 +- + drivers/of/property.c | 41 ++-- + drivers/of/resolver.c | 12 +- + drivers/of/unittest.c | 4 +- + include/dt-bindings/interrupt-controller/arm-gic.h | 2 + + scripts/dtc/checks.c | 16 +- + scripts/dtc/dt-extract-compatibles | 13 ++ + scripts/dtc/fdtoverlay.c | 2 +- + scripts/dtc/version_gen.h | 2 +- + .../testing/selftests/dt/test_unprobed_devices.sh | 15 +- + 100 files changed, 1754 insertions(+), 963 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arc/archs-pct.txt + create mode 100644 Documentation/devicetree/bindings/arc/snps,archs-pct.yaml + create mode 100644 Documentation/devicetree/bindings/board/fsl,bcsr.yaml + create mode 100644 Documentation/devicetree/bindings/board/fsl,fpga-qixis-i2c.yaml + create mode 100644 Documentation/devicetree/bindings/board/fsl,fpga-qixis.yaml + delete mode 100644 Documentation/devicetree/bindings/board/fsl-board.txt + delete mode 100644 Documentation/devicetree/bindings/bus/qcom,ebi2.txt + create mode 100644 Documentation/devicetree/bindings/bus/qcom,ebi2.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/mediatek,mt6795-sys-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/cpu/nvidia,tegra186-ccplex-cluster.yaml + create mode 100644 Documentation/devicetree/bindings/dma/nxp,lpc3220-dmamux.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-vic.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/aspeed,ast2400-vic.yaml + create mode 100644 Documentation/devicetree/bindings/misc/aspeed,ast2400-cvic.yaml + delete mode 100644 Documentation/devicetree/bindings/misc/aspeed,cvic.txt + rename Documentation/devicetree/bindings/net/{broadcom-bluetooth.yaml => bluetooth/brcm,bluetooth.yaml} (90%) + rename Documentation/devicetree/bindings/net/{marvell-bluetooth.yaml => bluetooth/marvell,88w8897.yaml} (83%) + rename Documentation/devicetree/bindings/net/{mediatek-bluetooth.txt => bluetooth/mediatek,bluetooth.txt} (100%) + rename Documentation/devicetree/bindings/net/{nokia-bluetooth.txt => bluetooth/nokia,h4p-bluetooth.txt} (100%) + rename Documentation/devicetree/bindings/net/{realtek-bluetooth.yaml => bluetooth/realtek,bluetooth.yaml} (92%) + rename Documentation/devicetree/bindings/net/{ => bluetooth}/ti,bluetooth.yaml (94%) + create mode 100644 Documentation/devicetree/bindings/net/fsl,cpm-enet.yaml + create mode 100644 Documentation/devicetree/bindings/net/fsl,cpm-mdio.yaml + delete mode 100644 Documentation/devicetree/bindings/net/maxim,ds26522.txt + create mode 100644 Documentation/devicetree/bindings/net/maxim,ds26522.yaml + create mode 100644 Documentation/devicetree/bindings/serial/serial-peripheral-props.yaml + create mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/fsl,ucc-hdlc.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/fsl/cpm_qe/network.txt + create mode 100644 Documentation/devicetree/bindings/soc/fsl/fsl,rcpm.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/fsl/rcpm.txt + delete mode 100644 Documentation/devicetree/bindings/timer/fsl,ftm-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/fsl,ftm-timer.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/nxp,lpc3220-timer.txt + create mode 100644 Documentation/devicetree/bindings/timer/nxp,lpc3220-timer.yaml + create mode 100644 Documentation/devicetree/bindings/timer/ti,da830-timer.yaml + delete mode 100644 Documentation/devicetree/bindings/timer/ti,davinci-timer.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/davinci-wdt.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/lpc18xx-wdt.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/nxp,lpc1850-wwdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/ti,davinci-wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/zii,rave-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/ziirave-wdt.txt +Merging dt-krzk/for-next (08fd3b6e0df4 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. +Merging mailbox/for-next (a8bd68e4329f mailbox: mtk-cmdq: Move devm_mbox_controller_register() after devm_pm_runtime_enable()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Already up to date. +Merging spi/for-next (58be528df758 Merge remote-tracking branch 'spi/for-6.12' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. +Merging tip/master (154470612df5 Merge branch into tip/master: 'x86/timers') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/arm64/Kconfig +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging drivers/iommu/intel/iommu.h +Auto-merging include/linux/cleanup.h +Auto-merging kernel/events/core.c +Auto-merging kernel/events/uprobes.c +Auto-merging kernel/fork.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sys.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging mm/page-writeback.c +Auto-merging mm/page_alloc.c +Auto-merging tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c +Resolved 'arch/arm64/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 09cb90624d97] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/arch/x86/buslock.rst | 3 +- + Documentation/core-api/cleanup.rst | 8 + + Documentation/core-api/index.rst | 1 + + Documentation/scheduler/sched-deadline.rst | 14 +- + arch/arm64/Kconfig | 1 + + arch/riscv/Kconfig | 1 + + arch/x86/Kconfig | 9 + + arch/x86/events/core.c | 63 ++ + arch/x86/events/intel/bts.c | 3 - + arch/x86/events/intel/core.c | 8 +- + arch/x86/events/intel/cstate.c | 142 +--- + arch/x86/events/intel/pt.c | 29 +- + arch/x86/events/intel/uncore.c | 9 + + arch/x86/events/intel/uncore.h | 2 + + arch/x86/events/intel/uncore_snb.c | 185 ++++- + arch/x86/events/rapl.c | 47 +- + arch/x86/include/asm/atomic64_32.h | 6 +- + arch/x86/include/asm/cpu.h | 11 +- + arch/x86/kernel/cpu/Makefile | 2 + + arch/x86/kernel/cpu/bus_lock.c | 406 +++++++++++ + arch/x86/kernel/cpu/common.c | 2 + + arch/x86/kernel/cpu/intel.c | 407 ----------- + arch/x86/lib/atomic64_cx8_32.S | 9 +- + drivers/cpufreq/cppc_cpufreq.c | 6 +- + drivers/dma/idxd/idxd.h | 7 - + drivers/dma/idxd/init.c | 3 - + drivers/dma/idxd/perfmon.c | 98 +-- + drivers/iommu/intel/iommu.h | 2 - + drivers/iommu/intel/perfmon.c | 111 +-- + fs/bcachefs/six.c | 2 +- + fs/proc/base.c | 2 +- + include/linux/cleanup.h | 136 ++++ + include/linux/cpuhotplug.h | 2 - + include/linux/ioprio.h | 2 +- + include/linux/perf_event.h | 32 +- + include/linux/rbtree.h | 67 ++ + include/linux/sched.h | 30 +- + include/linux/sched/deadline.h | 14 +- + include/linux/sched/prio.h | 1 + + include/linux/sched/rt.h | 33 +- + include/linux/uprobes.h | 48 +- + include/uapi/linux/sched/types.h | 6 +- + kernel/events/core.c | 586 +++++++++++----- + kernel/events/uprobes.c | 505 ++++++++------ + kernel/fork.c | 2 +- + kernel/freezer.c | 2 +- + kernel/jump_label.c | 34 +- + kernel/locking/lockdep.c | 55 +- + kernel/locking/lockdep_proc.c | 2 +- + kernel/locking/rtmutex.c | 4 +- + kernel/locking/rwsem.c | 26 +- + kernel/locking/ww_mutex.h | 2 +- + kernel/sched/core.c | 248 ++++--- + kernel/sched/cpufreq_schedutil.c | 6 +- + kernel/sched/deadline.c | 503 +++++++++++--- + kernel/sched/debug.c | 198 +++++- + kernel/sched/fair.c | 770 ++++++++++++++++----- + kernel/sched/features.h | 30 +- + kernel/sched/idle.c | 23 +- + kernel/sched/rt.c | 261 +++---- + kernel/sched/sched.h | 101 ++- + kernel/sched/stop_task.c | 18 +- + kernel/sched/syscalls.c | 134 +--- + kernel/sched/topology.c | 8 + + kernel/static_call_inline.c | 13 +- + kernel/sys.c | 2 +- + kernel/time/hrtimer.c | 2 +- + kernel/trace/bpf_trace.c | 38 +- + kernel/trace/trace_sched_wakeup.c | 2 +- + kernel/trace/trace_uprobe.c | 44 +- + mm/page-writeback.c | 4 +- + mm/page_alloc.c | 2 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 27 +- + 73 files changed, 3555 insertions(+), 2067 deletions(-) + create mode 100644 Documentation/core-api/cleanup.rst + create mode 100644 arch/x86/kernel/cpu/bus_lock.c +Merging clockevents/timers/drivers/next (d7a87891e2f5 platform/x86:intel/pmc: fix build regression with pmtimer turned off) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging MAINTAINERS +Auto-merging kernel/time/hrtimer.c +Auto-merging kernel/time/timer.c +Auto-merging mm/damon/core.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + drivers/platform/x86/intel/pmc/core.c | 6 +- + include/linux/acpi_pmtmr.h | 13 +- + include/linux/delay.h | 2 +- + kernel/time/Makefile | 2 +- + kernel/time/hrtimer.c | 120 ------------- + kernel/time/sleep_timeout.c | 320 ++++++++++++++++++++++++++++++++++ + kernel/time/timer.c | 192 -------------------- + mm/damon/core.c | 2 +- + 9 files changed, 330 insertions(+), 329 deletions(-) + create mode 100644 kernel/time/sleep_timeout.c +Merging edac/edac-for-next (61124f42dcaa Merge ras/edac-drivers into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. +Merging ftrace/for-next (2a07e30c19f3 Merge ring-buffer/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/admin-guide/kernel-parameters.txt +Auto-merging kernel/trace/trace.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 22 + + include/linux/ring_buffer.h | 20 + + kernel/trace/ring_buffer.c | 884 +++++++++++++++++++++--- + kernel/trace/trace.c | 251 ++++++- + kernel/trace/trace.h | 10 +- + kernel/trace/trace_functions_graph.c | 23 +- + kernel/trace/trace_output.c | 12 +- + 7 files changed, 1098 insertions(+), 124 deletions(-) +Merging rcu/next (355debb83bf7 Merge branches 'context_tracking.15.08.24a', 'csd.lock.15.08.24a', 'nocb.09.09.24a', 'rcutorture.14.08.24a', 'rcustall.09.09.24a', 'srcu.12.08.24a', 'rcu.tasks.14.08.24a', 'rcu_scaling_tests.15.08.24a', 'fixes.12.08.24a' and 'misc.11.08.24a' into next.09.09.24a) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/Kconfig +Auto-merging include/linux/context_tracking.h +CONFLICT (content): Merge conflict in include/linux/context_tracking.h +Auto-merging include/linux/smp.h +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/rcu/tree_exp.h +Auto-merging kernel/rcu/tree_stall.h +Auto-merging kernel/sched/core.c +Auto-merging kernel/trace/trace_osnoise.c +Auto-merging lib/Kconfig.debug +Resolved 'include/linux/context_tracking.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d102cd2e5532] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git +$ git diff -M --stat --summary HEAD^.. + .../RCU/Design/Data-Structures/Data-Structures.rst | 28 +- + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 8 +- + .../RCU/Design/Memory-Ordering/TreeRCU-dyntick.svg | 8 +- + .../RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg | 8 +- + .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 8 +- + .../RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg | 4 +- + .../RCU/Design/Requirements/Requirements.rst | 3 +- + Documentation/RCU/checklist.rst | 61 ++--- + Documentation/RCU/whatisRCU.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 20 +- + arch/Kconfig | 2 +- + arch/arm64/kernel/entry-common.c | 2 +- + arch/powerpc/include/asm/interrupt.h | 6 +- + arch/powerpc/kernel/interrupt.c | 6 +- + arch/powerpc/kernel/syscall.c | 2 +- + arch/x86/entry/common.c | 2 +- + include/linux/context_tracking.h | 32 ++- + include/linux/context_tracking_state.h | 60 ++--- + include/linux/entry-common.h | 2 +- + include/linux/rcu_segcblist.h | 6 +- + include/linux/rculist.h | 9 +- + include/linux/rcupdate.h | 15 +- + include/linux/rcutiny.h | 2 +- + include/linux/rcutree.h | 2 +- + include/linux/smp.h | 6 + + include/linux/srcutree.h | 15 +- + include/trace/events/rcu.h | 20 +- + kernel/context_tracking.c | 140 +++++----- + kernel/entry/common.c | 2 +- + kernel/rcu/rcu.h | 12 +- + kernel/rcu/rcu_segcblist.c | 11 - + kernel/rcu/rcu_segcblist.h | 11 +- + kernel/rcu/rcuscale.c | 214 ++++++++++++++-- + kernel/rcu/rcutorture.c | 121 ++++++--- + kernel/rcu/refscale.c | 67 ++--- + kernel/rcu/srcutree.c | 11 +- + kernel/rcu/tasks.h | 214 ++++++++++------ + kernel/rcu/tree.c | 174 ++++++------- + kernel/rcu/tree.h | 10 +- + kernel/rcu/tree_exp.h | 121 +++++---- + kernel/rcu/tree_nocb.h | 281 ++++++++------------- + kernel/rcu/tree_plugin.h | 11 +- + kernel/rcu/tree_stall.h | 16 +- + kernel/sched/core.c | 6 +- + kernel/smp.c | 38 ++- + kernel/stop_machine.c | 2 +- + kernel/trace/trace_osnoise.c | 4 +- + lib/Kconfig.debug | 1 + + tools/rcu/rcu-updaters.sh | 2 - + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 2 + + tools/testing/selftests/rcutorture/bin/torture.sh | 38 ++- + .../selftests/rcutorture/configs/rcu/CFcommon | 2 - + .../selftests/rcutorture/configs/rcu/CFcommon.i686 | 2 + + .../rcutorture/configs/rcu/CFcommon.ppc64le | 1 + + .../rcutorture/configs/rcu/CFcommon.x86_64 | 2 + + .../selftests/rcutorture/configs/rcu/TREE07.boot | 1 + + .../selftests/rcutorture/configs/refscale/TINY | 20 ++ + 57 files changed, 1089 insertions(+), 787 deletions(-) + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/CFcommon.i686 + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/CFcommon.ppc64le + create mode 100644 tools/testing/selftests/rcutorture/configs/rcu/CFcommon.x86_64 + create mode 100644 tools/testing/selftests/rcutorture/configs/refscale/TINY +Merging paulmck/non-rcu/next (3b27dde7b75d Merge branches 'cmpxchg.2024.09.13a', 'lkmm.2024.09.14a', 'kcsan.2024.08.01a' and 'misc.2024.08.02a' into HEAD) +$ git merge -m Merge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Auto-merging MAINTAINERS +Auto-merging kernel/exit.c +Merge made by the 'ort' strategy. + Documentation/memory-barriers.txt | 3 - + MAINTAINERS | 1 + + kernel/exit.c | 2 +- + kernel/kcsan/debugfs.c | 2 +- + tools/memory-model/Documentation/README | 24 ++++- + .../Documentation/herd-representation.txt | 110 +++++++++++++++++++++ + tools/memory-model/Documentation/simple.txt | 2 +- + tools/memory-model/linux-kernel.def | 27 +++++ + 8 files changed, 164 insertions(+), 7 deletions(-) + create mode 100644 tools/memory-model/Documentation/herd-representation.txt +Merging kvm/next (0cdcc99eeaed Merge tag 'kvm-riscv-6.12-1' of https://github.com/kvm-riscv/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (17a000564499 Merge branch kvm-arm64/visibility-cleanups 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 (f9b56b2c31e5 s390: Enable KVM_S390_UCONTROL config in debug_defconfig) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging tools/testing/selftests/kvm/Makefile +Merge made by the 'ort' strategy. + arch/s390/configs/debug_defconfig | 1 + + arch/s390/kvm/kvm-s390.c | 27 +- + tools/testing/selftests/kvm/.gitignore | 1 + + tools/testing/selftests/kvm/Makefile | 1 + + .../selftests/kvm/include/s390x/debug_print.h | 69 +++++ + .../selftests/kvm/include/s390x/processor.h | 5 + + tools/testing/selftests/kvm/include/s390x/sie.h | 240 +++++++++++++++ + tools/testing/selftests/kvm/lib/s390x/processor.c | 10 +- + tools/testing/selftests/kvm/s390x/cmma_test.c | 7 +- + tools/testing/selftests/kvm/s390x/config | 2 + + tools/testing/selftests/kvm/s390x/debug_test.c | 4 +- + tools/testing/selftests/kvm/s390x/memop.c | 4 +- + tools/testing/selftests/kvm/s390x/tprot.c | 5 +- + tools/testing/selftests/kvm/s390x/ucontrol_test.c | 332 +++++++++++++++++++++ + 14 files changed, 683 insertions(+), 25 deletions(-) + create mode 100644 tools/testing/selftests/kvm/include/s390x/debug_print.h + create mode 100644 tools/testing/selftests/kvm/include/s390x/sie.h + create mode 100644 tools/testing/selftests/kvm/s390x/config + create mode 100644 tools/testing/selftests/kvm/s390x/ucontrol_test.c +Merging kvm-ppc/topic/ppc-kvm (46765aaec4d7 KVM: PPC: Book3S HV: remove unused varible) +$ git merge -m Merge branch 'topic/ppc-kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (5aa09297a3dc RISC-V: KVM: Fix to allow hpmcounter31 from the guest) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Already up to date. +Merging kvm-x86/next (3cc25d5adcfd Merge branches 'fixes', 'generic', 'misc', 'mmu', 'pat_vmx_msrs', 'selftests', 'svm' and 'vmx') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging arch/x86/mm/pat/memtype.c +Auto-merging tools/testing/selftests/kvm/.gitignore +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/.gitignore +Auto-merging tools/testing/selftests/kvm/Makefile +Auto-merging virt/kvm/kvm_main.c +Resolved 'tools/testing/selftests/kvm/.gitignore' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9df534af3ef9] Merge branch 'next' of https://github.com/kvm-x86/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 23 +- + arch/x86/include/asm/cpuid.h | 1 + + arch/x86/include/asm/kvm-x86-ops.h | 2 +- + arch/x86/include/asm/kvm_host.h | 22 +- + arch/x86/include/asm/msr-index.h | 34 +- + arch/x86/include/asm/svm.h | 20 +- + arch/x86/include/asm/vmx.h | 40 +- + arch/x86/kernel/cpu/mtrr/mtrr.c | 6 + + arch/x86/kvm/cpuid.c | 30 +- + arch/x86/kvm/irq.c | 10 +- + arch/x86/kvm/lapic.c | 84 +- + arch/x86/kvm/lapic.h | 3 +- + arch/x86/kvm/mmu.h | 2 - + arch/x86/kvm/mmu/mmu.c | 524 ++++++----- + arch/x86/kvm/mmu/mmu_internal.h | 5 +- + arch/x86/kvm/mmu/mmutrace.h | 1 + + arch/x86/kvm/mmu/paging_tmpl.h | 63 +- + arch/x86/kvm/mmu/tdp_mmu.c | 6 +- + arch/x86/kvm/reverse_cpuid.h | 8 + + arch/x86/kvm/smm.c | 24 +- + arch/x86/kvm/svm/nested.c | 4 +- + arch/x86/kvm/svm/svm.c | 68 +- + arch/x86/kvm/svm/svm.h | 18 +- + arch/x86/kvm/svm/vmenter.S | 8 +- + arch/x86/kvm/vmx/capabilities.h | 10 +- + arch/x86/kvm/vmx/main.c | 4 +- + arch/x86/kvm/vmx/nested.c | 134 ++- + arch/x86/kvm/vmx/nested.h | 8 +- + arch/x86/kvm/vmx/sgx.c | 2 +- + arch/x86/kvm/vmx/vmx.c | 57 +- + arch/x86/kvm/vmx/vmx.h | 9 +- + arch/x86/kvm/vmx/vmx_onhyperv.h | 8 + + arch/x86/kvm/vmx/vmx_ops.h | 2 +- + arch/x86/kvm/vmx/x86_ops.h | 2 +- + arch/x86/kvm/x86.c | 980 ++++++++++----------- + arch/x86/kvm/x86.h | 31 +- + arch/x86/mm/pat/memtype.c | 36 +- + tools/testing/selftests/kvm/.gitignore | 3 + + tools/testing/selftests/kvm/Makefile | 3 + + tools/testing/selftests/kvm/coalesced_io_test.c | 236 +++++ + tools/testing/selftests/kvm/guest_print_test.c | 19 +- + tools/testing/selftests/kvm/include/kvm_util.h | 28 +- + tools/testing/selftests/kvm/include/x86_64/apic.h | 23 +- + .../testing/selftests/kvm/include/x86_64/hyperv.h | 18 + + .../selftests/kvm/include/x86_64/processor.h | 7 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 85 +- + tools/testing/selftests/kvm/lib/x86_64/hyperv.c | 67 ++ + tools/testing/selftests/kvm/lib/x86_64/processor.c | 69 +- + tools/testing/selftests/kvm/x86_64/debug_regs.c | 11 +- + tools/testing/selftests/kvm/x86_64/hyperv_evmcs.c | 2 +- + .../testing/selftests/kvm/x86_64/hyperv_svm_test.c | 2 +- + .../testing/selftests/kvm/x86_64/sev_smoke_test.c | 32 + + .../selftests/kvm/x86_64/xapic_state_test.c | 54 +- + .../testing/selftests/kvm/x86_64/xen_vmcall_test.c | 1 + + virt/kvm/coalesced_mmio.c | 31 +- + virt/kvm/kvm_main.c | 11 +- + 56 files changed, 1775 insertions(+), 1216 deletions(-) + create mode 100644 tools/testing/selftests/kvm/coalesced_io_test.c +Merging xen-tip/linux-next (c3dea3d54f4d xen/swiotlb: fix allocated size) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging arch/x86/include/asm/cpuid.h +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/xen/mmu_pv.c +Merge made by the 'ort' strategy. + arch/x86/include/asm/acpi.h | 8 ++ + arch/x86/include/asm/cpuid.h | 7 +- + arch/x86/kernel/acpi/boot.c | 11 ++ + arch/x86/kernel/jailhouse.c | 1 + + arch/x86/kernel/mmconf-fam10h_64.c | 1 + + arch/x86/kernel/smpboot.c | 1 + + arch/x86/kernel/x86_init.c | 1 + + arch/x86/platform/pvh/Makefile | 1 + + arch/x86/platform/pvh/enlighten.c | 6 +- + arch/x86/xen/mmu_pv.c | 5 +- + arch/x86/xen/p2m.c | 98 ++++++++++++++++++ + arch/x86/xen/setup.c | 202 ++++++++++++++++++++++++++++--------- + arch/x86/xen/xen-ops.h | 6 +- + drivers/xen/pci.c | 14 +-- + drivers/xen/swiotlb-xen.c | 10 +- + drivers/xen/xenbus/xenbus_xs.c | 6 +- + 16 files changed, 312 insertions(+), 66 deletions(-) +Merging percpu/for-next (79125d57644c Merge branch 'for-6.12' 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 +Auto-merging mm/percpu.c +Merge made by the 'ort' strategy. + mm/percpu.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) +Merging workqueues/for-next (90c6d73ac19d Merge branch 'for-6.11-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 7 ++ + include/linux/workqueue.h | 41 +++++++++ + kernel/workqueue.c | 107 ++++++++++++++++++------ + 3 files changed, 130 insertions(+), 25 deletions(-) +Merging sched-ext/for-next (902d67a2d40f sched: Move update_other_load_avgs() to kernel/sched/pelt.c) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Auto-merging Documentation/scheduler/index.rst +Auto-merging MAINTAINERS +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Auto-merging init/init_task.c +Auto-merging kernel/fork.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/syscalls.c +Merge made by the 'ort' strategy. + Documentation/scheduler/index.rst | 1 + + Documentation/scheduler/sched-ext.rst | 316 + + MAINTAINERS | 13 + + drivers/tty/sysrq.c | 1 + + include/asm-generic/vmlinux.lds.h | 1 + + include/linux/cgroup.h | 4 +- + include/linux/sched.h | 5 + + include/linux/sched/ext.h | 215 + + include/linux/sched/task.h | 8 +- + include/trace/events/sched_ext.h | 32 + + include/uapi/linux/sched.h | 1 + + init/Kconfig | 10 + + init/init_task.c | 12 + + kernel/Kconfig.preempt | 25 + + kernel/fork.c | 17 +- + kernel/sched/build_policy.c | 11 + + kernel/sched/core.c | 281 +- + kernel/sched/cpufreq_schedutil.c | 50 +- + kernel/sched/debug.c | 3 + + kernel/sched/ext.c | 7173 ++++++++++++++++++++ + kernel/sched/ext.h | 91 + + kernel/sched/fair.c | 23 +- + kernel/sched/idle.c | 2 + + kernel/sched/pelt.c | 20 + + kernel/sched/pelt.h | 1 + + kernel/sched/sched.h | 190 +- + kernel/sched/syscalls.c | 7 + + lib/dump_stack.c | 1 + + tools/Makefile | 10 +- + tools/sched_ext/.gitignore | 2 + + tools/sched_ext/Makefile | 246 + + tools/sched_ext/README.md | 270 + + tools/sched_ext/include/bpf-compat/gnu/stubs.h | 11 + + tools/sched_ext/include/scx/common.bpf.h | 412 ++ + tools/sched_ext/include/scx/common.h | 75 + + tools/sched_ext/include/scx/compat.bpf.h | 28 + + tools/sched_ext/include/scx/compat.h | 186 + + tools/sched_ext/include/scx/user_exit_info.h | 111 + + tools/sched_ext/scx_central.bpf.c | 361 + + tools/sched_ext/scx_central.c | 135 + + tools/sched_ext/scx_flatcg.bpf.c | 949 +++ + tools/sched_ext/scx_flatcg.c | 233 + + tools/sched_ext/scx_flatcg.h | 51 + + tools/sched_ext/scx_qmap.bpf.c | 827 +++ + tools/sched_ext/scx_qmap.c | 153 + + tools/sched_ext/scx_show_state.py | 39 + + tools/sched_ext/scx_simple.bpf.c | 156 + + tools/sched_ext/scx_simple.c | 107 + + tools/testing/selftests/sched_ext/.gitignore | 6 + + tools/testing/selftests/sched_ext/Makefile | 218 + + tools/testing/selftests/sched_ext/config | 9 + + tools/testing/selftests/sched_ext/create_dsq.bpf.c | 58 + + tools/testing/selftests/sched_ext/create_dsq.c | 57 + + .../selftests/sched_ext/ddsp_bogus_dsq_fail.bpf.c | 42 + + .../selftests/sched_ext/ddsp_bogus_dsq_fail.c | 57 + + .../selftests/sched_ext/ddsp_vtimelocal_fail.bpf.c | 39 + + .../selftests/sched_ext/ddsp_vtimelocal_fail.c | 56 + + .../testing/selftests/sched_ext/dsp_local_on.bpf.c | 65 + + tools/testing/selftests/sched_ext/dsp_local_on.c | 58 + + .../sched_ext/enq_last_no_enq_fails.bpf.c | 21 + + .../selftests/sched_ext/enq_last_no_enq_fails.c | 60 + + .../selftests/sched_ext/enq_select_cpu_fails.bpf.c | 43 + + .../selftests/sched_ext/enq_select_cpu_fails.c | 61 + + tools/testing/selftests/sched_ext/exit.bpf.c | 84 + + tools/testing/selftests/sched_ext/exit.c | 55 + + tools/testing/selftests/sched_ext/exit_test.h | 20 + + tools/testing/selftests/sched_ext/hotplug.bpf.c | 61 + + tools/testing/selftests/sched_ext/hotplug.c | 168 + + tools/testing/selftests/sched_ext/hotplug_test.h | 15 + + .../selftests/sched_ext/init_enable_count.bpf.c | 53 + + .../selftests/sched_ext/init_enable_count.c | 166 + + tools/testing/selftests/sched_ext/maximal.bpf.c | 164 + + tools/testing/selftests/sched_ext/maximal.c | 51 + + tools/testing/selftests/sched_ext/maybe_null.bpf.c | 36 + + tools/testing/selftests/sched_ext/maybe_null.c | 49 + + .../selftests/sched_ext/maybe_null_fail_dsp.bpf.c | 25 + + .../selftests/sched_ext/maybe_null_fail_yld.bpf.c | 28 + + tools/testing/selftests/sched_ext/minimal.bpf.c | 21 + + tools/testing/selftests/sched_ext/minimal.c | 58 + + tools/testing/selftests/sched_ext/prog_run.bpf.c | 33 + + tools/testing/selftests/sched_ext/prog_run.c | 78 + + tools/testing/selftests/sched_ext/reload_loop.c | 75 + + tools/testing/selftests/sched_ext/runner.c | 201 + + tools/testing/selftests/sched_ext/scx_test.h | 131 + + .../selftests/sched_ext/select_cpu_dfl.bpf.c | 40 + + tools/testing/selftests/sched_ext/select_cpu_dfl.c | 72 + + .../sched_ext/select_cpu_dfl_nodispatch.bpf.c | 89 + + .../sched_ext/select_cpu_dfl_nodispatch.c | 72 + + .../selftests/sched_ext/select_cpu_dispatch.bpf.c | 41 + + .../selftests/sched_ext/select_cpu_dispatch.c | 70 + + .../sched_ext/select_cpu_dispatch_bad_dsq.bpf.c | 37 + + .../sched_ext/select_cpu_dispatch_bad_dsq.c | 56 + + .../sched_ext/select_cpu_dispatch_dbl_dsp.bpf.c | 38 + + .../sched_ext/select_cpu_dispatch_dbl_dsp.c | 56 + + .../selftests/sched_ext/select_cpu_vtime.bpf.c | 92 + + .../testing/selftests/sched_ext/select_cpu_vtime.c | 59 + + tools/testing/selftests/sched_ext/test_example.c | 49 + + tools/testing/selftests/sched_ext/util.c | 71 + + tools/testing/selftests/sched_ext/util.h | 13 + + 99 files changed, 16028 insertions(+), 125 deletions(-) + create mode 100644 Documentation/scheduler/sched-ext.rst + create mode 100644 include/linux/sched/ext.h + create mode 100644 include/trace/events/sched_ext.h + create mode 100644 kernel/sched/ext.c + create mode 100644 kernel/sched/ext.h + create mode 100644 tools/sched_ext/.gitignore + create mode 100644 tools/sched_ext/Makefile + create mode 100644 tools/sched_ext/README.md + create mode 100644 tools/sched_ext/include/bpf-compat/gnu/stubs.h + create mode 100644 tools/sched_ext/include/scx/common.bpf.h + create mode 100644 tools/sched_ext/include/scx/common.h + create mode 100644 tools/sched_ext/include/scx/compat.bpf.h + create mode 100644 tools/sched_ext/include/scx/compat.h + create mode 100644 tools/sched_ext/include/scx/user_exit_info.h + create mode 100644 tools/sched_ext/scx_central.bpf.c + create mode 100644 tools/sched_ext/scx_central.c + create mode 100644 tools/sched_ext/scx_flatcg.bpf.c + create mode 100644 tools/sched_ext/scx_flatcg.c + create mode 100644 tools/sched_ext/scx_flatcg.h + create mode 100644 tools/sched_ext/scx_qmap.bpf.c + create mode 100644 tools/sched_ext/scx_qmap.c + create mode 100644 tools/sched_ext/scx_show_state.py + create mode 100644 tools/sched_ext/scx_simple.bpf.c + create mode 100644 tools/sched_ext/scx_simple.c + create mode 100644 tools/testing/selftests/sched_ext/.gitignore + create mode 100644 tools/testing/selftests/sched_ext/Makefile + create mode 100644 tools/testing/selftests/sched_ext/config + create mode 100644 tools/testing/selftests/sched_ext/create_dsq.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/create_dsq.c + create mode 100644 tools/testing/selftests/sched_ext/ddsp_bogus_dsq_fail.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/ddsp_bogus_dsq_fail.c + create mode 100644 tools/testing/selftests/sched_ext/ddsp_vtimelocal_fail.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/ddsp_vtimelocal_fail.c + create mode 100644 tools/testing/selftests/sched_ext/dsp_local_on.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/dsp_local_on.c + create mode 100644 tools/testing/selftests/sched_ext/enq_last_no_enq_fails.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/enq_last_no_enq_fails.c + create mode 100644 tools/testing/selftests/sched_ext/enq_select_cpu_fails.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/enq_select_cpu_fails.c + create mode 100644 tools/testing/selftests/sched_ext/exit.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/exit.c + create mode 100644 tools/testing/selftests/sched_ext/exit_test.h + create mode 100644 tools/testing/selftests/sched_ext/hotplug.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/hotplug.c + create mode 100644 tools/testing/selftests/sched_ext/hotplug_test.h + create mode 100644 tools/testing/selftests/sched_ext/init_enable_count.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/init_enable_count.c + create mode 100644 tools/testing/selftests/sched_ext/maximal.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/maximal.c + create mode 100644 tools/testing/selftests/sched_ext/maybe_null.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/maybe_null.c + create mode 100644 tools/testing/selftests/sched_ext/maybe_null_fail_dsp.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/maybe_null_fail_yld.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/minimal.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/minimal.c + create mode 100644 tools/testing/selftests/sched_ext/prog_run.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/prog_run.c + create mode 100644 tools/testing/selftests/sched_ext/reload_loop.c + create mode 100644 tools/testing/selftests/sched_ext/runner.c + create mode 100644 tools/testing/selftests/sched_ext/scx_test.h + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dfl.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dfl.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dfl_nodispatch.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dfl_nodispatch.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dispatch.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dispatch.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dispatch_bad_dsq.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dispatch_bad_dsq.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dispatch_dbl_dsp.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_dispatch_dbl_dsp.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_vtime.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/select_cpu_vtime.c + create mode 100644 tools/testing/selftests/sched_ext/test_example.c + create mode 100644 tools/testing/selftests/sched_ext/util.c + create mode 100644 tools/testing/selftests/sched_ext/util.h +Merging drivers-x86/for-next (837acb691c84 MAINTAINERS: adjust file entry in INTEL MID PLATFORM) +$ 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 Documentation/devicetree/bindings/serial/serial.yaml +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/msr-index.h +Auto-merging drivers/hid/hid-asus.c +Auto-merging drivers/mfd/intel_soc_pmic_bxtwc.c +Auto-merging drivers/platform/x86/amd/pmf/pmf-quirks.c +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/platform/x86/intel/pmc/core.c +Auto-merging drivers/platform/x86/intel/pmc/core.h +Auto-merging drivers/platform/x86/panasonic-laptop.c +Auto-merging include/linux/acpi.h +Auto-merging include/linux/platform_data/x86/asus-wmi.h +Merge made by the 'ort' strategy. + .../pm/intel_uncore_frequency_scaling.rst | 59 +++ + .../bindings/platform/microsoft,surface-sam.yaml | 47 +++ + .../devicetree/bindings/serial/serial.yaml | 2 +- + MAINTAINERS | 23 +- + arch/x86/Kconfig | 6 + + arch/x86/include/asm/intel_telemetry.h | 2 +- + arch/x86/include/asm/msr-index.h | 2 + + arch/x86/platform/geode/Makefile | 1 + + arch/x86/platform/geode/alix.c | 82 +--- + arch/x86/platform/geode/geode-common.c | 178 +++++++++ + arch/x86/platform/geode/geode-common.h | 21 ++ + arch/x86/platform/geode/geos.c | 80 +--- + arch/x86/platform/geode/net5501.c | 69 +--- + arch/x86/platform/intel-mid/intel-mid.c | 3 +- + drivers/hid/hid-asus.c | 7 + + drivers/hwmon/hp-wmi-sensors.c | 22 +- + drivers/mfd/intel_pmc_bxt.c | 3 +- + drivers/mfd/intel_soc_pmic_bxtwc.c | 3 +- + drivers/mfd/intel_soc_pmic_mrfld.c | 3 +- + drivers/platform/mellanox/mlxbf-pmc.c | 5 + + drivers/platform/olpc/olpc-ec.c | 3 - + drivers/platform/surface/aggregator/bus.c | 2 + + drivers/platform/surface/aggregator/controller.c | 67 +++- + drivers/platform/surface/aggregator/core.c | 82 +++- + .../platform/surface/surface_aggregator_registry.c | 45 ++- + drivers/platform/x86/Kconfig | 3 +- + drivers/platform/x86/acer-wmi.c | 19 +- + drivers/platform/x86/amd/pmf/acpi.c | 31 ++ + drivers/platform/x86/amd/pmf/core.c | 20 +- + drivers/platform/x86/amd/pmf/pmf-quirks.c | 8 + + drivers/platform/x86/amd/pmf/pmf.h | 73 ++++ + drivers/platform/x86/amd/pmf/spc.c | 51 ++- + drivers/platform/x86/amd/pmf/tee-if.c | 40 ++ + drivers/platform/x86/asus-laptop.c | 3 +- + drivers/platform/x86/asus-nb-wmi.c | 4 +- + drivers/platform/x86/asus-wmi.c | 224 ++++++----- + drivers/platform/x86/dell/Kconfig | 1 + + drivers/platform/x86/dell/dell-laptop.c | 419 +++++++++++++++++---- + drivers/platform/x86/dell/dell-smbios.h | 7 + + drivers/platform/x86/dell/dell-wmi-aio.c | 13 +- + drivers/platform/x86/eeepc-laptop.c | 3 +- + drivers/platform/x86/eeepc-wmi.c | 4 +- + drivers/platform/x86/fujitsu-laptop.c | 9 +- + drivers/platform/x86/hp/hp-wmi.c | 16 +- + drivers/platform/x86/huawei-wmi.c | 14 +- + drivers/platform/x86/ideapad-laptop.c | 191 ++++++++-- + drivers/platform/x86/ideapad-laptop.h | 139 ------- + drivers/platform/x86/intel/hid.c | 7 +- + drivers/platform/x86/intel/ifs/core.c | 33 ++ + drivers/platform/x86/intel/ifs/ifs.h | 92 ++++- + drivers/platform/x86/intel/ifs/load.c | 40 +- + drivers/platform/x86/intel/ifs/runtest.c | 233 ++++++++++++ + drivers/platform/x86/intel/int3472/Makefile | 9 +- + drivers/platform/x86/intel/int3472/common.c | 7 + + drivers/platform/x86/intel/int3472/discrete.c | 9 +- + drivers/platform/x86/intel/oaktrail.c | 3 +- + drivers/platform/x86/intel/pmc/core.c | 83 +++- + drivers/platform/x86/intel/pmc/core.h | 12 +- + drivers/platform/x86/intel/pmc/core_ssram.c | 6 +- + drivers/platform/x86/intel/pmt/class.c | 28 +- + drivers/platform/x86/intel/pmt/class.h | 10 +- + drivers/platform/x86/intel/pmt/crashlog.c | 2 +- + drivers/platform/x86/intel/pmt/telemetry.c | 12 +- + drivers/platform/x86/intel/sdsi.c | 3 +- + .../x86/intel/speed_select_if/isst_if_common.c | 40 +- + drivers/platform/x86/intel/tpmi.c | 3 +- + .../uncore-frequency/uncore-frequency-common.c | 42 ++- + .../uncore-frequency/uncore-frequency-common.h | 17 +- + .../intel/uncore-frequency/uncore-frequency-tpmi.c | 165 +++++++- + drivers/platform/x86/intel/vsec.c | 8 +- + drivers/platform/x86/intel_scu_ipc.c | 2 +- + drivers/platform/x86/intel_scu_ipcutil.c | 2 +- + drivers/platform/x86/intel_scu_pcidrv.c | 2 +- + drivers/platform/x86/intel_scu_pltdrv.c | 2 +- + drivers/platform/x86/intel_scu_wdt.c | 3 +- + drivers/platform/x86/lenovo-ymc.c | 2 + + drivers/platform/x86/lg-laptop.c | 149 +++++++- + drivers/platform/x86/msi-wmi.c | 20 +- + drivers/platform/x86/panasonic-laptop.c | 16 +- + drivers/platform/x86/samsung-laptop.c | 5 +- + drivers/platform/x86/serial-multi-instantiate.c | 32 +- + drivers/platform/x86/thinkpad_acpi.c | 145 ++++++- + drivers/platform/x86/toshiba-wmi.c | 15 +- + drivers/platform/x86/touchscreen_dmi.c | 26 ++ + drivers/platform/x86/wmi.c | 143 ++----- + drivers/platform/x86/x86-android-tablets/Kconfig | 2 +- + drivers/platform/x86/x86-android-tablets/asus.c | 8 +- + drivers/platform/x86/x86-android-tablets/core.c | 20 +- + drivers/platform/x86/x86-android-tablets/dmi.c | 16 +- + drivers/platform/x86/x86-android-tablets/lenovo.c | 22 +- + drivers/platform/x86/x86-android-tablets/other.c | 40 +- + .../x86/x86-android-tablets/shared-psy-info.c | 4 +- + .../x86/x86-android-tablets/x86-android-tablets.h | 2 +- + drivers/usb/typec/mux/intel_pmc_mux.c | 3 +- + drivers/watchdog/intel-mid_wdt.c | 5 +- + include/linux/acpi.h | 3 +- + .../x86/intel/vsec.h => include/linux/intel_vsec.h | 47 ++- + include/linux/platform_data/x86/asus-wmi.h | 37 ++ + .../linux/platform_data/{ => x86}/intel-mid_wdt.h | 6 +- + .../linux/platform_data/x86}/intel_scu_ipc.h | 4 +- + include/trace/events/intel_ifs.h | 27 ++ + 101 files changed, 2723 insertions(+), 1060 deletions(-) + create mode 100644 Documentation/devicetree/bindings/platform/microsoft,surface-sam.yaml + create mode 100644 arch/x86/platform/geode/geode-common.c + create mode 100644 arch/x86/platform/geode/geode-common.h + rename drivers/platform/x86/intel/vsec.h => include/linux/intel_vsec.h (62%) + rename include/linux/platform_data/{ => x86}/intel-mid_wdt.h (74%) + rename {arch/x86/include/asm => include/linux/platform_data/x86}/intel_scu_ipc.h (96%) +Merging chrome-platform/for-next (d1b35e6d34e9 platform/chrome: chromeos_laptop: Use kmemdup_array) +$ 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/chromeos_laptop.c | 7 +++--- + drivers/platform/chrome/cros_ec_lpc.c | 36 +++++++++++++++++++++++-------- + drivers/platform/chrome/cros_ec_typec.c | 10 +++++++++ + 3 files changed, 40 insertions(+), 13 deletions(-) +Merging chrome-platform-firmware/for-firmware-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (c3eddf5e8c30 HSI: omap-ssi: Remove unnecessary debugfs_create_dir() error check) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/controllers/omap_ssi_core.c | 11 +---------- + 1 file changed, 1 insertion(+), 10 deletions(-) +Merging leds-lj/for-leds-next (64c38866500b leds: turris-omnia: Fix module autoloading with MODULE_DEVICE_TABLE()) +$ 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 | 2 + + .../devicetree/bindings/leds/leds-lm3692x.txt | 65 ----- + .../devicetree/bindings/leds/leds-sc27xx-bltc.txt | 43 ---- + .../devicetree/bindings/leds/nxp,pca995x.yaml | 6 +- + .../devicetree/bindings/leds/sprd,sc2731-bltc.yaml | 84 +++++++ + .../devicetree/bindings/leds/ti.lm36922.yaml | 110 +++++++++ + Documentation/leds/leds-blinkm.rst | 29 ++- + Documentation/leds/well-known-leds.txt | 8 + + drivers/leds/Kconfig | 8 + + drivers/leds/flash/leds-aat1290.c | 14 +- + drivers/leds/flash/leds-as3645a.c | 8 +- + drivers/leds/flash/leds-ktd2692.c | 15 +- + drivers/leds/flash/leds-lm3601x.c | 19 +- + drivers/leds/flash/leds-max77693.c | 20 +- + drivers/leds/flash/leds-qcom-flash.c | 163 ++++++++++++- + drivers/leds/leds-88pm860x.c | 5 +- + drivers/leds/leds-aw2013.c | 8 +- + drivers/leds/leds-bcm6328.c | 7 +- + drivers/leds/leds-bcm6358.c | 7 +- + drivers/leds/leds-bd2606mvv.c | 23 +- + drivers/leds/leds-blinkm.c | 264 ++++++++++++++------- + drivers/leds/leds-gpio.c | 9 +- + drivers/leds/leds-is31fl319x.c | 34 +-- + drivers/leds/leds-is31fl32xx.c | 14 +- + drivers/leds/leds-lp55xx-common.c | 22 +- + drivers/leds/leds-lp55xx-common.h | 1 - + drivers/leds/leds-mc13783.c | 24 +- + drivers/leds/leds-mt6323.c | 22 +- + drivers/leds/leds-netxbig.c | 19 +- + drivers/leds/leds-pca9532.c | 12 +- + drivers/leds/leds-pca995x.c | 78 +++--- + drivers/leds/leds-sc27xx-bltc.c | 12 +- + drivers/leds/leds-sun50i-a100.c | 2 +- + drivers/leds/leds-turris-omnia.c | 9 +- + drivers/leds/rgb/leds-qcom-lpg.c | 14 +- + drivers/leds/trigger/ledtrig-netdev.c | 24 +- + include/linux/leds.h | 2 + + 37 files changed, 778 insertions(+), 428 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/leds/leds-lm3692x.txt + delete mode 100644 Documentation/devicetree/bindings/leds/leds-sc27xx-bltc.txt + create mode 100644 Documentation/devicetree/bindings/leds/sprd,sc2731-bltc.yaml + create mode 100644 Documentation/devicetree/bindings/leds/ti.lm36922.yaml +Merging ipmi/for-next (64dce81f8c37 ipmi: docs: don't advertise deprecated sysfs entries) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Auto-merging drivers/char/ipmi/ipmi_ssif.c +Merge made by the 'ort' strategy. + Documentation/driver-api/ipmi.rst | 2 +- + drivers/char/ipmi/ipmi_ssif.c | 25 ++++++++++++++++++++++++- + 2 files changed, 25 insertions(+), 2 deletions(-) +Merging driver-core/driver-core-next (6a36d828bdef driver core: attribute_container: Remove unused functions) +$ 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 drivers/base/dd.c +Auto-merging drivers/nvme/host/pci.c +Merge made by the 'ort' strategy. + drivers/base/attribute_container.c | 48 +------ + drivers/base/auxiliary.c | 2 +- + drivers/base/base.h | 6 +- + drivers/base/bus.c | 19 ++- + drivers/base/class.c | 14 +- + drivers/base/core.c | 276 ++++++++++++++++++++++-------------- + drivers/base/dd.c | 2 +- + drivers/base/devres.c | 2 +- + drivers/base/driver.c | 2 +- + drivers/base/firmware_loader/main.c | 30 ++++ + drivers/base/module.c | 14 +- + drivers/base/platform.c | 2 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 2 +- + drivers/nvme/host/pci.c | 1 + + include/linux/attribute_container.h | 6 - + include/linux/auxiliary_bus.h | 2 +- + include/linux/device/bus.h | 6 +- + include/linux/device/class.h | 2 +- + include/linux/device/driver.h | 4 +- + include/linux/fsl/mc.h | 2 +- + include/linux/platform_device.h | 2 +- + 21 files changed, 255 insertions(+), 189 deletions(-) +Merging usb/usb-next (68d4209158f4 sub: cdns3: Use predefined PCI vendor ID constant) +$ 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 Documentation/devicetree/bindings/usb/qcom,dwc3.yaml +Auto-merging Documentation/filesystems/9p.rst +Auto-merging drivers/usb/typec/anx7411.c +Auto-merging drivers/usb/typec/tipd/core.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/configfs-usb-gadget-acm | 7 + + Documentation/ABI/testing/configfs-usb-gadget-uac1 | 8 + + Documentation/ABI/testing/configfs-usb-gadget-uac2 | 11 + + .../devicetree/bindings/phy/fsl,mxs-usbphy.yaml | 17 + + .../devicetree/bindings/usb/fsl,ls1028a.yaml | 52 ++ + .../devicetree/bindings/usb/msm-hsusb.txt | 110 --- + .../devicetree/bindings/usb/qcom,dwc3.yaml | 18 + + .../devicetree/bindings/usb/ti,j721e-usb.yaml | 3 +- + Documentation/filesystems/9p.rst | 58 +- + Documentation/usb/functionfs-desc.rst | 39 + + Documentation/usb/functionfs.rst | 2 + + Documentation/usb/gadget-testing.rst | 19 + + Documentation/usb/index.rst | 1 + + drivers/thunderbolt/acpi.c | 40 +- + drivers/thunderbolt/debugfs.c | 382 +++++++- + drivers/thunderbolt/sb_regs.h | 18 +- + drivers/thunderbolt/tb.h | 42 +- + drivers/thunderbolt/usb4.c | 62 +- + drivers/usb/cdns3/cdns3-pci-wrap.c | 5 +- + drivers/usb/cdns3/cdnsp-pci.c | 29 +- + drivers/usb/cdns3/cdnsp-ring.c | 6 +- + drivers/usb/cdns3/host.c | 4 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 2 +- + drivers/usb/chipidea/ci_hdrc_npcm.c | 4 +- + drivers/usb/chipidea/udc.c | 8 +- + drivers/usb/class/cdc-acm.c | 2 + + drivers/usb/class/usbtmc.c | 2 +- + drivers/usb/common/common.c | 22 +- + drivers/usb/core/usb-acpi.c | 53 ++ + drivers/usb/dwc2/debugfs.c | 1 + + drivers/usb/dwc2/drd.c | 9 + + drivers/usb/dwc2/params.c | 2 + + drivers/usb/dwc2/platform.c | 26 +- + drivers/usb/dwc3/dwc3-imx8mp.c | 113 ++- + drivers/usb/dwc3/dwc3-octeon.c | 19 +- + drivers/usb/dwc3/dwc3-qcom.c | 16 +- + drivers/usb/dwc3/dwc3-rtk.c | 52 +- + drivers/usb/dwc3/dwc3-st.c | 38 +- + drivers/usb/dwc3/dwc3-xilinx.c | 7 +- + drivers/usb/gadget/configfs.c | 12 +- + drivers/usb/gadget/function/f_acm.c | 52 +- + drivers/usb/gadget/function/f_fs.c | 14 +- + drivers/usb/gadget/function/f_hid.c | 275 +++++- + drivers/usb/gadget/function/f_loopback.c | 2 +- + drivers/usb/gadget/function/f_mass_storage.c | 3 +- + drivers/usb/gadget/function/f_midi.c | 2 +- + drivers/usb/gadget/function/f_midi2.c | 2 +- + drivers/usb/gadget/function/f_sourcesink.c | 2 +- + drivers/usb/gadget/function/f_uac1.c | 63 +- + drivers/usb/gadget/function/f_uac2.c | 80 +- + drivers/usb/gadget/function/u_audio.c | 10 +- + drivers/usb/gadget/function/u_serial.c | 22 + + drivers/usb/gadget/function/u_serial.h | 4 + + drivers/usb/gadget/function/u_uac1.h | 12 +- + drivers/usb/gadget/function/u_uac2.h | 15 +- + drivers/usb/gadget/function/uvc_v4l2.c | 12 +- + drivers/usb/gadget/u_f.c | 2 +- + drivers/usb/gadget/udc/bdc/bdc_core.c | 1 + + drivers/usb/gadget/udc/cdns2/cdns2-gadget.c | 4 +- + drivers/usb/gadget/udc/cdns2/cdns2-pci.c | 7 +- + drivers/usb/gadget/udc/dummy_hcd.c | 14 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 67 +- + drivers/usb/gadget/udc/udc-xilinx.c | 2 +- + drivers/usb/host/Kconfig | 2 +- + drivers/usb/host/ehci-brcm.c | 1 + + drivers/usb/host/ehci-exynos.c | 9 +- + drivers/usb/host/ohci-exynos.c | 9 +- + drivers/usb/host/ohci-nxp.c | 18 +- + drivers/usb/host/ohci-ppc-of.c | 4 - + drivers/usb/host/r8a66597-hcd.c | 6 +- + drivers/usb/host/xhci-dbgcap.c | 133 +-- + drivers/usb/host/xhci-dbgcap.h | 2 +- + drivers/usb/host/xhci-dbgtty.c | 2 +- + drivers/usb/host/xhci-ext-caps.h | 5 + + drivers/usb/host/xhci-hub.c | 36 + + drivers/usb/host/xhci-mem.c | 8 +- + drivers/usb/host/xhci-pci-renesas.c | 48 +- + drivers/usb/host/xhci-pci.c | 98 ++- + drivers/usb/host/xhci-pci.h | 19 +- + drivers/usb/host/xhci-plat.c | 6 + + drivers/usb/host/xhci-ring.c | 72 +- + drivers/usb/host/xhci.c | 18 +- + drivers/usb/host/xhci.h | 20 +- + drivers/usb/misc/appledisplay.c | 15 +- + drivers/usb/misc/brcmstb-usb-pinmap.c | 1 + + drivers/usb/misc/cypress_cy7c63.c | 4 + + drivers/usb/misc/onboard_usb_dev.c | 78 ++ + drivers/usb/misc/onboard_usb_dev.h | 2 + + drivers/usb/misc/qcom_eud.c | 2 +- + drivers/usb/misc/yurex.c | 10 +- + drivers/usb/musb/mediatek.c | 27 +- + drivers/usb/musb/mpfs.c | 160 +++- + drivers/usb/phy/phy-gpio-vbus-usb.c | 1 + + drivers/usb/phy/phy-mxs-usb.c | 132 ++- + drivers/usb/roles/class.c | 7 +- + drivers/usb/serial/aircable.c | 1 - + drivers/usb/serial/ark3116.c | 1 - + drivers/usb/serial/belkin_sa.c | 1 - + drivers/usb/serial/ch341.c | 1 - + drivers/usb/serial/cp210x.c | 1 - + drivers/usb/serial/cyberjack.c | 1 - + drivers/usb/serial/cypress_m8.c | 3 - + drivers/usb/serial/digi_acceleport.c | 2 - + drivers/usb/serial/empeg.c | 1 - + drivers/usb/serial/f81232.c | 2 - + drivers/usb/serial/f81534.c | 1 - + drivers/usb/serial/ftdi_sio.c | 1 - + drivers/usb/serial/garmin_gps.c | 1 - + drivers/usb/serial/generic.c | 1 - + drivers/usb/serial/io_edgeport.c | 4 - + drivers/usb/serial/io_ti.c | 2 - + drivers/usb/serial/ipaq.c | 1 - + drivers/usb/serial/ipw.c | 1 - + drivers/usb/serial/ir-usb.c | 1 - + drivers/usb/serial/iuu_phoenix.c | 1 - + drivers/usb/serial/keyspan.c | 4 - + drivers/usb/serial/keyspan_pda.c | 2 - + drivers/usb/serial/kl5kusb105.c | 1 - + drivers/usb/serial/kobil_sct.c | 4 +- + drivers/usb/serial/mct_u232.c | 1 - + drivers/usb/serial/metro-usb.c | 1 - + drivers/usb/serial/mos7720.c | 1 - + drivers/usb/serial/mos7840.c | 1 - + drivers/usb/serial/mxuport.c | 1 - + drivers/usb/serial/navman.c | 1 - + drivers/usb/serial/omninet.c | 1 - + drivers/usb/serial/opticon.c | 1 - + drivers/usb/serial/option.c | 1 - + drivers/usb/serial/oti6858.c | 1 - + drivers/usb/serial/pl2303.c | 1 - + drivers/usb/serial/qcaux.c | 1 - + drivers/usb/serial/qcserial.c | 1 - + drivers/usb/serial/quatech2.c | 1 - + drivers/usb/serial/safe_serial.c | 1 - + drivers/usb/serial/sierra.c | 1 - + drivers/usb/serial/spcp8x5.c | 1 - + drivers/usb/serial/ssu100.c | 1 - + drivers/usb/serial/symbolserial.c | 1 - + drivers/usb/serial/ti_usb_3410_5052.c | 2 - + drivers/usb/serial/upd78f0730.c | 1 - + drivers/usb/serial/usb-serial-simple.c | 1 - + drivers/usb/serial/usb-serial.c | 12 +- + drivers/usb/serial/usb_debug.c | 2 - + drivers/usb/serial/visor.c | 3 - + drivers/usb/serial/whiteheat.c | 2 - + drivers/usb/serial/wishbone-serial.c | 1 - + drivers/usb/serial/xr_serial.c | 1 - + drivers/usb/serial/xsens_mt.c | 1 - + drivers/usb/storage/alauda.c | 4 +- + drivers/usb/storage/cypress_atacb.c | 4 +- + drivers/usb/storage/datafab.c | 4 +- + drivers/usb/storage/ene_ub6250.c | 6 +- + drivers/usb/storage/freecom.c | 4 +- + drivers/usb/storage/isd200.c | 4 +- + drivers/usb/storage/jumpshot.c | 4 +- + drivers/usb/storage/karma.c | 4 +- + drivers/usb/storage/onetouch.c | 4 +- + drivers/usb/storage/sddr09.c | 4 +- + drivers/usb/storage/sddr55.c | 4 +- + drivers/usb/storage/shuttle_usbat.c | 4 +- + drivers/usb/storage/uas.c | 2 +- + drivers/usb/typec/anx7411.c | 6 +- + drivers/usb/typec/tcpm/maxim_contaminant.c | 53 +- + drivers/usb/typec/tcpm/tcpci.c | 134 +-- + drivers/usb/typec/tcpm/tcpci_maxim.h | 34 +- + drivers/usb/typec/tcpm/tcpci_maxim_core.c | 82 +- + drivers/usb/typec/tcpm/tcpci_rt1711h.c | 27 +- + drivers/usb/typec/tipd/core.c | 3 +- + drivers/usb/typec/ucsi/ucsi.c | 160 ++-- + drivers/usb/typec/ucsi/ucsi.h | 46 +- + drivers/usb/typec/ucsi/ucsi_glink.c | 2 +- + drivers/usb/usbip/vhci_hcd.c | 36 +- + drivers/usb/usbip/vhci_sysfs.c | 3 +- + include/linux/mutex.h | 19 +- + include/linux/usb.h | 8 + + include/linux/usb/composite.h | 2 +- + .../gadget/u_f.h => include/linux/usb/func_utils.h | 8 +- + include/linux/usb/gadget_configfs.h | 7 +- + include/linux/usb/serial.h | 7 +- + include/linux/usb/tcpci.h | 31 +- + include/uapi/linux/usb/ch9.h | 8 +- + include/uapi/linux/usb/functionfs.h | 97 ++- + include/uapi/linux/usb/g_hid.h | 40 + + include/uapi/linux/usb/gadgetfs.h | 2 +- + net/9p/Kconfig | 6 + + net/9p/Makefile | 4 + + net/9p/trans_usbg.c | 956 +++++++++++++++++++++ + tools/usb/p9_fwd.py | 243 ++++++ + 188 files changed, 3855 insertions(+), 1248 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/fsl,ls1028a.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/msm-hsusb.txt + create mode 100644 Documentation/usb/functionfs-desc.rst + rename drivers/usb/gadget/u_f.h => include/linux/usb/func_utils.h (96%) + create mode 100644 include/uapi/linux/usb/g_hid.h + create mode 100644 net/9p/trans_usbg.c + create mode 100755 tools/usb/p9_fwd.py +Merging thunderbolt/next (10904df3f20c thunderbolt: Improve software receiver lane margining) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-serial/usb-next (4c0d9477ba69 USB: serial: kobil_sct: restore initial terminal settings) +$ 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 (5ed771f17472 tty: serial: samsung: Fix serial rx on Apple A7-A9) +$ 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 arch/arm64/boot/dts/mediatek/mt7981b.dtsi +Auto-merging drivers/net/mctp/mctp-serial.c +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/usb/host/xhci-dbgcap.h +Auto-merging drivers/usb/host/xhci-dbgtty.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/8250_omap.yaml | 1 + + .../bindings/serial/atmel,at91-usart.yaml | 9 +- + .../devicetree/bindings/serial/mediatek,uart.yaml | 1 + + .../devicetree/bindings/serial/renesas,scif.yaml | 1 + + .../devicetree/bindings/serial/samsung_uart.yaml | 70 ++++++-- + arch/arm64/boot/dts/mediatek/mt7981b.dtsi | 33 ++++ + drivers/net/hamradio/6pack.c | 60 +++---- + drivers/net/mctp/mctp-serial.c | 23 +-- + drivers/tty/hvc/hvsi_lib.c | 2 +- + drivers/tty/mxser.c | 7 +- + drivers/tty/serdev/core.c | 2 +- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 1 + + drivers/tty/serial/8250/8250_bcm2835aux.c | 47 ++++++ + drivers/tty/serial/8250/8250_dma.c | 19 ++- + drivers/tty/serial/8250/8250_dwlib.c | 2 +- + drivers/tty/serial/8250/8250_early.c | 11 ++ + drivers/tty/serial/8250/8250_exar.c | 2 +- + drivers/tty/serial/8250/8250_omap.c | 10 +- + drivers/tty/serial/8250/8250_pci.c | 2 +- + drivers/tty/serial/8250/8250_platform.c | 122 ++++++++++++-- + drivers/tty/serial/8250/8250_port.c | 4 +- + drivers/tty/serial/8250/8250_pxa.c | 16 -- + drivers/tty/serial/qcom_geni_serial.c | 133 ++++++++------- + drivers/tty/serial/rp2.c | 2 +- + drivers/tty/serial/samsung_tty.c | 51 +++--- + drivers/tty/serial/sc16is7xx.c | 183 +++++++++++---------- + drivers/tty/serial/serial_core.c | 142 +++++++--------- + drivers/tty/serial/st-asc.c | 10 +- + drivers/tty/serial/xilinx_uartps.c | 2 +- + drivers/tty/tty_io.c | 11 +- + drivers/usb/host/xhci-dbgcap.h | 1 - + drivers/usb/host/xhci-dbgtty.c | 30 +--- + include/linux/serial_8250.h | 2 +- + include/linux/serial_s3c.h | 24 +-- + include/linux/soc/qcom/geni-se.h | 9 + + 35 files changed, 621 insertions(+), 424 deletions(-) +Merging char-misc/char-misc-next (0cf7befa3ea2 greybus: gb-beagleplay: Add firmware upload API) +$ 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 Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/iio/accel/bma400_core.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-bus-nvmem | 2 +- + Documentation/ABI/testing/debugfs-iio-ad9467 | 39 + + Documentation/ABI/testing/debugfs-iio-backend | 20 + + Documentation/ABI/testing/sysfs-bus-iio | 78 +- + .../ABI/testing/sysfs-bus-iio-adc-max9611 | 17 - + .../ABI/testing/sysfs-bus-iio-chemical-sgp40 | 14 - + Documentation/ABI/testing/sysfs-bus-iio-dac | 61 + + .../ABI/testing/sysfs-bus-iio-dac-ltc2688 | 31 - + .../ABI/testing/sysfs-bus-iio-filter-admv8818 | 2 +- + Documentation/ABI/testing/sysfs-bus-iio-ina2xx-adc | 9 - + .../devicetree/bindings/extcon/extcon-ptn5150.yaml | 11 + + .../devicetree/bindings/extcon/extcon-usb-gpio.txt | 21 - + .../bindings/extcon/linux,extcon-usb-gpio.yaml | 37 + + .../devicetree/bindings/iio/accel/adi,adxl380.yaml | 92 + + .../bindings/iio/accel/kionix,kxcjk1013.yaml | 1 + + .../devicetree/bindings/iio/adc/adi,ad4695.yaml | 254 +++ + .../devicetree/bindings/iio/adc/adi,ad7192.yaml | 33 +- + .../devicetree/bindings/iio/adc/adi,ad7380.yaml | 13 + + .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 123 +- + .../devicetree/bindings/iio/adc/adi,ad9467.yaml | 3 + + .../bindings/iio/adc/microchip,pac1921.yaml | 71 + + .../bindings/iio/adc/rockchip-saradc.yaml | 3 + + .../bindings/iio/adc/sigma-delta-modulator.yaml | 25 +- + .../bindings/iio/adc/sophgo,cv1800b-saradc.yaml | 83 + + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 4 +- + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 122 +- + .../bindings/iio/adc/x-powers,axp209-adc.yaml | 12 + + .../devicetree/bindings/iio/dac/adi,ltc2664.yaml | 181 ++ + .../devicetree/bindings/iio/dac/adi,ltc2672.yaml | 160 ++ + Documentation/devicetree/bindings/iio/dac/dac.yaml | 50 + + .../bindings/iio/frequency/adi,adf4377.yaml | 10 + + .../bindings/iio/humidity/sciosense,ens210.yaml | 55 + + .../bindings/iio/light/liteon,ltrf216a.yaml | 4 +- + .../devicetree/bindings/iio/light/rohm,bh1745.yaml | 53 + + .../{rohm,bu27034.yaml => rohm,bu27034anuc.yaml} | 11 +- + .../devicetree/bindings/iio/light/stk33xx.yaml | 13 +- + .../iio/magnetometer/asahi-kasei,ak8975.yaml | 5 +- + .../iio/magnetometer/bosch,bmc150_magn.yaml | 3 + + .../bindings/iio/pressure/sensirion,sdp500.yaml | 46 + + .../bindings/iio/proximity/awinic,aw96103.yaml | 61 + + .../bindings/iio/proximity/tyhx,hx9023s.yaml | 93 + + .../bindings/interconnect/qcom,msm8939.yaml | 25 +- + .../bindings/interconnect/qcom,msm8953.yaml | 3 +- + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 2 + + .../bindings/interconnect/qcom,rpmh.yaml | 5 +- + .../devicetree/bindings/misc/qcom,fastrpc.yaml | 3 +- + .../devicetree/bindings/net/ti,cc1352p7.yaml | 7 + + .../bindings/nvmem/fsl,layerscape-sfp.yaml | 1 + + .../devicetree/bindings/nvmem/imx-ocotp.yaml | 3 +- + .../bindings/nvmem/layouts/nvmem-layout.yaml | 1 + + .../bindings/nvmem/{ => layouts}/u-boot,env.yaml | 39 +- + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 3 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/iio/ad4000.rst | 131 ++ + Documentation/iio/ad4695.rst | 167 ++ + Documentation/iio/ad7380.rst | 130 ++ + Documentation/iio/adxl380.rst | 233 +++ + Documentation/iio/index.rst | 4 + + MAINTAINERS | 69 +- + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 3 +- + drivers/android/binder.c | 288 ++- + drivers/android/binder_internal.h | 21 +- + drivers/android/binderfs.c | 8 + + drivers/base/cacheinfo.c | 41 +- + drivers/bus/mhi/host/init.c | 2 +- + drivers/bus/mhi/host/internal.h | 2 +- + drivers/bus/mhi/host/pci_generic.c | 64 +- + drivers/cdx/controller/mcdi.c | 4 - + drivers/char/hpet.c | 6 +- + drivers/comedi/drivers/ni_atmio.c | 9 + + drivers/comedi/drivers/ni_mio_common.c | 9 - + drivers/comedi/drivers/ni_pcimio.c | 9 + + .../drivers/ni_routing/tools/convert_c_to_py.c | 5 + + drivers/comedi/drivers/ni_stc.h | 2 - + drivers/extcon/Kconfig | 11 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-lc824206xa.c | 495 +++++ + drivers/fpga/socfpga.c | 7 +- + drivers/fpga/tests/fpga-bridge-test.c | 25 +- + drivers/fpga/tests/fpga-mgr-test.c | 28 +- + drivers/fpga/tests/fpga-region-test.c | 41 +- + drivers/fpga/zynq-fpga.c | 8 +- + drivers/greybus/Kconfig | 2 + + drivers/greybus/gb-beagleplay.c | 658 ++++++- + drivers/hwtracing/coresight/coresight-core.c | 37 +- + .../hwtracing/coresight/coresight-cti-platform.c | 10 +- + drivers/hwtracing/coresight/coresight-dummy.c | 7 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 47 +- + drivers/hwtracing/coresight/coresight-etm-perf.h | 18 - + drivers/hwtracing/coresight/coresight-etm3x-core.c | 9 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 9 +- + drivers/hwtracing/coresight/coresight-priv.h | 1 + + drivers/hwtracing/coresight/coresight-stm.c | 3 +- + drivers/hwtracing/coresight/coresight-sysfs.c | 3 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 7 +- + drivers/hwtracing/coresight/coresight-tmc.h | 5 +- + drivers/hwtracing/coresight/coresight-tpdm.c | 9 +- + drivers/hwtracing/coresight/coresight-trace-id.c | 138 +- + drivers/hwtracing/coresight/coresight-trace-id.h | 70 +- + drivers/iio/accel/Kconfig | 27 + + drivers/iio/accel/Makefile | 3 + + drivers/iio/accel/adxl367.c | 2 +- + drivers/iio/accel/adxl367_spi.c | 2 +- + drivers/iio/accel/adxl372.c | 2 +- + drivers/iio/accel/adxl380.c | 1905 ++++++++++++++++++++ + drivers/iio/accel/adxl380.h | 26 + + drivers/iio/accel/adxl380_i2c.c | 64 + + drivers/iio/accel/adxl380_spi.c | 66 + + drivers/iio/accel/bma180.c | 3 +- + drivers/iio/accel/bma400_core.c | 11 +- + drivers/iio/accel/bma400_spi.c | 2 +- + drivers/iio/accel/bmc150-accel-core.c | 13 +- + drivers/iio/accel/bmi088-accel-spi.c | 2 +- + drivers/iio/accel/cros_ec_accel_legacy.c | 2 +- + drivers/iio/accel/fxls8962af-core.c | 3 +- + drivers/iio/accel/kxcjk-1013.c | 8 +- + drivers/iio/accel/msa311.c | 3 +- + drivers/iio/accel/sca3300.c | 3 +- + drivers/iio/accel/stk8312.c | 3 +- + drivers/iio/accel/stk8ba50.c | 3 +- + drivers/iio/adc/Kconfig | 48 + + drivers/iio/adc/Makefile | 4 + + drivers/iio/adc/ad4000.c | 722 ++++++++ + drivers/iio/adc/ad4695.c | 1185 ++++++++++++ + drivers/iio/adc/ad7091r5.c | 6 +- + drivers/iio/adc/ad7091r8.c | 2 +- + drivers/iio/adc/ad7124.c | 38 +- + drivers/iio/adc/ad7192.c | 189 +- + drivers/iio/adc/ad7266.c | 7 +- + drivers/iio/adc/ad7280a.c | 14 +- + drivers/iio/adc/ad7291.c | 4 +- + drivers/iio/adc/ad7292.c | 4 +- + drivers/iio/adc/ad7298.c | 7 +- + drivers/iio/adc/ad7380.c | 523 +++++- + drivers/iio/adc/ad7476.c | 58 +- + drivers/iio/adc/ad7606.c | 47 +- + drivers/iio/adc/ad7606_par.c | 2 +- + drivers/iio/adc/ad7606_spi.c | 9 +- + drivers/iio/adc/ad7766.c | 14 +- + drivers/iio/adc/ad7768-1.c | 7 +- + drivers/iio/adc/ad7780.c | 10 +- + drivers/iio/adc/ad7793.c | 20 +- + drivers/iio/adc/ad7887.c | 4 +- + drivers/iio/adc/ad7923.c | 18 +- + drivers/iio/adc/ad799x.c | 3 +- + drivers/iio/adc/ad9467.c | 491 ++++- + drivers/iio/adc/ad_sigma_delta.c | 6 +- + drivers/iio/adc/adi-axi-adc.c | 71 +- + drivers/iio/adc/aspeed_adc.c | 5 +- + drivers/iio/adc/at91_adc.c | 19 +- + drivers/iio/adc/axp20x_adc.c | 182 +- + drivers/iio/adc/axp288_adc.c | 2 +- + drivers/iio/adc/bcm_iproc_adc.c | 2 +- + drivers/iio/adc/berlin2-adc.c | 2 +- + drivers/iio/adc/cc10001_adc.c | 4 +- + drivers/iio/adc/dln2-adc.c | 8 +- + drivers/iio/adc/ep93xx_adc.c | 2 +- + drivers/iio/adc/exynos_adc.c | 2 +- + drivers/iio/adc/hi8435.c | 2 +- + drivers/iio/adc/hx711.c | 7 +- + drivers/iio/adc/ina2xx-adc.c | 17 +- + drivers/iio/adc/ingenic-adc.c | 2 +- + drivers/iio/adc/lpc32xx_adc.c | 2 +- + drivers/iio/adc/ltc2496.c | 2 +- + drivers/iio/adc/ltc2497.c | 2 +- + drivers/iio/adc/max1027.c | 16 +- + drivers/iio/adc/max11100.c | 4 +- + drivers/iio/adc/max1118.c | 7 +- + drivers/iio/adc/max1241.c | 4 +- + drivers/iio/adc/max1363.c | 34 +- + drivers/iio/adc/max34408.c | 4 +- + drivers/iio/adc/max9611.c | 6 +- + drivers/iio/adc/mcp320x.c | 10 - + drivers/iio/adc/mcp3564.c | 54 +- + drivers/iio/adc/mcp3911.c | 61 +- + drivers/iio/adc/mp2629_adc.c | 4 +- + drivers/iio/adc/mt6360-adc.c | 4 +- + drivers/iio/adc/nau7802.c | 2 +- + drivers/iio/adc/pac1921.c | 1261 +++++++++++++ + drivers/iio/adc/pac1934.c | 6 +- + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 2 +- + drivers/iio/adc/qcom-spmi-rradc.c | 2 +- + drivers/iio/adc/rockchip_saradc.c | 4 +- + drivers/iio/adc/rtq6056.c | 4 +- + drivers/iio/adc/sd_adc_modulator.c | 97 +- + drivers/iio/adc/sophgo-cv1800b-adc.c | 227 +++ + drivers/iio/adc/stm32-adc.c | 6 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 299 ++- + drivers/iio/adc/stm32-dfsdm-core.c | 2 +- + drivers/iio/adc/stmpe-adc.c | 2 +- + drivers/iio/adc/ti-adc0832.c | 7 +- + drivers/iio/adc/ti-adc084s021.c | 7 +- + drivers/iio/adc/ti-adc12138.c | 7 +- + drivers/iio/adc/ti-adc161s626.c | 8 +- + drivers/iio/adc/ti-ads1015.c | 6 +- + drivers/iio/adc/ti-ads1119.c | 4 +- + drivers/iio/adc/ti-ads124s08.c | 5 +- + drivers/iio/adc/ti-ads1298.c | 3 +- + drivers/iio/adc/ti-ads131e08.c | 6 +- + drivers/iio/adc/ti-ads7924.c | 4 +- + drivers/iio/adc/ti-ads7950.c | 2 +- + drivers/iio/adc/ti-ads8344.c | 2 +- + drivers/iio/adc/ti-ads8688.c | 10 +- + drivers/iio/adc/ti-lmp92064.c | 2 +- + drivers/iio/adc/ti-tlc4541.c | 8 +- + drivers/iio/adc/ti-tsc2046.c | 83 +- + drivers/iio/adc/vf610_adc.c | 2 +- + drivers/iio/adc/xilinx-ams.c | 15 +- + drivers/iio/adc/xilinx-xadc-core.c | 5 +- + drivers/iio/buffer/industrialio-buffer-cb.c | 2 +- + drivers/iio/buffer/industrialio-buffer-dma.c | 36 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 1 + + drivers/iio/buffer/industrialio-hw-consumer.c | 4 +- + drivers/iio/chemical/bme680.h | 41 +- + drivers/iio/chemical/bme680_core.c | 633 +++---- + drivers/iio/chemical/bme680_spi.c | 2 +- + drivers/iio/chemical/sgp40.c | 11 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 8 +- + drivers/iio/common/scmi_sensors/scmi_iio.c | 2 +- + drivers/iio/dac/Kconfig | 11 + + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/ad5449.c | 15 +- + drivers/iio/dac/ad9739a.c | 13 +- + drivers/iio/dac/adi-axi-dac.c | 21 +- + drivers/iio/dac/ltc2664.c | 735 ++++++++ + drivers/iio/dac/ltc2688.c | 2 +- + drivers/iio/dac/mcp4728.c | 45 +- + drivers/iio/dac/mcp4922.c | 45 +- + drivers/iio/dac/ti-dac7311.c | 4 +- + drivers/iio/dummy/iio_simple_dummy_buffer.c | 2 +- + drivers/iio/frequency/adf4377.c | 35 +- + drivers/iio/health/afe4403.c | 3 +- + drivers/iio/health/afe4404.c | 3 +- + drivers/iio/health/max30102.c | 2 +- + drivers/iio/humidity/Kconfig | 11 + + drivers/iio/humidity/Makefile | 1 + + drivers/iio/humidity/am2315.c | 3 +- + drivers/iio/humidity/ens210.c | 339 ++++ + drivers/iio/imu/adis16400.c | 18 +- + drivers/iio/imu/adis16460.c | 18 +- + drivers/iio/imu/adis16475.c | 12 +- + drivers/iio/imu/adis16480.c | 20 +- + drivers/iio/imu/bmi160/bmi160_core.c | 3 +- + drivers/iio/imu/bmi323/bmi323.h | 1 + + drivers/iio/imu/bmi323/bmi323_core.c | 182 +- + drivers/iio/imu/bmi323/bmi323_i2c.c | 3 +- + drivers/iio/imu/bmi323/bmi323_spi.c | 3 +- + drivers/iio/imu/bno055/bno055.c | 2 +- + drivers/iio/imu/bno055/bno055_ser_core.c | 2 +- + drivers/iio/imu/kmx61.c | 3 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 93 +- + drivers/iio/industrialio-backend.c | 264 ++- + drivers/iio/industrialio-buffer.c | 52 +- + drivers/iio/industrialio-core.c | 46 +- + drivers/iio/industrialio-trigger.c | 27 + + drivers/iio/light/Kconfig | 13 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/adjd_s311.c | 3 +- + drivers/iio/light/apds9960.c | 55 +- + drivers/iio/light/bh1745.c | 906 ++++++++++ + drivers/iio/light/gp2ap002.c | 2 +- + drivers/iio/light/gp2ap020a00f.c | 9 +- + drivers/iio/light/isl29125.c | 3 +- + drivers/iio/light/ltr390.c | 241 ++- + drivers/iio/light/ltrf216a.c | 53 +- + drivers/iio/light/noa1305.c | 171 +- + drivers/iio/light/rohm-bu27034.c | 337 +--- + drivers/iio/light/si1145.c | 7 +- + drivers/iio/light/stk3310.c | 7 +- + drivers/iio/light/tcs3414.c | 3 +- + drivers/iio/light/tcs3472.c | 3 +- + drivers/iio/magnetometer/Kconfig | 2 +- + drivers/iio/magnetometer/ak8975.c | 80 +- + drivers/iio/magnetometer/rm3100-core.c | 2 +- + drivers/iio/pressure/Kconfig | 11 + + drivers/iio/pressure/Makefile | 1 + + drivers/iio/pressure/bmp280-core.c | 654 ++++++- + drivers/iio/pressure/bmp280-i2c.c | 2 +- + drivers/iio/pressure/bmp280-regmap.c | 45 +- + drivers/iio/pressure/bmp280-spi.c | 18 +- + drivers/iio/pressure/bmp280.h | 37 +- + drivers/iio/pressure/dlhl60d.c | 3 +- + drivers/iio/pressure/sdp500.c | 156 ++ + drivers/iio/proximity/Kconfig | 25 + + drivers/iio/proximity/Makefile | 2 + + drivers/iio/proximity/aw96103.c | 846 +++++++++ + drivers/iio/proximity/cros_ec_mkbp_proximity.c | 2 +- + drivers/iio/proximity/hx9023s.c | 1144 ++++++++++++ + drivers/iio/proximity/sx9500.c | 3 +- + drivers/iio/proximity/sx_common.c | 6 +- + drivers/interconnect/icc-clk.c | 3 +- + drivers/interconnect/qcom/Kconfig | 18 + + drivers/interconnect/qcom/Makefile | 4 + + drivers/interconnect/qcom/msm8937.c | 1350 ++++++++++++++ + drivers/interconnect/qcom/msm8953.c | 2 + + drivers/interconnect/qcom/msm8976.c | 1440 +++++++++++++++ + drivers/interconnect/qcom/qcs404.c | 127 +- + drivers/interconnect/qcom/sm8350.c | 155 +- + drivers/interconnect/qcom/sm8350.h | 10 - + drivers/misc/cxl/of.c | 207 +-- + drivers/misc/cxl/pci.c | 32 +- + drivers/misc/cxl/sysfs.c | 2 +- + drivers/misc/fastrpc.c | 10 +- + drivers/misc/kgdbts.c | 4 +- + drivers/misc/lis3lv02d/lis3lv02d.c | 4 +- + drivers/misc/ocxl/ocxl_internal.h | 2 - + drivers/misc/tsl2550.c | 8 +- + drivers/nvmem/Kconfig | 3 +- + drivers/nvmem/imx-ocotp-ele.c | 32 +- + drivers/nvmem/layouts/Kconfig | 11 + + drivers/nvmem/layouts/Makefile | 1 + + drivers/nvmem/layouts/u-boot-env.c | 211 +++ + drivers/nvmem/layouts/u-boot-env.h | 15 + + drivers/nvmem/sunplus-ocotp.c | 7 +- + drivers/nvmem/u-boot-env.c | 165 +- + drivers/pps/clients/pps_parport.c | 8 +- + drivers/slimbus/messaging.c | 9 +- + drivers/slimbus/qcom-ctrl.c | 7 +- + drivers/slimbus/qcom-ngd-ctrl.c | 29 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 5 +- + drivers/uio/uio.c | 4 +- + drivers/w1/masters/ds2482.c | 4 +- + include/dt-bindings/iio/adi,ad4695.h | 9 + + include/dt-bindings/interconnect/qcom,msm8937.h | 93 + + include/dt-bindings/interconnect/qcom,msm8976.h | 97 + + include/dt-bindings/interconnect/qcom,sm8350.h | 10 - + include/linux/coresight-pmu.h | 17 +- + include/linux/coresight.h | 21 +- + include/linux/iio/backend.h | 62 +- + include/linux/iio/iio.h | 39 +- + include/linux/platform_data/ad5449.h | 39 - + include/uapi/linux/android/binder.h | 36 + + scripts/mod/devicetable-offsets.c | 4 + + scripts/mod/file2alias.c | 11 + + tools/iio/Makefile | 2 +- + tools/iio/iio_generic_buffer.c | 4 + + .../selftests/filesystems/binderfs/binderfs_test.c | 1 + + 337 files changed, 21962 insertions(+), 3117 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-iio-ad9467 + create mode 100644 Documentation/ABI/testing/debugfs-iio-backend + delete mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-max9611 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-dac + delete mode 100644 Documentation/devicetree/bindings/extcon/extcon-usb-gpio.txt + create mode 100644 Documentation/devicetree/bindings/extcon/linux,extcon-usb-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/iio/accel/adi,adxl380.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad4695.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/microchip,pac1921.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/sophgo,cv1800b-saradc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ltc2664.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ltc2672.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/dac.yaml + create mode 100644 Documentation/devicetree/bindings/iio/humidity/sciosense,ens210.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/rohm,bh1745.yaml + rename Documentation/devicetree/bindings/iio/light/{rohm,bu27034.yaml => rohm,bu27034anuc.yaml} (66%) + create mode 100644 Documentation/devicetree/bindings/iio/pressure/sensirion,sdp500.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/awinic,aw96103.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/tyhx,hx9023s.yaml + rename Documentation/devicetree/bindings/nvmem/{ => layouts}/u-boot,env.yaml (75%) + create mode 100644 Documentation/iio/ad4000.rst + create mode 100644 Documentation/iio/ad4695.rst + create mode 100644 Documentation/iio/ad7380.rst + create mode 100644 Documentation/iio/adxl380.rst + create mode 100644 drivers/extcon/extcon-lc824206xa.c + create mode 100644 drivers/iio/accel/adxl380.c + create mode 100644 drivers/iio/accel/adxl380.h + create mode 100644 drivers/iio/accel/adxl380_i2c.c + create mode 100644 drivers/iio/accel/adxl380_spi.c + create mode 100644 drivers/iio/adc/ad4000.c + create mode 100644 drivers/iio/adc/ad4695.c + create mode 100644 drivers/iio/adc/pac1921.c + create mode 100644 drivers/iio/adc/sophgo-cv1800b-adc.c + create mode 100644 drivers/iio/dac/ltc2664.c + create mode 100644 drivers/iio/humidity/ens210.c + create mode 100644 drivers/iio/light/bh1745.c + create mode 100644 drivers/iio/pressure/sdp500.c + create mode 100644 drivers/iio/proximity/aw96103.c + create mode 100644 drivers/iio/proximity/hx9023s.c + create mode 100644 drivers/interconnect/qcom/msm8937.c + create mode 100644 drivers/interconnect/qcom/msm8976.c + create mode 100644 drivers/nvmem/layouts/u-boot-env.c + create mode 100644 drivers/nvmem/layouts/u-boot-env.h + create mode 100644 include/dt-bindings/iio/adi,ad4695.h + create mode 100644 include/dt-bindings/interconnect/qcom,msm8937.h + create mode 100644 include/dt-bindings/interconnect/qcom,msm8976.h + delete mode 100644 include/linux/platform_data/ad5449.h +Merging accel/habanalabs-next (f03eee5fc922 Merge tag 'drm-xe-next-fixes-2024-05-02' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Already up to date. +Merging coresight/next (988d40a4d4e7 coresight: Make trace ID map spinlock local to the map) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fastrpc/for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (8de36789bd03 fpga: zynq-fpga: Rename 'timeout' variable as 'time_left') +$ 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 (a5733950fe35 Merge branch 'icc-sm8350' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (fec496684388 iio: adc: ad7173: add support for ad4113) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Merge made by the 'ort' strategy. + .../devicetree/bindings/iio/adc/adi,ad7173.yaml | 3 + + drivers/iio/accel/adxl380.c | 7 +- + drivers/iio/accel/fxls8962af-core.c | 3 +- + drivers/iio/accel/hid-sensor-accel-3d.c | 7 +- + drivers/iio/adc/ad7173.c | 38 +++++++- + drivers/iio/adc/ad7266.c | 2 +- + drivers/iio/adc/ad7791.c | 4 +- + drivers/iio/adc/ad7793.c | 2 +- + drivers/iio/adc/ad7887.c | 2 +- + drivers/iio/adc/axp20x_adc.c | 60 +++--------- + drivers/iio/adc/axp288_adc.c | 2 +- + drivers/iio/adc/da9150-gpadc.c | 26 +---- + drivers/iio/adc/intel_mrfld_adc.c | 2 +- + drivers/iio/adc/lp8788_adc.c | 18 +--- + drivers/iio/adc/ltc2497-core.c | 15 +-- + drivers/iio/adc/mp2629_adc.c | 2 +- + drivers/iio/adc/rn5t618-adc.c | 2 +- + drivers/iio/adc/sun4i-gpadc-iio.c | 7 +- + drivers/iio/adc/ti-ads1015.c | 3 +- + drivers/iio/addac/ad74115.c | 18 ++-- + drivers/iio/addac/ad74413r.c | 21 ++-- + drivers/iio/common/st_sensors/st_sensors_trigger.c | 2 +- + drivers/iio/dac/ad5504.c | 2 +- + drivers/iio/dac/ad5791.c | 2 +- + drivers/iio/dac/m62332.c | 2 +- + drivers/iio/dac/max517.c | 2 +- + drivers/iio/frequency/ad9523.c | 2 +- + drivers/iio/frequency/adf4350.c | 2 +- + drivers/iio/gyro/fxas21002c_core.c | 3 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 6 +- + drivers/iio/gyro/mpu3050-core.c | 2 +- + drivers/iio/humidity/hid-sensor-humidity.c | 2 +- + drivers/iio/humidity/hts221_buffer.c | 3 +- + drivers/iio/imu/bmi160/bmi160_core.c | 11 +-- + drivers/iio/imu/bmi323/bmi323_core.c | 8 +- + drivers/iio/imu/fxos8700_core.c | 1 - + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 10 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 17 ++++ + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 17 ++++ + drivers/iio/imu/inv_mpu6050/inv_mpu_acpi.c | 6 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 9 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 18 ++-- + drivers/iio/inkern.c | 7 +- + drivers/iio/light/cm32181.c | 3 +- + drivers/iio/light/hid-sensor-als.c | 6 +- + drivers/iio/light/hid-sensor-prox.c | 4 +- + drivers/iio/light/lm3533-als.c | 6 +- + drivers/iio/light/st_uvis25_core.c | 3 +- + drivers/iio/magnetometer/ak8974.c | 2 +- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 4 +- + drivers/iio/orientation/hid-sensor-incl-3d.c | 6 +- + drivers/iio/orientation/hid-sensor-rotation.c | 6 +- + .../iio/position/hid-sensor-custom-intel-hinge.c | 6 +- + drivers/iio/pressure/bmp280-core.c | 108 +++++++++++---------- + drivers/iio/pressure/bmp280.h | 9 ++ + drivers/iio/pressure/hid-sensor-press.c | 6 +- + drivers/iio/proximity/sx9324.c | 20 ++++ + drivers/iio/proximity/sx9360.c | 1 - + drivers/iio/proximity/sx_common.c | 21 ---- + drivers/iio/proximity/sx_common.h | 4 - + drivers/iio/temperature/hid-sensor-temperature.c | 2 +- + include/linux/iio/driver.h | 5 +- + include/linux/types.h | 3 +- + include/uapi/linux/types.h | 1 + + tools/iio/iio_event_monitor.c | 1 + + 66 files changed, 292 insertions(+), 315 deletions(-) +Merging phy-next/next (3c2ea12a625d phy: renesas: rcar-gen3-usb2: Add support for the RZ/G3S SoC) +$ 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 drivers/phy/qualcomm/phy-qcom-qmp-pcie.c +Auto-merging drivers/phy/samsung/phy-exynos5-usbdrd.c +Merge made by the 'ort' strategy. + .../phy/hisilicon,hi3798cv200-combphy.yaml | 56 ++ + .../bindings/phy/nuvoton,ma35d1-usb2-phy.yaml | 45 ++ + .../bindings/phy/phy-hi3798cv200-combphy.txt | 59 -- + .../devicetree/bindings/phy/qcom,sata-phy.yaml | 55 ++ + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 3 + + .../devicetree/bindings/phy/qcom,usb-8x16-phy.txt | 76 --- + .../bindings/phy/qcom-apq8064-sata-phy.txt | 24 - + .../bindings/phy/qcom-ipq806x-sata-phy.txt | 23 - + .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 4 +- + .../bindings/phy/rockchip,rk3588-hdptx-phy.yaml | 3 + + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 8 +- + .../bindings/phy/socionext,uniphier-pcie-phy.yaml | 8 +- + .../phy/socionext,uniphier-usb3hs-phy.yaml | 7 +- + .../phy/socionext,uniphier-usb3ss-phy.yaml | 7 +- + drivers/phy/Kconfig | 1 + + drivers/phy/Makefile | 1 + + drivers/phy/broadcom/phy-bcm-cygnus-pcie.c | 20 +- + drivers/phy/broadcom/phy-brcm-sata.c | 21 +- + drivers/phy/cadence/phy-cadence-sierra.c | 95 ++- + drivers/phy/cadence/phy-cadence-torrent.c | 683 +++++++++++---------- + drivers/phy/hisilicon/phy-hisi-inno-usb2.c | 12 +- + drivers/phy/marvell/phy-mvebu-cp110-comphy.c | 4 +- + drivers/phy/mediatek/phy-mtk-tphy.c | 30 +- + drivers/phy/mediatek/phy-mtk-xsphy.c | 27 +- + drivers/phy/nuvoton/Kconfig | 12 + + drivers/phy/nuvoton/Makefile | 3 + + drivers/phy/nuvoton/phy-ma35d1-usb2.c | 143 +++++ + drivers/phy/phy-airoha-pcie.c | 6 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 38 +- + drivers/phy/qualcomm/phy-qcom-qmp-common.h | 19 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 19 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 83 ++- + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 12 +- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 10 +- + drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 13 +- + drivers/phy/renesas/phy-rcar-gen3-usb2.c | 60 +- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 206 ++++++- + drivers/phy/samsung/phy-exynos5-usbdrd.c | 12 +- + drivers/phy/ti/phy-am654-serdes.c | 50 +- + drivers/phy/ti/phy-gmii-sel.c | 16 +- + drivers/phy/ti/phy-j721e-wiz.c | 16 +- + 41 files changed, 1194 insertions(+), 796 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/hisilicon,hi3798cv200-combphy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/nuvoton,ma35d1-usb2-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-hi3798cv200-combphy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,sata-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-8x16-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/qcom-apq8064-sata-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/qcom-ipq806x-sata-phy.txt + create mode 100644 drivers/phy/nuvoton/Kconfig + create mode 100644 drivers/phy/nuvoton/Makefile + create mode 100644 drivers/phy/nuvoton/phy-ma35d1-usb2.c +Merging soundwire/next (5aedb8d8336b soundwire: intel_bus_common: enable interrupts before exiting reset) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging drivers/soundwire/intel.h +Auto-merging drivers/soundwire/intel_auxdevice.c +Merge made by the 'ort' strategy. + drivers/soundwire/bus_type.c | 19 ++++-------------- + drivers/soundwire/cadence_master.c | 39 ++++++++++++++++++++++++++++++++++-- + drivers/soundwire/cadence_master.h | 5 +++++ + drivers/soundwire/intel.h | 2 ++ + drivers/soundwire/intel_auxdevice.c | 1 + + drivers/soundwire/intel_bus_common.c | 35 +++++++++++++++++++++----------- + include/linux/soundwire/sdw.h | 2 -- + 7 files changed, 72 insertions(+), 31 deletions(-) +Merging extcon/extcon-next (2e01ac83c1c7 extcon: lc824206xa: Fix build error of POWER_SUPPLY_PROP_USB_TYPE) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (8400291e289e Linux 6.11-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 (aab439ffa1ca vfio/pci: clean up a type in vfio_pci_ioctl_pci_hot_reset_groups()) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging drivers/vfio/pci/vfio_pci_core.c +Merge made by the 'ort' strategy. + drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 4 +--- + drivers/vfio/mdev/mdev_private.h | 3 --- + drivers/vfio/mdev/mdev_sysfs.c | 2 +- + drivers/vfio/pci/vfio_pci_core.c | 7 +------ + 4 files changed, 3 insertions(+), 13 deletions(-) +Merging w1/for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging spmi/spmi-next (7c626ce4bae1 Linux 6.11-rc3) +$ git merge -m Merge branch 'spmi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Already up to date. +Merging staging/staging-next (b4fdf9b1cd8b staging: vt6655: Rename variable apTD1Rings) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging drivers/staging/rtl8192e/rtllib_crypt_tkip.c +Merge made by the 'ort' strategy. + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/fbtft/fb_ili9320.c | 2 - + drivers/staging/fbtft/fb_ra8875.c | 7 - + drivers/staging/fbtft/fb_sh1106.c | 3 - + drivers/staging/fbtft/fb_ssd1289.c | 3 - + drivers/staging/fbtft/fb_ssd1306.c | 3 - + drivers/staging/fbtft/fb_ssd1325.c | 9 - + drivers/staging/fbtft/fb_ssd1331.c | 2 - + drivers/staging/fbtft/fb_ssd1351.c | 5 +- + drivers/staging/fbtft/fb_uc1611.c | 3 - + drivers/staging/fbtft/fbtft-bus.c | 9 - + drivers/staging/fbtft/fbtft-core.c | 13 +- + drivers/staging/fbtft/fbtft-sysfs.c | 4 - + drivers/staging/fbtft/fbtft.h | 2 + + drivers/staging/greybus/gb-camera.h | 4 +- + drivers/staging/greybus/spilib.c | 6 +- + drivers/staging/ks7010/Kconfig | 14 - + drivers/staging/ks7010/Makefile | 4 - + drivers/staging/ks7010/TODO | 36 - + drivers/staging/ks7010/eap_packet.h | 70 - + drivers/staging/ks7010/ks7010_sdio.c | 1143 --------- + drivers/staging/ks7010/ks_hostif.c | 2312 ----------------- + drivers/staging/ks7010/ks_hostif.h | 617 ----- + drivers/staging/ks7010/ks_wlan.h | 567 ----- + drivers/staging/ks7010/ks_wlan_ioctl.h | 61 - + drivers/staging/ks7010/ks_wlan_net.c | 2676 -------------------- + .../iterator/iterator_1.0/ia_css_iterator.host.c | 3 +- + drivers/staging/most/video/video.c | 6 +- + drivers/staging/nvec/nvec.c | 17 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_def.h | 5 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 10 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 89 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_hw.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 67 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.h | 6 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 20 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 3 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 3 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 15 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 40 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 30 +- + drivers/staging/rtl8192e/rtllib.h | 141 +- + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 6 - + drivers/staging/rtl8192e/rtllib_rx.c | 140 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 4 +- + drivers/staging/rtl8712/rtl8712_recv.c | 4 - + drivers/staging/rtl8712/rtl871x_cmd.c | 5 +- + drivers/staging/rtl8712/rtl871x_cmd.h | 2 +- + drivers/staging/rtl8712/rtl871x_io.c | 4 +- + drivers/staging/rtl8712/usb_ops_linux.c | 2 +- + drivers/staging/rtl8723bs/Kconfig | 1 - + drivers/staging/rtl8723bs/Makefile | 2 - + drivers/staging/rtl8723bs/core/rtw_ap.c | 5 +- + drivers/staging/rtl8723bs/core/rtw_btcoex.c | 1 - + drivers/staging/rtl8723bs/core/rtw_cmd.c | 4 - + drivers/staging/rtl8723bs/core/rtw_debug.c | 68 - + drivers/staging/rtl8723bs/core/rtw_efuse.c | 60 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 5 +- + drivers/staging/rtl8723bs/core/rtw_io.c | 1 - + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 1 - + drivers/staging/rtl8723bs/core/rtw_mlme.c | 1 - + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 7 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 3 - + drivers/staging/rtl8723bs/core/rtw_recv.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_rf.c | 34 - + drivers/staging/rtl8723bs/core/rtw_security.c | 1 - + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 1 - + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 3 +- + drivers/staging/rtl8723bs/core/rtw_xmit.c | 3 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 1 - + drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 1 - + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 1 - + drivers/staging/rtl8723bs/hal/hal_com.c | 1 - + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 1 - + drivers/staging/rtl8723bs/hal/hal_intf.c | 7 - + drivers/staging/rtl8723bs/hal/hal_sdio.c | 1 - + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 1 - + drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 1 - + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 1 - + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 1 - + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 1 - + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 1 - + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 5 +- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 1 - + drivers/staging/rtl8723bs/include/drv_types.h | 7 - + drivers/staging/rtl8723bs/include/hal_intf.h | 1 - + drivers/staging/rtl8723bs/include/hal_pwr_seq.h | 2 +- + drivers/staging/rtl8723bs/include/osdep_service.h | 4 +- + .../rtl8723bs/include/osdep_service_linux.h | 68 +- + drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_cmd.h | 4 - + drivers/staging/rtl8723bs/include/rtw_debug.h | 14 - + drivers/staging/rtl8723bs/include/rtw_event.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_io.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 2 +- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 6 +- + drivers/staging/rtl8723bs/include/rtw_recv.h | 10 - + drivers/staging/rtl8723bs/include/rtw_rf.h | 2 - + drivers/staging/rtl8723bs/include/rtw_security.h | 127 +- + drivers/staging/rtl8723bs/include/rtw_xmit.h | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 1 - + drivers/staging/rtl8723bs/os_dep/ioctl_linux.c | 1 - + drivers/staging/rtl8723bs/os_dep/mlme_linux.c | 1 - + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 1 - + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 1 - + drivers/staging/rtl8723bs/os_dep/recv_linux.c | 1 - + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 1 - + drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 1 - + drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 1 - + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 4 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 20 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 343 ++- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 16 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 15 +- + drivers/staging/vme_user/vme.c | 10 +- + drivers/staging/vme_user/vme.h | 17 +- + drivers/staging/vme_user/vme_fake.c | 10 +- + drivers/staging/vme_user/vme_tsi148.c | 155 +- + drivers/staging/vt6655/TODO | 2 +- + drivers/staging/vt6655/card.c | 12 +- + drivers/staging/vt6655/card.h | 4 +- + drivers/staging/vt6655/device.h | 12 +- + drivers/staging/vt6655/device_main.c | 34 +- + drivers/staging/vt6655/mac.h | 4 +- + drivers/staging/vt6655/rxtx.c | 14 +- + 128 files changed, 835 insertions(+), 8539 deletions(-) + delete mode 100644 drivers/staging/ks7010/Kconfig + delete mode 100644 drivers/staging/ks7010/Makefile + delete mode 100644 drivers/staging/ks7010/TODO + delete mode 100644 drivers/staging/ks7010/eap_packet.h + delete mode 100644 drivers/staging/ks7010/ks7010_sdio.c + delete mode 100644 drivers/staging/ks7010/ks_hostif.c + delete mode 100644 drivers/staging/ks7010/ks_hostif.h + delete mode 100644 drivers/staging/ks7010/ks_wlan.h + delete mode 100644 drivers/staging/ks7010/ks_wlan_ioctl.h + delete mode 100644 drivers/staging/ks7010/ks_wlan_net.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_debug.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_rf.c + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_debug.h +Merging counter-next/counter-next (0d0f611bdf8e counter: ftm-quaddec: Enable module autoloading) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Merge made by the 'ort' strategy. + drivers/counter/ftm-quaddec.c | 1 + + 1 file changed, 1 insertion(+) +Merging siox/siox/for-next (db418d5f1ca5 siox: bus-gpio: Simplify using devm_siox_* functions) +$ git merge -m Merge branch 'siox/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git siox/siox/for-next +Already up to date. +Merging mux/for-next (5be63fc19fca Linux 6.11-rc5) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (e0bee4bcdc32 dmaengine: loongson1-apb-dma: Fix the build warning caused by the size of pdev_irqname) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging MAINTAINERS +Auto-merging drivers/dma/ep93xx_dma.c +Auto-merging drivers/dma/idma64.c +Auto-merging drivers/dma/idxd/init.c +Auto-merging drivers/dma/idxd/perfmon.c +Auto-merging drivers/dma/qcom/bam_dma.c +Auto-merging include/linux/pci_ids.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/fsl,imx-dma.yaml | 14 + + .../devicetree/bindings/dma/fsl,mxs-dma.yaml | 15 + + .../devicetree/bindings/dma/fsl-qdma.yaml | 13 +- + .../bindings/dma/loongson,ls1b-apbdma.yaml | 65 ++ + .../devicetree/bindings/dma/marvell,xor-v2.yaml | 61 ++ + .../devicetree/bindings/dma/mv-xor-v2.txt | 28 - + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 1 + + .../bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml | 4 +- + MAINTAINERS | 9 + + arch/arm/mach-lpc32xx/Kconfig | 1 + + drivers/dma/Kconfig | 20 + + drivers/dma/Makefile | 3 + + drivers/dma/acpi-dma.c | 4 +- + drivers/dma/altera-msgdma.c | 4 +- + drivers/dma/amba-pl08x.c | 2 +- + drivers/dma/amd/Kconfig | 14 + + drivers/dma/amd/Makefile | 3 + + drivers/dma/amd/qdma/Makefile | 5 + + drivers/dma/amd/qdma/qdma-comm-regs.c | 64 ++ + drivers/dma/amd/qdma/qdma.c | 1143 ++++++++++++++++++++ + drivers/dma/amd/qdma/qdma.h | 266 +++++ + drivers/dma/at_hdmac.c | 6 +- + drivers/dma/bcm-sba-raid.c | 4 +- + drivers/dma/bcm2835-dma.c | 2 +- + drivers/dma/dmaengine.c | 2 +- + drivers/dma/dmatest.c | 2 +- + drivers/dma/ep93xx_dma.c | 4 +- + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.h | 6 +- + drivers/dma/fsl-edma-main.c | 27 +- + drivers/dma/hisi_dma.c | 2 +- + drivers/dma/idma64.c | 4 +- + drivers/dma/idxd/init.c | 6 + + drivers/dma/idxd/perfmon.c | 4 +- + drivers/dma/idxd/submit.c | 2 +- + drivers/dma/imx-dma.c | 3 - + drivers/dma/ioat/init.c | 2 +- + drivers/dma/lgm/lgm-dma.c | 2 +- + drivers/dma/loongson1-apb-dma.c | 660 +++++++++++ + drivers/dma/lpc32xx-dmamux.c | 195 ++++ + drivers/dma/ls2x-apb-dma.c | 4 +- + drivers/dma/mediatek/mtk-cqdma.c | 4 +- + drivers/dma/mediatek/mtk-hsdma.c | 2 +- + drivers/dma/mv_xor.c | 4 +- + drivers/dma/mv_xor.h | 2 +- + drivers/dma/mv_xor_v2.c | 2 +- + drivers/dma/nbpfaxi.c | 2 +- + drivers/dma/of-dma.c | 4 +- + drivers/dma/owl-dma.c | 2 +- + drivers/dma/ppc4xx/adma.c | 2 +- + drivers/dma/ppc4xx/dma.h | 2 +- + drivers/dma/ptdma/ptdma.h | 2 +- + drivers/dma/qcom/bam_dma.c | 4 +- + drivers/dma/qcom/gpi.c | 2 +- + drivers/dma/qcom/qcom_adm.c | 2 +- + drivers/dma/sh/shdmac.c | 2 +- + drivers/dma/ste_dma40.h | 2 +- + drivers/dma/ste_dma40_ll.h | 2 +- + drivers/dma/tegra20-apb-dma.c | 2 +- + drivers/dma/ti/k3-udma.h | 1 - + drivers/dma/xgene-dma.c | 2 +- + drivers/dma/xilinx/xilinx_dpdma.c | 101 +- + drivers/dma/xilinx/zynqmp_dma.c | 27 +- + include/linux/dma/ipu-dma.h | 174 --- + include/linux/dma/k3-udma-glue.h | 2 - + include/linux/pci_ids.h | 3 + + include/linux/platform_data/amd_qdma.h | 36 + + 66 files changed, 2791 insertions(+), 275 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/loongson,ls1b-apbdma.yaml + create mode 100644 Documentation/devicetree/bindings/dma/marvell,xor-v2.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/mv-xor-v2.txt + create mode 100644 drivers/dma/amd/Kconfig + create mode 100644 drivers/dma/amd/Makefile + create mode 100644 drivers/dma/amd/qdma/Makefile + create mode 100644 drivers/dma/amd/qdma/qdma-comm-regs.c + create mode 100644 drivers/dma/amd/qdma/qdma.c + create mode 100644 drivers/dma/amd/qdma/qdma.h + create mode 100644 drivers/dma/loongson1-apb-dma.c + create mode 100644 drivers/dma/lpc32xx-dmamux.c + delete mode 100644 include/linux/dma/ipu-dma.h + create mode 100644 include/linux/platform_data/amd_qdma.h +Merging cgroup/for-next (df57390127a2 Merge branch 'for-6.12' 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 Documentation/admin-guide/cgroup-v2.rst +Auto-merging Documentation/core-api/index.rst +Auto-merging MAINTAINERS +Auto-merging include/linux/cgroup-defs.h +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Auto-merging kernel/cgroup/cgroup.c +Auto-merging kernel/fork.c +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 22 +- + Documentation/core-api/index.rst | 1 + + Documentation/core-api/union_find.rst | 106 ++ + .../translations/zh_CN/core-api/index.rst | 1 + + .../translations/zh_CN/core-api/union_find.rst | 92 ++ + MAINTAINERS | 12 + + include/linux/cgroup-defs.h | 14 + + include/linux/cpuset.h | 10 +- + include/linux/sched.h | 1 - + include/linux/union_find.h | 41 + + init/Kconfig | 13 + + kernel/cgroup/Makefile | 1 + + kernel/cgroup/cgroup-v1.c | 17 +- + kernel/cgroup/cgroup.c | 68 +- + kernel/cgroup/cpuset-internal.h | 305 ++++++ + kernel/cgroup/cpuset-v1.c | 562 ++++++++++ + kernel/cgroup/cpuset.c | 1155 +++----------------- + kernel/cgroup/pids.c | 32 +- + kernel/fork.c | 1 - + lib/Makefile | 2 +- + lib/union_find.c | 49 + + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 56 +- + .../selftests/cgroup/test_cpuset_v1_base.sh | 77 ++ + 23 files changed, 1569 insertions(+), 1069 deletions(-) + create mode 100644 Documentation/core-api/union_find.rst + create mode 100644 Documentation/translations/zh_CN/core-api/union_find.rst + create mode 100644 include/linux/union_find.h + create mode 100644 kernel/cgroup/cpuset-internal.h + create mode 100644 kernel/cgroup/cpuset-v1.c + create mode 100644 lib/union_find.c + create mode 100755 tools/testing/selftests/cgroup/test_cpuset_v1_base.sh +Merging scsi/for-next (5fe9a493006d Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 27 + + block/blk-core.c | 1 + + drivers/message/fusion/lsi/mpi_cnfg.h | 60 +- + drivers/message/fusion/mptbase.c | 10 +- + drivers/message/fusion/mptbase.h | 3 - + drivers/message/fusion/mptfc.c | 7 +- + drivers/scsi/NCR5380.c | 233 ++++--- + drivers/scsi/NCR5380.h | 20 +- + drivers/scsi/aacraid/aachba.c | 28 +- + drivers/scsi/aacraid/aacraid.h | 21 +- + drivers/scsi/aacraid/commctrl.c | 4 +- + drivers/scsi/aacraid/comminit.c | 3 +- + drivers/scsi/aacraid/commsup.c | 5 +- + drivers/scsi/aacraid/src.c | 2 +- + drivers/scsi/be2iscsi/be_main.c | 6 +- + drivers/scsi/bfa/bfad_im.c | 5 +- + drivers/scsi/bfa/bfad_im.h | 1 - + drivers/scsi/bnx2fc/bnx2fc.h | 6 - + drivers/scsi/bnx2fc/bnx2fc_fcoe.c | 4 +- + drivers/scsi/bnx2i/bnx2i.h | 11 - + drivers/scsi/device_handler/scsi_dh_rdac.c | 3 +- + drivers/scsi/elx/efct/efct_lio.c | 3 +- + drivers/scsi/elx/libefc/efc_nport.c | 2 +- + drivers/scsi/esas2r/esas2r.h | 1 - + drivers/scsi/esas2r/esas2r_init.c | 5 +- + drivers/scsi/fcoe/fcoe_sysfs.c | 18 +- + drivers/scsi/fnic/fnic_main.c | 6 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 3 +- + drivers/scsi/hosts.c | 9 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 5 +- + drivers/scsi/ipr.h | 4 +- + drivers/scsi/libfc/fc_exch.c | 3 +- + drivers/scsi/libfc/fc_rport.c | 3 +- + drivers/scsi/libsas/sas_init.c | 4 +- + drivers/scsi/lpfc/lpfc.h | 12 +- + drivers/scsi/lpfc/lpfc_els.c | 79 ++- + drivers/scsi/lpfc/lpfc_hbadisc.c | 14 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 22 +- + drivers/scsi/lpfc/lpfc_scsi.c | 13 +- + drivers/scsi/lpfc/lpfc_sli.c | 13 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vmid.c | 3 +- + drivers/scsi/mac_scsi.c | 174 +++--- + drivers/scsi/megaraid/megaraid_sas.h | 6 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 4 +- + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 10 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 10 +- + drivers/scsi/mpi3mr/mpi3mr.h | 7 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 36 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_base.h | 4 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +- + drivers/scsi/myrb.c | 5 +- + drivers/scsi/myrb.h | 1 - + drivers/scsi/myrs.c | 5 +- + drivers/scsi/myrs.h | 1 - + drivers/scsi/qedf/qedf_main.c | 20 +- + drivers/scsi/qedi/qedi_main.c | 8 +- + drivers/scsi/qla2xxx/qla_def.h | 1 - + drivers/scsi/qla2xxx/qla_os.c | 6 +- + drivers/scsi/qla4xxx/ql4_os.c | 2 +- + drivers/scsi/scsi_transport_fc.c | 11 +- + drivers/scsi/sd.c | 2 +- + drivers/scsi/smartpqi/smartpqi.h | 39 +- + drivers/scsi/smartpqi/smartpqi_init.c | 666 ++++++++++++++------- + drivers/scsi/smartpqi/smartpqi_sis.c | 60 ++ + drivers/scsi/smartpqi/smartpqi_sis.h | 3 + + drivers/scsi/snic/snic_main.c | 10 +- + drivers/scsi/stex.c | 6 +- + drivers/scsi/sun3_scsi.c | 2 +- + drivers/scsi/vmw_pvscsi.c | 3 +- + drivers/target/iscsi/iscsi_target.h | 2 - + drivers/target/iscsi/iscsi_target_login.h | 1 - + drivers/target/iscsi/iscsi_target_nego.h | 2 - + drivers/target/iscsi/iscsi_target_tpg.h | 5 - + drivers/target/iscsi/iscsi_target_util.h | 5 - + drivers/ufs/core/ufs-sysfs.c | 91 ++- + .../events/ufs.h => drivers/ufs/core/ufs_trace.h | 6 + + drivers/ufs/core/ufshcd.c | 85 ++- + drivers/ufs/host/ufshcd-pltfrm.c | 14 +- + include/scsi/fcoe_sysfs.h | 2 - + include/scsi/scsi_dbg.h | 7 - + include/scsi/scsi_host.h | 1 - + include/scsi/scsi_transport_fc.h | 6 - + include/ufs/ufs.h | 4 +- + include/ufs/ufshci.h | 5 +- + 87 files changed, 1185 insertions(+), 849 deletions(-) + rename include/trace/events/ufs.h => drivers/ufs/core/ufs_trace.h (98%) +Merging scsi-mkp/for-next (359aeb86480d Merge patch series "Update lpfc to revision 14.4.0.5") +$ 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/lpfc/lpfc_bsg.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/ufs/host/ufs-qcom.c +Merge made by the 'ort' strategy. + drivers/message/fusion/mptctl.c | 2 +- + drivers/scsi/cxgbi/libcxgbi.h | 3 - + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 2 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 21 ++++- + drivers/scsi/ibmvscsi/ibmvfc.h | 2 +- + drivers/scsi/lpfc/lpfc_bsg.c | 3 + + drivers/scsi/lpfc/lpfc_ct.c | 22 +++-- + drivers/scsi/lpfc/lpfc_disc.h | 7 ++ + drivers/scsi/lpfc/lpfc_els.c | 132 ++++++++++++++---------------- + drivers/scsi/lpfc/lpfc_hbadisc.c | 10 +-- + drivers/scsi/lpfc/lpfc_hw.h | 21 +++++ + drivers/scsi/lpfc/lpfc_hw4.h | 3 + + drivers/scsi/lpfc/lpfc_init.c | 32 ++++++-- + drivers/scsi/lpfc/lpfc_scsi.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 52 ++++++++++-- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/lpfc/lpfc_vport.c | 43 ++++++++-- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 +- + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 35 +++++++- + drivers/scsi/mpi3mr/mpi/mpi30_image.h | 13 ++- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 8 ++ + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 4 +- + drivers/scsi/mpi3mr/mpi3mr.h | 10 ++- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 79 ++++++++++++++---- + drivers/scsi/mpt3sas/mpt3sas_base.c | 5 +- + drivers/scsi/pm8001/pm8001_init.c | 6 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/qedf/qedf_io.c | 2 +- + drivers/scsi/scsi_debug.c | 1 - + drivers/scsi/sd.c | 32 +++++++- + drivers/scsi/st.c | 5 +- + drivers/scsi/zalon.c | 2 +- + drivers/ufs/host/ufs-qcom.c | 2 +- + 34 files changed, 415 insertions(+), 154 deletions(-) +Merging vhost/linux-next (1bc6f4910ae9 vsock/virtio: avoid queuing packets when intermediate queue is empty) +$ 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 MAINTAINERS +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c +Auto-merging fs/fuse/virtio_fs.c +Auto-merging net/vmw_vsock/virtio_transport.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/firmware/qemu_fw_cfg.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 21 +- + drivers/nvdimm/nd_virtio.c | 9 + + drivers/vdpa/ifcvf/ifcvf_base.h | 3 - + drivers/vdpa/mlx5/core/mlx5_vdpa.h | 47 ++- + drivers/vdpa/mlx5/core/mr.c | 291 +++++++++++++--- + drivers/vdpa/mlx5/core/resources.c | 76 +++- + drivers/vdpa/mlx5/net/mlx5_vnet.c | 477 +++++++++++++++++--------- + drivers/vdpa/pds/cmds.h | 1 - + drivers/vdpa/vdpa.c | 79 +++++ + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 21 +- + drivers/vhost/vdpa.c | 16 +- + drivers/virtio/virtio_balloon.c | 18 + + fs/fuse/virtio_fs.c | 164 ++++++++- + include/linux/vdpa.h | 9 + + include/uapi/linux/vdpa.h | 1 + + include/uapi/linux/virtio_balloon.h | 16 +- + net/vmw_vsock/virtio_transport.c | 144 +++++--- + tools/virtio/ringtest/main.c | 2 +- + 20 files changed, 1098 insertions(+), 300 deletions(-) +Merging rpmsg/for-next (752ce45a66ec Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../bindings/hwlock/sprd,hwspinlock-r3p0.yaml | 50 ++ + .../devicetree/bindings/hwlock/sprd-hwspinlock.txt | 23 - + .../bindings/remoteproc/qcom,sm8550-pas.yaml | 3 + + .../bindings/remoteproc/ti,k3-m4f-rproc.yaml | 125 ++++ + .../bindings/remoteproc/xlnx,zynqmp-r5fss.yaml | 1 + + drivers/remoteproc/Kconfig | 13 + + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/da8xx_remoteproc.c | 10 +- + drivers/remoteproc/imx_dsp_rproc.c | 2 +- + drivers/remoteproc/imx_rproc.c | 93 ++- + drivers/remoteproc/imx_rproc.h | 4 + + drivers/remoteproc/ingenic_rproc.c | 3 +- + drivers/remoteproc/keystone_remoteproc.c | 21 +- + drivers/remoteproc/qcom_q6v5_pas.c | 93 +++ + drivers/remoteproc/st_slim_rproc.c | 6 +- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 108 +--- + drivers/remoteproc/ti_k3_m4_remoteproc.c | 667 +++++++++++++++++++++ + drivers/remoteproc/ti_k3_r5_remoteproc.c | 130 ++-- + drivers/remoteproc/ti_sci_proc.h | 26 + + drivers/remoteproc/xlnx_r5_remoteproc.c | 141 ++++- + drivers/rpmsg/Makefile | 1 + + drivers/rpmsg/qcom_glink_native.c | 166 ++++- + drivers/rpmsg/qcom_glink_trace.h | 406 +++++++++++++ + 23 files changed, 1817 insertions(+), 276 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwlock/sprd,hwspinlock-r3p0.yaml + delete mode 100644 Documentation/devicetree/bindings/hwlock/sprd-hwspinlock.txt + create mode 100644 Documentation/devicetree/bindings/remoteproc/ti,k3-m4f-rproc.yaml + create mode 100644 drivers/remoteproc/ti_k3_m4_remoteproc.c + create mode 100644 drivers/rpmsg/qcom_glink_trace.h +Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-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 (6b5e97c02006 gpio: mpc8xxx: switch to using DEFINE_RUNTIME_DEV_PM_OPS()) +$ 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 +CONFLICT (modify/delete): arch/arm/mach-ep93xx/vision_ep9307.c deleted in HEAD and modified in gpio-brgl/gpio/for-next. Version gpio-brgl/gpio/for-next of arch/arm/mach-ep93xx/vision_ep9307.c left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-ep93xx/vision_ep9307.c +rm 'arch/arm/mach-ep93xx/vision_ep9307.c' +$ git commit --no-edit -v -a +[master 6f9bfb49aa36] Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/gpio/fairchild,74hc595.yaml | 11 -- + .../devicetree/bindings/gpio/fcs,fxl6408.yaml | 1 + + .../devicetree/bindings/gpio/fsl-imx-gpio.yaml | 11 -- + .../devicetree/bindings/gpio/gpio-davinci.yaml | 2 + + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 11 -- + .../devicetree/bindings/gpio/gpio_lpc32xx.txt | 43 ------ + .../bindings/gpio/microchip,mpfs-gpio.yaml | 12 -- + .../devicetree/bindings/gpio/nxp,lpc3220-gpio.yaml | 50 +++++++ + .../bindings/gpio/socionext,uniphier-gpio.yaml | 11 -- + arch/mips/bcm63xx/boards/board_bcm963xx.c | 2 +- + drivers/gpio/gpio-ath79.c | 31 ++-- + drivers/gpio/gpio-cadence.c | 23 +-- + drivers/gpio/gpio-davinci.c | 102 ++++--------- + drivers/gpio/gpio-fxl6408.c | 2 +- + drivers/gpio/gpio-ixp4xx.c | 10 +- + drivers/gpio/gpio-lpc18xx.c | 23 +-- + drivers/gpio/gpio-max7300.c | 2 +- + drivers/gpio/gpio-mb86s7x.c | 21 +-- + drivers/gpio/gpio-mpc8xxx.c | 50 +++++-- + drivers/gpio/gpio-msc313.c | 5 +- + drivers/gpio/gpio-pca953x.c | 4 +- + drivers/gpio/gpio-pch.c | 1 - + drivers/gpio/gpio-sama5d2-piobu.c | 18 +-- + drivers/gpio/gpio-stmpe.c | 55 +++---- + drivers/gpio/gpio-stp-xway.c | 10 +- + drivers/gpio/gpio-syscon.c | 1 - + drivers/gpio/gpio-tegra.c | 5 +- + drivers/gpio/gpio-tegra186.c | 3 +- + drivers/gpio/gpio-thunderx.c | 5 +- + drivers/gpio/gpio-uniphier.c | 5 +- + drivers/gpio/gpio-vf610.c | 31 +++- + drivers/gpio/gpio-virtuser.c | 13 +- + drivers/gpio/gpio-visconti.c | 5 +- + drivers/gpio/gpio-xilinx.c | 11 +- + drivers/gpio/gpio-zynq.c | 10 +- + drivers/gpio/gpiolib-acpi.c | 43 +++--- + drivers/gpio/gpiolib-cdev.c | 8 +- + drivers/gpio/gpiolib-devres.c | 120 ++++++--------- + drivers/gpio/gpiolib-legacy.c | 94 +++++++++++- + drivers/gpio/gpiolib-of.c | 92 ++++++------ + drivers/gpio/gpiolib-swnode.c | 62 ++++---- + drivers/gpio/gpiolib-sysfs.c | 6 +- + drivers/gpio/gpiolib.c | 164 ++++++++++++++++----- + drivers/gpio/gpiolib.h | 16 +- + include/linux/gpio.h | 12 +- + include/linux/platform_data/gpio-ath79.h | 16 -- + include/linux/platform_data/gpio-davinci.h | 21 --- + tools/gpio/Makefile | 2 +- + tools/gpio/gpio-hammer.c | 4 +- + 49 files changed, 625 insertions(+), 635 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio_lpc32xx.txt + create mode 100644 Documentation/devicetree/bindings/gpio/nxp,lpc3220-gpio.yaml + delete mode 100644 include/linux/platform_data/gpio-ath79.h + delete mode 100644 include/linux/platform_data/gpio-davinci.h +Merging gpio-intel/for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (b8b23101552d 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 drivers/pinctrl/Kconfig +Auto-merging drivers/pinctrl/Makefile +CONFLICT (content): Merge conflict in drivers/pinctrl/Makefile +Resolved 'drivers/pinctrl/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ed8295633320] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/pinctrl/mobileye,eyeq5-pinctrl.yaml | 242 ------- + .../bindings/pinctrl/nuvoton,npcm845-pinctrl.yaml | 70 +- + .../devicetree/bindings/pinctrl/pincfg-node.yaml | 3 + + .../bindings/pinctrl/qcom,apq8064-pinctrl.txt | 95 --- + .../bindings/pinctrl/qcom,apq8064-pinctrl.yaml | 110 +++ + .../bindings/pinctrl/qcom,apq8084-pinctrl.txt | 188 ----- + .../bindings/pinctrl/qcom,apq8084-pinctrl.yaml | 129 ++++ + .../bindings/pinctrl/qcom,ipq4019-pinctrl.txt | 85 --- + .../bindings/pinctrl/qcom,ipq4019-pinctrl.yaml | 103 +++ + .../bindings/pinctrl/qcom,ipq8064-pinctrl.txt | 101 --- + .../bindings/pinctrl/qcom,ipq8064-pinctrl.yaml | 108 +++ + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 1 + + .../bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 1 + + .../devicetree/bindings/pinctrl/renesas,pfc.yaml | 1 + + .../bindings/pinctrl/rockchip,pinctrl.yaml | 1 + + .../bindings/pinctrl/sophgo,cv1800-pinctrl.yaml | 122 ++++ + drivers/pinctrl/Kconfig | 16 + + drivers/pinctrl/Makefile | 4 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 1 + + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 9 +- + drivers/pinctrl/core.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx-scmi.c | 2 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 7 +- + drivers/pinctrl/freescale/pinctrl-imx8mq.c | 2 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 7 +- + drivers/pinctrl/intel/pinctrl-intel.c | 326 +++++---- + drivers/pinctrl/intel/pinctrl-intel.h | 3 +- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-paris.c | 7 +- + drivers/pinctrl/meson/pinctrl-amlogic-c3.c | 12 +- + drivers/pinctrl/meson/pinctrl-amlogic-t7.c | 12 +- + drivers/pinctrl/meson/pinctrl-meson-a1.c | 12 +- + drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 12 +- + drivers/pinctrl/meson/pinctrl-meson-axg-pmx.h | 2 +- + drivers/pinctrl/meson/pinctrl-meson-axg.c | 24 +- + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 24 +- + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 16 +- + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 16 +- + drivers/pinctrl/meson/pinctrl-meson-s4.c | 12 +- + drivers/pinctrl/meson/pinctrl-meson.c | 25 +- + drivers/pinctrl/meson/pinctrl-meson.h | 8 +- + drivers/pinctrl/meson/pinctrl-meson8-pmx.c | 6 +- + drivers/pinctrl/meson/pinctrl-meson8.c | 16 +- + drivers/pinctrl/meson/pinctrl-meson8b.c | 16 +- + drivers/pinctrl/mvebu/pinctrl-dove.c | 42 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 3 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 3 +- + drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 64 +- + drivers/pinctrl/nxp/pinctrl-s32cc.c | 51 +- + drivers/pinctrl/pinconf-generic.c | 2 + + drivers/pinctrl/pinctrl-eyeq5.c | 575 +++++++++++++++ + drivers/pinctrl/pinctrl-k210.c | 35 +- + drivers/pinctrl/pinctrl-rockchip.c | 207 ++++++ + drivers/pinctrl/pinctrl-rockchip.h | 1 + + drivers/pinctrl/pinctrl-single.c | 3 +- + drivers/pinctrl/pinctrl-stmfx.c | 5 +- + drivers/pinctrl/pinctrl-utils.c | 4 +- + drivers/pinctrl/pinctrl-zynq.c | 1 + + drivers/pinctrl/pinmux.c | 7 +- + drivers/pinctrl/realtek/pinctrl-rtd.c | 2 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 117 ++-- + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 3 +- + drivers/pinctrl/renesas/pinctrl.c | 3 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm.c | 14 + + drivers/pinctrl/samsung/pinctrl-exynos.c | 16 +- + drivers/pinctrl/samsung/pinctrl-s3c64xx.c | 14 + + drivers/pinctrl/samsung/pinctrl-samsung.c | 108 ++- + drivers/pinctrl/samsung/pinctrl-samsung.h | 21 + + drivers/pinctrl/sophgo/Kconfig | 54 ++ + drivers/pinctrl/sophgo/Makefile | 7 + + drivers/pinctrl/sophgo/pinctrl-cv1800b.c | 462 ++++++++++++ + drivers/pinctrl/sophgo/pinctrl-cv1812h.c | 771 +++++++++++++++++++++ + drivers/pinctrl/sophgo/pinctrl-cv18xx.c | 765 ++++++++++++++++++++ + drivers/pinctrl/sophgo/pinctrl-cv18xx.h | 155 +++++ + drivers/pinctrl/sophgo/pinctrl-sg2000.c | 771 +++++++++++++++++++++ + drivers/pinctrl/sophgo/pinctrl-sg2002.c | 542 +++++++++++++++ + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 14 +- + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 58 +- + include/dt-bindings/pinctrl/pinctrl-cv1800b.h | 63 ++ + include/dt-bindings/pinctrl/pinctrl-cv1812h.h | 127 ++++ + include/dt-bindings/pinctrl/pinctrl-cv18xx.h | 19 + + include/dt-bindings/pinctrl/pinctrl-sg2000.h | 127 ++++ + include/dt-bindings/pinctrl/pinctrl-sg2002.h | 79 +++ + include/linux/pinctrl/pinconf-generic.h | 3 + + 84 files changed, 6003 insertions(+), 1276 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/mobileye,eyeq5-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,apq8064-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,apq8084-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq4019-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,ipq8064-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/sophgo,cv1800-pinctrl.yaml + create mode 100644 drivers/pinctrl/pinctrl-eyeq5.c + create mode 100644 drivers/pinctrl/sophgo/Kconfig + create mode 100644 drivers/pinctrl/sophgo/Makefile + create mode 100644 drivers/pinctrl/sophgo/pinctrl-cv1800b.c + create mode 100644 drivers/pinctrl/sophgo/pinctrl-cv1812h.c + create mode 100644 drivers/pinctrl/sophgo/pinctrl-cv18xx.c + create mode 100644 drivers/pinctrl/sophgo/pinctrl-cv18xx.h + create mode 100644 drivers/pinctrl/sophgo/pinctrl-sg2000.c + create mode 100644 drivers/pinctrl/sophgo/pinctrl-sg2002.c + create mode 100644 include/dt-bindings/pinctrl/pinctrl-cv1800b.h + create mode 100644 include/dt-bindings/pinctrl/pinctrl-cv1812h.h + create mode 100644 include/dt-bindings/pinctrl/pinctrl-cv18xx.h + create mode 100644 include/dt-bindings/pinctrl/pinctrl-sg2000.h + create mode 100644 include/dt-bindings/pinctrl/pinctrl-sg2002.h +Merging pinctrl-intel/for-next (1652e95b17d5 pinctrl: intel: Constify struct intel_pinctrl parameter) +$ 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 (1325820dd085 pinctrl: renesas: rzg2l: Move pinconf_to_config_argument() call outside of switch cases) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (39dbbd4e6778 pinctrl: samsung: Use kmemdup_array instead of kmemdup for multiple allocation) +$ 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/pwm/for-next (d242feaf81d6 pwm: stm32: Fix a typo) +$ git merge -m Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Merge made by the 'ort' strategy. + .../bindings/pwm/allwinner,sun4i-a10-pwm.yaml | 9 +++++---- + Documentation/devicetree/bindings/pwm/pwm-amlogic.yaml | 17 +++++++++++++++++ + .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 1 + + .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 1 + + drivers/pwm/core.c | 13 ++++++------- + drivers/pwm/pwm-adp5585.c | 4 ++++ + drivers/pwm/pwm-atmel-hlcdc.c | 7 ++++--- + drivers/pwm/pwm-atmel-tcb.c | 2 +- + drivers/pwm/pwm-axi-pwmgen.c | 3 +-- + drivers/pwm/pwm-clk.c | 2 +- + drivers/pwm/pwm-hibvt.c | 2 +- + drivers/pwm/pwm-img.c | 2 +- + drivers/pwm/pwm-lp3943.c | 10 +++------- + drivers/pwm/pwm-lpc18xx-sct.c | 2 +- + drivers/pwm/pwm-omap-dmtimer.c | 4 ++-- + drivers/pwm/pwm-rcar.c | 2 +- + drivers/pwm/pwm-rockchip.c | 2 +- + drivers/pwm/pwm-sifive.c | 2 +- + drivers/pwm/pwm-stm32.c | 2 +- + drivers/pwm/pwm-sun4i.c | 2 +- + drivers/pwm/pwm-tegra.c | 2 +- + drivers/pwm/pwm-tiecap.c | 2 +- + drivers/pwm/pwm-tiehrpwm.c | 2 +- + include/linux/pwm.h | 10 ---------- + include/trace/events/pwm.h | 10 ++++++---- + 25 files changed, 63 insertions(+), 52 deletions(-) +Merging ktest/for-next (2351e8c65404 ktest.pl: Avoid false positives with grub2 skip regex) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Merge made by the 'ort' strategy. + tools/testing/ktest/ktest.pl | 28 +++++++++++++++++++--------- + 1 file changed, 19 insertions(+), 9 deletions(-) +Merging kselftest/next (a0474b8d5974 selftests: kselftest: Use strerror() on nolibc) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (8400291e289e Linux 6.11-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 (7fcc9b53216c lib/math: Add int_pow test suite) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging livepatching/for-next (9fbf78b6d6ce Merge branch 'for-6.12/trivial' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. + Documentation/livepatch/livepatch.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc/rtc-next (60a06efc56d7 rtc: m48t59: Remove division condition with direct comparison) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/rtc/sprd,sc2731-rtc.yaml | 49 ++++ + .../devicetree/bindings/rtc/sprd,sc27xx-rtc.txt | 26 -- + .../devicetree/bindings/rtc/st,stm32-rtc.yaml | 28 ++ + .../devicetree/bindings/rtc/trivial-rtc.yaml | 9 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 6 + + drivers/rtc/Kconfig | 16 ++ + drivers/rtc/Makefile | 1 + + drivers/rtc/rtc-at91sam9.c | 1 + + drivers/rtc/rtc-m48t59.c | 2 +- + drivers/rtc/rtc-s35390a.c | 1 - + drivers/rtc/rtc-sd2405al.c | 227 +++++++++++++++++ + drivers/rtc/rtc-stm32.c | 281 +++++++++++++++++++++ + drivers/rtc/rtc-sun6i.c | 1 + + drivers/rtc/rtc-twl.c | 4 +- + 15 files changed, 617 insertions(+), 37 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/sprd,sc2731-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/sprd,sc27xx-rtc.txt + create mode 100644 drivers/rtc/rtc-sd2405al.c +Merging nvdimm/libnvdimm-for-next (447b167bb60d nvdimm: Remove dead code for ENODEV checking in scan_labels()) +$ 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 +Merge made by the 'ort' strategy. + drivers/nvdimm/namespace_devs.c | 43 ++++++++++++++++------------------------- + drivers/nvdimm/of_pmem.c | 2 +- + drivers/nvmem/layouts.c | 2 +- + 3 files changed, 19 insertions(+), 28 deletions(-) +Merging at24/at24/for-next (36e071d2a152 dt-bindings: eeprom: at24: Add compatible for Giantec GT24C04A) +$ 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 (92aee2f6d156 NTB: ntb_transport: fix all kernel-doc warnings) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/ntb/ntb_transport.c +Merge made by the 'ort' strategy. + drivers/ntb/core.c | 4 ++-- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/ntb/ntb_transport.c | 10 ++++++---- + drivers/ntb/test/ntb_perf.c | 2 +- + 4 files changed, 10 insertions(+), 8 deletions(-) +Merging seccomp/for-next/seccomp (de9c2c66ad8e Linux 6.11-rc2) +$ 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 (c5eeb63edac9 fsi: Fix panic on scom file read) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Merge made by the 'ort' strategy. + drivers/fsi/fsi-sbefifo.c | 9 ++++++++- + drivers/fsi/i2cr-scom.c | 11 ++++++++++- + 2 files changed, 18 insertions(+), 2 deletions(-) +Merging slimbus/for-next (8400291e289e Linux 6.11-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 (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Already up to date. +Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (94e86b174d10 tools/hv: Add memory allocation check in hv_fcopy_start) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'ort' strategy. + arch/x86/hyperv/ivm.c | 6 +++--- + drivers/hv/vmbus_drv.c | 34 +++++++++++++++++++++++++++++++--- + tools/hv/hv_fcopy_uio_daemon.c | 7 +++++++ + 3 files changed, 41 insertions(+), 6 deletions(-) +Merging auxdisplay/for-next (8400291e289e Linux 6.11-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Already up to date. +Merging kgdb/kgdb/for-next (9bccbe7b2087 kdb: Get rid of redundant kdb_curr_task()) +$ 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 (6613476e225e Linux 6.8-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 (8400291e289e Linux 6.11-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 (84a5ae5b23ba bus: mhi: host: pci_generic: Enable EDL trigger for Foxconn modems) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (cb088e38aab4 s390/mm: get estimated free pages by memblock api) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Auto-merging arch/s390/mm/init.c +Auto-merging kernel/fork.c +Auto-merging mm/memblock.c +Auto-merging tools/include/linux/string.h +Auto-merging tools/testing/radix-tree/maple.c +CONFLICT (rename/delete): tools/testing/radix-tree/linux/init.h renamed to tools/testing/shared/linux/init.h in HEAD, but deleted in memblock/for-next. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f tools/testing/shared/linux/init.h +rm 'tools/testing/shared/linux/init.h' +$ git commit --no-edit -v -a +[master c5e2b6d71902] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git +$ git diff -M --stat --summary HEAD^.. + arch/s390/mm/init.c | 2 +- + include/linux/memblock.h | 1 + + kernel/fork.c | 2 +- + mm/memblock.c | 17 ++++++++ + tools/include/linux/compiler.h | 4 -- + tools/{testing/memblock => include}/linux/init.h | 19 ++++++--- + tools/include/linux/linkage.h | 2 + + tools/include/linux/mm.h | 6 +++ + tools/include/linux/pfn.h | 1 + + tools/include/linux/string.h | 3 ++ + tools/lib/cmdline.c | 53 ++++++++++++++++++++++++ + tools/testing/memblock/Makefile | 2 +- + tools/testing/memblock/linux/kernel.h | 2 + + tools/testing/memblock/linux/mmzone.h | 1 + + tools/testing/radix-tree/maple.c | 2 +- + tools/testing/shared/linux/init.h | 2 - + 16 files changed, 104 insertions(+), 15 deletions(-) + rename tools/{testing/memblock => include}/linux/init.h (76%) + create mode 100644 tools/lib/cmdline.c + delete mode 100644 tools/testing/shared/linux/init.h +Merging cxl/next (b5209da36b19 cxl: Convert cxl_internal_send_cmd() to use 'struct cxl_mailbox' as input) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +- + drivers/acpi/apei/einj-cxl.c | 2 +- + drivers/acpi/apei/ghes.c | 2 +- + drivers/cxl/core/cdat.c | 1 - + drivers/cxl/core/mbox.c | 94 +++++++++----- + drivers/cxl/core/memdev.c | 41 +++--- + drivers/cxl/core/pci.c | 141 ++++++++------------- + drivers/cxl/core/port.c | 192 ++++++++++++++--------------- + drivers/cxl/core/region.c | 79 ++++++------ + drivers/cxl/cxl.h | 8 +- + drivers/cxl/cxlmem.h | 25 ++-- + drivers/cxl/mem.c | 29 ++--- + drivers/cxl/pci.c | 91 +++++++++----- + drivers/cxl/pmem.c | 26 ++-- + drivers/cxl/port.c | 2 +- + drivers/cxl/security.c | 23 ++-- + include/{linux/einj-cxl.h => cxl/einj.h} | 0 + include/{linux/cxl-event.h => cxl/event.h} | 0 + include/cxl/mailbox.h | 28 +++++ + tools/testing/cxl/Kbuild | 2 +- + tools/testing/cxl/mock_acpi.c | 2 +- + tools/testing/cxl/test/mem.c | 44 +++++-- + tools/testing/cxl/test/mock.c | 10 +- + 23 files changed, 454 insertions(+), 391 deletions(-) + rename include/{linux/einj-cxl.h => cxl/einj.h} (100%) + rename include/{linux/cxl-event.h => cxl/event.h} (100%) + create mode 100644 include/cxl/mailbox.h +Merging zstd/zstd-next (3f832dfb8a8e zstd: fix g_debuglevel export warning) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Auto-merging include/linux/zstd.h +Auto-merging lib/zstd/compress/zstd_compress.c +Auto-merging lib/zstd/zstd_compress_module.c +Auto-merging lib/zstd/zstd_decompress_module.c +Merge made by the 'ort' strategy. + include/linux/zstd.h | 2 +- + include/linux/zstd_errors.h | 23 +- + include/linux/zstd_lib.h | 697 ++++++++-- + lib/zstd/Makefile | 2 +- + lib/zstd/common/allocations.h | 56 + + lib/zstd/common/bits.h | 149 ++ + lib/zstd/common/bitstream.h | 53 +- + lib/zstd/common/compiler.h | 14 +- + lib/zstd/common/cpu.h | 3 +- + lib/zstd/common/debug.c | 5 +- + lib/zstd/common/debug.h | 3 +- + lib/zstd/common/entropy_common.c | 42 +- + lib/zstd/common/error_private.c | 12 +- + lib/zstd/common/error_private.h | 3 +- + lib/zstd/common/fse.h | 89 +- + lib/zstd/common/fse_decompress.c | 94 +- + lib/zstd/common/huf.h | 234 +--- + lib/zstd/common/mem.h | 2 +- + lib/zstd/common/portability_macros.h | 26 +- + lib/zstd/common/zstd_common.c | 38 +- + lib/zstd/common/zstd_deps.h | 16 +- + lib/zstd/common/zstd_internal.h | 99 +- + lib/zstd/compress/clevels.h | 3 +- + lib/zstd/compress/fse_compress.c | 59 +- + lib/zstd/compress/hist.c | 3 +- + lib/zstd/compress/hist.h | 3 +- + lib/zstd/compress/huf_compress.c | 372 +++-- + lib/zstd/compress/zstd_compress.c | 1758 +++++++++++++++++------- + lib/zstd/compress/zstd_compress_internal.h | 333 +++-- + lib/zstd/compress/zstd_compress_literals.c | 155 ++- + lib/zstd/compress/zstd_compress_literals.h | 25 +- + lib/zstd/compress/zstd_compress_sequences.c | 7 +- + lib/zstd/compress/zstd_compress_sequences.h | 3 +- + lib/zstd/compress/zstd_compress_superblock.c | 47 +- + lib/zstd/compress/zstd_compress_superblock.h | 3 +- + lib/zstd/compress/zstd_cwksp.h | 149 +- + lib/zstd/compress/zstd_double_fast.c | 129 +- + lib/zstd/compress/zstd_double_fast.h | 6 +- + lib/zstd/compress/zstd_fast.c | 578 ++++++-- + lib/zstd/compress/zstd_fast.h | 6 +- + lib/zstd/compress/zstd_lazy.c | 518 +++---- + lib/zstd/compress/zstd_lazy.h | 7 +- + lib/zstd/compress/zstd_ldm.c | 11 +- + lib/zstd/compress/zstd_ldm.h | 3 +- + lib/zstd/compress/zstd_ldm_geartab.h | 3 +- + lib/zstd/compress/zstd_opt.c | 187 +-- + lib/zstd/compress/zstd_opt.h | 3 +- + lib/zstd/decompress/huf_decompress.c | 772 +++++++---- + lib/zstd/decompress/zstd_ddict.c | 9 +- + lib/zstd/decompress/zstd_ddict.h | 3 +- + lib/zstd/decompress/zstd_decompress.c | 259 +++- + lib/zstd/decompress/zstd_decompress_block.c | 283 ++-- + lib/zstd/decompress/zstd_decompress_block.h | 8 +- + lib/zstd/decompress/zstd_decompress_internal.h | 7 +- + lib/zstd/decompress_sources.h | 2 +- + lib/zstd/zstd_common_module.c | 5 +- + lib/zstd/zstd_compress_module.c | 2 +- + lib/zstd/zstd_decompress_module.c | 4 +- + 58 files changed, 4791 insertions(+), 2596 deletions(-) + create mode 100644 lib/zstd/common/allocations.h + create mode 100644 lib/zstd/common/bits.h +Merging efi/next (04736f7d1945 efi: Remove redundant null pointer checks in efi_debugfs_init()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Merge made by the 'ort' strategy. + drivers/firmware/efi/cper.c | 11 ++++++++--- + drivers/firmware/efi/efi.c | 2 +- + drivers/firmware/efi/libstub/tpm.c | 2 +- + include/linux/efi.h | 2 -- + 4 files changed, 10 insertions(+), 7 deletions(-) +Merging unicode/for-next (156bb2c569cd unicode: Fix utf8_load() error path) +$ 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 | 2 +- + fs/unicode/utf8-core.c | 2 +- + fs/unicode/utf8data.c_shipped | 2 +- + fs/unicode/utf8n.h | 2 +- + 4 files changed, 4 insertions(+), 4 deletions(-) +Merging slab/slab/for-next (ecc4d6af979b Merge branch 'slab/for-6.12/kmem_cache_args' into slab/for-next) +$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging fs/file_table.c +Auto-merging include/linux/rcutiny.h +Auto-merging include/linux/rcutree.h +Auto-merging include/linux/slab.h +Auto-merging io_uring/io_uring.c +Auto-merging kernel/rcu/tree.c +CONFLICT (content): Merge conflict in kernel/rcu/tree.c +Auto-merging mm/slab_common.c +Auto-merging mm/slub.c +Auto-merging net/ipv4/inet_connection_sock.c +Resolved 'kernel/rcu/tree.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 94eddfb015cd] Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git +$ git diff -M --stat --summary HEAD^.. + fs/file_table.c | 11 +- + include/linux/kasan.h | 65 ++++++- + include/linux/rcutiny.h | 5 + + include/linux/rcutree.h | 1 + + include/linux/slab.h | 228 ++++++++++++++++++++-- + io_uring/io_uring.c | 14 +- + kernel/rcu/tree.c | 109 ++++++++++- + lib/slub_kunit.c | 31 +++ + mm/Kconfig.debug | 32 ++++ + mm/kasan/common.c | 64 ++++--- + mm/kasan/kasan_test.c | 46 +++++ + mm/slab.h | 13 +- + mm/slab_common.c | 352 +++++++++++----------------------- + mm/slub.c | 412 ++++++++++++++++++++++++++-------------- + net/ipv4/inet_connection_sock.c | 5 +- + 15 files changed, 935 insertions(+), 453 deletions(-) +Merging random/master (210860e7f733 selftests: vDSO: check cpu caps before running chacha test) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/mman.h +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/powerpc/kernel/vdso/gettimeofday.S +Auto-merging arch/powerpc/kernel/vdso/vdso32.lds.S +Auto-merging arch/powerpc/kernel/vdso/vdso64.lds.S +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/include/asm/facility.h +CONFLICT (content): Merge conflict in arch/s390/include/asm/facility.h +Auto-merging arch/s390/kernel/entry.S +Auto-merging fs/proc/task_mmu.c +Auto-merging include/linux/mm.h +Auto-merging include/trace/events/mmflags.h +Auto-merging tools/include/linux/compiler.h +Auto-merging tools/include/linux/linkage.h +CONFLICT (content): Merge conflict in tools/include/linux/linkage.h +Resolved 'arch/s390/include/asm/facility.h' using previous resolution. +Resolved 'tools/include/linux/linkage.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d82846a1a978] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/vdso | 8 +- + arch/arm64/Kconfig | 1 + + arch/arm64/include/asm/alternative-macros.h | 4 + + arch/arm64/include/asm/mman.h | 6 +- + arch/arm64/include/asm/vdso/getrandom.h | 50 +++ + arch/arm64/include/asm/vdso/vsyscall.h | 15 + + arch/arm64/kernel/vdso.c | 6 - + arch/arm64/kernel/vdso/Makefile | 25 +- + arch/arm64/kernel/vdso/vdso.lds.S | 4 + + arch/arm64/kernel/vdso/vgetrandom-chacha.S | 172 ++++++++++ + arch/arm64/kernel/vdso/vgetrandom.c | 15 + + arch/loongarch/Kconfig | 1 + + arch/loongarch/include/asm/vdso/getrandom.h | 39 +++ + arch/loongarch/include/asm/vdso/vdso.h | 6 + + arch/loongarch/include/asm/vdso/vsyscall.h | 8 + + arch/loongarch/kernel/vdso.c | 1 + + arch/loongarch/vdso/Makefile | 7 +- + arch/loongarch/vdso/vdso.lds.S | 1 + + arch/loongarch/vdso/vgetrandom-chacha.S | 242 ++++++++++++++ + arch/loongarch/vdso/vgetrandom.c | 10 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/include/asm/mman.h | 2 +- + arch/powerpc/include/asm/vdso/getrandom.h | 54 +++ + arch/powerpc/include/asm/vdso/vsyscall.h | 6 + + arch/powerpc/include/asm/vdso_datapage.h | 17 + + arch/powerpc/kernel/asm-offsets.c | 3 + + arch/powerpc/kernel/vdso/Makefile | 57 ++-- + arch/powerpc/kernel/vdso/cacheflush.S | 2 +- + arch/powerpc/kernel/vdso/datapage.S | 4 +- + arch/powerpc/kernel/vdso/getrandom.S | 58 ++++ + arch/powerpc/kernel/vdso/gettimeofday.S | 13 - + arch/powerpc/kernel/vdso/vdso32.lds.S | 1 + + arch/powerpc/kernel/vdso/vdso64.lds.S | 1 + + arch/powerpc/kernel/vdso/vgetrandom-chacha.S | 365 +++++++++++++++++++++ + arch/powerpc/kernel/vdso/vgetrandom.c | 14 + + arch/s390/Kconfig | 1 + + arch/s390/include/asm/alternative.h | 6 +- + arch/s390/include/asm/facility.h | 37 ++- + arch/s390/include/asm/fpu-insn-asm.h | 22 ++ + arch/s390/include/asm/module.h | 14 + + arch/s390/include/asm/vdso-symbols.h | 17 + + arch/s390/include/asm/vdso.h | 12 - + arch/s390/include/asm/vdso/getrandom.h | 40 +++ + arch/s390/include/asm/vdso/vsyscall.h | 15 + + arch/s390/kernel/compat_signal.c | 2 +- + arch/s390/kernel/entry.S | 2 +- + arch/s390/kernel/signal.c | 2 +- + arch/s390/kernel/vdso.c | 26 +- + arch/s390/kernel/vdso64/Makefile | 9 +- + arch/s390/kernel/vdso64/vdso.h | 1 + + arch/s390/kernel/vdso64/vdso64.lds.S | 7 + + arch/s390/kernel/vdso64/vgetrandom-chacha.S | 185 +++++++++++ + arch/s390/kernel/vdso64/vgetrandom.c | 14 + + arch/x86/entry/vdso/vgetrandom.c | 2 - + arch/x86/entry/vdso/vma.c | 3 + + arch/x86/include/asm/pvclock.h | 1 + + arch/x86/include/asm/vdso/getrandom.h | 13 - + arch/x86/include/asm/vdso/vsyscall.h | 10 +- + drivers/char/random.c | 12 +- + fs/proc/task_mmu.c | 4 +- + include/asm-generic/unaligned.h | 11 +- + include/linux/mm.h | 4 +- + include/trace/events/mmflags.h | 4 +- + include/vdso/getrandom.h | 28 ++ + include/vdso/helpers.h | 1 + + include/vdso/unaligned.h | 15 + + lib/vdso/Makefile | 1 + + lib/vdso/getrandom.c | 27 +- + tools/arch/arm64/vdso | 1 + + tools/arch/loongarch/vdso | 1 + + tools/arch/powerpc/vdso | 1 + + tools/arch/s390/vdso | 1 + + tools/arch/x86/vdso | 1 + + tools/include/asm/alternative.h | 10 + + tools/include/generated/asm-offsets.h | 0 + tools/include/generated/asm/cpucap-defs.h | 0 + tools/include/generated/asm/sysreg-defs.h | 0 + tools/include/linux/compiler.h | 4 + + tools/include/linux/linkage.h | 4 + + tools/testing/selftests/vDSO/Makefile | 21 +- + tools/testing/selftests/vDSO/parse_vdso.c | 17 +- + tools/testing/selftests/vDSO/vdso_call.h | 70 ++++ + tools/testing/selftests/vDSO/vdso_config.h | 18 +- + tools/testing/selftests/vDSO/vdso_test_abi.c | 14 +- + tools/testing/selftests/vDSO/vdso_test_chacha.c | 103 +++++- + .../testing/selftests/vDSO/vdso_test_correctness.c | 21 +- + tools/testing/selftests/vDSO/vdso_test_getcpu.c | 3 +- + tools/testing/selftests/vDSO/vdso_test_getrandom.c | 128 +++++--- + .../selftests/vDSO/vdso_test_gettimeofday.c | 3 +- + 89 files changed, 1948 insertions(+), 240 deletions(-) + create mode 100644 arch/arm64/include/asm/vdso/getrandom.h + create mode 100644 arch/arm64/kernel/vdso/vgetrandom-chacha.S + create mode 100644 arch/arm64/kernel/vdso/vgetrandom.c + create mode 100644 arch/loongarch/include/asm/vdso/getrandom.h + create mode 100644 arch/loongarch/vdso/vgetrandom-chacha.S + create mode 100644 arch/loongarch/vdso/vgetrandom.c + create mode 100644 arch/powerpc/include/asm/vdso/getrandom.h + create mode 100644 arch/powerpc/kernel/vdso/getrandom.S + create mode 100644 arch/powerpc/kernel/vdso/vgetrandom-chacha.S + create mode 100644 arch/powerpc/kernel/vdso/vgetrandom.c + create mode 100644 arch/s390/include/asm/vdso-symbols.h + create mode 100644 arch/s390/include/asm/vdso/getrandom.h + create mode 100644 arch/s390/kernel/vdso64/vgetrandom-chacha.S + create mode 100644 arch/s390/kernel/vdso64/vgetrandom.c + create mode 100644 include/vdso/unaligned.h + create mode 120000 tools/arch/arm64/vdso + create mode 120000 tools/arch/loongarch/vdso + create mode 120000 tools/arch/powerpc/vdso + create mode 120000 tools/arch/s390/vdso + create mode 120000 tools/arch/x86/vdso + create mode 100644 tools/include/generated/asm-offsets.h + create mode 100644 tools/include/generated/asm/cpucap-defs.h + create mode 100644 tools/include/generated/asm/sysreg-defs.h + create mode 100644 tools/testing/selftests/vDSO/vdso_call.h +Merging landlock/next (1ca980815e1f landlock: Document LANDLOCK_SCOPE_SIGNAL) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging security/landlock/syscalls.c +Merge made by the 'ort' strategy. + Documentation/userspace-api/landlock.rst | 58 +- + include/uapi/linux/landlock.h | 30 + + samples/landlock/sandboxer.c | 73 +- + security/landlock/cred.h | 2 +- + security/landlock/fs.c | 25 + + security/landlock/fs.h | 7 + + security/landlock/limits.h | 3 + + security/landlock/ruleset.c | 7 +- + security/landlock/ruleset.h | 24 +- + security/landlock/syscalls.c | 17 +- + security/landlock/task.c | 193 ++++ + tools/testing/selftests/landlock/base_test.c | 2 +- + tools/testing/selftests/landlock/common.h | 39 + + tools/testing/selftests/landlock/fs_test.c | 1 - + tools/testing/selftests/landlock/net_test.c | 31 +- + .../selftests/landlock/scoped_abstract_unix_test.c | 1041 ++++++++++++++++++++ + .../selftests/landlock/scoped_base_variants.h | 156 +++ + tools/testing/selftests/landlock/scoped_common.h | 28 + + .../landlock/scoped_multiple_domain_variants.h | 152 +++ + .../selftests/landlock/scoped_signal_test.c | 484 +++++++++ + tools/testing/selftests/landlock/scoped_test.c | 33 + + 21 files changed, 2359 insertions(+), 47 deletions(-) + create mode 100644 tools/testing/selftests/landlock/scoped_abstract_unix_test.c + create mode 100644 tools/testing/selftests/landlock/scoped_base_variants.h + create mode 100644 tools/testing/selftests/landlock/scoped_common.h + create mode 100644 tools/testing/selftests/landlock/scoped_multiple_domain_variants.h + create mode 100644 tools/testing/selftests/landlock/scoped_signal_test.c + create mode 100644 tools/testing/selftests/landlock/scoped_test.c +Merging rust/rust-next (a2f115470520 kasan: rust: Add KASAN smoke test via UAF) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging Documentation/rust/quick-start.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging init/Kconfig +Auto-merging mm/kasan/kasan_test_c.c +Auto-merging rust/Makefile +CONFLICT (content): Merge conflict in rust/Makefile +Auto-merging rust/kernel/alloc/box_ext.rs +Auto-merging rust/kernel/lib.rs +CONFLICT (content): Merge conflict in rust/kernel/lib.rs +Auto-merging rust/macros/module.rs +Auto-merging scripts/Makefile.build +Auto-merging scripts/Makefile.kasan +CONFLICT (content): Merge conflict in scripts/Makefile.kasan +Auto-merging scripts/Makefile.lib +Auto-merging tools/objtool/check.c +Resolved 'rust/Makefile' using previous resolution. +Resolved 'rust/kernel/lib.rs' using previous resolution. +Resolved 'scripts/Makefile.kasan' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a87a05dc792d] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/rust/general-information.rst | 27 +- + Documentation/rust/index.rst | 18 +- + Documentation/rust/quick-start.rst | 4 +- + MAINTAINERS | 1 + + Makefile | 19 +- + arch/Kconfig | 16 + + arch/arm64/Kconfig | 14 +- + arch/arm64/Makefile | 3 + + arch/riscv/Kconfig | 9 +- + arch/x86/Makefile | 11 +- + init/Kconfig | 19 +- + mm/kasan/Makefile | 8 +- + mm/kasan/kasan.h | 6 + + mm/kasan/{kasan_test.c => kasan_test_c.c} | 11 + + mm/kasan/kasan_test_rust.rs | 21 + + rust/Makefile | 56 +- + rust/bindings/bindings_helper.h | 2 +- + rust/exports.c | 1 + + rust/helpers.c | 239 ------ + rust/helpers/blk.c | 14 + + rust/helpers/bug.c | 8 + + rust/helpers/build_assert.c | 25 + + rust/helpers/build_bug.c | 9 + + rust/helpers/err.c | 19 + + rust/helpers/helpers.c | 26 + + rust/helpers/kunit.c | 9 + + rust/helpers/mutex.c | 9 + + rust/helpers/page.c | 19 + + rust/helpers/rbtree.c | 9 + + rust/helpers/refcount.c | 19 + + rust/helpers/signal.c | 9 + + rust/helpers/slab.c | 9 + + rust/helpers/spinlock.c | 24 + + rust/helpers/task.c | 19 + + rust/helpers/uaccess.c | 15 + + rust/helpers/wait.c | 9 + + rust/helpers/workqueue.c | 15 + + rust/kernel/alloc/box_ext.rs | 33 +- + rust/kernel/error.rs | 5 +- + rust/kernel/init.rs | 193 ++++- + rust/kernel/init/__internal.rs | 29 + + rust/kernel/lib.rs | 2 + + rust/kernel/list.rs | 686 +++++++++++++++ + rust/kernel/list/arc.rs | 521 ++++++++++++ + rust/kernel/list/arc_field.rs | 96 +++ + rust/kernel/list/impl_list_item_mod.rs | 274 ++++++ + rust/kernel/prelude.rs | 2 +- + rust/kernel/print.rs | 20 +- + rust/kernel/rbtree.rs | 1278 ++++++++++++++++++++++++++++ + rust/kernel/std_vendor.rs | 2 +- + rust/kernel/sync/arc.rs | 25 +- + rust/kernel/types.rs | 63 +- + rust/macros/lib.rs | 4 + + rust/macros/module.rs | 12 + + scripts/Kconfig.include | 8 + + scripts/Makefile.build | 9 +- + scripts/Makefile.compiler | 15 + + scripts/Makefile.kasan | 57 +- + scripts/Makefile.lib | 3 + + scripts/generate_rust_target.rs | 118 ++- + scripts/rustc-version.sh | 26 + + tools/objtool/check.c | 52 +- + tools/objtool/noreturns.h | 2 + + 63 files changed, 3881 insertions(+), 405 deletions(-) + rename mm/kasan/{kasan_test.c => kasan_test_c.c} (99%) + create mode 100644 mm/kasan/kasan_test_rust.rs + delete mode 100644 rust/helpers.c + create mode 100644 rust/helpers/blk.c + create mode 100644 rust/helpers/bug.c + create mode 100644 rust/helpers/build_assert.c + create mode 100644 rust/helpers/build_bug.c + create mode 100644 rust/helpers/err.c + create mode 100644 rust/helpers/helpers.c + create mode 100644 rust/helpers/kunit.c + create mode 100644 rust/helpers/mutex.c + create mode 100644 rust/helpers/page.c + create mode 100644 rust/helpers/rbtree.c + create mode 100644 rust/helpers/refcount.c + create mode 100644 rust/helpers/signal.c + create mode 100644 rust/helpers/slab.c + create mode 100644 rust/helpers/spinlock.c + create mode 100644 rust/helpers/task.c + create mode 100644 rust/helpers/uaccess.c + create mode 100644 rust/helpers/wait.c + create mode 100644 rust/helpers/workqueue.c + create mode 100644 rust/kernel/list.rs + create mode 100644 rust/kernel/list/arc.rs + create mode 100644 rust/kernel/list/arc_field.rs + create mode 100644 rust/kernel/list/impl_list_item_mod.rs + create mode 100644 rust/kernel/rbtree.rs + create mode 100755 scripts/rustc-version.sh +Merging sysctl/sysctl-next (559d4c6a9d3b sysctl: avoid spurious permanent empty tables) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Merge made by the 'ort' strategy. + fs/proc/proc_sysctl.c | 11 ++++++++--- + 1 file changed, 8 insertions(+), 3 deletions(-) +Merging execve/for-next/execve (44f65d900698 binfmt_elf: mseal address zero) +$ 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 +Auto-merging fs/binfmt_elf.c +CONFLICT (content): Merge conflict in fs/binfmt_elf.c +Auto-merging include/linux/mm.h +CONFLICT (content): Merge conflict in include/linux/mm.h +Auto-merging kernel/signal.c +Auto-merging mm/mseal.c +Resolved 'fs/binfmt_elf.c' using previous resolution. +Resolved 'include/linux/mm.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1e7becee4d6f] Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git +$ git diff -M --stat --summary HEAD^.. + fs/binfmt_elf.c | 53 +++++++++++---- + fs/coredump.c | 166 ++++++++++++++++++++++++++++++++++------------- + include/linux/coredump.h | 30 ++++++++- + include/linux/mm.h | 10 +++ + kernel/signal.c | 21 +++++- + mm/mseal.c | 2 +- + 6 files changed, 220 insertions(+), 62 deletions(-) +Merging bitmap/bitmap-for-next (d7bcc37436c7 lib/test_bits.c: Add tests for GENMASK_U128()) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging include/linux/bitmap.h +Auto-merging include/linux/cpumask.h +Merge made by the 'ort' strategy. + include/linux/bitmap.h | 140 ++++++++++++++++-------------- + include/linux/bits.h | 15 ++++ + include/linux/cpumask.h | 212 ++++++++++++++++++++++++--------------------- + include/linux/find.h | 50 +++++------ + include/linux/nodemask.h | 86 +++++++++--------- + include/uapi/linux/bits.h | 3 + + include/uapi/linux/const.h | 17 ++++ + lib/test_bits.c | 34 ++++++++ + 8 files changed, 325 insertions(+), 232 deletions(-) +Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro) +$ 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 (c00ac1f9fd7b Merge branches 'for-linus/hardening' and 'for-next/hardening' into for-next/kspp) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging MAINTAINERS +Auto-merging drivers/media/platform/qcom/venus/hfi_cmds.h +Auto-merging include/linux/string.h +Auto-merging include/linux/string_choices.h +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 1 - + drivers/media/platform/qcom/venus/hfi_cmds.h | 2 +- + include/linux/compiler.h | 3 ++ + include/linux/compiler_types.h | 7 ++++ + include/linux/string.h | 12 ++++--- + include/linux/string_choices.h | 29 +++++++++++++++++ + include/uapi/linux/vbox_vmmdev_types.h | 5 ++- + lib/.gitignore | 2 -- + lib/Makefile | 38 +--------------------- + lib/string_helpers.c | 3 ++ + lib/test_fortify/.gitignore | 2 ++ + lib/test_fortify/Makefile | 28 ++++++++++++++++ + {scripts => lib/test_fortify}/test_fortify.sh | 0 + scripts/coccinelle/api/string_choices.cocci | 46 +++++++++++++++++++++++++++ + scripts/remove-stale-files | 2 ++ + 15 files changed, 134 insertions(+), 46 deletions(-) + create mode 100644 lib/test_fortify/.gitignore + create mode 100644 lib/test_fortify/Makefile + rename {scripts => lib/test_fortify}/test_fortify.sh (100%) +$ git am -3 ../patches/0001-fix-up-for-lib-string_choices-Add-str_true_false-str.patch +Applying: fix up for "lib/string_choices: Add str_true_false()/str_false_true() helper' +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/string_choices.h +$ git add -A . +$ git commit -v -a --amend +[master 67db95ac1a8f] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git + Date: Wed Sep 18 14:51:14 2024 +1000 +$ git am -3 ../patches/0001-fix-up-for-lib-string_choices-Add-str_up_down-helper.patch +Applying: fix up for "lib/string_choices: Add str_up_down() helper" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/xe/xe_gt_idle.c +$ git add -A . +$ git commit -v -a --amend +[master 5d9b0e38fbee] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git + Date: Wed Sep 18 14:51:14 2024 +1000 +Merging kspp-gustavo/for-next/kspp (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging nolibc/nolibc (248f6b935bbd Merge tag 'nolibc-20240824-for-6.12-1' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc into nolibc) +$ git merge -m Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git nolibc/nolibc +Already up to date. +Merging tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) +$ git merge -m Merge branch 'tsm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux tsm/tsm-next +Already up to date. +Merging iommufd/for-next (79805c1bbbf9 iommu: Set iommu_attach_handle->domain in core) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Auto-merging drivers/iommu/iommufd/ioas.c +Auto-merging drivers/iommu/iommufd/selftest.c +CONFLICT (content): Merge conflict in drivers/iommu/iommufd/selftest.c +Resolved 'drivers/iommu/iommufd/selftest.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2342ae2b60da] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git +$ git diff -M --stat --summary HEAD^.. + drivers/iommu/iommu.c | 1 + + drivers/iommu/iommufd/device.c | 56 ++++++++++++++++----------------- + drivers/iommu/iommufd/fault.c | 5 ++- + drivers/iommu/iommufd/hw_pagetable.c | 3 +- + drivers/iommu/iommufd/io_pagetable.c | 16 +++++++--- + drivers/iommu/iommufd/io_pagetable.h | 2 +- + drivers/iommu/iommufd/ioas.c | 2 +- + drivers/iommu/iommufd/iommufd_private.h | 32 ++++++++++++++++--- + drivers/iommu/iommufd/iommufd_test.h | 2 +- + drivers/iommu/iommufd/iova_bitmap.c | 2 +- + drivers/iommu/iommufd/main.c | 12 +++---- + drivers/iommu/iommufd/pages.c | 10 +++--- + drivers/iommu/iommufd/selftest.c | 19 ++++++----- + include/linux/iommufd.h | 12 +++---- + include/uapi/linux/iommufd.h | 2 +- + 15 files changed, 103 insertions(+), 73 deletions(-) +Merging turbostat/next (527aa0ca1c0c tools/power turbostat: Don't hide CPU column for num_cpus = 1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Merge made by the 'ort' strategy. + tools/power/x86/turbostat/turbostat.8 | 25 +++++++ + tools/power/x86/turbostat/turbostat.c | 131 ++++++++++++++++++++++++++++------ + 2 files changed, 136 insertions(+), 20 deletions(-) +Merging pwrseq/pwrseq/for-next (8b7e0a6c443e Documentation: add a driver API doc for the power sequencing subsystem) +$ git merge -m Merge branch 'pwrseq/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/power/sequencing/pwrseq-qcom-wcn.c +Merge made by the 'ort' strategy. + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/pwrseq.rst | 95 ++++++++++++++++++++++++++++++ + MAINTAINERS | 1 + + drivers/power/sequencing/pwrseq-qcom-wcn.c | 11 ++++ + 4 files changed, 108 insertions(+) + create mode 100644 Documentation/driver-api/pwrseq.rst +Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT) +$ git merge -m Merge branch 'header_cleanup' of git://evilpiepirate.org/bcachefs.git header_cleanup/header_cleanup +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 00000000000000..0a7d2724838bdb --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20240918