diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-07-03 16:14:20 +1000 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2024-07-03 16:14:20 +1000 |
| commit | 0b58e108042b0ed28a71cd7edf5175999955b233 (patch) | |
| tree | 4edfefb91d9cdb20280e795654527ccda8e98cfa | |
| parent | c3c6aceb95e422cdaedecea440137a2b7878dc11 (diff) | |
Add linux-next specific files for 20240703next-20240703
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 380 | ||||
| -rw-r--r-- | Next/Trees | 382 | ||||
| -rw-r--r-- | Next/merge.log | 16709 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 17472 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..f39b73f5872c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,380 @@ +Name SHA1 +---- ---- +origin e9d22f7a6655941fc8b2b942ed354ec780936b3e +fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +mm-hotfixes e968e6d21d03e778943a32e436939147ea59948e +vfs-brauner-fixes 655593a40efc577edc651f1d5c5dfde83367c477 +fscrypt-current 4cece764965020c22cff7665b18a012006359095 +fsverity-current 4cece764965020c22cff7665b18a012006359095 +btrfs-fixes 5b63f5b7f7bad54e1a596210c87c63bd3151e1ce +vfs-fixes bba1f6758a9ec90c1adac5dcf78f8a15f1bad65b +erofs-fixes 9b32b063be1001e322c5f6e01f2a649636947851 +nfsd-fixes ac03629b1612ad008ea6603a3d142e291e3de9bb +v9fs-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +overlayfs-fixes 77a28aa476873048024ad56daf8f4f17d58ee48e +fs-current 971ae5795e0cb10747e93d5a8819574b556f2f0e +kbuild-current 22a40d14b572deb80c0648557f4bd502d7e83826 +arc-current e67572cd2204894179d89bd7b984072f19313b03 +arm-current 0c66c6f4e21cb22220cbd8821c5c73fc157d20dc +arm64-fixes ecc54006f158ae0245a13e59026da2f0239c1b86 +arm-soc-fixes 07917ee08723e6c46074a2655a380126acee3898 +davinci-current 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +sophgo-fixes 90f6cc7f8e07b926f60e3a37944c428e7809bed1 +m68k-current ec8c8266373f6283a3e99b036aea7b9428480625 +powerpc-fixes 21a741eb75f80397e5f7d3739e24d7d75e619011 +s390-fixes feaa3344ff974c862c4b44384a239b1e610e6063 +net 8905a2c7d39b921b8a62bcf80da0f8c45ec0e764 +bpf 42391445a86393bdb36b4148971f14a4aa5d97f9 +ipsec 2d5317753e5f02a66e6d0afb9b25105d0beab1be +netfilter 8905a2c7d39b921b8a62bcf80da0f8c45ec0e764 +ipvs 7931d32955e09d0a11b1fe0b6aac1bfa061c005c +wireless 816c6bec09ed5b90a58a1e12d5a606c5b6e23f47 +wpan b8ec0dc3845f6c9089573cb5c2c4b05f7fc10728 +rdma-fixes f2661062f16b2de5d7b6a5c42a9a5c96326b8454 +sound-current 4b3e3810738376b3292d1bf29996640843fbd9a0 +sound-asoc-fixes 2163aff6bebbb752edf73f79700f5e2095f3559e +regmap-fixes 76f19626bd35a1791faeb75264d358256ebc544c +regulator-fixes f2661062f16b2de5d7b6a5c42a9a5c96326b8454 +spi-fixes 1762dc01fc78ef5f19693e9317eae7491c6c7e1b +pci-current 419d57d429f6e1fbd9024d34b11eb84b3138c60e +driver-core.current 6ba59ff4227927d3a8530fc2973b80e94b54d58f +tty.current 22a40d14b572deb80c0648557f4bd502d7e83826 +usb.current 22a40d14b572deb80c0648557f4bd502d7e83826 +usb-serial-fixes 4298e400dbdbf259549d69c349e060652ad53611 +phy f2661062f16b2de5d7b6a5c42a9a5c96326b8454 +staging.current 22a40d14b572deb80c0648557f4bd502d7e83826 +iio-fixes 1a5cba43096c9242fab503a40b053ec6b93d313a +counter-current 22a40d14b572deb80c0648557f4bd502d7e83826 +char-misc.current 22a40d14b572deb80c0648557f4bd502d7e83826 +soundwire-fixes f2661062f16b2de5d7b6a5c42a9a5c96326b8454 +thunderbolt-fixes f2661062f16b2de5d7b6a5c42a9a5c96326b8454 +input-current 7c7b1be19b228b450c2945ec379d7fc6bfef9852 +crypto-current a5d8922ab2aec39336ebc78d7cefe3b84647b058 +vfio-fixes d71a989cf5d961989c273093cdff2550acdde314 +kselftest-fixes 48236960c06d32370bfa6f2cc408e786873262c8 +dmaengine-fixes f2661062f16b2de5d7b6a5c42a9a5c96326b8454 +backlight-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +mtd-fixes b27d8946b5edd9827ee3c2f9ea1dd30022fb1ebe +mfd-fixes 68f860426d500cfb697b505799244c7dfff604b1 +v4l-dvb-fixes fd404435d44b453d62afe77545b9252c2cc72c8a +reset-fixes ab35896730a5e8fdf885a23fa2e27f286c5f94b2 +mips-fixes 0d5679a0aae2d8cda72169452c32e5cb88a7ab33 +at91-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +omap-fixes 9b6a51aab5f5f9f71d2fa16e8b4d530e1643dfcb +kvm-fixes dee67a94d4c6cbd05b8f6e1181498e94caa33334 +kvms390-fixes 4c6abb7f7b349f00c0f7ed5045bf67759c012892 +hwmon-fixes 6ba59ff4227927d3a8530fc2973b80e94b54d58f +nvdimm-fixes 33908660e814203e996f6e775d033c5c32fcf9a7 +cxl-fixes a0f39d51dbf72c28283bd201b97559ed82bc0fe5 +dma-mapping-fixes 75961ffb5cb3e5196f19cae7683f35cc88b50800 +drivers-x86-fixes e527a6127223b644e0a27b44f4b16e16eb6c7f0a +samsung-krzk-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +pinctrl-samsung-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +devicetree-fixes e7985f43609c782132f8f5794ee6cc4cdb66ca75 +dt-krzk-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +scsi-fixes ab2068a6fb84751836a84c26ca72b3beb349619d +drm-fixes 22a40d14b572deb80c0648557f4bd502d7e83826 +drm-intel-fixes f72383371e8c5d1d108532d7e395ff2c277233e5 +mmc-fixes ab069ce125965a5e282f7b53b86aee76ab32975c +rtc-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +gnss-fixes 6ba59ff4227927d3a8530fc2973b80e94b54d58f +hyperv-fixes 3b85a2eacd3d886f4d4133a83cdfc2f3b48f06c0 +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes cc2c169e34b4215f73c66a34bd292e9e1fcaa3c9 +riscv-dt-fixes e21de658f8e808551c2f9702727442980bdc0ad7 +riscv-soc-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +fpga-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +spdx a3e18a540541325a8c8848171f71e0d45ad30b2c +gpio-brgl-fixes 3645ffaf2b334abaf5f53e5ca0f47465d91e69d2 +gpio-intel-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +pinctrl-intel-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +auxdisplay-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +kunit-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +memblock-fixes 8043832e2a123fd9372007a29192f2f3ba328cd6 +renesas-fixes 8c987693dc2d292d777f1be63cb35233049ae25e +perf-current 83a7eefedc9b56fe7bfeff13b6c7356688ffa670 +efi-fixes 46e27b9961d8712bc89234444ede314cec0e8bae +zstd-fixes 77618db346455129424fadbbaec596a09feaf3bb +battery-fixes d3911f1639e67fc7b12aae0efa5a540976d7443b +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +iommufd-fixes dd5a440a31fae6e459c0d6271dddd62825505361 +rust-fixes a126eca844353360ebafa9088d22865cb8e022e3 +w1-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +pmdomain-fixes c3f38fa61af77b49866b006939479069cd451173 +i2c-host-fixes 22a40d14b572deb80c0648557f4bd502d7e83826 +sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +clk-fixes 10f84de27bd05bd2648512975d085dbe0a1e71c3 +pwrseq-fixes 83a7eefedc9b56fe7bfeff13b6c7356688ffa670 +drm-misc-fixes 704c1bef3aa44f82500cab27267ce338e188a340 +mm-stable 37a658069afbd1eb2c6d9f41ff029ce0fcc3c11a +mm-nonmm-stable 2a49c8b6b6d0dba9c5a4e921f07fbd7a8ad7a5f1 +mm e6f9f50b8d1ba1f6bb5c373f02e85141b6c6242f +kbuild fc8ad8ff95ebb8ced462fbed48b65c9fe2447b8d +clang-format 5a205c6a9f79d14db38006aa2d7c4f4e76b1bfc7 +perf a7cacaa0880e427642cb305010ea2a62c7b0e1ac +compiler-attributes 2993eb7a8d34aee6165e1f6676e81cdf1d22aa62 +dma-mapping 82d71b53d7e732ede6028591342bdc80fabfa29f +asm-generic 01b6ed5fcd5a95f93f9991b005ded2eacf067187 +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm b5e3526094975da0ba85237b8d3d10d873d7bb95 +arm64 2de29d1f81725835fbd1bf3d2888c36f34c96214 +arm-perf d0d7c66c537d36fbb87c515edb695c1e8ea3cdcb +arm-soc bf35f851523ae5ab8389763dd68e3b4cb6b920ca +amlogic 338c92a5d1956f1841f84b86923087676d1d0cea +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed 73feb9cd46f1f0d1130da6961048f8e2a04fc79e +at91 1cdb1c9626a48f93b0278a95f1de90a119f8435d +broadcom 4caff16b6e00c7884f9400a3f393b614ee8fab16 +davinci 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory 815cc7715ab183701de42b570a28b4e3d877ef6c +imx-mxs ffa7b132ee5f11ede76567e79dec969475a5c029 +mediatek 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +mvebu da8e8356f59487331aab2c3cf5250e29b05c4b3e +omap 5856330c3d569dcc2aa2d157d6e5a8984cb03409 +qcom 4139ef135814c652fa292c14cfe8e60bb7baf546 +renesas 5c91aa40e630a19362a16429ec9b886da940e69d +reset eb5d88b1538850c6d9ddfcd0b59dc7c84831b530 +rockchip 84a3d3b435e7c109d2141c5bbb9eaab146c94df0 +samsung-krzk b305fd6840d17f4840c9e9b208b0dac6131c5dd8 +scmi eaaeef9e62f9d52e72dec5f79de5171afbbb171e +sophgo 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +stm32 45fad67e83073a93bafcc39f4fa6ae1900d5d75b +sunxi 0682fbf17dd94002b19afdd211bcfbbfcc8daf2a +tee cd88a296582cf314e04792b73ede0b39f3193fe2 +tegra 5211d93c551f039e9df1b9ececb7102eb6e099fb +ti 0457310f1e9d5e767fd64cd88400e0e8f8f38a2c +xilinx 613af8986db8eefbc018364da62b9f3f9c94ba32 +clk 2bf56243b7b675bc79538664789a032ee15b0c96 +clk-imx 466da3d2d967ee87d82060df2bc9c6ad4fc4af49 +clk-renesas c7e58843d1e49a6b54d528a8ea34933cafb713f2 +csky 2c40c1c6adab90ee4660caf03722b3a3ec67767b +loongarch 8051b80fbeef27981e31ce69aec3508a914eda85 +m68k 75d3891ca19efe82392aa5e2810334979075a87a +m68knommu 22a40d14b572deb80c0648557f4bd502d7e83826 +microblaze 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +mips 04f38d1a4db017f17e82442727b91ce03dd72759 +openrisc 4dc70e1aadfadf968676d983587c6f5d455aba85 +parisc-hd 5f55e098b8d032ef25b576d18fb91b16ef2d1c41 +powerpc 17c743b9da9e0d073ff19fd5313f521744514939 +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v 60a6707f582ebbdfb6b378f45d7bf929106a1cd5 +riscv-dt 2904244a8c46bdd0fee181df693a495f4628a575 +riscv-soc 16b8597f1774b56bf9ff193448961712f330cca5 +s390 6566c83200ca41f49911069fff6d39c934d4e638 +sh 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +sparc 1c9e709cde80fb612e07d9503ad04457e8a58da2 +uml 919e3ece7f5aaf7b5f3c54538d5303b6eeeb053b +xtensa b7cf2a1d9881823133acc48427815a48b35b49f4 +bcachefs d6d793ae55897afe5871b8bf7eb3599ba25890fa +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt 7f016edaa0f385da0c37eee1ebb64c7f6929c533 +afs abcbd3bfbbfe97a8912d0c929d4aa18f50d9bc52 +btrfs 80d54c4200e1c8ad4fb5990788605d09b5778001 +ceph 93a2221c9c1ae32643df67c482dc4c4c591b7514 +cifs a3c1d574e8df2ca90983ce0370dfa6732328fc7d +configfs 4425c1d9b44ded655d2668e1ce95a62bccf7b21b +dlm 89b01913dc73d7c4b8440b1396909ccb7ec8c4b4 +erofs f2661062f16b2de5d7b6a5c42a9a5c96326b8454 +exfat 0daa52fbc7ac2cce82b4e1b7e0fba43fe886b98f +exportfs e8f897f4afef0031fe618a8e94127a0934896aba +ext3 85f22bb5d2c2a0b15b10ab34d4413423c3c97884 +ext4 8262fe9a902c8a7b68c8521ebe18360a9145bada +f2fs 8cb1f4080dd91c6e6b01dbea013a3f42341cb6a1 +fsverity ee5814dddefbaa181cb247a75676dd5103775db1 +fuse 529395d2ae6456c556405016ea0c43081fe607f3 +gfs2 5a1906a476bc84145f20cd1941aa1250d38db4aa +jfs d0fa70aca54c8643248e89061da23752506ec0d4 +ksmbd 6ba59ff4227927d3a8530fc2973b80e94b54d58f +nfs 22a40d14b572deb80c0648557f4bd502d7e83826 +nfs-anna e53a863bab5841214bf43e5ab65cf5f781f50103 +nfsd b3984e398f0846533580e3c6362c501ec2749504 +ntfs3 bde63e8eae5d67582b32517229de11ef00223e34 +orangefs 53e4efa470d5fc6a96662d2d3322cfc925818517 +overlayfs 004b8d1491b4bcbb7da1a3206d1e7e66822d47c6 +ubifs af9a8730ddb6a4b2edd779ccc0aceb994d616830 +v9fs 2211561723a66e37596b1fc401c792ef36e3dea0 +v9fs-ericvh 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +xfs 3ba3ab1f6719287674cf77a1208944cf38ef71c7 +zonefs df2f9708ff1f23afdf6804bb16199e1903550582 +iomap 3ac974796e5d94509b85a403449132ea660127c2 +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner 6cbc40abcac67e1276b9114d14e34461eb0fea32 +vfs a38297e3fb012ddfa7ce0321a7e5a8daeb1872b6 +fs-next 37baa0045f3b59c1cf3b501c28aa93d04edbf54a +printk 07c2ab22a8dadf8af687cbad6b1d171df9072c8c +pci 7f928a74087009acd72075ee3a56bc7a86ad8378 +pstore 9b3c13c9ea4ecb2b95948f666560b8df8f358b40 +hid 07fbb3e88d2205f2aba6642d56168c05a6ff0010 +i2c 6367df381ba9bcc1b2181eb64ea9368b934e5ae8 +i2c-host 04d6adabcdd5f854728bbd3ebf95c29b74173621 +i3c 145ca7b61e952d6fd07aeca820f0925ac503dad0 +dmi 4d1b28a8119c615f1e932520f9ee1f80bdda5204 +hwmon-staging cd228e7b65d43c441964a17f02c92f33d2c4af7b +jc_docs 93dd11d0dd740d027b30aa37cd3dd1ea3900d813 +v4l-dvb 8771b7f31b7fff91a998e6afdb60650d4bac59a5 +v4l-dvb-next 156922faabcef2979cb2ddc2fbaa659b5ea37f54 +pm d203f7f03764177deb518c8dd25a7c1897e43ab9 +cpufreq-arm ce84b7beeb524e7b20983838687862454ba54df7 +cpupower 3a5bb5066f4c7170e850b930e84b1075e25f8e90 +devfreq 1d143dde76798ce6655d5de01b0a5d29f2011a38 +pmdomain cc647e931a249605e06d3eb3ec89a7e320fc28cc +opp e3943f00afdb71684c4f209f9d3a90d6b79771fc +thermal 7eeb114a635a04bea2fa7d57cedbf374c714d29e +rdma 589b844f1bf04850d9fabcaa2e943325dc6768b4 +net-next ac26327635d643efe173e7460fa09eb39f0e5c54 +bpf-next fd8db07705c55a995c42b1e71afc42faad675b0b +ipsec-next f531d13bdfe3f4f084aaa8acae2cb0f02295f5ae +mlx5-next b339e0a39dc37726712b9f0485d78fe4306d1667 +netfilter-next ac26327635d643efe173e7460fa09eb39f0e5c54 +ipvs-next f4ebd03496f6b67940b0af92ce885c1d0dc9e121 +bluetooth 31cdab2ae178cdb84035c6997233246d944dcb4c +wireless-next 8c62617295d3c4cd03f1a02c3b9bf9d4e6d6e0c6 +wpan-next 9187210eee7d87eea37b45ea93454a88681894a4 +wpan-staging 9187210eee7d87eea37b45ea93454a88681894a4 +mtd 2538af030d6fa74dfe66121d6c53757e47d224a4 +nand 7326d3fb1ee39f02ef1f49d1e14ac3896caf85e2 +spi-nor d35df77707bf5ae1221b5ba1c8a88cf4fcdd4901 +crypto 95c0f5c3b8bb7acdc5c4f04bc6a7d3f40d319e9e +drm a78313bb206e0c456a989f380c4cbd8af8af7c76 +drm-exynos 9347028bfcfc5965bcb7511d25ad0f5687a8c352 +drm-misc e315384899082843193116060e147703d85546e6 +amdgpu 4ed6a3689caba239e6df18c60af9489001f481c3 +drm-intel 9fc97277eb2d17492de636b68cf7d2f5c4f15c1b +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm 7775352a5f52f034d24fafdf3969c2003a53aa3a +drm-msm-lumag 104e548a7c97da24224b375632fca0fc8b64c0db +drm-xe 7c0389c615b5c6aef1b0e38e30db759b3cbff885 +etnaviv 704d3d60fec451f37706368d9d3e320322978986 +fbdev 7ee6cfe6d9cf53df926386801a006cc9c22e8a36 +regmap 438685f6714a5926b05038ebf2882b8c2a922bc2 +sound 5b707581c072bcef086ef4c122a2ea81470a1027 +ieee1394 502099acb8cbf08acb6b43ff2b8da43d2bf85166 +sound-asoc 2b5b8270c6ea1cd47e7ee592ebdf5dac647c27ad +modules 61842868de13aa7fd7391c626e889f4d6f1450bf +input 7c459517252ebbad515a0b6f972454962ca549e2 +block 5b3974db2723bc24d94bf93f612ab7af7587eaaa +device-mapper 92b14c0230ffb082a9f8ea16ea91a5945f0d5e1d +libata f5a0205ad03159f0bc9cb8aaf2414e6b1a215105 +pcmcia 0630e3bc0e91b57288921df2927859b23184ca45 +mmc f7e7e00f7b86bceb0816d25a0372096ac6de3fc5 +mfd 33c0e553c8c3cee355ea7bcd358d653b0f022b2d +backlight b337cc3ce47549528fc3ee0b8c7ebd33348a3126 +battery b498ddb6f283c1a3efff98851aa58d66307be620 +regulator db576ed76232875ca92372771bfd247ad47b46ce +security 9ca51b3176e042aa3261a47b0df2b69c2885a4a1 +apparmor 3dd384108d53834002be5630132ad5c3f32166ad +integrity fbf06cee60876d50f259d0689e3c03940750f0d4 +selinux e123134b39dc40af94e8aec49227ae55b5e087a8 +smack e86cac0acdb1a74f608bacefe702f2034133a047 +tomoyo b96342141183ffa62bfed5998f9b808c84042322 +tpmdd cf5ae3c7d48e1e459e5ec699c9a2fdc17650a330 +watchdog 22a40d14b572deb80c0648557f4bd502d7e83826 +iommu cfb822815752cadb2e0cf1a68871ee2ed74bada7 +audit 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +devicetree bbf9b1ffa198aaef6b6b0062bc8d08b5f0a4fe1c +dt-krzk 828f810f69f3126831644ab652a44e0fc65046ec +mailbox 10b98582bc76a65b7c9dcee82b7918d7949740de +spi 5b6cad81d0c1b1c71533f2898a47f3d2fcfc4595 +tip e70c87e103e2e3842bf4c55a66c83560a1387925 +clockevents 2030a7e11f161b4067bd4eadd984cdb36446fcca +edac 9a1c5fe0f0a8aec0859394d7bea86db8ff842a0a +ftrace 5dfebf3c26dc5fe0fe08a5b4f334922b650e43b9 +rcu a9e1661087f1d60ab6f35f16f70ef20205ca8d48 +paulmck 32584f42dec84f6cd91f59cbb59941827c24c9cd +kvm 02b0d3b9d4dd1ef76b3e8c63175f1ae9ff392313 +kvm-arm 62933f02c855f0895d0cce95bd5334a663ce24c0 +kvms390 39cd87c4eb2b893354f3b850f916353f2658ae6f +kvm-ppc 0b65365f3fa95c2c5e2094739151a05cabb3c48a +kvm-riscv e325618349cdc1fbbe63574080249730e7cff9ea +kvm-x86 771df9ffadb8204e61d3e98f36c5067102aab78f +xen-tip 611ff1b1ae989a7bcce3e2a8e132ee30e968c557 +percpu 2d9ad81ef93570bc0d4929d05d0601ea400d6fcf +workqueues c6eff66fe16e95baa97293940fb7f1e06364543c +sched-ext 18b2bd03371b64fdb21b31eb48095099d95b56ef +drivers-x86 4261031484d8f8fcbd2bd6517416b88545447597 +chrome-platform 3664706e875f84bd4e3fa25ed1c6e46934cb32cd +chrome-platform-firmware fc2c1d716d4a879dd52c612ea19a7f994f08748d +hsi f02cfe6950479b04fb75cf8424a852af7c50d3ad +leds-lj 940b27161afc6ec53fc66245a4fb3518394cdc92 +ipmi 0627cef36145c9ff9845bdfd7ddf485bbac1f981 +driver-core 6b521fc111a2ad5ead39776960d3d2d289ce0722 +usb f7697db8b1b3e80d8cd5af071a5af42c8b445fc4 +thunderbolt 49056c95df448c1fa870c8688f34e5d1abffb154 +usb-serial 6ba59ff4227927d3a8530fc2973b80e94b54d58f +tty 33827dc4ad8982c987ad4066d643693403ce7fd0 +char-misc 19ed3bb5587b30ace275cb604fb2b9c60dc49de0 +accel f03eee5fc922158654405318a02db9982c0ddf07 +coresight 2e5657aa59669698f0f3bf7742d83577a18eb830 +fastrpc 47bf4198bf386018e99673c1ce5dbd8e5eda293e +fpga 3a0fa8e97d3024de199634667900b6a90bbe43d0 +icc 3c6ffb01709172b0cc7f71bf0d0472a4b06bd0b0 +iio 529d2e1900642eba6df28307e26e19793e227546 +phy-next 2a011c3c12e8de461fb1fdce85fa38d308c4eb8b +soundwire 518aee32c551d2f7d1e577f63df6dfcc80259b50 +extcon e508f2606c0bbe6fd051d5833acedc24a3c993b5 +gnss 6ba59ff4227927d3a8530fc2973b80e94b54d58f +vfio abe8103da3c59415b790fa260a6676c7bf252a65 +w1 26bf5fc86033162dbd2d5759094cbd724313d55b +spmi 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +staging d67f063101f551dde4fb67f17cafcd98064238ee +counter-next 7b47e79eac4cff2874328835c9d9a48133a8f1d9 +siox db418d5f1ca5b7bafc8eaa9393ea18a7901bb0ed +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 316d1225b1126286952d1e1a3da9da911cc00dd6 +cgroup 3756b08be683fc17d8a552726ebe5ed778eb5b03 +scsi dbe36d24953312a8fb9450e9e0635d83dbc6f913 +scsi-mkp 06b91c00db396fafeed4c3201597bf3ed8261511 +vhost c8fae27d141a32a1624d0d0d5419d94252824498 +rpmsg 54fb559c546713f7627d01524ae7b86e3127fa5b +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl 6f2a875024993449f1b19a144d3e4391411a1b51 +gpio-intel 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +pinctrl 0cd9f140389bcd876e23aa3c06eea07f42892ad4 +pinctrl-intel 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +pinctrl-renesas 71062e52fc0aea0f3477aaaaa789226388a7eeaf +pinctrl-samsung 707807f4c1128e39442519e849e4ce0b7c29b110 +pwm b8689bb9b901e5e2bc0f0905320b32e8c898a58b +ktest 07283c1873a4d0eaa0e822536881bfdaea853910 +kselftest 15a783a493b021975f3dd12bdd95a7080df0e8cf +kunit 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +kunit-next 67c9971cd6d309ecbcb87b942e22ffc194d7a376 +livepatching 9871e6af43db3892811f5a4ed0ed2e2d7cf6cf3c +rtc 43696b3a9e46cf622bfeb70856b9b1cfa5a9fb23 +nvdimm b0d478e34dbfccb7ce430e20cbe77d4d10593fa3 +at24 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +ntb 9341b37ec17a8793e8439e9b18354ba69556b786 +seccomp f0c508faea645da58d6ae6b644a1b68020d5a9d2 +fsi c5eeb63edac9497f9a0d46d3b75cf8b293771ecf +slimbus 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +nvmem 65f09ab3b3efb2f349344f43d84a567b530a24e0 +xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af +hyperv f2580a907e5c0e8fc9354fd095b011301c64f949 +auxdisplay 2ccfe94bc3ac980d2d1df9f7a0b2c6d2137abe55 +kgdb 9bccbe7b20876a34c70b13430ea1b308fc8d5a7e +hmm 6613476e225e090cc9aad49be7fa504e290dd33d +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi f08d4bdad612dcff6827f8cd2b20f13413c392d3 +memblock 94ff46de4a738e7916b68ab5cc0b0380729f02af +cxl f3d70720e92c24c22e0e63c2588636edba33eb1a +zstd 3f832dfb8a8eafee3cecd479d99651a64a61485a +efi d68cc8abc357c05ca1567458965f009add8bab69 +unicode 68318904a7758e11f16fa9d202a6df60f896e71a +slab a7555f5f17d7791613396e2855ebc73a5ba227ad +random 886d4870bedefece0576972ac35c9e52c4dd51f9 +landlock 591561c2b47b7e7225e229e844f5de75ce0c09ec +rust 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +sysctl acc154691fc75e1a178fc36624bdeee1420585a4 +execve 2a97388a807b6ab5538aa8f8537b2463c6988bd2 +bitmap e0eeb938adb0367de4b0946125a06142d8de7d37 +hte 9e4259716f60c96c069a38e826884ad783dc4eb4 +kspp 350e853715b20a86afccde4b79b01109cd150bc5 +kspp-gustavo 6613476e225e090cc9aad49be7fa504e290dd33d +nolibc 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd 53e6b65693b68519dcfd384280bfc3d34c7398e2 +turbostat eff04be3f4aa1cf0ebdc2177e1022d3dd4a5abc4 +pwrseq 6140d185a43daa298d43453929560388d6d49b6e +header_cleanup 5f4c01f1e3c7b0c8d1e5dd6f080531de7aa5e47b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..6c9844ed129b --- /dev/null +++ b/Next/Trees @@ -0,0 +1,382 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +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 +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 +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/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +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 +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +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 +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.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 +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 +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.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/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +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 +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +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 +bcachefs git https://evilpiepirate.org/git/bcachefs.git#for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +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 +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs-brauner git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +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 +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-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +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 https://evilpiepirate.org/git/bcachefs.git#header_cleanup diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..d47c67d0c890 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,16709 @@ +$ date -R +Wed, 03 Jul 2024 09:01:11 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 54% (5340/9838)
Updating files: 55% (5411/9838)
Updating files: 56% (5510/9838)
Updating files: 57% (5608/9838)
Updating files: 58% (5707/9838)
Updating files: 59% (5805/9838)
Updating files: 60% (5903/9838)
Updating files: 61% (6002/9838)
Updating files: 62% (6100/9838)
Updating files: 63% (6198/9838)
Updating files: 64% (6297/9838)
Updating files: 65% (6395/9838)
Updating files: 66% (6494/9838)
Updating files: 67% (6592/9838)
Updating files: 68% (6690/9838)
Updating files: 69% (6789/9838)
Updating files: 70% (6887/9838)
Updating files: 71% (6985/9838)
Updating files: 72% (7084/9838)
Updating files: 73% (7182/9838)
Updating files: 74% (7281/9838)
Updating files: 75% (7379/9838)
Updating files: 76% (7477/9838)
Updating files: 77% (7576/9838)
Updating files: 78% (7674/9838)
Updating files: 79% (7773/9838)
Updating files: 80% (7871/9838)
Updating files: 81% (7969/9838)
Updating files: 82% (8068/9838)
Updating files: 83% (8166/9838)
Updating files: 84% (8264/9838)
Updating files: 85% (8363/9838)
Updating files: 86% (8461/9838)
Updating files: 87% (8560/9838)
Updating files: 88% (8658/9838)
Updating files: 89% (8756/9838)
Updating files: 90% (8855/9838)
Updating files: 91% (8953/9838)
Updating files: 92% (9051/9838)
Updating files: 93% (9150/9838)
Updating files: 94% (9248/9838)
Updating files: 94% (9309/9838)
Updating files: 95% (9347/9838)
Updating files: 96% (9445/9838)
Updating files: 97% (9543/9838)
Updating files: 98% (9642/9838)
Updating files: 99% (9740/9838)
Updating files: 100% (9838/9838)
Updating files: 100% (9838/9838), done. +HEAD is now at 73e931504f8e Merge tag 'cxl-fixes-6.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl +Merging origin/master (e9d22f7a6655 Merge tag 'linux_kselftest-fixes-6.10-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 73e931504f8e..e9d22f7a6655 +Fast-forward (no commit created; -m option ignored) + drivers/scsi/libsas/sas_internal.h | 14 +++++++++++++ + drivers/scsi/scsi_debug.c | 6 +++++- + fs/afs/inode.c | 4 ++-- + fs/dcache.c | 31 +++++++++++++---------------- + fs/erofs/super.c | 2 +- + fs/erofs/zmap.c | 2 ++ + fs/erofs/zutil.c | 8 ++++---- + fs/locks.c | 9 ++++----- + tools/testing/selftests/resctrl/cat_test.c | 32 ++++++++++++++++++++---------- + 9 files changed, 68 insertions(+), 40 deletions(-) +Merging fixes/fixes (2dde18cd1d8f Linux 6.5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (e968e6d21d03 lib/build_OID_registry: avoid non-destructive substitution for Perl < 5.13.2 compat) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Merge made by the 'ort' strategy. + fs/nilfs2/alloc.c | 19 +++- + fs/nilfs2/alloc.h | 4 +- + fs/nilfs2/dat.c | 2 +- + fs/nilfs2/dir.c | 38 ++++++- + fs/nilfs2/ifile.c | 7 +- + fs/nilfs2/nilfs.h | 10 +- + fs/nilfs2/the_nilfs.c | 6 + + fs/nilfs2/the_nilfs.h | 2 +- + fs/userfaultfd.c | 7 +- + include/linux/mmzone.h | 3 +- + include/linux/page_ref.h | 57 ++-------- + include/linux/pagemap.h | 11 +- + include/linux/swap.h | 3 +- + kernel/exit.c | 2 + + lib/build_OID_registry | 4 +- + mm/damon/core.c | 21 +++- + mm/filemap.c | 17 +-- + mm/gup.c | 289 +++++++++++++++++++++++++---------------------- + mm/huge_memory.c | 2 +- + mm/hugetlb.c | 53 ++------- + mm/hugetlb_vmemmap.c | 16 +++ + mm/internal.h | 4 +- + mm/page-writeback.c | 32 +++++- + mm/readahead.c | 8 +- + mm/shmem.c | 15 ++- + mm/vmalloc.c | 10 +- + mm/workingset.c | 14 ++- + 27 files changed, 376 insertions(+), 280 deletions(-) +$ git am -3 ../patches/0001-fixup-for-mm-gup-stop-abusing-try_grab_folio.patch +Applying: fixup for "mm: gup: stop abusing try_grab_folio" +$ git reset HEAD^ +Unstaged changes after reset: +M mm/gup.c +$ git add -A . +$ git commit -v -a --amend +[master 0ba4b8bfc07e] Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Wed Jul 3 09:01:58 2024 +1000 +Merging vfs-brauner-fixes/vfs.fixes (655593a40efc afs: Convert comma to semicolon) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ 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 (5b63f5b7f7ba Merge branch 'misc-6.10' 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/extent_io.c | 2 +- + fs/btrfs/inode.c | 2 +- + fs/btrfs/qgroup.c | 10 ++++++++-- + fs/btrfs/ref-verify.c | 9 +++++++-- + fs/btrfs/space-info.c | 24 +++++++++++++++++++++--- + 5 files changed, 38 insertions(+), 9 deletions(-) +Merging vfs-fixes/fixes (bba1f6758a9e lirc: rc_dev_get_from_fd(): fix file leak) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Merge made by the 'ort' strategy. + arch/powerpc/kvm/powerpc.c | 4 +++- + drivers/media/rc/lirc_dev.c | 4 +++- + 2 files changed, 6 insertions(+), 2 deletions(-) +Merging erofs-fixes/fixes (9b32b063be10 erofs: ensure m_llen is reset to 0 if metadata is invalid) +$ 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 (ac03629b1612 Revert "nfsd: fix oops when reading pool_stats before server is started") +$ 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 (1613e604df0c Linux 6.10-rc1) +$ 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 fs-current (971ae5795e0c Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Merge made by the 'ort' strategy. + arch/powerpc/kvm/powerpc.c | 4 +++- + drivers/media/rc/lirc_dev.c | 4 +++- + fs/btrfs/extent_io.c | 2 +- + fs/btrfs/inode.c | 2 +- + fs/btrfs/qgroup.c | 10 ++++++++-- + fs/btrfs/ref-verify.c | 9 +++++++-- + fs/btrfs/space-info.c | 24 +++++++++++++++++++++--- + 7 files changed, 44 insertions(+), 11 deletions(-) +Merging kbuild-current/fixes (22a40d14b572 Linux 6.10-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 (ecc54006f158 arm64: Clear the initial ID map correctly before remapping) +$ 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 (07917ee08723 Merge tag 'v6.10-rockchip-dtsfixes1' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip 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 (1613e604df0c Linux 6.10-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 (90f6cc7f8e07 riscv: dts: sophgo: disable write-protection for milkv duo) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Merge made by the 'ort' strategy. +Merging m68k-current/for-linus (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-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 (21a741eb75f8 powerpc/pseries: Fix scv instruction crash with kexec) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Merge made by the 'ort' strategy. + arch/powerpc/kernel/eeh_pe.c | 7 +++++-- + arch/powerpc/kernel/head_64.S | 5 +++-- + arch/powerpc/kexec/core_64.c | 11 +++++++++++ + arch/powerpc/platforms/pseries/kexec.c | 8 -------- + arch/powerpc/platforms/pseries/pseries.h | 1 - + arch/powerpc/platforms/pseries/setup.c | 5 ++--- + 6 files changed, 21 insertions(+), 16 deletions(-) +Merging s390-fixes/fixes (feaa3344ff97 s390: Update defconfigs) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Merge made by the 'ort' strategy. + arch/s390/configs/debug_defconfig | 5 ++--- + arch/s390/configs/defconfig | 5 ++--- + 2 files changed, 4 insertions(+), 6 deletions(-) +Merging net/main (8905a2c7d39b Merge branch 'net-txgbe-fix-msi-and-intx-interrupts') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + CREDITS | 4 + + MAINTAINERS | 13 +- + drivers/bluetooth/btintel_pcie.c | 2 +- + drivers/bluetooth/btnxpuart.c | 2 +- + drivers/bluetooth/hci_bcm4377.c | 10 +- + drivers/bluetooth/hci_qca.c | 18 ++- + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 1 + + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 2 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 132 ++++++++++----------- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 46 +++++-- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 5 + + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 4 +- + .../mellanox/mlx5/core/esw/acl/ingress_ofld.c | 37 ++++-- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 22 +++- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 10 ++ + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 4 +- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 2 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 1 + + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 10 +- + drivers/net/ethernet/wangxun/libwx/wx_type.h | 1 + + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 2 + + drivers/net/ethernet/wangxun/txgbe/txgbe_irq.c | 124 ++++++++----------- + drivers/net/ethernet/wangxun/txgbe/txgbe_irq.h | 2 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 9 +- + drivers/net/wireless/ti/wlcore/cmd.c | 7 -- + drivers/net/wireless/ti/wlcore/main.c | 17 ++- + drivers/net/wireless/ti/wlcore/tx.c | 7 +- + drivers/net/wireless/ti/wlcore/wlcore_i.h | 6 + + include/linux/mlx5/mlx5_ifc.h | 6 +- + include/linux/phy.h | 2 +- + include/net/bluetooth/hci.h | 11 ++ + include/net/bluetooth/hci_sync.h | 2 + + net/bluetooth/hci_conn.c | 15 ++- + net/bluetooth/hci_core.c | 76 ++++-------- + net/bluetooth/hci_event.c | 33 +++++- + net/bluetooth/hci_sync.c | 13 ++ + net/bluetooth/iso.c | 3 +- + net/bluetooth/l2cap_core.c | 3 + + net/bluetooth/l2cap_sock.c | 14 ++- + net/core/datagram.c | 19 ++- + net/ipv4/tcp_input.c | 2 +- + net/ipv4/tcp_metrics.c | 1 + + net/mac80211/main.c | 1 + + net/mac80211/util.c | 2 + + net/mac802154/main.c | 14 ++- + net/mac802154/tx.c | 8 +- + net/wireless/nl80211.c | 6 +- + 47 files changed, 427 insertions(+), 304 deletions(-) +Merging bpf/master (42391445a863 Merge tag 'for-net-2024-06-28' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth into main) +$ 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 (2d5317753e5f xfrm: Export symbol xfrm_dev_state_delete.) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + include/net/xfrm.h | 36 ++++++++-------------------- + net/ipv4/esp4.c | 3 +-- + net/ipv4/esp4_offload.c | 7 ++++++ + net/ipv6/esp6.c | 3 +-- + net/ipv6/esp6_offload.c | 7 ++++++ + net/xfrm/xfrm_input.c | 8 +++---- + net/xfrm/xfrm_state.c | 62 +++++++++++++++++++++++++++++++++++++++++++++++-- + 7 files changed, 89 insertions(+), 37 deletions(-) +Merging netfilter/main (8905a2c7d39b Merge branch 'net-txgbe-fix-msi-and-intx-interrupts') +$ 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 (7931d32955e0 netfilter: nf_tables: fully validate NFT_DATA_VALUE on store to data registers) +$ 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 (816c6bec09ed wifi: mac80211: fix BSS_CHANGED_UNSOL_BCAST_PROBE_RESP) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + include/net/mac80211.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging wpan/master (b8ec0dc3845f net: mac802154: Fix racy device stats updates by DEV_STATS_INC() and DEV_STATS_ADD()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (f2661062f16b Linux 6.10-rc5) +$ 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 (4b3e38107383 Merge tag 'asoc-fix-v6.10-rc5' 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 (2163aff6bebb firmware: cs_dsp: Prevent buffer overrun when processing V2 alg headers) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/firmware/cirrus/cs_dsp.c | 227 ++++++++++++++++++++++++++++----------- + 1 file changed, 162 insertions(+), 65 deletions(-) +Merging regmap-fixes/for-linus (76f19626bd35 regmap: add missing MODULE_DESCRIPTION() macros) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/base/regmap/regmap-ac97.c | 1 + + drivers/base/regmap/regmap-ram.c | 1 + + drivers/base/regmap/regmap-raw-ram.c | 1 + + drivers/base/regmap/regmap-sccb.c | 1 + + drivers/base/regmap/regmap-slimbus.c | 1 + + drivers/base/regmap/regmap-spi-avmm.c | 1 + + drivers/base/regmap/regmap-spmi.c | 1 + + drivers/base/regmap/regmap-w1.c | 1 + + 8 files changed, 8 insertions(+) +Merging regulator-fixes/for-linus (f2661062f16b Linux 6.10-rc5) +$ 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 (1762dc01fc78 spi: davinci: Unset POWERDOWN bit when releasing resources) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-axi-spi-engine.c | 26 ++++++++++++++++++-------- + drivers/spi/spi-davinci.c | 6 ++++++ + drivers/spi/spi-imx.c | 2 +- + 3 files changed, 25 insertions(+), 9 deletions(-) +Merging pci-current/for-linus (419d57d429f6 CREDITS: Add Synopsys DesignWare eDMA driver for Gustavo Pimentel) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Auto-merging CREDITS +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + CREDITS | 4 +++- + MAINTAINERS | 3 +-- + 2 files changed, 4 insertions(+), 3 deletions(-) +Merging driver-core.current/driver-core-linus (6ba59ff42279 Linux 6.10-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 (22a40d14b572 Linux 6.10-rc6) +$ 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 (22a40d14b572 Linux 6.10-rc6) +$ 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 (4298e400dbdb USB: serial: option: add Telit generic core-dump composition) +$ 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/option.c | 10 ++++++++++ + 1 file changed, 10 insertions(+) +Merging phy/fixes (f2661062f16b Linux 6.10-rc5) +$ 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 (22a40d14b572 Linux 6.10-rc6) +$ 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 (1a5cba43096c iio: light: apds9306: Fix error handing) +$ 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/industrialio-trigger.c | 2 +- + drivers/iio/light/apds9306.c | 4 ++-- + 2 files changed, 3 insertions(+), 3 deletions(-) +Merging counter-current/counter-current (22a40d14b572 Linux 6.10-rc6) +$ 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 (22a40d14b572 Linux 6.10-rc6) +$ 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 (f2661062f16b Linux 6.10-rc5) +$ 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 (f2661062f16b Linux 6.10-rc5) +$ 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 (7c7b1be19b22 Input: ads7846 - use spi_device_id 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 +Already up to date. +Merging crypto-current/master (a5d8922ab2ae crypto: qat - fix linking errors when PCI_IOV is disabled) +$ 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 (d71a989cf5d9 vfio/pci: Insert full vma on mmap'd MMIO fault) +$ 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 (48236960c06d selftests/resctrl: Fix non-contiguous CBM for AMD) +$ 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 (f2661062f16b Linux 6.10-rc5) +$ 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 (b27d8946b5ed mtd: rawnand: rockchip: ensure NVDDR timings are rejected) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (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 (fd404435d44b media: ivsc: Depend on IPU_BRIDGE or not IPU_BRIDGE) +$ git merge -m Merge branch 'fixes' of https://git.linuxtv.org/media_stage.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 2 +- + drivers/media/pci/intel/ipu6/ipu6-isys.c | 2 +- + drivers/media/pci/intel/ivsc/Kconfig | 1 + + 3 files changed, 3 insertions(+), 2 deletions(-) +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 (0d5679a0aae2 mips: fix compat_sys_lseek syscall) +$ 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 (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (9b6a51aab5f5 ARM: dts: Fix occasional boot hang for am3 usb) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (dee67a94d4c6 Merge tag 'kvm-x86-fixes-6.10-rcN' of https://github.com/kvm-x86/linux into HEAD) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (4c6abb7f7b34 KVM: s390: fix LPSWEY handling) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Merge made by the 'ort' strategy. + arch/s390/include/asm/kvm_host.h | 1 + + arch/s390/kvm/kvm-s390.c | 1 + + arch/s390/kvm/kvm-s390.h | 15 +++++++++++++++ + arch/s390/kvm/priv.c | 32 ++++++++++++++++++++++++++++++++ + 4 files changed, 49 insertions(+) +Merging hwmon-fixes/hwmon (6ba59ff42279 Linux 6.10-rc4) +$ 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 (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (a0f39d51dbf7 cxl: documentation: add missing files to cxl driver-api) +$ 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 (e527a6127223 platform/x86: toshiba_acpi: Fix quickstart quirk handling) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Merge made by the 'ort' strategy. + drivers/platform/x86/toshiba_acpi.c | 31 ++++++++++++++++++------------- + 1 file changed, 18 insertions(+), 13 deletions(-) +Merging samsung-krzk-fixes/fixes (1613e604df0c Linux 6.10-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 (1613e604df0c Linux 6.10-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 (e7985f43609c of: property: Fix fw_devlink handling of interrupt-map) +$ 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 (1613e604df0c Linux 6.10-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 (ab2068a6fb84 scsi: libsas: Fix exp-attached device scan after probe failure scanned in again after probe failed) +$ 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 (22a40d14b572 Linux 6.10-rc6) +$ 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 (f72383371e8c drm/i915/display: For MTL+ platforms skip mg dp programming) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_ddi.c | 3 +++ + 1 file changed, 3 insertions(+) +Merging mmc-fixes/fixes (ab069ce12596 mmc: sdhci: Do not lock spinlock around mmc_gpio_get_ro()) +$ 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 (1613e604df0c Linux 6.10-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 (6ba59ff42279 Linux 6.10-rc4) +$ 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 (3b85a2eacd3d Documentation: hyperv: Add overview of Confidential Computing VM support) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Merge made by the 'ort' strategy. + Documentation/virt/hyperv/coco.rst | 260 ++++++++++++++++++++++++++++++++++++ + Documentation/virt/hyperv/index.rst | 1 + + arch/x86/kernel/cpu/mshyperv.c | 16 ++- + drivers/clocksource/hyperv_timer.c | 16 ++- + drivers/hv/hyperv_vmbus.h | 6 - + 5 files changed, 291 insertions(+), 8 deletions(-) + create mode 100644 Documentation/virt/hyperv/coco.rst +Merging soc-fsl-fixes/fix (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (cc2c169e34b4 Merge patch "riscv: stacktrace: convert arch_stack_walk() to noinstr") +$ 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 (e21de658f8e8 MAINTAINERS: thead: update Maintainer) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (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 (a3e18a540541 Merge tag 'xfs-6.10-fixes-3' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ 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 (3645ffaf2b33 gpiolib: of: fix lookup quirk for MIPS Lantiq) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'ort' strategy. + drivers/gpio/gpiolib-of.c | 14 ++++++++++++-- + 1 file changed, 12 insertions(+), 2 deletions(-) +Merging gpio-intel-fixes/fixes (1613e604df0c Linux 6.10-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 (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (1613e604df0c Linux 6.10-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 (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging 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 (83a7eefedc9b Linux 6.10-rc3) +$ 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 (46e27b9961d8 efi/arm64: Fix kmemleak false positive in arm64_efi_rt_init()) +$ 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 (d3911f1639e6 power: supply: rt5033: Bring back i2c_set_clientdata) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Merge made by the 'ort' strategy. + drivers/power/supply/rt5033_battery.c | 1 + + 1 file changed, 1 insertion(+) +Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (dd5a440a31fa Linux 6.9-rc7) +$ 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 (a126eca84435 rust: avoid unused import warning in `rusttest`) +$ 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 (1613e604df0c Linux 6.10-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 (c3f38fa61af7 Linux 6.10-rc2) +$ 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 (22a40d14b572 Linux 6.10-rc6) +$ 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 +Already up to date. +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 (10f84de27bd0 Merge tag 'qcom-clk-fixes-for-6.10' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into clk-fixes) +$ git merge -m Merge branch 'clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Merge made by the 'ort' strategy. + drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 1 + + drivers/clk/mediatek/clk-mtk.c | 24 ++++++++++++++---------- + drivers/clk/mediatek/clk-mtk.h | 2 ++ + drivers/clk/qcom/apss-ipq-pll.c | 2 -- + drivers/clk/qcom/clk-alpha-pll.c | 3 +++ + drivers/clk/qcom/gcc-ipq9574.c | 10 ++++++---- + drivers/clk/qcom/gcc-sm6350.c | 10 +++++----- + drivers/clk/sunxi-ng/ccu_common.c | 18 ++++++++++++------ + 8 files changed, 43 insertions(+), 27 deletions(-) +Merging pwrseq-fixes/pwrseq/for-current (83a7eefedc9b Linux 6.10-rc3) +$ 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 drm-misc-fixes/for-linux-next-fixes (704c1bef3aa4 drm: panel-orientation-quirks: Add labels for both Valve Steam Deck revisions) +$ 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. + drivers/firmware/sysfb.c | 12 ++++++++---- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 9 ++++++++- + drivers/gpu/drm/nouveau/nouveau_connector.c | 3 +++ + 3 files changed, 19 insertions(+), 5 deletions(-) +Merging mm-stable/mm-stable (37a658069afb selftests/damon/damon_nr_regions: test online-tuned max_nr_regions) +$ 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/kernel-parameters.txt +Auto-merging arch/s390/boot/startup.c +Auto-merging drivers/s390/char/sclp.c +Auto-merging fs/netfs/buffered_write.c +Auto-merging include/linux/mmzone.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/swap.h +Auto-merging kernel/trace/ftrace.c +Auto-merging mm/damon/core.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/hugetlb_vmemmap.c +Auto-merging mm/internal.h +Auto-merging mm/readahead.c +Auto-merging mm/shmem.c +Auto-merging mm/vmalloc.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-kernel-mm-damon | 6 + + Documentation/admin-guide/kernel-parameters.txt | 9 +- + Documentation/admin-guide/mm/damon/usage.rst | 10 +- + Documentation/admin-guide/mm/pagemap.rst | 21 - + Documentation/admin-guide/mm/transhuge.rst | 38 ++ + Documentation/core-api/pin_user_pages.rst | 18 +- + Documentation/dev-tools/kmsan.rst | 11 +- + Documentation/mm/arch_pgtable_helpers.rst | 4 - + Documentation/mm/damon/design.rst | 4 + + Documentation/mm/damon/maintainer-profile.rst | 36 ++ + Documentation/mm/unevictable-lru.rst | 10 +- + arch/arm/include/asm/cacheflush.h | 2 +- + arch/arm64/include/asm/cacheflush.h | 2 +- + arch/loongarch/include/asm/pgtable.h | 4 +- + arch/mips/include/asm/pgtable.h | 4 +- + arch/mips/mm/cache.c | 2 +- + arch/riscv/include/asm/pgtable.h | 4 +- + arch/s390/Kconfig | 1 + + arch/s390/Makefile | 2 +- + arch/s390/boot/Makefile | 3 + + arch/s390/boot/kmsan.c | 6 + + arch/s390/boot/startup.c | 7 + + arch/s390/boot/string.c | 16 + + arch/s390/include/asm/checksum.h | 2 + + arch/s390/include/asm/cpacf.h | 3 + + arch/s390/include/asm/cpu_mf.h | 6 + + arch/s390/include/asm/irqflags.h | 17 +- + arch/s390/include/asm/kmsan.h | 59 +++ + arch/s390/include/asm/pgtable.h | 12 + + arch/s390/include/asm/string.h | 20 +- + arch/s390/include/asm/thread_info.h | 2 +- + arch/s390/include/asm/uaccess.h | 112 +++-- + arch/s390/kernel/diag.c | 10 +- + arch/s390/kernel/ftrace.c | 2 + + arch/s390/kernel/traps.c | 6 + + arch/s390/kernel/unwind_bc.c | 4 + + arch/sparc/mm/init_64.c | 2 +- + arch/x86/mm/init_64.c | 14 - + arch/x86/mm/pat/set_memory.c | 4 +- + arch/xtensa/include/asm/pgtable.h | 6 +- + arch/xtensa/mm/tlb.c | 6 +- + drivers/block/zram/Kconfig | 1 + + drivers/hv/hv_balloon.c | 5 +- + drivers/s390/char/sclp.c | 2 +- + drivers/video/fbdev/core/fb_defio.c | 13 +- + drivers/virtio/virtio_mem.c | 29 +- + drivers/xen/balloon.c | 9 +- + fs/afs/dir.c | 6 +- + fs/afs/dir_edit.c | 4 +- + fs/aio.c | 12 +- + fs/btrfs/relocation.c | 3 +- + fs/btrfs/send.c | 2 +- + fs/ceph/dir.c | 2 +- + fs/ceph/inode.c | 2 +- + fs/hugetlbfs/inode.c | 7 +- + fs/netfs/buffered_read.c | 4 +- + fs/netfs/buffered_write.c | 2 +- + fs/nfs/file.c | 2 +- + fs/nfs/internal.h | 19 - + fs/nfs/nfstrace.h | 4 +- + fs/nfs/write.c | 6 +- + fs/nilfs2/bmap.c | 10 +- + fs/proc/internal.h | 33 ++ + fs/proc/page.c | 21 +- + fs/proc/task_mmu.c | 110 ++--- + include/linux/buffer_head.h | 2 +- + include/linux/cgroup-defs.h | 2 - + include/linux/damon.h | 17 +- + include/linux/gfp.h | 8 + + include/linux/highmem-internal.h | 17 +- + include/linux/highmem.h | 2 +- + include/linux/huge_mm.h | 42 +- + include/linux/hugetlb.h | 23 +- + include/linux/kmsan.h | 76 ++++ + include/linux/kmsan_types.h | 2 +- + include/linux/memblock.h | 2 - + include/linux/memcontrol.h | 36 +- + include/linux/memory_hotplug.h | 4 +- + include/linux/migrate.h | 9 +- + include/linux/migrate_mode.h | 6 +- + include/linux/mm.h | 75 +--- + include/linux/mm_types.h | 37 +- + include/linux/mmzone.h | 2 + + include/linux/page-flags.h | 80 ++-- + include/linux/pagemap.h | 33 +- + include/linux/percpu-defs.h | 6 + + include/linux/pgtable.h | 35 +- + include/linux/rmap.h | 45 +- + include/linux/swap.h | 9 +- + include/linux/vmstat.h | 4 + + include/linux/zswap.h | 10 +- + include/ras/ras_event.h | 3 +- + include/trace/events/migrate.h | 3 +- + kernel/events/uprobes.c | 2 +- + kernel/power/swap.c | 5 +- + kernel/trace/ftrace.c | 1 + + lib/maple_tree.c | 15 +- + lib/test_hmm.c | 1 + + lib/test_maple_tree.c | 1 + + lib/test_ubsan.c | 1 + + lib/test_xarray.c | 1 + + lib/zlib_dfltcc/dfltcc.h | 1 + + lib/zlib_dfltcc/dfltcc_util.h | 28 ++ + mm/Kconfig | 13 +- + mm/balloon_compaction.c | 8 - + mm/damon/core.c | 338 ++++++++++++++- + mm/damon/dbgfs.c | 2 +- + mm/damon/lru_sort.c | 56 +-- + mm/damon/paddr.c | 157 +++++++ + mm/damon/reclaim.c | 65 ++- + mm/damon/sysfs-common.h | 2 +- + mm/damon/sysfs-schemes.c | 127 +++--- + mm/damon/sysfs-test.h | 10 +- + mm/damon/sysfs.c | 81 +--- + mm/dmapool_test.c | 1 + + mm/filemap.c | 8 +- + mm/folio-compat.c | 6 - + mm/gup.c | 6 +- + mm/highmem.c | 21 +- + mm/huge_memory.c | 161 +++++--- + mm/hugetlb.c | 41 +- + mm/hugetlb_cgroup.c | 305 +++++++------- + mm/hugetlb_vmemmap.c | 17 +- + mm/hwpoison-inject.c | 1 + + mm/internal.h | 75 +++- + mm/kfence/core.c | 11 +- + mm/kfence/kfence_test.c | 1 + + mm/khugepaged.c | 7 +- + mm/kmsan/core.c | 5 +- + mm/kmsan/hooks.c | 38 +- + mm/kmsan/init.c | 9 +- + mm/kmsan/instrumentation.c | 15 +- + mm/kmsan/kmsan.h | 39 +- + mm/kmsan/kmsan_test.c | 32 ++ + mm/kmsan/report.c | 10 +- + mm/kmsan/shadow.c | 9 +- + mm/ksm.c | 10 +- + mm/madvise.c | 2 +- + mm/memcontrol.c | 10 +- + mm/memory-failure.c | 201 ++++----- + mm/memory.c | 363 +++++++++++----- + mm/memory_hotplug.c | 49 +-- + mm/mempolicy.c | 18 +- + mm/migrate.c | 134 +++--- + mm/migrate_device.c | 24 +- + mm/mincore.c | 2 +- + mm/mlock.c | 19 +- + mm/mm_init.c | 96 ++--- + mm/mmap.c | 41 ++ + mm/mmap_lock.c | 175 +------- + mm/mprotect.c | 4 +- + mm/mremap.c | 2 +- + mm/page-writeback.c | 319 ++++++++------- + mm/page_alloc.c | 77 +++- + mm/page_ext.c | 32 +- + mm/page_io.c | 15 +- + mm/readahead.c | 276 +++++-------- + mm/rmap.c | 171 ++++---- + mm/shmem.c | 378 ++++++++++++++--- + mm/slub.c | 33 +- + mm/sparse-vmemmap.c | 8 + + mm/sparse.c | 28 +- + mm/swap.c | 8 +- + mm/swap.h | 30 +- + mm/swap_state.c | 115 +++--- + mm/swapfile.c | 75 +++- + mm/truncate.c | 2 +- + mm/userfaultfd.c | 12 +- + mm/vmalloc.c | 9 +- + mm/vmscan.c | 56 ++- + mm/vmstat.c | 26 +- + mm/zsmalloc.c | 38 +- + mm/zswap.c | 65 +-- + samples/kmemleak/kmemleak-test.c | 1 + + tools/include/uapi/linux/fs.h | 392 ++++++++++++++++++ + tools/include/uapi/linux/prctl.h | 331 +++++++++++++++ + tools/objtool/check.c | 2 + + tools/testing/selftests/damon/Makefile | 3 +- + tools/testing/selftests/damon/_damon_sysfs.py | 65 ++- + tools/testing/selftests/damon/access_memory.c | 2 +- + tools/testing/selftests/damon/access_memory_even.c | 42 ++ + tools/testing/selftests/damon/damon_nr_regions.py | 145 +++++++ + .../testing/selftests/damon/damos_tried_regions.py | 65 +++ + tools/testing/selftests/mm/Makefile | 2 + + tools/testing/selftests/mm/hugepage-mremap.c | 2 +- + tools/testing/selftests/mm/hugetlb_dio.c | 117 ++++++ + tools/testing/selftests/mm/ksm_functional_tests.c | 8 +- + tools/testing/selftests/mm/memfd_secret.c | 14 +- + tools/testing/selftests/mm/mkdirty.c | 8 +- + tools/testing/selftests/mm/mlock2.h | 1 + + tools/testing/selftests/mm/mseal_helpers.h | 41 ++ + tools/testing/selftests/mm/mseal_test.c | 143 +++---- + tools/testing/selftests/mm/pagemap_ioctl.c | 6 +- + tools/testing/selftests/mm/protection_keys.c | 2 +- + tools/testing/selftests/mm/run_vmtests.sh | 1 + + tools/testing/selftests/mm/seal_elf.c | 37 +- + tools/testing/selftests/mm/split_huge_page_test.c | 3 +- + tools/testing/selftests/mm/thuge-gen.c | 13 +- + tools/testing/selftests/mm/uffd-common.c | 4 - + tools/testing/selftests/mm/uffd-stress.c | 16 +- + tools/testing/selftests/mm/uffd-unit-tests.c | 14 +- + tools/testing/selftests/mm/va_high_addr_switch.c | 454 +++++++++++---------- + tools/testing/selftests/mm/va_high_addr_switch.sh | 4 - + 203 files changed, 5229 insertions(+), 2770 deletions(-) + create mode 100644 arch/s390/boot/kmsan.c + create mode 100644 arch/s390/include/asm/kmsan.h + create mode 100644 tools/include/uapi/linux/fs.h + create mode 100644 tools/include/uapi/linux/prctl.h + create mode 100644 tools/testing/selftests/damon/access_memory_even.c + create mode 100644 tools/testing/selftests/damon/damon_nr_regions.py + create mode 100644 tools/testing/selftests/damon/damos_tried_regions.py + create mode 100644 tools/testing/selftests/mm/hugetlb_dio.c + create mode 100644 tools/testing/selftests/mm/mseal_helpers.h +Merging mm-nonmm-stable/mm-nonmm-stable (2a49c8b6b6d0 selftests/fpu: add missing MODULE_DESCRIPTION() macro) +$ 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 include/linux/workqueue.h +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + drivers/fsi/fsi-occ.c | 17 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 2 +- + drivers/md/bcache/alloc.c | 64 +++++-- + drivers/md/bcache/bcache.h | 2 +- + drivers/md/bcache/bset.c | 124 +++++++++----- + drivers/md/bcache/bset.h | 40 ++--- + drivers/md/bcache/btree.c | 69 ++++---- + drivers/md/bcache/extents.c | 53 +++--- + drivers/md/bcache/movinggc.c | 41 +++-- + drivers/md/bcache/super.c | 3 +- + drivers/md/bcache/sysfs.c | 4 +- + drivers/md/bcache/util.c | 2 +- + drivers/md/bcache/util.h | 67 +------- + drivers/md/bcache/writeback.c | 13 +- + drivers/md/dm-vdo/repair.c | 19 ++- + drivers/md/dm-vdo/slab-depot.c | 14 +- + drivers/most/core.c | 10 +- + drivers/most/most_cdev.c | 6 +- + drivers/net/wireless/ti/wl1251/acx.h | 2 +- + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 2 +- + fs/bcachefs/clock.c | 47 ++++-- + fs/bcachefs/clock_types.h | 2 +- + fs/bcachefs/ec.c | 78 ++++++--- + fs/bcachefs/ec_types.h | 2 +- + fs/bcachefs/util.c | 2 +- + fs/bcachefs/util.h | 118 +------------ + fs/nilfs2/segment.c | 89 ++++++---- + fs/ocfs2/dlmglue.c | 28 +-- + fs/ocfs2/ocfs2.h | 2 +- + fs/ocfs2/stack_o2cb.c | 2 +- + fs/ocfs2/stack_user.c | 2 +- + fs/ocfs2/stackglue.h | 2 +- + fs/ocfs2/xattr.c | 27 ++- + fs/proc/generic.c | 6 +- + include/linux/cacheinfo.h | 2 +- + include/linux/cgroup.h | 1 - + include/linux/clockchips.h | 2 +- + include/linux/compiler.h | 6 +- + include/linux/cpu.h | 1 - + include/linux/cpu_cooling.h | 1 - + include/linux/cpu_rmap.h | 2 +- + include/linux/cpumask.h | 56 +----- + include/linux/cpumask_types.h | 66 ++++++++ + include/linux/interrupt.h | 2 +- + include/linux/irqchip/irq-partition-percpu.h | 2 +- + include/linux/jhash.h | 6 +- + include/linux/kernel_stat.h | 1 - + include/linux/min_heap.h | 188 ++++++++++++++++----- + include/linux/msi.h | 2 +- + include/linux/node.h | 1 - + include/linux/nvme-fc-driver.h | 2 +- + include/linux/panic.h | 8 +- + include/linux/percpu.h | 1 - + include/linux/pm_domain.h | 2 +- + include/linux/profile.h | 1 - + include/linux/rcupdate.h | 1 - + include/linux/sched.h | 7 +- + include/linux/seq_file.h | 1 - + include/linux/soc/apple/rtkit.h | 4 +- + include/linux/stop_machine.h | 2 +- + include/linux/torture.h | 2 +- + include/linux/tracepoint.h | 1 - + include/linux/workqueue.h | 2 +- + kernel/backtracetest.c | 1 + + kernel/crash_reserve.c | 1 - + kernel/events/core.c | 29 ++-- + kernel/fork.c | 7 +- + kernel/hung_task.c | 2 +- + kernel/panic.c | 116 +++++++++---- + kernel/resource_kunit.c | 1 + + lib/Kconfig.debug | 4 +- + lib/asn1_encoder.c | 1 + + lib/atomic64_test.c | 1 + + lib/bitfield_kunit.c | 1 + + lib/buildid.c | 14 ++ + lib/checksum_kunit.c | 1 + + lib/cmdline_kunit.c | 1 + + lib/dhry_run.c | 1 + + lib/dump_stack.c | 9 +- + lib/fortify_kunit.c | 1 + + lib/hashtable_test.c | 1 + + lib/is_signed_type_kunit.c | 1 + + lib/memcpy_kunit.c | 1 + + lib/overflow_kunit.c | 1 + + lib/percpu_counter.c | 44 ++++- + lib/plist.c | 42 ++++- + lib/siphash_kunit.c | 1 + + lib/sort.c | 14 +- + lib/stackinit_kunit.c | 1 + + lib/test-kstrtox.c | 1 + + lib/test_bits.c | 1 + + lib/test_blackhole_dev.c | 1 + + lib/test_firmware.c | 1 + + lib/test_fpu_glue.c | 1 + + lib/test_free_pages.c | 1 + + lib/test_hash.c | 1 + + lib/test_hexdump.c | 1 + + lib/test_ida.c | 1 + + lib/test_kmod.c | 1 + + lib/test_kprobes.c | 3 +- + lib/test_linear_ranges.c | 1 + + lib/test_list_sort.c | 1 + + lib/test_memcat_p.c | 1 + + lib/test_meminit.c | 1 + + lib/test_min_heap.c | 76 ++++++--- + lib/test_module.c | 1 + + lib/test_ref_tracker.c | 3 +- + lib/test_sort.c | 15 +- + lib/test_static_key_base.c | 1 + + lib/test_static_keys.c | 1 + + lib/test_sysctl.c | 1 + + lib/test_uuid.c | 1 + + lib/ts_bm.c | 1 + + lib/ts_fsm.c | 1 + + lib/ts_kmp.c | 1 + + net/netfilter/nf_conntrack_core.c | 2 +- + net/tipc/socket.c | 2 +- + samples/kfifo/bytestream-example.c | 1 + + samples/kfifo/dma-example.c | 1 + + samples/kfifo/inttype-example.c | 1 + + samples/kfifo/record-example.c | 1 + + scripts/checkpatch.pl | 26 ++- + scripts/decode_stacktrace.sh | 6 +- + scripts/gdb/linux/mm.py | 23 ++- + scripts/gdb/linux/stackdepot.py | 8 +- + scripts/spelling.txt | 3 + + tools/lib/list_sort.c | 10 -- + tools/testing/radix-tree/idr-test.c | 1 + + tools/testing/radix-tree/maple.c | 1 + + tools/testing/radix-tree/xarray.c | 1 + + .../selftests/filesystems/eventfd/eventfd_test.c | 136 ++++++++++++++- + tools/testing/selftests/mqueue/mq_perf_tests.c | 6 +- + tools/testing/selftests/proc/.gitignore | 2 + + tools/testing/selftests/proc/Makefile | 2 + + tools/testing/selftests/proc/proc-2-is-kthread.c | 53 ++++++ + tools/testing/selftests/proc/proc-empty-vm.c | 3 - + .../selftests/proc/proc-self-isnt-kthread.c | 37 ++++ + 140 files changed, 1337 insertions(+), 745 deletions(-) + create mode 100644 include/linux/cpumask_types.h + create mode 100644 tools/testing/selftests/proc/proc-2-is-kthread.c + create mode 100644 tools/testing/selftests/proc/proc-self-isnt-kthread.c +Merging mm/mm-everything (e6f9f50b8d1b foo) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging MAINTAINERS +Auto-merging mm/gup.c +CONFLICT (content): Merge conflict in mm/gup.c +Recorded preimage for 'mm/gup.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'mm/gup.c'. +[master 1038c091085a] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 18 +- + Documentation/admin-guide/mm/damon/start.rst | 46 +- + Documentation/admin-guide/mm/transhuge.rst | 16 + + Documentation/admin-guide/sysctl/vm.rst | 35 + + Documentation/filesystems/proc.rst | 9 + + Documentation/mm/damon/design.rst | 145 +- + Documentation/mm/damon/index.rst | 22 +- + MAINTAINERS | 2 + + arch/arm/include/asm/hugetlb-3level.h | 4 +- + arch/arm64/include/asm/hugetlb.h | 2 +- + arch/arm64/mm/hugetlbpage.c | 2 +- + arch/powerpc/Kconfig | 1 - + arch/powerpc/include/asm/book3s/32/pgalloc.h | 2 - + arch/powerpc/include/asm/book3s/64/hash-4k.h | 15 - + arch/powerpc/include/asm/book3s/64/hash.h | 40 +- + arch/powerpc/include/asm/book3s/64/hugetlb.h | 38 - + arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 47 - + arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 20 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 22 +- + arch/powerpc/include/asm/hugetlb.h | 15 +- + arch/powerpc/include/asm/nohash/32/hugetlb-8xx.h | 38 +- + arch/powerpc/include/asm/nohash/32/mmu-8xx.h | 9 +- + arch/powerpc/include/asm/nohash/32/pte-44x.h | 3 - + arch/powerpc/include/asm/nohash/32/pte-85xx.h | 3 - + arch/powerpc/include/asm/nohash/32/pte-8xx.h | 58 +- + arch/powerpc/include/asm/nohash/hugetlb-e500.h | 39 +- + arch/powerpc/include/asm/nohash/mmu-e500.h | 6 +- + arch/powerpc/include/asm/nohash/pgalloc.h | 2 - + arch/powerpc/include/asm/nohash/pgtable.h | 46 +- + arch/powerpc/include/asm/nohash/pte-e500.h | 63 +- + arch/powerpc/include/asm/page.h | 32 - + arch/powerpc/include/asm/pgtable-be-types.h | 10 - + arch/powerpc/include/asm/pgtable-types.h | 13 +- + arch/powerpc/include/asm/pgtable.h | 3 + + arch/powerpc/kernel/exceptions-64e.S | 4 +- + arch/powerpc/kernel/head_85xx.S | 70 +- + arch/powerpc/kernel/head_8xx.S | 10 +- + arch/powerpc/kernel/setup_64.c | 6 +- + arch/powerpc/mm/book3s64/hash_utils.c | 11 +- + arch/powerpc/mm/book3s64/hugetlbpage.c | 10 + + arch/powerpc/mm/book3s64/pgtable.c | 12 - + arch/powerpc/mm/hugetlbpage.c | 459 +-- + arch/powerpc/mm/init-common.c | 8 +- + arch/powerpc/mm/kasan/8xx.c | 21 +- + arch/powerpc/mm/nohash/8xx.c | 43 +- + arch/powerpc/mm/nohash/Makefile | 2 +- + arch/powerpc/mm/nohash/book3e_pgtable.c | 4 +- + arch/powerpc/mm/nohash/tlb.c | 407 +-- + arch/powerpc/mm/nohash/tlb_64e.c | 314 ++ + arch/powerpc/mm/nohash/tlb_low_64e.S | 428 +-- + arch/powerpc/mm/pgtable.c | 94 +- + arch/powerpc/mm/pgtable_32.c | 2 +- + arch/riscv/include/asm/hugetlb.h | 2 +- + arch/riscv/mm/hugetlbpage.c | 2 +- + arch/s390/include/asm/hugetlb.h | 4 +- + arch/s390/mm/hugetlbpage.c | 4 +- + drivers/dma-buf/Kconfig | 1 + + drivers/dma-buf/udmabuf.c | 236 +- + fs/aio.c | 3 +- + fs/coredump.c | 14 +- + fs/hugetlbfs/inode.c | 6 +- + fs/ocfs2/dir.c | 46 +- + fs/ocfs2/namei.c | 2 + + fs/proc/task_mmu.c | 393 ++- + fs/ufs/super.c | 1 + + fs/userfaultfd.c | 2 +- + include/asm-generic/hugetlb.h | 2 +- + include/linux/bpf.h | 4 +- + include/linux/highmem.h | 6 + + include/linux/huge_mm.h | 3 + + include/linux/hugetlb.h | 6 - + include/linux/list_lru.h | 2 +- + include/linux/memcontrol.h | 357 ++- + include/linux/memfd.h | 5 + + include/linux/migrate.h | 1 - + include/linux/mm.h | 6 + + include/linux/pgtable.h | 3 + + include/linux/sched.h | 9 +- + include/linux/slab.h | 12 +- + include/linux/swap.h | 6 +- + include/linux/swapops.h | 4 +- + include/linux/zswap.h | 2 +- + include/trace/events/kmem.h | 4 +- + include/uapi/linux/fs.h | 158 +- + init/Kconfig | 18 +- + kernel/bpf/memalloc.c | 9 +- + kernel/bpf/syscall.c | 6 +- + kernel/events/core.c | 2 +- + kernel/exit.c | 81 +- + kernel/fork.c | 18 +- + kernel/pid_namespace.c | 13 +- + lib/rbtree.c | 8 +- + lib/zlib_deflate/deflate_syms.c | 1 + + mm/Kconfig | 10 - + mm/Makefile | 2 + + mm/damon/paddr.c | 2 +- + mm/damon/vaddr.c | 6 +- + mm/filemap.c | 3 +- + mm/gup.c | 667 ++--- + mm/hmm.c | 2 +- + mm/huge_memory.c | 19 +- + mm/hugetlb.c | 90 +- + mm/kfence/core.c | 6 +- + mm/kfence/kfence.h | 2 +- + mm/ksm.c | 251 +- + mm/list_lru.c | 14 +- + mm/memcontrol-v1.c | 2969 +++++++++++++++++++ + mm/memcontrol-v1.h | 152 + + mm/memcontrol.c | 3172 +-------------------- + mm/memfd.c | 45 + + mm/memory-failure.c | 43 +- + mm/memory.c | 12 +- + mm/mempolicy.c | 2 +- + mm/migrate.c | 75 +- + mm/mincore.c | 2 +- + mm/page_alloc.c | 57 +- + mm/page_io.c | 113 +- + mm/pagewalk.c | 57 +- + mm/percpu-internal.h | 6 +- + mm/percpu.c | 6 +- + mm/shmem.c | 2 +- + mm/slab.h | 2 +- + mm/slab_common.c | 10 +- + mm/slub.c | 10 +- + mm/swapfile.c | 20 + + mm/userfaultfd.c | 2 +- + mm/util.c | 17 + + mm/vmscan.c | 49 +- + mm/zsmalloc.c | 137 +- + mm/zswap.c | 143 +- + tools/include/uapi/linux/fs.h | 180 +- + tools/mm/Makefile | 2 +- + tools/mm/thp_swap_allocator_test.c | 234 ++ + tools/testing/selftests/cgroup/config | 1 - + tools/testing/selftests/drivers/dma-buf/udmabuf.c | 214 +- + tools/testing/selftests/exec/Makefile | 1 - + tools/testing/selftests/futex/functional/Makefile | 2 +- + tools/testing/selftests/intel_pstate/Makefile | 2 +- + tools/testing/selftests/iommu/Makefile | 2 - + tools/testing/selftests/kvm/Makefile | 2 +- + tools/testing/selftests/lib.mk | 3 + + tools/testing/selftests/mm/.gitignore | 1 + + tools/testing/selftests/mm/Makefile | 1 + + tools/testing/selftests/mm/hugetlb-soft-offline.c | 228 ++ + tools/testing/selftests/mm/run_vmtests.sh | 6 + + tools/testing/selftests/mm/thuge-gen.c | 2 +- + tools/testing/selftests/mm/uffd-stress.c | 17 +- + tools/testing/selftests/net/Makefile | 2 +- + tools/testing/selftests/net/tcp_ao/Makefile | 2 +- + tools/testing/selftests/proc/Makefile | 2 +- + tools/testing/selftests/proc/proc-pid-vm.c | 86 + + tools/testing/selftests/resctrl/Makefile | 2 +- + tools/testing/selftests/ring-buffer/Makefile | 1 - + tools/testing/selftests/riscv/mm/Makefile | 2 +- + tools/testing/selftests/sgx/Makefile | 2 +- + tools/testing/selftests/tmpfs/Makefile | 1 - + 156 files changed, 7100 insertions(+), 6268 deletions(-) + delete mode 100644 arch/powerpc/include/asm/book3s/64/pgtable-4k.h + create mode 100644 arch/powerpc/mm/nohash/tlb_64e.c + create mode 100644 mm/memcontrol-v1.c + create mode 100644 mm/memcontrol-v1.h + create mode 100644 tools/mm/thp_swap_allocator_test.c + create mode 100644 tools/testing/selftests/mm/hugetlb-soft-offline.c +Merging kbuild/for-next (fc8ad8ff95eb kconfig: remove E_LIST expression type) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Merge made by the 'ort' strategy. + Documentation/kbuild/kconfig-language.rst | 11 +- + include/asm-generic/vmlinux.lds.h | 19 -- + init/Makefile | 2 +- + kernel/kallsyms_internal.h | 5 - + scripts/Makefile.lib | 1 + + {init => scripts}/build-version | 0 + scripts/kallsyms.c | 6 - + scripts/kconfig/conf.c | 238 +++++++---------- + scripts/kconfig/confdata.c | 127 +++------ + scripts/kconfig/expr.c | 23 +- + scripts/kconfig/expr.h | 21 +- + scripts/kconfig/gconf-cfg.sh | 2 + + scripts/kconfig/gconf.c | 24 +- + scripts/kconfig/list.h | 53 ++++ + scripts/kconfig/lkc.h | 10 +- + scripts/kconfig/lkc_proto.h | 4 +- + scripts/kconfig/mconf-cfg.sh | 2 + + scripts/kconfig/mconf.c | 36 +-- + scripts/kconfig/menu.c | 57 +---- + scripts/kconfig/nconf-cfg.sh | 2 + + scripts/kconfig/nconf.c | 36 +-- + scripts/kconfig/parser.y | 41 +-- + scripts/kconfig/qconf-cfg.sh | 2 + + scripts/kconfig/qconf.cc | 20 +- + scripts/kconfig/qconf.h | 2 +- + scripts/kconfig/symbol.c | 284 ++++++++++++--------- + scripts/kconfig/tests/choice/Kconfig | 17 -- + scripts/kconfig/tests/choice/__init__.py | 10 - + .../kconfig/tests/choice/alldef_expected_config | 3 - + .../kconfig/tests/choice/allmod_expected_config | 3 - + scripts/kconfig/tests/choice/allno_expected_config | 3 - + .../kconfig/tests/choice/allyes_expected_config | 3 - + .../kconfig/tests/choice/oldask0_expected_stdout | 4 - + scripts/kconfig/tests/choice/oldask1_config | 1 - + .../kconfig/tests/choice/oldask1_expected_stdout | 9 - + .../kconfig/tests/choice_value_with_m_dep/Kconfig | 21 -- + .../tests/choice_value_with_m_dep/__init__.py | 16 -- + .../kconfig/tests/choice_value_with_m_dep/config | 2 - + .../tests/choice_value_with_m_dep/expected_config | 3 - + .../tests/choice_value_with_m_dep/expected_stdout | 4 - + scripts/kconfig/tests/inter_choice/Kconfig | 25 -- + scripts/kconfig/tests/inter_choice/__init__.py | 15 -- + scripts/kconfig/tests/inter_choice/defconfig | 1 - + scripts/kconfig/tests/inter_choice/expected_config | 4 - + scripts/link-vmlinux.sh | 101 ++++---- + scripts/make_fit.py | 86 +++++-- + scripts/mod/modpost.c | 11 - + scripts/package/builddeb | 2 +- + scripts/package/buildtar | 2 +- + scripts/package/gen-diff-patch | 2 + + scripts/package/install-extmod-build | 5 +- + scripts/package/mkdebian | 2 +- + scripts/package/mkspec | 4 +- + usr/Makefile | 6 +- + 54 files changed, 569 insertions(+), 824 deletions(-) + rename {init => scripts}/build-version (100%) + delete mode 100644 scripts/kconfig/tests/choice/oldask1_config + delete mode 100644 scripts/kconfig/tests/choice/oldask1_expected_stdout + delete mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/Kconfig + delete mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/__init__.py + delete mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/config + delete mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/expected_config + delete mode 100644 scripts/kconfig/tests/choice_value_with_m_dep/expected_stdout + delete mode 100644 scripts/kconfig/tests/inter_choice/Kconfig + delete mode 100644 scripts/kconfig/tests/inter_choice/__init__.py + delete mode 100644 scripts/kconfig/tests/inter_choice/defconfig + delete mode 100644 scripts/kconfig/tests/inter_choice/expected_config +Merging clang-format/clang-format (5a205c6a9f79 clang-format: Update with v6.7-rc4's `for_each` macro list) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf-tools-next (a7cacaa0880e perf sched replay: Fix -r/--repeat command line option for infinity) +$ 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 +Auto-merging tools/perf/Makefile.perf +Auto-merging tools/perf/builtin-record.c +CONFLICT (content): Merge conflict in tools/perf/builtin-record.c +Auto-merging tools/perf/builtin-trace.c +Resolved 'tools/perf/builtin-record.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 91d53f5a6e86] Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git +$ git diff -M --stat --summary HEAD^.. + tools/build/feature/test-libtracefs.c | 2 +- + tools/lib/api/io.h | 67 +- + tools/lib/perf/include/perf/event.h | 6 + + tools/perf/Build | 14 +- + tools/perf/Documentation/perf-amd-ibs.txt | 189 + + tools/perf/Documentation/perf-kwork.txt | 4 +- + tools/perf/Documentation/perf-lock.txt | 4 +- + tools/perf/Documentation/perf-mem.txt | 2 +- + tools/perf/Documentation/perf-record.txt | 4 +- + tools/perf/Documentation/perf-sched.txt | 11 +- + tools/perf/Documentation/perf-top.txt | 4 + + tools/perf/Documentation/perf.txt | 3 +- + tools/perf/Makefile.config | 34 +- + tools/perf/Makefile.perf | 83 +- + tools/perf/arch/Build | 5 +- + tools/perf/arch/arm/Build | 4 +- + tools/perf/arch/arm/tests/Build | 8 +- + tools/perf/arch/arm/util/Build | 10 +- + tools/perf/arch/arm/util/pmu.c | 10 +- + tools/perf/arch/arm64/Build | 4 +- + tools/perf/arch/arm64/tests/Build | 8 +- + tools/perf/arch/arm64/util/Build | 20 +- + tools/perf/arch/csky/Build | 2 +- + tools/perf/arch/csky/util/Build | 6 +- + tools/perf/arch/loongarch/Build | 2 +- + tools/perf/arch/loongarch/util/Build | 8 +- + tools/perf/arch/mips/Build | 2 +- + tools/perf/arch/mips/util/Build | 6 +- + tools/perf/arch/powerpc/Build | 4 +- + tools/perf/arch/powerpc/tests/Build | 6 +- + tools/perf/arch/powerpc/util/Build | 24 +- + tools/perf/arch/riscv/Build | 2 +- + tools/perf/arch/riscv/util/Build | 8 +- + tools/perf/arch/s390/Build | 2 +- + tools/perf/arch/s390/util/Build | 16 +- + tools/perf/arch/sh/Build | 2 +- + tools/perf/arch/sh/util/Build | 2 +- + tools/perf/arch/sparc/Build | 2 +- + tools/perf/arch/sparc/util/Build | 2 +- + tools/perf/arch/x86/Build | 6 +- + tools/perf/arch/x86/tests/Build | 20 +- + tools/perf/arch/x86/tests/insn-x86-dat-32.c | 116 + + tools/perf/arch/x86/tests/insn-x86-dat-64.c | 1026 ++++++ + tools/perf/arch/x86/tests/insn-x86-dat-src.c | 597 ++++ + tools/perf/arch/x86/util/Build | 42 +- + tools/perf/arch/xtensa/Build | 2 +- + tools/perf/bench/Build | 46 +- + tools/perf/bench/epoll-ctl.c | 2 +- + tools/perf/bench/epoll-wait.c | 2 +- + tools/perf/bench/futex-hash.c | 2 +- + tools/perf/bench/futex-lock-pi.c | 2 +- + tools/perf/bench/futex-requeue.c | 2 +- + tools/perf/bench/futex-wake-parallel.c | 4 +- + tools/perf/bench/futex-wake.c | 2 +- + tools/perf/builtin-annotate.c | 4 +- + tools/perf/builtin-list.c | 23 +- + tools/perf/builtin-lock.c | 29 +- + tools/perf/builtin-record.c | 32 +- + tools/perf/builtin-report.c | 12 +- + tools/perf/builtin-sched.c | 22 +- + tools/perf/builtin-stat.c | 399 ++- + tools/perf/builtin-top.c | 9 + + tools/perf/builtin-trace.c | 35 +- + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 1084 +++--- + .../perf/pmu-events/arch/x86/alderlake/cache.json | 184 +- + .../arch/x86/alderlake/floating-point.json | 20 + + .../pmu-events/arch/x86/alderlake/frontend.json | 56 +- + .../perf/pmu-events/arch/x86/alderlake/memory.json | 44 + + .../arch/x86/alderlake/metricgroups.json | 23 +- + .../perf/pmu-events/arch/x86/alderlake/other.json | 37 + + .../pmu-events/arch/x86/alderlake/pipeline.json | 214 ++ + .../arch/x86/alderlake/uncore-interconnect.json | 19 + + .../arch/x86/alderlake/uncore-memory.json | 25 + + .../arch/x86/alderlake/uncore-other.json | 1 + + .../arch/x86/alderlake/virtual-memory.json | 26 + + .../arch/x86/alderlaken/adln-metrics.json | 704 ++-- + .../perf/pmu-events/arch/x86/alderlaken/cache.json | 50 +- + .../arch/x86/alderlaken/floating-point.json | 2 + + .../pmu-events/arch/x86/alderlaken/frontend.json | 3 + + .../pmu-events/arch/x86/alderlaken/memory.json | 11 + + .../arch/x86/alderlaken/metricgroups.json | 21 +- + .../perf/pmu-events/arch/x86/alderlaken/other.json | 13 + + .../pmu-events/arch/x86/alderlaken/pipeline.json | 80 + + .../arch/x86/alderlaken/uncore-interconnect.json | 19 + + .../arch/x86/alderlaken/uncore-memory.json | 25 + + .../arch/x86/alderlaken/uncore-other.json | 1 + + .../arch/x86/alderlaken/virtual-memory.json | 6 + + tools/perf/pmu-events/arch/x86/bonnell/cache.json | 93 + + .../perf/pmu-events/arch/x86/bonnell/counter.json | 7 + + .../arch/x86/bonnell/floating-point.json | 32 + + .../perf/pmu-events/arch/x86/bonnell/frontend.json | 11 + + tools/perf/pmu-events/arch/x86/bonnell/memory.json | 19 + + tools/perf/pmu-events/arch/x86/bonnell/other.json | 56 + + .../perf/pmu-events/arch/x86/bonnell/pipeline.json | 44 + + .../arch/x86/bonnell/virtual-memory.json | 15 + + .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 80 +- + .../perf/pmu-events/arch/x86/broadwell/cache.json | 275 ++ + .../pmu-events/arch/x86/broadwell/counter.json | 22 + + .../arch/x86/broadwell/floating-point.json | 22 + + .../pmu-events/arch/x86/broadwell/frontend.json | 28 + + .../perf/pmu-events/arch/x86/broadwell/memory.json | 240 ++ + .../arch/x86/broadwell/metricgroups.json | 11 + + .../perf/pmu-events/arch/x86/broadwell/other.json | 4 + + .../pmu-events/arch/x86/broadwell/pipeline.json | 137 + + .../arch/x86/broadwell/uncore-cache.json | 24 + + .../arch/x86/broadwell/uncore-interconnect.json | 7 + + .../arch/x86/broadwell/uncore-other.json | 10 - + .../arch/x86/broadwell/virtual-memory.json | 38 + + .../arch/x86/broadwellde/bdwde-metrics.json | 80 +- + .../pmu-events/arch/x86/broadwellde/cache.json | 76 + + .../pmu-events/arch/x86/broadwellde/counter.json | 42 + + .../arch/x86/broadwellde/floating-point.json | 22 + + .../pmu-events/arch/x86/broadwellde/frontend.json | 28 + + .../pmu-events/arch/x86/broadwellde/memory.json | 39 + + .../arch/x86/broadwellde/metricgroups.json | 11 + + .../pmu-events/arch/x86/broadwellde/other.json | 4 + + .../pmu-events/arch/x86/broadwellde/pipeline.json | 137 + + .../arch/x86/broadwellde/uncore-cache.json | 382 ++ + .../arch/x86/broadwellde/uncore-interconnect.json | 70 + + .../pmu-events/arch/x86/broadwellde/uncore-io.json | 62 + + .../arch/x86/broadwellde/uncore-memory.json | 322 ++ + .../arch/x86/broadwellde/uncore-power.json | 57 + + .../arch/x86/broadwellde/virtual-memory.json | 38 + + .../arch/x86/broadwellx/bdx-metrics.json | 128 +- + .../perf/pmu-events/arch/x86/broadwellx/cache.json | 88 + + .../pmu-events/arch/x86/broadwellx/counter.json | 57 + + .../arch/x86/broadwellx/floating-point.json | 22 + + .../pmu-events/arch/x86/broadwellx/frontend.json | 28 + + .../pmu-events/arch/x86/broadwellx/memory.json | 58 + + .../arch/x86/broadwellx/metricgroups.json | 11 + + .../perf/pmu-events/arch/x86/broadwellx/other.json | 4 + + .../pmu-events/arch/x86/broadwellx/pipeline.json | 137 + + .../arch/x86/broadwellx/uncore-cache.json | 399 +++ + .../arch/x86/broadwellx/uncore-interconnect.json | 454 +++ + .../pmu-events/arch/x86/broadwellx/uncore-io.json | 62 + + .../arch/x86/broadwellx/uncore-memory.json | 326 ++ + .../arch/x86/broadwellx/uncore-power.json | 57 + + .../arch/x86/broadwellx/virtual-memory.json | 38 + + .../pmu-events/arch/x86/cascadelakex/cache.json | 1245 +++++++ + .../arch/x86/cascadelakex/clx-metrics.json | 310 +- + .../pmu-events/arch/x86/cascadelakex/counter.json | 52 + + .../arch/x86/cascadelakex/floating-point.json | 16 + + .../pmu-events/arch/x86/cascadelakex/frontend.json | 49 + + .../pmu-events/arch/x86/cascadelakex/memory.json | 743 ++++ + .../arch/x86/cascadelakex/metricgroups.json | 13 + + .../pmu-events/arch/x86/cascadelakex/other.json | 168 + + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 104 +- + .../arch/x86/cascadelakex/uncore-cache.json | 2293 ++++++++++++ + .../arch/x86/cascadelakex/uncore-interconnect.json | 2536 ++++++++++++++ + .../arch/x86/cascadelakex/uncore-io.json | 703 ++++ + .../arch/x86/cascadelakex/uncore-memory.json | 985 ++++++ + .../arch/x86/cascadelakex/uncore-power.json | 50 + + .../arch/x86/cascadelakex/virtual-memory.json | 28 + + .../pmu-events/arch/x86/elkhartlake/cache.json | 101 + + .../pmu-events/arch/x86/elkhartlake/counter.json | 7 + + .../arch/x86/elkhartlake/floating-point.json | 3 + + .../pmu-events/arch/x86/elkhartlake/frontend.json | 9 + + .../pmu-events/arch/x86/elkhartlake/memory.json | 40 + + .../pmu-events/arch/x86/elkhartlake/other.json | 61 + + .../pmu-events/arch/x86/elkhartlake/pipeline.json | 60 + + .../arch/x86/elkhartlake/virtual-memory.json | 31 + + .../pmu-events/arch/x86/emeraldrapids/cache.json | 159 +- + .../pmu-events/arch/x86/emeraldrapids/counter.json | 82 + + .../arch/x86/emeraldrapids/emr-metrics.json | 2186 ++++++++++++ + .../arch/x86/emeraldrapids/floating-point.json | 28 + + .../arch/x86/emeraldrapids/frontend.json | 50 + + .../pmu-events/arch/x86/emeraldrapids/memory.json | 50 + + .../arch/x86/emeraldrapids/metricgroups.json | 137 + + .../pmu-events/arch/x86/emeraldrapids/other.json | 43 + + .../arch/x86/emeraldrapids/pipeline.json | 133 + + .../arch/x86/emeraldrapids/uncore-cache.json | 1288 +++++++ + .../arch/x86/emeraldrapids/uncore-cxl.json | 110 + + .../x86/emeraldrapids/uncore-interconnect.json | 1427 ++++++++ + .../arch/x86/emeraldrapids/uncore-io.json | 743 ++++ + .../arch/x86/emeraldrapids/uncore-memory.json | 742 ++++ + .../arch/x86/emeraldrapids/uncore-power.json | 49 + + .../arch/x86/emeraldrapids/virtual-memory.json | 20 + + tools/perf/pmu-events/arch/x86/goldmont/cache.json | 103 + + .../perf/pmu-events/arch/x86/goldmont/counter.json | 7 + + .../arch/x86/goldmont/floating-point.json | 3 + + .../pmu-events/arch/x86/goldmont/frontend.json | 8 + + .../perf/pmu-events/arch/x86/goldmont/memory.json | 3 + + tools/perf/pmu-events/arch/x86/goldmont/other.json | 5 + + .../pmu-events/arch/x86/goldmont/pipeline.json | 40 + + .../arch/x86/goldmont/virtual-memory.json | 7 + + .../pmu-events/arch/x86/goldmontplus/cache.json | 101 + + .../pmu-events/arch/x86/goldmontplus/counter.json | 7 + + .../arch/x86/goldmontplus/floating-point.json | 3 + + .../pmu-events/arch/x86/goldmontplus/frontend.json | 8 + + .../pmu-events/arch/x86/goldmontplus/memory.json | 3 + + .../pmu-events/arch/x86/goldmontplus/other.json | 5 + + .../pmu-events/arch/x86/goldmontplus/pipeline.json | 42 + + .../arch/x86/goldmontplus/virtual-memory.json | 18 + + .../perf/pmu-events/arch/x86/grandridge/cache.json | 97 +- + .../pmu-events/arch/x86/grandridge/counter.json | 42 + + .../arch/x86/grandridge/floating-point.json | 54 +- + .../pmu-events/arch/x86/grandridge/frontend.json | 5 +- + .../arch/x86/grandridge/grr-metrics.json | 849 +++++ + .../pmu-events/arch/x86/grandridge/memory.json | 13 +- + .../arch/x86/grandridge/metricgroups.json | 23 + + .../perf/pmu-events/arch/x86/grandridge/other.json | 15 +- + .../pmu-events/arch/x86/grandridge/pipeline.json | 97 +- + .../arch/x86/grandridge/uncore-cache.json | 267 ++ + .../arch/x86/grandridge/uncore-interconnect.json | 30 + + .../pmu-events/arch/x86/grandridge/uncore-io.json | 181 + + .../arch/x86/grandridge/uncore-memory.json | 66 + + .../arch/x86/grandridge/uncore-power.json | 1 + + .../arch/x86/grandridge/virtual-memory.json | 17 + + .../pmu-events/arch/x86/graniterapids/cache.json | 825 +++++ + .../pmu-events/arch/x86/graniterapids/counter.json | 77 + + .../arch/x86/graniterapids/floating-point.json | 242 ++ + .../arch/x86/graniterapids/frontend.json | 469 ++- + .../pmu-events/arch/x86/graniterapids/memory.json | 175 +- + .../pmu-events/arch/x86/graniterapids/other.json | 150 +- + .../arch/x86/graniterapids/pipeline.json | 1009 +++++- + .../arch/x86/graniterapids/uncore-cache.json | 3674 ++++++++++++++++++++ + .../arch/x86/graniterapids/uncore-cxl.json | 31 + + .../x86/graniterapids/uncore-interconnect.json | 1849 ++++++++++ + .../arch/x86/graniterapids/uncore-io.json | 1901 ++++++++++ + .../arch/x86/graniterapids/uncore-memory.json | 449 +++ + .../arch/x86/graniterapids/uncore-power.json | 11 + + .../arch/x86/graniterapids/virtual-memory.json | 159 + + tools/perf/pmu-events/arch/x86/haswell/cache.json | 94 + + .../perf/pmu-events/arch/x86/haswell/counter.json | 22 + + .../arch/x86/haswell/floating-point.json | 10 + + .../perf/pmu-events/arch/x86/haswell/frontend.json | 29 + + .../pmu-events/arch/x86/haswell/hsw-metrics.json | 66 +- + tools/perf/pmu-events/arch/x86/haswell/memory.json | 60 + + .../pmu-events/arch/x86/haswell/metricgroups.json | 11 + + tools/perf/pmu-events/arch/x86/haswell/other.json | 4 + + .../perf/pmu-events/arch/x86/haswell/pipeline.json | 130 + + .../pmu-events/arch/x86/haswell/uncore-cache.json | 33 + + .../arch/x86/haswell/uncore-interconnect.json | 6 + + .../pmu-events/arch/x86/haswell/uncore-other.json | 1 + + .../arch/x86/haswell/virtual-memory.json | 49 + + tools/perf/pmu-events/arch/x86/haswellx/cache.json | 97 + + .../perf/pmu-events/arch/x86/haswellx/counter.json | 57 + + .../arch/x86/haswellx/floating-point.json | 10 + + .../pmu-events/arch/x86/haswellx/frontend.json | 29 + + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 114 +- + .../perf/pmu-events/arch/x86/haswellx/memory.json | 67 + + .../pmu-events/arch/x86/haswellx/metricgroups.json | 11 + + tools/perf/pmu-events/arch/x86/haswellx/other.json | 4 + + .../pmu-events/arch/x86/haswellx/pipeline.json | 130 + + .../pmu-events/arch/x86/haswellx/uncore-cache.json | 398 +++ + .../arch/x86/haswellx/uncore-interconnect.json | 448 +++ + .../pmu-events/arch/x86/haswellx/uncore-io.json | 59 + + .../arch/x86/haswellx/uncore-memory.json | 325 ++ + .../pmu-events/arch/x86/haswellx/uncore-power.json | 62 + + .../arch/x86/haswellx/virtual-memory.json | 49 + + tools/perf/pmu-events/arch/x86/icelake/cache.json | 109 + + .../perf/pmu-events/arch/x86/icelake/counter.json | 17 + + .../arch/x86/icelake/floating-point.json | 13 + + .../perf/pmu-events/arch/x86/icelake/frontend.json | 41 +- + .../pmu-events/arch/x86/icelake/icl-metrics.json | 308 +- + tools/perf/pmu-events/arch/x86/icelake/memory.json | 44 + + .../pmu-events/arch/x86/icelake/metricgroups.json | 13 + + tools/perf/pmu-events/arch/x86/icelake/other.json | 27 + + .../perf/pmu-events/arch/x86/icelake/pipeline.json | 94 + + .../arch/x86/icelake/uncore-interconnect.json | 34 +- + .../pmu-events/arch/x86/icelake/uncore-other.json | 1 + + .../arch/x86/icelake/virtual-memory.json | 20 + + tools/perf/pmu-events/arch/x86/icelakex/cache.json | 106 + + .../perf/pmu-events/arch/x86/icelakex/counter.json | 57 + + .../arch/x86/icelakex/floating-point.json | 13 + + .../pmu-events/arch/x86/icelakex/frontend.json | 38 + + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 340 +- + .../perf/pmu-events/arch/x86/icelakex/memory.json | 45 + + .../pmu-events/arch/x86/icelakex/metricgroups.json | 13 + + tools/perf/pmu-events/arch/x86/icelakex/other.json | 52 + + .../pmu-events/arch/x86/icelakex/pipeline.json | 92 + + .../pmu-events/arch/x86/icelakex/uncore-cache.json | 2149 +++++++++++- + .../arch/x86/icelakex/uncore-interconnect.json | 3344 ++++++++++++++++++ + .../pmu-events/arch/x86/icelakex/uncore-io.json | 1829 ++++++++++ + .../arch/x86/icelakex/uncore-memory.json | 338 ++ + .../pmu-events/arch/x86/icelakex/uncore-power.json | 51 + + .../arch/x86/icelakex/virtual-memory.json | 22 + + .../perf/pmu-events/arch/x86/ivybridge/cache.json | 104 + + .../pmu-events/arch/x86/ivybridge/counter.json | 17 + + .../arch/x86/ivybridge/floating-point.json | 17 + + .../pmu-events/arch/x86/ivybridge/frontend.json | 30 + + .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 68 +- + .../perf/pmu-events/arch/x86/ivybridge/memory.json | 19 + + .../arch/x86/ivybridge/metricgroups.json | 11 + + .../perf/pmu-events/arch/x86/ivybridge/other.json | 4 + + .../pmu-events/arch/x86/ivybridge/pipeline.json | 126 + + .../arch/x86/ivybridge/uncore-cache.json | 25 + + .../arch/x86/ivybridge/uncore-interconnect.json | 9 + + .../arch/x86/ivybridge/virtual-memory.json | 18 + + tools/perf/pmu-events/arch/x86/ivytown/cache.json | 118 + + .../perf/pmu-events/arch/x86/ivytown/counter.json | 52 + + .../arch/x86/ivytown/floating-point.json | 17 + + .../perf/pmu-events/arch/x86/ivytown/frontend.json | 30 + + .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 68 +- + tools/perf/pmu-events/arch/x86/ivytown/memory.json | 41 + + .../pmu-events/arch/x86/ivytown/metricgroups.json | 11 + + tools/perf/pmu-events/arch/x86/ivytown/other.json | 4 + + .../perf/pmu-events/arch/x86/ivytown/pipeline.json | 126 + + .../pmu-events/arch/x86/ivytown/uncore-cache.json | 349 ++ + .../arch/x86/ivytown/uncore-interconnect.json | 385 ++ + .../pmu-events/arch/x86/ivytown/uncore-io.json | 61 + + .../pmu-events/arch/x86/ivytown/uncore-memory.json | 198 ++ + .../pmu-events/arch/x86/ivytown/uncore-power.json | 74 + + .../arch/x86/ivytown/virtual-memory.json | 20 + + tools/perf/pmu-events/arch/x86/jaketown/cache.json | 123 + + .../perf/pmu-events/arch/x86/jaketown/counter.json | 52 + + .../arch/x86/jaketown/floating-point.json | 15 + + .../pmu-events/arch/x86/jaketown/frontend.json | 32 + + .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 24 +- + .../perf/pmu-events/arch/x86/jaketown/memory.json | 35 + + .../pmu-events/arch/x86/jaketown/metricgroups.json | 11 + + tools/perf/pmu-events/arch/x86/jaketown/other.json | 6 + + .../pmu-events/arch/x86/jaketown/pipeline.json | 127 + + .../pmu-events/arch/x86/jaketown/uncore-cache.json | 205 ++ + .../arch/x86/jaketown/uncore-interconnect.json | 207 ++ + .../pmu-events/arch/x86/jaketown/uncore-io.json | 36 + + .../arch/x86/jaketown/uncore-memory.json | 51 + + .../pmu-events/arch/x86/jaketown/uncore-power.json | 39 + + .../arch/x86/jaketown/virtual-memory.json | 16 + + .../pmu-events/arch/x86/knightslanding/cache.json | 213 ++ + .../arch/x86/knightslanding/counter.json | 37 + + .../arch/x86/knightslanding/floating-point.json | 3 + + .../arch/x86/knightslanding/frontend.json | 7 + + .../pmu-events/arch/x86/knightslanding/memory.json | 101 + + .../arch/x86/knightslanding/pipeline.json | 45 + + .../arch/x86/knightslanding/uncore-cache.json | 421 +++ + .../arch/x86/knightslanding/uncore-io.json | 24 + + .../arch/x86/knightslanding/uncore-memory.json | 14 + + .../arch/x86/knightslanding/virtual-memory.json | 7 + + .../perf/pmu-events/arch/x86/lunarlake/cache.json | 20 + + .../pmu-events/arch/x86/lunarlake/frontend.json | 3 + + .../perf/pmu-events/arch/x86/lunarlake/memory.json | 15 + + .../perf/pmu-events/arch/x86/lunarlake/other.json | 6 + + .../pmu-events/arch/x86/lunarlake/pipeline.json | 36 + + .../arch/x86/lunarlake/virtual-memory.json | 6 + + tools/perf/pmu-events/arch/x86/mapfile.csv | 34 +- + .../perf/pmu-events/arch/x86/meteorlake/cache.json | 223 +- + .../arch/x86/meteorlake/floating-point.json | 86 +- + .../pmu-events/arch/x86/meteorlake/frontend.json | 69 +- + .../pmu-events/arch/x86/meteorlake/memory.json | 62 +- + .../perf/pmu-events/arch/x86/meteorlake/other.json | 19 +- + .../pmu-events/arch/x86/meteorlake/pipeline.json | 300 +- + .../arch/x86/meteorlake/uncore-cache.json | 2 + + .../arch/x86/meteorlake/uncore-interconnect.json | 8 + + .../arch/x86/meteorlake/uncore-memory.json | 16 + + .../arch/x86/meteorlake/uncore-other.json | 1 + + .../arch/x86/meteorlake/virtual-memory.json | 37 + + .../perf/pmu-events/arch/x86/nehalemep/cache.json | 320 ++ + .../pmu-events/arch/x86/nehalemep/counter.json | 7 + + .../arch/x86/nehalemep/floating-point.json | 28 + + .../pmu-events/arch/x86/nehalemep/frontend.json | 3 + + .../perf/pmu-events/arch/x86/nehalemep/memory.json | 67 + + .../perf/pmu-events/arch/x86/nehalemep/other.json | 18 + + .../pmu-events/arch/x86/nehalemep/pipeline.json | 109 + + .../arch/x86/nehalemep/virtual-memory.json | 13 + + .../perf/pmu-events/arch/x86/nehalemex/cache.json | 315 ++ + .../pmu-events/arch/x86/nehalemex/counter.json | 7 + + .../arch/x86/nehalemex/floating-point.json | 28 + + .../pmu-events/arch/x86/nehalemex/frontend.json | 3 + + .../perf/pmu-events/arch/x86/nehalemex/memory.json | 67 + + .../perf/pmu-events/arch/x86/nehalemex/other.json | 18 + + .../pmu-events/arch/x86/nehalemex/pipeline.json | 109 + + .../arch/x86/nehalemex/virtual-memory.json | 13 + + .../perf/pmu-events/arch/x86/rocketlake/cache.json | 109 + + .../pmu-events/arch/x86/rocketlake/counter.json | 17 + + .../arch/x86/rocketlake/floating-point.json | 13 + + .../pmu-events/arch/x86/rocketlake/frontend.json | 41 +- + .../pmu-events/arch/x86/rocketlake/memory.json | 44 + + .../arch/x86/rocketlake/metricgroups.json | 13 + + .../perf/pmu-events/arch/x86/rocketlake/other.json | 27 + + .../pmu-events/arch/x86/rocketlake/pipeline.json | 94 + + .../arch/x86/rocketlake/rkl-metrics.json | 308 +- + .../arch/x86/rocketlake/uncore-interconnect.json | 28 +- + .../arch/x86/rocketlake/uncore-other.json | 1 + + .../arch/x86/rocketlake/virtual-memory.json | 20 + + .../pmu-events/arch/x86/sandybridge/cache.json | 173 + + .../pmu-events/arch/x86/sandybridge/counter.json | 17 + + .../arch/x86/sandybridge/floating-point.json | 15 + + .../pmu-events/arch/x86/sandybridge/frontend.json | 32 + + .../pmu-events/arch/x86/sandybridge/memory.json | 37 + + .../arch/x86/sandybridge/metricgroups.json | 11 + + .../pmu-events/arch/x86/sandybridge/other.json | 6 + + .../pmu-events/arch/x86/sandybridge/pipeline.json | 128 + + .../arch/x86/sandybridge/snb-metrics.json | 24 +- + .../arch/x86/sandybridge/uncore-cache.json | 25 + + .../arch/x86/sandybridge/uncore-interconnect.json | 9 + + .../arch/x86/sandybridge/virtual-memory.json | 16 + + .../pmu-events/arch/x86/sapphirerapids/cache.json | 161 +- + .../arch/x86/sapphirerapids/counter.json | 82 + + .../arch/x86/sapphirerapids/floating-point.json | 28 + + .../arch/x86/sapphirerapids/frontend.json | 50 + + .../pmu-events/arch/x86/sapphirerapids/memory.json | 50 + + .../arch/x86/sapphirerapids/metricgroups.json | 13 + + .../pmu-events/arch/x86/sapphirerapids/other.json | 48 + + .../arch/x86/sapphirerapids/pipeline.json | 133 + + .../arch/x86/sapphirerapids/spr-metrics.json | 411 +-- + .../arch/x86/sapphirerapids/uncore-cache.json | 1244 +++++++ + .../arch/x86/sapphirerapids/uncore-cxl.json | 110 + + .../x86/sapphirerapids/uncore-interconnect.json | 1427 ++++++++ + .../arch/x86/sapphirerapids/uncore-io.json | 679 ++++ + .../arch/x86/sapphirerapids/uncore-memory.json | 742 ++++ + .../arch/x86/sapphirerapids/uncore-power.json | 49 + + .../arch/x86/sapphirerapids/virtual-memory.json | 20 + + .../pmu-events/arch/x86/sierraforest/cache.json | 97 +- + .../pmu-events/arch/x86/sierraforest/counter.json | 77 + + .../arch/x86/sierraforest/floating-point.json | 54 +- + .../pmu-events/arch/x86/sierraforest/frontend.json | 5 +- + .../pmu-events/arch/x86/sierraforest/memory.json | 13 +- + .../arch/x86/sierraforest/metricgroups.json | 23 + + .../pmu-events/arch/x86/sierraforest/other.json | 15 +- + .../pmu-events/arch/x86/sierraforest/pipeline.json | 97 +- + .../arch/x86/sierraforest/srf-metrics.json | 927 +++++ + .../arch/x86/sierraforest/uncore-cache.json | 567 ++- + .../arch/x86/sierraforest/uncore-cxl.json | 21 + + .../arch/x86/sierraforest/uncore-interconnect.json | 267 ++ + .../arch/x86/sierraforest/uncore-io.json | 267 ++ + .../arch/x86/sierraforest/uncore-memory.json | 66 + + .../arch/x86/sierraforest/uncore-power.json | 1 + + .../arch/x86/sierraforest/virtual-memory.json | 17 + + .../perf/pmu-events/arch/x86/silvermont/cache.json | 77 + + .../pmu-events/arch/x86/silvermont/counter.json | 7 + + .../arch/x86/silvermont/floating-point.json | 1 + + .../pmu-events/arch/x86/silvermont/frontend.json | 8 + + .../pmu-events/arch/x86/silvermont/memory.json | 1 + + .../perf/pmu-events/arch/x86/silvermont/other.json | 2 + + .../pmu-events/arch/x86/silvermont/pipeline.json | 34 + + .../arch/x86/silvermont/virtual-memory.json | 7 + + tools/perf/pmu-events/arch/x86/skylake/cache.json | 250 ++ + .../perf/pmu-events/arch/x86/skylake/counter.json | 22 + + .../arch/x86/skylake/floating-point.json | 10 + + .../perf/pmu-events/arch/x86/skylake/frontend.json | 49 + + tools/perf/pmu-events/arch/x86/skylake/memory.json | 131 + + .../pmu-events/arch/x86/skylake/metricgroups.json | 13 + + tools/perf/pmu-events/arch/x86/skylake/other.json | 2 + + .../perf/pmu-events/arch/x86/skylake/pipeline.json | 103 +- + .../pmu-events/arch/x86/skylake/skl-metrics.json | 196 +- + .../pmu-events/arch/x86/skylake/uncore-cache.json | 23 + + .../arch/x86/skylake/uncore-interconnect.json | 8 + + .../pmu-events/arch/x86/skylake/uncore-other.json | 10 - + .../arch/x86/skylake/virtual-memory.json | 28 + + tools/perf/pmu-events/arch/x86/skylakex/cache.json | 155 + + .../perf/pmu-events/arch/x86/skylakex/counter.json | 52 + + .../arch/x86/skylakex/floating-point.json | 13 + + .../pmu-events/arch/x86/skylakex/frontend.json | 49 + + .../perf/pmu-events/arch/x86/skylakex/memory.json | 115 + + .../pmu-events/arch/x86/skylakex/metricgroups.json | 13 + + tools/perf/pmu-events/arch/x86/skylakex/other.json | 15 + + .../pmu-events/arch/x86/skylakex/pipeline.json | 104 +- + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 310 +- + .../pmu-events/arch/x86/skylakex/uncore-cache.json | 2274 ++++++++++++ + .../arch/x86/skylakex/uncore-interconnect.json | 2521 ++++++++++++++ + .../pmu-events/arch/x86/skylakex/uncore-io.json | 703 ++++ + .../arch/x86/skylakex/uncore-memory.json | 804 +++++ + .../pmu-events/arch/x86/skylakex/uncore-power.json | 50 + + .../arch/x86/skylakex/virtual-memory.json | 28 + + .../perf/pmu-events/arch/x86/snowridgex/cache.json | 101 + + .../pmu-events/arch/x86/snowridgex/counter.json | 47 + + .../arch/x86/snowridgex/floating-point.json | 3 + + .../pmu-events/arch/x86/snowridgex/frontend.json | 9 + + .../pmu-events/arch/x86/snowridgex/memory.json | 40 + + .../perf/pmu-events/arch/x86/snowridgex/other.json | 61 + + .../pmu-events/arch/x86/snowridgex/pipeline.json | 60 + + .../arch/x86/snowridgex/uncore-cache.json | 1548 ++++++++- + .../arch/x86/snowridgex/uncore-interconnect.json | 1403 ++++++++ + .../pmu-events/arch/x86/snowridgex/uncore-io.json | 1743 ++++++++++ + .../arch/x86/snowridgex/uncore-memory.json | 103 + + .../arch/x86/snowridgex/uncore-power.json | 51 + + .../arch/x86/snowridgex/virtual-memory.json | 31 + + .../perf/pmu-events/arch/x86/tigerlake/cache.json | 73 + + .../pmu-events/arch/x86/tigerlake/counter.json | 17 + + .../arch/x86/tigerlake/floating-point.json | 13 + + .../pmu-events/arch/x86/tigerlake/frontend.json | 41 +- + .../perf/pmu-events/arch/x86/tigerlake/memory.json | 24 + + .../arch/x86/tigerlake/metricgroups.json | 13 + + .../perf/pmu-events/arch/x86/tigerlake/other.json | 4 + + .../pmu-events/arch/x86/tigerlake/pipeline.json | 95 + + .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 198 +- + .../arch/x86/tigerlake/uncore-interconnect.json | 19 + + .../arch/x86/tigerlake/uncore-memory.json | 6 + + .../arch/x86/tigerlake/uncore-other.json | 1 + + .../arch/x86/tigerlake/virtual-memory.json | 20 + + .../pmu-events/arch/x86/westmereep-dp/cache.json | 282 ++ + .../pmu-events/arch/x86/westmereep-dp/counter.json | 7 + + .../arch/x86/westmereep-dp/floating-point.json | 28 + + .../arch/x86/westmereep-dp/frontend.json | 3 + + .../pmu-events/arch/x86/westmereep-dp/memory.json | 69 + + .../pmu-events/arch/x86/westmereep-dp/other.json | 28 + + .../arch/x86/westmereep-dp/pipeline.json | 111 + + .../arch/x86/westmereep-dp/virtual-memory.json | 21 + + .../pmu-events/arch/x86/westmereep-sp/cache.json | 321 ++ + .../pmu-events/arch/x86/westmereep-sp/counter.json | 7 + + .../arch/x86/westmereep-sp/floating-point.json | 28 + + .../arch/x86/westmereep-sp/frontend.json | 3 + + .../pmu-events/arch/x86/westmereep-sp/memory.json | 67 + + .../pmu-events/arch/x86/westmereep-sp/other.json | 28 + + .../arch/x86/westmereep-sp/pipeline.json | 111 + + .../arch/x86/westmereep-sp/virtual-memory.json | 18 + + .../perf/pmu-events/arch/x86/westmereex/cache.json | 320 ++ + .../pmu-events/arch/x86/westmereex/counter.json | 7 + + .../arch/x86/westmereex/floating-point.json | 28 + + .../pmu-events/arch/x86/westmereex/frontend.json | 3 + + .../pmu-events/arch/x86/westmereex/memory.json | 68 + + .../perf/pmu-events/arch/x86/westmereex/other.json | 28 + + .../pmu-events/arch/x86/westmereex/pipeline.json | 111 + + .../arch/x86/westmereex/virtual-memory.json | 21 + + tools/perf/scripts/Build | 4 +- + tools/perf/scripts/perl/Perf-Trace-Util/Build | 2 +- + tools/perf/scripts/python/Perf-Trace-Util/Build | 2 +- + tools/perf/scripts/python/netdev-times.py | 3 +- + tools/perf/scripts/python/parallel-perf.py | 3 +- + tools/perf/tests/Build | 140 +- + tools/perf/tests/pmu.c | 199 +- + tools/perf/tests/shell/annotate.sh | 10 +- + .../tests/shell/base_probe/test_adding_kernel.sh | 31 +- + tools/perf/tests/shell/stat_bpf_counters.sh | 36 +- + tools/perf/tests/shell/test_arm_callgraph_fp.sh | 27 +- + .../tests/shell/test_uprobe_from_different_cu.sh | 2 +- + tools/perf/tests/workloads/Build | 12 +- + tools/perf/tests/workloads/leafloop.c | 20 +- + tools/perf/ui/Build | 18 +- + tools/perf/ui/browsers/Build | 14 +- + tools/perf/ui/hist.c | 154 +- + tools/perf/ui/stdio/hist.c | 5 +- + tools/perf/ui/tui/Build | 8 +- + tools/perf/util/Build | 390 +-- + tools/perf/util/arm-spe-decoder/Build | 2 +- + .../util/arm-spe-decoder/arm-spe-pkt-decoder.c | 23 +- + tools/perf/util/bpf-filter.c | 33 +- + tools/perf/util/bpf-filter.h | 5 +- + tools/perf/util/bpf-filter.l | 66 +- + tools/perf/util/bpf-filter.y | 7 +- + tools/perf/util/bpf_skel/sample-filter.h | 40 +- + tools/perf/util/bpf_skel/sample_filter.bpf.c | 73 +- + tools/perf/util/cs-etm-decoder/Build | 2 +- + tools/perf/util/dso.c | 12 + + tools/perf/util/dso.h | 4 + + tools/perf/util/dsos.c | 5 +- + tools/perf/util/events_stats.h | 3 +- + tools/perf/util/evsel.c | 239 +- + tools/perf/util/evsel.h | 14 + + tools/perf/util/expr.c | 4 - + tools/perf/util/genelf.c | 5 - + tools/perf/util/hisi-ptt-decoder/Build | 2 +- + tools/perf/util/hisi-ptt.c | 5 - + tools/perf/util/hist.c | 6 +- + tools/perf/util/hist.h | 3 +- + tools/perf/util/intel-pt-decoder/Build | 2 +- + .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 9 + + tools/perf/util/maps.c | 113 +- + tools/perf/util/mem-events.c | 2 +- + tools/perf/util/parse-events.c | 10 +- + tools/perf/util/perf-regs-arch/Build | 18 +- + tools/perf/util/pmu.c | 54 +- + tools/perf/util/pmus.c | 72 +- + tools/perf/util/pmus.h | 7 +- + tools/perf/util/python-ext-sources | 53 - + tools/perf/util/python.c | 271 +- + tools/perf/util/scripting-engines/Build | 4 +- + tools/perf/util/session.c | 25 +- + tools/perf/util/session.h | 3 +- + tools/perf/util/setup.py | 33 +- + tools/perf/util/sort.c | 2 +- + tools/perf/util/srcline.c | 2 +- + tools/perf/util/stat-display.c | 20 +- + tools/perf/util/stat-shadow.c | 7 + + tools/perf/util/symbol.c | 8 +- + tools/perf/util/symbol_conf.h | 3 +- + tools/perf/util/unwind-libunwind-local.c | 5 + + 568 files changed, 80196 insertions(+), 4370 deletions(-) + create mode 100644 tools/perf/Documentation/perf-amd-ibs.txt + create mode 100644 tools/perf/pmu-events/arch/x86/bonnell/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwell/counter.json + delete mode 100644 tools/perf/pmu-events/arch/x86/broadwell/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellde/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/broadwellx/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/cascadelakex/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/elkhartlake/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/emr-metrics.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/goldmont/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/goldmontplus/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/grr-metrics.json + create mode 100644 tools/perf/pmu-events/arch/x86/grandridge/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/uncore-cxl.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/uncore-io.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/uncore-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/graniterapids/uncore-power.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswell/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/haswellx/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/icelake/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/icelakex/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivybridge/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/ivytown/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/jaketown/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/knightslanding/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemep/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/nehalemex/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/rocketlake/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/sandybridge/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/sapphirerapids/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/metricgroups.json + create mode 100644 tools/perf/pmu-events/arch/x86/sierraforest/srf-metrics.json + create mode 100644 tools/perf/pmu-events/arch/x86/silvermont/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylake/counter.json + delete mode 100644 tools/perf/pmu-events/arch/x86/skylake/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/skylakex/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/snowridgex/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/tigerlake/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-dp/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereep-sp/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/westmereex/counter.json + delete mode 100644 tools/perf/util/python-ext-sources +Merging compiler-attributes/compiler-attributes (2993eb7a8d34 Compiler Attributes: counted_by: fixup clang URL) +$ 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 (82d71b53d7e7 Documentation/core-api: correct reference to SWIOTLB_DYNAMIC) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (01b6ed5fcd5a syscalls: fix sys_fanotify_mark prototype) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Merge made by the 'ort' strategy. +Merging arc/for-next (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 (b5e352609497 Merge branches 'clkdev', '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. + arch/arm/Kconfig | 3 ++- + arch/arm/boot/compressed/vmlinux.lds.S | 2 +- + arch/arm/include/asm/vmlinux.lds.h | 2 +- + arch/arm/kernel/entry-armv.S | 3 +++ + arch/arm/kernel/module.c | 5 ----- + arch/arm/kernel/vmlinux-xip.lds.S | 4 ++-- + arch/arm/kernel/vmlinux.lds.S | 6 +++--- + arch/arm/mach-alpine/alpine_cpu_pm.c | 2 +- + drivers/firmware/efi/libstub/Makefile | 4 ++++ + 9 files changed, 17 insertions(+), 14 deletions(-) +Merging arm64/for-next/core (2de29d1f8172 Merge branch 'for-next/vcpu-hotplug' 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 +Auto-merging include/linux/cpumask.h +Auto-merging kernel/cpu.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 6 + + Documentation/arch/arm64/cpu-hotplug.rst | 79 +++++ + Documentation/arch/arm64/index.rst | 1 + + Documentation/arch/arm64/silicon-errata.rst | 16 +- + arch/arm64/Kconfig | 41 +-- + arch/arm64/include/asm/acpi.h | 12 + + arch/arm64/include/asm/arch_gicv3.h | 15 - + arch/arm64/include/asm/arch_timer.h | 2 +- + arch/arm64/include/asm/cpucaps.h | 2 +- + arch/arm64/include/asm/cputype.h | 6 + + arch/arm64/include/asm/esr.h | 33 ++- + arch/arm64/include/asm/mmu_context.h | 4 +- + arch/arm64/include/asm/mte.h | 4 +- + arch/arm64/include/asm/ptrace.h | 33 +-- + arch/arm64/include/asm/smp.h | 13 +- + arch/arm64/kernel/Makefile | 1 - + arch/arm64/kernel/acpi.c | 111 +------ + arch/arm64/kernel/acpi_numa.c | 11 - + arch/arm64/kernel/cpu_errata.c | 17 +- + arch/arm64/kernel/cpufeature.c | 1 + + arch/arm64/kernel/image-vars.h | 5 - + arch/arm64/kernel/proton-pack.c | 2 +- + arch/arm64/kernel/psci.c | 2 +- + arch/arm64/kernel/reloc_test_core.c | 1 + + arch/arm64/kernel/smp.c | 68 ++++- + drivers/acpi/acpi_processor.c | 145 +++++---- + drivers/acpi/arm64/Makefile | 6 +- + drivers/acpi/arm64/amba.c | 6 +- + .../arm64/kernel => drivers/acpi/arm64}/cpuidle.c | 4 - + drivers/acpi/arm64/ffh.c | 107 +++++++ + drivers/acpi/processor_core.c | 3 +- + drivers/acpi/processor_driver.c | 43 +-- + drivers/acpi/scan.c | 47 ++- + drivers/base/cpu.c | 12 +- + drivers/irqchip/irq-gic-common.c | 22 +- + drivers/irqchip/irq-gic-common.h | 7 +- + drivers/irqchip/irq-gic-v3-its.c | 11 +- + drivers/irqchip/irq-gic-v3.c | 282 ++++++++++-------- + drivers/irqchip/irq-gic.c | 10 +- + drivers/irqchip/irq-hip04.c | 6 +- + include/acpi/acpi_bus.h | 1 + + include/acpi/processor.h | 2 +- + include/linux/acpi.h | 12 +- + include/linux/cpumask.h | 25 ++ + include/linux/irqchip/arm-gic-common.h | 4 - + include/linux/irqchip/arm-gic-v3-prio.h | 52 ++++ + include/linux/irqchip/arm-gic-v3.h | 2 +- + include/linux/wordpart.h | 8 + + kernel/cpu.c | 3 + + tools/testing/selftests/arm64/abi/ptrace.c | 2 +- + tools/testing/selftests/arm64/fp/.gitignore | 1 + + tools/testing/selftests/arm64/fp/Makefile | 1 + + tools/testing/selftests/arm64/fp/fp-stress.c | 26 +- + tools/testing/selftests/arm64/fp/kernel-test.c | 324 +++++++++++++++++++++ + 54 files changed, 1137 insertions(+), 523 deletions(-) + create mode 100644 Documentation/arch/arm64/cpu-hotplug.rst + rename {arch/arm64/kernel => drivers/acpi/arm64}/cpuidle.c (97%) + create mode 100644 drivers/acpi/arm64/ffh.c + create mode 100644 include/linux/irqchip/arm-gic-v3-prio.h + create mode 100644 tools/testing/selftests/arm64/fp/kernel-test.c +Merging arm-perf/for-next/perf (d0d7c66c537d perf: imx_perf: add support for i.MX95 platform) +$ 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/pmu.yaml | 6 + + .../devicetree/bindings/perf/fsl-imx-ddr.yaml | 3 + + drivers/perf/arm-cmn.c | 116 +++++-- + drivers/perf/arm_pmuv3.c | 12 + + drivers/perf/fsl_imx9_ddr_perf.c | 354 +++++++++++++++------ + 5 files changed, 366 insertions(+), 125 deletions(-) +Merging arm-soc/for-next (bf35f851523a 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 +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/rockchip/rk3066a.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts +Auto-merging arch/arm64/boot/dts/rockchip/rk3308.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts +Auto-merging arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts +Auto-merging arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts +Merge made by the 'ort' strategy. + .../testing/sysfs-bus-i2c-devices-turris-omnia-mcu | 113 + + Documentation/devicetree/bindings/arm/airoha.yaml | 4 + + Documentation/devicetree/bindings/arm/amlogic.yaml | 10 + + .../bindings/arm/arm,juno-fpga-apb-regs.yaml | 61 + + .../devicetree/bindings/arm/mediatek.yaml | 24 + + .../devicetree/bindings/arm/rockchip.yaml | 24 + + .../devicetree/bindings/arm/rtsm-dcscb.txt | 19 - + .../devicetree/bindings/firmware/arm,scmi.yaml | 12 +- + .../bindings/firmware/cznic,turris-omnia-mcu.yaml | 86 + + .../bindings/fuse/renesas,rcar-efuse.yaml | 55 + + .../devicetree/bindings/fuse/renesas,rcar-otp.yaml | 38 + + .../marvell,armada-370-xp-mpic.txt | 38 - + .../interrupt-controller/marvell,mpic.yaml | 63 + + .../bindings/power/amlogic,meson-sec-pwrc.yaml | 1 + + .../bindings/soc/mediatek/mediatek,mutex.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 8 + + MAINTAINERS | 15 + + arch/arm/arm-soc-for-next-contents.txt | 82 + + arch/arm/boot/dts/arm/arm-realview-eb-bbrevd.dtsi | 2 +- + arch/arm/boot/dts/arm/arm-realview-eb.dtsi | 48 +- + arch/arm/boot/dts/arm/arm-realview-pb1176.dts | 38 +- + arch/arm/boot/dts/arm/arm-realview-pb11mp.dts | 48 +- + arch/arm/boot/dts/arm/arm-realview-pbx.dtsi | 48 +- + arch/arm/boot/dts/arm/integratorap-im-pd1.dts | 4 +- + arch/arm/boot/dts/arm/integratorap.dts | 14 +- + arch/arm/boot/dts/arm/integratorcp.dts | 14 +- + arch/arm/boot/dts/arm/mps2.dtsi | 48 +- + arch/arm/boot/dts/arm/versatile-ab.dts | 8 +- + arch/arm/boot/dts/arm/vexpress-v2m-rs1.dtsi | 8 +- + arch/arm/boot/dts/arm/vexpress-v2m.dtsi | 16 +- + arch/arm/boot/dts/arm/vexpress-v2p-ca15-tc1.dts | 14 +- + arch/arm/boot/dts/arm/vexpress-v2p-ca15_a7.dts | 22 +- + arch/arm/boot/dts/arm/vexpress-v2p-ca5s.dts | 12 +- + arch/arm/boot/dts/arm/vexpress-v2p-ca9.dts | 18 +- + arch/arm/boot/dts/marvell/armada-370-xp.dtsi | 1 - + arch/arm/boot/dts/marvell/armada-375.dtsi | 1 - + .../boot/dts/marvell/armada-385-turris-omnia.dts | 35 +- + arch/arm/boot/dts/marvell/armada-38x.dtsi | 1 - + arch/arm/boot/dts/marvell/armada-39x.dtsi | 1 - + arch/arm/boot/dts/mediatek/mt2701-evb.dts | 2 +- + arch/arm/boot/dts/mediatek/mt7623.dtsi | 18 +- + arch/arm/boot/dts/renesas/r8a73a4.dtsi | 1 + + arch/arm/boot/dts/renesas/r8a7742.dtsi | 1 + + arch/arm/boot/dts/renesas/r8a7743.dtsi | 1 + + arch/arm/boot/dts/renesas/r8a7744.dtsi | 1 + + arch/arm/boot/dts/renesas/r8a7745.dtsi | 1 + + arch/arm/boot/dts/renesas/r8a77470.dtsi | 1 + + arch/arm/boot/dts/renesas/r8a7790.dtsi | 1 + + arch/arm/boot/dts/renesas/r8a7791.dtsi | 1 + + arch/arm/boot/dts/renesas/r8a7792.dtsi | 1 + + arch/arm/boot/dts/renesas/r8a7793.dtsi | 1 + + arch/arm/boot/dts/renesas/r8a7794.dtsi | 1 + + arch/arm/boot/dts/renesas/r9a06g032.dtsi | 19 + + arch/arm/boot/dts/rockchip/rk3036.dtsi | 1 + + arch/arm/boot/dts/rockchip/rk3066a-mk808.dts | 8 + + arch/arm/boot/dts/rockchip/rk3066a.dtsi | 16 + + arch/arm/boot/dts/rockchip/rk3128.dtsi | 128 + + arch/arm/boot/dts/st/stih407-family.dtsi | 6 +- + arch/arm/boot/dts/st/stih410.dtsi | 1 + + arch/arm/boot/dts/st/stih418.dtsi | 42 +- + arch/arm/configs/vexpress_defconfig | 1 - + arch/arm/mach-versatile/Kconfig | 9 - + arch/arm/mach-versatile/Makefile | 3 - + arch/arm/mach-versatile/dcscb.c | 173 -- + arch/arm/mach-versatile/dcscb_setup.S | 33 - + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/airoha/Makefile | 2 + + arch/arm64/boot/dts/airoha/en7581-evb.dts | 26 + + arch/arm64/boot/dts/airoha/en7581.dtsi | 154 ++ + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 10 + + .../boot/dts/altera/socfpga_stratix10_socdk.dts | 2 - + .../dts/altera/socfpga_stratix10_socdk_nand.dts | 2 - + arch/arm64/boot/dts/amlogic/Makefile | 4 + + arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi | 10 + + arch/arm64/boot/dts/amlogic/amlogic-c3.dtsi | 3 +- + arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts | 45 + + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 16 +- + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 24 +- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 438 +-- + arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 4 + + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 2 +- + .../boot/dts/amlogic/meson-g12b-bananapi.dtsi | 14 - + .../boot/dts/amlogic/meson-g12b-dreambox-one.dts | 17 + + .../boot/dts/amlogic/meson-g12b-dreambox-two.dts | 20 + + .../boot/dts/amlogic/meson-g12b-dreambox.dtsi | 154 ++ + .../boot/dts/amlogic/meson-g12b-radxa-zero2.dts | 24 + + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 10 +- + .../boot/dts/amlogic/meson-gxl-s905x-vero4k.dts | 199 ++ + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 10 +- + .../boot/dts/amlogic/meson-gxlx-s905l-p271.dts | 51 + + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 199 ++ + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 44 +- + arch/arm64/boot/dts/arm/corstone1000-fvp.dts | 2 +- + arch/arm64/boot/dts/arm/corstone1000.dtsi | 6 +- + arch/arm64/boot/dts/arm/foundation-v8.dtsi | 6 +- + arch/arm64/boot/dts/arm/juno-base.dtsi | 1 - + arch/arm64/boot/dts/arm/juno-clocks.dtsi | 10 +- + arch/arm64/boot/dts/arm/juno-motherboard.dtsi | 13 +- + arch/arm64/boot/dts/arm/rtsm_ve-motherboard.dtsi | 10 +- + .../boot/dts/arm/vexpress-v2f-1xv7-ca53x2.dts | 6 +- + arch/arm64/boot/dts/intel/socfpga_agilex_socdk.dts | 2 - + arch/arm64/boot/dts/intel/socfpga_n5x_socdk.dts | 2 - + arch/arm64/boot/dts/mediatek/Makefile | 12 + + arch/arm64/boot/dts/mediatek/mt2712-evb.dts | 4 +- + .../boot/dts/mediatek/mt6795-sony-xperia-m5.dts | 8 +- + .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 8 +- + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 4 +- + .../boot/dts/mediatek/mt7981b-cudy-wr3000-v1.dts | 74 + + .../boot/dts/mediatek/mt7981b-openwrt-one.dts | 15 + + arch/arm64/boot/dts/mediatek/mt7981b.dtsi | 78 +- + .../dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso | 28 +- + .../dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dts | 493 ++++ + .../dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso | 66 +- + .../dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso | 78 +- + .../dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso | 16 +- + arch/arm64/boot/dts/mediatek/mt7988a.dtsi | 90 +- + arch/arm64/boot/dts/mediatek/mt8173-elm-hana.dtsi | 9 + + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 6 - + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 12 +- + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 6 - + .../dts/mediatek/mt8183-kukui-audio-da7219.dtsi | 2 +- + .../dts/mediatek/mt8183-kukui-jacuzzi-cozmo.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku6.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku7.dts | 1 + + .../mt8183-kukui-jacuzzi-fennel14-sku2.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-fennel14.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-kappa.dts | 1 + + .../dts/mediatek/mt8183-kukui-jacuzzi-kenzo.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-makomo-sku0.dts | 2 +- + .../mediatek/mt8183-kukui-jacuzzi-makomo-sku1.dts | 2 +- + .../dts/mediatek/mt8183-kukui-jacuzzi-pico6.dts | 14 +- + .../mediatek/mt8183-kukui-jacuzzi-willow-sku0.dts | 1 + + .../mediatek/mt8183-kukui-jacuzzi-willow-sku1.dts | 1 + + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 25 +- + .../dts/mediatek/mt8183-kukui-kodama-sku32.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 18 +- + arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 10 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 136 +- + .../mediatek/mt8186-corsola-voltorb-sku589824.dts | 13 + + .../mediatek/mt8186-corsola-voltorb-sku589825.dts | 25 + + .../boot/dts/mediatek/mt8186-corsola-voltorb.dtsi | 103 + + arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi | 42 +- + arch/arm64/boot/dts/mediatek/mt8188.dtsi | 480 ++++ + .../boot/dts/mediatek/mt8192-asurada-hayato-r1.dts | 1 + + .../dts/mediatek/mt8192-asurada-hayato-r5-sku2.dts | 1 + + .../dts/mediatek/mt8192-asurada-spherion-r0.dts | 1 + + .../dts/mediatek/mt8192-asurada-spherion-r4.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 1 + + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 2 +- + .../boot/dts/mediatek/mt8195-cherry-dojo-r1.dts | 114 + + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 50 + + arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 26 +- + arch/arm64/boot/dts/mediatek/mt8195-evb.dts | 4 +- + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8365-evk.dts | 4 +- + arch/arm64/boot/dts/mediatek/mt8365.dtsi | 3 +- + .../boot/dts/mediatek/mt8390-genio-700-evk.dts | 880 ++++++ + .../boot/dts/mediatek/mt8395-genio-1200-evk.dts | 34 +- + .../dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts | 1127 ++++++++ + .../boot/dts/mediatek/mt8395-radxa-nio-12l.dts | 88 +- + .../boot/dts/microchip/sparx5_pcb134_board.dtsi | 372 +-- + .../boot/dts/microchip/sparx5_pcb135_board.dtsi | 95 +- + arch/arm64/boot/dts/renesas/condor-common.dtsi | 6 + + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77980-condor.dts | 8 - + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 5 +- + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 6 + + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 5 +- + arch/arm64/boot/dts/renesas/r8a779f4-s4sk.dts | 6 + + .../r8a779g0-white-hawk-ard-audio-da7212.dtso | 4 - + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 28 +- + .../boot/dts/renesas/r8a779h0-gray-hawk-single.dts | 4 + + arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 737 +++++- + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r9a07g043u.dtsi | 5 +- + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 9 +- + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 9 +- + arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 11 +- + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 7 +- + .../boot/dts/renesas/white-hawk-cpu-common.dtsi | 29 +- + .../boot/dts/renesas/white-hawk-ethernet.dtsi | 103 + + arch/arm64/boot/dts/rockchip/Makefile | 7 + + arch/arm64/boot/dts/rockchip/rk3308-rock-pi-s.dts | 81 +- + arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts | 293 ++ + arch/arm64/boot/dts/rockchip/rk3308.dtsi | 29 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3368-lba3368.dts | 659 +++++ + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 74 + + arch/arm64/boot/dts/rockchip/rk3399pro.dtsi | 22 - + .../boot/dts/rockchip/rk3566-radxa-zero-3.dtsi | 531 ++++ + .../boot/dts/rockchip/rk3566-radxa-zero-3e.dts | 52 + + .../boot/dts/rockchip/rk3566-radxa-zero-3w.dts | 92 + + arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3566-rock-3c.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3568-evb1-v10.dts | 2 +- + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 4 - + .../boot/dts/rockchip/rk3588-armsom-sige7.dts | 4 + + ...3588s-pinctrl.dtsi => rk3588-base-pinctrl.dtsi} | 0 + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 2799 ++++++++++++++++++++ + .../dts/rockchip/rk3588-edgeble-neu6a-common.dtsi | 4 + + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 16 + + ...3588-pinctrl.dtsi => rk3588-extra-pinctrl.dtsi} | 0 + arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 448 ++++ + .../rockchip/rk3588-friendlyelec-cm3588-nas.dts | 778 ++++++ + .../dts/rockchip/rk3588-friendlyelec-cm3588.dtsi | 653 +++++ + arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts | 4 + + arch/arm64/boot/dts/rockchip/rk3588-opp.dtsi | 190 ++ + .../arm64/boot/dts/rockchip/rk3588-quartzpro64.dts | 12 + + .../boot/dts/rockchip/rk3588-rock-5b-pcie-ep.dtso | 25 + + .../dts/rockchip/rk3588-rock-5b-pcie-srns.dtso | 16 + + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 57 +- + .../arm64/boot/dts/rockchip/rk3588-toybrick-x0.dts | 4 + + .../arm64/boot/dts/rockchip/rk3588-turing-rk1.dtsi | 4 + + arch/arm64/boot/dts/rockchip/rk3588.dtsi | 413 +-- + arch/arm64/boot/dts/rockchip/rk3588j.dtsi | 143 +- + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 17 + + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 2670 +------------------ + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 16 + + .../boot/dts/xilinx/zynqmp-sck-kv-g-revA.dtso | 19 +- + .../boot/dts/xilinx/zynqmp-sck-kv-g-revB.dtso | 41 +- + arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 19 +- + arch/arm64/boot/dts/xilinx/zynqmp-smk-k26-revA.dts | 8 +- + .../arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts | 8 + + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 184 +- + drivers/bus/vexpress-config.c | 1 + + drivers/firmware/arm_ffa/Makefile | 6 +- + drivers/firmware/arm_ffa/bus.c | 22 +- + drivers/firmware/arm_ffa/common.h | 2 - + drivers/firmware/arm_ffa/driver.c | 57 +- + drivers/firmware/arm_scmi/common.h | 1 + + drivers/firmware/arm_scmi/mailbox.c | 57 +- + drivers/firmware/arm_scmi/scmi_power_control.c | 21 +- + drivers/firmware/arm_scmi/shmem.c | 5 + + drivers/firmware/meson/meson_sm.c | 1 + + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 1 + + drivers/platform/cznic/Kconfig | 48 + + drivers/platform/cznic/Makefile | 8 + + drivers/platform/cznic/turris-omnia-mcu-base.c | 408 +++ + drivers/platform/cznic/turris-omnia-mcu-gpio.c | 1095 ++++++++ + .../cznic/turris-omnia-mcu-sys-off-wakeup.c | 260 ++ + drivers/platform/cznic/turris-omnia-mcu-trng.c | 103 + + drivers/platform/cznic/turris-omnia-mcu-watchdog.c | 130 + + drivers/platform/cznic/turris-omnia-mcu.h | 194 ++ + drivers/reset/Kconfig | 14 + + drivers/reset/Makefile | 5 +- + drivers/reset/reset-imx8mp-audiomix.c | 128 + + drivers/reset/reset-meson-audio-arb.c | 9 +- + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 32 +- + drivers/reset/sti/Kconfig | 4 +- + drivers/soc/amlogic/meson-clk-measure.c | 1 + + drivers/soc/amlogic/meson-gx-socinfo.c | 2 + + drivers/soc/imx/soc-imx8m.c | 1 + + drivers/soc/ixp4xx/ixp4xx-npe.c | 1 + + drivers/soc/ixp4xx/ixp4xx-qmgr.c | 1 + + drivers/soc/mediatek/mtk-cmdq-helper.c | 35 + + drivers/soc/mediatek/mtk-mmsys.c | 1 + + drivers/soc/mediatek/mtk-mutex.c | 1 + + drivers/tee/optee/notif.c | 9 +- + drivers/tee/optee/optee_private.h | 5 +- + drivers/tee/optee/optee_rpc_cmd.h | 1 + + drivers/tee/optee/rpc.c | 10 +- + include/dt-bindings/clock/rk3128-cru.h | 1 + + include/dt-bindings/power/amlogic,a4-pwrc.h | 21 + + include/linux/soc/mediatek/mtk-cmdq.h | 42 + + include/linux/turris-omnia-mcu-interface.h | 249 ++ + 279 files changed, 17529 insertions(+), 4637 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-i2c-devices-turris-omnia-mcu + create mode 100644 Documentation/devicetree/bindings/arm/arm,juno-fpga-apb-regs.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/rtsm-dcscb.txt + create mode 100644 Documentation/devicetree/bindings/firmware/cznic,turris-omnia-mcu.yaml + create mode 100644 Documentation/devicetree/bindings/fuse/renesas,rcar-efuse.yaml + create mode 100644 Documentation/devicetree/bindings/fuse/renesas,rcar-otp.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,armada-370-xp-mpic.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/marvell,mpic.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + delete mode 100644 arch/arm/mach-versatile/dcscb.c + delete mode 100644 arch/arm/mach-versatile/dcscb_setup.S + create mode 100644 arch/arm64/boot/dts/airoha/Makefile + create mode 100644 arch/arm64/boot/dts/airoha/en7581-evb.dts + create mode 100644 arch/arm64/boot/dts/airoha/en7581.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-dreambox-one.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-dreambox-two.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-dreambox.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxl-s905x-vero4k.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-gxlx-s905l-p271.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt7981b-cudy-wr3000-v1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt7981b-openwrt-one.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-mini.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589824.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb-sku589825.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8186-corsola-voltorb.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8195-cherry-dojo-r1.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8390-genio-700-evk.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8395-kontron-3-5-sbc-i1200.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-rock-s0.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3368-lba3368.dts + delete mode 100644 arch/arm64/boot/dts/rockchip/rk3399pro.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3e.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-radxa-zero-3w.dts + rename arch/arm64/boot/dts/rockchip/{rk3588s-pinctrl.dtsi => rk3588-base-pinctrl.dtsi} (100%) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-base.dtsi + rename arch/arm64/boot/dts/rockchip/{rk3588-pinctrl.dtsi => rk3588-extra-pinctrl.dtsi} (100%) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588-nas.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-friendlyelec-cm3588.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-opp.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-rock-5b-pcie-ep.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-rock-5b-pcie-srns.dtso + create mode 100644 drivers/platform/cznic/Kconfig + create mode 100644 drivers/platform/cznic/Makefile + create mode 100644 drivers/platform/cznic/turris-omnia-mcu-base.c + create mode 100644 drivers/platform/cznic/turris-omnia-mcu-gpio.c + create mode 100644 drivers/platform/cznic/turris-omnia-mcu-sys-off-wakeup.c + create mode 100644 drivers/platform/cznic/turris-omnia-mcu-trng.c + create mode 100644 drivers/platform/cznic/turris-omnia-mcu-watchdog.c + create mode 100644 drivers/platform/cznic/turris-omnia-mcu.h + create mode 100644 drivers/reset/reset-imx8mp-audiomix.c + create mode 100644 include/dt-bindings/power/amlogic,a4-pwrc.h + create mode 100644 include/linux/turris-omnia-mcu-interface.h +Merging amlogic/for-next (338c92a5d195 Merge branch 'v6.11/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 (73feb9cd46f1 ARM: dts: aspeed: System1: Updates to BMC board) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 2 + + arch/arm/boot/dts/aspeed/Makefile | 2 + + .../dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts | 12 +- + .../dts/aspeed/aspeed-bmc-ibm-blueridge-4u.dts | 21 + + .../boot/dts/aspeed/aspeed-bmc-ibm-blueridge.dts | 1691 +++++++++ + arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-fuji.dts | 3881 ++++++++++++++++++++ + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 6 +- + arch/arm/boot/dts/aspeed/ibm-power11-quad.dtsi | 1539 ++++++++ + 8 files changed, 7147 insertions(+), 7 deletions(-) + 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 +Merging at91/at91-next (1cdb1c9626a4 Merge branch 'at91-defconfig' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. + arch/arm/configs/at91_dt_defconfig | 1 + + 1 file changed, 1 insertion(+) +Merging broadcom/next (4caff16b6e00 Merge branch 'devicetree-arm64/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + .../bindings/soc/bcm/brcm,bcm2711-avs-monitor.yaml | 44 ++++ + .../arm/boot/dts/broadcom/bcm53016-meraki-mr32.dts | 12 +- + .../dts/broadcom/bcm958625-meraki-mx6x-common.dtsi | 12 +- + 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 +++++++++++++++++++++ + 6 files changed, 408 insertions(+), 8 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2711-avs-monitor.yaml + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712-rpi-5-b.dts + create mode 100644 arch/arm64/boot/dts/broadcom/bcm2712.dtsi +Merging davinci/davinci/for-next (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (815cc7715ab1 dt-bindings: memory: fsl: replace maintainer) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/memory-controllers/fsl/fsl,ifc.yaml | 2 +- + drivers/memory/Kconfig | 2 +- + drivers/mtd/nand/raw/Kconfig | 3 +-- + 3 files changed, 3 insertions(+), 4 deletions(-) +Merging imx-mxs/for-next (ffa7b132ee5f Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 32 +- + .../interrupt-controller/fsl,ls-extirq.yaml | 1 - + .../bindings/soc/fsl/fsl,layerscape-dcfg.yaml | 1 - + .../bindings/soc/fsl/fsl,layerscape-scfg.yaml | 1 - + arch/arm/boot/dts/nxp/imx/Makefile | 2 + + arch/arm/boot/dts/nxp/imx/e60k02.dtsi | 4 + + arch/arm/boot/dts/nxp/imx/imx51-apf51dev.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx51-babbage.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx51-ts4800.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx53-m53evk.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx53-m53menlo.dts | 1 + + arch/arm/boot/dts/nxp/imx/imx53-tx53-x03x.dts | 14 +- + arch/arm/boot/dts/nxp/imx/imx53-tx53-x13x.dts | 6 +- + .../boot/dts/nxp/imx/imx6dl-aristainetos2_4.dts | 5 +- + .../arm/boot/dts/nxp/imx/imx6dl-aristainetos_4.dts | 4 +- + .../arm/boot/dts/nxp/imx/imx6dl-aristainetos_7.dts | 4 +- + .../dts/nxp/imx/imx6dl-kontron-samx6i-ads2.dts | 12 + + .../boot/dts/nxp/imx/imx6dl-kontron-samx6i.dtsi | 2 +- + .../boot/dts/nxp/imx/imx6q-kontron-samx6i-ads2.dts | 12 + + .../arm/boot/dts/nxp/imx/imx6q-kontron-samx6i.dtsi | 25 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw52xx.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw53xx.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw54xx.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw560x.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw5903.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw5904.dtsi | 2 +- + .../dts/nxp/imx/imx6qdl-kontron-samx6i-ads2.dtsi | 148 +++ + .../boot/dts/nxp/imx/imx6qdl-kontron-samx6i.dtsi | 58 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-mba6a.dtsi | 12 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-mba6b.dtsi | 12 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-tx6-lcd.dtsi | 21 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-tx6-lvds.dtsi | 20 +- + arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi | 14 +- + arch/arm/boot/dts/nxp/mxs/imx28-tx28.dts | 6 - + arch/arm/configs/imx_v6_v7_defconfig | 7 + + arch/arm64/Kconfig.platforms | 1 - + arch/arm64/boot/dts/freescale/Makefile | 15 + + arch/arm64/boot/dts/freescale/fsl-ls1012a.dtsi | 79 +- + arch/arm64/boot/dts/freescale/fsl-ls1028a-rdb.dts | 31 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 55 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-rdb.dts | 20 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 138 +-- + arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a.dtsi | 49 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 72 +- + arch/arm64/boot/dts/freescale/fsl-ls2080a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls2088a.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 186 +-- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 56 +- + arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi | 1 - + arch/arm64/boot/dts/freescale/imx8-ss-cm41.dtsi | 68 ++ + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 69 ++ + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 277 +++++ + arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi | 78 ++ + arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi | 11 + + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 2 +- + .../boot/dts/freescale/imx8mm-iot-gateway.dts | 218 ++++ + .../imx8mm-phygate-tauri-l-rs232-rs232.dtso | 72 ++ + .../imx8mm-phygate-tauri-l-rs232-rs485.dtso | 76 ++ + .../imx8mm-phygate-tauri-l-rs232-rts-cts.dtso | 41 + + .../boot/dts/freescale/imx8mm-phygate-tauri-l.dts | 10 + + .../arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 8 +- + arch/arm64/boot/dts/freescale/imx8mm-ucm-som.dtsi | 679 +++++++++++ + .../boot/dts/freescale/imx8mm-venice-gw700x.dtsi | 20 + + .../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 - + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 20 +- + .../arm64/boot/dts/freescale/imx8mn-tqma8mqnl.dtsi | 8 +- + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 2 - + .../arm64/boot/dts/freescale/imx8mp-beacon-kit.dts | 12 +- + .../boot/dts/freescale/imx8mp-beacon-som.dtsi | 2 - + .../boot/dts/freescale/imx8mp-debix-model-a.dts | 47 + + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dts | 39 + + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk3.dts | 39 + + .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 13 +- + .../dts/freescale/imx8mp-evk-mx8-dlvds-lcd1.dtso | 77 ++ + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 91 +- + .../boot/dts/freescale/imx8mp-msc-sm2s-ep1.dts | 27 + + .../freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts | 906 +++++++++++++++ + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 5 - + .../arm64/boot/dts/freescale/imx8mp-tqma8mpql.dtsi | 8 +- + .../boot/dts/freescale/imx8mp-venice-gw702x.dtsi | 20 + + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 24 + + .../boot/dts/freescale/imx8mp-verdin-dahlia.dtsi | 37 + + .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 37 + + .../boot/dts/freescale/imx8mp-verdin-mallow.dtsi | 37 + + .../boot/dts/freescale/imx8mp-verdin-nonwifi.dtsi | 3 +- + .../boot/dts/freescale/imx8mp-verdin-wifi.dtsi | 3 +- + .../boot/dts/freescale/imx8mp-verdin-yavia.dtsi | 37 + + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 18 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 120 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 2 - + arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi | 8 +- + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 344 ++++++ + arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi | 473 ++++++++ + arch/arm64/boot/dts/freescale/imx8qm.dtsi | 103 ++ + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 1 + + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 309 +++-- + arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts | 492 ++++++++ + .../dts/freescale/imx93-tqma9352-mba93xxca.dts | 73 +- + .../dts/freescale/imx93-tqma9352-mba93xxla.dts | 61 + + arch/arm64/boot/dts/freescale/imx93-tqma9352.dtsi | 6 + + arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts | 289 +++++ + arch/arm64/boot/dts/freescale/imx95-clock.h | 187 +++ + arch/arm64/boot/dts/freescale/imx95-pinfunc.h | 865 ++++++++++++++ + arch/arm64/boot/dts/freescale/imx95-power.h | 47 + + arch/arm64/boot/dts/freescale/imx95.dtsi | 1192 ++++++++++++++++++++ + .../boot/dts/freescale/qoriq-fman3-0-10g-0.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-10g-1.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-0.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-1.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-2.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-3.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-4.dtsi | 2 +- + .../boot/dts/freescale/qoriq-fman3-0-1g-5.dtsi | 2 +- + arch/arm64/boot/dts/freescale/qoriq-fman3-0.dtsi | 4 +- + arch/arm64/boot/dts/freescale/tqma8xx.dtsi | 8 +- + arch/arm64/configs/defconfig | 5 + + 125 files changed, 8187 insertions(+), 736 deletions(-) + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-kontron-samx6i-ads2.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-kontron-samx6i-ads2.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-kontron-samx6i-ads2.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8-ss-cm41.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-iot-gateway.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phygate-tauri-l-rs232-rs232.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phygate-tauri-l-rs232-rs485.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phygate-tauri-l-rs232-rts-cts.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-ucm-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-evk-mx8-dlvds-lcd1.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mp-ras314.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8qm-ss-audio.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-clock.h + create mode 100644 arch/arm64/boot/dts/freescale/imx95-pinfunc.h + create mode 100644 arch/arm64/boot/dts/freescale/imx95-power.h + create mode 100644 arch/arm64/boot/dts/freescale/imx95.dtsi +Merging mediatek/for-next (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Already up to date. +Merging mvebu/for-next (da8e8356f594 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (5856330c3d56 Merge branch 'drivers-ti-sysc-for-v6.10' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (4139ef135814 Merge branches 'arm32-for-6.11', 'arm64-defconfig-fixes-for-6.10', 'arm64-defconfig-for-6.11', 'arm64-fixes-for-6.10', 'arm64-for-6.11', 'clk-fixes-for-6.10', 'clk-for-6.11', 'drivers-fixes-for-6.10' and 'drivers-for-6.11' 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 Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 22 + + .../devicetree/bindings/cache/qcom,llcc.yaml | 59 +- + .../bindings/clock/qcom,dispcc-sc8280xp.yaml | 20 +- + .../bindings/clock/qcom,dispcc-sm6350.yaml | 20 +- + .../bindings/clock/qcom,dispcc-sm8x50.yaml | 46 +- + .../bindings/clock/qcom,gcc-apq8064.yaml | 3 +- + .../bindings/clock/qcom,gcc-apq8084.yaml | 1 + + .../bindings/clock/qcom,gcc-ipq4019.yaml | 3 +- + .../bindings/clock/qcom,gcc-ipq6018.yaml | 3 +- + .../bindings/clock/qcom,gcc-ipq8064.yaml | 3 +- + .../bindings/clock/qcom,gcc-ipq8074.yaml | 1 + + .../{qcom,gcc-other.yaml => qcom,gcc-mdm9607.yaml} | 4 +- + .../bindings/clock/qcom,gcc-mdm9615.yaml | 50 + + .../bindings/clock/qcom,gcc-msm8660.yaml | 3 +- + .../bindings/clock/qcom,gcc-msm8909.yaml | 1 + + .../bindings/clock/qcom,gcc-msm8916.yaml | 1 + + .../bindings/clock/qcom,gcc-msm8953.yaml | 1 + + .../bindings/clock/qcom,gcc-msm8974.yaml | 1 + + .../bindings/clock/qcom,gcc-msm8976.yaml | 1 + + .../bindings/clock/qcom,gcc-msm8994.yaml | 1 + + .../bindings/clock/qcom,gcc-msm8996.yaml | 1 + + .../bindings/clock/qcom,gcc-msm8998.yaml | 1 + + .../bindings/clock/qcom,gcc-qcm2290.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc-qcs404.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc-sc7280.yaml | 1 + + .../bindings/clock/qcom,gcc-sc8180x.yaml | 1 + + .../bindings/clock/qcom,gcc-sc8280xp.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc-sdm660.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc-sdm845.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc-sdx55.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc-sdx65.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc-sm6115.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc-sm6125.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc-sm6350.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc-sm8450.yaml | 1 + + .../devicetree/bindings/clock/qcom,gcc.yaml | 1 - + .../bindings/clock/qcom,gpucc-sdm660.yaml | 20 +- + .../devicetree/bindings/clock/qcom,gpucc.yaml | 20 +- + .../bindings/clock/qcom,ipq5018-gcc.yaml | 3 +- + .../bindings/clock/qcom,ipq5332-gcc.yaml | 3 +- + .../bindings/clock/qcom,ipq9574-gcc.yaml | 3 +- + .../bindings/clock/qcom,msm8998-gpucc.yaml | 20 +- + .../bindings/clock/qcom,qca8k-nsscc.yaml | 86 + + .../bindings/clock/qcom,qcm2290-dispcc.yaml | 20 +- + .../bindings/clock/qcom,qcm2290-gpucc.yaml | 77 + + .../bindings/clock/qcom,qdu1000-gcc.yaml | 1 + + .../bindings/clock/qcom,sa8775p-gcc.yaml | 1 + + .../bindings/clock/qcom,sc7180-dispcc.yaml | 20 +- + .../bindings/clock/qcom,sc7280-dispcc.yaml | 20 +- + .../bindings/clock/qcom,sdm845-dispcc.yaml | 20 +- + .../devicetree/bindings/clock/qcom,sdx75-gcc.yaml | 1 + + .../devicetree/bindings/clock/qcom,sm4450-gcc.yaml | 1 + + .../bindings/clock/qcom,sm6115-dispcc.yaml | 20 +- + .../devicetree/bindings/clock/qcom,sm6375-gcc.yaml | 1 + + .../bindings/clock/qcom,sm7150-camcc.yaml | 60 + + .../bindings/clock/qcom,sm7150-dispcc.yaml | 75 + + .../devicetree/bindings/clock/qcom,sm7150-gcc.yaml | 1 + + .../bindings/clock/qcom,sm7150-videocc.yaml | 58 + + .../bindings/clock/qcom,sm8450-camcc.yaml | 7 +- + .../bindings/clock/qcom,sm8450-dispcc.yaml | 20 +- + .../bindings/clock/qcom,sm8450-gpucc.yaml | 20 +- + .../bindings/clock/qcom,sm8450-videocc.yaml | 26 +- + .../bindings/clock/qcom,sm8550-dispcc.yaml | 20 +- + .../devicetree/bindings/clock/qcom,sm8550-gcc.yaml | 1 + + .../devicetree/bindings/clock/qcom,sm8650-gcc.yaml | 1 + + .../devicetree/bindings/clock/qcom,videocc.yaml | 19 +- + .../bindings/clock/qcom,x1e80100-gcc.yaml | 1 + + .../devicetree/bindings/firmware/qcom,scm.yaml | 15 + + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 3 +- + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 1 + + .../devicetree/bindings/soc/qcom/qcom,smp2p.yaml | 3 +- + .../devicetree/bindings/soc/qcom/qcom,smsm.yaml | 30 +- + .../devicetree/bindings/sram/qcom,imem.yaml | 1 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 8 + + arch/arm/boot/dts/qcom/Makefile | 4 + + arch/arm/boot/dts/qcom/msm8226-motorola-falcon.dts | 53 + + .../dts/qcom/qcom-apq8026-samsung-milletwifi.dts | 573 ++++ + arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 7 +- + arch/arm/boot/dts/qcom/qcom-apq8084.dtsi | 2 +- + arch/arm/boot/dts/qcom/qcom-ipq4019.dtsi | 1 - + arch/arm/boot/dts/qcom/qcom-ipq8064.dtsi | 3 +- + arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 1 - + .../dts/qcom/qcom-msm8226-microsoft-common.dtsi | 4 + + arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 4 +- + arch/arm/boot/dts/qcom/qcom-msm8660.dtsi | 1 - + .../dts/qcom/qcom-msm8926-motorola-peregrine.dts | 123 +- + arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 1 - + .../qcom/qcom-msm8974-lge-nexus5-hammerhead.dts | 6 +- + .../boot/dts/qcom/qcom-msm8974-samsung-hlte.dts | 401 +++ + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 28 +- + arch/arm/boot/dts/qcom/qcom-msm8974pro-htc-m8.dts | 353 ++ + .../qcom-msm8974pro-sony-xperia-shinano-aries.dts | 44 + + ...qcom-msm8974pro-sony-xperia-shinano-common.dtsi | 2 + + arch/arm64/boot/dts/qcom/Makefile | 15 + + .../boot/dts/qcom/apq8016-schneider-hmibsc.dts | 491 +++ + .../dts/qcom/ipq5018-tplink-archer-ax55-v1.dts | 128 + + arch/arm64/boot/dts/qcom/ipq5018.dtsi | 1 - + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 1 - + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 27 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 14 +- + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 37 +- + .../boot/dts/qcom/msm8216-samsung-fortuna3g.dts | 14 + + arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 26 + + arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 47 + + .../boot/dts/qcom/msm8916-motorola-common.dtsi | 161 + + .../boot/dts/qcom/msm8916-motorola-harpia.dts | 147 + + .../boot/dts/qcom/msm8916-motorola-osprey.dts | 105 + + .../boot/dts/qcom/msm8916-motorola-surnia.dts | 83 + + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 53 +- + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 6 + + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 6 + + arch/arm64/boot/dts/qcom/msm8916-samsung-e5.dts | 6 + + arch/arm64/boot/dts/qcom/msm8916-samsung-e7.dts | 7 + + .../dts/qcom/msm8916-samsung-fortuna-common.dtsi | 197 ++ + .../boot/dts/qcom/msm8916-samsung-gprimeltecan.dts | 70 + + .../boot/dts/qcom/msm8916-samsung-grandmax.dts | 6 + + .../dts/qcom/msm8916-samsung-grandprimelte.dts | 14 + + .../dts/qcom/msm8916-samsung-rossa-common.dtsi | 18 + + arch/arm64/boot/dts/qcom/msm8916-samsung-rossa.dts | 6 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 18 +- + arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts | 56 +- + arch/arm64/boot/dts/qcom/msm8939.dtsi | 16 +- + .../boot/dts/qcom/msm8953-motorola-potter.dts | 1 + + arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts | 1 + + arch/arm64/boot/dts/qcom/msm8953-xiaomi-mido.dts | 1 + + arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dts | 1 + + arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts | 1 + + arch/arm64/boot/dts/qcom/msm8953.dtsi | 30 +- + arch/arm64/boot/dts/qcom/msm8956.dtsi | 4 +- + arch/arm64/boot/dts/qcom/msm8976.dtsi | 579 +++- + arch/arm64/boot/dts/qcom/msm8994.dtsi | 14 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 1 - + arch/arm64/boot/dts/qcom/msm8996.dtsi | 103 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 21 +- + arch/arm64/boot/dts/qcom/pm6125.dtsi | 1 - + arch/arm64/boot/dts/qcom/pm6150.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 3 - + arch/arm64/boot/dts/qcom/pm6350.dtsi | 1 - + arch/arm64/boot/dts/qcom/pm660.dtsi | 26 +- + arch/arm64/boot/dts/qcom/pm660l.dtsi | 1 - + arch/arm64/boot/dts/qcom/pm7250b.dtsi | 47 +- + arch/arm64/boot/dts/qcom/pm7325.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm7550ba.dtsi | 1 - + arch/arm64/boot/dts/qcom/pm8010.dtsi | 2 - + arch/arm64/boot/dts/qcom/pm8150.dtsi | 1 - + arch/arm64/boot/dts/qcom/pm8150b.dtsi | 1 - + arch/arm64/boot/dts/qcom/pm8150l.dtsi | 1 - + arch/arm64/boot/dts/qcom/pm8350.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8350b.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8350c.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8450.dtsi | 1 - + arch/arm64/boot/dts/qcom/pm8550.dtsi | 1 - + arch/arm64/boot/dts/qcom/pm8550b.dtsi | 1 - + arch/arm64/boot/dts/qcom/pm8550ve.dtsi | 1 - + arch/arm64/boot/dts/qcom/pm8550vs.dtsi | 4 - + arch/arm64/boot/dts/qcom/pm8916.dtsi | 31 +- + arch/arm64/boot/dts/qcom/pm8953.dtsi | 3 - + arch/arm64/boot/dts/qcom/pm8994.dtsi | 1 - + arch/arm64/boot/dts/qcom/pm8998.dtsi | 1 - + arch/arm64/boot/dts/qcom/pmi632.dtsi | 7 +- + arch/arm64/boot/dts/qcom/pmi8950.dtsi | 8 + + arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi | 1 - + arch/arm64/boot/dts/qcom/pmm8155au_2.dtsi | 1 - + arch/arm64/boot/dts/qcom/pmr735a.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmr735b.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmr735d_a.dtsi | 1 - + arch/arm64/boot/dts/qcom/pmr735d_b.dtsi | 1 - + arch/arm64/boot/dts/qcom/pms405.dtsi | 1 - + arch/arm64/boot/dts/qcom/pmx75.dtsi | 1 - + arch/arm64/boot/dts/qcom/qcm2290.dtsi | 184 +- + arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 157 +- + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 2 +- + arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts | 961 ++++++ + arch/arm64/boot/dts/qcom/qcs404.dtsi | 20 +- + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 111 +- + arch/arm64/boot/dts/qcom/qcs8550-aim300-aiot.dts | 315 ++ + arch/arm64/boot/dts/qcom/qcs8550-aim300.dtsi | 405 +++ + arch/arm64/boot/dts/qcom/qcs8550.dtsi | 162 + + arch/arm64/boot/dts/qcom/qdu1000-idp.dts | 23 + + arch/arm64/boot/dts/qcom/qdu1000.dtsi | 153 +- + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 21 +- + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 15 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 122 +- + arch/arm64/boot/dts/qcom/qru1000-idp.dts | 23 + + arch/arm64/boot/dts/qcom/sa8775p-pmics.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sa8775p-ride-r3.dts | 47 + + arch/arm64/boot/dts/qcom/sa8775p-ride.dts | 836 +---- + arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi | 814 +++++ + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 1146 ++++++- + .../boot/dts/qcom/sc7180-trogdor-clamshell.dtsi | 9 + + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 6 +- + .../boot/dts/qcom/sc7180-trogdor-detachable.dtsi | 13 + + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 10 +- + .../boot/dts/qcom/sc7180-trogdor-kingoftown.dts | 2 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r1-kb.dts | 2 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r1-lte.dts | 2 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r10-kb.dts | 2 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts | 2 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 2 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 2 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 2 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 2 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 3 +- + .../boot/dts/qcom/sc7180-trogdor-pazquel.dtsi | 5 +- + .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 6 +- + .../dts/qcom/sc7180-trogdor-quackingstick.dtsi | 15 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 3 +- + .../boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 29 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 1 - + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 1 - + arch/arm64/boot/dts/qcom/sc7280.dtsi | 225 +- + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 16 +- + arch/arm64/boot/dts/qcom/sc8180x-pmics.dtsi | 2 - + arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 20 +- + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 263 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 23 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 160 +- + arch/arm64/boot/dts/qcom/sc8280xp-pmics.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 84 +- + .../arm64/boot/dts/qcom/sda660-inforce-ifc6560.dts | 15 + + arch/arm64/boot/dts/qcom/sdm450-lenovo-tbx605f.dts | 276 ++ + arch/arm64/boot/dts/qcom/sdm450-motorola-ali.dts | 1 + + arch/arm64/boot/dts/qcom/sdm630.dtsi | 29 +- + arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts | 4 + + arch/arm64/boot/dts/qcom/sdm632-motorola-ocean.dts | 1 + + arch/arm64/boot/dts/qcom/sdm670.dtsi | 18 + + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 12 - + arch/arm64/boot/dts/qcom/sdm845.dtsi | 177 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 77 + + arch/arm64/boot/dts/qcom/sdx75-idp.dts | 45 + + arch/arm64/boot/dts/qcom/sdx75.dtsi | 583 +++- + .../arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts | 1 + + arch/arm64/boot/dts/qcom/sm4450.dtsi | 48 +- + arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 1 + + arch/arm64/boot/dts/qcom/sm6115.dtsi | 45 +- + arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 1 + + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 8 - + .../boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts | 6 - + arch/arm64/boot/dts/qcom/sm6125.dtsi | 8 +- + .../dts/qcom/sm6350-sony-xperia-lena-pdx213.dts | 3 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 145 +- + .../dts/qcom/sm6375-sony-xperia-murray-pdx225.dts | 2 +- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 78 - + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 205 +- + arch/arm64/boot/dts/qcom/sm8150-hdk.dts | 17 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 60 +- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 14 - + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 2 +- + .../boot/dts/qcom/sm8250-xiaomi-elish-common.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 83 +- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 27 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 82 +- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 43 +- + .../boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 245 +- + arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 26 +- + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 26 +- + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 134 +- + arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts | 593 ++++ + .../dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 14 - + arch/arm64/boot/dts/qcom/sm8550.dtsi | 335 +- + .../boot/dts/qcom/sm8650-hdk-display-card.dtso | 141 + + arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 1355 ++++++++ + arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 34 +- + arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 128 +- + arch/arm64/boot/dts/qcom/sm8650.dtsi | 327 +- + arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 213 +- + arch/arm64/boot/dts/qcom/x1e80100-pmics.dtsi | 482 +++ + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 365 +- + arch/arm64/boot/dts/qcom/x1e80100.dtsi | 1844 +++++++++- + arch/arm64/configs/defconfig | 10 +- + drivers/clk/qcom/Kconfig | 60 +- + drivers/clk/qcom/Makefile | 6 + + drivers/clk/qcom/apss-ipq6018.c | 2 +- + drivers/clk/qcom/camcc-sc7180.c | 2 +- + drivers/clk/qcom/camcc-sc7280.c | 26 +- + drivers/clk/qcom/camcc-sc8280xp.c | 6 +- + drivers/clk/qcom/camcc-sdm845.c | 2 +- + drivers/clk/qcom/camcc-sm6350.c | 4 +- + drivers/clk/qcom/camcc-sm7150.c | 2061 +++++++++++ + drivers/clk/qcom/camcc-sm8250.c | 6 +- + drivers/clk/qcom/camcc-sm8450.c | 2 +- + drivers/clk/qcom/camcc-sm8550.c | 2 +- + drivers/clk/qcom/camcc-sm8650.c | 3591 ++++++++++++++++++++ + drivers/clk/qcom/camcc-x1e80100.c | 2 +- + drivers/clk/qcom/clk-alpha-pll.c | 47 + + drivers/clk/qcom/clk-alpha-pll.h | 3 + + drivers/clk/qcom/clk-branch.c | 7 + + drivers/clk/qcom/clk-branch.h | 1 + + drivers/clk/qcom/common.c | 8 +- + drivers/clk/qcom/common.h | 2 +- + drivers/clk/qcom/dispcc-qcm2290.c | 2 +- + drivers/clk/qcom/dispcc-sc7180.c | 2 +- + drivers/clk/qcom/dispcc-sc7280.c | 2 +- + drivers/clk/qcom/dispcc-sc8280xp.c | 2 +- + drivers/clk/qcom/dispcc-sdm845.c | 2 +- + drivers/clk/qcom/dispcc-sm6115.c | 2 +- + drivers/clk/qcom/dispcc-sm6125.c | 4 +- + drivers/clk/qcom/dispcc-sm6350.c | 4 +- + drivers/clk/qcom/dispcc-sm6375.c | 4 +- + drivers/clk/qcom/dispcc-sm7150.c | 1006 ++++++ + drivers/clk/qcom/dispcc-sm8250.c | 2 +- + drivers/clk/qcom/dispcc-sm8450.c | 4 +- + drivers/clk/qcom/dispcc-sm8550.c | 4 +- + drivers/clk/qcom/dispcc-sm8650.c | 4 +- + drivers/clk/qcom/dispcc-x1e80100.c | 2 +- + drivers/clk/qcom/ecpricc-qdu1000.c | 2 +- + drivers/clk/qcom/gcc-ipq5018.c | 2 +- + drivers/clk/qcom/gcc-ipq6018.c | 4 +- + drivers/clk/qcom/gcc-ipq8074.c | 2 +- + drivers/clk/qcom/gcc-ipq9574.c | 76 + + drivers/clk/qcom/gcc-mdm9607.c | 2 +- + drivers/clk/qcom/gcc-mdm9615.c | 2 +- + drivers/clk/qcom/gcc-msm8917.c | 2 +- + drivers/clk/qcom/gcc-msm8939.c | 2 +- + drivers/clk/qcom/gcc-msm8953.c | 2 +- + drivers/clk/qcom/gcc-msm8976.c | 3 +- + drivers/clk/qcom/gcc-msm8996.c | 2 +- + drivers/clk/qcom/gcc-msm8998.c | 4 +- + drivers/clk/qcom/gcc-qcm2290.c | 2 +- + drivers/clk/qcom/gcc-qcs404.c | 2 +- + drivers/clk/qcom/gcc-qdu1000.c | 2 +- + drivers/clk/qcom/gcc-sa8775p.c | 156 +- + drivers/clk/qcom/gcc-sc7180.c | 2 +- + drivers/clk/qcom/gcc-sc7280.c | 15 +- + drivers/clk/qcom/gcc-sc8180x.c | 4 +- + drivers/clk/qcom/gcc-sc8280xp.c | 2 +- + drivers/clk/qcom/gcc-sdm660.c | 2 +- + drivers/clk/qcom/gcc-sdm845.c | 2 +- + drivers/clk/qcom/gcc-sdx55.c | 2 +- + drivers/clk/qcom/gcc-sdx65.c | 2 +- + drivers/clk/qcom/gcc-sdx75.c | 2 +- + drivers/clk/qcom/gcc-sm4450.c | 2 +- + drivers/clk/qcom/gcc-sm6115.c | 8 +- + drivers/clk/qcom/gcc-sm6125.c | 2 +- + drivers/clk/qcom/gcc-sm6350.c | 2 +- + drivers/clk/qcom/gcc-sm6375.c | 6 +- + drivers/clk/qcom/gcc-sm7150.c | 394 +-- + drivers/clk/qcom/gcc-sm8150.c | 2 +- + drivers/clk/qcom/gcc-sm8250.c | 2 +- + drivers/clk/qcom/gcc-sm8350.c | 2 +- + drivers/clk/qcom/gcc-sm8450.c | 2 +- + drivers/clk/qcom/gcc-sm8550.c | 2 +- + drivers/clk/qcom/gcc-sm8650.c | 2 +- + drivers/clk/qcom/gcc-x1e80100.c | 46 +- + drivers/clk/qcom/gpucc-msm8998.c | 4 +- + drivers/clk/qcom/gpucc-qcm2290.c | 423 +++ + drivers/clk/qcom/gpucc-sa8775p.c | 43 +- + drivers/clk/qcom/gpucc-sc7180.c | 2 +- + drivers/clk/qcom/gpucc-sc7280.c | 9 +- + drivers/clk/qcom/gpucc-sc8280xp.c | 2 +- + drivers/clk/qcom/gpucc-sdm660.c | 4 +- + drivers/clk/qcom/gpucc-sdm845.c | 2 +- + drivers/clk/qcom/gpucc-sm6115.c | 6 +- + drivers/clk/qcom/gpucc-sm6125.c | 4 +- + drivers/clk/qcom/gpucc-sm6350.c | 2 +- + drivers/clk/qcom/gpucc-sm6375.c | 4 +- + drivers/clk/qcom/gpucc-sm8150.c | 2 +- + drivers/clk/qcom/gpucc-sm8250.c | 4 +- + drivers/clk/qcom/gpucc-sm8350.c | 9 +- + drivers/clk/qcom/gpucc-sm8450.c | 4 +- + drivers/clk/qcom/gpucc-sm8550.c | 2 +- + drivers/clk/qcom/gpucc-sm8650.c | 4 +- + drivers/clk/qcom/gpucc-x1e80100.c | 2 +- + drivers/clk/qcom/lcc-ipq806x.c | 2 +- + drivers/clk/qcom/lcc-msm8960.c | 2 +- + drivers/clk/qcom/lpass-gfm-sm8250.c | 1 + + drivers/clk/qcom/lpassaudiocc-sc7280.c | 4 +- + drivers/clk/qcom/lpasscorecc-sc7180.c | 4 +- + drivers/clk/qcom/lpasscorecc-sc7280.c | 2 +- + drivers/clk/qcom/mmcc-msm8960.c | 2 +- + drivers/clk/qcom/mmcc-msm8974.c | 2 +- + drivers/clk/qcom/mmcc-msm8994.c | 6 +- + drivers/clk/qcom/mmcc-msm8996.c | 8 +- + drivers/clk/qcom/mmcc-msm8998.c | 2 +- + drivers/clk/qcom/mmcc-sdm660.c | 6 +- + drivers/clk/qcom/nsscc-qca8k.c | 2221 ++++++++++++ + drivers/clk/qcom/tcsrcc-sm8550.c | 2 +- + drivers/clk/qcom/videocc-sc7180.c | 2 +- + drivers/clk/qcom/videocc-sc7280.c | 9 +- + drivers/clk/qcom/videocc-sdm845.c | 3 +- + drivers/clk/qcom/videocc-sm7150.c | 357 ++ + drivers/clk/qcom/videocc-sm8150.c | 4 +- + drivers/clk/qcom/videocc-sm8250.c | 4 +- + drivers/clk/qcom/videocc-sm8350.c | 2 +- + drivers/clk/qcom/videocc-sm8450.c | 2 +- + drivers/clk/qcom/videocc-sm8550.c | 158 +- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 1 + + drivers/firmware/qcom/Kconfig | 31 + + drivers/firmware/qcom/Makefile | 1 + + drivers/firmware/qcom/qcom_qseecom_uefisecapp.c | 256 +- + drivers/firmware/qcom/qcom_scm-smc.c | 30 +- + drivers/firmware/qcom/qcom_scm.c | 197 +- + drivers/firmware/qcom/qcom_scm.h | 9 + + drivers/firmware/qcom/qcom_tzmem.c | 467 +++ + drivers/firmware/qcom/qcom_tzmem.h | 13 + + drivers/soc/qcom/Kconfig | 18 + + drivers/soc/qcom/Makefile | 2 + + drivers/soc/qcom/icc-bwmon.c | 16 +- + drivers/soc/qcom/llcc-qcom.c | 51 +- + drivers/soc/qcom/pdr_interface.c | 8 +- + drivers/soc/qcom/pdr_internal.h | 318 +- + drivers/soc/qcom/pmic_glink.c | 17 +- + drivers/soc/qcom/pmic_glink_altmode.c | 2 +- + drivers/soc/qcom/qcom_pd_mapper.c | 677 ++++ + drivers/soc/qcom/qcom_pdr_msg.c | 353 ++ + drivers/soc/qcom/rpmh-rsc.c | 7 +- + drivers/soc/qcom/rpmh.c | 1 - + drivers/soc/qcom/smem.c | 33 + + drivers/soc/qcom/smp2p.c | 11 +- + drivers/soc/qcom/smsm.c | 51 +- + drivers/soc/qcom/socinfo.c | 13 +- + drivers/soc/qcom/spm.c | 1 + + include/dt-bindings/arm/qcom,ids.h | 2 + + include/dt-bindings/clock/qcom,ipq9574-gcc.h | 4 + + include/dt-bindings/clock/qcom,qca8k-nsscc.h | 101 + + include/dt-bindings/clock/qcom,qcm2290-gpucc.h | 32 + + include/dt-bindings/clock/qcom,sm7150-camcc.h | 113 + + include/dt-bindings/clock/qcom,sm7150-dispcc.h | 59 + + include/dt-bindings/clock/qcom,sm7150-videocc.h | 28 + + include/dt-bindings/clock/qcom,sm8650-camcc.h | 195 ++ + include/dt-bindings/clock/qcom,sm8650-videocc.h | 23 + + include/dt-bindings/reset/qcom,qca8k-nsscc.h | 76 + + include/linux/firmware/qcom/qcom_qseecom.h | 8 +- + include/linux/firmware/qcom/qcom_scm.h | 37 +- + include/linux/firmware/qcom/qcom_tzmem.h | 56 + + include/linux/soc/qcom/llcc-qcom.h | 4 +- + include/linux/soc/qcom/smem.h | 1 + + include/linux/soc/qcom/socinfo.h | 34 + + 436 files changed, 30515 insertions(+), 3972 deletions(-) + rename Documentation/devicetree/bindings/clock/{qcom,gcc-other.yaml => qcom,gcc-mdm9607.yaml} (87%) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-mdm9615.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,qca8k-nsscc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,qcm2290-gpucc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm7150-camcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm7150-dispcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm7150-videocc.yaml + create mode 100644 arch/arm/boot/dts/qcom/qcom-apq8026-samsung-milletwifi.dts + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8974-samsung-hlte.dts + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8974pro-htc-m8.dts + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8974pro-sony-xperia-shinano-aries.dts + create mode 100644 arch/arm64/boot/dts/qcom/apq8016-schneider-hmibsc.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq5018-tplink-archer-ax55-v1.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-motorola-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-motorola-harpia.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-motorola-osprey.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-motorola-surnia.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcm6490-shift-otter.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550-aim300-aiot.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550-aim300.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sa8775p-ride-r3.dts + create mode 100644 arch/arm64/boot/dts/qcom/sa8775p-ride.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-clamshell.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-detachable.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sdm450-lenovo-tbx605f.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8650-hdk-display-card.dtso + create mode 100644 arch/arm64/boot/dts/qcom/sm8650-hdk.dts + create mode 100644 drivers/clk/qcom/camcc-sm7150.c + create mode 100644 drivers/clk/qcom/camcc-sm8650.c + create mode 100644 drivers/clk/qcom/dispcc-sm7150.c + create mode 100644 drivers/clk/qcom/gpucc-qcm2290.c + create mode 100644 drivers/clk/qcom/nsscc-qca8k.c + create mode 100644 drivers/clk/qcom/videocc-sm7150.c + create mode 100644 drivers/firmware/qcom/qcom_tzmem.c + create mode 100644 drivers/firmware/qcom/qcom_tzmem.h + create mode 100644 drivers/soc/qcom/qcom_pd_mapper.c + create mode 100644 drivers/soc/qcom/qcom_pdr_msg.c + create mode 100644 include/dt-bindings/clock/qcom,qca8k-nsscc.h + create mode 100644 include/dt-bindings/clock/qcom,qcm2290-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,sm7150-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm7150-dispcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm7150-videocc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8650-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8650-videocc.h + create mode 100644 include/dt-bindings/reset/qcom,qca8k-nsscc.h + create mode 100644 include/linux/firmware/qcom/qcom_tzmem.h +Merging renesas/next (5c91aa40e630 Merge branches 'renesas-arm-defconfig-for-v6.11' and 'renesas-dts-for-v6.11' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + arch/arm64/configs/defconfig | 4 ++++ + 1 file changed, 4 insertions(+) +Merging reset/reset/next (eb5d88b15388 reset: RESET_IMX8MP_AUDIOMIX should depend on ARCH_MXC) +$ 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 (84a3d3b435e7 Merge branch 'v6.11-clk/next' 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/power/rockchip-io-domain.yaml | 24 ++++ + arch/arm64/boot/dts/rockchip/Makefile | 1 + + .../rockchip/rk3568-wolfvision-pf5-display-vz.dtso | 17 +++ + .../rockchip/rk3568-wolfvision-pf5-display.dtsi | 121 +++++++++++++++++++++ + drivers/clk/rockchip/clk-cpu.c | 5 +- + drivers/clk/rockchip/clk-pll.c | 8 +- + drivers/clk/rockchip/clk-rk3128.c | 24 +++- + drivers/clk/rockchip/clk-rk3188.c | 18 ++- + drivers/soc/rockchip/grf.c | 2 + + drivers/soc/rockchip/io-domain.c | 40 +++++++ + include/dt-bindings/clock/rk3128-cru.h | 3 +- + 11 files changed, 245 insertions(+), 18 deletions(-) + 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 +Merging samsung-krzk/for-next (b305fd6840d1 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/exynos/exynos850.dtsi | 8 ++++++++ + arch/arm64/boot/dts/exynos/google/gs101-oriole.dts | 9 ++++++++- + arch/arm64/boot/dts/exynos/google/gs101.dtsi | 22 +++++++++++----------- + drivers/clk/samsung/clk-cpu.c | 4 ++-- + drivers/clk/samsung/clk-exynos-clkout.c | 7 ++++--- + drivers/clk/samsung/clk-gs101.c | 2 +- + drivers/clk/samsung/clk-pll.c | 8 ++++---- + drivers/soc/samsung/exynos-pmu.c | 22 +++++++++++++++++++--- + include/linux/soc/samsung/exynos-regs-pmu.h | 4 ++++ + 9 files changed, 61 insertions(+), 25 deletions(-) +Merging scmi/for-linux-next (eaaeef9e62f9 Merge tags 'scmi-updates-6.11', 'ffa-updates-6.11', 'vexpress-updates-6.11' and 'juno-updates-6.11' 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. +Merging sophgo/for-next (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Already up to date. +Merging stm32/stm32-next (45fad67e8307 arm64: dts: st: enable Ethernet2 on stm32mp257f-ev1 board) +$ 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. + .../devicetree/bindings/arm/stm32/stm32.yaml | 6 + + arch/arm/boot/dts/st/Makefile | 1 + + arch/arm/boot/dts/st/stm32f429.dtsi | 1 + + arch/arm/boot/dts/st/stm32mp13-pinctrl.dtsi | 609 +++++++++++++++++++++ + arch/arm/boot/dts/st/stm32mp131.dtsi | 38 ++ + arch/arm/boot/dts/st/stm32mp133.dtsi | 31 ++ + arch/arm/boot/dts/st/stm32mp135f-dhcor-dhsbc.dts | 377 +++++++++++++ + arch/arm/boot/dts/st/stm32mp135f-dk.dts | 128 +++++ + arch/arm/boot/dts/st/stm32mp13xx-dhcor-som.dtsi | 308 +++++++++++ + arch/arm/boot/dts/st/stm32mp151.dtsi | 3 + + arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts | 5 + + arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts | 5 + + arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts | 5 + + arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts | 5 + + arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts | 13 - + arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 13 - + arch/arm/boot/dts/st/stm32mp15xx-osd32.dtsi | 13 + + arch/arm/configs/multi_v7_defconfig | 1 + + arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi | 100 ++++ + arch/arm64/boot/dts/st/stm32mp251.dtsi | 211 ++++++- + arch/arm64/boot/dts/st/stm32mp253.dtsi | 64 +++ + arch/arm64/boot/dts/st/stm32mp257f-ev1.dts | 34 ++ + 22 files changed, 1944 insertions(+), 27 deletions(-) + create mode 100644 arch/arm/boot/dts/st/stm32mp135f-dhcor-dhsbc.dts + create mode 100644 arch/arm/boot/dts/st/stm32mp13xx-dhcor-som.dtsi +Merging sunxi/sunxi/for-next (0682fbf17dd9 Merge branches 'sunxi/clk-fixes-for-6.10', 'sunxi/drivers-for-6.11' and 'sunxi/dt-for-6.11' 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 +Auto-merging Documentation/devicetree/bindings/arm/sunxi.yaml +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 16 +- + .../input/allwinner,sun4i-a10-lradc-keys.yaml | 4 +- + .../sram/allwinner,sun4i-a10-system-control.yaml | 28 +++ + arch/arm/boot/dts/allwinner/Makefile | 62 ----- + .../boot/dts/allwinner/sun50i-a64-pine64-lts.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pine64-plus.dts | 2 +- + .../arm64/boot/dts/allwinner/sun50i-a64-pine64.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinebook.dts | 2 +- + .../allwinner/sun50i-a64-pinetab-early-adopter.dts | 2 +- + .../boot/dts/allwinner/sun50i-a64-pinetab.dts | 2 +- + .../dts/allwinner/sun50i-a64-sopine-baseboard.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 37 ++- + .../dts/allwinner/sun50i-h6-pine-h64-model-b.dts | 2 +- + .../boot/dts/allwinner/sun50i-h6-pine-h64.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 37 +++ + .../boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi | 25 +- + arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 67 ++++++ + .../dts/allwinner/sun50i-h64-remix-mini-pc.dts | 2 +- + .../allwinner/sun50i-h700-anbernic-rg35xx-2024.dts | 4 +- + .../allwinner/sun50i-h700-anbernic-rg35xx-h.dts | 79 +++++++ + arch/riscv/boot/dts/allwinner/Makefile | 2 + + .../dts/allwinner/sun20i-d1-clockworkpi-v3.14.dts | 252 +++++++++++++++++++++ + .../boot/dts/allwinner/sun20i-d1-devterm-v3.14.dts | 36 +++ + arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 11 + + drivers/clk/sunxi-ng/ccu-sun20i-d1-r.c | 1 + + drivers/clk/sunxi-ng/ccu-sun20i-d1.c | 1 + + drivers/clk/sunxi-ng/ccu-sun4i-a10.c | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-a100-r.c | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-a100.c | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-a64.c | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-h6.c | 1 + + drivers/clk/sunxi-ng/ccu-sun50i-h616.c | 6 + + drivers/clk/sunxi-ng/ccu-sun50i-h616.h | 2 +- + drivers/clk/sunxi-ng/ccu-sun6i-a31.c | 1 + + drivers/clk/sunxi-ng/ccu-sun6i-rtc.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-a23.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-a33.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-a83t.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-de2.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-r.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 1 + + drivers/clk/sunxi-ng/ccu-sun9i-a80-de.c | 1 + + drivers/clk/sunxi-ng/ccu-sun9i-a80-usb.c | 1 + + drivers/clk/sunxi-ng/ccu-sun9i-a80.c | 1 + + drivers/clk/sunxi-ng/ccu-suniv-f1c100s.c | 1 + + drivers/clk/sunxi-ng/ccu_common.c | 1 + + drivers/clk/sunxi/clk-sunxi.c | 11 - + drivers/soc/sunxi/sunxi_sram.c | 2 - + include/dt-bindings/clock/sun50i-h616-ccu.h | 1 + + include/dt-bindings/reset/sun50i-h616-ccu.h | 1 + + 53 files changed, 617 insertions(+), 109 deletions(-) + create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-clockworkpi-v3.14.dts + create mode 100644 arch/riscv/boot/dts/allwinner/sun20i-d1-devterm-v3.14.dts +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 (5211d93c551f Merge branch for-6.11/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 +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + arch/arm/mach-tegra/board-paz00.c | 50 +++++++++----- + .../dts/nvidia/tegra234-p3768-0000+p3767-0000.dts | 77 +--------------------- + .../dts/nvidia/tegra234-p3768-0000+p3767-0005.dts | 31 +-------- + ...68-0000.dtsi => tegra234-p3768-0000+p3767.dtsi} | 28 +++++++- + arch/arm64/configs/defconfig | 1 + + drivers/soc/tegra/pmc.c | 8 +-- + 6 files changed, 64 insertions(+), 131 deletions(-) + rename arch/arm64/boot/dts/nvidia/{tegra234-p3768-0000.dtsi => tegra234-p3768-0000+p3767.dtsi} (90%) +Merging ti/ti-next (0457310f1e9d Merge branch '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 +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/keystone/ti,sci.yaml | 2 +- + Documentation/devicetree/bindings/arm/ti/k3.yaml | 6 + + .../devicetree/bindings/clock/ti,sci-clk.yaml | 2 +- + .../devicetree/bindings/reset/ti,sci-reset.yaml | 2 +- + .../devicetree/bindings/soc/ti/sci-pm-domain.yaml | 2 +- + MAINTAINERS | 1 + + arch/arm64/boot/dts/ti/Makefile | 56 +- + arch/arm64/boot/dts/ti/k3-am62-lp-sk-nand.dtso | 116 +++ + arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 4 + + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 39 +- + arch/arm64/boot/dts/ti/k3-am62-verdin-dev.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 4 - + arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 5 + + arch/arm64/boot/dts/ti/k3-am62.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 2 - + .../dts/ti/k3-am625-phyboard-lyra-1-4-ghz-opp.dtso | 20 + + .../boot/dts/ti/k3-am625-phyboard-lyra-rdk.dts | 467 +-------- + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 32 +- + arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi | 330 ++++++ + arch/arm64/boot/dts/ti/k3-am62a-wakeup.dtsi | 11 +- + .../boot/dts/ti/k3-am62a7-phyboard-lyra-rdk.dts | 18 + + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 2 - + .../boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 1062 +++++++++++++++++++ + ...62p-mcu.dtsi => k3-am62p-j722s-common-mcu.dtsi} | 11 +- + ...mal.dtsi => k3-am62p-j722s-common-thermal.dtsi} | 0 + ...keup.dtsi => k3-am62p-j722s-common-wakeup.dtsi} | 8 +- + arch/arm64/boot/dts/ti/k3-am62p-main.dtsi | 1087 +------------------- + arch/arm64/boot/dts/ti/k3-am62p.dtsi | 9 +- + arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 20 +- + arch/arm64/boot/dts/ti/k3-am62x-phyboard-lyra.dtsi | 475 +++++++++ + arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 24 +- + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 24 + + arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi | 46 +- + .../dts/ti/k3-am64-tqma64xxl-mbax4xxl-sdcard.dtso | 4 +- + .../dts/ti/k3-am64-tqma64xxl-mbax4xxl-wlan.dtso | 4 +- + .../dts/ti/k3-am642-evm-icssg1-dualemac-mii.dtso | 101 ++ + arch/arm64/boot/dts/ti/k3-am642-evm-nand.dtso | 148 +++ + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 15 + + arch/arm64/boot/dts/ti/k3-am642-hummingboard-t.dts | 1 - + .../ti/k3-am642-phyboard-electra-pcie-usb2.dtso | 87 ++ + .../boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 12 - + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 12 + + .../boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts | 4 +- + arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 36 + + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 12 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 1 + + arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 76 ++ + arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi | 86 +- + arch/arm64/boot/dts/ti/k3-am69-sk.dts | 87 +- + .../dts/ti/k3-am6xx-phycore-disable-eth-phy.dtso | 19 + + .../boot/dts/ti/k3-am6xx-phycore-disable-rtc.dtso | 15 + + .../dts/ti/k3-am6xx-phycore-disable-spi-nor.dtso | 15 + + .../boot/dts/ti/k3-am6xx-phycore-qspi-nor.dtso | 15 + + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 14 +- + arch/arm64/boot/dts/ti/k3-j7200-som-p0.dtsi | 5 +- + .../k3-j721e-common-proc-board-infotainment.dtso | 164 +++ + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 12 +- + arch/arm64/boot/dts/ti/k3-j721e-sk.dts | 117 +++ + arch/arm64/boot/dts/ti/k3-j721e-som-p0.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 12 +- + arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 5 +- + arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 182 ++++ + arch/arm64/boot/dts/ti/k3-j722s-main.dtsi | 217 ++++ + arch/arm64/boot/dts/ti/k3-j722s.dtsi | 165 ++- + .../boot/dts/ti/k3-j784s4-evm-pcie0-pcie1-ep.dtso | 79 ++ + .../dts/ti/k3-j784s4-evm-quad-port-eth-exp1.dtso | 147 +++ + .../dts/ti/k3-j784s4-evm-usxgmii-exp1-exp2.dtso | 81 ++ + arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 383 ++++++- + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 527 ++++++++++ + arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 14 +- + arch/arm64/boot/dts/ti/k3-j784s4.dtsi | 10 +- + arch/arm64/boot/dts/ti/k3-pinctrl.h | 3 + + arch/arm64/boot/dts/ti/k3-serdes.h | 8 + + arch/arm64/configs/defconfig | 5 + + drivers/firmware/ti_sci.h | 2 +- + drivers/soc/ti/k3-socinfo.c | 2 +- + drivers/soc/ti/knav_qmss.h | 2 +- + drivers/soc/ti/knav_qmss_acc.c | 2 +- + drivers/soc/ti/knav_qmss_queue.c | 2 +- + drivers/soc/ti/pm33xx.c | 4 +- + 81 files changed, 5155 insertions(+), 1657 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-am62-lp-sk-nand.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am625-phyboard-lyra-1-4-ghz-opp.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am62a7-phyboard-lyra-rdk.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am62p-j722s-common-main.dtsi + rename arch/arm64/boot/dts/ti/{k3-am62p-mcu.dtsi => k3-am62p-j722s-common-mcu.dtsi} (94%) + rename arch/arm64/boot/dts/ti/{k3-am62p-thermal.dtsi => k3-am62p-j722s-common-thermal.dtsi} (100%) + rename arch/arm64/boot/dts/ti/{k3-am62p-wakeup.dtsi => k3-am62p-j722s-common-wakeup.dtsi} (93%) + create mode 100644 arch/arm64/boot/dts/ti/k3-am62x-phyboard-lyra.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-evm-icssg1-dualemac-mii.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-evm-nand.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-pcie-usb2.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am6xx-phycore-disable-eth-phy.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am6xx-phycore-disable-rtc.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am6xx-phycore-disable-spi-nor.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-am6xx-phycore-qspi-nor.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-j721e-common-proc-board-infotainment.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-j722s-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j784s4-evm-pcie0-pcie1-ep.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-j784s4-evm-quad-port-eth-exp1.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-j784s4-evm-usxgmii-exp1-exp2.dtso +Merging xilinx/for-next (613af8986db8 Merge remote-tracking branch 'git/zynqmp/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + drivers/firmware/xilinx/zynqmp.c | 3 - + drivers/soc/xilinx/xlnx_event_manager.c | 16 +-- + drivers/soc/xilinx/zynqmp_power.c | 155 ++++++++++++++++++++++++---- + include/clocksource/timer-xilinx.h | 2 +- + include/linux/firmware/xlnx-event-manager.h | 10 ++ + include/linux/firmware/xlnx-zynqmp.h | 3 + + 6 files changed, 152 insertions(+), 37 deletions(-) +Merging clk/clk-next (2bf56243b7b6 Merge branch 'clk-samsung' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. + .../clock/amlogic,a1-peripherals-clkc.yaml | 9 +- + .../bindings/clock/amlogic,a1-pll-clkc.yaml | 9 +- + .../bindings/clock/amlogic,axg-audio-clkc.txt | 59 - + .../bindings/clock/amlogic,axg-audio-clkc.yaml | 201 ++ + .../clock/amlogic,c3-peripherals-clkc.yaml | 120 + + .../bindings/clock/amlogic,c3-pll-clkc.yaml | 59 + + .../devicetree/bindings/clock/milbeaut-clock.yaml | 29 +- + .../bindings/clock/renesas,rzg2l-cpg.yaml | 2 +- + drivers/clk/clk-fractional-divider_test.c | 3 +- + drivers/clk/clk-gate_test.c | 3 +- + drivers/clk/clk_test.c | 3 +- + drivers/clk/mediatek/clk-mt2701-aud.c | 2 + + drivers/clk/mediatek/clk-mt2701-bdp.c | 2 + + drivers/clk/mediatek/clk-mt2701-eth.c | 2 + + drivers/clk/mediatek/clk-mt2701-g3d.c | 2 + + drivers/clk/mediatek/clk-mt2701-hif.c | 2 + + drivers/clk/mediatek/clk-mt2701-img.c | 2 + + drivers/clk/mediatek/clk-mt2701-mm.c | 2 + + drivers/clk/mediatek/clk-mt2701-vdec.c | 2 + + drivers/clk/mediatek/clk-mt2701.c | 2 + + drivers/clk/mediatek/clk-mt2712-apmixedsys.c | 2 + + drivers/clk/mediatek/clk-mt2712-bdp.c | 2 + + drivers/clk/mediatek/clk-mt2712-img.c | 2 + + drivers/clk/mediatek/clk-mt2712-jpgdec.c | 2 + + drivers/clk/mediatek/clk-mt2712-mfg.c | 2 + + drivers/clk/mediatek/clk-mt2712-mm.c | 2 + + drivers/clk/mediatek/clk-mt2712-vdec.c | 2 + + drivers/clk/mediatek/clk-mt2712-venc.c | 2 + + drivers/clk/mediatek/clk-mt2712.c | 2 + + drivers/clk/mediatek/clk-mt6765-audio.c | 2 + + drivers/clk/mediatek/clk-mt6765-cam.c | 2 + + drivers/clk/mediatek/clk-mt6765-img.c | 2 + + drivers/clk/mediatek/clk-mt6765-mipi0a.c | 2 + + drivers/clk/mediatek/clk-mt6765-mm.c | 2 + + drivers/clk/mediatek/clk-mt6765-vcodec.c | 2 + + drivers/clk/mediatek/clk-mt6765.c | 2 + + drivers/clk/mediatek/clk-mt6779-aud.c | 3 +- + drivers/clk/mediatek/clk-mt6779-cam.c | 3 +- + drivers/clk/mediatek/clk-mt6779-img.c | 2 + + drivers/clk/mediatek/clk-mt6779-ipe.c | 2 + + drivers/clk/mediatek/clk-mt6779-mfg.c | 2 + + drivers/clk/mediatek/clk-mt6779-mm.c | 2 + + drivers/clk/mediatek/clk-mt6779-vdec.c | 2 + + drivers/clk/mediatek/clk-mt6779-venc.c | 2 + + drivers/clk/mediatek/clk-mt6779.c | 2 + + drivers/clk/mediatek/clk-mt6795-mm.c | 2 +- + drivers/clk/mediatek/clk-mt6797-img.c | 2 + + drivers/clk/mediatek/clk-mt6797-mm.c | 2 + + drivers/clk/mediatek/clk-mt6797-vdec.c | 2 + + drivers/clk/mediatek/clk-mt6797-venc.c | 2 + + drivers/clk/mediatek/clk-mt6797.c | 2 + + drivers/clk/mediatek/clk-mt7622-aud.c | 2 + + drivers/clk/mediatek/clk-mt7622-eth.c | 2 + + drivers/clk/mediatek/clk-mt7622-hif.c | 2 + + drivers/clk/mediatek/clk-mt7629-eth.c | 2 + + drivers/clk/mediatek/clk-mt7629-hif.c | 2 + + drivers/clk/mediatek/clk-mt7629.c | 2 + + drivers/clk/mediatek/clk-mt7981-apmixed.c | 2 + + drivers/clk/mediatek/clk-mt7981-eth.c | 2 + + drivers/clk/mediatek/clk-mt7981-infracfg.c | 2 + + drivers/clk/mediatek/clk-mt7981-topckgen.c | 2 + + drivers/clk/mediatek/clk-mt7986-apmixed.c | 2 + + drivers/clk/mediatek/clk-mt7986-topckgen.c | 2 + + drivers/clk/mediatek/clk-mt7988-apmixed.c | 2 + + drivers/clk/mediatek/clk-mt7988-infracfg.c | 2 + + drivers/clk/mediatek/clk-mt7988-topckgen.c | 2 + + drivers/clk/mediatek/clk-mt8167-apmixedsys.c | 2 + + drivers/clk/mediatek/clk-mt8167-aud.c | 2 + + drivers/clk/mediatek/clk-mt8167-img.c | 2 + + drivers/clk/mediatek/clk-mt8167-mfgcfg.c | 2 + + drivers/clk/mediatek/clk-mt8167-mm.c | 2 + + drivers/clk/mediatek/clk-mt8167-vdec.c | 2 + + drivers/clk/mediatek/clk-mt8167.c | 2 + + drivers/clk/mediatek/clk-mt8183-apmixedsys.c | 2 + + drivers/clk/mediatek/clk-mt8183-audio.c | 2 + + drivers/clk/mediatek/clk-mt8183-cam.c | 2 + + drivers/clk/mediatek/clk-mt8183-img.c | 2 + + drivers/clk/mediatek/clk-mt8183-ipu0.c | 2 + + drivers/clk/mediatek/clk-mt8183-ipu1.c | 2 + + drivers/clk/mediatek/clk-mt8183-ipu_adl.c | 2 + + drivers/clk/mediatek/clk-mt8183-ipu_conn.c | 2 + + drivers/clk/mediatek/clk-mt8183-mfgcfg.c | 2 + + drivers/clk/mediatek/clk-mt8183-mm.c | 2 + + drivers/clk/mediatek/clk-mt8183-vdec.c | 2 + + drivers/clk/mediatek/clk-mt8183-venc.c | 2 + + drivers/clk/mediatek/clk-mt8183.c | 2 + + drivers/clk/mediatek/clk-mt8186-apmixedsys.c | 2 + + drivers/clk/mediatek/clk-mt8186-cam.c | 2 + + drivers/clk/mediatek/clk-mt8186-img.c | 2 + + drivers/clk/mediatek/clk-mt8186-imp_iic_wrap.c | 2 + + drivers/clk/mediatek/clk-mt8186-infra_ao.c | 2 + + drivers/clk/mediatek/clk-mt8186-ipe.c | 2 + + drivers/clk/mediatek/clk-mt8186-mdp.c | 2 + + drivers/clk/mediatek/clk-mt8186-mfg.c | 2 + + drivers/clk/mediatek/clk-mt8186-mm.c | 2 + + drivers/clk/mediatek/clk-mt8186-topckgen.c | 2 + + drivers/clk/mediatek/clk-mt8186-vdec.c | 2 + + drivers/clk/mediatek/clk-mt8186-venc.c | 2 + + drivers/clk/mediatek/clk-mt8186-wpe.c | 2 + + drivers/clk/mediatek/clk-mt8188-adsp_audio26m.c | 2 + + drivers/clk/mediatek/clk-mt8188-apmixedsys.c | 2 + + drivers/clk/mediatek/clk-mt8188-cam.c | 3 +- + drivers/clk/mediatek/clk-mt8188-ccu.c | 3 +- + drivers/clk/mediatek/clk-mt8188-img.c | 3 +- + drivers/clk/mediatek/clk-mt8188-imp_iic_wrap.c | 2 + + drivers/clk/mediatek/clk-mt8188-infra_ao.c | 2 + + drivers/clk/mediatek/clk-mt8188-ipe.c | 2 + + drivers/clk/mediatek/clk-mt8188-mfg.c | 2 + + drivers/clk/mediatek/clk-mt8188-peri_ao.c | 2 + + drivers/clk/mediatek/clk-mt8188-topckgen.c | 2 + + drivers/clk/mediatek/clk-mt8188-vdec.c | 2 + + drivers/clk/mediatek/clk-mt8188-vdo0.c | 2 + + drivers/clk/mediatek/clk-mt8188-vdo1.c | 2 + + drivers/clk/mediatek/clk-mt8188-venc.c | 3 +- + drivers/clk/mediatek/clk-mt8188-vpp0.c | 2 + + drivers/clk/mediatek/clk-mt8188-vpp1.c | 2 + + drivers/clk/mediatek/clk-mt8188-wpe.c | 3 +- + drivers/clk/mediatek/clk-mt8192-aud.c | 2 + + drivers/clk/mediatek/clk-mt8192-cam.c | 2 + + drivers/clk/mediatek/clk-mt8192-img.c | 2 + + drivers/clk/mediatek/clk-mt8192-imp_iic_wrap.c | 2 + + drivers/clk/mediatek/clk-mt8192-ipe.c | 2 + + drivers/clk/mediatek/clk-mt8192-mdp.c | 2 + + drivers/clk/mediatek/clk-mt8192-mfg.c | 2 + + drivers/clk/mediatek/clk-mt8192-mm.c | 2 + + drivers/clk/mediatek/clk-mt8192-msdc.c | 2 + + drivers/clk/mediatek/clk-mt8192-scp_adsp.c | 2 + + drivers/clk/mediatek/clk-mt8192-vdec.c | 2 + + drivers/clk/mediatek/clk-mt8192-venc.c | 2 + + drivers/clk/mediatek/clk-mt8192.c | 2 + + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 2 + + drivers/clk/mediatek/clk-mt8195-apusys_pll.c | 2 + + drivers/clk/mediatek/clk-mt8195-cam.c | 2 + + drivers/clk/mediatek/clk-mt8195-ccu.c | 2 + + drivers/clk/mediatek/clk-mt8195-img.c | 2 + + drivers/clk/mediatek/clk-mt8195-imp_iic_wrap.c | 2 + + drivers/clk/mediatek/clk-mt8195-infra_ao.c | 2 + + drivers/clk/mediatek/clk-mt8195-ipe.c | 2 + + drivers/clk/mediatek/clk-mt8195-mfg.c | 2 + + drivers/clk/mediatek/clk-mt8195-peri_ao.c | 2 + + drivers/clk/mediatek/clk-mt8195-scp_adsp.c | 2 + + drivers/clk/mediatek/clk-mt8195-topckgen.c | 2 + + drivers/clk/mediatek/clk-mt8195-vdec.c | 2 + + drivers/clk/mediatek/clk-mt8195-vdo0.c | 2 + + drivers/clk/mediatek/clk-mt8195-vdo1.c | 2 + + drivers/clk/mediatek/clk-mt8195-venc.c | 2 + + drivers/clk/mediatek/clk-mt8195-vpp0.c | 2 + + drivers/clk/mediatek/clk-mt8195-vpp1.c | 2 + + drivers/clk/mediatek/clk-mt8195-wpe.c | 2 + + drivers/clk/mediatek/clk-mt8365-apmixedsys.c | 2 + + drivers/clk/mediatek/clk-mt8365-apu.c | 2 + + drivers/clk/mediatek/clk-mt8365-cam.c | 2 + + drivers/clk/mediatek/clk-mt8365-mfg.c | 2 + + drivers/clk/mediatek/clk-mt8365-mm.c | 2 + + drivers/clk/mediatek/clk-mt8365-vdec.c | 2 + + drivers/clk/mediatek/clk-mt8365-venc.c | 2 + + drivers/clk/mediatek/clk-mt8365.c | 2 + + drivers/clk/meson/Kconfig | 27 + + drivers/clk/meson/Makefile | 2 + + drivers/clk/meson/a1-peripherals.c | 3 +- + drivers/clk/meson/a1-pll.c | 3 +- + drivers/clk/meson/axg-aoclk.c | 3 +- + drivers/clk/meson/axg.c | 3 +- + drivers/clk/meson/c3-peripherals.c | 2366 ++++++++++++++++++++ + drivers/clk/meson/c3-pll.c | 747 ++++++ + drivers/clk/meson/clk-pll.c | 46 +- + drivers/clk/meson/clk-pll.h | 1 + + drivers/clk/meson/g12a-aoclk.c | 3 +- + drivers/clk/meson/g12a.c | 3 +- + drivers/clk/meson/gxbb-aoclk.c | 2 + + drivers/clk/meson/gxbb.c | 3 +- + drivers/clk/meson/meson-aoclk.c | 2 + + drivers/clk/meson/meson-clkc-utils.c | 1 + + drivers/clk/meson/meson-eeclk.c | 2 + + drivers/clk/meson/s4-peripherals.c | 5 +- + drivers/clk/meson/s4-pll.c | 8 +- + drivers/clk/renesas/Kconfig | 4 +- + drivers/clk/renesas/r8a77970-cpg-mssr.c | 5 +- + drivers/clk/renesas/r8a779h0-cpg-mssr.c | 28 +- + drivers/clk/renesas/r9a08g045-cpg.c | 26 + + drivers/clk/renesas/rcar-cpg-lib.c | 2 +- + drivers/clk/renesas/rcar-gen2-cpg.c | 4 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 2 - + drivers/clk/renesas/rcar-gen4-cpg.c | 2 - + drivers/clk/sifive/sifive-prci.c | 1 + + drivers/clk/sophgo/clk-cv1800.c | 1 + + drivers/clk/sprd/common.c | 1 + + drivers/clk/stm32/clk-stm32-core.c | 2 +- + drivers/clk/stm32/clk-stm32-core.h | 2 +- + drivers/clk/stm32/clk-stm32mp13.c | 2 +- + drivers/clk/stm32/clk-stm32mp25.c | 516 +++-- + .../clock/amlogic,a1-peripherals-clkc.h | 1 + + include/dt-bindings/clock/amlogic,a1-pll-clkc.h | 1 + + .../clock/amlogic,c3-peripherals-clkc.h | 212 ++ + include/dt-bindings/clock/amlogic,c3-pll-clkc.h | 40 + + include/dt-bindings/clock/amlogic,c3-scmi-clkc.h | 27 + + include/dt-bindings/clock/r8a7779-clock.h | 1 - + include/dt-bindings/clock/r8a7790-clock.h | 158 -- + include/dt-bindings/clock/r8a7791-clock.h | 161 -- + include/dt-bindings/clock/r8a7792-clock.h | 98 - + include/dt-bindings/clock/r8a7793-clock.h | 159 -- + include/dt-bindings/clock/r8a7794-clock.h | 137 -- + 202 files changed, 4558 insertions(+), 1061 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.txt + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,axg-audio-clkc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,c3-peripherals-clkc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/amlogic,c3-pll-clkc.yaml + create mode 100644 drivers/clk/meson/c3-peripherals.c + create mode 100644 drivers/clk/meson/c3-pll.c + create mode 100644 include/dt-bindings/clock/amlogic,c3-peripherals-clkc.h + create mode 100644 include/dt-bindings/clock/amlogic,c3-pll-clkc.h + create mode 100644 include/dt-bindings/clock/amlogic,c3-scmi-clkc.h + delete mode 100644 include/dt-bindings/clock/r8a7790-clock.h + delete mode 100644 include/dt-bindings/clock/r8a7791-clock.h + delete mode 100644 include/dt-bindings/clock/r8a7792-clock.h + delete mode 100644 include/dt-bindings/clock/r8a7793-clock.h + delete mode 100644 include/dt-bindings/clock/r8a7794-clock.h +Merging clk-imx/for-next (466da3d2d967 clk: imx: composite-7ulp: Use NULL instead of 0) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/imx8mp-audiomix.yaml | 3 + + 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-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-imxrt1050.c | 1 + + drivers/clk/imx/clk.c | 1 + + drivers/clk/imx/clk.h | 4 + + 16 files changed, 196 insertions(+), 51 deletions(-) +Merging clk-renesas/renesas-clk (c7e58843d1e4 clk: renesas: r9a08g045: Add clock, reset and power domain support for I2C) +$ 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 (8051b80fbeef LoongArch: Automatically disable KASLR for hibernation) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Merge made by the 'ort' strategy. + arch/loongarch/include/asm/addrspace.h | 4 ++++ + arch/loongarch/include/asm/hardirq.h | 3 ++- + arch/loongarch/include/asm/io.h | 10 ++++++++-- + arch/loongarch/include/asm/irq_work.h | 10 ++++++++++ + arch/loongarch/include/asm/loongarch.h | 10 +++++++++- + arch/loongarch/include/asm/smp.h | 2 ++ + arch/loongarch/include/asm/stackframe.h | 11 +++++++++++ + arch/loongarch/include/uapi/asm/unistd.h | 1 + + arch/loongarch/kernel/acpi.c | 22 ++++++++++++++++------ + arch/loongarch/kernel/head.S | 12 ++---------- + arch/loongarch/kernel/paravirt.c | 6 ++++++ + arch/loongarch/kernel/relocate.c | 26 ++++++++++++++++++++++++++ + arch/loongarch/kernel/setup.c | 4 +++- + arch/loongarch/kernel/smp.c | 21 +++++++++++++++++---- + arch/loongarch/power/platform.c | 22 +++++++++++++++++----- + arch/loongarch/power/suspend_asm.S | 8 ++------ + drivers/firmware/efi/libstub/loongarch.c | 2 ++ + 17 files changed, 138 insertions(+), 36 deletions(-) + create mode 100644 arch/loongarch/include/asm/irq_work.h +Merging m68k/for-next (75d3891ca19e m68k: defconfig: Update defconfigs for v6.10-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 +Merge made by the 'ort' strategy. + arch/m68k/amiga/config.c | 9 +++++++++ + arch/m68k/atari/ataints.c | 6 +----- + arch/m68k/configs/amiga_defconfig | 1 + + arch/m68k/configs/apollo_defconfig | 1 + + arch/m68k/configs/atari_defconfig | 1 + + arch/m68k/configs/bvme6000_defconfig | 1 + + arch/m68k/configs/hp300_defconfig | 1 + + arch/m68k/configs/mac_defconfig | 1 + + arch/m68k/configs/multi_defconfig | 1 + + arch/m68k/configs/mvme147_defconfig | 1 + + arch/m68k/configs/mvme16x_defconfig | 1 + + arch/m68k/configs/q40_defconfig | 1 + + arch/m68k/configs/sun3_defconfig | 1 + + arch/m68k/configs/sun3x_defconfig | 1 + + arch/m68k/emu/nfblock.c | 1 + + arch/m68k/emu/nfcon.c | 1 + + drivers/zorro/zorro.c | 3 ++- + include/uapi/linux/zorro_ids.h | 3 +++ + 18 files changed, 29 insertions(+), 6 deletions(-) +Merging m68knommu/for-next (22a40d14b572 Linux 6.10-rc6) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Already up to date. +Merging microblaze/next (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (04f38d1a4db0 mips: bmips: enable RAC on BMIPS4350) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mips/brcm/soc.yaml | 24 +++++ + .../devicetree/bindings/mips/mobileye.yaml | 5 + + arch/mips/Kbuild.platforms | 2 +- + arch/mips/Kconfig | 9 +- + arch/mips/alchemy/common/platform.c | 8 +- + arch/mips/bcm47xx/prom.c | 3 + + arch/mips/bcm47xx/setup.c | 8 ++ + arch/mips/bcm63xx/prom.c | 3 + + arch/mips/bcm63xx/setup.c | 8 ++ + arch/mips/bmips/dma.c | 2 +- + arch/mips/bmips/setup.c | 35 ++++++- + arch/mips/boot/dts/Makefile | 2 +- + arch/mips/boot/dts/loongson/loongson64-2k1000.dtsi | 102 +++++++++++-------- + .../boot/dts/loongson/loongson64g_4core_ls7a.dts | 1 + + arch/mips/boot/dts/mobileye/Makefile | 1 + + arch/mips/boot/dts/mobileye/eyeq6h-epm6.dts | 22 ++++ + .../boot/dts/mobileye/eyeq6h-fixed-clocks.dtsi | 52 ++++++++++ + arch/mips/boot/dts/mobileye/eyeq6h-pins.dtsi | 88 ++++++++++++++++ + arch/mips/boot/dts/mobileye/eyeq6h.dtsi | 98 ++++++++++++++++++ + arch/mips/configs/ci20_defconfig | 1 + + arch/mips/configs/db1xxx_defconfig | 1 - + arch/mips/configs/eyeq5_defconfig | 2 +- + arch/mips/configs/eyeq6_defconfig | 111 +++++++++++++++++++++ + arch/mips/configs/generic_defconfig | 1 - + arch/mips/crypto/poly1305-glue.c | 1 + + arch/mips/include/asm/bmips.h | 1 + + arch/mips/include/asm/mach-loongson64/boot_param.h | 2 + + arch/mips/include/asm/pm.h | 22 ++-- + arch/mips/include/asm/sgi/ip22.h | 3 + + arch/mips/kernel/smp-bmips.c | 22 +++- + arch/mips/kvm/interrupt.h | 4 + + arch/mips/kvm/loongson_ipi.c | 2 + + arch/mips/kvm/mips.c | 2 - + arch/mips/loongson64/Makefile | 2 +- + arch/mips/loongson64/dma.c | 1 + + arch/mips/loongson64/env.c | 8 ++ + arch/mips/loongson64/pm.c | 92 ++++------------- + arch/mips/loongson64/reset.c | 38 +++---- + arch/mips/loongson64/sleeper.S | 21 ++++ + arch/mips/loongson64/smp.c | 23 ++++- + arch/mips/mobileye/Kconfig | 26 +++++ + arch/mips/mobileye/Platform | 1 + + arch/mips/sgi-ip22/ip22-gio.c | 4 +- + arch/mips/sgi-ip22/ip22-int.c | 2 - + arch/mips/sgi-ip22/ip22-setup.c | 2 - + arch/mips/sgi-ip30/ip30-console.c | 1 + + drivers/platform/mips/cpu_hwmon.c | 3 + + 47 files changed, 699 insertions(+), 173 deletions(-) + create mode 100644 arch/mips/boot/dts/mobileye/eyeq6h-epm6.dts + create mode 100644 arch/mips/boot/dts/mobileye/eyeq6h-fixed-clocks.dtsi + create mode 100644 arch/mips/boot/dts/mobileye/eyeq6h-pins.dtsi + create mode 100644 arch/mips/boot/dts/mobileye/eyeq6h.dtsi + create mode 100644 arch/mips/configs/eyeq6_defconfig + create mode 100644 arch/mips/loongson64/sleeper.S + create mode 100644 arch/mips/mobileye/Kconfig +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 (5f55e098b8d0 parisc: Add 64-bit gettimeofday() and clock_gettime() vDSO functions) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/include/asm/unistd.h | 54 +++++++++--------------------- + arch/parisc/include/asm/vdso.h | 2 +- + arch/parisc/kernel/vdso32/Makefile | 24 +++++++++++-- + arch/parisc/kernel/vdso32/vdso32.lds.S | 3 ++ + arch/parisc/kernel/vdso32/vdso32_generic.c | 32 ++++++++++++++++++ + arch/parisc/kernel/vdso64/Makefile | 25 +++++++++++--- + arch/parisc/kernel/vdso64/vdso64.lds.S | 2 ++ + arch/parisc/kernel/vdso64/vdso64_generic.c | 24 +++++++++++++ + 8 files changed, 119 insertions(+), 47 deletions(-) + create mode 100644 arch/parisc/kernel/vdso32/vdso32_generic.c + create mode 100644 arch/parisc/kernel/vdso64/vdso64_generic.c +Merging powerpc/next (17c743b9da9e selftests/sigaltstack: Fix ppc64 GCC build) +$ 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/kexec/core_64.c +Auto-merging arch/powerpc/mm/nohash/Makefile +CONFLICT (content): Merge conflict in arch/powerpc/mm/nohash/Makefile +Recorded preimage for 'arch/powerpc/mm/nohash/Makefile' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/powerpc/mm/nohash/Makefile'. +[master a8acb161e7a1] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 - + arch/powerpc/Kconfig | 17 +- + arch/powerpc/Kconfig.debug | 13 - + arch/powerpc/Makefile | 5 - + arch/powerpc/boot/4xx.c | 266 ------- + arch/powerpc/boot/4xx.h | 4 - + arch/powerpc/boot/Makefile | 11 - + arch/powerpc/boot/cuboot-acadia.c | 171 ----- + arch/powerpc/boot/cuboot-hotfoot.c | 139 ---- + arch/powerpc/boot/cuboot-kilauea.c | 46 -- + arch/powerpc/boot/dcr.h | 11 - + arch/powerpc/boot/dts/acadia.dts | 224 ------ + arch/powerpc/boot/dts/haleakala.dts | 281 -------- + arch/powerpc/boot/dts/hotfoot.dts | 296 -------- + arch/powerpc/boot/dts/kilauea.dts | 407 ----------- + arch/powerpc/boot/dts/klondike.dts | 212 ------ + arch/powerpc/boot/dts/makalu.dts | 353 ---------- + arch/powerpc/boot/dts/obs600.dts | 314 --------- + arch/powerpc/boot/ppcboot-hotfoot.h | 119 ---- + arch/powerpc/boot/ppcboot.h | 2 +- + arch/powerpc/boot/wrapper | 20 - + arch/powerpc/configs/40x.config | 2 - + arch/powerpc/configs/40x/acadia_defconfig | 61 -- + arch/powerpc/configs/40x/kilauea_defconfig | 69 -- + arch/powerpc/configs/40x/klondike_defconfig | 43 -- + arch/powerpc/configs/40x/makalu_defconfig | 59 -- + arch/powerpc/configs/40x/obs600_defconfig | 69 -- + arch/powerpc/configs/40x/walnut_defconfig | 55 -- + arch/powerpc/configs/ppc40x_defconfig | 74 -- + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/include/asm/cacheflush.h | 2 +- + arch/powerpc/include/asm/cputable.h | 7 - + arch/powerpc/include/asm/hw_irq.h | 8 +- + arch/powerpc/include/asm/iommu.h | 16 +- + arch/powerpc/include/asm/irq.h | 2 +- + arch/powerpc/include/asm/kexec.h | 6 +- + arch/powerpc/include/asm/kup.h | 2 +- + arch/powerpc/include/asm/mmu.h | 7 - + arch/powerpc/include/asm/nohash/32/mmu-40x.h | 68 -- + arch/powerpc/include/asm/nohash/32/pgtable.h | 4 +- + arch/powerpc/include/asm/nohash/32/pte-40x.h | 73 -- + arch/powerpc/include/asm/nohash/mmu.h | 5 +- + arch/powerpc/include/asm/perf_event_server.h | 3 +- + arch/powerpc/include/asm/plpar_wrappers.h | 28 - + arch/powerpc/include/asm/ppc_asm.h | 2 +- + arch/powerpc/include/asm/processor.h | 2 +- + arch/powerpc/include/asm/ptrace.h | 2 +- + arch/powerpc/include/asm/reg.h | 27 +- + arch/powerpc/include/asm/reg_booke.h | 113 +-- + arch/powerpc/include/asm/time.h | 7 +- + arch/powerpc/include/asm/udbg.h | 1 - + arch/powerpc/kernel/Makefile | 1 - + arch/powerpc/kernel/asm-offsets.c | 2 +- + arch/powerpc/kernel/cpu_specs.h | 4 - + arch/powerpc/kernel/cpu_specs_40x.h | 280 -------- + arch/powerpc/kernel/eeh.c | 16 - + arch/powerpc/kernel/entry_32.S | 48 +- + arch/powerpc/kernel/epapr_hcalls.S | 2 +- + arch/powerpc/kernel/head_32.h | 12 +- + arch/powerpc/kernel/head_40x.S | 721 ------------------- + arch/powerpc/kernel/head_booke.h | 3 +- + arch/powerpc/kernel/iommu.c | 170 +---- + arch/powerpc/kernel/irq.c | 2 +- + arch/powerpc/kernel/kgdb.c | 4 +- + arch/powerpc/kernel/misc_32.S | 40 -- + arch/powerpc/kernel/process.c | 4 +- + arch/powerpc/kernel/prom.c | 12 +- + arch/powerpc/kernel/rtas.c | 4 + + arch/powerpc/kernel/setup.h | 2 +- + arch/powerpc/kernel/setup_32.c | 2 +- + arch/powerpc/kernel/time.c | 2 +- + arch/powerpc/kernel/traps.c | 2 +- + arch/powerpc/kernel/udbg.c | 3 - + arch/powerpc/kernel/udbg_16550.c | 23 - + arch/powerpc/kexec/core_64.c | 55 +- + arch/powerpc/kexec/elf_64.c | 12 +- + arch/powerpc/kexec/file_load_64.c | 53 +- + arch/powerpc/mm/drmem.c | 4 +- + arch/powerpc/mm/fault.c | 4 +- + arch/powerpc/mm/mmu_context.c | 2 +- + arch/powerpc/mm/mmu_decl.h | 8 +- + arch/powerpc/mm/nohash/40x.c | 161 ----- + arch/powerpc/mm/nohash/Makefile | 1 - + arch/powerpc/mm/nohash/kup.c | 2 - + arch/powerpc/mm/nohash/mmu_context.c | 5 +- + arch/powerpc/mm/nohash/tlb_low.S | 27 +- + arch/powerpc/mm/numa.c | 14 +- + arch/powerpc/mm/ptdump/Makefile | 2 +- + arch/powerpc/perf/core-book3s.c | 45 +- + arch/powerpc/perf/power10-pmu.c | 3 +- + arch/powerpc/platforms/40x/Kconfig | 78 --- + arch/powerpc/platforms/40x/Makefile | 2 - + arch/powerpc/platforms/40x/ppc40x_simple.c | 74 -- + arch/powerpc/platforms/44x/Makefile | 6 +- + arch/powerpc/platforms/{4xx => 44x}/cpm.c | 0 + arch/powerpc/platforms/{4xx => 44x}/gpio.c | 0 + arch/powerpc/platforms/{4xx => 44x}/hsta_msi.c | 0 + arch/powerpc/platforms/44x/machine_check.c | 15 + + arch/powerpc/platforms/{4xx => 44x}/pci.c | 100 --- + arch/powerpc/platforms/{4xx => 44x}/pci.h | 0 + arch/powerpc/platforms/{4xx => 44x}/soc.c | 0 + arch/powerpc/platforms/{4xx => 44x}/uic.c | 0 + arch/powerpc/platforms/4xx/Makefile | 7 - + arch/powerpc/platforms/4xx/machine_check.c | 23 - + arch/powerpc/platforms/Kconfig | 1 - + arch/powerpc/platforms/Kconfig.cputype | 27 +- + arch/powerpc/platforms/Makefile | 2 - + arch/powerpc/platforms/powernv/pci-ioda.c | 6 +- + arch/powerpc/platforms/pseries/iommu.c | 773 +++++++++++++++++++-- + arch/powerpc/platforms/pseries/pci_dlpar.c | 14 + + arch/powerpc/platforms/pseries/vas.c | 22 +- + arch/powerpc/sysdev/Kconfig | 4 +- + drivers/macintosh/ams/ams-i2c.c | 2 +- + drivers/macintosh/windfarm_ad7417_sensor.c | 2 +- + drivers/macintosh/windfarm_fcu_controls.c | 2 +- + drivers/macintosh/windfarm_lm87_sensor.c | 2 +- + drivers/macintosh/windfarm_max6690_sensor.c | 2 +- + drivers/macintosh/windfarm_smu_sat.c | 2 +- + drivers/vfio/vfio_iommu_spapr_tce.c | 13 +- + scripts/head-object-list.txt | 1 - + .../selftests/sigaltstack/current_stack_pointer.h | 2 +- + 121 files changed, 1011 insertions(+), 5658 deletions(-) + delete mode 100644 arch/powerpc/boot/cuboot-acadia.c + delete mode 100644 arch/powerpc/boot/cuboot-hotfoot.c + delete mode 100644 arch/powerpc/boot/cuboot-kilauea.c + delete mode 100644 arch/powerpc/boot/dts/acadia.dts + delete mode 100644 arch/powerpc/boot/dts/haleakala.dts + delete mode 100644 arch/powerpc/boot/dts/hotfoot.dts + delete mode 100644 arch/powerpc/boot/dts/kilauea.dts + delete mode 100644 arch/powerpc/boot/dts/klondike.dts + delete mode 100644 arch/powerpc/boot/dts/makalu.dts + delete mode 100644 arch/powerpc/boot/dts/obs600.dts + delete mode 100644 arch/powerpc/boot/ppcboot-hotfoot.h + delete mode 100644 arch/powerpc/configs/40x.config + delete mode 100644 arch/powerpc/configs/40x/acadia_defconfig + delete mode 100644 arch/powerpc/configs/40x/kilauea_defconfig + delete mode 100644 arch/powerpc/configs/40x/klondike_defconfig + delete mode 100644 arch/powerpc/configs/40x/makalu_defconfig + delete mode 100644 arch/powerpc/configs/40x/obs600_defconfig + delete mode 100644 arch/powerpc/configs/40x/walnut_defconfig + delete mode 100644 arch/powerpc/configs/ppc40x_defconfig + delete mode 100644 arch/powerpc/include/asm/nohash/32/mmu-40x.h + delete mode 100644 arch/powerpc/include/asm/nohash/32/pte-40x.h + delete mode 100644 arch/powerpc/kernel/cpu_specs_40x.h + delete mode 100644 arch/powerpc/kernel/head_40x.S + delete mode 100644 arch/powerpc/mm/nohash/40x.c + delete mode 100644 arch/powerpc/platforms/40x/Kconfig + delete mode 100644 arch/powerpc/platforms/40x/Makefile + delete mode 100644 arch/powerpc/platforms/40x/ppc40x_simple.c + rename arch/powerpc/platforms/{4xx => 44x}/cpm.c (100%) + rename arch/powerpc/platforms/{4xx => 44x}/gpio.c (100%) + rename arch/powerpc/platforms/{4xx => 44x}/hsta_msi.c (100%) + rename arch/powerpc/platforms/{4xx => 44x}/pci.c (95%) + rename arch/powerpc/platforms/{4xx => 44x}/pci.h (100%) + rename arch/powerpc/platforms/{4xx => 44x}/soc.c (100%) + rename arch/powerpc/platforms/{4xx => 44x}/uic.c (100%) + delete mode 100644 arch/powerpc/platforms/4xx/Makefile + delete mode 100644 arch/powerpc/platforms/4xx/machine_check.c +Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (60a6707f582e Merge patch series "riscv: Memory Hot(Un)Plug support") +$ 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/include/asm/pgtable.h +Auto-merging arch/riscv/kernel/patch.c +CONFLICT (content): Merge conflict in arch/riscv/kernel/patch.c +Auto-merging arch/riscv/kvm/vcpu_onereg.c +Auto-merging arch/riscv/mm/init.c +Resolved 'arch/riscv/kernel/patch.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 53e089745ff5] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/arch/riscv/hwprobe.rst | 43 +++ + .../interrupt-controller/riscv,cpu-intc.txt | 52 --- + .../interrupt-controller/riscv,cpu-intc.yaml | 73 +++++ + Documentation/devicetree/bindings/riscv/cpus.yaml | 21 +- + .../devicetree/bindings/riscv/extensions.yaml | 125 ++++++++ + arch/riscv/Kconfig | 16 + + arch/riscv/include/asm/cpufeature.h | 1 + + arch/riscv/include/asm/dmi.h | 24 ++ + arch/riscv/include/asm/hwcap.h | 11 + + arch/riscv/include/asm/jump_label.h | 4 +- + arch/riscv/include/asm/kasan.h | 4 +- + arch/riscv/include/asm/mmu.h | 4 +- + arch/riscv/include/asm/page.h | 5 + + arch/riscv/include/asm/patch.h | 2 +- + arch/riscv/include/asm/pgtable-64.h | 20 ++ + arch/riscv/include/asm/pgtable-bits.h | 1 + + arch/riscv/include/asm/pgtable.h | 32 +- + arch/riscv/include/asm/vector.h | 10 +- + arch/riscv/include/uapi/asm/hwprobe.h | 11 + + arch/riscv/include/uapi/asm/kvm.h | 6 + + arch/riscv/kernel/cpufeature.c | 333 ++++++++++++++------ + arch/riscv/kernel/head.S | 19 +- + arch/riscv/kernel/jump_label.c | 16 +- + arch/riscv/kernel/patch.c | 59 ++-- + arch/riscv/kernel/probes/kprobes.c | 19 +- + arch/riscv/kernel/smpboot.c | 14 +- + arch/riscv/kernel/sys_hwprobe.c | 17 +- + arch/riscv/kernel/vector.c | 5 +- + arch/riscv/kvm/vcpu_onereg.c | 12 + + arch/riscv/lib/uaccess.S | 2 +- + arch/riscv/mm/init.c | 347 ++++++++++++++++++--- + arch/riscv/mm/ptdump.c | 3 + + arch/riscv/net/bpf_jit_comp64.c | 7 +- + drivers/firmware/efi/riscv-runtime.c | 13 + + drivers/virtio/Kconfig | 2 +- + tools/testing/selftests/kvm/riscv/get-reg-list.c | 24 ++ + .../testing/selftests/riscv/vector/vstate_prctl.c | 6 +- + 37 files changed, 1082 insertions(+), 281 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/riscv,cpu-intc.yaml + create mode 100644 arch/riscv/include/asm/dmi.h +Merging riscv-dt/riscv-dt-for-next (2904244a8c46 riscv: dts: starfive: add PCIe dts configuration for JH7110) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Auto-merging Documentation/devicetree/bindings/riscv/cpus.yaml +Auto-merging arch/riscv/boot/dts/starfive/jh7110-common.dtsi +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/riscv/cpus.yaml | 1 + + .../devicetree/bindings/riscv/microchip.yaml | 1 + + .../devicetree/bindings/riscv/starfive.yaml | 1 + + arch/riscv/boot/dts/microchip/Makefile | 1 + + .../dts/microchip/mpfs-beaglev-fire-fabric.dtsi | 82 ++++++++ + .../riscv/boot/dts/microchip/mpfs-beaglev-fire.dts | 223 +++++++++++++++++++++ + arch/riscv/boot/dts/starfive/Makefile | 1 + + arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 69 ++++++- + arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts | 7 + + .../boot/dts/starfive/jh7110-pine64-star64.dts | 65 ++++++ + .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 8 + + arch/riscv/boot/dts/starfive/jh7110.dtsi | 86 ++++++++ + arch/riscv/boot/dts/thead/th1520.dtsi | 81 ++++++++ + 13 files changed, 621 insertions(+), 5 deletions(-) + create mode 100644 arch/riscv/boot/dts/microchip/mpfs-beaglev-fire-fabric.dtsi + create mode 100644 arch/riscv/boot/dts/microchip/mpfs-beaglev-fire.dts + create mode 100644 arch/riscv/boot/dts/starfive/jh7110-pine64-star64.dts +Merging riscv-soc/riscv-soc-for-next (16b8597f1774 Merge branch 'riscv-cache-for-next' into riscv-soc-for-next) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../cache/starfive,jh8100-starlink-cache.yaml | 66 ++++++++++ + MAINTAINERS | 2 + + arch/riscv/configs/defconfig | 26 ++++ + drivers/cache/Kconfig | 9 ++ + drivers/cache/Makefile | 5 +- + drivers/cache/starfive_starlink_cache.c | 130 ++++++++++++++++++++ + drivers/firmware/microchip/mpfs-auto-update.c | 136 ++++++++++----------- + 7 files changed, 303 insertions(+), 71 deletions(-) + create mode 100644 Documentation/devicetree/bindings/cache/starfive,jh8100-starlink-cache.yaml + create mode 100644 drivers/cache/starfive_starlink_cache.c +Merging s390/for-next (6566c83200ca Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/boot/startup.c +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/s390/kernel/traps.c +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/s390/mm/hugetlbpage.c +Merge made by the 'ort' strategy. + arch/s390/Kconfig | 2 +- + arch/s390/boot/ipl_parm.c | 4 +- + arch/s390/boot/ipl_report.c | 2 +- + arch/s390/boot/pgm_check_info.c | 18 +-- + arch/s390/boot/physmem_info.c | 8 +- + arch/s390/boot/startup.c | 12 +- + arch/s390/boot/vmem.c | 12 +- + arch/s390/crypto/crc32-vx.c | 1 + + arch/s390/include/asm/arch_hweight.h | 76 +++++++++++++ + arch/s390/include/asm/bitops.h | 3 +- + arch/s390/include/asm/current.h | 2 +- + arch/s390/include/asm/elf.h | 8 ++ + arch/s390/include/asm/facility.h | 4 +- + arch/s390/include/asm/hardirq.h | 6 +- + arch/s390/include/asm/lowcore.h | 5 +- + arch/s390/include/asm/mmu_context.h | 8 +- + arch/s390/include/asm/page.h | 5 + + arch/s390/include/asm/pai.h | 17 ++- + arch/s390/include/asm/percpu.h | 2 +- + arch/s390/include/asm/pgtable.h | 33 +++++- + arch/s390/include/asm/preempt.h | 30 ++--- + arch/s390/include/asm/processor.h | 8 +- + arch/s390/include/asm/setup.h | 34 +++--- + arch/s390/include/asm/smp.h | 2 +- + arch/s390/include/asm/softirq_stack.h | 2 +- + arch/s390/include/asm/spinlock.h | 2 +- + arch/s390/include/asm/timex.h | 10 +- + arch/s390/include/asm/uv.h | 12 +- + arch/s390/include/asm/vtime.h | 16 ++- + arch/s390/kernel/dumpstack.c | 8 +- + arch/s390/kernel/early.c | 36 +++--- + arch/s390/kernel/idle.c | 11 +- + arch/s390/kernel/irq.c | 18 +-- + arch/s390/kernel/machine_kexec.c | 4 +- + arch/s390/kernel/nmi.c | 31 ++--- + arch/s390/kernel/perf_cpum_sf.c | 2 +- + arch/s390/kernel/perf_pai_crypto.c | 189 +++++++++++++++++++------------ + arch/s390/kernel/perf_pai_ext.c | 146 ++++++++++++++++-------- + arch/s390/kernel/process.c | 6 +- + arch/s390/kernel/setup.c | 24 ++-- + arch/s390/kernel/smp.c | 33 +++--- + arch/s390/kernel/syscall.c | 4 +- + arch/s390/kernel/time.c | 22 ++-- + arch/s390/kernel/topology.c | 8 +- + arch/s390/kernel/traps.c | 28 ++--- + arch/s390/kernel/uv.c | 207 +++++++++++++++++++++++----------- + arch/s390/kernel/vtime.c | 82 +++++++------- + arch/s390/kvm/kvm-s390.c | 2 +- + arch/s390/lib/spinlock.c | 4 +- + arch/s390/lib/test_kprobes.c | 1 + + arch/s390/lib/test_modules.c | 1 + + arch/s390/lib/test_unwind.c | 3 +- + arch/s390/lib/uaccess.c | 4 +- + arch/s390/mm/cmm.c | 1 + + arch/s390/mm/dump_pagetables.c | 2 +- + arch/s390/mm/fault.c | 30 ++--- + arch/s390/mm/gmap.c | 16 +-- + arch/s390/mm/hugetlbpage.c | 8 +- + arch/s390/mm/init.c | 3 +- + arch/s390/mm/pageattr.c | 2 +- + arch/s390/mm/pgalloc.c | 4 +- + arch/s390/pci/pci.c | 2 +- + drivers/s390/block/dcssblk.c | 1 + + drivers/s390/char/con3270.c | 1 + + drivers/s390/char/fs3270.c | 1 + + drivers/s390/char/raw3270.c | 1 + + drivers/s390/char/sclp_cmd.c | 7 +- + drivers/s390/char/sclp_early.c | 4 +- + drivers/s390/char/sclp_early_core.c | 12 +- + drivers/s390/char/sclp_sd.c | 26 ++++- + drivers/s390/cio/qdio_main.c | 2 +- + drivers/s390/cio/qdio_thinint.c | 2 +- + drivers/s390/cio/trace.h | 2 +- + 73 files changed, 832 insertions(+), 513 deletions(-) + create mode 100644 arch/s390/include/asm/arch_hweight.h +Merging sh/for-next (1613e604df0c Linux 6.10-rc1) +$ 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 (1c9e709cde80 sparc/leon: Remove on-stack cpumask var) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (919e3ece7f5a um: virtio_uml: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (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 bcachefs/for-next (d6d793ae5589 bcachefs: Simplify btree key cache fill path) +$ git merge -m Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git bcachefs/for-next +Auto-merging MAINTAINERS +Auto-merging fs/bcachefs/alloc_background.c +Auto-merging fs/bcachefs/alloc_background.h +Auto-merging fs/bcachefs/alloc_foreground.c +Auto-merging fs/bcachefs/bcachefs.h +Auto-merging fs/bcachefs/snapshot.c +Auto-merging fs/bcachefs/super.c +CONFLICT (content): Merge conflict in fs/bcachefs/super.c +Resolved 'fs/bcachefs/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 574941385bb1] Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 - + fs/bcachefs/Makefile | 3 +- + fs/bcachefs/alloc_background.c | 192 +++++--- + fs/bcachefs/alloc_background.h | 41 +- + fs/bcachefs/alloc_background_format.h | 2 + + fs/bcachefs/alloc_foreground.c | 16 +- + fs/bcachefs/backpointers.c | 14 +- + fs/bcachefs/bcachefs.h | 28 +- + fs/bcachefs/bcachefs_format.h | 70 +-- + fs/bcachefs/bcachefs_ioctl.h | 36 +- + fs/bcachefs/bkey_methods.c | 1 + + fs/bcachefs/btree_cache.c | 16 +- + fs/bcachefs/btree_cache.h | 2 + + fs/bcachefs/btree_gc.c | 284 ++++-------- + fs/bcachefs/btree_gc.h | 23 +- + fs/bcachefs/btree_gc_types.h | 13 +- + fs/bcachefs/btree_io.c | 35 +- + fs/bcachefs/btree_io.h | 6 +- + fs/bcachefs/btree_iter.c | 65 +-- + fs/bcachefs/btree_iter.h | 15 +- + fs/bcachefs/btree_journal_iter.c | 23 +- + fs/bcachefs/btree_journal_iter.h | 17 + + fs/bcachefs/btree_key_cache.c | 342 ++++++-------- + fs/bcachefs/btree_locking.c | 1 + + fs/bcachefs/btree_locking.h | 1 + + fs/bcachefs/btree_trans_commit.c | 171 ++++--- + fs/bcachefs/btree_types.h | 16 +- + fs/bcachefs/btree_update.c | 6 +- + fs/bcachefs/btree_update.h | 36 +- + fs/bcachefs/btree_update_interior.c | 20 +- + fs/bcachefs/btree_write_buffer.c | 138 +++++- + fs/bcachefs/btree_write_buffer.h | 49 +- + fs/bcachefs/btree_write_buffer_types.h | 2 + + fs/bcachefs/buckets.c | 764 +++++++------------------------- + fs/bcachefs/buckets.h | 71 +-- + fs/bcachefs/buckets_types.h | 17 +- + fs/bcachefs/chardev.c | 130 +++--- + fs/bcachefs/dirent.c | 8 + + fs/bcachefs/disk_accounting.c | 788 +++++++++++++++++++++++++++++++++ + fs/bcachefs/disk_accounting.h | 219 +++++++++ + fs/bcachefs/disk_accounting_format.h | 162 +++++++ + fs/bcachefs/disk_accounting_types.h | 19 + + fs/bcachefs/disk_groups.c | 2 +- + fs/bcachefs/ec.c | 117 +++-- + fs/bcachefs/errcode.h | 3 +- + fs/bcachefs/error.c | 56 ++- + fs/bcachefs/error.h | 22 +- + fs/bcachefs/eytzinger.h | 11 + + fs/bcachefs/fs-common.h | 2 + + fs/bcachefs/fs-io-buffered.c | 39 +- + fs/bcachefs/fs-io-direct.c | 4 +- + fs/bcachefs/fs-io-pagecache.c | 37 +- + fs/bcachefs/fs-io-pagecache.h | 7 +- + fs/bcachefs/fs-io.c | 15 +- + fs/bcachefs/fs-ioctl.c | 80 +++- + fs/bcachefs/fs.c | 195 +++++--- + fs/bcachefs/fsck.c | 280 ++++++------ + fs/bcachefs/inode.c | 60 ++- + fs/bcachefs/io_write.c | 7 +- + fs/bcachefs/journal.c | 17 +- + fs/bcachefs/journal.h | 8 +- + fs/bcachefs/journal_io.c | 27 +- + fs/bcachefs/lru.c | 6 +- + fs/bcachefs/lru.h | 12 - + fs/bcachefs/lru_format.h | 25 ++ + fs/bcachefs/move.c | 2 +- + fs/bcachefs/opts.c | 120 +++-- + fs/bcachefs/opts.h | 14 +- + fs/bcachefs/printbuf.c | 14 + + fs/bcachefs/printbuf.h | 1 + + fs/bcachefs/recovery.c | 134 ++++-- + fs/bcachefs/recovery_passes.c | 5 + + fs/bcachefs/recovery_passes_types.h | 1 + + fs/bcachefs/reflink.c | 2 +- + fs/bcachefs/replicas.c | 255 ++--------- + fs/bcachefs/replicas.h | 16 +- + fs/bcachefs/replicas_types.h | 16 - + fs/bcachefs/sb-clean.c | 62 --- + fs/bcachefs/sb-downgrade.c | 111 ++++- + fs/bcachefs/sb-downgrade.h | 1 + + fs/bcachefs/sb-errors_format.h | 4 +- + fs/bcachefs/snapshot.c | 24 +- + fs/bcachefs/subvolume.c | 20 +- + fs/bcachefs/super.c | 90 ++-- + fs/bcachefs/sysfs.c | 110 ++--- + fs/bcachefs/tests.c | 14 +- + fs/bcachefs/thread_with_file.c | 87 ++-- + fs/bcachefs/thread_with_file.h | 4 +- + fs/bcachefs/thread_with_file_types.h | 5 +- + fs/bcachefs/trace.h | 50 +++ + fs/bcachefs/two_state_shared_lock.h | 11 +- + fs/bcachefs/util.h | 21 +- + 92 files changed, 3588 insertions(+), 2501 deletions(-) + create mode 100644 fs/bcachefs/disk_accounting.c + create mode 100644 fs/bcachefs/disk_accounting.h + create mode 100644 fs/bcachefs/disk_accounting_format.h + create mode 100644 fs/bcachefs/disk_accounting_types.h + create mode 100644 fs/bcachefs/lru_format.h +Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +Merging fscrypt/for-next (7f016edaa0f3 fscrypt: try to avoid refing parent dentry in fscrypt_file_open) +$ 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 (80d54c4200e1 Merge branch 'for-next-next-v6.10-20240624' into for-next-20240624) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/block-group.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/btrfs/free-space-cache.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/qgroup.c +CONFLICT (content): Merge conflict in fs/btrfs/qgroup.c +Auto-merging fs/btrfs/scrub.c +Auto-merging fs/btrfs/space-info.c +Auto-merging fs/btrfs/tree-log.c +CONFLICT (content): Merge conflict in fs/btrfs/tree-log.c +Resolved 'fs/btrfs/qgroup.c' using previous resolution. +Resolved 'fs/btrfs/tree-log.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next b19a82b401e0] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/Kconfig | 1 + + fs/btrfs/Makefile | 2 +- + fs/btrfs/accessors.h | 12 +- + fs/btrfs/block-group.c | 7 + + fs/btrfs/btrfs_inode.h | 145 +++-- + fs/btrfs/compression.c | 15 +- + fs/btrfs/compression.h | 8 + + fs/btrfs/ctree.c | 104 ++-- + fs/btrfs/ctree.h | 8 +- + fs/btrfs/defrag.c | 16 +- + fs/btrfs/delalloc-space.c | 2 +- + fs/btrfs/delalloc-space.h | 2 +- + fs/btrfs/delayed-inode.c | 35 +- + fs/btrfs/delayed-inode.h | 6 +- + fs/btrfs/delayed-ref.c | 51 +- + fs/btrfs/delayed-ref.h | 8 +- + fs/btrfs/dev-replace.c | 4 +- + fs/btrfs/dir-item.c | 8 +- + fs/btrfs/dir-item.h | 6 +- + fs/btrfs/disk-io.c | 88 ++-- + fs/btrfs/disk-io.h | 18 +- + fs/btrfs/export.c | 6 +- + fs/btrfs/extent-io-tree.c | 4 + + fs/btrfs/extent-tree.c | 697 ++++++++++++++---------- + fs/btrfs/extent-tree.h | 8 +- + fs/btrfs/extent_io.c | 1047 +++++-------------------------------- + fs/btrfs/extent_io.h | 13 +- + fs/btrfs/extent_map.c | 241 ++++++--- + fs/btrfs/extent_map.h | 56 +- + fs/btrfs/fiemap.c | 930 ++++++++++++++++++++++++++++++++ + fs/btrfs/fiemap.h | 11 + + fs/btrfs/file-item.c | 36 +- + fs/btrfs/file.c | 70 ++- + fs/btrfs/file.h | 2 +- + fs/btrfs/free-space-cache.c | 7 +- + fs/btrfs/free-space-tree.c | 10 +- + fs/btrfs/fs.h | 11 +- + fs/btrfs/inode-item.c | 4 +- + fs/btrfs/inode.c | 743 ++++++++++++-------------- + fs/btrfs/ioctl.c | 78 ++- + fs/btrfs/ioctl.h | 2 +- + fs/btrfs/locking.h | 1 - + fs/btrfs/lru_cache.h | 1 - + fs/btrfs/misc.h | 4 +- + fs/btrfs/ordered-data.c | 124 +++-- + fs/btrfs/ordered-data.h | 25 +- + fs/btrfs/print-tree.c | 2 +- + fs/btrfs/props.c | 6 +- + fs/btrfs/props.h | 2 +- + fs/btrfs/qgroup.c | 222 +++++--- + fs/btrfs/qgroup.h | 25 +- + fs/btrfs/raid56.c | 112 +++- + fs/btrfs/reflink.c | 8 +- + fs/btrfs/relocation.c | 147 +++--- + fs/btrfs/scrub.c | 153 ++---- + fs/btrfs/send.c | 47 +- + fs/btrfs/send.h | 2 +- + fs/btrfs/space-info.c | 13 +- + fs/btrfs/subpage.c | 158 +++++- + fs/btrfs/subpage.h | 9 +- + fs/btrfs/super.c | 20 +- + fs/btrfs/super.h | 2 +- + fs/btrfs/tests/btrfs-tests.c | 5 +- + fs/btrfs/tests/extent-map-tests.c | 120 +++-- + fs/btrfs/tests/inode-tests.c | 176 +++---- + fs/btrfs/transaction.c | 21 +- + fs/btrfs/transaction.h | 7 +- + fs/btrfs/tree-log.c | 74 ++- + fs/btrfs/tree-log.h | 6 +- + fs/btrfs/ulist.c | 21 +- + fs/btrfs/ulist.h | 2 + + fs/btrfs/uuid-tree.c | 10 +- + fs/btrfs/uuid-tree.h | 4 +- + fs/btrfs/volumes.c | 64 ++- + fs/btrfs/volumes.h | 2 +- + fs/btrfs/xattr.c | 2 +- + fs/btrfs/xattr.h | 2 +- + fs/btrfs/zlib.c | 20 +- + fs/btrfs/zoned.c | 29 +- + fs/btrfs/zoned.h | 11 +- + fs/btrfs/zstd.c | 19 +- + include/trace/events/btrfs.h | 19 +- + include/uapi/linux/btrfs_tree.h | 8 + + 83 files changed, 3486 insertions(+), 2741 deletions(-) + create mode 100644 fs/btrfs/fiemap.c + create mode 100644 fs/btrfs/fiemap.h +Merging ceph/master (93a2221c9c1a doc: ceph: update userspace command to get CephFS metadata) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (a3c1d574e8df cifs: Fix read-performance regression by dropping readahead expansion) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/smb/client/file.c | 30 ------------------------------ + 1 file changed, 30 deletions(-) +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/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 (89b01913dc73 dlm: add rcu_barrier before destroy kmem cache) +$ 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. + drivers/md/md-cluster.c | 2 +- + fs/dlm/ast.c | 170 +++++++++----- + fs/dlm/ast.h | 11 +- + fs/dlm/config.c | 2 +- + fs/dlm/debug_fs.c | 10 +- + fs/dlm/dlm_internal.h | 60 ++--- + fs/dlm/lock.c | 568 +++++++++++++++++++++++------------------------ + fs/dlm/lock.h | 7 +- + fs/dlm/lockspace.c | 131 +++++------ + fs/dlm/lowcomms.c | 8 +- + fs/dlm/lowcomms.h | 2 +- + fs/dlm/member.c | 2 +- + fs/dlm/memory.c | 10 +- + fs/dlm/midcomms.c | 4 +- + fs/dlm/midcomms.h | 2 +- + fs/dlm/recover.c | 78 +++---- + fs/dlm/recover.h | 2 +- + fs/dlm/recoverd.c | 14 +- + fs/dlm/user.c | 42 ++-- + include/linux/dlm.h | 17 +- + include/uapi/linux/dlm.h | 2 + + 21 files changed, 583 insertions(+), 561 deletions(-) +Merging erofs/dev (f2661062f16b Linux 6.10-rc5) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (0daa52fbc7ac exfat: fix potential deadlock on __exfat_get_dentry_set) +$ 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/dir.c | 2 +- + fs/exfat/file.c | 22 +++++++++++++--------- + fs/exfat/super.c | 2 +- + 3 files changed, 15 insertions(+), 11 deletions(-) +Merging exportfs/exportfs-next (e8f897f4afef Linux 6.8) +$ 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 (85f22bb5d2c2 Merge UDF consistency fixes.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. + fs/ext2/balloc.c | 11 ++++-- + fs/isofs/inode.c | 1 + + fs/jbd2/journal.c | 1 + + fs/notify/fsnotify.c | 31 +++++++++++------ + fs/notify/fsnotify.h | 2 +- + fs/notify/mark.c | 32 +++++++++++++++-- + fs/udf/balloc.c | 74 ++++++++++++++++------------------------ + fs/udf/file.c | 2 ++ + fs/udf/inode.c | 13 +++---- + fs/udf/namei.c | 2 -- + fs/udf/super.c | 18 +++++++++- + include/linux/fsnotify_backend.h | 8 +++-- + 12 files changed, 119 insertions(+), 76 deletions(-) +Merging ext4/dev (8262fe9a902c ext4: make ext4_da_map_blocks() buffer_head unaware) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/jbd2/journal.c +Merge made by the 'ort' strategy. + fs/ext4/block_validity.c | 2 +- + fs/ext4/extents_status.c | 72 +++++++++---- + fs/ext4/extents_status.h | 5 +- + fs/ext4/inline.c | 6 +- + fs/ext4/inode.c | 258 ++++++++++++++++++++++++++++---------------- + fs/ext4/super.c | 6 +- + fs/jbd2/commit.c | 10 +- + fs/jbd2/journal.c | 54 ++++------ + fs/jbd2/recovery.c | 3 +- + include/trace/events/ext4.h | 26 +++-- + 10 files changed, 273 insertions(+), 169 deletions(-) +Merging f2fs/dev (8cb1f4080dd9 f2fs: assign CURSEG_ALL_DATA_ATGC if blkaddr is valid) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Merge made by the 'ort' strategy. + fs/f2fs/checkpoint.c | 1 + + fs/f2fs/compress.c | 2 +- + fs/f2fs/data.c | 17 ++++++++----- + fs/f2fs/extent_cache.c | 50 +++++++++++++++---------------------- + fs/f2fs/f2fs.h | 8 +++--- + fs/f2fs/file.c | 68 +++++++++++++++++++++++++++++++++++++++++++------- + fs/f2fs/gc.c | 11 +++++++- + fs/f2fs/inline.c | 26 ++++++++++++++++--- + fs/f2fs/inode.c | 23 +++++++---------- + fs/f2fs/segment.c | 34 +++++++++++++++++++++---- + fs/f2fs/super.c | 1 + + fs/f2fs/sysfs.c | 12 ++++----- + 12 files changed, 175 insertions(+), 78 deletions(-) +Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning) +$ 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 (529395d2ae64 virtio-fs: add multi-queue support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Already up to date. +Merging gfs2/for-next (5a1906a476bc gfs2: Revert "check for no eligible quota changes") +$ 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. + Documentation/filesystems/gfs2-glocks.rst | 55 ++--- + fs/gfs2/glock.c | 215 +++++++---------- + fs/gfs2/glock.h | 1 - + fs/gfs2/glops.c | 42 +--- + fs/gfs2/incore.h | 12 +- + fs/gfs2/lock_dlm.c | 28 ++- + fs/gfs2/ops_fstype.c | 13 +- + fs/gfs2/quota.c | 388 +++++++++++++++--------------- + fs/gfs2/super.c | 1 - + fs/gfs2/trace_gfs2.h | 6 +- + fs/gfs2/util.c | 12 +- + 11 files changed, 374 insertions(+), 399 deletions(-) +Merging jfs/jfs-next (d0fa70aca54c jfs: don't walk off the end of ealist) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Auto-merging fs/jfs/xattr.c +Auto-merging include/linux/pagemap.h +Merge made by the 'ort' strategy. + fs/jfs/jfs_dmap.c | 2 + + fs/jfs/jfs_dtree.c | 2 + + fs/jfs/jfs_imap.c | 5 +- + fs/jfs/jfs_logmgr.c | 2 +- + fs/jfs/jfs_metapage.c | 316 ++++++++++++++++++++++++------------------------ + fs/jfs/jfs_metapage.h | 16 +-- + fs/jfs/xattr.c | 23 +++- + include/linux/pagemap.h | 6 - + 8 files changed, 193 insertions(+), 179 deletions(-) +Merging ksmbd/ksmbd-for-next (6ba59ff42279 Linux 6.10-rc4) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (22a40d14b572 Linux 6.10-rc6) +$ 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 (e53a863bab58 nfs/blocklayout: SCSI layout trace points for reservation key reg/unreg) +$ 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/blocklayout/blocklayout.c | 25 ++- + fs/nfs/blocklayout/blocklayout.h | 9 +- + fs/nfs/blocklayout/dev.c | 116 +++++++++---- + fs/nfs/callback.h | 5 +- + fs/nfs/callback_proc.c | 19 ++- + fs/nfs/callback_xdr.c | 39 ++++- + fs/nfs/client.c | 3 + + fs/nfs/delegation.c | 67 +++++--- + fs/nfs/delegation.h | 45 ++++- + fs/nfs/dir.c | 3 +- + fs/nfs/file.c | 14 +- + fs/nfs/filelayout/filelayout.c | 1 - + fs/nfs/flexfilelayout/flexfilelayout.c | 2 +- + fs/nfs/fscache.c | 2 +- + fs/nfs/inode.c | 88 +++++++++- + fs/nfs/internal.h | 8 +- + fs/nfs/mount_clnt.c | 5 - + fs/nfs/nfs2super.c | 1 + + fs/nfs/nfs3proc.c | 10 +- + fs/nfs/nfs3super.c | 1 + + fs/nfs/nfs4_fs.h | 3 +- + fs/nfs/nfs4proc.c | 299 ++++++++++++++++++++++++--------- + fs/nfs/nfs4state.c | 4 +- + fs/nfs/nfs4super.c | 1 + + fs/nfs/nfs4trace.c | 7 + + fs/nfs/nfs4trace.h | 88 ++++++++++ + fs/nfs/nfs4xdr.c | 138 +++++++++++---- + fs/nfs/pagelist.c | 2 +- + fs/nfs/pnfs.c | 223 ++++++++++++++++++------ + fs/nfs/pnfs.h | 52 +++--- + fs/nfs/pnfs_nfs.c | 47 ------ + fs/nfs/proc.c | 10 +- + fs/nfs/read.c | 5 +- + fs/nfs/unlink.c | 2 + + fs/nfs/write.c | 155 +++++------------ + fs/nfs_common/grace.c | 1 + + fs/nfs_common/nfsacl.c | 1 + + include/linux/nfs4.h | 11 ++ + include/linux/nfs_fs_sb.h | 4 + + include/linux/nfs_page.h | 4 +- + include/linux/nfs_xdr.h | 47 +++++- + include/linux/sunrpc/rdma_rn.h | 27 +++ + include/trace/events/rpcrdma.h | 57 +++++++ + include/uapi/linux/nfs4.h | 4 + + mm/filemap.c | 42 +++-- + net/sunrpc/clnt.c | 3 +- + net/sunrpc/xprtrdma/Makefile | 2 +- + net/sunrpc/xprtrdma/frwr_ops.c | 9 +- + net/sunrpc/xprtrdma/ib_client.c | 181 ++++++++++++++++++++ + net/sunrpc/xprtrdma/module.c | 18 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 3 +- + net/sunrpc/xprtrdma/verbs.c | 100 ++++++----- + net/sunrpc/xprtrdma/xprt_rdma.h | 5 +- + 53 files changed, 1473 insertions(+), 545 deletions(-) + create mode 100644 include/linux/sunrpc/rdma_rn.h + create mode 100644 net/sunrpc/xprtrdma/ib_client.c +Merging nfsd/nfsd-next (b3984e398f08 MAINTAINERS: Add a bugzilla link for NFSD) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/netlink/specs/nfsd.yaml | 27 ++++++++ + MAINTAINERS | 2 +- + fs/lockd/Makefile | 9 ++- + fs/nfsd/Kconfig | 2 +- + fs/nfsd/netlink.c | 17 +++++ + fs/nfsd/netlink.h | 2 + + fs/nfsd/nfs2acl.c | 2 - + fs/nfsd/nfs3acl.c | 2 - + fs/nfsd/nfs4proc.c | 5 +- + fs/nfsd/nfs4recover.c | 4 +- + fs/nfsd/nfs4xdr.c | 12 ++-- + fs/nfsd/nfsctl.c | 99 +++++++++++++++++++++++---- + fs/nfsd/nfsd.h | 3 +- + fs/nfsd/nfssvc.c | 66 ++++++++++++------ + include/linux/sunrpc/svc.h | 3 + + include/uapi/linux/nfsd_netlink.h | 10 +++ + net/sunrpc/svc.c | 111 ++++++++++++++++++++----------- + net/sunrpc/svc_xprt.c | 1 + + net/sunrpc/xprtrdma/svc_rdma_transport.c | 83 +++++++++++++++-------- + 19 files changed, 335 insertions(+), 125 deletions(-) +Merging ntfs3/master (bde63e8eae5d fs/ntfs3: Fix formatting, change comments, renaming) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 130 ++++++++++++++++++++++++++++------------------------- + fs/ntfs3/bitmap.c | 2 +- + fs/ntfs3/dir.c | 57 ++++++++++++++--------- + fs/ntfs3/file.c | 124 ++++++++++++++++++++++++++++++++++++++------------ + fs/ntfs3/frecord.c | 110 ++++++++++++++++++++++++++++++++++++--------- + fs/ntfs3/fslog.c | 77 +++++++++++++++++++++---------- + fs/ntfs3/fsntfs.c | 11 ++--- + fs/ntfs3/index.c | 4 +- + fs/ntfs3/inode.c | 119 +++++++++++++++++++++++++----------------------- + fs/ntfs3/namei.c | 6 +-- + fs/ntfs3/ntfs.h | 15 +++---- + fs/ntfs3/ntfs_fs.h | 36 +++++++-------- + fs/ntfs3/super.c | 71 +++++++++++------------------ + fs/ntfs3/xattr.c | 25 ++++++----- + 14 files changed, 479 insertions(+), 308 deletions(-) +Merging orangefs/for-next (53e4efa470d5 orangefs: fix out-of-bounds fsid access) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (004b8d1491b4 ovl: fix encoding fid for lower only root) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (af9a8730ddb6 jffs2: Fix potential illegal address access in jffs2_free_inode) +$ 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 (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (3ba3ab1f6719 xfs: enable FITRIM on the realtime device) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_alloc.c | 28 +--- + fs/xfs/libxfs/xfs_alloc.h | 6 +- + fs/xfs/libxfs/xfs_dir2_data.c | 31 ++++- + fs/xfs/libxfs/xfs_dir2_priv.h | 7 + + fs/xfs/libxfs/xfs_trans_resv.c | 1 - + fs/xfs/scrub/quota_repair.c | 1 - + fs/xfs/xfs_bmap_util.c | 22 +-- + fs/xfs/xfs_discard.c | 303 +++++++++++++++++++++++++++++++++++++---- + fs/xfs/xfs_extfree_item.c | 4 +- + fs/xfs/xfs_file.c | 141 ++++++++++--------- + fs/xfs/xfs_handle.c | 1 - + fs/xfs/xfs_iomap.c | 71 +++++----- + fs/xfs/xfs_log_recover.c | 5 +- + fs/xfs/xfs_qm_bhv.c | 1 - + fs/xfs/xfs_trace.c | 1 - + fs/xfs/xfs_trace.h | 29 ++++ + 16 files changed, 476 insertions(+), 176 deletions(-) +Merging zonefs/for-next (df2f9708ff1f zonefs: enable support for large folios) +$ 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/super.c | 1 + + 1 file changed, 1 insertion(+) +Merging iomap/iomap-for-next (3ac974796e5d iomap: fix short copy in iomap_write_iter()) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (ce85a1e04645 xfs: stabilize fs summary counters for online fsck) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (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 (6cbc40abcac6 Merge branch 'vfs.iomap' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm64/include/asm/unistd32.h +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging fs/bcachefs/fs.c +Auto-merging fs/btrfs/inode.c +CONFLICT (content): Merge conflict in fs/btrfs/inode.c +Auto-merging fs/dcache.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/nfs/read.c +Auto-merging fs/nfs/write.c +Auto-merging fs/open.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/xfs/xfs_icache.c +Auto-merging include/linux/syscalls.h +Auto-merging include/uapi/asm-generic/unistd.h +Auto-merging mm/shmem.c +Auto-merging tools/testing/selftests/filesystems/statmount/statmount_test.c +Resolved 'fs/btrfs/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 37baa0045f3b] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 38 ++ + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/iomap/design.rst | 441 +++++++++++++ + Documentation/filesystems/iomap/index.rst | 13 + + Documentation/filesystems/iomap/operations.rst | 713 +++++++++++++++++++++ + Documentation/filesystems/iomap/porting.rst | 120 ++++ + MAINTAINERS | 1 + + arch/alpha/kernel/syscalls/syscall.tbl | 4 + + arch/arm/tools/syscall.tbl | 4 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 8 + + arch/m68k/kernel/syscalls/syscall.tbl | 4 + + arch/microblaze/kernel/syscalls/syscall.tbl | 4 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 4 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 4 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 4 + + arch/parisc/kernel/syscalls/syscall.tbl | 4 + + arch/powerpc/kernel/syscalls/syscall.tbl | 4 + + arch/s390/kernel/syscalls/syscall.tbl | 4 + + arch/sh/kernel/syscalls/syscall.tbl | 4 + + arch/sparc/kernel/syscalls/syscall.tbl | 4 + + arch/x86/entry/syscalls/syscall_32.tbl | 4 + + arch/x86/entry/syscalls/syscall_64.tbl | 4 + + arch/xtensa/kernel/syscalls/syscall.tbl | 4 + + fs/attr.c | 2 - + fs/autofs/init.c | 1 + + fs/bcachefs/fs.c | 1 - + fs/befs/linuxvfs.c | 10 +- + fs/binfmt_elf.c | 2 - + fs/binfmt_elf_fdpic.c | 5 +- + fs/binfmt_misc.c | 8 +- + fs/binfmt_script.c | 1 + + fs/btrfs/inode.c | 2 +- + fs/buffer.c | 7 +- + fs/coda/symlink.c | 10 +- + fs/cramfs/inode.c | 26 +- + fs/dcache.c | 30 +- + fs/efs/inode.c | 1 + + fs/efs/symlink.c | 14 +- + fs/exec.c | 14 +- + fs/exportfs/expfs.c | 9 +- + fs/ext4/crypto.c | 10 +- + fs/ext4/ext4.h | 35 +- + fs/ext4/namei.c | 120 ++-- + fs/ext4/super.c | 4 +- + fs/f2fs/acl.c | 3 +- + fs/f2fs/dir.c | 105 +-- + fs/f2fs/f2fs.h | 16 +- + fs/f2fs/file.c | 6 +- + fs/f2fs/namei.c | 10 +- + fs/f2fs/recovery.c | 9 +- + fs/f2fs/super.c | 8 +- + fs/fat/fat_test.c | 1 + + fs/fat/inode.c | 1 + + fs/fhandle.c | 192 ++++-- + fs/fsopen.c | 7 +- + fs/fuse/acl.c | 4 +- + fs/hfs/inode.c | 3 + + fs/hfs/super.c | 1 + + fs/hfsplus/bfind.c | 15 +- + fs/hfsplus/extents.c | 9 +- + fs/hfsplus/hfsplus_fs.h | 21 + + fs/hfsplus/ioctl.c | 4 +- + fs/hostfs/hostfs_kern.c | 106 +-- + fs/hpfs/namei.c | 15 +- + fs/hpfs/super.c | 1 + + fs/inode.c | 109 +++- + fs/internal.h | 24 +- + fs/iomap/buffered-io.c | 83 ++- + fs/isofs/rock.c | 17 +- + fs/jffs2/file.c | 14 +- + fs/libfs.c | 74 +++ + fs/minix/inode.c | 1 + + fs/mount.h | 3 + + fs/mpage.c | 13 +- + fs/namei.c | 104 +-- + fs/namespace.c | 506 +++++++++++---- + fs/netfs/buffered_read.c | 14 +- + fs/netfs/buffered_write.c | 12 +- + fs/netfs/direct_read.c | 2 +- + fs/netfs/direct_write.c | 8 +- + fs/netfs/fscache_cache.c | 4 +- + fs/netfs/fscache_cookie.c | 28 +- + fs/netfs/fscache_io.c | 12 +- + fs/netfs/fscache_main.c | 2 +- + fs/netfs/fscache_volume.c | 4 +- + fs/netfs/internal.h | 33 +- + fs/netfs/io.c | 12 +- + fs/netfs/main.c | 4 - + fs/netfs/misc.c | 4 +- + fs/netfs/write_collect.c | 16 +- + fs/netfs/write_issue.c | 36 +- + fs/nfs/read.c | 2 - + fs/nfs/symlink.c | 10 +- + fs/nfs/write.c | 1 - + fs/nfsd/nfsfh.c | 2 +- + fs/nls/mac-celtic.c | 1 + + fs/nls/mac-centeuro.c | 1 + + fs/nls/mac-croatian.c | 1 + + fs/nls/mac-cyrillic.c | 1 + + fs/nls/mac-gaelic.c | 1 + + fs/nls/mac-greek.c | 1 + + fs/nls/mac-iceland.c | 1 + + fs/nls/mac-inuit.c | 1 + + fs/nls/mac-roman.c | 1 + + fs/nls/mac-romanian.c | 1 + + fs/nls/mac-turkish.c | 1 + + fs/nls/nls_ascii.c | 1 + + fs/nls/nls_base.c | 1 + + fs/nls/nls_cp1250.c | 1 + + fs/nls/nls_cp1251.c | 1 + + fs/nls/nls_cp1255.c | 1 + + fs/nls/nls_cp437.c | 1 + + fs/nls/nls_cp737.c | 1 + + fs/nls/nls_cp775.c | 1 + + fs/nls/nls_cp850.c | 1 + + fs/nls/nls_cp852.c | 1 + + fs/nls/nls_cp855.c | 1 + + fs/nls/nls_cp857.c | 1 + + fs/nls/nls_cp860.c | 1 + + fs/nls/nls_cp861.c | 1 + + fs/nls/nls_cp862.c | 1 + + fs/nls/nls_cp863.c | 1 + + fs/nls/nls_cp864.c | 1 + + fs/nls/nls_cp865.c | 1 + + fs/nls/nls_cp866.c | 1 + + fs/nls/nls_cp869.c | 1 + + fs/nls/nls_cp874.c | 1 + + fs/nls/nls_cp932.c | 1 + + fs/nls/nls_cp936.c | 1 + + fs/nls/nls_cp949.c | 1 + + fs/nls/nls_cp950.c | 1 + + fs/nls/nls_euc-jp.c | 1 + + fs/nls/nls_iso8859-1.c | 1 + + fs/nls/nls_iso8859-13.c | 1 + + fs/nls/nls_iso8859-14.c | 1 + + fs/nls/nls_iso8859-15.c | 1 + + fs/nls/nls_iso8859-2.c | 1 + + fs/nls/nls_iso8859-3.c | 1 + + fs/nls/nls_iso8859-4.c | 1 + + fs/nls/nls_iso8859-5.c | 1 + + fs/nls/nls_iso8859-6.c | 1 + + fs/nls/nls_iso8859-7.c | 1 + + fs/nls/nls_iso8859-9.c | 1 + + fs/nls/nls_koi8-r.c | 1 + + fs/nls/nls_koi8-ru.c | 1 + + fs/nls/nls_koi8-u.c | 1 + + fs/nls/nls_ucs2_utils.c | 1 + + fs/nls/nls_utf8.c | 1 + + fs/nsfs.c | 126 +++- + fs/open.c | 17 +- + fs/openpromfs/inode.c | 1 + + fs/orangefs/inode.c | 13 +- + fs/orangefs/orangefs-bufmap.c | 4 +- + fs/pidfs.c | 90 +++ + fs/proc/base.c | 203 +++++- + fs/proc/generic.c | 6 +- + fs/proc/internal.h | 2 +- + fs/proc/task_mmu.c | 6 +- + fs/proc/task_nommu.c | 2 +- + fs/proc_namespace.c | 6 +- + fs/qnx4/inode.c | 1 + + fs/qnx6/inode.c | 1 + + fs/quota/dquot.c | 8 +- + fs/readdir.c | 4 +- + fs/reiserfs/inode.c | 1 - + fs/romfs/super.c | 22 +- + fs/stat.c | 170 +++-- + fs/sysv/super.c | 1 + + fs/ufs/dir.c | 1 - + fs/vboxsf/file.c | 18 +- + fs/xattr.c | 148 ++++- + fs/xfs/xfs_icache.c | 5 +- + fs/xfs/xfs_iops.c | 15 +- + include/asm-generic/audit_change_attr.h | 6 + + include/linux/cleanup.h | 13 +- + include/linux/dcache.h | 11 +- + include/linux/exportfs.h | 2 + + include/linux/file.h | 20 + + include/linux/fs.h | 96 ++- + include/linux/namei.h | 9 +- + include/linux/nsproxy.h | 13 + + include/linux/path.h | 9 + + include/linux/syscalls.h | 13 + + include/linux/xattr.h | 4 + + include/uapi/asm-generic/unistd.h | 11 +- + include/uapi/linux/mount.h | 10 +- + include/uapi/linux/nsfs.h | 10 + + include/uapi/linux/pidfd.h | 14 + + include/uapi/linux/xattr.h | 7 + + io_uring/statx.c | 3 +- + io_uring/xattr.c | 6 +- + kernel/fork.c | 26 +- + lib/lockref.c | 14 +- + mm/khugepaged.c | 10 +- + mm/shmem.c | 9 +- + security/Kconfig | 121 ++++ + .../selftests/filesystems/statmount/Makefile | 2 +- + .../selftests/filesystems/statmount/statmount.h | 46 ++ + .../filesystems/statmount/statmount_test.c | 144 +++-- + .../filesystems/statmount/statmount_test_ns.c | 360 +++++++++++ + 201 files changed, 4213 insertions(+), 1100 deletions(-) + create mode 100644 Documentation/filesystems/iomap/design.rst + create mode 100644 Documentation/filesystems/iomap/index.rst + create mode 100644 Documentation/filesystems/iomap/operations.rst + create mode 100644 Documentation/filesystems/iomap/porting.rst + create mode 100644 tools/testing/selftests/filesystems/statmount/statmount.h + create mode 100644 tools/testing/selftests/filesystems/statmount/statmount_test_ns.c +Merging vfs/for-next (a38297e3fb01 Linux 6.9) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merging fs-next (37baa0045f3b Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging fs/bcachefs/ec.c +Auto-merging fs/bcachefs/util.h +Auto-merging fs/btrfs/relocation.c +Auto-merging fs/btrfs/send.c +Auto-merging fs/netfs/buffered_read.c +Auto-merging fs/netfs/buffered_write.c +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/internal.h +CONFLICT (content): Merge conflict in fs/nfs/internal.h +Auto-merging fs/nfs/write.c +Auto-merging fs/proc/internal.h +Auto-merging fs/proc/task_mmu.c +Auto-merging include/linux/pagemap.h +Auto-merging kernel/fork.c +Auto-merging mm/filemap.c +Auto-merging mm/khugepaged.c +Auto-merging mm/shmem.c +Resolved 'fs/nfs/internal.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f29693e65afb] Merge branch 'fs-next' of linux-next +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 38 + + Documentation/filesystems/gfs2-glocks.rst | 55 +- + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/iomap/design.rst | 441 +++++++++ + Documentation/filesystems/iomap/index.rst | 13 + + Documentation/filesystems/iomap/operations.rst | 713 +++++++++++++ + Documentation/filesystems/iomap/porting.rst | 120 +++ + Documentation/netlink/specs/nfsd.yaml | 27 + + MAINTAINERS | 4 +- + arch/alpha/kernel/syscalls/syscall.tbl | 4 + + arch/arm/tools/syscall.tbl | 4 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 8 + + arch/m68k/kernel/syscalls/syscall.tbl | 4 + + arch/microblaze/kernel/syscalls/syscall.tbl | 4 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 4 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 4 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 4 + + arch/parisc/kernel/syscalls/syscall.tbl | 4 + + arch/powerpc/kernel/syscalls/syscall.tbl | 4 + + arch/s390/kernel/syscalls/syscall.tbl | 4 + + arch/sh/kernel/syscalls/syscall.tbl | 4 + + arch/sparc/kernel/syscalls/syscall.tbl | 4 + + arch/x86/entry/syscalls/syscall_32.tbl | 4 + + arch/x86/entry/syscalls/syscall_64.tbl | 4 + + arch/xtensa/kernel/syscalls/syscall.tbl | 4 + + drivers/md/md-cluster.c | 2 +- + fs/9p/fid.c | 5 +- + fs/9p/vfs_inode.c | 1 + + fs/attr.c | 2 - + fs/autofs/init.c | 1 + + fs/bcachefs/Makefile | 3 +- + fs/bcachefs/alloc_background.c | 192 ++-- + fs/bcachefs/alloc_background.h | 41 +- + fs/bcachefs/alloc_background_format.h | 2 + + fs/bcachefs/alloc_foreground.c | 16 +- + fs/bcachefs/backpointers.c | 14 +- + fs/bcachefs/bcachefs.h | 28 +- + fs/bcachefs/bcachefs_format.h | 70 +- + fs/bcachefs/bcachefs_ioctl.h | 36 +- + fs/bcachefs/bkey_methods.c | 1 + + fs/bcachefs/btree_cache.c | 16 +- + fs/bcachefs/btree_cache.h | 2 + + fs/bcachefs/btree_gc.c | 284 ++---- + fs/bcachefs/btree_gc.h | 23 +- + fs/bcachefs/btree_gc_types.h | 13 +- + fs/bcachefs/btree_io.c | 35 +- + fs/bcachefs/btree_io.h | 6 +- + fs/bcachefs/btree_iter.c | 65 +- + fs/bcachefs/btree_iter.h | 15 +- + fs/bcachefs/btree_journal_iter.c | 23 +- + fs/bcachefs/btree_journal_iter.h | 17 + + fs/bcachefs/btree_key_cache.c | 342 +++---- + fs/bcachefs/btree_locking.c | 1 + + fs/bcachefs/btree_locking.h | 1 + + fs/bcachefs/btree_trans_commit.c | 171 ++-- + fs/bcachefs/btree_types.h | 16 +- + fs/bcachefs/btree_update.c | 6 +- + fs/bcachefs/btree_update.h | 36 +- + fs/bcachefs/btree_update_interior.c | 20 +- + fs/bcachefs/btree_write_buffer.c | 138 ++- + fs/bcachefs/btree_write_buffer.h | 49 +- + fs/bcachefs/btree_write_buffer_types.h | 2 + + fs/bcachefs/buckets.c | 764 ++++---------- + fs/bcachefs/buckets.h | 71 +- + fs/bcachefs/buckets_types.h | 17 +- + fs/bcachefs/chardev.c | 130 +-- + fs/bcachefs/dirent.c | 8 + + fs/bcachefs/disk_accounting.c | 788 +++++++++++++++ + fs/bcachefs/disk_accounting.h | 219 ++++ + fs/bcachefs/disk_accounting_format.h | 162 +++ + fs/bcachefs/disk_accounting_types.h | 19 + + fs/bcachefs/disk_groups.c | 2 +- + fs/bcachefs/ec.c | 117 +-- + fs/bcachefs/errcode.h | 3 +- + fs/bcachefs/error.c | 56 +- + fs/bcachefs/error.h | 22 +- + fs/bcachefs/eytzinger.h | 11 + + fs/bcachefs/fs-common.h | 2 + + fs/bcachefs/fs-io-buffered.c | 39 +- + fs/bcachefs/fs-io-direct.c | 4 +- + fs/bcachefs/fs-io-pagecache.c | 37 +- + fs/bcachefs/fs-io-pagecache.h | 7 +- + fs/bcachefs/fs-io.c | 15 +- + fs/bcachefs/fs-ioctl.c | 80 +- + fs/bcachefs/fs.c | 196 ++-- + fs/bcachefs/fsck.c | 280 +++--- + fs/bcachefs/inode.c | 60 +- + fs/bcachefs/io_write.c | 7 +- + fs/bcachefs/journal.c | 17 +- + fs/bcachefs/journal.h | 8 +- + fs/bcachefs/journal_io.c | 27 +- + fs/bcachefs/lru.c | 6 +- + fs/bcachefs/lru.h | 12 - + fs/bcachefs/lru_format.h | 25 + + fs/bcachefs/move.c | 2 +- + fs/bcachefs/opts.c | 120 ++- + fs/bcachefs/opts.h | 14 +- + fs/bcachefs/printbuf.c | 14 + + fs/bcachefs/printbuf.h | 1 + + fs/bcachefs/recovery.c | 134 ++- + fs/bcachefs/recovery_passes.c | 5 + + fs/bcachefs/recovery_passes_types.h | 1 + + fs/bcachefs/reflink.c | 2 +- + fs/bcachefs/replicas.c | 255 +---- + fs/bcachefs/replicas.h | 16 +- + fs/bcachefs/replicas_types.h | 16 - + fs/bcachefs/sb-clean.c | 62 -- + fs/bcachefs/sb-downgrade.c | 111 ++- + fs/bcachefs/sb-downgrade.h | 1 + + fs/bcachefs/sb-errors_format.h | 4 +- + fs/bcachefs/snapshot.c | 24 +- + fs/bcachefs/subvolume.c | 20 +- + fs/bcachefs/super.c | 90 +- + fs/bcachefs/sysfs.c | 110 +- + fs/bcachefs/tests.c | 14 +- + fs/bcachefs/thread_with_file.c | 87 +- + fs/bcachefs/thread_with_file.h | 4 +- + fs/bcachefs/thread_with_file_types.h | 5 +- + fs/bcachefs/trace.h | 50 + + fs/bcachefs/two_state_shared_lock.h | 11 +- + fs/bcachefs/util.h | 21 +- + fs/befs/linuxvfs.c | 10 +- + fs/binfmt_elf.c | 2 - + fs/binfmt_elf_fdpic.c | 5 +- + fs/binfmt_misc.c | 8 +- + fs/binfmt_script.c | 1 + + fs/btrfs/Kconfig | 1 + + fs/btrfs/Makefile | 2 +- + fs/btrfs/accessors.h | 12 +- + fs/btrfs/block-group.c | 7 + + fs/btrfs/btrfs_inode.h | 145 ++- + fs/btrfs/compression.c | 15 +- + fs/btrfs/compression.h | 8 + + fs/btrfs/ctree.c | 104 +- + fs/btrfs/ctree.h | 8 +- + fs/btrfs/defrag.c | 16 +- + fs/btrfs/delalloc-space.c | 2 +- + fs/btrfs/delalloc-space.h | 2 +- + fs/btrfs/delayed-inode.c | 35 +- + fs/btrfs/delayed-inode.h | 6 +- + fs/btrfs/delayed-ref.c | 51 +- + fs/btrfs/delayed-ref.h | 8 +- + fs/btrfs/dev-replace.c | 4 +- + fs/btrfs/dir-item.c | 8 +- + fs/btrfs/dir-item.h | 6 +- + fs/btrfs/disk-io.c | 88 +- + fs/btrfs/disk-io.h | 18 +- + fs/btrfs/export.c | 6 +- + fs/btrfs/extent-io-tree.c | 4 + + fs/btrfs/extent-tree.c | 697 ++++++++----- + fs/btrfs/extent-tree.h | 8 +- + fs/btrfs/extent_io.c | 1047 +++----------------- + fs/btrfs/extent_io.h | 13 +- + fs/btrfs/extent_map.c | 241 +++-- + fs/btrfs/extent_map.h | 56 +- + fs/btrfs/fiemap.c | 930 +++++++++++++++++ + fs/btrfs/fiemap.h | 11 + + fs/btrfs/file-item.c | 36 +- + fs/btrfs/file.c | 70 +- + fs/btrfs/file.h | 2 +- + fs/btrfs/free-space-cache.c | 7 +- + fs/btrfs/free-space-tree.c | 10 +- + fs/btrfs/fs.h | 11 +- + fs/btrfs/inode-item.c | 4 +- + fs/btrfs/inode.c | 743 ++++++-------- + fs/btrfs/ioctl.c | 78 +- + fs/btrfs/ioctl.h | 2 +- + fs/btrfs/locking.h | 1 - + fs/btrfs/lru_cache.h | 1 - + fs/btrfs/misc.h | 4 +- + fs/btrfs/ordered-data.c | 124 ++- + fs/btrfs/ordered-data.h | 25 +- + fs/btrfs/print-tree.c | 2 +- + fs/btrfs/props.c | 6 +- + fs/btrfs/props.h | 2 +- + fs/btrfs/qgroup.c | 222 +++-- + fs/btrfs/qgroup.h | 25 +- + fs/btrfs/raid56.c | 112 ++- + fs/btrfs/reflink.c | 8 +- + fs/btrfs/relocation.c | 147 ++- + fs/btrfs/scrub.c | 153 +-- + fs/btrfs/send.c | 47 +- + fs/btrfs/send.h | 2 +- + fs/btrfs/space-info.c | 13 +- + fs/btrfs/subpage.c | 158 ++- + fs/btrfs/subpage.h | 9 +- + fs/btrfs/super.c | 20 +- + fs/btrfs/super.h | 2 +- + fs/btrfs/tests/btrfs-tests.c | 5 +- + fs/btrfs/tests/extent-map-tests.c | 120 ++- + fs/btrfs/tests/inode-tests.c | 176 ++-- + fs/btrfs/transaction.c | 21 +- + fs/btrfs/transaction.h | 7 +- + fs/btrfs/tree-log.c | 74 +- + fs/btrfs/tree-log.h | 6 +- + fs/btrfs/ulist.c | 21 +- + fs/btrfs/ulist.h | 2 + + fs/btrfs/uuid-tree.c | 10 +- + fs/btrfs/uuid-tree.h | 4 +- + fs/btrfs/volumes.c | 64 +- + fs/btrfs/volumes.h | 2 +- + fs/btrfs/xattr.c | 2 +- + fs/btrfs/xattr.h | 2 +- + fs/btrfs/zlib.c | 20 +- + fs/btrfs/zoned.c | 29 +- + fs/btrfs/zoned.h | 11 +- + fs/btrfs/zstd.c | 19 +- + fs/buffer.c | 7 +- + fs/coda/symlink.c | 10 +- + fs/configfs/configfs_internal.h | 4 +- + fs/configfs/dir.c | 42 +- + fs/configfs/inode.c | 24 - + fs/cramfs/inode.c | 26 +- + fs/dcache.c | 30 +- + fs/dlm/ast.c | 170 ++-- + fs/dlm/ast.h | 11 +- + fs/dlm/config.c | 2 +- + fs/dlm/debug_fs.c | 10 +- + fs/dlm/dlm_internal.h | 60 +- + fs/dlm/lock.c | 568 ++++++----- + fs/dlm/lock.h | 7 +- + fs/dlm/lockspace.c | 131 ++- + fs/dlm/lowcomms.c | 8 +- + fs/dlm/lowcomms.h | 2 +- + fs/dlm/member.c | 2 +- + fs/dlm/memory.c | 10 +- + fs/dlm/midcomms.c | 4 +- + fs/dlm/midcomms.h | 2 +- + fs/dlm/recover.c | 78 +- + fs/dlm/recover.h | 2 +- + fs/dlm/recoverd.c | 14 +- + fs/dlm/user.c | 42 +- + fs/efs/inode.c | 1 + + fs/efs/symlink.c | 14 +- + fs/exec.c | 14 +- + fs/exfat/dir.c | 2 +- + fs/exfat/file.c | 22 +- + fs/exfat/super.c | 2 +- + fs/exportfs/expfs.c | 9 +- + fs/ext2/balloc.c | 11 +- + fs/ext4/block_validity.c | 2 +- + fs/ext4/crypto.c | 10 +- + fs/ext4/ext4.h | 35 +- + fs/ext4/extents_status.c | 72 +- + fs/ext4/extents_status.h | 5 +- + fs/ext4/inline.c | 6 +- + fs/ext4/inode.c | 258 +++-- + fs/ext4/namei.c | 120 +-- + fs/ext4/super.c | 10 +- + fs/f2fs/acl.c | 3 +- + fs/f2fs/checkpoint.c | 1 + + fs/f2fs/compress.c | 2 +- + fs/f2fs/data.c | 17 +- + fs/f2fs/dir.c | 105 +- + fs/f2fs/extent_cache.c | 50 +- + fs/f2fs/f2fs.h | 24 +- + fs/f2fs/file.c | 74 +- + fs/f2fs/gc.c | 11 +- + fs/f2fs/inline.c | 26 +- + fs/f2fs/inode.c | 23 +- + fs/f2fs/namei.c | 10 +- + fs/f2fs/recovery.c | 9 +- + fs/f2fs/segment.c | 34 +- + fs/f2fs/super.c | 9 +- + fs/f2fs/sysfs.c | 12 +- + fs/fat/fat_test.c | 1 + + fs/fat/inode.c | 1 + + fs/fhandle.c | 192 +++- + fs/fsopen.c | 7 +- + fs/fuse/acl.c | 4 +- + fs/gfs2/glock.c | 215 ++-- + fs/gfs2/glock.h | 1 - + fs/gfs2/glops.c | 42 +- + fs/gfs2/incore.h | 12 +- + fs/gfs2/lock_dlm.c | 28 +- + fs/gfs2/ops_fstype.c | 13 +- + fs/gfs2/quota.c | 388 ++++---- + fs/gfs2/super.c | 1 - + fs/gfs2/trace_gfs2.h | 6 +- + fs/gfs2/util.c | 12 +- + fs/hfs/inode.c | 3 + + fs/hfs/super.c | 1 + + fs/hfsplus/bfind.c | 15 +- + fs/hfsplus/extents.c | 9 +- + fs/hfsplus/hfsplus_fs.h | 21 + + fs/hfsplus/ioctl.c | 4 +- + fs/hostfs/hostfs_kern.c | 106 +- + fs/hpfs/namei.c | 15 +- + fs/hpfs/super.c | 1 + + fs/inode.c | 109 +- + fs/internal.h | 24 +- + fs/iomap/buffered-io.c | 83 +- + fs/isofs/inode.c | 1 + + fs/isofs/rock.c | 17 +- + fs/jbd2/commit.c | 10 +- + fs/jbd2/journal.c | 55 +- + fs/jbd2/recovery.c | 3 +- + fs/jffs2/file.c | 14 +- + fs/jfs/jfs_dmap.c | 2 + + fs/jfs/jfs_dtree.c | 2 + + fs/jfs/jfs_imap.c | 5 +- + fs/jfs/jfs_logmgr.c | 2 +- + fs/jfs/jfs_metapage.c | 316 +++--- + fs/jfs/jfs_metapage.h | 16 +- + fs/jfs/xattr.c | 23 +- + fs/libfs.c | 74 ++ + fs/lockd/Makefile | 9 +- + fs/minix/inode.c | 1 + + fs/mount.h | 3 + + fs/mpage.c | 13 +- + fs/namei.c | 104 +- + fs/namespace.c | 506 +++++++--- + fs/netfs/buffered_read.c | 14 +- + fs/netfs/buffered_write.c | 12 +- + fs/netfs/direct_read.c | 2 +- + fs/netfs/direct_write.c | 8 +- + fs/netfs/fscache_cache.c | 4 +- + fs/netfs/fscache_cookie.c | 28 +- + fs/netfs/fscache_io.c | 12 +- + fs/netfs/fscache_main.c | 2 +- + fs/netfs/fscache_volume.c | 4 +- + fs/netfs/internal.h | 33 +- + fs/netfs/io.c | 12 +- + fs/netfs/main.c | 4 - + fs/netfs/misc.c | 4 +- + fs/netfs/write_collect.c | 16 +- + fs/netfs/write_issue.c | 36 +- + fs/nfs/blocklayout/blocklayout.c | 25 +- + fs/nfs/blocklayout/blocklayout.h | 9 +- + fs/nfs/blocklayout/dev.c | 116 ++- + fs/nfs/callback.h | 5 +- + fs/nfs/callback_proc.c | 19 +- + fs/nfs/callback_xdr.c | 39 +- + fs/nfs/client.c | 3 + + fs/nfs/delegation.c | 67 +- + fs/nfs/delegation.h | 45 +- + fs/nfs/dir.c | 3 +- + fs/nfs/file.c | 14 +- + fs/nfs/filelayout/filelayout.c | 1 - + fs/nfs/flexfilelayout/flexfilelayout.c | 2 +- + fs/nfs/fscache.c | 2 +- + fs/nfs/inode.c | 88 +- + fs/nfs/internal.h | 6 +- + fs/nfs/mount_clnt.c | 5 - + fs/nfs/nfs2super.c | 1 + + fs/nfs/nfs3proc.c | 10 +- + fs/nfs/nfs3super.c | 1 + + fs/nfs/nfs4_fs.h | 3 +- + fs/nfs/nfs4proc.c | 299 ++++-- + fs/nfs/nfs4state.c | 4 +- + fs/nfs/nfs4super.c | 1 + + fs/nfs/nfs4trace.c | 7 + + fs/nfs/nfs4trace.h | 88 ++ + fs/nfs/nfs4xdr.c | 138 ++- + fs/nfs/pagelist.c | 2 +- + fs/nfs/pnfs.c | 223 ++++- + fs/nfs/pnfs.h | 52 +- + fs/nfs/pnfs_nfs.c | 47 - + fs/nfs/proc.c | 10 +- + fs/nfs/read.c | 7 +- + fs/nfs/symlink.c | 10 +- + fs/nfs/unlink.c | 2 + + fs/nfs/write.c | 156 +-- + fs/nfs_common/grace.c | 1 + + fs/nfs_common/nfsacl.c | 1 + + fs/nfsd/Kconfig | 2 +- + fs/nfsd/netlink.c | 17 + + fs/nfsd/netlink.h | 2 + + fs/nfsd/nfs2acl.c | 2 - + fs/nfsd/nfs3acl.c | 2 - + fs/nfsd/nfs4proc.c | 5 +- + fs/nfsd/nfs4recover.c | 4 +- + fs/nfsd/nfs4xdr.c | 12 +- + fs/nfsd/nfsctl.c | 99 +- + fs/nfsd/nfsd.h | 3 +- + fs/nfsd/nfsfh.c | 2 +- + fs/nfsd/nfssvc.c | 66 +- + fs/nls/mac-celtic.c | 1 + + fs/nls/mac-centeuro.c | 1 + + fs/nls/mac-croatian.c | 1 + + fs/nls/mac-cyrillic.c | 1 + + fs/nls/mac-gaelic.c | 1 + + fs/nls/mac-greek.c | 1 + + fs/nls/mac-iceland.c | 1 + + fs/nls/mac-inuit.c | 1 + + fs/nls/mac-roman.c | 1 + + fs/nls/mac-romanian.c | 1 + + fs/nls/mac-turkish.c | 1 + + fs/nls/nls_ascii.c | 1 + + fs/nls/nls_base.c | 1 + + fs/nls/nls_cp1250.c | 1 + + fs/nls/nls_cp1251.c | 1 + + fs/nls/nls_cp1255.c | 1 + + fs/nls/nls_cp437.c | 1 + + fs/nls/nls_cp737.c | 1 + + fs/nls/nls_cp775.c | 1 + + fs/nls/nls_cp850.c | 1 + + fs/nls/nls_cp852.c | 1 + + fs/nls/nls_cp855.c | 1 + + fs/nls/nls_cp857.c | 1 + + fs/nls/nls_cp860.c | 1 + + fs/nls/nls_cp861.c | 1 + + fs/nls/nls_cp862.c | 1 + + fs/nls/nls_cp863.c | 1 + + fs/nls/nls_cp864.c | 1 + + fs/nls/nls_cp865.c | 1 + + fs/nls/nls_cp866.c | 1 + + fs/nls/nls_cp869.c | 1 + + fs/nls/nls_cp874.c | 1 + + fs/nls/nls_cp932.c | 1 + + fs/nls/nls_cp936.c | 1 + + fs/nls/nls_cp949.c | 1 + + fs/nls/nls_cp950.c | 1 + + fs/nls/nls_euc-jp.c | 1 + + fs/nls/nls_iso8859-1.c | 1 + + fs/nls/nls_iso8859-13.c | 1 + + fs/nls/nls_iso8859-14.c | 1 + + fs/nls/nls_iso8859-15.c | 1 + + fs/nls/nls_iso8859-2.c | 1 + + fs/nls/nls_iso8859-3.c | 1 + + fs/nls/nls_iso8859-4.c | 1 + + fs/nls/nls_iso8859-5.c | 1 + + fs/nls/nls_iso8859-6.c | 1 + + fs/nls/nls_iso8859-7.c | 1 + + fs/nls/nls_iso8859-9.c | 1 + + fs/nls/nls_koi8-r.c | 1 + + fs/nls/nls_koi8-ru.c | 1 + + fs/nls/nls_koi8-u.c | 1 + + fs/nls/nls_ucs2_utils.c | 1 + + fs/nls/nls_utf8.c | 1 + + fs/notify/fsnotify.c | 31 +- + fs/notify/fsnotify.h | 2 +- + fs/notify/mark.c | 32 +- + fs/nsfs.c | 126 ++- + fs/ntfs3/attrib.c | 130 +-- + fs/ntfs3/bitmap.c | 2 +- + fs/ntfs3/dir.c | 57 +- + fs/ntfs3/file.c | 124 ++- + fs/ntfs3/frecord.c | 110 +- + fs/ntfs3/fslog.c | 77 +- + fs/ntfs3/fsntfs.c | 11 +- + fs/ntfs3/index.c | 4 +- + fs/ntfs3/inode.c | 119 +-- + fs/ntfs3/namei.c | 6 +- + fs/ntfs3/ntfs.h | 15 +- + fs/ntfs3/ntfs_fs.h | 36 +- + fs/ntfs3/super.c | 71 +- + fs/ntfs3/xattr.c | 25 +- + fs/open.c | 17 +- + fs/openpromfs/inode.c | 1 + + fs/orangefs/inode.c | 13 +- + fs/orangefs/orangefs-bufmap.c | 4 +- + fs/pidfs.c | 90 ++ + fs/proc/base.c | 203 +++- + fs/proc/internal.h | 2 +- + fs/proc/task_mmu.c | 6 +- + fs/proc/task_nommu.c | 2 +- + fs/proc_namespace.c | 6 +- + fs/qnx4/inode.c | 1 + + fs/qnx6/inode.c | 1 + + fs/quota/dquot.c | 8 +- + fs/readdir.c | 4 +- + fs/reiserfs/inode.c | 1 - + fs/romfs/super.c | 22 +- + fs/smb/client/file.c | 30 - + fs/stat.c | 170 ++-- + fs/sysv/super.c | 1 + + fs/udf/balloc.c | 74 +- + fs/udf/file.c | 2 + + fs/udf/inode.c | 13 +- + fs/udf/namei.c | 2 - + fs/udf/super.c | 18 +- + fs/ufs/dir.c | 1 - + fs/vboxsf/file.c | 18 +- + fs/xattr.c | 148 ++- + fs/xfs/libxfs/xfs_alloc.c | 28 +- + fs/xfs/libxfs/xfs_alloc.h | 6 +- + fs/xfs/libxfs/xfs_dir2_data.c | 31 +- + fs/xfs/libxfs/xfs_dir2_priv.h | 7 + + fs/xfs/libxfs/xfs_trans_resv.c | 1 - + fs/xfs/scrub/quota_repair.c | 1 - + fs/xfs/xfs_bmap_util.c | 22 +- + fs/xfs/xfs_discard.c | 303 +++++- + fs/xfs/xfs_extfree_item.c | 4 +- + fs/xfs/xfs_file.c | 141 +-- + fs/xfs/xfs_handle.c | 1 - + fs/xfs/xfs_icache.c | 5 +- + fs/xfs/xfs_iomap.c | 71 +- + fs/xfs/xfs_iops.c | 15 +- + fs/xfs/xfs_log_recover.c | 5 +- + fs/xfs/xfs_qm_bhv.c | 1 - + fs/xfs/xfs_trace.c | 1 - + fs/xfs/xfs_trace.h | 29 + + fs/zonefs/super.c | 1 + + include/asm-generic/audit_change_attr.h | 6 + + include/linux/cleanup.h | 13 +- + include/linux/dcache.h | 11 +- + include/linux/dlm.h | 17 +- + include/linux/exportfs.h | 2 + + include/linux/file.h | 20 + + include/linux/fs.h | 96 +- + include/linux/fsnotify_backend.h | 8 +- + include/linux/namei.h | 9 +- + include/linux/nfs4.h | 11 + + include/linux/nfs_fs_sb.h | 4 + + include/linux/nfs_page.h | 4 +- + include/linux/nfs_xdr.h | 47 +- + include/linux/nsproxy.h | 13 + + include/linux/pagemap.h | 6 - + include/linux/path.h | 9 + + include/linux/sunrpc/rdma_rn.h | 27 + + include/linux/sunrpc/svc.h | 3 + + include/linux/syscalls.h | 13 + + include/linux/xattr.h | 4 + + include/trace/events/btrfs.h | 19 +- + include/trace/events/ext4.h | 26 +- + include/trace/events/rpcrdma.h | 57 ++ + include/uapi/asm-generic/unistd.h | 11 +- + include/uapi/linux/btrfs_tree.h | 8 + + include/uapi/linux/dlm.h | 2 + + include/uapi/linux/mount.h | 10 +- + include/uapi/linux/nfs4.h | 4 + + include/uapi/linux/nfsd_netlink.h | 10 + + include/uapi/linux/nsfs.h | 10 + + include/uapi/linux/pidfd.h | 14 + + include/uapi/linux/xattr.h | 7 + + io_uring/statx.c | 3 +- + io_uring/xattr.c | 6 +- + kernel/fork.c | 26 +- + lib/lockref.c | 14 +- + mm/filemap.c | 42 +- + mm/khugepaged.c | 10 +- + mm/shmem.c | 9 +- + net/sunrpc/clnt.c | 3 +- + net/sunrpc/svc.c | 111 ++- + net/sunrpc/svc_xprt.c | 1 + + net/sunrpc/xprtrdma/Makefile | 2 +- + net/sunrpc/xprtrdma/frwr_ops.c | 9 +- + net/sunrpc/xprtrdma/ib_client.c | 181 ++++ + net/sunrpc/xprtrdma/module.c | 18 +- + net/sunrpc/xprtrdma/rpc_rdma.c | 3 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 83 +- + net/sunrpc/xprtrdma/verbs.c | 100 +- + net/sunrpc/xprtrdma/xprt_rdma.h | 5 +- + security/Kconfig | 121 +++ + .../selftests/filesystems/statmount/Makefile | 2 +- + .../selftests/filesystems/statmount/statmount.h | 46 + + .../filesystems/statmount/statmount_test.c | 144 ++- + .../filesystems/statmount/statmount_test_ns.c | 360 +++++++ + 550 files changed, 15815 insertions(+), 9033 deletions(-) + create mode 100644 Documentation/filesystems/iomap/design.rst + create mode 100644 Documentation/filesystems/iomap/index.rst + create mode 100644 Documentation/filesystems/iomap/operations.rst + create mode 100644 Documentation/filesystems/iomap/porting.rst + create mode 100644 fs/bcachefs/disk_accounting.c + create mode 100644 fs/bcachefs/disk_accounting.h + create mode 100644 fs/bcachefs/disk_accounting_format.h + create mode 100644 fs/bcachefs/disk_accounting_types.h + create mode 100644 fs/bcachefs/lru_format.h + create mode 100644 fs/btrfs/fiemap.c + create mode 100644 fs/btrfs/fiemap.h + create mode 100644 include/linux/sunrpc/rdma_rn.h + create mode 100644 net/sunrpc/xprtrdma/ib_client.c + create mode 100644 tools/testing/selftests/filesystems/statmount/statmount.h + create mode 100644 tools/testing/selftests/filesystems/statmount/statmount_test_ns.c +Merging printk/for-next (07c2ab22a8da Merge branch 'for-6.11' 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 +Auto-merging drivers/tty/serial/8250/8250_core.c +Auto-merging drivers/tty/serial/serial_core.c +Auto-merging include/linux/printk.h +Auto-merging include/linux/serial_core.h +Auto-merging kernel/panic.c +Auto-merging kernel/printk/printk.c +Merge made by the 'ort' strategy. + drivers/tty/serial/8250/8250_core.c | 6 +- + drivers/tty/serial/amba-pl011.c | 2 +- + drivers/tty/serial/serial_core.c | 16 +- + drivers/tty/sysrq.c | 2 +- + include/linux/console.h | 112 ++++++-- + include/linux/printk.h | 37 ++- + include/linux/serial_core.h | 117 +++++++- + kernel/locking/lockdep.c | 84 +++++- + kernel/panic.c | 9 + + kernel/printk/internal.h | 73 ++++- + kernel/printk/nbcon.c | 517 ++++++++++++++++++++++++++++++++++-- + kernel/printk/printk.c | 313 ++++++++++++++++------ + kernel/printk/printk_ringbuffer.h | 2 + + kernel/printk/printk_safe.c | 23 +- + kernel/rcu/tree_exp.h | 9 + + kernel/rcu/tree_stall.h | 11 + + lib/test_printf.c | 1 + + lib/test_scanf.c | 1 + + 18 files changed, 1198 insertions(+), 137 deletions(-) +Merging pci/next (7f928a740870 Merge branch 'controller/tegra194' into next) +$ 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/pci/pci.c +CONFLICT (content): Merge conflict in drivers/pci/pci.c +Auto-merging drivers/pci/probe.c +Auto-merging include/linux/pci.h +Resolved 'drivers/pci/pci.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 275d150bdbe9] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git +$ git diff -M --stat --summary HEAD^.. + Documentation/PCI/endpoint/pci-endpoint.rst | 4 +- + Documentation/PCI/pciebus-howto.rst | 2 +- + .../bindings/pci/mediatek,mt7621-pcie.yaml | 29 + + .../bindings/pci/microchip,pcie-host.yaml | 55 +- + .../bindings/pci/plda,xpressrich3-axi-common.yaml | 75 ++ + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 64 +- + .../devicetree/bindings/pci/qcom,pcie-sm8450.yaml | 4 + + .../bindings/pci/rockchip-dw-pcie-common.yaml | 126 +++ + .../bindings/pci/rockchip-dw-pcie-ep.yaml | 95 +++ + .../devicetree/bindings/pci/rockchip-dw-pcie.yaml | 93 +-- + .../devicetree/bindings/pci/snps,dw-pcie-ep.yaml | 13 +- + .../bindings/pci/starfive,jh7110-pcie.yaml | 120 +++ + .../devicetree/bindings/pci/xilinx-versal-cpm.yaml | 2 +- + .../translations/zh_CN/PCI/pciebus-howto.rst | 2 +- + MAINTAINERS | 19 +- + drivers/acpi/pci_root.c | 17 - + drivers/gpu/drm/vboxvideo/vbox_main.c | 20 +- + drivers/misc/pci_endpoint_test.c | 75 +- + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 2 +- + drivers/pci/bus.c | 10 +- + drivers/pci/controller/Kconfig | 9 +- + drivers/pci/controller/Makefile | 2 +- + drivers/pci/controller/dwc/Kconfig | 22 +- + drivers/pci/controller/dwc/Makefile | 2 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 8 +- + drivers/pci/controller/dwc/pci-exynos.c | 54 +- + drivers/pci/controller/dwc/pci-imx6.c | 38 +- + drivers/pci/controller/dwc/pci-keystone.c | 202 +++-- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 4 +- + drivers/pci/controller/dwc/pci-meson.c | 1 - + drivers/pci/controller/dwc/pcie-al.c | 16 +- + drivers/pci/controller/dwc/pcie-artpec6.c | 10 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 155 ++-- + drivers/pci/controller/dwc/pcie-designware-host.c | 145 +++- + drivers/pci/controller/dwc/pcie-designware-plat.c | 2 +- + drivers/pci/controller/dwc/pcie-designware.c | 121 +-- + drivers/pci/controller/dwc/pcie-designware.h | 46 +- + drivers/pci/controller/dwc/pcie-dw-rockchip.c | 330 +++++++- + drivers/pci/controller/dwc/pcie-keembay.c | 2 +- + drivers/pci/controller/dwc/pcie-kirin.c | 105 +-- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 50 +- + drivers/pci/controller/dwc/pcie-qcom.c | 340 ++++---- + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 308 ++++++- + drivers/pci/controller/dwc/pcie-tegra194.c | 10 +- + drivers/pci/controller/dwc/pcie-uniphier-ep.c | 2 +- + .../pci/controller/mobiveil/pcie-layerscape-gen4.c | 2 +- + drivers/pci/controller/mobiveil/pcie-mobiveil.h | 2 +- + drivers/pci/controller/pci-aardvark.c | 1 - + drivers/pci/controller/pci-host-common.c | 4 - + drivers/pci/controller/pcie-rcar-host.c | 6 +- + drivers/pci/controller/pcie-rockchip-host.c | 3 + + drivers/pci/controller/pcie-rockchip.c | 2 +- + drivers/pci/controller/plda/Kconfig | 30 + + drivers/pci/controller/plda/Makefile | 4 + + .../controller/{ => plda}/pcie-microchip-host.c | 615 ++------------ + drivers/pci/controller/plda/pcie-plda-host.c | 651 +++++++++++++++ + drivers/pci/controller/plda/pcie-plda.h | 273 ++++++ + drivers/pci/controller/plda/pcie-starfive.c | 488 +++++++++++ + drivers/pci/devres.c | 916 +++++++++++++++++---- + drivers/pci/endpoint/functions/pci-epf-mhi.c | 48 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 117 ++- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 19 +- + drivers/pci/endpoint/pci-ep-cfs.c | 1 - + drivers/pci/endpoint/pci-epc-core.c | 79 +- + drivers/pci/hotplug/acpiphp_ampere_altra.c | 1 + + drivers/pci/hotplug/pciehp.h | 4 + + drivers/pci/hotplug/pciehp_core.c | 42 +- + drivers/pci/hotplug/pciehp_hpc.c | 5 + + drivers/pci/hotplug/pciehp_pci.c | 4 + + drivers/pci/iomap.c | 16 + + drivers/pci/of.c | 60 +- + drivers/pci/pci-acpi.c | 22 + + drivers/pci/pci-mid.c | 4 +- + drivers/pci/pci-pf-stub.c | 1 + + drivers/pci/pci-stub.c | 1 + + drivers/pci/pci.c | 127 +-- + drivers/pci/pci.h | 100 ++- + drivers/pci/pcie/aer.c | 18 + + drivers/pci/pcie/dpc.c | 60 +- + drivers/pci/pcie/portdrv.c | 2 +- + drivers/pci/probe.c | 36 +- + drivers/pci/quirks.c | 4 + + drivers/pci/setup-bus.c | 91 +- + drivers/pci/switch/switchtec.c | 16 +- + drivers/usb/cdns3/cdnsp-pci.c | 2 +- + drivers/usb/gadget/udc/cdns2/cdns2-pci.c | 2 +- + include/linux/ioport.h | 44 +- + include/linux/pci-epc.h | 15 +- + include/linux/pci-epf.h | 10 +- + include/linux/pci.h | 10 +- + include/linux/switchtec.h | 2 +- + kernel/resource.c | 68 +- + 92 files changed, 5014 insertions(+), 1825 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/plda,xpressrich3-axi-common.yaml + create mode 100644 Documentation/devicetree/bindings/pci/rockchip-dw-pcie-common.yaml + create mode 100644 Documentation/devicetree/bindings/pci/rockchip-dw-pcie-ep.yaml + create mode 100644 Documentation/devicetree/bindings/pci/starfive,jh7110-pcie.yaml + create mode 100644 drivers/pci/controller/plda/Kconfig + create mode 100644 drivers/pci/controller/plda/Makefile + rename drivers/pci/controller/{ => plda}/pcie-microchip-host.c (54%) + create mode 100644 drivers/pci/controller/plda/pcie-plda-host.c + create mode 100644 drivers/pci/controller/plda/pcie-plda.h + create mode 100644 drivers/pci/controller/plda/pcie-starfive.c +Merging pstore/for-next/pstore (9b3c13c9ea4e pstore: platform: add missing MODULE_DESCRIPTION() macro) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Merge made by the 'ort' strategy. + fs/pstore/blk.c | 2 +- + fs/pstore/platform.c | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging hid/for-next (07fbb3e88d22 Merge branch 'for-6.11/bpf' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. + Documentation/hid/hid-bpf.rst | 173 +- + drivers/hid/Makefile | 6 +- + drivers/hid/bpf/Makefile | 2 +- + drivers/hid/bpf/entrypoints/Makefile | 93 - + drivers/hid/bpf/entrypoints/README | 4 - + drivers/hid/bpf/entrypoints/entrypoints.bpf.c | 25 - + drivers/hid/bpf/entrypoints/entrypoints.lskel.h | 248 -- + drivers/hid/bpf/hid_bpf_dispatch.c | 419 +-- + drivers/hid/bpf/hid_bpf_dispatch.h | 13 +- + drivers/hid/bpf/hid_bpf_jmp_table.c | 565 ---- + drivers/hid/bpf/hid_bpf_struct_ops.c | 307 ++ + drivers/hid/bpf/progs/FR-TEC__Raptor-Mach-2.bpf.c | 9 +- + drivers/hid/bpf/progs/HP__Elite-Presenter.bpf.c | 6 +- + drivers/hid/bpf/progs/Huion__Dial-2.bpf.c | 614 ++++ + drivers/hid/bpf/progs/Huion__Inspiroy-2-S.bpf.c | 534 ++++ + drivers/hid/bpf/progs/Huion__Kamvas-Pro-19.bpf.c | 9 +- + .../hid/bpf/progs/IOGEAR__Kaliber-MMOmentum.bpf.c | 6 +- + drivers/hid/bpf/progs/Makefile | 2 +- + ...Elite-2.bpf.c => Microsoft__Xbox-Elite-2.bpf.c} | 21 +- + .../bpf/progs/Thrustmaster__TCA-Yoke-Boeing.bpf.c | 144 + + drivers/hid/bpf/progs/Wacom__ArtPen.bpf.c | 6 +- + drivers/hid/bpf/progs/XPPen__Artist24.bpf.c | 12 +- + drivers/hid/bpf/progs/XPPen__ArtistPro16Gen2.bpf.c | 24 +- + drivers/hid/bpf/progs/XPPen__DecoMini4.bpf.c | 231 ++ + drivers/hid/bpf/progs/hid_bpf.h | 6 + + drivers/hid/bpf/progs/hid_bpf_helpers.h | 1 + + drivers/hid/bpf/progs/hid_report_helpers.h | 2960 ++++++++++++++++++++ + drivers/hid/hid-a4tech.c | 1 + + drivers/hid/hid-apple.c | 1 + + drivers/hid/hid-aureal.c | 1 + + drivers/hid/hid-belkin.c | 1 + + drivers/hid/hid-betopff.c | 1 + + drivers/hid/hid-bigbenff.c | 1 + + drivers/hid/hid-cherry.c | 1 + + drivers/hid/hid-chicony.c | 1 + + drivers/hid/hid-core.c | 133 +- + drivers/hid/hid-cypress.c | 1 + + drivers/hid/hid-dr.c | 1 + + drivers/hid/hid-elecom.c | 1 + + drivers/hid/hid-elo.c | 1 + + drivers/hid/hid-emsff.c | 1 + + drivers/hid/hid-evision.c | 1 + + drivers/hid/hid-ezkey.c | 1 + + drivers/hid/hid-gaff.c | 1 + + drivers/hid/hid-google-hammer.c | 1 + + drivers/hid/hid-google-stadiaff.c | 1 + + drivers/hid/hid-gyration.c | 1 + + drivers/hid/hid-holtek-kbd.c | 1 + + drivers/hid/hid-letsketch.c | 1 + + drivers/hid/hid-lg-g15.c | 1 + + drivers/hid/hid-lg.c | 1 + + drivers/hid/hid-logitech-dj.c | 1 + + drivers/hid/hid-magicmouse.c | 1 + + drivers/hid/hid-maltron.c | 1 + + drivers/hid/hid-megaworld.c | 1 + + drivers/hid/hid-mf.c | 1 + + drivers/hid/hid-microsoft.c | 1 + + drivers/hid/hid-monterey.c | 1 + + drivers/hid/hid-nintendo.c | 21 - + drivers/hid/hid-ntrig.c | 1 + + drivers/hid/hid-ortek.c | 1 + + drivers/hid/hid-petalynx.c | 1 + + drivers/hid/hid-pl.c | 1 + + drivers/hid/hid-primax.c | 1 + + drivers/hid/hid-prodikeys.c | 1 + + drivers/hid/hid-razer.c | 1 + + drivers/hid/hid-redragon.c | 1 + + drivers/hid/hid-retrode.c | 1 + + drivers/hid/hid-saitek.c | 1 + + drivers/hid/hid-samsung.c | 1 + + drivers/hid/hid-semitek.c | 1 + + drivers/hid/hid-sjoy.c | 1 + + drivers/hid/hid-sony.c | 1 + + drivers/hid/hid-speedlink.c | 1 + + drivers/hid/hid-steam.c | 1 + + drivers/hid/hid-steelseries.c | 1 + + drivers/hid/hid-sunplus.c | 1 + + drivers/hid/hid-tivo.c | 1 + + drivers/hid/hid-tmff.c | 1 + + drivers/hid/hid-topseed.c | 1 + + drivers/hid/hid-twinhan.c | 1 + + drivers/hid/hid-uclogic-core.c | 2 + + drivers/hid/hid-uclogic-rdesc-test.c | 2 + + drivers/hid/hid-uclogic-rdesc.c | 11 +- + drivers/hid/hid-viewsonic.c | 1 + + drivers/hid/hid-vivaldi-common.c | 1 + + drivers/hid/hid-waltop.c | 1 + + drivers/hid/hid-xinmo.c | 1 + + drivers/hid/hid-zpff.c | 1 + + drivers/hid/hid-zydacron.c | 1 + + drivers/hid/hidraw.c | 10 +- + drivers/hid/intel-ish-hid/ishtp/bus.c | 2 + + drivers/hid/usbhid/hid-core.c | 2 + + include/linux/hid.h | 7 + + include/linux/hid_bpf.h | 202 +- + samples/hid/Makefile | 5 +- + samples/hid/hid_bpf_attach.bpf.c | 18 - + samples/hid/hid_bpf_attach.h | 14 - + samples/hid/hid_mouse.bpf.c | 26 +- + samples/hid/hid_mouse.c | 39 +- + samples/hid/hid_surface_dial.bpf.c | 10 +- + samples/hid/hid_surface_dial.c | 53 +- + tools/testing/selftests/hid/hid_bpf.c | 426 ++- + tools/testing/selftests/hid/progs/hid.c | 392 ++- + .../testing/selftests/hid/progs/hid_bpf_helpers.h | 46 +- + 105 files changed, 6344 insertions(+), 1575 deletions(-) + delete mode 100644 drivers/hid/bpf/entrypoints/Makefile + delete mode 100644 drivers/hid/bpf/entrypoints/README + delete mode 100644 drivers/hid/bpf/entrypoints/entrypoints.bpf.c + delete mode 100644 drivers/hid/bpf/entrypoints/entrypoints.lskel.h + delete mode 100644 drivers/hid/bpf/hid_bpf_jmp_table.c + create mode 100644 drivers/hid/bpf/hid_bpf_struct_ops.c + create mode 100644 drivers/hid/bpf/progs/Huion__Dial-2.bpf.c + create mode 100644 drivers/hid/bpf/progs/Huion__Inspiroy-2-S.bpf.c + rename drivers/hid/bpf/progs/{Microsoft__XBox-Elite-2.bpf.c => Microsoft__Xbox-Elite-2.bpf.c} (89%) + create mode 100644 drivers/hid/bpf/progs/Thrustmaster__TCA-Yoke-Boeing.bpf.c + create mode 100644 drivers/hid/bpf/progs/XPPen__DecoMini4.bpf.c + create mode 100644 drivers/hid/bpf/progs/hid_report_helpers.h + delete mode 100644 samples/hid/hid_bpf_attach.bpf.c + delete mode 100644 samples/hid/hid_bpf_attach.h +Merging i2c/i2c/for-next (6367df381ba9 Merge branch 'i2c/for-current' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'ort' strategy. + Documentation/i2c/slave-testunit-backend.rst | 122 ++++++++++++++++++--------- + drivers/i2c/i2c-core-base.c | 4 +- + drivers/i2c/i2c-dev.c | 12 +++ + drivers/i2c/i2c-slave-testunit.c | 2 +- + drivers/i2c/i2c-smbus.c | 2 +- + drivers/i2c/muxes/i2c-mux-pca9541.c | 2 +- + 6 files changed, 99 insertions(+), 45 deletions(-) +Merging i2c-host/i2c/i2c-host (04d6adabcdd5 dt-bindings: i2c: nxp,lpc1788-i2c: convert to dt schema) +$ 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 MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/atmel,at91sam-i2c.yaml | 8 -- + .../devicetree/bindings/i2c/brcm,brcmstb-i2c.yaml | 28 +++--- + .../devicetree/bindings/i2c/i2c-demux-pinctrl.yaml | 106 ++++++++++----------- + .../devicetree/bindings/i2c/i2c-lpc2k.txt | 33 ------- + .../bindings/i2c/nvidia,tegra20-i2c.yaml | 6 -- + .../devicetree/bindings/i2c/nxp,lpc1788-i2c.yaml | 54 +++++++++++ + .../devicetree/bindings/i2c/renesas,iic-emev2.yaml | 14 +-- + .../devicetree/bindings/i2c/renesas,rcar-i2c.yaml | 20 ++-- + .../devicetree/bindings/i2c/renesas,riic.yaml | 34 +++---- + .../bindings/i2c/renesas,rmobile-iic.yaml | 24 ++--- + .../bindings/i2c/samsung,s3c2410-i2c.yaml | 6 -- + .../devicetree/bindings/i2c/st,stm32-i2c.yaml | 66 ++++++------- + .../devicetree/bindings/i2c/ti,omap4-i2c.yaml | 64 +++++-------- + Documentation/i2c/busses/i2c-i801.rst | 1 + + MAINTAINERS | 2 +- + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-ali1563.c | 1 + + drivers/i2c/busses/i2c-ccgx-ucsi.c | 1 + + drivers/i2c/busses/i2c-i801.c | 3 + + drivers/i2c/busses/i2c-omap.c | 36 +++++-- + drivers/i2c/busses/i2c-pxa.c | 1 + + drivers/i2c/busses/i2c-qup.c | 1 + + 22 files changed, 265 insertions(+), 245 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-lpc2k.txt + create mode 100644 Documentation/devicetree/bindings/i2c/nxp,lpc1788-i2c.yaml +Merging i3c/i3c/next (145ca7b61e95 i3c: dw: Add optional apb clock) +$ 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. + .../bindings/i3c/snps,dw-i3c-master.yaml | 11 +++- + drivers/i3c/master/ast2600-i3c-master.c | 1 - + drivers/i3c/master/dw-i3c-master.c | 55 ++++++-------------- + drivers/i3c/master/dw-i3c-master.h | 4 +- + drivers/i3c/master/mipi-i3c-hci/core.c | 8 +++ + drivers/i3c/master/mipi-i3c-hci/dma.c | 44 ++++++++-------- + drivers/i3c/master/svc-i3c-master.c | 60 ++++++++++++++++------ + 7 files changed, 103 insertions(+), 80 deletions(-) +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 (cd228e7b65d4 hwmon: add MP5920 driver) +$ 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/dell-smm-hwmon.c +Auto-merging drivers/hwmon/shtc1.c +Auto-merging drivers/i2c/i2c-smbus.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/hwmon/g762.txt | 47 -- + .../devicetree/bindings/hwmon/gmt,g762.yaml | 95 +++ + .../devicetree/bindings/hwmon/maxim,max6639.yaml | 92 +++ + .../devicetree/bindings/hwmon/ti,ina2xx.yaml | 9 + + .../devicetree/bindings/hwmon/ti,tmp108.yaml | 12 + + .../devicetree/bindings/trivial-devices.yaml | 10 + + Documentation/hwmon/asus_ec_sensors.rst | 1 + + Documentation/hwmon/corsair-cpro.rst | 8 + + Documentation/hwmon/corsair-psu.rst | 6 +- + Documentation/hwmon/dell-smm-hwmon.rst | 2 + + Documentation/hwmon/index.rst | 5 + + Documentation/hwmon/max31827.rst | 13 +- + Documentation/hwmon/mp2891.rst | 179 ++++++ + Documentation/hwmon/mp2993.rst | 150 +++++ + Documentation/hwmon/mp5920.rst | 91 +++ + Documentation/hwmon/mp9941.rst | 92 +++ + Documentation/hwmon/spd5118.rst | 63 ++ + MAINTAINERS | 21 + + drivers/hwmon/Kconfig | 31 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/ad7418.c | 7 +- + drivers/hwmon/adm1021.c | 4 +- + drivers/hwmon/adm1031.c | 4 +- + drivers/hwmon/ads7828.c | 7 +- + drivers/hwmon/adt7475.c | 18 +- + drivers/hwmon/aht10.c | 3 +- + drivers/hwmon/asus-ec-sensors.c | 10 + + drivers/hwmon/asus_atk0110.c | 1 + + drivers/hwmon/corsair-cpro.c | 89 +++ + drivers/hwmon/corsair-psu.c | 7 +- + drivers/hwmon/dell-smm-hwmon.c | 7 + + drivers/hwmon/dme1737.c | 4 +- + drivers/hwmon/ds1621.c | 4 +- + drivers/hwmon/f75375s.c | 46 +- + drivers/hwmon/fschmd.c | 2 +- + drivers/hwmon/g762.c | 33 +- + drivers/hwmon/gsc-hwmon.c | 7 +- + drivers/hwmon/hwmon.c | 149 ++++- + drivers/hwmon/iio_hwmon.c | 11 +- + drivers/hwmon/ina238.c | 2 +- + drivers/hwmon/ina2xx.c | 39 +- + drivers/hwmon/jc42.c | 49 +- + drivers/hwmon/lm63.c | 5 +- + drivers/hwmon/lm70.c | 6 +- + drivers/hwmon/lm75.c | 10 +- + drivers/hwmon/lm78.c | 4 +- + drivers/hwmon/lm83.c | 16 +- + drivers/hwmon/lm85.c | 7 +- + drivers/hwmon/lm90.c | 61 +- + drivers/hwmon/lm95234.c | 5 +- + drivers/hwmon/ltc2991.c | 11 +- + drivers/hwmon/max16065.c | 10 +- + drivers/hwmon/max1668.c | 4 +- + drivers/hwmon/max31827.c | 23 +- + drivers/hwmon/max6639.c | 608 ++++++++++++------ + drivers/hwmon/max6697.c | 7 +- + drivers/hwmon/mcp3021.c | 6 +- + drivers/hwmon/mr75203.c | 1 + + drivers/hwmon/nct6683.c | 2 + + drivers/hwmon/nct6775.h | 2 +- + drivers/hwmon/nzxt-smart2.c | 1 + + drivers/hwmon/pmbus/Kconfig | 36 ++ + drivers/hwmon/pmbus/Makefile | 4 + + drivers/hwmon/pmbus/lm25066.c | 2 +- + drivers/hwmon/pmbus/mp2856.c | 8 +- + drivers/hwmon/pmbus/mp2891.c | 600 ++++++++++++++++++ + drivers/hwmon/pmbus/mp2993.c | 261 ++++++++ + drivers/hwmon/pmbus/mp5920.c | 90 +++ + drivers/hwmon/pmbus/mp9941.c | 319 ++++++++++ + drivers/hwmon/powr1220.c | 6 +- + drivers/hwmon/sht3x.c | 20 +- + drivers/hwmon/shtc1.c | 4 +- + drivers/hwmon/spd5118.c | 703 +++++++++++++++++++++ + drivers/hwmon/thmc50.c | 4 +- + drivers/hwmon/tmp401.c | 2 +- + drivers/hwmon/tmp421.c | 6 +- + drivers/hwmon/tmp464.c | 5 +- + drivers/hwmon/tmp513.c | 2 +- + drivers/hwmon/tps23861.c | 2 +- + drivers/hwmon/w83781d.c | 4 +- + drivers/hwmon/w83795.c | 4 +- + drivers/i2c/i2c-smbus.c | 6 +- + include/linux/hwmon.h | 2 + + 83 files changed, 3741 insertions(+), 569 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/hwmon/g762.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/gmt,g762.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/maxim,max6639.yaml + create mode 100644 Documentation/hwmon/mp2891.rst + create mode 100644 Documentation/hwmon/mp2993.rst + create mode 100644 Documentation/hwmon/mp5920.rst + create mode 100644 Documentation/hwmon/mp9941.rst + create mode 100644 Documentation/hwmon/spd5118.rst + create mode 100644 drivers/hwmon/pmbus/mp2891.c + create mode 100644 drivers/hwmon/pmbus/mp2993.c + create mode 100644 drivers/hwmon/pmbus/mp5920.c + create mode 100644 drivers/hwmon/pmbus/mp9941.c + create mode 100644 drivers/hwmon/spd5118.c +Merging jc_docs/docs-next (93dd11d0dd74 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 Documentation/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + .clang-format | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 37 +-- + .../verify-bugs-and-bisect-regressions.rst | 2 +- + Documentation/arch/x86/cpuinfo.rst | 2 +- + Documentation/core-api/genericirq.rst | 2 +- + Documentation/crypto/async-tx-api.rst | 30 +- + .../{process => dev-tools}/clang-format.rst | 0 + Documentation/dev-tools/index.rst | 1 + + Documentation/doc-guide/kernel-doc.rst | 4 +- + .../maintainer/maintainer-entry-profile.rst | 1 + + Documentation/mm/vmalloced-kernel-stacks.rst | 10 +- + Documentation/process/4.Coding.rst | 2 +- + Documentation/process/changes.rst | 1 + + Documentation/process/coding-style.rst | 2 +- + Documentation/process/email-clients.rst | 25 +- + Documentation/process/handling-regressions.rst | 30 +- + Documentation/process/index.rst | 11 - + Documentation/process/kernel-docs.rst | 68 +++-- + Documentation/staging/index.rst | 1 + + .../{process => staging}/magic-number.rst | 0 + .../it_IT/{ => arch}/riscv/patch-acceptance.rst | 24 +- + .../translations/it_IT/doc-guide/kernel-doc.rst | 44 +++ + .../translations/it_IT/doc-guide/parse-headers.rst | 2 +- + .../translations/it_IT/process/5.Posting.rst | 27 +- + .../translations/it_IT/process/6.Followthrough.rst | 7 + + .../it_IT/process/7.AdvancedTopics.rst | 2 +- + .../translations/it_IT/process/changes.rst | 4 +- + .../translations/it_IT/process/clang-format.rst | 2 +- + Documentation/translations/it_IT/process/index.rst | 2 +- + .../translations/it_IT/process/magic-number.rst | 2 +- + .../it_IT/process/stable-kernel-rules.rst | 322 +++++++++++---------- + .../it_IT/process/submitting-patches.rst | 135 +++++++-- + .../translations/sp_SP/process/coding-style.rst | 2 +- + .../translations/sp_SP/process/magic-number.rst | 2 +- + .../translations/zh_CN/admin-guide/index.rst | 2 +- + .../translations/zh_CN/admin-guide/numastat.rst | 48 +++ + .../zh_CN/dev-tools/gdb-kernel-debugging.rst | 4 + + .../translations/zh_CN/dev-tools/index.rst | 6 +- + .../translations/zh_CN/dev-tools/kasan.rst | 18 ++ + .../zh_CN/dev-tools/testing-overview.rst | 2 + + .../translations/zh_CN/driver-api/index.rst | 2 +- + .../translations/zh_CN/driver-api/phy/index.rst | 20 ++ + .../translations/zh_CN/driver-api/phy/phy.rst | 212 ++++++++++++++ + .../translations/zh_CN/process/4.Coding.rst | 2 +- + .../translations/zh_CN/process/coding-style.rst | 2 +- + .../translations/zh_CN/process/magic-number.rst | 2 +- + .../translations/zh_TW/process/4.Coding.rst | 2 +- + .../translations/zh_TW/process/coding-style.rst | 2 +- + .../translations/zh_TW/process/magic-number.rst | 2 +- + scripts/checktransupdate.py | 203 +++++++++++++ + 50 files changed, 1011 insertions(+), 326 deletions(-) + rename Documentation/{process => dev-tools}/clang-format.rst (100%) + rename Documentation/{process => staging}/magic-number.rst (100%) + rename Documentation/translations/it_IT/{ => arch}/riscv/patch-acceptance.rst (64%) + create mode 100644 Documentation/translations/zh_CN/admin-guide/numastat.rst + create mode 100644 Documentation/translations/zh_CN/driver-api/phy/index.rst + create mode 100644 Documentation/translations/zh_CN/driver-api/phy/phy.rst + create mode 100755 scripts/checktransupdate.py +Merging v4l-dvb/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (156922faabce media: atomisp: Switch to new Intel CPU model defines) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging MAINTAINERS +Auto-merging drivers/media/pci/intel/ipu6/ipu6-isys-video.c +Merge made by the 'ort' strategy. + .../bindings/media/i2c/maxim,max96714.yaml | 174 +++ + .../bindings/media/i2c/maxim,max96717.yaml | 157 ++ + .../media/i2c/{imx258.yaml => sony,imx258.yaml} | 11 +- + .../devicetree/bindings/media/i2c/sony,imx283.yaml | 107 ++ + .../bindings/media/mediatek,mt7622-cir.yaml | 55 + + .../devicetree/bindings/media/mtk-cir.txt | 28 - + .../devicetree/bindings/media/rockchip-rga.yaml | 1 + + .../media/v4l/ext-ctrls-codec-stateless.rst | 4 +- + .../userspace-api/media/v4l/ext-ctrls-codec.rst | 14 + + MAINTAINERS | 25 +- + drivers/media/common/siano/smscoreapi.c | 10 +- + drivers/media/common/siano/smscoreapi.h | 18 +- + drivers/media/common/siano/smsdvb-main.c | 4 +- + drivers/media/common/siano/smsendian.c | 8 +- + drivers/media/dvb-frontends/dib7000p.c | 5 - + drivers/media/dvb-frontends/drx39xyj/drxj.c | 7 - + drivers/media/dvb-frontends/stv090x.c | 37 +- + drivers/media/dvb-frontends/stv0910.c | 5 - + drivers/media/i2c/Kconfig | 45 + + drivers/media/i2c/Makefile | 3 + + drivers/media/i2c/adv7511-v4l2.c | 5 - + drivers/media/i2c/dw9768.c | 5 - + drivers/media/i2c/hi846.c | 2 +- + drivers/media/i2c/imx258.c | 1422 +++++++++-------- + drivers/media/i2c/imx283.c | 1605 ++++++++++++++++++++ + drivers/media/i2c/imx412.c | 9 +- + drivers/media/i2c/ks0127.c | 8 - + drivers/media/i2c/max96714.c | 1024 +++++++++++++ + drivers/media/i2c/max96717.c | 927 +++++++++++ + drivers/media/i2c/ov5693.c | 10 - + drivers/media/i2c/tw9910.c | 5 - + drivers/media/pci/cx18/cx18-scb.h | 2 +- + drivers/media/pci/intel/ipu6/ipu6-buttress.c | 4 +- + drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 98 +- + drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h | 2 - + drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 3 - + drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 43 +- + drivers/media/pci/ivtv/ivtv-driver.c | 93 +- + drivers/media/pci/ivtv/ivtv-fileops.c | 66 +- + drivers/media/pci/ivtv/ivtv-udma.c | 8 + + drivers/media/pci/ivtv/ivtv-yuv.c | 6 + + drivers/media/pci/ivtv/ivtvfb.c | 6 +- + drivers/media/platform/allegro-dvt/nal-hevc.h | 7 +- + drivers/media/platform/amphion/vdec.c | 2 - + drivers/media/platform/amphion/venc.c | 6 +- + drivers/media/platform/amphion/vpu.h | 1 + + drivers/media/platform/amphion/vpu_defs.h | 1 + + drivers/media/platform/amphion/vpu_malone.c | 5 - + drivers/media/platform/amphion/vpu_v4l2.c | 16 + + drivers/media/platform/amphion/vpu_v4l2.h | 1 + + drivers/media/platform/amphion/vpu_windsor.c | 2 + + drivers/media/platform/m2m-deinterlace.c | 4 - + .../mediatek/vcodec/common/mtk_vcodec_util.c | 3 +- + .../mediatek/vcodec/decoder/mtk_vcodec_dec.c | 60 +- + .../mediatek/vcodec/decoder/vdec/vdec_vp8_if.c | 2 +- + .../platform/mediatek/vcodec/decoder/vdec_vpu_if.c | 6 + + drivers/media/platform/nvidia/tegra-vde/h264.c | 5 - + drivers/media/platform/nvidia/tegra-vde/vde.h | 1 - + drivers/media/platform/rockchip/rga/rga-buf.c | 5 + + drivers/media/platform/rockchip/rga/rga.c | 4 + + drivers/media/platform/rockchip/rga/rga.h | 3 + + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 8 +- + .../platform/rockchip/rkisp1/rkisp1-resizer.c | 8 +- + drivers/media/platform/xilinx/xilinx-dma.c | 4 +- + drivers/media/platform/xilinx/xilinx-dma.h | 2 +- + drivers/media/rc/imon.c | 5 +- + drivers/media/rc/mceusb.c | 11 +- + drivers/media/spi/gs1662.c | 8 - + drivers/media/usb/dvb-usb/dvb-usb-init.c | 35 +- + drivers/media/usb/dvb-usb/opera1.c | 4 - + drivers/media/usb/go7007/go7007-i2c.c | 30 +- + drivers/media/usb/pvrusb2/pvrusb2-debugifc.c | 5 - + drivers/media/v4l2-core/v4l2-async.c | 7 + + drivers/media/v4l2-core/v4l2-cci.c | 9 + + drivers/media/v4l2-core/v4l2-ctrls-defs.c | 5 + + drivers/media/v4l2-core/v4l2-subdev.c | 391 +++-- + .../media/atomisp/include/linux/atomisp_platform.h | 25 +- + drivers/staging/media/av7110/Kconfig | 22 - + drivers/staging/media/av7110/Makefile | 2 - + drivers/staging/media/av7110/TODO | 3 - + .../av7110/audio-bilingual-channel-select.rst | 58 - + .../staging/media/av7110/audio-channel-select.rst | 57 - + .../staging/media/av7110/audio-clear-buffer.rst | 48 - + drivers/staging/media/av7110/audio-continue.rst | 48 - + drivers/staging/media/av7110/audio-fclose.rst | 51 - + drivers/staging/media/av7110/audio-fopen.rst | 103 -- + drivers/staging/media/av7110/audio-fwrite.rst | 79 - + .../media/av7110/audio-get-capabilities.rst | 54 - + drivers/staging/media/av7110/audio-get-status.rst | 54 - + drivers/staging/media/av7110/audio-pause.rst | 49 - + drivers/staging/media/av7110/audio-play.rst | 48 - + .../staging/media/av7110/audio-select-source.rst | 56 - + drivers/staging/media/av7110/audio-set-av-sync.rst | 58 - + .../staging/media/av7110/audio-set-bypass-mode.rst | 62 - + drivers/staging/media/av7110/audio-set-id.rst | 59 - + drivers/staging/media/av7110/audio-set-mixer.rst | 53 - + drivers/staging/media/av7110/audio-set-mute.rst | 62 - + .../staging/media/av7110/audio-set-streamtype.rst | 66 - + drivers/staging/media/av7110/audio-stop.rst | 48 - + drivers/staging/media/av7110/audio.rst | 27 - + drivers/staging/media/av7110/audio_data_types.rst | 116 -- + .../staging/media/av7110/audio_function_calls.rst | 30 - + drivers/staging/media/av7110/av7110.c | 496 +++--- + drivers/staging/media/av7110/av7110.h | 50 +- + drivers/staging/media/av7110/av7110_av.c | 234 +-- + drivers/staging/media/av7110/av7110_av.h | 37 +- + drivers/staging/media/av7110/av7110_ca.c | 43 +- + drivers/staging/media/av7110/av7110_ca.h | 12 +- + drivers/staging/media/av7110/av7110_hw.c | 230 ++- + drivers/staging/media/av7110/av7110_hw.h | 79 +- + drivers/staging/media/av7110/av7110_ipack.c | 294 ++-- + drivers/staging/media/av7110/av7110_ipack.h | 12 +- + drivers/staging/media/av7110/av7110_ir.c | 3 +- + drivers/staging/media/av7110/av7110_v4l.c | 102 +- + drivers/staging/media/av7110/budget-patch.c | 665 -------- + drivers/staging/media/av7110/dvb_filter.c | 112 +- + drivers/staging/media/av7110/dvb_filter.h | 22 +- + drivers/staging/media/av7110/sp8870.c | 200 +-- + drivers/staging/media/av7110/sp8870.h | 24 +- + .../staging/media/av7110/video-clear-buffer.rst | 54 - + drivers/staging/media/av7110/video-command.rst | 96 -- + drivers/staging/media/av7110/video-continue.rst | 57 - + .../staging/media/av7110/video-fast-forward.rst | 72 - + drivers/staging/media/av7110/video-fclose.rst | 51 - + drivers/staging/media/av7110/video-fopen.rst | 111 -- + drivers/staging/media/av7110/video-freeze.rst | 61 - + drivers/staging/media/av7110/video-fwrite.rst | 79 - + .../media/av7110/video-get-capabilities.rst | 61 - + drivers/staging/media/av7110/video-get-event.rst | 105 -- + .../staging/media/av7110/video-get-frame-count.rst | 65 - + drivers/staging/media/av7110/video-get-pts.rst | 69 - + drivers/staging/media/av7110/video-get-size.rst | 69 - + drivers/staging/media/av7110/video-get-status.rst | 72 - + drivers/staging/media/av7110/video-play.rst | 57 - + .../staging/media/av7110/video-select-source.rst | 76 - + drivers/staging/media/av7110/video-set-blank.rst | 64 - + .../media/av7110/video-set-display-format.rst | 60 - + drivers/staging/media/av7110/video-set-format.rst | 82 - + .../staging/media/av7110/video-set-streamtype.rst | 61 - + drivers/staging/media/av7110/video-slowmotion.rst | 72 - + .../staging/media/av7110/video-stillpicture.rst | 61 - + drivers/staging/media/av7110/video-stop.rst | 74 - + drivers/staging/media/av7110/video-try-command.rst | 66 - + drivers/staging/media/av7110/video.rst | 36 - + .../staging/media/av7110/video_function_calls.rst | 35 - + drivers/staging/media/av7110/video_types.rst | 248 --- + drivers/staging/media/max96712/max96712.c | 37 +- + include/media/ipu-bridge.h | 1 + + include/media/v4l2-subdev.h | 88 +- + include/uapi/linux/v4l2-controls.h | 2 + + 150 files changed, 6604 insertions(+), 6228 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/i2c/maxim,max96714.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/maxim,max96717.yaml + rename Documentation/devicetree/bindings/media/i2c/{imx258.yaml => sony,imx258.yaml} (88%) + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx283.yaml + create mode 100644 Documentation/devicetree/bindings/media/mediatek,mt7622-cir.yaml + delete mode 100644 Documentation/devicetree/bindings/media/mtk-cir.txt + create mode 100644 drivers/media/i2c/imx283.c + create mode 100644 drivers/media/i2c/max96714.c + create mode 100644 drivers/media/i2c/max96717.c + delete mode 100644 drivers/staging/media/av7110/TODO + delete mode 100644 drivers/staging/media/av7110/audio-bilingual-channel-select.rst + delete mode 100644 drivers/staging/media/av7110/audio-channel-select.rst + delete mode 100644 drivers/staging/media/av7110/audio-clear-buffer.rst + delete mode 100644 drivers/staging/media/av7110/audio-continue.rst + delete mode 100644 drivers/staging/media/av7110/audio-fclose.rst + delete mode 100644 drivers/staging/media/av7110/audio-fopen.rst + delete mode 100644 drivers/staging/media/av7110/audio-fwrite.rst + delete mode 100644 drivers/staging/media/av7110/audio-get-capabilities.rst + delete mode 100644 drivers/staging/media/av7110/audio-get-status.rst + delete mode 100644 drivers/staging/media/av7110/audio-pause.rst + delete mode 100644 drivers/staging/media/av7110/audio-play.rst + delete mode 100644 drivers/staging/media/av7110/audio-select-source.rst + delete mode 100644 drivers/staging/media/av7110/audio-set-av-sync.rst + delete mode 100644 drivers/staging/media/av7110/audio-set-bypass-mode.rst + delete mode 100644 drivers/staging/media/av7110/audio-set-id.rst + delete mode 100644 drivers/staging/media/av7110/audio-set-mixer.rst + delete mode 100644 drivers/staging/media/av7110/audio-set-mute.rst + delete mode 100644 drivers/staging/media/av7110/audio-set-streamtype.rst + delete mode 100644 drivers/staging/media/av7110/audio-stop.rst + delete mode 100644 drivers/staging/media/av7110/audio.rst + delete mode 100644 drivers/staging/media/av7110/audio_data_types.rst + delete mode 100644 drivers/staging/media/av7110/audio_function_calls.rst + delete mode 100644 drivers/staging/media/av7110/budget-patch.c + delete mode 100644 drivers/staging/media/av7110/video-clear-buffer.rst + delete mode 100644 drivers/staging/media/av7110/video-command.rst + delete mode 100644 drivers/staging/media/av7110/video-continue.rst + delete mode 100644 drivers/staging/media/av7110/video-fast-forward.rst + delete mode 100644 drivers/staging/media/av7110/video-fclose.rst + delete mode 100644 drivers/staging/media/av7110/video-fopen.rst + delete mode 100644 drivers/staging/media/av7110/video-freeze.rst + delete mode 100644 drivers/staging/media/av7110/video-fwrite.rst + delete mode 100644 drivers/staging/media/av7110/video-get-capabilities.rst + delete mode 100644 drivers/staging/media/av7110/video-get-event.rst + delete mode 100644 drivers/staging/media/av7110/video-get-frame-count.rst + delete mode 100644 drivers/staging/media/av7110/video-get-pts.rst + delete mode 100644 drivers/staging/media/av7110/video-get-size.rst + delete mode 100644 drivers/staging/media/av7110/video-get-status.rst + delete mode 100644 drivers/staging/media/av7110/video-play.rst + delete mode 100644 drivers/staging/media/av7110/video-select-source.rst + delete mode 100644 drivers/staging/media/av7110/video-set-blank.rst + delete mode 100644 drivers/staging/media/av7110/video-set-display-format.rst + delete mode 100644 drivers/staging/media/av7110/video-set-format.rst + delete mode 100644 drivers/staging/media/av7110/video-set-streamtype.rst + delete mode 100644 drivers/staging/media/av7110/video-slowmotion.rst + delete mode 100644 drivers/staging/media/av7110/video-stillpicture.rst + delete mode 100644 drivers/staging/media/av7110/video-stop.rst + delete mode 100644 drivers/staging/media/av7110/video-try-command.rst + delete mode 100644 drivers/staging/media/av7110/video.rst + delete mode 100644 drivers/staging/media/av7110/video_function_calls.rst + delete mode 100644 drivers/staging/media/av7110/video_types.rst +Merging pm/linux-next (d203f7f03764 Merge branch 'pm-cpuidle' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/acpi_processor.c +Auto-merging include/linux/acpi.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/pm/amd-pstate.rst | 18 +- + .../bindings/thermal/hisilicon,tsensor.yaml | 57 + + .../bindings/thermal/hisilicon-thermal.txt | 32 - + MAINTAINERS | 4 +- + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/msr-index.h | 2 + + arch/x86/kernel/cpu/scattered.c | 1 + + drivers/acpi/Makefile | 1 + + drivers/acpi/ac.c | 2 +- + drivers/acpi/acpi_pad.c | 19 +- + drivers/acpi/acpi_processor.c | 4 +- + drivers/acpi/acpi_tad.c | 1 + + drivers/acpi/battery.c | 37 +- + drivers/acpi/bus.c | 2 + + drivers/acpi/cppc_acpi.c | 2 + + drivers/acpi/fan.h | 9 + + drivers/acpi/fan_core.c | 4 + + drivers/acpi/fan_hwmon.c | 170 +++ + drivers/acpi/numa/hmat.c | 6 +- + drivers/acpi/platform_profile.c | 1 + + drivers/acpi/pmic/intel_pmic.c | 2 +- + drivers/acpi/pmic/intel_pmic.h | 4 +- + drivers/acpi/pmic/intel_pmic_bxtwc.c | 4 +- + drivers/acpi/pmic/intel_pmic_bytcrc.c | 4 +- + drivers/acpi/pmic/intel_pmic_chtdc_ti.c | 17 +- + drivers/acpi/pmic/intel_pmic_chtwc.c | 7 +- + drivers/acpi/pmic/intel_pmic_xpower.c | 11 +- + drivers/acpi/sbs.c | 29 +- + drivers/acpi/x86/lpss.c | 4 +- + drivers/acpi/x86/utils.c | 44 +- + drivers/cpufreq/Kconfig.x86 | 1 + + drivers/cpufreq/acpi-cpufreq.c | 6 +- + drivers/cpufreq/amd-pstate.c | 311 ++++-- + drivers/cpufreq/amd-pstate.h | 2 + + drivers/cpufreq/cpufreq.c | 53 +- + drivers/cpufreq/intel_pstate.c | 123 ++- + drivers/cpufreq/speedstep-centrino.c | 8 +- + drivers/cpuidle/cpuidle-haltpoll.c | 1 + + drivers/cpuidle/governors/menu.c | 17 +- + drivers/cpuidle/governors/teo.c | 194 +--- + drivers/idle/intel_idle.c | 116 +-- + drivers/powercap/idle_inject.c | 2 +- + drivers/powercap/intel_rapl_common.c | 108 +- + drivers/powercap/intel_rapl_msr.c | 16 +- + drivers/thermal/Kconfig | 28 +- + drivers/thermal/Makefile | 4 +- + drivers/thermal/gov_bang_bang.c | 14 +- + .../intel/int340x_thermal/int3400_thermal.c | 2 +- + .../intel/int340x_thermal/int3403_thermal.c | 11 - + .../int340x_thermal/processor_thermal_device.c | 3 +- + .../int340x_thermal/processor_thermal_device.h | 1 + + .../int340x_thermal/processor_thermal_device_pci.c | 115 +- + .../intel/int340x_thermal/processor_thermal_rfim.c | 113 +- + drivers/thermal/intel/intel_pch_thermal.c | 5 + + drivers/thermal/intel/intel_soc_dts_thermal.c | 2 +- + drivers/thermal/intel/intel_tcc.c | 177 +++- + drivers/thermal/intel/intel_tcc_cooling.c | 32 +- + drivers/thermal/k3_j72xx_bandgap.c | 113 +- + drivers/thermal/mediatek/lvts_thermal.c | 12 +- + drivers/thermal/renesas/Kconfig | 28 + + drivers/thermal/renesas/Makefile | 5 + + drivers/thermal/{ => renesas}/rcar_gen3_thermal.c | 2 +- + drivers/thermal/{ => renesas}/rcar_thermal.c | 2 +- + drivers/thermal/{ => renesas}/rzg2l_thermal.c | 2 +- + drivers/thermal/thermal_core.c | 13 +- + drivers/thermal/thermal_core.h | 10 +- + drivers/thermal/thermal_debugfs.c | 110 +- + drivers/thermal/thermal_debugfs.h | 2 + + drivers/thermal/thermal_sysfs.c | 19 +- + drivers/thermal/thermal_trip.c | 35 +- + .../dt-bindings/thermal/mediatek,lvts-thermal.h | 12 +- + include/linux/acpi.h | 5 +- + include/linux/cpufreq.h | 6 +- + include/linux/intel_tcc.h | 1 + + include/linux/platform_data/x86/soc.h | 12 +- + tools/power/cpupower/Makefile | 37 +- + tools/power/cpupower/README | 158 ++- + tools/power/cpupower/man/cpupower-monitor.1 | 13 +- + .../cpupower/utils/idle_monitor/cpupower-monitor.c | 2 +- + tools/power/pm-graph/bootgraph.py | 16 +- + tools/power/pm-graph/sleepgraph.py | 1098 ++++++++++---------- + 81 files changed, 2285 insertions(+), 1393 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/hisilicon,tsensor.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/hisilicon-thermal.txt + create mode 100644 drivers/acpi/fan_hwmon.c + create mode 100644 drivers/thermal/renesas/Kconfig + create mode 100644 drivers/thermal/renesas/Makefile + rename drivers/thermal/{ => renesas}/rcar_gen3_thermal.c (99%) + rename drivers/thermal/{ => renesas}/rcar_thermal.c (99%) + rename drivers/thermal/{ => renesas}/rzg2l_thermal.c (99%) +Merging cpufreq-arm/cpufreq/arm/linux-next (ce84b7beeb52 cpufreq: sti: add missing MODULE_DEVICE_TABLE entry for stih418) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Auto-merging drivers/cpufreq/qcom-cpufreq-nvmem.c +Merge made by the 'ort' strategy. + drivers/cpufreq/cppc_cpufreq.c | 9 +--- + drivers/cpufreq/cpufreq-dt-platdev.c | 1 + + drivers/cpufreq/longhaul.c | 5 +- + drivers/cpufreq/qcom-cpufreq-nvmem.c | 12 ++--- + drivers/cpufreq/scmi-cpufreq.c | 4 +- + drivers/cpufreq/sti-cpufreq.c | 1 + + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 30 +++++------ + drivers/cpufreq/ti-cpufreq.c | 96 ++++++++++++++++++++++++++++++++-- + drivers/opp/ti-opp-supply.c | 6 ++- + 9 files changed, 122 insertions(+), 42 deletions(-) +Merging cpupower/cpupower (3a5bb5066f4c cpupower: fix lib default installation path) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Merge made by the 'ort' strategy. + tools/power/cpupower/Makefile | 10 +--------- + tools/power/cpupower/bench/Makefile | 5 +++++ + 2 files changed, 6 insertions(+), 9 deletions(-) +Merging devfreq/devfreq-next (1d143dde7679 PM / devfreq: exynos: Use Use devm_clk_get_enabled() helpers) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/exynos-bus.c | 22 +++++----------------- + drivers/devfreq/governor_performance.c | 1 + + drivers/devfreq/governor_powersave.c | 1 + + drivers/devfreq/governor_simpleondemand.c | 1 + + drivers/devfreq/governor_userspace.c | 1 + + 5 files changed, 9 insertions(+), 17 deletions(-) +Merging pmdomain/next (cc647e931a24 pmdomain: amlogic: add missing MODULE_DESCRIPTION() macros) +$ 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. + drivers/pmdomain/amlogic/meson-ee-pwrc.c | 1 + + drivers/pmdomain/amlogic/meson-gx-pwrc-vpu.c | 1 + + drivers/pmdomain/amlogic/meson-secure-pwrc.c | 29 ++++++++++++++++++++++++++++ + drivers/pmdomain/arm/scmi_pm_domain.c | 1 + + drivers/pmdomain/core.c | 2 +- + drivers/pmdomain/renesas/rmobile-sysc.c | 8 ++------ + 6 files changed, 35 insertions(+), 7 deletions(-) +Merging opp/opp/linux-next (e3943f00afdb OPP: Introduce an OF helper function to inform if required-opps is used) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Merge made by the 'ort' strategy. + drivers/opp/core.c | 15 ++++++++------- + drivers/opp/of.c | 32 ++++++++++++++++++++++++++++++++ + include/linux/pm_opp.h | 6 ++++++ + 3 files changed, 46 insertions(+), 7 deletions(-) +Merging thermal/thermal/linux-next (7eeb114a635a dt-bindings: thermal: convert hisilicon-thermal.txt to dt-schema) +$ 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 (589b844f1bf0 RDMA/mlx5: Send UAR page index as ioctl attribute) +$ 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 MAINTAINERS +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/mlx5/mr.c +Auto-merging drivers/infiniband/hw/mlx5/srq.c +Auto-merging drivers/infiniband/sw/rxe/rxe_verbs.c +Auto-merging drivers/net/ethernet/microsoft/mana/mana_en.c +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/infiniband/core/cache.c | 14 +- + drivers/infiniband/core/iwcm.c | 41 +- + drivers/infiniband/core/uverbs_cmd.c | 2 +- + drivers/infiniband/core/uverbs_std_types_cq.c | 2 +- + drivers/infiniband/core/verbs.c | 82 +++- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 6 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 12 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_res.h | 6 + + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 1 + + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 1 + + drivers/infiniband/hw/bnxt_re/roce_hsi.h | 30 +- + drivers/infiniband/hw/cxgb4/cq.c | 3 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 2 +- + drivers/infiniband/hw/efa/efa.h | 2 +- + drivers/infiniband/hw/efa/efa_com.c | 30 +- + drivers/infiniband/hw/efa/efa_main.c | 30 +- + drivers/infiniband/hw/efa/efa_verbs.c | 9 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 3 +- + drivers/infiniband/hw/erdma/erdma_verbs.h | 2 +- + drivers/infiniband/hw/hfi1/mmu_rb.c | 2 +- + drivers/infiniband/hw/hfi1/mmu_rb.h | 4 +- + drivers/infiniband/hw/hfi1/pin_system.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 2 +- + drivers/infiniband/hw/irdma/main.h | 2 +- + drivers/infiniband/hw/irdma/verbs.c | 5 +- + drivers/infiniband/hw/mana/cq.c | 3 +- + drivers/infiniband/hw/mana/device.c | 5 + + drivers/infiniband/hw/mana/main.c | 109 +++++- + drivers/infiniband/hw/mana/mana_ib.h | 130 +++++- + drivers/infiniband/hw/mana/qp.c | 198 +++++++++- + drivers/infiniband/hw/mlx4/alias_GUID.c | 2 +- + drivers/infiniband/hw/mlx4/cq.c | 3 +- + drivers/infiniband/hw/mlx4/mad.c | 2 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 2 +- + drivers/infiniband/hw/mlx5/counters.c | 4 + + drivers/infiniband/hw/mlx5/cq.c | 31 +- + drivers/infiniband/hw/mlx5/main.c | 180 ++++++--- + drivers/infiniband/hw/mlx5/mem.c | 198 ---------- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 25 +- + drivers/infiniband/hw/mlx5/mr.c | 9 + + drivers/infiniband/hw/mlx5/odp.c | 6 +- + drivers/infiniband/hw/mlx5/qp.c | 20 +- + drivers/infiniband/hw/mlx5/srq.c | 4 + + drivers/infiniband/hw/mlx5/umr.c | 55 ++- + drivers/infiniband/hw/mlx5/umr.h | 3 + + drivers/infiniband/hw/mthca/mthca_provider.c | 3 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 3 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 2 +- + drivers/infiniband/hw/qedr/verbs.c | 3 +- + drivers/infiniband/hw/qedr/verbs.h | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_cq.c | 5 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 2 +- + drivers/infiniband/sw/rdmavt/cq.c | 6 +- + drivers/infiniband/sw/rdmavt/cq.h | 2 +- + drivers/infiniband/sw/rxe/rxe_req.c | 7 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 3 +- + drivers/infiniband/sw/siw/siw_verbs.c | 5 +- + drivers/infiniband/sw/siw/siw_verbs.h | 2 +- + drivers/infiniband/ulp/isert/ib_isert.c | 3 - + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/wc.c | 434 +++++++++++++++++++++ + drivers/net/ethernet/microsoft/mana/gdma_main.c | 1 + + drivers/net/ethernet/microsoft/mana/mana_en.c | 85 +++- + drivers/net/ethernet/microsoft/mana/mana_ethtool.c | 27 +- + include/linux/mlx5/driver.h | 11 + + include/linux/mlx5/mlx5_ifc.h | 6 +- + include/linux/mlx5/qp.h | 9 +- + include/net/mana/gdma.h | 5 +- + include/net/mana/mana.h | 9 +- + include/rdma/ib_verbs.h | 4 +- + include/uapi/rdma/bnxt_re-abi.h | 2 +- + include/uapi/rdma/ib_user_ioctl_cmds.h | 7 +- + include/uapi/rdma/mana-abi.h | 9 + + include/uapi/rdma/mlx5_user_ioctl_cmds.h | 4 + + 81 files changed, 1491 insertions(+), 471 deletions(-) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/wc.c +Merging net-next/main (ac26327635d6 Merge branch 'fixes-for-stm32-dwmac-driver-fails-to-probe') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/rockchip/rk3066a.dtsi +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/net/bpf_jit_comp64.c +Auto-merging drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/microsoft/mana/gdma_main.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c +Auto-merging drivers/net/ethernet/wangxun/libwx/wx_hw.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/wangxun/libwx/wx_hw.c +Auto-merging drivers/net/ethernet/wangxun/libwx/wx_lib.c +Auto-merging drivers/net/ethernet/wangxun/libwx/wx_type.h +Auto-merging drivers/net/ethernet/wangxun/ngbe/ngbe_main.c +Auto-merging drivers/net/ethernet/wangxun/txgbe/txgbe_main.c +Auto-merging include/linux/bpf.h +Auto-merging include/linux/filter.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +CONFLICT (content): Merge conflict in include/linux/mlx5/mlx5_ifc.h +Auto-merging include/linux/phy.h +Auto-merging include/linux/sched.h +Auto-merging include/net/mac80211.h +Auto-merging include/net/mana/gdma.h +Auto-merging kernel/bpf/syscall.c +Auto-merging net/core/datagram.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging tools/testing/selftests/net/Makefile +Recorded preimage for 'drivers/net/ethernet/wangxun/libwx/wx_hw.c' +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 +Recorded resolution for 'drivers/net/ethernet/wangxun/libwx/wx_hw.c'. +[master f34d6635752c] Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/libbpf/libbpf_overview.rst | 8 + + Documentation/bpf/standardization/abi.rst | 3 + + .../bpf/standardization/instruction-set.rst | 261 +- + Documentation/devicetree/bindings/net/arc_emac.txt | 46 - + .../devicetree/bindings/net/can/xilinx,can.yaml | 2 +- + .../devicetree/bindings/net/cdns,macb.yaml | 1 + + .../devicetree/bindings/net/dsa/lantiq,gswip.yaml | 202 ++ + .../devicetree/bindings/net/dsa/lantiq-gswip.txt | 146 - + .../bindings/net/dsa/mediatek,mt7530.yaml | 6 +- + .../bindings/net/dsa/vitesse,vsc73xx.txt | 129 - + .../bindings/net/dsa/vitesse,vsc73xx.yaml | 162 + + .../bindings/net/ethernet-controller.yaml | 1 + + .../devicetree/bindings/net/fsl,fman-mdio.yaml | 123 + + .../devicetree/bindings/net/fsl,fman-muram.yaml | 40 + + .../devicetree/bindings/net/fsl,fman-port.yaml | 75 + + .../devicetree/bindings/net/fsl,fman.yaml | 204 ++ + Documentation/devicetree/bindings/net/fsl-fman.txt | 548 ---- + .../devicetree/bindings/net/fsl-tsec-phy.txt | 2 +- + .../devicetree/bindings/net/mscc,miim.yaml | 10 + + .../devicetree/bindings/net/realtek,rtl82xx.yaml | 23 + + .../devicetree/bindings/net/snps,dwmac.yaml | 81 +- + .../devicetree/bindings/net/stm32-dwmac.yaml | 49 +- + .../devicetree/bindings/net/ti,icss-iep.yaml | 9 + + .../devicetree/bindings/net/ti,icssg-prueth.yaml | 9 + + .../bindings/net/wireless/qcom,ath10k.yaml | 5 + + .../bindings/net/wireless/qcom,ath11k.yaml | 9 - + .../bindings/net/xlnx,gmii-to-rgmii.yaml | 5 + + Documentation/devicetree/bindings/ptp/fsl,ptp.yaml | 144 + + .../devicetree/bindings/ptp/ptp-qoriq.txt | 87 - + Documentation/netlink/specs/dpll.yaml | 1 + + Documentation/netlink/specs/ethtool.yaml | 86 + + Documentation/netlink/specs/tcp_metrics.yaml | 169 + + .../ethernet/mellanox/mlx5/counters.rst | 24 +- + Documentation/networking/devlink/octeontx2.rst | 16 + + Documentation/networking/ethtool-netlink.rst | 78 + + Documentation/networking/index.rst | 3 + + Documentation/networking/ip-sysctl.rst | 27 + + Documentation/networking/iso15765-2.rst | 386 +++ + Documentation/networking/mptcp-sysctl.rst | 74 +- + Documentation/networking/mptcp.rst | 156 + + Documentation/networking/net_dim.rst | 42 + + Documentation/networking/phy.rst | 6 + + Documentation/networking/sriov.rst | 25 + + Documentation/networking/tcp_ao.rst | 9 + + MAINTAINERS | 26 +- + arch/arm/boot/dts/rockchip/rk3066a.dtsi | 4 - + arch/arm/boot/dts/rockchip/rk3xxx.dtsi | 7 +- + .../boot/dts/ti/k3-am65-iot2050-common-pg1.dtsi | 12 + + arch/riscv/Kconfig | 12 + + arch/riscv/net/bpf_jit.h | 51 + + arch/riscv/net/bpf_jit_comp32.c | 3 +- + arch/riscv/net/bpf_jit_comp64.c | 21 +- + drivers/dma/ti/k3-udma-glue.c | 3 + + drivers/isdn/hardware/mISDN/avmfritz.c | 1 + + drivers/isdn/hardware/mISDN/hfcmulti.c | 1 + + drivers/isdn/hardware/mISDN/hfcpci.c | 1 + + drivers/isdn/hardware/mISDN/hfcsusb.c | 1 + + drivers/isdn/hardware/mISDN/mISDNinfineon.c | 1 + + drivers/isdn/hardware/mISDN/mISDNipac.c | 1 + + drivers/isdn/hardware/mISDN/mISDNisar.c | 1 + + drivers/isdn/hardware/mISDN/netjet.c | 1 + + drivers/isdn/hardware/mISDN/speedfax.c | 1 + + drivers/isdn/hardware/mISDN/w6692.c | 1 + + drivers/isdn/mISDN/core.c | 1 + + drivers/isdn/mISDN/dsp_blowfish.c | 5 - + drivers/isdn/mISDN/dsp_core.c | 1 + + drivers/isdn/mISDN/l1oip_core.c | 1 + + drivers/net/arcnet/com20020-isa.c | 1 + + drivers/net/can/Kconfig | 5 +- + drivers/net/can/kvaser_pciefd.c | 137 +- + drivers/net/can/m_can/m_can.c | 165 +- + drivers/net/can/m_can/m_can.h | 2 +- + drivers/net/can/m_can/m_can_pci.c | 2 +- + drivers/net/can/m_can/m_can_platform.c | 2 +- + drivers/net/can/m_can/tcan4x5x-core.c | 15 +- + drivers/net/can/mscan/mscan.c | 6 - + drivers/net/can/rcar/rcar_canfd.c | 41 +- + drivers/net/can/sja1000/plx_pci.c | 3 +- + drivers/net/can/spi/hi311x.c | 7 +- + drivers/net/can/spi/mcp251x.c | 11 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-core.c | 91 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-dump.c | 2 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-regmap.c | 2 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-ring.c | 5 + + drivers/net/can/spi/mcp251xfd/mcp251xfd-rx.c | 165 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd-tef.c | 129 +- + .../net/can/spi/mcp251xfd/mcp251xfd-timestamp.c | 29 +- + drivers/net/can/spi/mcp251xfd/mcp251xfd.h | 56 +- + drivers/net/can/usb/Kconfig | 3 + + drivers/net/can/usb/gs_usb.c | 5 + + drivers/net/can/usb/kvaser_usb/kvaser_usb_core.c | 9 + + drivers/net/can/xilinx_can.c | 2 +- + drivers/net/dsa/Kconfig | 1 + + drivers/net/dsa/hirschmann/hellcreek.h | 8 +- + drivers/net/dsa/lan9303_i2c.c | 2 +- + drivers/net/dsa/lantiq_gswip.c | 123 +- + drivers/net/dsa/microchip/ksz9477_i2c.c | 4 +- + drivers/net/dsa/microchip/ksz_common.c | 7 + + drivers/net/dsa/mt7530.c | 121 +- + drivers/net/dsa/mt7530.h | 1 + + drivers/net/dsa/ocelot/felix.c | 112 +- + drivers/net/dsa/ocelot/felix.h | 9 +- + drivers/net/dsa/ocelot/felix_vsc9959.c | 112 +- + drivers/net/dsa/ocelot/ocelot_ext.c | 54 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 60 +- + drivers/net/dsa/qca/qca8k-common.c | 118 +- + drivers/net/dsa/qca/qca8k.h | 1 + + drivers/net/dsa/xrs700x/xrs700x_i2c.c | 4 +- + drivers/net/ethernet/8390/ne2k-pci.c | 11 - + drivers/net/ethernet/adaptec/starfire.c | 8 - + drivers/net/ethernet/amd/7990.c | 1 + + drivers/net/ethernet/amd/a2065.c | 1 + + drivers/net/ethernet/amd/ariadne.c | 1 + + drivers/net/ethernet/amd/atarilance.c | 1 + + drivers/net/ethernet/amd/hplance.c | 1 + + drivers/net/ethernet/amd/lance.c | 1 + + drivers/net/ethernet/amd/mvme147.c | 1 + + drivers/net/ethernet/amd/sun3lance.c | 1 + + drivers/net/ethernet/arc/Kconfig | 10 - + drivers/net/ethernet/arc/Makefile | 1 - + drivers/net/ethernet/arc/emac_arc.c | 88 - + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 681 +++- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 42 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 14 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 157 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 44 +- + drivers/net/ethernet/cadence/macb.h | 8 + + drivers/net/ethernet/cadence/macb_main.c | 121 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 6 - + drivers/net/ethernet/cavium/liquidio/octeon_droq.c | 5 - + drivers/net/ethernet/cavium/thunder/thunder_bgx.c | 21 +- + drivers/net/ethernet/cirrus/mac89x0.c | 1 + + drivers/net/ethernet/cisco/enic/enic_ethtool.c | 23 + + drivers/net/ethernet/cortina/gemini.c | 56 +- + drivers/net/ethernet/freescale/fec_main.c | 6 + + drivers/net/ethernet/freescale/fman/fman_memac.c | 16 +- + drivers/net/ethernet/google/gve/Makefile | 2 +- + drivers/net/ethernet/google/gve/gve.h | 54 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 228 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 103 + + drivers/net/ethernet/google/gve/gve_ethtool.c | 72 +- + drivers/net/ethernet/google/gve/gve_flow_rule.c | 298 ++ + drivers/net/ethernet/google/gve/gve_main.c | 83 +- + drivers/net/ethernet/hisilicon/hns3/Makefile | 11 +- + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 11 + + .../hisilicon/hns3/hns3_common/hclge_comm_rss.c | 14 + + .../hns3/hns3_common/hclge_comm_tqp_stats.c | 5 + + drivers/net/ethernet/intel/e1000/Makefile | 2 +- + drivers/net/ethernet/intel/e1000e/Makefile | 7 +- + drivers/net/ethernet/intel/i40e/Makefile | 2 +- + drivers/net/ethernet/intel/iavf/Makefile | 5 +- + drivers/net/ethernet/intel/ice/devlink/devlink.c | 2 - + .../net/ethernet/intel/ice/devlink/devlink_port.c | 61 +- + drivers/net/ethernet/intel/ice/ice_adapter.c | 56 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 1 + + drivers/net/ethernet/intel/ice/ice_cgu_regs.h | 77 +- + drivers/net/ethernet/intel/ice/ice_common.c | 74 +- + drivers/net/ethernet/intel/ice/ice_common.h | 4 +- + drivers/net/ethernet/intel/ice/ice_controlq.c | 30 +- + drivers/net/ethernet/intel/ice/ice_controlq.h | 15 +- + drivers/net/ethernet/intel/ice/ice_eswitch.c | 85 +- + drivers/net/ethernet/intel/ice/ice_eswitch.h | 14 +- + drivers/net/ethernet/intel/ice/ice_eswitch_br.c | 4 +- + drivers/net/ethernet/intel/ice/ice_eswitch_br.h | 1 + + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 4 + + drivers/net/ethernet/intel/ice/ice_lib.c | 4 +- + drivers/net/ethernet/intel/ice/ice_main.c | 23 +- + drivers/net/ethernet/intel/ice/ice_ptp.c | 211 +- + drivers/net/ethernet/intel/ice/ice_ptp.h | 1 + + drivers/net/ethernet/intel/ice/ice_ptp_consts.h | 402 +++ + drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 3256 ++++++++++++++++---- + drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 295 +- + drivers/net/ethernet/intel/ice/ice_repr.c | 16 +- + drivers/net/ethernet/intel/ice/ice_repr.h | 3 +- + drivers/net/ethernet/intel/ice/ice_sbq_cmd.h | 10 +- + drivers/net/ethernet/intel/ice/ice_sriov.c | 34 +- + drivers/net/ethernet/intel/ice/ice_sriov.h | 8 + + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 4 + + drivers/net/ethernet/intel/ice/ice_type.h | 58 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 2 +- + drivers/net/ethernet/intel/igb/Makefile | 6 +- + drivers/net/ethernet/intel/igb/igb_main.c | 4 + + drivers/net/ethernet/intel/igbvf/Makefile | 6 +- + drivers/net/ethernet/intel/igc/Makefile | 6 +- + drivers/net/ethernet/intel/ixgbe/Makefile | 8 +- + drivers/net/ethernet/intel/ixgbevf/Makefile | 6 +- + drivers/net/ethernet/intel/libeth/Makefile | 2 +- + drivers/net/ethernet/intel/libie/Makefile | 2 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 8 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 66 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 2 + + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 365 +++ + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 4 +- + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 9 + + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 7 +- + .../ethernet/marvell/octeontx2/nic/otx2_devlink.c | 64 + + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 20 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 26 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 112 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 8 +- + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 17 +- + drivers/net/ethernet/mellanox/mlx4/en_cq.c | 14 + + drivers/net/ethernet/mellanox/mlx4/en_ethtool.c | 59 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 74 + + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 6 - + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 24 +- + .../net/ethernet/mellanox/mlx5/core/en/params.c | 12 +- + drivers/net/ethernet/mellanox/mlx5/core/en/qos.c | 13 +- + drivers/net/ethernet/mellanox/mlx5/core/en/tc_ct.c | 187 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 6 + + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 56 + + .../mellanox/mlx5/core/en_accel/ipsec_rxtx.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 216 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 211 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 7 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/Kconfig | 1 + + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 57 + + drivers/net/ethernet/mellanox/mlxsw/core_env.h | 6 + + drivers/net/ethernet/mellanox/mlxsw/minimal.c | 19 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 320 +- + drivers/net/ethernet/mellanox/mlxsw/port.h | 3 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 31 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum.h | 1 - + .../ethernet/mellanox/mlxsw/spectrum_acl_atcam.c | 20 +- + .../mellanox/mlxsw/spectrum_acl_bloom_filter.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_acl_erp.c | 13 - + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.h | 9 +- + .../net/ethernet/mellanox/mlxsw/spectrum_buffers.c | 8 +- + .../net/ethernet/mellanox/mlxsw/spectrum_dpipe.c | 8 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 15 + + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 6 +- + .../ethernet/microchip/lan966x/lan966x_ethtool.c | 8 - + .../ethernet/microchip/lan966x/lan966x_vcap_impl.c | 2 +- + .../ethernet/microchip/sparx5/sparx5_vcap_impl.c | 2 +- + drivers/net/ethernet/microchip/vcap/vcap_api.h | 2 +- + .../microchip/vcap/vcap_api_debugfs_kunit.c | 2 +- + .../net/ethernet/microchip/vcap/vcap_api_kunit.c | 2 +- + drivers/net/ethernet/microsoft/Kconfig | 2 +- + drivers/net/ethernet/microsoft/mana/gdma_main.c | 10 +- + drivers/net/ethernet/microsoft/mana/hw_channel.c | 14 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 14 +- + drivers/net/ethernet/microsoft/mana/shm_channel.c | 13 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 4 + + drivers/net/ethernet/pensando/ionic/ionic.h | 7 + + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 8 + + .../net/ethernet/pensando/ionic/ionic_debugfs.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.c | 129 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 8 +- + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 11 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 237 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 151 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.h | 12 +- + drivers/net/ethernet/pensando/ionic/ionic_main.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 56 +- + drivers/net/ethernet/realtek/r8169_main.c | 12 +- + drivers/net/ethernet/renesas/Kconfig | 11 + + drivers/net/ethernet/renesas/Makefile | 2 + + drivers/net/ethernet/renesas/ravb.h | 15 +- + drivers/net/ethernet/renesas/ravb_main.c | 562 ++-- + drivers/net/ethernet/renesas/rtsn.c | 1391 +++++++++ + drivers/net/ethernet/renesas/rtsn.h | 464 +++ + drivers/net/ethernet/sfc/ef10.c | 2 +- + drivers/net/ethernet/sfc/ef100_ethtool.c | 4 + + drivers/net/ethernet/sfc/efx.c | 2 +- + drivers/net/ethernet/sfc/efx.h | 2 +- + drivers/net/ethernet/sfc/efx_common.c | 10 +- + drivers/net/ethernet/sfc/ethtool.c | 4 + + drivers/net/ethernet/sfc/ethtool_common.c | 168 +- + drivers/net/ethernet/sfc/ethtool_common.h | 12 + + drivers/net/ethernet/sfc/mcdi_filters.c | 135 +- + drivers/net/ethernet/sfc/mcdi_filters.h | 8 +- + drivers/net/ethernet/sfc/net_driver.h | 28 +- + drivers/net/ethernet/sfc/rx_common.c | 64 +- + drivers/net/ethernet/sfc/rx_common.h | 8 +- + drivers/net/ethernet/sfc/tc.c | 5 +- + drivers/net/ethernet/smsc/smc9194.c | 1 + + drivers/net/ethernet/smsc/smc91x.c | 4 - + drivers/net/ethernet/smsc/smc91x.h | 4 +- + drivers/net/ethernet/stmicro/stmmac/common.h | 2 - + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 26 +- + .../ethernet/stmicro/stmmac/dwmac-qcom-ethqos.c | 24 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rzn1.c | 7 + + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 7 + + drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 259 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_core.c | 8 +- + .../net/ethernet/stmicro/stmmac/dwmac1000_dma.c | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac100_core.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac100_dma.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 8 - + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 6 - + drivers/net/ethernet/stmicro/stmmac/hwif.h | 3 - + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 84 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_pcs.h | 17 - + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 10 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.h | 5 - + drivers/net/ethernet/synopsys/dwc-xlgmac-common.c | 7 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-pci.c | 5 - + drivers/net/ethernet/tehuti/Kconfig | 15 + + drivers/net/ethernet/tehuti/Makefile | 3 + + drivers/net/ethernet/tehuti/tn40.c | 1800 +++++++++++ + drivers/net/ethernet/tehuti/tn40.h | 232 ++ + drivers/net/ethernet/tehuti/tn40_mdio.c | 142 + + drivers/net/ethernet/tehuti/tn40_phy.c | 76 + + drivers/net/ethernet/tehuti/tn40_regs.h | 245 ++ + drivers/net/ethernet/ti/Kconfig | 1 + + drivers/net/ethernet/ti/Makefile | 3 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 11 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 2 +- + drivers/net/ethernet/ti/icssg/icss_iep.c | 88 +- + drivers/net/ethernet/ti/icssg/icssg_common.c | 6 +- + drivers/net/ethernet/ti/icssg/icssg_config.c | 326 +- + drivers/net/ethernet/ti/icssg/icssg_config.h | 26 + + drivers/net/ethernet/ti/icssg/icssg_prueth.c | 288 +- + drivers/net/ethernet/ti/icssg/icssg_prueth.h | 36 + + drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c | 51 +- + drivers/net/ethernet/ti/icssg/icssg_switchdev.c | 477 +++ + drivers/net/ethernet/ti/icssg/icssg_switchdev.h | 13 + + drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 39 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 32 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.h | 2 + + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 62 +- + drivers/net/ethernet/wangxun/libwx/wx_lib.h | 1 + + drivers/net/ethernet/wangxun/libwx/wx_type.h | 56 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c | 4 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 2 +- + drivers/net/ethernet/wangxun/txgbe/Makefile | 1 + + drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c | 427 +++ + drivers/net/ethernet/wangxun/txgbe/txgbe_fdir.c | 643 ++++ + drivers/net/ethernet/wangxun/txgbe/txgbe_fdir.h | 20 + + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 18 + + drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 147 + + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 7 +- + drivers/net/fjes/fjes_trace.h | 2 +- + drivers/net/mctp/mctp-i2c.c | 4 +- + drivers/net/mdio/mdio-mscc-miim.c | 8 + + drivers/net/netconsole.c | 2 + + drivers/net/phy/aquantia/Makefile | 2 +- + drivers/net/phy/aquantia/aquantia.h | 78 + + drivers/net/phy/aquantia/aquantia_leds.c | 150 + + drivers/net/phy/aquantia/aquantia_main.c | 100 +- + drivers/net/phy/phy-core.c | 1 + + drivers/net/phy/phy.c | 2 +- + drivers/net/phy/phy_device.c | 9 +- + drivers/net/phy/phylink.c | 22 +- + drivers/net/phy/realtek.c | 114 + + drivers/net/phy/xilinx_gmii2rgmii.c | 7 + + drivers/net/pse-pd/pd692x0.c | 4 +- + drivers/net/pse-pd/tps23881.c | 4 +- + drivers/net/usb/cdc_ncm.c | 47 +- + drivers/net/usb/lan78xx.c | 12 +- + drivers/net/usb/r8152.c | 21 + + drivers/net/usb/smsc75xx.c | 5 - + drivers/net/virtio_net.c | 140 +- + drivers/net/vmxnet3/Makefile | 2 +- + drivers/net/vmxnet3/vmxnet3_defs.h | 61 +- + drivers/net/vmxnet3/vmxnet3_drv.c | 217 +- + drivers/net/vmxnet3/vmxnet3_ethtool.c | 2 +- + drivers/net/vmxnet3/vmxnet3_int.h | 33 +- + drivers/net/vrf.c | 56 +- + drivers/net/wireless/admtek/adm8211.c | 2 +- + drivers/net/wireless/ath/ar5523/ar5523.c | 2 +- + drivers/net/wireless/ath/ath10k/Kconfig | 6 + + drivers/net/wireless/ath/ath10k/Makefile | 1 + + drivers/net/wireless/ath/ath10k/core.c | 32 + + drivers/net/wireless/ath/ath10k/core.h | 8 + + drivers/net/wireless/ath/ath10k/hw.h | 1 + + drivers/net/wireless/ath/ath10k/leds.c | 90 + + drivers/net/wireless/ath/ath10k/leds.h | 34 + + drivers/net/wireless/ath/ath10k/mac.c | 3 +- + drivers/net/wireless/ath/ath10k/qmi.c | 11 + + drivers/net/wireless/ath/ath10k/qmi.h | 1 + + drivers/net/wireless/ath/ath10k/wmi-ops.h | 32 + + drivers/net/wireless/ath/ath10k/wmi-tlv.c | 2 + + drivers/net/wireless/ath/ath10k/wmi.c | 54 + + drivers/net/wireless/ath/ath10k/wmi.h | 35 + + drivers/net/wireless/ath/ath11k/ahb.c | 57 +- + drivers/net/wireless/ath/ath11k/ce.h | 6 +- + drivers/net/wireless/ath/ath11k/core.c | 49 +- + drivers/net/wireless/ath/ath11k/core.h | 9 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 6 +- + drivers/net/wireless/ath/ath11k/dp.c | 12 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 104 +- + drivers/net/wireless/ath/ath11k/dp_tx.c | 6 +- + drivers/net/wireless/ath/ath11k/hal.c | 16 +- + drivers/net/wireless/ath/ath11k/hal.h | 2 + + drivers/net/wireless/ath/ath11k/hw.h | 4 +- + drivers/net/wireless/ath/ath11k/mac.c | 169 +- + drivers/net/wireless/ath/ath11k/qmi.c | 2 +- + drivers/net/wireless/ath/ath11k/reg.c | 18 +- + drivers/net/wireless/ath/ath11k/reg.h | 4 +- + drivers/net/wireless/ath/ath11k/wmi.c | 2 +- + drivers/net/wireless/ath/ath12k/ce.h | 6 +- + drivers/net/wireless/ath/ath12k/core.c | 144 +- + drivers/net/wireless/ath/ath12k/core.h | 44 +- + drivers/net/wireless/ath/ath12k/dp.c | 83 +- + drivers/net/wireless/ath/ath12k/dp.h | 4 +- + drivers/net/wireless/ath/ath12k/dp_mon.c | 40 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 115 +- + drivers/net/wireless/ath/ath12k/dp_tx.c | 165 +- + drivers/net/wireless/ath/ath12k/dp_tx.h | 5 +- + drivers/net/wireless/ath/ath12k/hal.c | 5 +- + drivers/net/wireless/ath/ath12k/hal.h | 21 +- + drivers/net/wireless/ath/ath12k/hal_desc.h | 47 +- + drivers/net/wireless/ath/ath12k/hal_tx.h | 4 +- + drivers/net/wireless/ath/ath12k/hif.h | 9 + + drivers/net/wireless/ath/ath12k/hw.c | 23 +- + drivers/net/wireless/ath/ath12k/hw.h | 4 +- + drivers/net/wireless/ath/ath12k/mac.c | 576 +++- + drivers/net/wireless/ath/ath12k/mhi.c | 11 + + drivers/net/wireless/ath/ath12k/pci.c | 39 +- + drivers/net/wireless/ath/ath12k/pci.h | 1 + + drivers/net/wireless/ath/ath12k/qmi.c | 8 +- + drivers/net/wireless/ath/ath12k/reg.c | 19 +- + drivers/net/wireless/ath/ath12k/wmi.c | 55 +- + drivers/net/wireless/ath/ath12k/wmi.h | 48 +- + drivers/net/wireless/ath/ath5k/base.c | 2 +- + drivers/net/wireless/ath/ath5k/base.h | 2 +- + drivers/net/wireless/ath/ath9k/htc_drv_main.c | 2 +- + drivers/net/wireless/ath/ath9k/main.c | 2 +- + drivers/net/wireless/ath/carl9170/main.c | 2 +- + drivers/net/wireless/ath/wcn36xx/main.c | 2 +- + drivers/net/wireless/ath/wil6210/netdev.c | 21 +- + drivers/net/wireless/ath/wil6210/wil6210.h | 2 +- + drivers/net/wireless/atmel/at76c50x-usb.c | 58 +- + drivers/net/wireless/atmel/at76c50x-usb.h | 2 +- + drivers/net/wireless/broadcom/b43/main.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/btcoex.c | 4 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 10 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 5 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 5 - + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 2 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 6 +- + .../wireless/broadcom/brcm80211/brcmsmac/aiutils.c | 2 +- + .../wireless/broadcom/brcm80211/brcmsmac/ampdu.c | 2 +- + .../wireless/broadcom/brcm80211/brcmsmac/antsel.c | 2 +- + .../wireless/broadcom/brcm80211/brcmsmac/channel.c | 2 +- + .../net/wireless/broadcom/brcm80211/brcmsmac/dma.c | 2 +- + .../broadcom/brcm80211/brcmsmac/mac80211_if.c | 5 +- + .../wireless/broadcom/brcm80211/brcmsmac/main.c | 29 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_cmn.c | 4 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_lcn.c | 24 +- + .../broadcom/brcm80211/brcmsmac/phy_shim.c | 4 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 2 +- + drivers/net/wireless/intel/iwlegacy/3945.c | 2 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 4 +- + drivers/net/wireless/intel/iwlegacy/4965.h | 2 +- + drivers/net/wireless/intel/iwlwifi/Makefile | 3 +- + drivers/net/wireless/intel/iwlwifi/cfg/22000.c | 4 +- + drivers/net/wireless/intel/iwlwifi/cfg/ax210.c | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 4 +- + drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 4 +- + drivers/net/wireless/intel/iwlwifi/dvm/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/agn.h | 21 +- + drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 8 +- + drivers/net/wireless/intel/iwlwifi/dvm/dev.h | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/devices.c | 2 +- + .../iwlwifi/{iwl-eeprom-parse.c => dvm/eeprom.c} | 480 ++- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 8 +- + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.c | 21 +- + drivers/net/wireless/intel/iwlwifi/dvm/tt.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 1 + + drivers/net/wireless/intel/iwlwifi/fw/api/alive.h | 6 +- + .../net/wireless/intel/iwlwifi/fw/api/binding.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/coex.h | 69 +- + drivers/net/wireless/intel/iwlwifi/fw/api/config.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 4 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 27 +- + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 9 +- + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 3 +- + .../net/wireless/intel/iwlwifi/fw/api/location.h | 159 +- + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 2 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 56 +- + .../net/wireless/intel/iwlwifi/fw/api/offload.h | 2 +- + .../net/wireless/intel/iwlwifi/fw/api/phy-ctxt.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/phy.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 10 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rs.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 16 +- + .../net/wireless/intel/iwlwifi/fw/api/time-event.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 3 +- + drivers/net/wireless/intel/iwlwifi/fw/error-dump.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/init.c | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 15 +- + drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 3 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 3 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 6 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 6 - + .../net/wireless/intel/iwlwifi/iwl-devtrace-data.h | 4 +- + .../wireless/intel/iwlwifi/iwl-devtrace-iwlwifi.h | 8 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 16 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-read.c | 394 --- + .../net/wireless/intel/iwlwifi/iwl-eeprom-read.h | 12 - + drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 34 +- + drivers/net/wireless/intel/iwlwifi/iwl-io.c | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-modparams.h | 21 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 42 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 8 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.c | 118 + + .../{iwl-eeprom-parse.h => iwl-nvm-utils.h} | 17 - + drivers/net/wireless/intel/iwlwifi/iwl-op-mode.h | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 448 ++- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 649 +--- + drivers/net/wireless/intel/iwlwifi/mei/iwl-mei.h | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 85 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 38 + + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 231 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 303 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-responder.c | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 53 +- + drivers/net/wireless/intel/iwlwifi/mvm/link.c | 54 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 408 ++- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 145 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 79 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 5 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 82 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 139 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 19 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 3 + + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 22 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 30 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 34 +- + .../net/wireless/intel/iwlwifi/mvm/tests/links.c | 4 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 182 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 62 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 40 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 7 +- + .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 2 +- + .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 4 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 86 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 262 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 9 +- + .../net/wireless/intel/iwlwifi/pcie/trans-gen2.c | 13 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 295 +- + drivers/net/wireless/intel/iwlwifi/pcie/tx-gen2.c | 1130 ++++++- + drivers/net/wireless/intel/iwlwifi/pcie/tx.c | 999 +++++- + drivers/net/wireless/intel/iwlwifi/queue/tx.c | 1900 ------------ + drivers/net/wireless/intel/iwlwifi/queue/tx.h | 191 -- + drivers/net/wireless/intersil/p54/fwio.c | 6 +- + drivers/net/wireless/intersil/p54/main.c | 2 +- + drivers/net/wireless/intersil/p54/p54pci.c | 8 +- + drivers/net/wireless/intersil/p54/p54spi.c | 10 +- + drivers/net/wireless/marvell/libertas_tf/main.c | 2 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 2 + + drivers/net/wireless/marvell/mwl8k.c | 14 +- + drivers/net/wireless/mediatek/mt76/debugfs.c | 6 +- + drivers/net/wireless/mediatek/mt76/dma.c | 31 +- + drivers/net/wireless/mediatek/mt76/dma.h | 9 + + drivers/net/wireless/mediatek/mt76/mt76.h | 4 +- + drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/dma.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x0/pci.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x0/usb.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/pci_main.c | 2 +- + .../net/wireless/mediatek/mt76/mt76x2/usb_main.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/dma.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7925/pci.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt792x.h | 4 +- + drivers/net/wireless/mediatek/mt76/mt792x_core.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt792x_dma.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt792x_usb.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7996/dma.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7996/main.c | 2 +- + drivers/net/wireless/mediatek/mt7601u/main.c | 2 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 29 - + drivers/net/wireless/microchip/wilc1000/fw.h | 13 + + drivers/net/wireless/microchip/wilc1000/hif.c | 4 +- + drivers/net/wireless/microchip/wilc1000/hif.h | 2 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 76 +- + drivers/net/wireless/microchip/wilc1000/netdev.h | 3 +- + drivers/net/wireless/microchip/wilc1000/sdio.c | 145 +- + drivers/net/wireless/microchip/wilc1000/spi.c | 17 +- + drivers/net/wireless/microchip/wilc1000/wlan.c | 57 +- + drivers/net/wireless/microchip/wilc1000/wlan.h | 2 +- + drivers/net/wireless/purelifi/plfxlc/mac.c | 2 +- + drivers/net/wireless/purelifi/plfxlc/mac.h | 2 +- + drivers/net/wireless/purelifi/plfxlc/usb.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2x00.h | 12 +- + drivers/net/wireless/ralink/rt2x00/rt2x00mac.c | 2 +- + drivers/net/wireless/realtek/rtl818x/rtl8180/dev.c | 2 +- + drivers/net/wireless/realtek/rtl818x/rtl8187/dev.c | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/core.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/Kconfig | 12 + + drivers/net/wireless/realtek/rtlwifi/Makefile | 1 + + drivers/net/wireless/realtek/rtlwifi/base.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/sw.c | 3 +- + .../wireless/realtek/rtlwifi/rtl8192d/hw_common.c | 94 +- + .../wireless/realtek/rtlwifi/rtl8192d/hw_common.h | 28 +- + .../wireless/realtek/rtlwifi/rtl8192d/trx_common.c | 92 +- + .../wireless/realtek/rtlwifi/rtl8192d/trx_common.h | 16 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 18 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 20 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 2 +- + .../wireless/realtek/rtlwifi/rtl8192du/Makefile | 13 + + .../net/wireless/realtek/rtlwifi/rtl8192du/dm.c | 120 + + .../net/wireless/realtek/rtlwifi/rtl8192du/dm.h | 10 + + .../net/wireless/realtek/rtlwifi/rtl8192du/fw.c | 63 + + .../net/wireless/realtek/rtlwifi/rtl8192du/fw.h | 9 + + .../net/wireless/realtek/rtlwifi/rtl8192du/hw.c | 1212 ++++++++ + .../net/wireless/realtek/rtlwifi/rtl8192du/hw.h | 22 + + .../net/wireless/realtek/rtlwifi/rtl8192du/led.c | 10 + + .../net/wireless/realtek/rtlwifi/rtl8192du/led.h | 9 + + .../net/wireless/realtek/rtlwifi/rtl8192du/phy.c | 3123 +++++++++++++++++++ + .../net/wireless/realtek/rtlwifi/rtl8192du/phy.h | 32 + + .../net/wireless/realtek/rtlwifi/rtl8192du/rf.c | 240 ++ + .../net/wireless/realtek/rtlwifi/rtl8192du/rf.h | 11 + + .../net/wireless/realtek/rtlwifi/rtl8192du/sw.c | 395 +++ + .../net/wireless/realtek/rtlwifi/rtl8192du/table.c | 1675 ++++++++++ + .../net/wireless/realtek/rtlwifi/rtl8192du/table.h | 29 + + .../net/wireless/realtek/rtlwifi/rtl8192du/trx.c | 372 +++ + .../net/wireless/realtek/rtlwifi/rtl8192du/trx.h | 60 + + drivers/net/wireless/realtek/rtlwifi/usb.c | 36 +- + drivers/net/wireless/realtek/rtlwifi/usb.h | 2 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 12 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 2 +- + drivers/net/wireless/realtek/rtw88/pci.c | 17 +- + drivers/net/wireless/realtek/rtw88/pci.h | 2 +- + drivers/net/wireless/realtek/rtw88/usb.c | 14 +- + drivers/net/wireless/realtek/rtw89/cam.c | 79 +- + drivers/net/wireless/realtek/rtw89/chan.c | 5 +- + drivers/net/wireless/realtek/rtw89/core.c | 107 +- + drivers/net/wireless/realtek/rtw89/core.h | 20 +- + drivers/net/wireless/realtek/rtw89/debug.c | 16 +- + drivers/net/wireless/realtek/rtw89/fw.c | 31 +- + drivers/net/wireless/realtek/rtw89/fw.h | 4 + + drivers/net/wireless/realtek/rtw89/mac.c | 12 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 44 +- + drivers/net/wireless/realtek/rtw89/pci.c | 29 +- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 7 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 1 + + drivers/net/wireless/realtek/rtw89/ser.c | 8 +- + drivers/net/wireless/realtek/rtw89/txrx.h | 4 + + drivers/net/wireless/rsi/rsi_91x_mac80211.c | 3 +- + drivers/net/wireless/silabs/wfx/sta.c | 2 +- + drivers/net/wireless/silabs/wfx/sta.h | 2 +- + drivers/net/wireless/st/cw1200/sta.c | 2 +- + drivers/net/wireless/st/cw1200/sta.h | 2 +- + drivers/net/wireless/ti/wl1251/main.c | 2 +- + drivers/net/wireless/ti/wl18xx/main.c | 71 +- + drivers/net/wireless/ti/wl18xx/tx.c | 13 +- + drivers/net/wireless/ti/wl18xx/wl18xx.h | 62 +- + drivers/net/wireless/ti/wlcore/cmd.c | 9 + + drivers/net/wireless/ti/wlcore/event.c | 2 +- + drivers/net/wireless/ti/wlcore/main.c | 103 +- + drivers/net/wireless/ti/wlcore/wlcore_i.h | 4 + + drivers/net/wireless/virtual/mac80211_hwsim.c | 3 +- + drivers/net/wireless/zydas/zd1211rw/zd_mac.c | 2 +- + drivers/net/wireless/zydas/zd1211rw/zd_mac.h | 2 +- + drivers/net/wireless/zydas/zd1211rw/zd_usb.c | 10 +- + drivers/nfc/microread/i2c.c | 2 +- + drivers/nfc/nfcmrvl/i2c.c | 2 +- + drivers/nfc/nxp-nci/i2c.c | 2 +- + drivers/nfc/pn533/i2c.c | 2 +- + drivers/nfc/pn544/i2c.c | 2 +- + drivers/nfc/s3fwrn5/i2c.c | 2 +- + drivers/nfc/st-nci/i2c.c | 2 +- + drivers/nfc/st21nfca/i2c.c | 2 +- + drivers/s390/net/lcs.c | 3 +- + drivers/soc/fsl/Kconfig | 2 +- + drivers/staging/vt6655/device_main.c | 2 +- + drivers/staging/vt6656/main_usb.c | 2 +- + include/linux/bpf.h | 23 +- + include/linux/dim.h | 113 + + include/linux/ethtool.h | 134 +- + include/linux/filter.h | 127 +- + include/linux/ieee80211.h | 290 +- + include/linux/local_lock.h | 21 + + include/linux/local_lock_internal.h | 31 + + include/linux/lockdep.h | 3 + + include/linux/math64.h | 28 + + include/linux/mlx5/device.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 21 +- + include/linux/netdevice.h | 74 +- + include/linux/netdevice_xmit.h | 13 + + include/linux/netlink.h | 1 - + include/linux/objagg.h | 1 - + include/linux/pci_ids.h | 2 + + include/linux/phy.h | 4 + + include/linux/phylink.h | 6 +- + include/linux/sched.h | 8 +- + include/linux/sfp.h | 6 + + include/linux/skbuff.h | 101 +- + include/linux/socket.h | 2 +- + include/linux/stmmac.h | 6 +- + include/net/af_unix.h | 14 - + include/net/caif/caif_layer.h | 2 - + include/net/cfg80211.h | 187 +- + include/net/devlink.h | 4 +- + include/net/dsa.h | 6 - + include/net/flow_dissector.h | 11 + + include/net/flow_offload.h | 35 + + include/net/ieee80211_radiotap.h | 1 + + include/net/inet_frag.h | 4 +- + include/net/inet_timewait_sock.h | 11 +- + include/net/ip.h | 3 +- + include/net/ip_fib.h | 28 + + include/net/ip_tunnels.h | 12 + + include/net/mac80211.h | 49 +- + include/net/mana/gdma.h | 10 +- + include/net/mana/mana.h | 3 +- + include/net/netdev_queues.h | 2 + + include/net/netfilter/nf_tables.h | 222 +- + include/net/netns/ipv4.h | 9 + + include/net/page_pool/types.h | 1 + + include/net/regulatory.h | 2 - + include/net/request_sock.h | 37 +- + include/net/seg6.h | 7 + + include/net/seg6_hmac.h | 7 + + include/net/seg6_local.h | 1 + + include/net/sock.h | 7 +- + include/net/tcp.h | 111 +- + include/net/tcp_ao.h | 42 +- + include/net/xdp_sock.h | 14 +- + include/trace/events/skb.h | 11 +- + include/trace/events/tcp.h | 317 ++ + include/uapi/linux/bpf.h | 15 +- + include/uapi/linux/can/isotp.h | 2 +- + include/uapi/linux/ethtool.h | 18 + + include/uapi/linux/ethtool_netlink.h | 41 + + include/uapi/linux/in.h | 2 + + include/uapi/linux/netfilter/nf_tables.h | 2 +- + include/uapi/linux/nl80211.h | 6 + + include/uapi/linux/pkt_cls.h | 3 + + include/uapi/linux/tcp_metrics.h | 22 +- + io_uring/net.c | 16 +- + kernel/bpf/bpf_local_storage.c | 4 +- + kernel/bpf/bpf_struct_ops.c | 75 +- + kernel/bpf/btf.c | 310 +- + kernel/bpf/cpumap.c | 35 +- + kernel/bpf/devmap.c | 30 +- + kernel/bpf/helpers.c | 119 + + kernel/bpf/syscall.c | 34 +- + kernel/bpf/verifier.c | 4 +- + kernel/locking/spinlock.c | 8 + + lib/Kconfig | 1 + + lib/dim/net_dim.c | 144 +- + lib/objagg.c | 20 +- + lib/test_bpf.c | 1 + + lib/test_objagg.c | 2 +- + net/Kconfig | 13 +- + net/atm/ioctl.c | 4 +- + net/bpf/bpf_dummy_struct_ops.c | 4 +- + net/bpf/test_run.c | 11 +- + net/bridge/br_netfilter_hooks.c | 20 +- + net/bridge/br_netlink_tunnel.c | 4 +- + net/bridge/netfilter/nf_conntrack_bridge.c | 6 +- + net/caif/cfpkt_skbuff.c | 7 - + net/can/Kconfig | 11 +- + net/can/isotp.c | 11 +- + net/core/datagram.c | 47 +- + net/core/dev.c | 157 +- + net/core/dev.h | 22 + + net/core/dev_ioctl.c | 1 - + net/core/drop_monitor.c | 9 +- + net/core/filter.c | 153 +- + net/core/flow_dissector.c | 44 +- + net/core/gen_estimator.c | 2 +- + net/core/lwt_bpf.c | 9 +- + net/core/neighbour.c | 2 +- + net/core/page_pool.c | 7 +- + net/core/rtnetlink.c | 9 +- + net/core/skbuff.c | 68 +- + net/core/sock.c | 35 +- + net/core/sock_diag.c | 8 +- + net/core/sysctl_net_core.c | 75 +- + net/dccp/minisocks.c | 9 +- + net/devlink/dpipe.c | 2 +- + net/dsa/Kconfig | 2 +- + net/dsa/dsa.c | 2 - + net/dsa/port.c | 72 +- + net/dsa/user.c | 107 +- + net/dsa/user.h | 2 + + net/ethtool/Makefile | 2 +- + net/ethtool/cabletest.c | 4 - + net/ethtool/cmis.h | 124 + + net/ethtool/cmis_cdb.c | 602 ++++ + net/ethtool/cmis_fw_update.c | 399 +++ + net/ethtool/coalesce.c | 274 +- + net/ethtool/eeprom.c | 6 + + net/ethtool/ioctl.c | 148 +- + net/ethtool/module.c | 394 +++ + net/ethtool/module_fw.h | 75 + + net/ethtool/netlink.c | 56 + + net/ethtool/netlink.h | 16 + + net/ethtool/wol.c | 2 +- + net/hsr/hsr_device.c | 63 +- + net/hsr/hsr_forward.c | 41 +- + net/hsr/hsr_framereg.c | 12 + + net/hsr/hsr_framereg.h | 2 + + net/hsr/hsr_main.h | 4 +- + net/hsr/hsr_netlink.c | 1 + + net/ieee802154/6lowpan/reassembly.c | 2 +- + net/ipv4/bpf_tcp_ca.c | 6 +- + net/ipv4/cipso_ipv4.c | 2 +- + net/ipv4/fib_semantics.c | 5 +- + net/ipv4/fou_core.c | 2 +- + net/ipv4/inet_connection_sock.c | 58 + + net/ipv4/inet_fragment.c | 2 +- + net/ipv4/inet_timewait_sock.c | 63 +- + net/ipv4/ip_fragment.c | 2 +- + net/ipv4/ip_output.c | 14 +- + net/ipv4/ip_tunnel.c | 10 +- + net/ipv4/metrics.c | 8 +- + net/ipv4/ping.c | 2 +- + net/ipv4/raw.c | 6 +- + net/ipv4/route.c | 16 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/sysctl_net_ipv4.c | 80 +- + net/ipv4/tcp.c | 112 +- + net/ipv4/tcp_ao.c | 24 +- + net/ipv4/tcp_cong.c | 11 +- + net/ipv4/tcp_fastopen.c | 7 +- + net/ipv4/tcp_input.c | 78 +- + net/ipv4/tcp_ipv4.c | 60 +- + net/ipv4/tcp_minisocks.c | 31 +- + net/ipv4/tcp_output.c | 27 +- + net/ipv4/tcp_sigpool.c | 17 +- + net/ipv4/tcp_timer.c | 6 +- + net/ipv4/udp.c | 15 +- + net/ipv4/udp_offload.c | 8 + + net/ipv6/addrconf.c | 8 +- + net/ipv6/af_inet6.c | 2 +- + net/ipv6/ip6_fib.c | 2 +- + net/ipv6/ip6_output.c | 11 +- + net/ipv6/ipv6_sockglue.c | 3 +- + net/ipv6/ndisc.c | 2 +- + net/ipv6/netfilter.c | 6 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 2 +- + net/ipv6/raw.c | 10 +- + net/ipv6/reassembly.c | 2 +- + net/ipv6/route.c | 25 +- + net/ipv6/seg6.c | 35 +- + net/ipv6/seg6_local.c | 22 +- + net/ipv6/syncookies.c | 2 +- + net/ipv6/tcp_ipv6.c | 34 +- + net/ipv6/udp.c | 13 +- + net/l2tp/l2tp_core.c | 531 ++-- + net/l2tp/l2tp_core.h | 43 +- + net/l2tp/l2tp_debugfs.c | 13 +- + net/l2tp/l2tp_ip.c | 2 +- + net/l2tp/l2tp_ip6.c | 2 +- + net/l2tp/l2tp_netlink.c | 6 +- + net/l2tp/l2tp_ppp.c | 6 +- + net/mac80211/agg-tx.c | 4 +- + net/mac80211/cfg.c | 158 +- + net/mac80211/chan.c | 113 +- + net/mac80211/driver-ops.c | 6 +- + net/mac80211/driver-ops.h | 14 +- + net/mac80211/ht.c | 2 +- + net/mac80211/ibss.c | 9 +- + net/mac80211/ieee80211_i.h | 65 +- + net/mac80211/iface.c | 63 +- + net/mac80211/link.c | 18 +- + net/mac80211/main.c | 3 +- + net/mac80211/mesh.c | 2 +- + net/mac80211/mlme.c | 1031 +++++-- + net/mac80211/offchannel.c | 35 +- + net/mac80211/parse.c | 100 +- + net/mac80211/pm.c | 4 +- + net/mac80211/rx.c | 1 + + net/mac80211/spectmgmt.c | 20 +- + net/mac80211/sta_info.h | 6 + + net/mac80211/tests/Makefile | 2 +- + net/mac80211/tests/tpe.c | 284 ++ + net/mac80211/trace.h | 15 +- + net/mac80211/tx.c | 6 +- + net/mac80211/util.c | 40 +- + net/mac80211/vht.c | 75 +- + net/mptcp/protocol.c | 8 +- + net/mptcp/protocol.h | 5 + + net/mptcp/sockopt.c | 2 +- + net/mptcp/subflow.c | 2 +- + net/netfilter/ipvs/ip_vs_ctl.c | 7 +- + net/netfilter/ipvs/ip_vs_proto_sctp.c | 4 +- + net/netfilter/nf_conncount.c | 8 +- + net/netfilter/nf_conntrack_bpf.c | 68 +- + net/netfilter/nf_tables_api.c | 411 ++- + net/netfilter/nf_tables_offload.c | 40 +- + net/netfilter/nf_tables_trace.c | 2 +- + net/netfilter/nfnetlink_cttimeout.c | 3 +- + net/netfilter/nft_hash.c | 3 +- + net/netfilter/nft_immediate.c | 2 +- + net/netfilter/xt_recent.c | 8 +- + net/netlink/af_netlink.c | 20 +- + net/openvswitch/vport-internal_dev.c | 10 +- + net/packet/af_packet.c | 17 +- + net/qrtr/ns.c | 17 +- + net/rds/tcp.c | 4 +- + net/rds/tcp_recv.c | 4 +- + net/rfkill/core.c | 8 +- + net/sched/act_api.c | 2 +- + net/sched/act_bpf.c | 4 +- + net/sched/cls_bpf.c | 4 +- + net/sched/cls_flower.c | 56 +- + net/sched/sch_generic.c | 1 + + net/smc/Makefile | 2 +- + net/smc/af_smc.c | 162 +- + net/smc/smc.h | 38 + + net/smc/smc_core.c | 7 +- + net/smc/smc_inet.c | 159 + + net/smc/smc_inet.h | 22 + + net/tls/tls_device.c | 11 +- + net/unix/af_unix.c | 172 +- + net/unix/diag.c | 45 +- + net/unix/garbage.c | 8 +- + net/wireless/chan.c | 120 +- + net/wireless/core.c | 15 +- + net/wireless/core.h | 7 +- + net/wireless/ibss.c | 5 +- + net/wireless/mesh.c | 5 +- + net/wireless/nl80211.c | 130 +- + net/wireless/nl80211.h | 4 +- + net/wireless/pmsr.c | 10 +- + net/wireless/rdev-ops.h | 56 +- + net/wireless/reg.c | 2 + + net/wireless/scan.c | 119 +- + net/wireless/sme.c | 4 +- + net/wireless/tests/chan.c | 22 +- + net/wireless/trace.h | 227 +- + net/wireless/util.c | 8 +- + net/xdp/xsk.c | 25 +- + samples/bpf/cpustat_kern.c | 3 +- + scripts/Makefile.btf | 4 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 6 +- + tools/bpf/bpftool/Makefile | 3 +- + tools/bpf/bpftool/bash-completion/bpftool | 3 + + tools/bpf/bpftool/btf.c | 140 +- + tools/bpf/bpftool/common.c | 2 +- + tools/bpf/bpftool/gen.c | 52 +- + tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 7 +- + tools/bpf/bpftool/skeleton/profiler.bpf.c | 14 +- + tools/include/uapi/linux/bpf.h | 15 +- + tools/lib/bpf/btf.c | 344 ++- + tools/lib/bpf/libbpf.c | 89 +- + tools/lib/bpf/libbpf.h | 23 +- + tools/lib/bpf/libbpf.map | 2 + + tools/lib/bpf/libbpf_internal.h | 36 +- + tools/lib/bpf/linker.c | 58 +- + tools/net/ynl/Makefile.deps | 4 +- + tools/net/ynl/lib/ynl-priv.h | 30 +- + tools/net/ynl/lib/ynl.c | 10 +- + tools/net/ynl/lib/ynl.h | 2 +- + tools/net/ynl/lib/ynl.py | 2 + + tools/net/ynl/ynl-gen-c.py | 6 +- + tools/net/ynl/ynl-gen-rst.py | 13 +- + .../bpf/bpf_test_no_cfi/bpf_test_no_cfi.c | 4 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 6 +- + tools/testing/selftests/bpf/config | 1 + + tools/testing/selftests/bpf/network_helpers.c | 32 +- + tools/testing/selftests/bpf/network_helpers.h | 8 +- + .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 2 +- + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 7 + + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 198 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 6 - + .../selftests/bpf/prog_tests/btf_field_iter.c | 161 + + tools/testing/selftests/bpf/prog_tests/cpumask.c | 5 + + .../testing/selftests/bpf/prog_tests/ctx_rewrite.c | 10 +- + tools/testing/selftests/bpf/prog_tests/find_vma.c | 4 +- + .../testing/selftests/bpf/prog_tests/linked_list.c | 12 + + tools/testing/selftests/bpf/prog_tests/rbtree.c | 47 + + .../testing/selftests/bpf/prog_tests/send_signal.c | 3 +- + .../selftests/bpf/prog_tests/sockopt_inherit.c | 2 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 3 - + .../bpf/prog_tests/test_struct_ops_module.c | 57 + + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + .../selftests/bpf/progs/bpf_iter_bpf_array_map.c | 6 - + .../bpf/progs/bpf_iter_bpf_percpu_array_map.c | 6 - + .../testing/selftests/bpf/progs/cpumask_success.c | 171 + + tools/testing/selftests/bpf/progs/linked_list.c | 42 + + tools/testing/selftests/bpf/progs/rbtree.c | 77 + + .../selftests/bpf/progs/struct_ops_detach.c | 10 + + tools/testing/selftests/bpf/progs/test_bpf_nf.c | 108 + + .../selftests/bpf/progs/test_sockmap_kern.h | 20 +- + tools/testing/selftests/bpf/progs/test_tc_dtime.c | 41 +- + .../selftests/bpf/progs/verifier_bits_iter.c | 153 + + tools/testing/selftests/bpf/test_sockmap.c | 136 +- + .../selftests/bpf/test_tcp_check_syncookie_user.c | 4 +- + tools/testing/selftests/bpf/test_verifier.c | 5 - + tools/testing/selftests/bpf/trace_helpers.c | 13 +- + tools/testing/selftests/drivers/net/hw/Makefile | 1 + + tools/testing/selftests/drivers/net/hw/rss_ctx.py | 354 +++ + tools/testing/selftests/drivers/net/lib/py/env.py | 19 +- + tools/testing/selftests/drivers/net/lib/py/load.py | 37 +- + .../selftests/drivers/net/mlxsw/mirror_gre.sh | 71 +- + .../drivers/net/mlxsw/mirror_gre_scale.sh | 18 +- + .../drivers/net/mlxsw/spectrum-2/tc_flower.sh | 55 +- + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/amt.sh | 2 +- + tools/testing/selftests/net/config | 6 +- + tools/testing/selftests/net/forwarding/Makefile | 2 + + tools/testing/selftests/net/forwarding/lib.sh | 92 +- + .../selftests/net/forwarding/min_max_mtu.sh | 283 ++ + .../testing/selftests/net/forwarding/mirror_gre.sh | 45 +- + .../selftests/net/forwarding/mirror_gre_bound.sh | 23 +- + .../net/forwarding/mirror_gre_bridge_1d.sh | 21 +- + .../net/forwarding/mirror_gre_bridge_1d_vlan.sh | 21 +- + .../net/forwarding/mirror_gre_bridge_1q.sh | 21 +- + .../net/forwarding/mirror_gre_bridge_1q_lag.sh | 29 +- + .../selftests/net/forwarding/mirror_gre_changes.sh | 73 +- + .../selftests/net/forwarding/mirror_gre_flower.sh | 43 +- + .../net/forwarding/mirror_gre_lag_lacp.sh | 65 +- + .../selftests/net/forwarding/mirror_gre_lib.sh | 90 +- + .../selftests/net/forwarding/mirror_gre_neigh.sh | 39 +- + .../selftests/net/forwarding/mirror_gre_nh.sh | 35 +- + .../selftests/net/forwarding/mirror_gre_vlan.sh | 21 +- + .../net/forwarding/mirror_gre_vlan_bridge_1q.sh | 69 +- + .../testing/selftests/net/forwarding/mirror_lib.sh | 79 +- + .../selftests/net/forwarding/mirror_vlan.sh | 43 +- + .../selftests/net/forwarding/router_mpath_seed.sh | 333 ++ + tools/testing/selftests/net/hsr/hsr_ping.sh | 9 + + tools/testing/selftests/net/hsr/hsr_redbox.sh | 15 + + tools/testing/selftests/net/lib.sh | 59 +- + tools/testing/selftests/net/lib/py/ksft.py | 54 +- + tools/testing/selftests/net/lib/py/utils.py | 61 +- + tools/testing/selftests/net/mptcp/mptcp_lib.sh | 33 +- + tools/testing/selftests/net/netfilter/nft_queue.sh | 37 + + tools/testing/selftests/net/netns-sysctl.sh | 40 + + .../testing/selftests/net/openvswitch/ovs-dpctl.py | 368 ++- + tools/testing/selftests/net/pmtu.sh | 147 +- + tools/testing/selftests/net/udpgso.c | 15 +- + tools/testing/selftests/net/udpgso.sh | 43 + + 1051 files changed, 48188 insertions(+), 15015 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/net/arc_emac.txt + create mode 100644 Documentation/devicetree/bindings/net/dsa/lantiq,gswip.yaml + delete mode 100644 Documentation/devicetree/bindings/net/dsa/lantiq-gswip.txt + delete mode 100644 Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.txt + create mode 100644 Documentation/devicetree/bindings/net/dsa/vitesse,vsc73xx.yaml + create mode 100644 Documentation/devicetree/bindings/net/fsl,fman-mdio.yaml + create mode 100644 Documentation/devicetree/bindings/net/fsl,fman-muram.yaml + create mode 100644 Documentation/devicetree/bindings/net/fsl,fman-port.yaml + create mode 100644 Documentation/devicetree/bindings/net/fsl,fman.yaml + delete mode 100644 Documentation/devicetree/bindings/net/fsl-fman.txt + create mode 100644 Documentation/devicetree/bindings/ptp/fsl,ptp.yaml + delete mode 100644 Documentation/devicetree/bindings/ptp/ptp-qoriq.txt + create mode 100644 Documentation/netlink/specs/tcp_metrics.yaml + create mode 100644 Documentation/networking/iso15765-2.rst + create mode 100644 Documentation/networking/mptcp.rst + create mode 100644 Documentation/networking/sriov.rst + delete mode 100644 drivers/net/ethernet/arc/emac_arc.c + create mode 100644 drivers/net/ethernet/google/gve/gve_flow_rule.c + create mode 100644 drivers/net/ethernet/renesas/rtsn.c + create mode 100644 drivers/net/ethernet/renesas/rtsn.h + create mode 100644 drivers/net/ethernet/tehuti/tn40.c + create mode 100644 drivers/net/ethernet/tehuti/tn40.h + create mode 100644 drivers/net/ethernet/tehuti/tn40_mdio.c + create mode 100644 drivers/net/ethernet/tehuti/tn40_phy.c + create mode 100644 drivers/net/ethernet/tehuti/tn40_regs.h + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_switchdev.c + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_switchdev.h + create mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe_fdir.c + create mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe_fdir.h + create mode 100644 drivers/net/phy/aquantia/aquantia_leds.c + create mode 100644 drivers/net/wireless/ath/ath10k/leds.c + create mode 100644 drivers/net/wireless/ath/ath10k/leds.h + rename drivers/net/wireless/intel/iwlwifi/{iwl-eeprom-parse.c => dvm/eeprom.c} (69%) + delete mode 100644 drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.c + delete mode 100644 drivers/net/wireless/intel/iwlwifi/iwl-eeprom-read.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/iwl-nvm-utils.c + rename drivers/net/wireless/intel/iwlwifi/{iwl-eeprom-parse.h => iwl-nvm-utils.h} (73%) + delete mode 100644 drivers/net/wireless/intel/iwlwifi/queue/tx.c + delete mode 100644 drivers/net/wireless/intel/iwlwifi/queue/tx.h + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/Makefile + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/dm.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/dm.h + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/fw.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/fw.h + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/hw.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/hw.h + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/led.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/led.h + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/phy.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/phy.h + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/rf.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/rf.h + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/sw.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/table.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/table.h + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/trx.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192du/trx.h + create mode 100644 include/linux/netdevice_xmit.h + create mode 100644 net/ethtool/cmis.h + create mode 100644 net/ethtool/cmis_cdb.c + create mode 100644 net/ethtool/cmis_fw_update.c + create mode 100644 net/ethtool/module_fw.h + create mode 100644 net/mac80211/tests/tpe.c + create mode 100644 net/smc/smc_inet.c + create mode 100644 net/smc/smc_inet.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_field_iter.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_detach.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_bits_iter.c + create mode 100755 tools/testing/selftests/drivers/net/hw/rss_ctx.py + create mode 100755 tools/testing/selftests/net/forwarding/min_max_mtu.sh + create mode 100755 tools/testing/selftests/net/forwarding/router_mpath_seed.sh + create mode 100755 tools/testing/selftests/net/netns-sysctl.sh +Merging bpf-next/for-next (fd8db07705c5 bpf, devmap: Add .map_alloc_check) +$ 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 arch/riscv/net/bpf_jit_comp64.c +CONFLICT (content): Merge conflict in arch/riscv/net/bpf_jit_comp64.c +Auto-merging include/linux/bpf.h +Auto-merging include/linux/bpf_verifier.h +Auto-merging include/linux/btf.h +Auto-merging include/linux/filter.h +Auto-merging include/linux/module.h +Auto-merging kernel/bpf/core.c +Auto-merging kernel/bpf/devmap.c +Auto-merging kernel/bpf/verifier.c +Auto-merging net/bpf/test_run.c +Auto-merging net/core/filter.c +Auto-merging tools/testing/selftests/bpf/progs/verifier_iterating_callbacks.c +Resolved 'arch/riscv/net/bpf_jit_comp64.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 00ac5a64b30e] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git +$ git diff -M --stat --summary HEAD^.. + .../bpf/standardization/instruction-set.rst | 80 +-- + arch/arm64/net/bpf_jit_comp.c | 12 +- + arch/powerpc/net/bpf_jit_comp.c | 4 +- + arch/riscv/net/bpf_jit_comp64.c | 123 ++-- + arch/riscv/net/bpf_jit_core.c | 5 +- + arch/s390/net/bpf_jit_comp.c | 404 +++++++++--- + arch/x86/net/bpf_jit_comp.c | 15 +- + fs/verity/measure.c | 5 +- + include/linux/bpf.h | 11 +- + include/linux/bpf_verifier.h | 12 +- + include/linux/btf.h | 65 ++ + include/linux/filter.h | 3 +- + include/linux/module.h | 2 + + include/net/netfilter/nf_flow_table.h | 15 + + include/uapi/linux/bpf.h | 2 + + kernel/bpf/Makefile | 8 +- + kernel/bpf/bpf_lsm.c | 1 + + kernel/bpf/bpf_struct_ops.c | 2 +- + kernel/bpf/btf.c | 191 ++++-- + kernel/bpf/core.c | 8 +- + kernel/bpf/crypto.c | 42 +- + kernel/bpf/devmap.c | 27 +- + kernel/bpf/helpers.c | 43 +- + kernel/bpf/log.c | 6 +- + kernel/bpf/verifier.c | 140 ++++- + kernel/module/main.c | 5 +- + kernel/trace/bpf_trace.c | 15 +- + lib/test_bpf.c | 10 + + net/bpf/test_run.c | 28 +- + net/core/filter.c | 56 +- + net/netfilter/Makefile | 7 +- + net/netfilter/nf_flow_table_bpf.c | 121 ++++ + net/netfilter/nf_flow_table_inet.c | 2 +- + net/netfilter/nf_flow_table_offload.c | 2 +- + net/netfilter/nf_flow_table_xdp.c | 147 +++++ + scripts/Makefile.btf | 7 +- + scripts/Makefile.modfinal | 2 +- + tools/bpf/bpftool/btf.c | 55 ++ + tools/bpf/bpftool/cgroup.c | 40 +- + tools/bpf/bpftool/gen.c | 2 + + tools/bpf/bpftool/prog.c | 4 + + tools/bpf/resolve_btfids/main.c | 8 + + tools/include/uapi/linux/bpf.h | 2 + + tools/lib/bpf/Build | 2 +- + tools/lib/bpf/btf.c | 684 ++++++++++++++------- + tools/lib/bpf/btf.h | 36 ++ + tools/lib/bpf/btf_iter.c | 177 ++++++ + tools/lib/bpf/btf_relocate.c | 519 ++++++++++++++++ + tools/lib/bpf/libbpf.map | 2 + + tools/lib/bpf/libbpf_internal.h | 3 + + tools/lib/bpf/linker.c | 11 +- + tools/testing/selftests/bpf/DENYLIST.aarch64 | 1 + + tools/testing/selftests/bpf/DENYLIST.s390x | 3 - + tools/testing/selftests/bpf/bpf_arena_common.h | 2 + + tools/testing/selftests/bpf/bpf_experimental.h | 30 +- + tools/testing/selftests/bpf/bpf_kfuncs.h | 2 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 71 +++ + .../selftests/bpf/bpf_testmod/bpf_testmod_kfunc.h | 10 + + tools/testing/selftests/bpf/config | 13 + + tools/testing/selftests/bpf/network_helpers.c | 100 ++- + tools/testing/selftests/bpf/network_helpers.h | 6 +- + .../selftests/bpf/prog_tests/arena_atomics.c | 18 + + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 37 +- + .../testing/selftests/bpf/prog_tests/btf_distill.c | 552 +++++++++++++++++ + .../testing/selftests/bpf/prog_tests/cgroup_v1v2.c | 4 +- + .../selftests/bpf/prog_tests/fexit_stress.c | 4 +- + .../selftests/bpf/prog_tests/ip_check_defrag.c | 14 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 1 + + .../bpf/prog_tests/kfunc_param_nullable.c | 11 + + tools/testing/selftests/bpf/prog_tests/mptcp.c | 7 +- + .../selftests/bpf/prog_tests/test_skb_pkt_end.c | 1 + + .../selftests/bpf/prog_tests/tracing_struct.c | 44 +- + .../selftests/bpf/prog_tests/xdp_flowtable.c | 168 +++++ + tools/testing/selftests/bpf/progs/arena_atomics.c | 143 +++-- + tools/testing/selftests/bpf/progs/arena_htab.c | 21 +- + tools/testing/selftests/bpf/progs/arena_list.c | 1 + + tools/testing/selftests/bpf/progs/bpf_dctcp.c | 36 +- + tools/testing/selftests/bpf/progs/bpf_misc.h | 15 +- + tools/testing/selftests/bpf/progs/crypto_bench.c | 10 +- + tools/testing/selftests/bpf/progs/crypto_sanity.c | 16 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 30 +- + .../testing/selftests/bpf/progs/get_func_ip_test.c | 7 +- + .../testing/selftests/bpf/progs/ip_check_defrag.c | 10 +- + tools/testing/selftests/bpf/progs/iters.c | 2 - + .../testing/selftests/bpf/progs/kfunc_call_test.c | 37 ++ + .../selftests/bpf/progs/kprobe_multi_session.c | 3 +- + .../bpf/progs/kprobe_multi_session_cookie.c | 2 +- + tools/testing/selftests/bpf/progs/linked_list.c | 5 +- + .../testing/selftests/bpf/progs/map_percpu_stats.c | 2 +- + .../selftests/bpf/progs/nested_trust_common.h | 2 +- + .../selftests/bpf/progs/netif_receive_skb.c | 5 +- + tools/testing/selftests/bpf/progs/profiler.inc.h | 5 +- + tools/testing/selftests/bpf/progs/rbtree_fail.c | 2 +- + .../selftests/bpf/progs/refcounted_kptr_fail.c | 4 +- + tools/testing/selftests/bpf/progs/setget_sockopt.c | 5 +- + tools/testing/selftests/bpf/progs/skb_pkt_end.c | 11 +- + tools/testing/selftests/bpf/progs/test_bpf_ma.c | 4 - + tools/testing/selftests/bpf/progs/test_bpf_nf.c | 1 + + .../testing/selftests/bpf/progs/test_bpf_nf_fail.c | 1 + + .../selftests/bpf/progs/test_kfunc_dynptr_param.c | 2 +- + .../bpf/progs/test_kfunc_param_nullable.c | 43 ++ + .../selftests/bpf/progs/test_sysctl_loop1.c | 5 +- + .../selftests/bpf/progs/test_sysctl_loop2.c | 5 +- + .../testing/selftests/bpf/progs/test_sysctl_prog.c | 5 +- + .../bpf/progs/test_tcp_custom_syncookie.c | 1 + + .../bpf/progs/test_tcp_custom_syncookie.h | 2 - + tools/testing/selftests/bpf/progs/tracing_struct.c | 54 -- + .../selftests/bpf/progs/tracing_struct_many_args.c | 95 +++ + .../selftests/bpf/progs/user_ringbuf_fail.c | 22 + + tools/testing/selftests/bpf/progs/verifier_arena.c | 1 + + .../selftests/bpf/progs/verifier_arena_large.c | 1 + + .../bpf/progs/verifier_iterating_callbacks.c | 236 +++++++ + .../selftests/bpf/progs/verifier_netfilter_ctx.c | 6 +- + .../bpf/progs/verifier_subprog_precision.c | 2 - + tools/testing/selftests/bpf/progs/xdp_flowtable.c | 144 +++++ + .../selftests/bpf/progs/xdp_synproxy_kern.c | 1 + + tools/testing/selftests/bpf/progs/xfrm_info.c | 1 + + tools/testing/selftests/bpf/test_loader.c | 121 +++- + tools/testing/selftests/bpf/test_sockmap.c | 1 - + .../selftests/bpf/test_tcp_check_syncookie_user.c | 29 +- + tools/testing/selftests/bpf/verifier/precise.c | 22 +- + tools/testing/selftests/bpf/xskxceiver.c | 40 +- + tools/testing/selftests/bpf/xskxceiver.h | 2 + + 123 files changed, 4532 insertions(+), 961 deletions(-) + create mode 100644 net/netfilter/nf_flow_table_bpf.c + create mode 100644 net/netfilter/nf_flow_table_xdp.c + create mode 100644 tools/lib/bpf/btf_iter.c + create mode 100644 tools/lib/bpf/btf_relocate.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_distill.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/kfunc_param_nullable.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_flowtable.c + create mode 100644 tools/testing/selftests/bpf/progs/test_kfunc_param_nullable.c + create mode 100644 tools/testing/selftests/bpf/progs/tracing_struct_many_args.c + create mode 100644 tools/testing/selftests/bpf/progs/xdp_flowtable.c +$ git am -3 ../patches/0001-HID-bpf-Fix-up-build.patch +Applying: HID: bpf: Fix up build +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/hid/bpf/hid_bpf_struct_ops.c +$ git add -A . +$ git commit -v -a --amend +[master 4bec46a13137] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git + Date: Wed Jul 3 11:27:55 2024 +1000 +Merging ipsec-next/master (f531d13bdfe3 xfrm: support sending NAT keepalives in ESP in UDP states) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Auto-merging include/net/xfrm.h +Auto-merging net/ipv6/af_inet6.c +Auto-merging net/ipv6/xfrm6_policy.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging net/xfrm/xfrm_state.c +Merge made by the 'ort' strategy. + include/net/ipv6_stubs.h | 3 + + include/net/netns/xfrm.h | 1 + + include/net/xfrm.h | 10 ++ + include/uapi/linux/xfrm.h | 1 + + net/ipv6/af_inet6.c | 1 + + net/ipv6/xfrm6_policy.c | 7 + + net/xfrm/Makefile | 3 +- + net/xfrm/xfrm_compat.c | 6 +- + net/xfrm/xfrm_nat_keepalive.c | 292 ++++++++++++++++++++++++++++++++++++++++++ + net/xfrm/xfrm_policy.c | 8 ++ + net/xfrm/xfrm_state.c | 17 +++ + net/xfrm/xfrm_user.c | 15 +++ + 12 files changed, 361 insertions(+), 3 deletions(-) + create mode 100644 net/xfrm/xfrm_nat_keepalive.c +Merging mlx5-next/mlx5-next (b339e0a39dc3 RDMA/mlx5: Add Qcounters req_transport_retries_exceeded/req_rnr_retries_exceeded) +$ 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 (ac26327635d6 Merge branch 'fixes-for-stm32-dwmac-driver-fails-to-probe') +$ 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 (f4ebd03496f6 netfilter: xt_recent: Lift restrictions on max hitcount value) +$ 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 (31cdab2ae178 dt-bindings: net: bluetooth: convert MT7622 Bluetooth to the json-schema) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging MAINTAINERS +Auto-merging drivers/bluetooth/btintel_pcie.c +Auto-merging drivers/bluetooth/btnxpuart.c +Auto-merging drivers/bluetooth/hci_bcm4377.c +Auto-merging drivers/bluetooth/hci_qca.c +Auto-merging include/net/bluetooth/hci_sync.h +Auto-merging net/bluetooth/hci_core.c +CONFLICT (content): Merge conflict in net/bluetooth/hci_core.c +Auto-merging net/bluetooth/hci_event.c +Auto-merging net/bluetooth/hci_sync.c +Auto-merging net/bluetooth/iso.c +Resolved 'net/bluetooth/hci_core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7438ddca9480] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git +$ git diff -M --stat --summary HEAD^.. + .../net/bluetooth/mediatek,mt7622-bluetooth.yaml | 51 + + .../bindings/net/bluetooth/nxp,88w8987-bt.yaml | 4 + + .../bindings/net/bluetooth/qualcomm-bluetooth.yaml | 17 + + .../devicetree/bindings/net/mediatek-bluetooth.txt | 36 - + MAINTAINERS | 8 + + drivers/bluetooth/Kconfig | 7 +- + drivers/bluetooth/btintel.c | 241 +++-- + drivers/bluetooth/btintel.h | 11 +- + drivers/bluetooth/btintel_pcie.c | 10 +- + drivers/bluetooth/btmtk.c | 18 + + drivers/bluetooth/btmtk.h | 8 + + drivers/bluetooth/btmtksdio.c | 3 + + drivers/bluetooth/btnxpuart.c | 189 +++- + drivers/bluetooth/btrtl.c | 2 +- + drivers/bluetooth/btusb.c | 85 +- + drivers/bluetooth/hci_bcm4377.c | 66 +- + drivers/bluetooth/hci_ldisc.c | 2 +- + drivers/bluetooth/hci_nokia.c | 5 - + drivers/bluetooth/hci_qca.c | 85 +- + drivers/bluetooth/hci_vhci.c | 2 +- + drivers/power/Kconfig | 1 + + drivers/power/Makefile | 1 + + drivers/power/sequencing/Kconfig | 29 + + drivers/power/sequencing/Makefile | 6 + + drivers/power/sequencing/core.c | 1105 ++++++++++++++++++++ + drivers/power/sequencing/pwrseq-qcom-wcn.c | 336 ++++++ + include/linux/pwrseq/consumer.h | 56 + + include/linux/pwrseq/provider.h | 75 ++ + include/net/bluetooth/hci_core.h | 7 +- + include/net/bluetooth/hci_sock.h | 2 +- + include/net/bluetooth/hci_sync.h | 3 + + include/net/bluetooth/rfcomm.h | 2 +- + net/bluetooth/hci_core.c | 58 +- + net/bluetooth/hci_event.c | 2 + + net/bluetooth/hci_sync.c | 21 +- + net/bluetooth/iso.c | 5 - + net/bluetooth/mgmt.c | 50 +- + net/bluetooth/rfcomm/tty.c | 23 +- + 38 files changed, 2308 insertions(+), 324 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/mediatek,mt7622-bluetooth.yaml + create mode 100644 drivers/power/sequencing/Kconfig + create mode 100644 drivers/power/sequencing/Makefile + create mode 100644 drivers/power/sequencing/core.c + create mode 100644 drivers/power/sequencing/pwrseq-qcom-wcn.c + create mode 100644 include/linux/pwrseq/consumer.h + create mode 100644 include/linux/pwrseq/provider.h +Merging wireless-next/for-next (8c62617295d3 wifi: mac80211: remove DEAUTH_NEED_MGD_TX_PREP) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Auto-merging include/net/mac80211.h +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 12 +++--- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 2 + + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 4 ++ + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 2 + + drivers/net/wireless/virtual/mac80211_hwsim.h | 4 +- + include/net/mac80211.h | 22 +++------- + net/mac80211/cfg.c | 3 -- + net/mac80211/debugfs.c | 1 - + net/mac80211/main.c | 3 -- + net/mac80211/mlme.c | 50 +++++++--------------- + net/wireless/nl80211.c | 10 +---- + 11 files changed, 39 insertions(+), 74 deletions(-) +Merging wpan-next/master (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Already up to date. +Merging wpan-staging/staging (9187210eee7d Merge tag 'net-next-6.9' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ 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 (2538af030d6f mtd: cmdlinepart: Replace `dbg()` macro with `pr_debug()`) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + drivers/mtd/chips/cfi_cmdset_0020.c | 1 + + drivers/mtd/chips/cfi_util.c | 1 + + drivers/mtd/maps/Makefile | 11 +++++------ + drivers/mtd/maps/map_funcs.c | 1 + + drivers/mtd/parsers/brcm_u-boot.c | 1 + + drivers/mtd/parsers/cmdlinepart.c | 18 +++++------------ + drivers/mtd/parsers/tplink_safeloader.c | 1 + + drivers/mtd/tests/Makefile | 34 ++++++++++++++++----------------- + drivers/mtd/tests/mtd_test.c | 9 +++++++++ + include/linux/mtd/cfi.h | 32 +++++++++++++++---------------- + 10 files changed, 57 insertions(+), 52 deletions(-) +Merging nand/nand/next (7326d3fb1ee3 mtd: rawnand: lpx32xx: Request DMA channels using DT entries) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/fsl,mxs-dma.yaml | 15 + + .../bindings/mtd/amlogic,meson-nand.yaml | 18 + + .../devicetree/bindings/mtd/gpmi-nand.yaml | 22 + + .../devicetree/bindings/mtd/qcom,nandc.yaml | 38 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 5 - + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 20 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.h | 6 +- + drivers/mtd/nand/raw/intel-nand-controller.c | 6 +- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 26 +- + drivers/mtd/nand/raw/lpc32xx_slc.c | 26 +- + drivers/mtd/nand/raw/meson_nand.c | 86 ++- + drivers/mtd/nand/raw/mxc_nand.c | 708 ++++++++++----------- + 12 files changed, 533 insertions(+), 443 deletions(-) +Merging spi-nor/spi-nor/next (d35df77707bf mtd: spi-nor: winbond: fix w25q128 regression) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Merge made by the 'ort' strategy. + drivers/mtd/spi-nor/Makefile | 1 - + drivers/mtd/spi-nor/core.c | 188 ++++++++++++++++------------------------- + drivers/mtd/spi-nor/core.h | 12 --- + drivers/mtd/spi-nor/everspin.c | 19 ++++- + drivers/mtd/spi-nor/winbond.c | 2 + + drivers/mtd/spi-nor/xilinx.c | 169 ------------------------------------ + 6 files changed, 89 insertions(+), 302 deletions(-) + delete mode 100644 drivers/mtd/spi-nor/xilinx.c +Merging crypto/master (95c0f5c3b8bb hwrng: core - Fix wrong quality calculation at hw rng registration) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging MAINTAINERS +Auto-merging drivers/char/hw_random/core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/rng/amlogic,meson-rng.yaml | 3 + + .../bindings/rng/samsung,exynos5250-trng.yaml | 40 +- + MAINTAINERS | 6 + + arch/arm/crypto/aes-neonbs-glue.c | 1 + + arch/arm/crypto/crc32-ce-core.S | 17 +- + arch/arm/crypto/crc32-ce-glue.c | 1 + + arch/arm/crypto/crct10dif-ce-glue.c | 1 + + arch/arm/crypto/curve25519-glue.c | 1 + + arch/arm/crypto/poly1305-glue.c | 1 + + arch/arm64/crypto/aes-neonbs-glue.c | 1 + + arch/arm64/crypto/crct10dif-ce-glue.c | 3 +- + arch/arm64/crypto/poly1305-glue.c | 1 + + arch/powerpc/crypto/Kconfig | 11 + + arch/powerpc/crypto/Makefile | 2 + + arch/powerpc/crypto/curve25519-ppc64le-core.c | 299 +++ + arch/powerpc/crypto/curve25519-ppc64le_asm.S | 671 +++++ + arch/x86/crypto/Kconfig | 1 + + arch/x86/crypto/Makefile | 8 +- + arch/x86/crypto/aes-gcm-aesni-x86_64.S | 1128 ++++++++ + arch/x86/crypto/aes-gcm-avx10-x86_64.S | 1222 +++++++++ + arch/x86/crypto/aesni-intel_asm.S | 1503 +---------- + arch/x86/crypto/aesni-intel_avx-x86_64.S | 2804 -------------------- + arch/x86/crypto/aesni-intel_glue.c | 1269 +++++---- + arch/x86/crypto/crc32-pclmul_glue.c | 1 + + arch/x86/crypto/curve25519-x86_64.c | 1 + + arch/x86/crypto/poly1305_glue.c | 4 +- + arch/x86/crypto/twofish_glue_3way.c | 9 +- + crypto/Kconfig | 18 - + crypto/Makefile | 8 - + crypto/af_alg.c | 1 + + crypto/algapi.c | 3 + + crypto/algif_hash.c | 1 + + crypto/algif_skcipher.c | 1 + + crypto/api.c | 4 +- + crypto/asymmetric_keys/pkcs7_parser.c | 4 - + crypto/asymmetric_keys/public_key.c | 7 - + crypto/asymmetric_keys/x509_cert_parser.c | 16 - + crypto/asymmetric_keys/x509_public_key.c | 17 +- + crypto/cast_common.c | 1 + + crypto/curve25519-generic.c | 1 + + crypto/deflate.c | 1 + + crypto/ecc.c | 3 +- + crypto/ecdsa.c | 34 +- + crypto/internal.h | 7 +- + crypto/simd.c | 1 + + crypto/sm2.c | 498 ---- + crypto/sm2signature.asn1 | 4 - + crypto/tcrypt.c | 9 + + crypto/testmgr.c | 35 +- + crypto/testmgr.h | 59 - + crypto/xor.c | 1 + + drivers/char/hw_random/amd-rng.c | 4 +- + drivers/char/hw_random/arm_smccc_trng.c | 1 + + drivers/char/hw_random/cavium-rng-vf.c | 1 + + drivers/char/hw_random/cavium-rng.c | 1 + + drivers/char/hw_random/core.c | 4 +- + drivers/char/hw_random/exynos-trng.c | 217 +- + drivers/char/hw_random/omap-rng.c | 1 + + drivers/char/hw_random/omap3-rom-rng.c | 1 + + drivers/char/hw_random/stm32-rng.c | 35 +- + drivers/crypto/atmel-sha204a.c | 3 +- + drivers/crypto/axis/artpec6_crypto.c | 7 - + drivers/crypto/ccp/Makefile | 3 +- + drivers/crypto/ccp/dbc.c | 2 +- + drivers/crypto/ccp/hsti.c | 138 + + drivers/crypto/ccp/hsti.h | 17 + + drivers/crypto/ccp/psp-dev.c | 23 +- + drivers/crypto/ccp/psp-dev.h | 46 +- + drivers/crypto/ccp/sev-dev.c | 8 +- + drivers/crypto/ccp/sp-dev.h | 2 +- + drivers/crypto/ccp/sp-pci.c | 67 +- + drivers/crypto/ccree/cc_cipher.c | 6 - + drivers/crypto/hifn_795x.c | 17 - + drivers/crypto/hisilicon/qm.c | 11 +- + drivers/crypto/hisilicon/zip/zip_main.c | 48 +- + drivers/crypto/intel/keembay/ocs-hcu.c | 1 + + drivers/crypto/intel/qat/qat_common/adf_ctl_drv.c | 21 +- + drivers/crypto/intel/qat/qat_common/adf_dev_mgr.c | 2 +- + drivers/crypto/intel/qat/qat_common/adf_rl.c | 1 + + drivers/crypto/n2_core.c | 4 - + drivers/crypto/sa2ul.c | 1 + + drivers/crypto/stm32/stm32-cryp.c | 719 ++++- + drivers/crypto/tegra/tegra-se-main.c | 1 - + drivers/crypto/xilinx/zynqmp-aes-gcm.c | 1 + + include/crypto/internal/ecc.h | 3 + + include/crypto/sm2.h | 28 - + include/linux/hw_random.h | 3 +- + include/linux/psp-platform-access.h | 5 +- + lib/crypto/arc4.c | 1 + + lib/crypto/des.c | 1 + + lib/crypto/libchacha.c | 1 + + lib/crypto/mpi/ec.c | 6 +- + lib/crypto/mpi/mpi-pow.c | 9 +- + lib/crypto/poly1305.c | 1 + + lib/crypto/sha1.c | 1 + + lib/crypto/sha256.c | 1 + + lib/crypto/utils.c | 1 + + security/integrity/digsig_asymmetric.c | 3 +- + 98 files changed, 5379 insertions(+), 5842 deletions(-) + create mode 100644 arch/powerpc/crypto/curve25519-ppc64le-core.c + create mode 100644 arch/powerpc/crypto/curve25519-ppc64le_asm.S + create mode 100644 arch/x86/crypto/aes-gcm-aesni-x86_64.S + create mode 100644 arch/x86/crypto/aes-gcm-avx10-x86_64.S + delete mode 100644 arch/x86/crypto/aesni-intel_avx-x86_64.S + delete mode 100644 crypto/sm2.c + delete mode 100644 crypto/sm2signature.asn1 + create mode 100644 drivers/crypto/ccp/hsti.c + create mode 100644 drivers/crypto/ccp/hsti.h + delete mode 100644 include/crypto/sm2.h +Merging drm/drm-next (fb625bf6187d Merge tag 'drm-habanalabs-next-2024-06-23' of https://github.com/HabanaAI/drivers.accel.habanalabs.kernel into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/psp_v14_0.c +Auto-merging drivers/gpu/drm/amd/display/Kconfig +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h +Auto-merging drivers/gpu/drm/bridge/panel.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_fbdev_dma.c +Auto-merging drivers/gpu/drm/drm_panel_orientation_quirks.c +Auto-merging drivers/gpu/drm/exynos/exynos_dp.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_drv.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/disp.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_connector.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +Auto-merging drivers/gpu/drm/xe/xe_gt_idle.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_idle.c +Auto-merging drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c +Auto-merging drivers/gpu/drm/xe/xe_guc.c +Auto-merging drivers/gpu/drm/xe/xe_guc_pc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_pc.c +Auto-merging drivers/gpu/drm/xe/xe_ring_ops.c +Auto-merging drivers/video/fbdev/core/fb_defio.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_gt_idle.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_guc_pc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 32600f05863e] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/debugfs-driver-habanalabs | 12 +- + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 5 + + .../bindings/display/bridge/synopsys,dw-hdmi.yaml | 13 + + .../bindings/display/bridge/toshiba,tc358767.yaml | 2 +- + .../bindings/display/imx/fsl,imx6-hdmi.yaml | 8 - + .../bindings/display/panel/boe,tv101wum-nl6.yaml | 2 - + .../bindings/display/panel/himax,hx83102.yaml | 77 + + .../bindings/display/panel/ilitek,ili9806e.yaml | 63 + + .../bindings/display/panel/panel-edp-legacy.yaml | 117 + + .../bindings/display/panel/panel-mipi-dbi-spi.yaml | 30 + + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../panel/panel-simple-lvds-dual-ports.yaml | 6 + + .../bindings/display/panel/panel-simple.yaml | 58 +- + .../bindings/display/panel/samsung,atna33xc20.yaml | 95 + + .../bindings/display/panel/sharp,ld-d5116z01b.yaml | 30 - + .../bindings/display/panel/wl-355608-a8.yaml | 60 + + .../display/rockchip/rockchip,dw-hdmi.yaml | 8 - + .../display/rockchip/rockchip,dw-mipi-dsi.yaml | 2 + + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 5 +- + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + Documentation/gpu/amdgpu/thermal.rst | 6 + + Documentation/gpu/drm-internals.rst | 10 +- + Documentation/gpu/drm-kms-helpers.rst | 12 +- + Documentation/gpu/drm-usage-stats.rst | 21 +- + Documentation/gpu/i915.rst | 5 +- + Documentation/gpu/kms-properties.csv | 2 - + Documentation/gpu/todo.rst | 72 +- + Documentation/gpu/xe/index.rst | 1 + + Documentation/gpu/xe/xe-drm-usage-stats.rst | 10 + + MAINTAINERS | 23 +- + arch/x86/kernel/early-quirks.c | 85 +- + .../accel/habanalabs/common/command_submission.c | 13 - + drivers/accel/habanalabs/common/debugfs.c | 22 +- + drivers/accel/habanalabs/common/device.c | 240 +- + drivers/accel/habanalabs/common/firmware_if.c | 229 +- + drivers/accel/habanalabs/common/habanalabs.h | 76 +- + drivers/accel/habanalabs/common/habanalabs_drv.c | 5 +- + drivers/accel/habanalabs/common/hwmon.c | 60 +- + drivers/accel/habanalabs/common/irq.c | 33 +- + drivers/accel/habanalabs/common/memory_mgr.c | 37 +- + drivers/accel/habanalabs/common/mmu/mmu.c | 14 +- + drivers/accel/habanalabs/common/pci/pci.c | 4 +- + drivers/accel/habanalabs/common/sysfs.c | 8 +- + drivers/accel/habanalabs/gaudi/gaudi.c | 12 +- + drivers/accel/habanalabs/gaudi2/gaudi2.c | 88 +- + drivers/accel/habanalabs/gaudi2/gaudi2P.h | 10 +- + drivers/accel/habanalabs/gaudi2/gaudi2_security.c | 1 + + drivers/accel/habanalabs/goya/goya.c | 13 +- + drivers/accel/habanalabs/include/gaudi2/gaudi2.h | 4 +- + .../include/gaudi2/gaudi2_async_ids_map_extended.h | 244 +- + .../accel/habanalabs/include/gaudi2/gaudi2_fw_if.h | 27 +- + .../habanalabs/include/gaudi2/gaudi2_reg_map.h | 8 + + .../habanalabs/include/hw_ip/pci/pci_general.h | 3 +- + drivers/accel/ivpu/Makefile | 11 +- + drivers/accel/ivpu/ivpu_debugfs.c | 89 +- + drivers/accel/ivpu/ivpu_drv.c | 113 +- + drivers/accel/ivpu/ivpu_drv.h | 62 +- + drivers/accel/ivpu/ivpu_fw.c | 61 +- + drivers/accel/ivpu/ivpu_fw.h | 4 + + drivers/accel/ivpu/ivpu_gem.h | 13 +- + drivers/accel/ivpu/ivpu_hw.c | 331 + + drivers/accel/ivpu/ivpu_hw.h | 245 +- + drivers/accel/ivpu/ivpu_hw_37xx.c | 1065 - + drivers/accel/ivpu/ivpu_hw_37xx_reg.h | 72 - + drivers/accel/ivpu/ivpu_hw_40xx.c | 1250 - + drivers/accel/ivpu/ivpu_hw_40xx_reg.h | 94 +- + drivers/accel/ivpu/ivpu_hw_btrs.c | 905 + + drivers/accel/ivpu/ivpu_hw_btrs.h | 50 + + drivers/accel/ivpu/ivpu_hw_btrs_lnl_reg.h | 108 + + drivers/accel/ivpu/ivpu_hw_btrs_mtl_reg.h | 83 + + drivers/accel/ivpu/ivpu_hw_ip.c | 1174 + + drivers/accel/ivpu/ivpu_hw_ip.h | 36 + + drivers/accel/ivpu/ivpu_ipc.c | 20 +- + drivers/accel/ivpu/ivpu_ipc.h | 8 +- + drivers/accel/ivpu/ivpu_job.c | 324 +- + drivers/accel/ivpu/ivpu_job.h | 6 +- + drivers/accel/ivpu/ivpu_jsm_msg.c | 311 +- + drivers/accel/ivpu/ivpu_jsm_msg.h | 22 +- + drivers/accel/ivpu/ivpu_mmu.c | 22 +- + drivers/accel/ivpu/ivpu_mmu_context.c | 86 + + drivers/accel/ivpu/ivpu_mmu_context.h | 2 + + drivers/accel/ivpu/ivpu_ms.c | 309 + + drivers/accel/ivpu/ivpu_ms.h | 36 + + drivers/accel/ivpu/ivpu_pm.c | 111 +- + drivers/accel/ivpu/ivpu_pm.h | 10 +- + drivers/accel/ivpu/ivpu_sysfs.c | 58 + + drivers/accel/ivpu/ivpu_sysfs.h | 13 + + drivers/accel/ivpu/vpu_boot_api.h | 16 +- + drivers/accel/ivpu/vpu_jsm_api.h | 14 +- + drivers/base/devcoredump.c | 23 +- + drivers/char/agp/amd64-agp.c | 1 + + drivers/char/agp/intel-agp.c | 3 +- + drivers/char/agp/intel-gtt.c | 3 +- + drivers/char/agp/sis-agp.c | 1 + + drivers/char/agp/via-agp.c | 1 + + drivers/dma-buf/dma-fence-array.c | 10 +- + drivers/dma-buf/dma-heap.c | 4 +- + drivers/dma-buf/dma-resv.c | 7 + + drivers/dma-buf/heaps/cma_heap.c | 4 +- + drivers/dma-buf/heaps/system_heap.c | 4 +- + drivers/gpu/drm/Kconfig | 18 +- + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/acp/include/acp_gfx_if.h | 2 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c | 377 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 269 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 16 - + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 153 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 198 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 37 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 83 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 88 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 425 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 340 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 34 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 74 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 67 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 119 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.h | 18 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 7 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 6 + + drivers/gpu/drm/amd/amdgpu/atom.c | 8 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/clearstate_gfx12.h | 121 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 561 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 386 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 5007 + + .../drm/amd/amdgpu/{mes_v10_1.h => gfx_v12_0.h} | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 67 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 69 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 293 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 37 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v12_0.c | 501 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v12_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 1026 + + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 126 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/imu_v12_0.c | 400 + + drivers/gpu/drm/amd/amdgpu/imu_v12_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 3 - + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 3 - + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 2 - + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 7 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 3 - + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 1189 - + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 1561 + + drivers/gpu/drm/amd/amdgpu/mes_v12_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 55 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c | 654 + + drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.h | 28 + + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 50 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 52 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 9 +- + drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c | 29 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 19 +- + drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 19 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 22 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 15 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 18 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 23 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 16 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 24 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 7 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 9 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0_0_pkt_open.h | 8 + + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 1651 + + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 20 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 4 +- + drivers/gpu/drm/amd/amdgpu/soc24.c | 599 + + drivers/gpu/drm/amd/amdgpu/soc24.h | 30 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 75 +- + drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 11 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 36 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 9 +- + drivers/gpu/drm/amd/amdkfd/Makefile | 2 + + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 1613 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 496 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 5 - + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 2 - + drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_debug.h | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 57 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 85 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 3 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v12.c | 81 + + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c | 453 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 21 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 16 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 32 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 72 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 5 +- + drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c | 6 +- + drivers/gpu/drm/amd/display/Kconfig | 2 + + drivers/gpu/drm/amd/display/Makefile | 10 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1267 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 37 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 60 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 126 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 33 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 258 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 54 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 3 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 28 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 12 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.h | 2 +- + drivers/gpu/drm/amd/display/dc/Makefile | 13 +- + drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 4 - + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 18 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 116 +- + .../amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 15 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 +- + .../dc/clk_mgr/dcn30/dcn30_smu11_driver_if.h | 2 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 10 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 4 +- + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c | 2 +- + .../dc/clk_mgr/dcn32/dcn32_smu13_driver_if.h | 2 +- + .../amd/display/dc/clk_mgr/dcn32/smu13_driver_if.h | 108 - + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 57 +- + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 21 +- + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h | 2 + + .../gpu/drm/amd/display/dc/clk_mgr/dcn401/dalsmc.h | 53 + + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 1577 + + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h | 113 + + .../dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.c | 313 + + .../dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.h | 29 + + .../dc/clk_mgr/dcn401/dcn401_smu14_driver_if.h | 66 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 246 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 45 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 9 +- + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 3 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 325 +- + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 116 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 386 +- + drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 1 + + drivers/gpu/drm/amd/display/dc/dc.h | 79 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 245 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 29 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 8 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 47 +- + drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 193 + + drivers/gpu/drm/amd/display/dc/dc_spl_translate.h | 22 + + drivers/gpu/drm/amd/display/dc/dc_state_priv.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 36 +- + drivers/gpu/drm/amd/display/dc/dc_stream_priv.h | 38 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 82 +- + drivers/gpu/drm/amd/display/dc/dccg/Makefile | 103 + + .../amd/display/dc/{ => dccg}/dcn20/dcn20_dccg.c | 0 + .../amd/display/dc/{ => dccg}/dcn20/dcn20_dccg.h | 27 + + .../amd/display/dc/{ => dccg}/dcn201/dcn201_dccg.c | 0 + .../amd/display/dc/{ => dccg}/dcn201/dcn201_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn21/dcn21_dccg.c | 0 + .../amd/display/dc/{ => dccg}/dcn21/dcn21_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn30/dcn30_dccg.c | 0 + .../amd/display/dc/{ => dccg}/dcn30/dcn30_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn301/dcn301_dccg.c | 0 + .../amd/display/dc/{ => dccg}/dcn301/dcn301_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn302/dcn302_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn303/dcn303_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn31/dcn31_dccg.c | 0 + .../amd/display/dc/{ => dccg}/dcn31/dcn31_dccg.h | 2 +- + .../amd/display/dc/{ => dccg}/dcn314/dcn314_dccg.c | 12 +- + .../amd/display/dc/{ => dccg}/dcn314/dcn314_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn32/dcn32_dccg.c | 13 +- + .../amd/display/dc/{ => dccg}/dcn32/dcn32_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn35/dcn35_dccg.c | 70 +- + .../amd/display/dc/{ => dccg}/dcn35/dcn35_dccg.h | 0 + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c | 999 + + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.h | 217 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 64 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 3 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 121 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 8 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 4 + + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 6 +- + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 1 - + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 1 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 20 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.h | 2 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 5 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 146 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.h | 33 +- + .../display/dc/dce110/dce110_timing_generator.c | 18 + + .../display/dc/dce110/dce110_timing_generator.h | 2 + + .../display/dc/dce110/dce110_timing_generator_v.c | 3 +- + .../display/dc/dce120/dce120_timing_generator.c | 1 + + .../amd/display/dc/dce80/dce80_timing_generator.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 4 +- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 4 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 7 + + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 8 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c | 3 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 1 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 25 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h | 4 +- + drivers/gpu/drm/amd/display/dc/dcn201/Makefile | 9 +- + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.h | 3 +- + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 6 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 5 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 3 +- + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 14 + + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn314/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 20 - + drivers/gpu/drm/amd/display/dc/dcn321/Makefile | 17 - + drivers/gpu/drm/amd/display/dc/dcn35/Makefile | 20 - + drivers/gpu/drm/amd/display/dc/dcn401/Makefile | 11 + + drivers/gpu/drm/amd/display/dc/dio/Makefile | 63 + + .../dc/{ => dio}/dcn32/dcn32_dio_link_encoder.c | 3 - + .../dc/{ => dio}/dcn32/dcn32_dio_link_encoder.h | 0 + .../dc/{ => dio}/dcn32/dcn32_dio_stream_encoder.c | 40 +- + .../dc/{ => dio}/dcn32/dcn32_dio_stream_encoder.h | 0 + .../dc/{ => dio}/dcn321/dcn321_dio_link_encoder.c | 0 + .../dc/{ => dio}/dcn321/dcn321_dio_link_encoder.h | 0 + .../dc/{ => dio}/dcn35/dcn35_dio_link_encoder.c | 10 +- + .../dc/{ => dio}/dcn35/dcn35_dio_link_encoder.h | 0 + .../dc/{ => dio}/dcn35/dcn35_dio_stream_encoder.c | 43 +- + .../dc/{ => dio}/dcn35/dcn35_dio_stream_encoder.h | 6 + + .../dc/dio/dcn401/dcn401_dio_link_encoder.c | 322 + + .../dc/dio/dcn401/dcn401_dio_link_encoder.h | 134 + + .../dc/dio/dcn401/dcn401_dio_stream_encoder.c | 857 + + .../dc/dio/dcn401/dcn401_dio_stream_encoder.h | 217 + + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 3 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 4 + + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 9 +- + .../gpu/drm/amd/display/dc/dml/dcn10/dcn10_fpu.h | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 20 +- + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 16 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 4 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 5 - + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 5 - + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 8 - + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 8 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 5 - + .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.h | 7 +- + .../gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c | 10 + + .../gpu/drm/amd/display/dc/dml/dcn303/dcn303_fpu.c | 10 + + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 20 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 4 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 5 - + .../display/dc/dml/dcn314/display_mode_vba_314.c | 14 +- + .../dc/dml/dcn314/display_rq_dlg_calc_314.c | 5 - + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 58 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 2 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 8 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 10 + + .../gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.c | 239 + + .../gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.h | 14 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 7 +- + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 5 - + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 80 + + .../drm/amd/display/dc/dml2/display_mode_core.c | 61 +- + .../drm/amd/display/dc/dml2/display_mode_core.h | 2 + + .../display/dc/dml2/display_mode_core_structs.h | 2 + + .../dc/dml2/dml21/dml21_translation_helper.c | 1166 + + .../dc/dml2/dml21/dml21_translation_helper.h | 29 + + .../drm/amd/display/dc/dml2/dml21/dml21_utils.c | 555 + + .../drm/amd/display/dc/dml2/dml21/dml21_utils.h | 50 + + .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 437 + + .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.h | 68 + + .../dc/dml2/dml21/inc/bounding_boxes/dcn3_soc_bb.h | 401 + + .../dc/dml2/dml21/inc/bounding_boxes/dcn4_soc_bb.h | 365 + + .../dc/dml2/dml21/inc/dml2_external_lib_deps.h | 10 + + .../drm/amd/display/dc/dml2/dml21/inc/dml_top.h | 47 + + .../dc/dml2/dml21/inc/dml_top_dchub_registers.h | 185 + + .../dc/dml2/dml21/inc/dml_top_display_cfg_types.h | 507 + + .../dc/dml2/dml21/inc/dml_top_policy_types.h | 14 + + .../dml2/dml21/inc/dml_top_soc_parameter_types.h | 196 + + .../amd/display/dc/dml2/dml21/inc/dml_top_types.h | 720 + + .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c | 719 + + .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.h | 16 + + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 12743 ++ + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.h | 39 + + .../dml2/dml21/src/dml2_core/dml2_core_factory.c | 38 + + .../dml2/dml21/src/dml2_core/dml2_core_factory.h | 14 + + .../dc/dml2/dml21/src/dml2_core/dml2_core_shared.c | 12387 ++ + .../dc/dml2/dml21/src/dml2_core/dml2_core_shared.h | 38 + + .../dml21/src/dml2_core/dml2_core_shared_types.h | 2049 + + .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 714 + + .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h | 17 + + .../dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 51 + + .../dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.h | 14 + + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.c | 195 + + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.h | 14 + + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.c | 40 + + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.h | 14 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.c | 707 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.h | 23 + + .../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 | 2101 + + .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.h | 27 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.c | 86 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.h | 14 + + .../src/dml2_standalone_libraries/lib_float_math.c | 150 + + .../src/dml2_standalone_libraries/lib_float_math.h | 26 + + .../dml21/src/dml2_top/dml2_top_optimization.c | 309 + + .../dml21/src/dml2_top/dml2_top_optimization.h | 34 + + .../display/dc/dml2/dml21/src/dml2_top/dml_top.c | 330 + + .../dc/dml2/dml21/src/dml2_top/dml_top_mcache.c | 550 + + .../dc/dml2/dml21/src/dml2_top/dml_top_mcache.h | 24 + + .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.c | 32 + + .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.h | 18 + + .../dml21/src/inc/dml2_internal_shared_types.h | 986 + + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 101 +- + .../drm/amd/display/dc/dml2/dml2_internal_types.h | 20 + + .../amd/display/dc/dml2/dml2_translation_helper.c | 187 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 47 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 19 + + drivers/gpu/drm/amd/display/dc/dpp/Makefile | 8 +- + .../drm/amd/display/dc/dpp/dcn10/CMakeLists.txt | 6 - + .../drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 3 +- + .../drm/amd/display/dc/dpp/dcn20/CMakeLists.txt | 5 - + .../gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.c | 56 + + .../gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.h | 9 +- + .../drm/amd/display/dc/dpp/dcn201/CMakeLists.txt | 4 - + .../gpu/drm/amd/display/dc/dpp/dcn201/dcn201_dpp.c | 13 +- + .../drm/amd/display/dc/dpp/dcn30/CMakeLists.txt | 5 - + .../gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c | 34 +- + .../gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.h | 4 +- + .../drm/amd/display/dc/dpp/dcn32/CMakeLists.txt | 4 - + .../gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.c | 73 + + .../gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.h | 8 + + .../drm/amd/display/dc/dpp/dcn35/CMakeLists.txt | 4 - + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.c | 427 + + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h | 729 + + .../drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 311 + + .../amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 1219 + + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 9 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 31 +- + .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 18 +- + .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.h | 14 +- + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c | 418 + + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.h | 337 + + drivers/gpu/drm/amd/display/dc/dsc/dsc.h | 1 + + drivers/gpu/drm/amd/display/dc/dwb/Makefile | 37 + + .../drm/amd/display/dc/{ => dwb}/dcn35/dcn35_dwb.c | 0 + .../drm/amd/display/dc/{ => dwb}/dcn35/dcn35_dwb.h | 0 + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 10 + + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 2 +- + .../amd/display/dc/gpio/dcn401/hw_factory_dcn401.c | 252 + + .../amd/display/dc/gpio/dcn401/hw_factory_dcn401.h | 11 + + .../display/dc/gpio/dcn401/hw_translate_dcn401.c | 335 + + .../display/dc/gpio/dcn401/hw_translate_dcn401.h | 13 + + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 17 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 11 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 4 + + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 4 + + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 19 +- + drivers/gpu/drm/amd/display/dc/hpo/Makefile | 35 + + .../dc/{ => hpo}/dcn32/dcn32_hpo_dp_link_encoder.c | 0 + .../dc/{ => hpo}/dcn32/dcn32_hpo_dp_link_encoder.h | 0 + drivers/gpu/drm/amd/display/dc/hubbub/Makefile | 104 + + .../display/dc/{ => hubbub}/dcn10/dcn10_hubbub.c | 2 +- + .../display/dc/{ => hubbub}/dcn10/dcn10_hubbub.h | 47 +- + .../display/dc/{ => hubbub}/dcn20/dcn20_hubbub.c | 27 +- + .../display/dc/{ => hubbub}/dcn20/dcn20_hubbub.h | 2 +- + .../display/dc/{ => hubbub}/dcn201/dcn201_hubbub.c | 0 + .../display/dc/{ => hubbub}/dcn201/dcn201_hubbub.h | 0 + .../display/dc/{ => hubbub}/dcn21/dcn21_hubbub.c | 0 + .../display/dc/{ => hubbub}/dcn21/dcn21_hubbub.h | 0 + .../display/dc/{ => hubbub}/dcn30/dcn30_hubbub.c | 0 + .../display/dc/{ => hubbub}/dcn30/dcn30_hubbub.h | 0 + .../display/dc/{ => hubbub}/dcn301/dcn301_hubbub.c | 0 + .../display/dc/{ => hubbub}/dcn301/dcn301_hubbub.h | 0 + .../display/dc/{ => hubbub}/dcn31/dcn31_hubbub.c | 0 + .../display/dc/{ => hubbub}/dcn31/dcn31_hubbub.h | 0 + .../display/dc/{ => hubbub}/dcn32/dcn32_hubbub.c | 2 +- + .../display/dc/{ => hubbub}/dcn32/dcn32_hubbub.h | 2 + + .../display/dc/{ => hubbub}/dcn35/dcn35_hubbub.c | 0 + .../display/dc/{ => hubbub}/dcn35/dcn35_hubbub.h | 0 + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 929 + + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.h | 192 + + drivers/gpu/drm/amd/display/dc/hubp/Makefile | 97 + + .../amd/display/dc/{ => hubp}/dcn10/dcn10_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn10/dcn10_hubp.h | 0 + .../amd/display/dc/{ => hubp}/dcn20/dcn20_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn20/dcn20_hubp.h | 35 +- + .../amd/display/dc/{ => hubp}/dcn201/dcn201_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn201/dcn201_hubp.h | 0 + .../amd/display/dc/{ => hubp}/dcn21/dcn21_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn21/dcn21_hubp.h | 0 + .../amd/display/dc/{ => hubp}/dcn30/dcn30_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn30/dcn30_hubp.h | 0 + .../amd/display/dc/{ => hubp}/dcn31/dcn31_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn31/dcn31_hubp.h | 0 + .../amd/display/dc/{ => hubp}/dcn32/dcn32_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn32/dcn32_hubp.h | 0 + .../amd/display/dc/{ => hubp}/dcn35/dcn35_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn35/dcn35_hubp.h | 0 + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 1027 + + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h | 331 + + drivers/gpu/drm/amd/display/dc/hwss/Makefile | 9 +- + .../gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.h | 24 + + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 35 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 64 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 181 +- + .../drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.c | 10 +- + .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 2 +- + .../gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 7 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h | 2 +- + .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn301/dcn301_init.c | 4 +- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 2 +- + .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 51 +- + .../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 | 228 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.h | 6 +- + .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 4 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 128 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 2 + + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 5 +- + .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 12 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 1689 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 81 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 151 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.h | 12 + + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 26 + + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 9 +- + drivers/gpu/drm/amd/display/dc/inc/clock_source.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 6 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 55 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 8 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 24 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 56 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 9 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 726 +- + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/hw/optc.h | 4 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 3 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 28 +- + drivers/gpu/drm/amd/display/dc/inc/link.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 18 +- + drivers/gpu/drm/amd/display/dc/irq/Makefile | 9 + + .../amd/display/dc/irq/dcn401/irq_service_dcn401.c | 409 + + .../amd/display/dc/irq/dcn401/irq_service_dcn401.h | 13 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- + drivers/gpu/drm/amd/display/dc/irq_types.h | 8 + + .../drm/amd/display/dc/link/hwss/link_hwss_dio.c | 12 +- + .../hwss/link_hwss_hpo_fixed_vs_pe_retimer_dp.c | 5 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 2 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 68 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 67 +- + .../drm/amd/display/dc/link/protocols/link_ddc.c | 4 - + .../display/dc/link/protocols/link_dp_capability.c | 74 +- + .../dc/link/protocols/link_dp_irq_handler.c | 29 +- + .../amd/display/dc/link/protocols/link_dp_phy.c | 53 +- + .../display/dc/link/protocols/link_dp_training.c | 17 +- + .../dc/link/protocols/link_dp_training_dpia.c | 16 - + .../drm/amd/display/dc/link/protocols/link_dpcd.c | 1 + + .../dc/link/protocols/link_edp_panel_control.c | 4 +- + .../dc/link/protocols/link_edp_panel_control.h | 2 +- + drivers/gpu/drm/amd/display/dc/mmhubbub/Makefile | 45 + + .../dc/{ => mmhubbub}/dcn32/dcn32_mmhubbub.c | 0 + .../dc/{ => mmhubbub}/dcn32/dcn32_mmhubbub.h | 0 + .../dc/{ => mmhubbub}/dcn35/dcn35_mmhubbub.c | 0 + .../dc/{ => mmhubbub}/dcn35/dcn35_mmhubbub.h | 0 + drivers/gpu/drm/amd/display/dc/mpc/Makefile | 45 + + .../drm/amd/display/dc/{ => mpc}/dcn32/dcn32_mpc.c | 3 + + .../drm/amd/display/dc/{ => mpc}/dcn32/dcn32_mpc.h | 0 + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c | 653 + + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h | 239 + + drivers/gpu/drm/amd/display/dc/opp/Makefile | 35 + + .../drm/amd/display/dc/{ => opp}/dcn35/dcn35_opp.c | 0 + .../drm/amd/display/dc/{ => opp}/dcn35/dcn35_opp.h | 0 + drivers/gpu/drm/amd/display/dc/optc/Makefile | 6 + + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c | 50 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 10 +- + .../gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.c | 16 +- + .../gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.h | 3 +- + .../drm/amd/display/dc/optc/dcn201/dcn201_optc.c | 7 +- + .../drm/amd/display/dc/optc/dcn201/dcn201_optc.h | 3 - + .../gpu/drm/amd/display/dc/optc/dcn30/dcn30_optc.c | 9 +- + .../gpu/drm/amd/display/dc/optc/dcn30/dcn30_optc.h | 2 +- + .../drm/amd/display/dc/optc/dcn301/dcn301_optc.c | 1 + + .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c | 20 +- + .../drm/amd/display/dc/optc/dcn314/dcn314_optc.c | 10 +- + .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 10 +- + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 11 +- + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.c | 477 + + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.h | 167 + + drivers/gpu/drm/amd/display/dc/os_types.h | 2 - + drivers/gpu/drm/amd/display/dc/pg/Makefile | 35 + + .../amd/display/dc/{ => pg}/dcn35/dcn35_pg_cntl.c | 6 +- + .../amd/display/dc/{ => pg}/dcn35/dcn35_pg_cntl.h | 0 + drivers/gpu/drm/amd/display/dc/resource/Makefile | 10 +- + .../amd/display/dc/resource/dce80/CMakeLists.txt | 4 - + .../amd/display/dc/resource/dce80/dce80_resource.c | 1 + + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 18 +- + .../display/dc/resource/dcn201/dcn201_resource.c | 4 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 15 +- + .../display/dc/resource/dcn301/dcn301_resource.c | 20 +- + .../display/dc/resource/dcn303/dcn303_resource.c | 11 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 1 + + .../display/dc/resource/dcn314/dcn314_resource.c | 4 +- + .../display/dc/resource/dcn315/dcn315_resource.c | 12 + + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 19 +- + .../{ => resource}/dcn32/dcn32_resource_helpers.c | 15 +- + .../display/dc/resource/dcn321/dcn321_resource.c | 12 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 8 +- + .../display/dc/resource/dcn351/dcn351_resource.c | 8 +- + .../display/dc/resource/dcn401/dcn401_resource.c | 2139 + + .../display/dc/resource/dcn401/dcn401_resource.h | 644 + + drivers/gpu/drm/amd/display/dc/spl/Makefile | 33 + + drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 1470 + + drivers/gpu/drm/amd/display/dc/spl/dc_spl.h | 24 + + .../drm/amd/display/dc/spl/dc_spl_isharp_filters.c | 350 + + .../drm/amd/display/dc/spl/dc_spl_isharp_filters.h | 17 + + .../drm/amd/display/dc/spl/dc_spl_scl_filters.c | 1425 + + .../drm/amd/display/dc/spl/dc_spl_scl_filters.h | 59 + + drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h | 491 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 47 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 663 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 10 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c | 603 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.h | 287 + + drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h | 1 - + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 89 + + .../gpu/drm/amd/display/dmub/src/dmub_srv_stat.c | 6 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 14 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + .../gpu/drm/amd/display/include/grph_object_id.h | 4 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 28 +- + .../drm/amd/display/modules/power/power_helpers.c | 22 +- + .../drm/amd/display/modules/power/power_helpers.h | 5 + + drivers/gpu/drm/amd/include/amd_shared.h | 2 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 108 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 56 + + .../amd/include/asic_reg/dcn/dcn_3_0_2_offset.h | 90 + + .../amd/include/asic_reg/dcn/dcn_3_0_2_sh_mask.h | 44 + + .../amd/include/asic_reg/dcn/dcn_3_0_3_offset.h | 16 + + .../amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h | 16 + + .../amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h | 28 + + .../amd/include/asic_reg/dcn/dcn_4_1_0_offset.h | 16618 ++ + .../amd/include/asic_reg/dcn/dcn_4_1_0_sh_mask.h | 145742 ++++++++++++++++++ + .../drm/amd/include/asic_reg/gc/gc_11_0_0_offset.h | 10 + + .../drm/amd/include/asic_reg/gc/gc_12_0_0_offset.h | 11061 ++ + .../amd/include/asic_reg/gc/gc_12_0_0_sh_mask.h | 40550 +++++ + .../include/asic_reg/mmhub/mmhub_4_1_0_offset.h | 1341 + + .../include/asic_reg/mmhub/mmhub_4_1_0_sh_mask.h | 6943 + + .../amd/include/asic_reg/thm/thm_14_0_2_offset.h | 228 + + .../amd/include/asic_reg/thm/thm_14_0_2_sh_mask.h | 940 + + drivers/gpu/drm/amd/include/discovery.h | 28 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 17 + + drivers/gpu/drm/amd/include/mes_api_def.h | 570 - + drivers/gpu/drm/amd/include/mes_v12_api_def.h | 798 + + drivers/gpu/drm/amd/include/soc21_enum.h | 2 +- + drivers/gpu/drm/amd/include/soc24_enum.h | 21073 +++ + drivers/gpu/drm/amd/include/v12_structs.h | 1189 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 49 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 211 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 10 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 1 - + drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 9 - + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 20 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 10 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c | 21 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 5 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h | 36 +- + .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 2 - + .../drm/amd/pm/powerplay/hwmgr/processpptables.c | 2 - + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 37 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 78 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 29 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 115 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 20 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 31 +- + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 38 +- + .../gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c | 5 +- + .../drm/amd/pm/powerplay/smumgr/vega10_smumgr.c | 6 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 137 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 41 +- + .../pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0.h | 21 +- + .../pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0_0.h | 1 - + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 3 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 1 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 4 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 18 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 69 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 39 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 6 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 14 + + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 61 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 68 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 70 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 12 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 28 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 30 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 235 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 8 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 30 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 77 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 197 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 61 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 2 + + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 49 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 8 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 1 + + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 4 +- + drivers/gpu/drm/ast/ast_drv.c | 4 +- + drivers/gpu/drm/ast/ast_mode.c | 45 +- + drivers/gpu/drm/atmel-hlcdc/Kconfig | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 172 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 105 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 132 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 391 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 - + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 20 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 28 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 363 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 29 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 157 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 9 + + drivers/gpu/drm/bridge/analogix/anx7625.c | 36 +- + drivers/gpu/drm/bridge/analogix/anx7625.h | 10 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 5 - + drivers/gpu/drm/bridge/imx/imx-ldb-helper.c | 5 - + .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 5 - + drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 5 - + drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 5 - + drivers/gpu/drm/bridge/ite-it6505.c | 88 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 1 + + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 6 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 5 - + drivers/gpu/drm/bridge/nxp-ptn3460.c | 5 - + drivers/gpu/drm/bridge/panel.c | 5 - + drivers/gpu/drm/bridge/samsung-dsim.c | 25 +- + drivers/gpu/drm/bridge/sii902x.c | 46 +- + drivers/gpu/drm/bridge/sii9234.c | 1 + + drivers/gpu/drm/bridge/sil-sii8620.c | 1 + + drivers/gpu/drm/bridge/simple-bridge.c | 18 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 5 - + drivers/gpu/drm/bridge/tc358767.c | 101 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 5 - + drivers/gpu/drm/ci/build-igt.sh | 41 +- + drivers/gpu/drm/ci/build.sh | 10 +- + drivers/gpu/drm/ci/build.yml | 1 + + drivers/gpu/drm/ci/container.yml | 12 +- + drivers/gpu/drm/ci/gitlab-ci.yml | 47 +- + drivers/gpu/drm/ci/igt_runner.sh | 15 +- + drivers/gpu/drm/ci/image-tags.yml | 4 +- + drivers/gpu/drm/ci/lava-submit.sh | 4 +- + drivers/gpu/drm/ci/test.yml | 41 +- + drivers/gpu/drm/ci/testlist.txt | 2761 - + drivers/gpu/drm/ci/x86_64.config | 1 + + drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 41 +- + drivers/gpu/drm/ci/xfails/amdgpu-stoney-flakes.txt | 7 + + drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 33 +- + drivers/gpu/drm/ci/xfails/i915-amly-fails.txt | 31 + + drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt | 9 + + drivers/gpu/drm/ci/xfails/i915-amly-skips.txt | 22 +- + drivers/gpu/drm/ci/xfails/i915-apl-fails.txt | 46 +- + drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt | 6 + + drivers/gpu/drm/ci/xfails/i915-apl-skips.txt | 26 +- + drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 38 + + drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt | 6 + + drivers/gpu/drm/ci/xfails/i915-cml-skips.txt | 23 + + drivers/gpu/drm/ci/xfails/i915-glk-fails.txt | 41 +- + drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt | 7 + + drivers/gpu/drm/ci/xfails/i915-glk-skips.txt | 26 +- + drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt | 42 +- + drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt | 7 +- + drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt | 36 +- + drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 77 +- + drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt | 28 +- + drivers/gpu/drm/ci/xfails/i915-whl-fails.txt | 63 +- + drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt | 6 + + drivers/gpu/drm/ci/xfails/i915-whl-skips.txt | 22 +- + .../gpu/drm/ci/xfails/mediatek-mt8173-fails.txt | 30 +- + .../gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt | 11 + + .../gpu/drm/ci/xfails/mediatek-mt8173-skips.txt | 16 + + .../gpu/drm/ci/xfails/mediatek-mt8183-fails.txt | 21 +- + .../gpu/drm/ci/xfails/mediatek-mt8183-skips.txt | 18 + + drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt | 24 +- + drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt | 18 + + drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt | 26 +- + drivers/gpu/drm/ci/xfails/msm-apq8016-skips.txt | 15 + + drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt | 8 +- + drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt | 6 + + drivers/gpu/drm/ci/xfails/msm-apq8096-skips.txt | 26 +- + .../xfails/msm-sc7180-trogdor-kingoftown-fails.txt | 175 +- + .../msm-sc7180-trogdor-kingoftown-flakes.txt | 8 + + .../xfails/msm-sc7180-trogdor-kingoftown-skips.txt | 19 + + .../msm-sc7180-trogdor-lazor-limozeen-fails.txt | 175 +- + .../msm-sc7180-trogdor-lazor-limozeen-flakes.txt | 6 + + .../msm-sc7180-trogdor-lazor-limozeen-skips.txt | 16 + + drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt | 38 +- + drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt | 25 +- + drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt | 19 + + .../gpu/drm/ci/xfails/rockchip-rk3288-fails.txt | 62 +- + .../gpu/drm/ci/xfails/rockchip-rk3288-skips.txt | 21 +- + .../gpu/drm/ci/xfails/rockchip-rk3399-fails.txt | 83 +- + .../gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt | 13 +- + .../gpu/drm/ci/xfails/rockchip-rk3399-skips.txt | 19 + + drivers/gpu/drm/ci/xfails/update-xfails.py | 4 +- + .../gpu/drm/ci/xfails/virtio_gpu-none-fails.txt | 94 +- + .../gpu/drm/ci/xfails/virtio_gpu-none-skips.txt | 20 +- + drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 57 + + drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt | 69 + + drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 119 + + drivers/gpu/drm/display/Kconfig | 7 + + drivers/gpu/drm/display/Makefile | 2 + + drivers/gpu/drm/display/drm_hdmi_helper.c | 61 + + drivers/gpu/drm/display/drm_hdmi_state_helper.c | 752 + + drivers/gpu/drm/drm_atomic.c | 11 + + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_bridge.c | 42 - + drivers/gpu/drm/drm_bridge_connector.c | 107 +- + drivers/gpu/drm/drm_connector.c | 201 + + drivers/gpu/drm/drm_crtc_internal.h | 2 + + drivers/gpu/drm/drm_debugfs.c | 158 +- + drivers/gpu/drm/drm_drv.c | 6 +- + drivers/gpu/drm/drm_edid.c | 61 +- + drivers/gpu/drm/drm_fb_helper.c | 11 +- + drivers/gpu/drm/drm_fbdev_dma.c | 66 +- + drivers/gpu/drm/drm_fbdev_shmem.c | 317 + + .../drm/{drm_fbdev_generic.c => drm_fbdev_ttm.c} | 80 +- + drivers/gpu/drm/drm_ioctl.c | 5 +- + drivers/gpu/drm/drm_mipi_dbi.c | 77 +- + drivers/gpu/drm/drm_mipi_dsi.c | 322 + + drivers/gpu/drm/drm_mm.c | 35 - + drivers/gpu/drm/drm_mode_object.c | 1 + + drivers/gpu/drm/drm_modes.c | 5 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 1 + + drivers/gpu/drm/drm_panic.c | 355 +- + drivers/gpu/drm/drm_print.c | 72 +- + drivers/gpu/drm/drm_probe_helper.c | 13 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 1 + + drivers/gpu/drm/drm_sysfs.c | 24 +- + drivers/gpu/drm/exynos/exynos_dp.c | 5 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- + drivers/gpu/drm/gud/gud_drv.c | 5 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 4 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 17 +- + drivers/gpu/drm/hisilicon/kirin/Kconfig | 2 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 11 +- + drivers/gpu/drm/hisilicon/kirin/dw_dsi_reg.h | 2 + + drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 2 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 4 +- + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 19 +- + drivers/gpu/drm/i915/Kconfig | 1 - + drivers/gpu/drm/i915/Kconfig.debug | 17 + + drivers/gpu/drm/i915/Makefile | 27 +- + drivers/gpu/drm/i915/display/dvo_ns2501.c | 1 - + drivers/gpu/drm/i915/display/g4x_dp.c | 37 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 104 +- + drivers/gpu/drm/i915/display/i9xx_plane_regs.h | 112 + + drivers/gpu/drm/i915/display/i9xx_wm.c | 114 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 46 +- + drivers/gpu/drm/i915/display/intel_alpm.c | 414 + + drivers/gpu/drm/i915/display/intel_alpm.h | 27 + + drivers/gpu/drm/i915/display/intel_atomic.c | 1 - + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 62 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 1 + + drivers/gpu/drm/i915/display/intel_audio.c | 17 +- + drivers/gpu/drm/i915/display/intel_audio_regs.h | 3 + + drivers/gpu/drm/i915/display/intel_bios.c | 243 +- + drivers/gpu/drm/i915/display/intel_bw.c | 65 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 130 +- + drivers/gpu/drm/i915/display/intel_color.c | 143 +- + drivers/gpu/drm/i915/display/intel_color.h | 4 +- + drivers/gpu/drm/i915/display/intel_color_regs.h | 5 + + drivers/gpu/drm/i915/display/intel_crt.c | 50 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 15 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 15 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 102 +- + drivers/gpu/drm/i915/display/intel_cursor_regs.h | 112 + + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 368 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 8 +- + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 48 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 129 +- + drivers/gpu/drm/i915/display/intel_display.c | 811 +- + drivers/gpu/drm/i915/display/intel_display.h | 13 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 12 +- + .../gpu/drm/i915/display/intel_display_device.c | 925 +- + .../gpu/drm/i915/display/intel_display_device.h | 89 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 46 +- + .../gpu/drm/i915/display/intel_display_limits.h | 21 +- + .../gpu/drm/i915/display/intel_display_params.c | 2 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 20 +- + .../drm/i915/display/intel_display_power_well.c | 14 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 87 +- + drivers/gpu/drm/i915/display/intel_dkl_phy.c | 1 - + drivers/gpu/drm/i915/display/intel_dmc.c | 21 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 6 +- + drivers/gpu/drm/i915/display/intel_dp.c | 410 +- + drivers/gpu/drm/i915/display/intel_dp.h | 24 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 149 +- + drivers/gpu/drm/i915/display/intel_dp_aux_regs.h | 18 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 5 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 538 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 8 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 84 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 63 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 1 + + drivers/gpu/drm/i915/display/intel_dpt.c | 9 +- + drivers/gpu/drm/i915/display/intel_dpt.h | 5 +- + drivers/gpu/drm/i915/display/intel_dpt_common.c | 1 + + drivers/gpu/drm/i915/display/intel_drrs.c | 8 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 31 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 9 + + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 6 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 5 +- + drivers/gpu/drm/i915/display/intel_encoder.c | 39 + + drivers/gpu/drm/i915/display/intel_encoder.h | 16 + + drivers/gpu/drm/i915/display/intel_fb.c | 45 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 73 +- + drivers/gpu/drm/i915/display/intel_fb_pin.h | 12 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 38 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 40 +- + drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 6 +- + drivers/gpu/drm/i915/display/intel_fbdev_fb.h | 4 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 15 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 13 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 27 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 2 +- + .../gpu/drm/i915/display/intel_hdcp_gsc_message.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 41 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 12 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 31 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 60 +- + .../gpu/drm/i915/display/intel_modeset_verify.c | 8 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 21 +- + drivers/gpu/drm/i915/display/intel_overlay.h | 6 +- + drivers/gpu/drm/i915/display/intel_panel.c | 2 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 21 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 21 +- + drivers/gpu/drm/i915/display/intel_pipe_crc_regs.h | 152 + + drivers/gpu/drm/i915/display/intel_pps.c | 32 +- + drivers/gpu/drm/i915/display/intel_pps_regs.h | 16 +- + drivers/gpu/drm/i915/display/intel_psr.c | 981 +- + drivers/gpu/drm/i915/display/intel_psr_regs.h | 93 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 1 - + drivers/gpu/drm/i915/display/intel_sprite_regs.h | 242 +- + drivers/gpu/drm/i915/display/intel_sprite_uapi.c | 2 +- + drivers/gpu/drm/i915/display/intel_tdf.h | 25 + + drivers/gpu/drm/i915/display/intel_vblank.c | 169 +- + drivers/gpu/drm/i915/display/intel_vblank.h | 5 + + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 729 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 19 +- + drivers/gpu/drm/i915/display/intel_vdsc_regs.h | 6 +- + drivers/gpu/drm/i915/display/intel_vga.c | 1 + + drivers/gpu/drm/i915/display/intel_vrr.c | 182 +- + drivers/gpu/drm/i915/display/intel_vrr_regs.h | 127 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 210 +- + drivers/gpu/drm/i915/display/skl_universal_plane.h | 2 + + .../drm/i915/display/skl_universal_plane_regs.h | 442 + + drivers/gpu/drm/i915/display/skl_watermark.c | 134 +- + drivers/gpu/drm/i915/display/skl_watermark.h | 13 +- + drivers/gpu/drm/i915/display/skl_watermark_regs.h | 83 - + drivers/gpu/drm/i915/display/vlv_dsi.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 113 + + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 2 +- + drivers/gpu/drm/i915/gt/intel_context.c | 2 + + drivers/gpu/drm/i915/gt/intel_context.h | 22 + + drivers/gpu/drm/i915/gt/intel_context_types.h | 3 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 1 - + drivers/gpu/drm/i915/gt/intel_lrc.c | 8 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 8 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 13 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 8 + + drivers/gpu/drm/i915/gt/selftest_context.c | 2 +- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 110 - + drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 32 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 15 +- + drivers/gpu/drm/i915/gvt/display.c | 73 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 3 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 23 +- + drivers/gpu/drm/i915/gvt/handlers.c | 153 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 1 + + drivers/gpu/drm/i915/gvt/reg.h | 3 - + drivers/gpu/drm/i915/i915_drv.h | 15 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 5 +- + drivers/gpu/drm/i915/i915_irq.c | 5 +- + drivers/gpu/drm/i915/i915_params.c | 5 + + drivers/gpu/drm/i915/i915_params.h | 3 +- + drivers/gpu/drm/i915/i915_pci.c | 157 +- + drivers/gpu/drm/i915/i915_reg.h | 923 +- + drivers/gpu/drm/i915/i915_suspend.c | 48 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 14 +- + drivers/gpu/drm/i915/intel_device_info.c | 92 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 353 +- + drivers/gpu/drm/i915/intel_memory_region.c | 2 +- + drivers/gpu/drm/i915/intel_memory_region.h | 5 - + drivers/gpu/drm/i915/intel_pci_config.h | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 9 +- + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 4 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- + drivers/gpu/drm/i915/soc/intel_dram.c | 216 +- + drivers/gpu/drm/i915/soc/intel_dram.h | 1 + + drivers/gpu/drm/i915/soc/intel_gmch.c | 2 +- + drivers/gpu/drm/i915/soc/intel_pch.c | 4 +- + drivers/gpu/drm/imx/ipuv3/imx-ldb.c | 24 +- + drivers/gpu/drm/imx/ipuv3/imx-tve.c | 14 +- + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 4 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 4 +- + drivers/gpu/drm/loongson/Kconfig | 1 + + drivers/gpu/drm/loongson/lsdc_drv.c | 4 +- + drivers/gpu/drm/loongson/lsdc_output_7a1000.c | 15 +- + drivers/gpu/drm/loongson/lsdc_output_7a2000.c | 15 +- + drivers/gpu/drm/mediatek/Kconfig | 1 + + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 11 - + drivers/gpu/drm/meson/meson_plane.c | 17 +- + drivers/gpu/drm/mgag200/Kconfig | 18 +- + drivers/gpu/drm/mgag200/Makefile | 5 +- + drivers/gpu/drm/mgag200/mgag200_bmc.c | 107 + + drivers/gpu/drm/mgag200/mgag200_ddc.c | 179 + + drivers/gpu/drm/mgag200/mgag200_ddc.h | 11 + + drivers/gpu/drm/mgag200/mgag200_drv.c | 27 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200eh.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200er.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200se.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_i2c.c | 129 - + drivers/gpu/drm/mgag200/mgag200_mode.c | 35 +- + drivers/gpu/drm/mgag200/mgag200_vga.c | 72 + + drivers/gpu/drm/nouveau/dispnv50/disp.c | 8 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 8 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 6 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_exec.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 30 +- + drivers/gpu/drm/nouveau/nouveau_fence.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_sched.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_uvmm.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 364 +- + drivers/gpu/drm/omapdrm/Kconfig | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 4 +- + drivers/gpu/drm/panel/Kconfig | 29 + + drivers/gpu/drm/panel/Makefile | 3 + + drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 1 + + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 136 +- + drivers/gpu/drm/panel/panel-auo-a030jtn01.c | 1 + + drivers/gpu/drm/panel/panel-boe-himax8279d.c | 40 - + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 2745 +- + drivers/gpu/drm/panel/panel-edp.c | 260 +- + drivers/gpu/drm/panel/panel-himax-hx83102.c | 706 + + drivers/gpu/drm/panel/panel-himax-hx8394.c | 3 +- + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 7 +- + drivers/gpu/drm/panel/panel-ilitek-ili9806e.c | 402 + + drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 764 +- + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 1 + + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 318 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 35 - + drivers/gpu/drm/panel/panel-khadas-ts050.c | 39 - + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 48 - + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 28 - + drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 28 - + drivers/gpu/drm/panel/panel-lg-sw43408.c | 74 +- + drivers/gpu/drm/panel/panel-lincolntech-lcd197.c | 262 + + drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 226 + + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 29 - + drivers/gpu/drm/panel/panel-novatek-nt36672e.c | 643 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 1 + + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 44 - + drivers/gpu/drm/panel/panel-orisetech-ota5601a.c | 1 + + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 41 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 47 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 26 - + drivers/gpu/drm/panel/panel-raydium-rm692e5.c | 236 +- + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 36 - + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 49 - + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 63 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 24 - + drivers/gpu/drm/panel/panel-simple.c | 185 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 855 +- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 6 - + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 431 +- + drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c | 23 - + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 28 - + drivers/gpu/drm/panfrost/panfrost_drv.c | 10 + + drivers/gpu/drm/qxl/qxl_display.c | 3 + + drivers/gpu/drm/qxl/qxl_drv.c | 4 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 12 +- + drivers/gpu/drm/radeon/evergreen_hdmi.c | 5 +- + drivers/gpu/drm/radeon/pptable.h | 2 +- + drivers/gpu/drm/radeon/radeon_audio.c | 13 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 37 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 4 +- + drivers/gpu/drm/radeon/radeon_mode.h | 2 - + drivers/gpu/drm/renesas/rcar-du/Kconfig | 2 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 4 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 4 +- + drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 4 +- + drivers/gpu/drm/rockchip/Kconfig | 3 + + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 26 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 20 + + drivers/gpu/drm/rockchip/inno_hdmi.c | 172 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 +- + drivers/gpu/drm/solomon/ssd130x.c | 4 +- + drivers/gpu/drm/sti/Kconfig | 2 +- + drivers/gpu/drm/sti/sti_dvo.c | 1 + + drivers/gpu/drm/stm/Kconfig | 2 +- + drivers/gpu/drm/sun4i/Kconfig | 3 + + drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 83 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 70 +- + drivers/gpu/drm/sun4i/sun8i_mixer.h | 20 + + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 85 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.h | 20 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 86 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.h | 20 +- + drivers/gpu/drm/sun4i/sunxi_engine.h | 13 +- + drivers/gpu/drm/tests/Makefile | 1 + + drivers/gpu/drm/tests/drm_buddy_test.c | 1 + + drivers/gpu/drm/tests/drm_cmdline_parser_test.c | 1 + + drivers/gpu/drm/tests/drm_connector_test.c | 1052 +- + drivers/gpu/drm/tests/drm_damage_helper_test.c | 1 + + drivers/gpu/drm/tests/drm_dp_mst_helper_test.c | 1 + + drivers/gpu/drm/tests/drm_exec_test.c | 1 + + drivers/gpu/drm/tests/drm_format_test.c | 1 + + drivers/gpu/drm/tests/drm_framebuffer_test.c | 1 + + drivers/gpu/drm/tests/drm_gem_shmem_test.c | 1 + + drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 1744 + + drivers/gpu/drm/tests/drm_kunit_edid.h | 484 + + drivers/gpu/drm/tests/drm_kunit_helpers.c | 1 + + drivers/gpu/drm/tests/drm_managed_test.c | 1 + + drivers/gpu/drm/tests/drm_mm_test.c | 1 + + drivers/gpu/drm/tests/drm_modes_test.c | 1 + + drivers/gpu/drm/tests/drm_plane_helper_test.c | 1 + + drivers/gpu/drm/tests/drm_probe_helper_test.c | 1 + + drivers/gpu/drm/tests/drm_rect_test.c | 1 + + drivers/gpu/drm/tidss/tidss_plane.c | 14 +- + drivers/gpu/drm/tiny/bochs.c | 28 +- + drivers/gpu/drm/tiny/cirrus.c | 5 +- + drivers/gpu/drm/tiny/gm12u320.c | 5 +- + drivers/gpu/drm/tiny/hx8357d.c | 4 +- + drivers/gpu/drm/tiny/ili9163.c | 4 +- + drivers/gpu/drm/tiny/ili9225.c | 5 +- + drivers/gpu/drm/tiny/ili9341.c | 4 +- + drivers/gpu/drm/tiny/ili9486.c | 4 +- + drivers/gpu/drm/tiny/mi0283qt.c | 5 +- + drivers/gpu/drm/tiny/ofdrm.c | 4 +- + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 60 +- + drivers/gpu/drm/tiny/repaper.c | 4 +- + drivers/gpu/drm/tiny/simpledrm.c | 4 +- + drivers/gpu/drm/tiny/st7586.c | 5 +- + drivers/gpu/drm/tiny/st7735r.c | 4 +- + drivers/gpu/drm/ttm/tests/.kunitconfig | 1 - + drivers/gpu/drm/ttm/tests/Makefile | 2 + + drivers/gpu/drm/ttm/tests/TODO | 27 + + drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 63 +- + drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c | 1225 + + drivers/gpu/drm/ttm/tests/ttm_device_test.c | 3 +- + drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 178 +- + drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 17 +- + drivers/gpu/drm/ttm/tests/ttm_mock_manager.c | 234 + + drivers/gpu/drm/ttm/tests/ttm_mock_manager.h | 30 + + drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 9 +- + drivers/gpu/drm/ttm/tests/ttm_resource_test.c | 21 +- + drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 169 +- + drivers/gpu/drm/ttm/ttm_tt.c | 3 + + drivers/gpu/drm/udl/Makefile | 8 +- + drivers/gpu/drm/udl/udl_drv.c | 5 +- + drivers/gpu/drm/udl/udl_drv.h | 12 +- + drivers/gpu/drm/udl/udl_edid.c | 80 + + drivers/gpu/drm/udl/udl_edid.h | 15 + + drivers/gpu/drm/udl/udl_modeset.c | 142 +- + drivers/gpu/drm/v3d/v3d_drv.c | 11 + + drivers/gpu/drm/v3d/v3d_drv.h | 11 +- + drivers/gpu/drm/v3d/v3d_perfmon.c | 228 +- + drivers/gpu/drm/v3d/v3d_performance_counters.h | 29 + + drivers/gpu/drm/v3d/v3d_sched.c | 2 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 4 +- + drivers/gpu/drm/vc4/Kconfig | 1 + + drivers/gpu/drm/vc4/tests/vc4_mock.c | 6 +- + drivers/gpu/drm/vc4/tests/vc4_mock.h | 9 +- + drivers/gpu/drm/vc4/tests/vc4_mock_plane.c | 44 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 644 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 44 +- + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 6 +- + drivers/gpu/drm/vc4/vc4_vec.c | 31 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 10 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 12 +- + drivers/gpu/drm/vkms/vkms_drv.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 1 - + drivers/gpu/drm/xe/Kconfig | 1 - + drivers/gpu/drm/xe/Kconfig.debug | 10 - + drivers/gpu/drm/xe/Makefile | 46 +- + drivers/gpu/drm/xe/abi/guc_actions_abi.h | 6 - + drivers/gpu/drm/xe/abi/guc_actions_slpc_abi.h | 22 + + drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 190 + + drivers/gpu/drm/xe/abi/guc_errors_abi.h | 57 +- + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 40 +- + drivers/gpu/drm/xe/abi/guc_messages_abi.h | 41 +- + drivers/gpu/drm/xe/abi/guc_relay_actions_abi.h | 170 +- + .../gem/i915_gem_object_types.h | 11 + + .../{ => gem}/i915_gem_stolen.h | 0 + .../compat-i915-headers/{ => gt}/intel_gt_types.h | 0 + drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 67 +- + .../drm/xe/compat-i915-headers/intel_runtime_pm.h | 51 + + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 5 + + drivers/gpu/drm/xe/display/ext/i915_irq.c | 1 - + drivers/gpu/drm/xe/display/intel_fb_bo.c | 7 +- + drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 37 +- + drivers/gpu/drm/xe/display/intel_fbdev_fb.h | 21 - + drivers/gpu/drm/xe/display/xe_display.c | 46 +- + drivers/gpu/drm/xe/display/xe_display.h | 12 +- + drivers/gpu/drm/xe/display/xe_dsb_buffer.c | 9 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 28 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 3 +- + drivers/gpu/drm/xe/display/xe_plane_initial.c | 23 +- + drivers/gpu/drm/xe/display/xe_tdf.c | 13 + + .../xe/{regs => instructions}/xe_gpu_commands.h | 0 + drivers/gpu/drm/xe/instructions/xe_mi_commands.h | 5 + + drivers/gpu/drm/xe/regs/xe_bars.h | 11 + + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 12 +- + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 81 +- + drivers/gpu/drm/xe/regs/xe_guc_regs.h | 2 + + drivers/gpu/drm/xe/regs/xe_lrc_layout.h | 8 + + drivers/gpu/drm/xe/regs/xe_oa_regs.h | 100 + + drivers/gpu/drm/xe/regs/xe_pcode_regs.h | 7 + + drivers/gpu/drm/xe/regs/xe_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_sriov_regs.h | 3 + + drivers/gpu/drm/xe/tests/Makefile | 1 + + drivers/gpu/drm/xe/tests/xe_args_test.c | 221 + + .../gpu/drm/xe/tests/xe_gt_sriov_pf_service_test.c | 232 + + drivers/gpu/drm/xe/tests/xe_migrate.c | 88 +- + drivers/gpu/drm/xe/tests/xe_rtp_test.c | 64 +- + drivers/gpu/drm/xe/xe_args.h | 143 + + drivers/gpu/drm/xe/xe_assert.h | 4 +- + drivers/gpu/drm/xe/xe_bb.c | 2 +- + drivers/gpu/drm/xe/xe_bo.c | 82 +- + drivers/gpu/drm/xe/xe_bo.h | 1 + + drivers/gpu/drm/xe/xe_debugfs.c | 58 + + drivers/gpu/drm/xe/xe_devcoredump.c | 27 +- + drivers/gpu/drm/xe/xe_devcoredump_types.h | 2 + + drivers/gpu/drm/xe/xe_device.c | 201 +- + drivers/gpu/drm/xe/xe_device.h | 15 +- + drivers/gpu/drm/xe/xe_device_sysfs.c | 4 +- + drivers/gpu/drm/xe/xe_device_types.h | 33 +- + drivers/gpu/drm/xe/xe_drm_client.c | 124 +- + drivers/gpu/drm/xe/xe_exec.c | 8 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 85 +- + drivers/gpu/drm/xe/xe_exec_queue.h | 10 + + drivers/gpu/drm/xe/xe_exec_queue_types.h | 42 +- + drivers/gpu/drm/xe/xe_execlist.c | 12 +- + drivers/gpu/drm/xe/xe_force_wake.c | 102 +- + drivers/gpu/drm/xe/xe_force_wake.h | 13 +- + drivers/gpu/drm/xe/xe_ggtt.c | 76 +- + drivers/gpu/drm/xe/xe_ggtt.h | 1 - + drivers/gpu/drm/xe/xe_ggtt_types.h | 12 +- + drivers/gpu/drm/xe/xe_gsc.c | 8 + + drivers/gpu/drm/xe/xe_gsc.h | 3 +- + drivers/gpu/drm/xe/xe_gsc_proxy.c | 5 +- + drivers/gpu/drm/xe/xe_gsc_submit.c | 1 + + drivers/gpu/drm/xe/xe_gt.c | 166 +- + drivers/gpu/drm/xe/xe_gt.h | 28 + + drivers/gpu/drm/xe/xe_gt_ccs_mode.c | 19 +- + drivers/gpu/drm/xe/xe_gt_clock.c | 21 + + drivers/gpu/drm/xe/xe_gt_clock.h | 1 + + drivers/gpu/drm/xe/xe_gt_debugfs.c | 31 + + drivers/gpu/drm/xe/xe_gt_freq.c | 8 +- + drivers/gpu/drm/xe/xe_gt_idle.c | 73 +- + drivers/gpu/drm/xe/xe_gt_idle.h | 4 +- + drivers/gpu/drm/xe/xe_gt_mcr.c | 27 +- + drivers/gpu/drm/xe/xe_gt_mcr.h | 25 + + drivers/gpu/drm/xe/xe_gt_pagefault.c | 156 +- + drivers/gpu/drm/xe/xe_gt_printk.h | 3 + + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 32 + + drivers/gpu/drm/xe/xe_gt_sriov_pf.h | 5 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 106 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 6 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config_types.h | 4 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c | 21 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.h | 1 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 427 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.h | 18 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.c | 147 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.h | 27 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor_types.h | 22 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 550 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.h | 36 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_service_types.h | 52 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 10 + + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 979 + + drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 30 + + drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c | 72 + + drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.h | 14 + + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 84 + + drivers/gpu/drm/xe/xe_gt_sysfs.c | 4 +- + .../{xe_gt_throttle_sysfs.c => xe_gt_throttle.c} | 30 +- + drivers/gpu/drm/xe/xe_gt_throttle.h | 17 + + drivers/gpu/drm/xe/xe_gt_throttle_sysfs.h | 16 - + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 189 +- + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h | 3 + + drivers/gpu/drm/xe/xe_gt_topology.c | 14 +- + drivers/gpu/drm/xe/xe_gt_topology.h | 3 + + drivers/gpu/drm/xe/xe_gt_types.h | 38 +- + drivers/gpu/drm/xe/xe_guc.c | 393 +- + drivers/gpu/drm/xe/xe_guc.h | 3 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 71 +- + drivers/gpu/drm/xe/xe_guc_ads.h | 3 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 76 +- + drivers/gpu/drm/xe/xe_guc_ct_types.h | 2 + + drivers/gpu/drm/xe/xe_guc_db_mgr.c | 3 +- + drivers/gpu/drm/xe/xe_guc_id_mgr.c | 3 +- + drivers/gpu/drm/xe/xe_guc_klv_helpers.c | 12 + + drivers/gpu/drm/xe/xe_guc_klv_helpers.h | 15 +- + drivers/gpu/drm/xe/xe_guc_klv_thresholds_set.h | 64 + + .../gpu/drm/xe/xe_guc_klv_thresholds_set_types.h | 68 + + drivers/gpu/drm/xe/xe_guc_pc.c | 218 +- + drivers/gpu/drm/xe/xe_guc_pc.h | 10 +- + drivers/gpu/drm/xe/xe_guc_pc_types.h | 4 + + drivers/gpu/drm/xe/xe_guc_relay.c | 17 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 605 +- + drivers/gpu/drm/xe/xe_guc_submit.h | 4 +- + drivers/gpu/drm/xe/xe_guc_types.h | 9 - + drivers/gpu/drm/xe/xe_huc.c | 32 +- + drivers/gpu/drm/xe/xe_huc.h | 3 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 197 +- + drivers/gpu/drm/xe/xe_hw_engine.h | 3 + + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 30 +- + drivers/gpu/drm/xe/xe_hw_engine_types.h | 28 +- + drivers/gpu/drm/xe/xe_hw_fence.c | 59 +- + drivers/gpu/drm/xe/xe_hw_fence.h | 7 +- + drivers/gpu/drm/xe/xe_hwmon.c | 37 +- + drivers/gpu/drm/xe/xe_irq.c | 12 +- + drivers/gpu/drm/xe/xe_irq.h | 1 - + drivers/gpu/drm/xe/xe_lrc.c | 392 +- + drivers/gpu/drm/xe/xe_lrc.h | 64 +- + drivers/gpu/drm/xe/xe_lrc_types.h | 12 + + drivers/gpu/drm/xe/xe_migrate.c | 106 +- + drivers/gpu/drm/xe/xe_mmio.c | 453 +- + drivers/gpu/drm/xe/xe_mmio.h | 22 +- + drivers/gpu/drm/xe/xe_mocs.c | 301 +- + drivers/gpu/drm/xe/xe_mocs.h | 11 +- + drivers/gpu/drm/xe/xe_module.c | 10 + + drivers/gpu/drm/xe/xe_module.h | 1 + + drivers/gpu/drm/xe/xe_oa.c | 2510 + + drivers/gpu/drm/xe/xe_oa.h | 27 + + drivers/gpu/drm/xe/xe_oa_types.h | 242 + + drivers/gpu/drm/xe/xe_pat.c | 1 + + drivers/gpu/drm/xe/xe_pci.c | 117 +- + drivers/gpu/drm/xe/xe_pci_sriov.c | 157 + + drivers/gpu/drm/xe/xe_pci_sriov.h | 13 + + drivers/gpu/drm/xe/xe_pci_types.h | 4 + + drivers/gpu/drm/xe/xe_pcode.c | 6 +- + drivers/gpu/drm/xe/xe_perf.c | 92 + + drivers/gpu/drm/xe/xe_perf.h | 20 + + drivers/gpu/drm/xe/xe_pm.c | 42 +- + drivers/gpu/drm/xe/xe_pm.h | 9 +- + drivers/gpu/drm/xe/xe_preempt_fence.c | 16 +- + drivers/gpu/drm/xe/xe_pt.c | 77 +- + drivers/gpu/drm/xe/xe_query.c | 87 +- + drivers/gpu/drm/xe/xe_reg_sr.h | 4 +- + drivers/gpu/drm/xe/xe_reg_whitelist.c | 24 +- + drivers/gpu/drm/xe/xe_res_cursor.h | 2 - + drivers/gpu/drm/xe/xe_ring_ops.c | 55 +- + drivers/gpu/drm/xe/xe_rtp.c | 41 +- + drivers/gpu/drm/xe/xe_rtp.h | 59 +- + drivers/gpu/drm/xe/xe_rtp_helpers.h | 28 +- + drivers/gpu/drm/xe/xe_rtp_types.h | 3 + + drivers/gpu/drm/xe/xe_sched_job.c | 189 +- + drivers/gpu/drm/xe/xe_sched_job.h | 10 +- + drivers/gpu/drm/xe/xe_sched_job_types.h | 20 +- + drivers/gpu/drm/xe/xe_sriov.c | 11 + + drivers/gpu/drm/xe/xe_sriov.h | 6 +- + drivers/gpu/drm/xe/xe_sync.c | 15 + + drivers/gpu/drm/xe/xe_sync.h | 1 + + drivers/gpu/drm/xe/xe_tile_sysfs.c | 4 +- + drivers/gpu/drm/xe/xe_trace.h | 379 +- + drivers/gpu/drm/xe/xe_trace_bo.c | 9 + + drivers/gpu/drm/xe/xe_trace_bo.h | 247 + + drivers/gpu/drm/xe/xe_trace_guc.c | 9 + + drivers/gpu/drm/xe/xe_trace_guc.h | 110 + + drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 2 + + drivers/gpu/drm/xe/xe_uc.c | 58 +- + drivers/gpu/drm/xe/xe_uc.h | 4 +- + drivers/gpu/drm/xe/xe_uc_fw.c | 5 + + drivers/gpu/drm/xe/xe_uc_fw.h | 2 +- + drivers/gpu/drm/xe/xe_vm.c | 958 +- + drivers/gpu/drm/xe/xe_vm.h | 5 +- + drivers/gpu/drm/xe/xe_vm_doc.h | 24 +- + drivers/gpu/drm/xe/xe_vm_types.h | 29 +- + drivers/gpu/drm/xe/xe_vram.c | 368 + + drivers/gpu/drm/xe/xe_vram.h | 13 + + drivers/gpu/drm/xe/xe_vram_freq.c | 4 +- + drivers/gpu/drm/xe/xe_wa.c | 48 +- + drivers/gpu/drm/xe/xe_wa.h | 2 - + drivers/gpu/drm/xe/xe_wa_oob.rules | 1 + + drivers/gpu/drm/xlnx/zynqmp_disp.c | 44 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 62 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 + + drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 1 + + drivers/gpu/drm/xlnx/zynqmp_kms.c | 22 +- + drivers/gpu/drm/xlnx/zynqmp_kms.h | 4 +- + drivers/gpu/ipu-v3/ipu-pre.c | 131 +- + drivers/gpu/ipu-v3/ipu-prg.c | 2 +- + drivers/gpu/ipu-v3/ipu-prv.h | 2 +- + drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c | 4 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 4 +- + drivers/misc/mei/pxp/mei_pxp.c | 4 +- + drivers/platform/x86/intel_ips.c | 2 +- + drivers/video/fbdev/core/fb_defio.c | 82 +- + drivers/video/logo/Kconfig | 2 + + include/drm/bridge/analogix_dp.h | 4 +- + include/drm/display/drm_dp.h | 28 +- + include/drm/display/drm_dp_helper.h | 3 +- + include/drm/display/drm_hdmi_helper.h | 4 + + include/drm/display/drm_hdmi_state_helper.h | 23 + + include/drm/drm_bridge.h | 84 +- + include/drm/drm_connector.h | 252 +- + include/drm/drm_drv.h | 2 +- + include/drm/drm_edid.h | 4 - + include/drm/drm_fbdev_generic.h | 15 - + include/drm/drm_fbdev_shmem.h | 15 + + include/drm/drm_fbdev_ttm.h | 15 + + include/drm/drm_mipi_dbi.h | 10 + + include/drm/drm_mipi_dsi.h | 129 +- + include/drm/drm_mm.h | 1 - + include/drm/drm_mode_config.h | 4 +- + include/drm/drm_panic.h | 9 + + include/drm/drm_print.h | 14 +- + include/drm/i915_pciids.h | 767 - + include/drm/{ => intel}/i915_component.h | 0 + include/drm/{ => intel}/i915_drm.h | 0 + .../drm/{ => intel}/i915_gsc_proxy_mei_interface.h | 0 + include/drm/{ => intel}/i915_hdcp_interface.h | 0 + include/drm/intel/i915_pciids.h | 800 + + include/drm/{ => intel}/i915_pxp_tee_interface.h | 0 + include/drm/{ => intel}/intel-gtt.h | 0 + include/drm/{ => intel}/intel_lpe_audio.h | 0 + include/drm/{ => intel}/xe_pciids.h | 7 + + include/drm/ttm/ttm_bo.h | 4 + + include/linux/devcoredump.h | 53 +- + include/linux/dma-fence-array.h | 3 + + include/linux/dma-heap.h | 4 +- + include/linux/fb.h | 1 + + include/linux/habanalabs/cpucp_if.h | 20 +- + include/linux/habanalabs/hl_boot_if.h | 29 +- + include/linux/mfd/atmel-hlcdc.h | 10 + + include/sound/hdaudio.h | 2 +- + include/uapi/drm/amdgpu_drm.h | 25 +- + include/uapi/drm/drm_fourcc.h | 19 + + include/uapi/drm/drm_mode.h | 8 - + include/uapi/drm/i915_drm.h | 27 + + include/uapi/drm/ivpu_accel.h | 69 +- + include/uapi/drm/v3d_drm.h | 48 + + include/uapi/drm/xe_drm.h | 310 + + include/uapi/linux/dma-heap.h | 2 +- + include/uapi/linux/kfd_ioctl.h | 5 +- + include/uapi/linux/kfd_sysfs.h | 19 +- + lib/fonts/Kconfig | 22 +- + sound/x86/intel_hdmi_audio.c | 2 +- + 1606 files changed, 383920 insertions(+), 29639 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/himax,hx83102.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9806e.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-edp-legacy.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,atna33xc20.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ld-d5116z01b.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/wl-355608-a8.yaml + create mode 100644 Documentation/gpu/xe/xe-drm-usage-stats.rst + create mode 100644 drivers/accel/ivpu/ivpu_hw.c + delete mode 100644 drivers/accel/ivpu/ivpu_hw_37xx.c + delete mode 100644 drivers/accel/ivpu/ivpu_hw_40xx.c + create mode 100644 drivers/accel/ivpu/ivpu_hw_btrs.c + create mode 100644 drivers/accel/ivpu/ivpu_hw_btrs.h + create mode 100644 drivers/accel/ivpu/ivpu_hw_btrs_lnl_reg.h + create mode 100644 drivers/accel/ivpu/ivpu_hw_btrs_mtl_reg.h + create mode 100644 drivers/accel/ivpu/ivpu_hw_ip.c + create mode 100644 drivers/accel/ivpu/ivpu_hw_ip.h + create mode 100644 drivers/accel/ivpu/ivpu_ms.c + create mode 100644 drivers/accel/ivpu/ivpu_ms.h + create mode 100644 drivers/accel/ivpu/ivpu_sysfs.c + create mode 100644 drivers/accel/ivpu/ivpu_sysfs.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/clearstate_gfx12.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c + rename drivers/gpu/drm/amd/amdgpu/{mes_v10_1.h => gfx_v12_0.h} (87%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v12_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v12_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v12_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v12_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v12_0.h + delete mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v10_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v12_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v12_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v7_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc24.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc24.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v12.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/smu13_driver_if.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dalsmc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_smu14_driver_if.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_spl_translate.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_spl_translate.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dccg/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn20/dcn20_dccg.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn20/dcn20_dccg.h (94%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn201/dcn201_dccg.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn201/dcn201_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn21/dcn21_dccg.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn21/dcn21_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn30/dcn30_dccg.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn30/dcn30_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn301/dcn301_dccg.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn301/dcn301_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn302/dcn302_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn303/dcn303_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn31/dcn31_dccg.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn31/dcn31_dccg.h (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn314/dcn314_dccg.c (98%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn314/dcn314_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn32/dcn32_dccg.c (97%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn32/dcn32_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn35/dcn35_dccg.c (92%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn35/dcn35_dccg.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dccg/dcn401/dcn401_dccg.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/Makefile + delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/Makefile + delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn32/dcn32_dio_link_encoder.c (98%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn32/dcn32_dio_link_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn32/dcn32_dio_stream_encoder.c (92%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn32/dcn32_dio_stream_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn321/dcn321_dio_link_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn321/dcn321_dio_link_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn35/dcn35_dio_link_encoder.c (98%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn35/dcn35_dio_link_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn35/dcn35_dio_stream_encoder.c (91%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn35/dcn35_dio_stream_encoder.h (99%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_utils.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_utils.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/bounding_boxes/dcn3_soc_bb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/bounding_boxes/dcn4_soc_bb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml2_external_lib_deps.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_dchub_registers.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_display_cfg_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_policy_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_soc_parameter_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_shared.c + create 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_shared_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_standalone_libraries/lib_float_math.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_standalone_libraries/lib_float_math.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_optimization.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_optimization.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml_top.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml_top_mcache.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml_top_mcache.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_debug.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_debug.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_internal_shared_types.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn10/CMakeLists.txt + delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn20/CMakeLists.txt + delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn201/CMakeLists.txt + delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn30/CMakeLists.txt + delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn32/CMakeLists.txt + delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn35/CMakeLists.txt + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dwb/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => dwb}/dcn35/dcn35_dwb.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dwb}/dcn35/dcn35_dwb.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_factory_dcn401.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_factory_dcn401.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_translate_dcn401.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_translate_dcn401.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hpo/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => hpo}/dcn32/dcn32_hpo_dp_link_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hpo}/dcn32/dcn32_hpo_dp_link_encoder.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/hubbub/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn10/dcn10_hubbub.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn10/dcn10_hubbub.h (89%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn20/dcn20_hubbub.c (97%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn20/dcn20_hubbub.h (99%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn201/dcn201_hubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn201/dcn201_hubbub.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn21/dcn21_hubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn21/dcn21_hubbub.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn30/dcn30_hubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn30/dcn30_hubbub.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn301/dcn301_hubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn301/dcn301_hubbub.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn31/dcn31_hubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn31/dcn31_hubbub.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn32/dcn32_hubbub.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn32/dcn32_hubbub.h (98%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn35/dcn35_hubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn35/dcn35_hubbub.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn10/dcn10_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn10/dcn10_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn20/dcn20_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn20/dcn20_hubp.h (92%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn201/dcn201_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn201/dcn201_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn21/dcn21_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn21/dcn21_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn30/dcn30_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn30/dcn30_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn31/dcn31_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn31/dcn31_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn32/dcn32_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn32/dcn32_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn35/dcn35_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn35/dcn35_hubp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn401/irq_service_dcn401.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn401/irq_service_dcn401.h + create mode 100644 drivers/gpu/drm/amd/display/dc/mmhubbub/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => mmhubbub}/dcn32/dcn32_mmhubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mmhubbub}/dcn32/dcn32_mmhubbub.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mmhubbub}/dcn35/dcn35_mmhubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mmhubbub}/dcn35/dcn35_mmhubbub.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/mpc/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn32/dcn32_mpc.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn32/dcn32_mpc.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/opp/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => opp}/dcn35/dcn35_opp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => opp}/dcn35/dcn35_opp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/optc/dcn401/dcn401_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/optc/dcn401/dcn401_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/pg/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => pg}/dcn35/dcn35_pg_cntl.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => pg}/dcn35/dcn35_pg_cntl.h (100%) + delete mode 100644 drivers/gpu/drm/amd/display/dc/resource/dce80/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn32/dcn32_resource_helpers.c (97%) + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_isharp_filters.c + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_isharp_filters.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters.c + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_4_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_4_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_4_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_4_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_14_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_14_0_2_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/mes_api_def.h + create mode 100644 drivers/gpu/drm/amd/include/mes_v12_api_def.h + create mode 100644 drivers/gpu/drm/amd/include/soc24_enum.h + create mode 100644 drivers/gpu/drm/amd/include/v12_structs.h + delete mode 100644 drivers/gpu/drm/ci/testlist.txt + create mode 100644 drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8016-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-fails.txt + create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-skips.txt + create mode 100644 drivers/gpu/drm/display/drm_hdmi_state_helper.c + create mode 100644 drivers/gpu/drm/drm_fbdev_shmem.c + rename drivers/gpu/drm/{drm_fbdev_generic.c => drm_fbdev_ttm.c} (76%) + create mode 100644 drivers/gpu/drm/i915/display/i9xx_plane_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_alpm.c + create mode 100644 drivers/gpu/drm/i915/display/intel_alpm.h + create mode 100644 drivers/gpu/drm/i915/display/intel_cursor_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_encoder.c + create mode 100644 drivers/gpu/drm/i915/display/intel_encoder.h + create mode 100644 drivers/gpu/drm/i915/display/intel_pipe_crc_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_tdf.h + create mode 100644 drivers/gpu/drm/i915/display/intel_vrr_regs.h + create mode 100644 drivers/gpu/drm/i915/display/skl_universal_plane_regs.h + create mode 100644 drivers/gpu/drm/mgag200/mgag200_ddc.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_ddc.h + delete mode 100644 drivers/gpu/drm/mgag200/mgag200_i2c.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_vga.c + create mode 100644 drivers/gpu/drm/panel/panel-himax-hx83102.c + create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili9806e.c + create mode 100644 drivers/gpu/drm/panel/panel-lincolntech-lcd197.c + create mode 100644 drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c + create mode 100644 drivers/gpu/drm/tests/drm_kunit_edid.h + create mode 100644 drivers/gpu/drm/ttm/tests/TODO + create mode 100644 drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c + create mode 100644 drivers/gpu/drm/ttm/tests/ttm_mock_manager.c + create mode 100644 drivers/gpu/drm/ttm/tests/ttm_mock_manager.h + create mode 100644 drivers/gpu/drm/udl/udl_edid.c + create mode 100644 drivers/gpu/drm/udl/udl_edid.h + create mode 100644 drivers/gpu/drm/v3d/v3d_performance_counters.h + create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object_types.h + rename drivers/gpu/drm/xe/compat-i915-headers/{ => gem}/i915_gem_stolen.h (100%) + rename drivers/gpu/drm/xe/compat-i915-headers/{ => gt}/intel_gt_types.h (100%) + delete mode 100644 drivers/gpu/drm/xe/display/intel_fbdev_fb.h + create mode 100644 drivers/gpu/drm/xe/display/xe_tdf.c + rename drivers/gpu/drm/xe/{regs => instructions}/xe_gpu_commands.h (100%) + create mode 100644 drivers/gpu/drm/xe/regs/xe_bars.h + create mode 100644 drivers/gpu/drm/xe/regs/xe_oa_regs.h + create mode 100644 drivers/gpu/drm/xe/tests/xe_args_test.c + create mode 100644 drivers/gpu/drm/xe/tests/xe_gt_sriov_pf_service_test.c + create mode 100644 drivers/gpu/drm/xe/xe_args.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor_types.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_service.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_service_types.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h + rename drivers/gpu/drm/xe/{xe_gt_throttle_sysfs.c => xe_gt_throttle.c} (83%) + create mode 100644 drivers/gpu/drm/xe/xe_gt_throttle.h + delete mode 100644 drivers/gpu/drm/xe/xe_gt_throttle_sysfs.h + create mode 100644 drivers/gpu/drm/xe/xe_guc_klv_thresholds_set.h + create mode 100644 drivers/gpu/drm/xe/xe_guc_klv_thresholds_set_types.h + create mode 100644 drivers/gpu/drm/xe/xe_oa.c + create mode 100644 drivers/gpu/drm/xe/xe_oa.h + create mode 100644 drivers/gpu/drm/xe/xe_oa_types.h + create mode 100644 drivers/gpu/drm/xe/xe_pci_sriov.c + create mode 100644 drivers/gpu/drm/xe/xe_pci_sriov.h + create mode 100644 drivers/gpu/drm/xe/xe_perf.c + create mode 100644 drivers/gpu/drm/xe/xe_perf.h + create mode 100644 drivers/gpu/drm/xe/xe_trace_bo.c + create mode 100644 drivers/gpu/drm/xe/xe_trace_bo.h + create mode 100644 drivers/gpu/drm/xe/xe_trace_guc.c + create mode 100644 drivers/gpu/drm/xe/xe_trace_guc.h + create mode 100644 drivers/gpu/drm/xe/xe_vram.c + create mode 100644 drivers/gpu/drm/xe/xe_vram.h + create mode 100644 include/drm/display/drm_hdmi_state_helper.h + delete mode 100644 include/drm/drm_fbdev_generic.h + create mode 100644 include/drm/drm_fbdev_shmem.h + create mode 100644 include/drm/drm_fbdev_ttm.h + delete mode 100644 include/drm/i915_pciids.h + rename include/drm/{ => intel}/i915_component.h (100%) + rename include/drm/{ => intel}/i915_drm.h (100%) + rename include/drm/{ => intel}/i915_gsc_proxy_mei_interface.h (100%) + rename include/drm/{ => intel}/i915_hdcp_interface.h (100%) + create mode 100644 include/drm/intel/i915_pciids.h + rename include/drm/{ => intel}/i915_pxp_tee_interface.h (100%) + rename include/drm/{ => intel}/intel-gtt.h (100%) + rename include/drm/{ => intel}/intel_lpe_audio.h (100%) + rename include/drm/{ => intel}/xe_pciids.h (96%) +$ git am -3 ../patches/0001-Revert-drm-omap-Allow-build-with-COMPILE_TEST-y.patch +Applying: Revert "drm/omap: Allow build with COMPILE_TEST=y" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/omapdrm/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 827595beb61a] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git + Date: Wed Jul 3 11:50:06 2024 +1000 +$ git reset --hard HEAD^ +HEAD is now at c292b7985713 Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git +Merging next-20240627 version of drm +$ git merge -m next-20240627/drm a78313bb206e0c456a989f380c4cbd8af8af7c76 +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/psp_v14_0.c +Auto-merging drivers/gpu/drm/amd/display/Kconfig +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h +Auto-merging drivers/gpu/drm/bridge/panel.c +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_fbdev_dma.c +Auto-merging drivers/gpu/drm/drm_panel_orientation_quirks.c +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/mediatek/mtk_drm_drv.c +Auto-merging drivers/gpu/drm/nouveau/dispnv50/disp.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_connector.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c +Auto-merging drivers/gpu/drm/xe/xe_gt_idle.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_gt_idle.c +Auto-merging drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c +Auto-merging drivers/gpu/drm/xe/xe_guc.c +Auto-merging drivers/gpu/drm/xe/xe_guc_pc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_pc.c +Auto-merging drivers/gpu/drm/xe/xe_ring_ops.c +Auto-merging drivers/video/fbdev/core/fb_defio.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_gt_idle.c' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_guc_pc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cd560aa21550] next-20240627/drm +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/panel/boe,tv101wum-nl6.yaml | 2 - + .../bindings/display/panel/himax,hx83102.yaml | 77 + + .../bindings/display/panel/panel-edp-legacy.yaml | 117 + + .../bindings/display/panel/panel-mipi-dbi-spi.yaml | 30 + + .../panel/panel-simple-lvds-dual-ports.yaml | 6 + + .../bindings/display/panel/panel-simple.yaml | 58 +- + .../bindings/display/panel/samsung,atna33xc20.yaml | 95 + + .../bindings/display/panel/sharp,ld-d5116z01b.yaml | 30 - + .../bindings/display/panel/wl-355608-a8.yaml | 60 + + .../display/rockchip/rockchip,dw-mipi-dsi.yaml | 2 + + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 5 +- + .../devicetree/bindings/vendor-prefixes.yaml | 6 + + Documentation/gpu/amdgpu/thermal.rst | 6 + + Documentation/gpu/drm-internals.rst | 10 +- + Documentation/gpu/drm-kms-helpers.rst | 12 +- + Documentation/gpu/drm-usage-stats.rst | 21 +- + Documentation/gpu/i915.rst | 5 +- + Documentation/gpu/kms-properties.csv | 2 - + Documentation/gpu/todo.rst | 72 +- + Documentation/gpu/xe/index.rst | 1 + + Documentation/gpu/xe/xe-drm-usage-stats.rst | 10 + + MAINTAINERS | 11 +- + arch/x86/kernel/early-quirks.c | 85 +- + drivers/accel/ivpu/Makefile | 11 +- + drivers/accel/ivpu/ivpu_debugfs.c | 89 +- + drivers/accel/ivpu/ivpu_drv.c | 113 +- + drivers/accel/ivpu/ivpu_drv.h | 62 +- + drivers/accel/ivpu/ivpu_fw.c | 61 +- + drivers/accel/ivpu/ivpu_fw.h | 4 + + drivers/accel/ivpu/ivpu_gem.h | 13 +- + drivers/accel/ivpu/ivpu_hw.c | 331 + + drivers/accel/ivpu/ivpu_hw.h | 245 +- + drivers/accel/ivpu/ivpu_hw_37xx.c | 1065 - + drivers/accel/ivpu/ivpu_hw_37xx_reg.h | 72 - + drivers/accel/ivpu/ivpu_hw_40xx.c | 1250 - + drivers/accel/ivpu/ivpu_hw_40xx_reg.h | 94 +- + drivers/accel/ivpu/ivpu_hw_btrs.c | 905 + + drivers/accel/ivpu/ivpu_hw_btrs.h | 50 + + drivers/accel/ivpu/ivpu_hw_btrs_lnl_reg.h | 108 + + drivers/accel/ivpu/ivpu_hw_btrs_mtl_reg.h | 83 + + drivers/accel/ivpu/ivpu_hw_ip.c | 1174 + + drivers/accel/ivpu/ivpu_hw_ip.h | 36 + + drivers/accel/ivpu/ivpu_ipc.c | 20 +- + drivers/accel/ivpu/ivpu_ipc.h | 8 +- + drivers/accel/ivpu/ivpu_job.c | 324 +- + drivers/accel/ivpu/ivpu_job.h | 6 +- + drivers/accel/ivpu/ivpu_jsm_msg.c | 311 +- + drivers/accel/ivpu/ivpu_jsm_msg.h | 22 +- + drivers/accel/ivpu/ivpu_mmu.c | 22 +- + drivers/accel/ivpu/ivpu_mmu_context.c | 86 + + drivers/accel/ivpu/ivpu_mmu_context.h | 2 + + drivers/accel/ivpu/ivpu_ms.c | 309 + + drivers/accel/ivpu/ivpu_ms.h | 36 + + drivers/accel/ivpu/ivpu_pm.c | 111 +- + drivers/accel/ivpu/ivpu_pm.h | 10 +- + drivers/accel/ivpu/ivpu_sysfs.c | 58 + + drivers/accel/ivpu/ivpu_sysfs.h | 13 + + drivers/accel/ivpu/vpu_boot_api.h | 16 +- + drivers/accel/ivpu/vpu_jsm_api.h | 14 +- + drivers/char/agp/amd64-agp.c | 1 + + drivers/char/agp/intel-agp.c | 3 +- + drivers/char/agp/intel-gtt.c | 3 +- + drivers/char/agp/sis-agp.c | 1 + + drivers/char/agp/via-agp.c | 1 + + drivers/dma-buf/dma-fence-array.c | 10 +- + drivers/dma-buf/dma-heap.c | 4 +- + drivers/dma-buf/dma-resv.c | 7 + + drivers/dma-buf/heaps/cma_heap.c | 4 +- + drivers/dma-buf/heaps/system_heap.c | 4 +- + drivers/gpu/drm/Kconfig | 16 +- + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/amd/acp/include/acp_gfx_if.h | 2 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/Makefile | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c | 377 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 269 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 16 - + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 153 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 198 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 37 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 34 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gart.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 83 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 88 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gtt_mgr.c | 2 - + drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 425 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp_ta.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 340 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 34 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 74 + + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 67 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 119 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.h | 18 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 7 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 6 + + drivers/gpu/drm/amd/amdgpu/atom.c | 8 +- + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/clearstate_gfx12.h | 121 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 561 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 386 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 5007 + + .../drm/amd/amdgpu/{mes_v10_1.h => gfx_v12_0.h} | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 67 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 69 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 293 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 37 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v12_0.c | 501 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v12_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 1026 + + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 126 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/imu_v12_0.c | 400 + + drivers/gpu/drm/amd/amdgpu/imu_v12_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/jpeg_v1_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 3 - + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 3 - + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 2 - + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 7 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 3 - + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 1189 - + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 1561 + + drivers/gpu/drm/amd/amdgpu/mes_v12_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 55 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c | 654 + + drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.h | 28 + + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 50 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 52 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 9 +- + drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c | 29 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 19 +- + drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 19 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_1.c | 22 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 15 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 18 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 23 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_7.c | 16 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 24 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 7 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 9 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0_0_pkt_open.h | 8 + + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 1651 + + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 20 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 4 +- + drivers/gpu/drm/amd/amdgpu/soc24.c | 599 + + drivers/gpu/drm/amd/amdgpu/soc24.h | 30 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 75 +- + drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 11 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 36 +- + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 9 +- + drivers/gpu/drm/amd/amdkfd/Makefile | 2 + + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 1613 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 496 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 5 - + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.h | 2 - + drivers/gpu/drm/amd/amdkfd/kfd_debug.c | 19 +- + drivers/gpu/drm/amd/amdkfd/kfd_debug.h | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 57 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 85 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 3 +- + .../drm/amd/amdkfd/kfd_device_queue_manager_v12.c | 81 + + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c | 453 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 7 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 21 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 16 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.h | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 32 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 72 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 5 +- + drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c | 6 +- + drivers/gpu/drm/amd/display/Kconfig | 2 + + drivers/gpu/drm/amd/display/Makefile | 10 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1267 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 37 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 60 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 126 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 33 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 258 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 54 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 3 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 28 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 12 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.h | 2 +- + drivers/gpu/drm/amd/display/dc/Makefile | 13 +- + drivers/gpu/drm/amd/display/dc/basics/fixpt31_32.c | 4 - + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 18 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 116 +- + .../amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 10 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 15 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 13 +- + .../dc/clk_mgr/dcn30/dcn30_smu11_driver_if.h | 2 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 10 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 4 +- + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c | 2 +- + .../dc/clk_mgr/dcn32/dcn32_smu13_driver_if.h | 2 +- + .../amd/display/dc/clk_mgr/dcn32/smu13_driver_if.h | 108 - + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 57 +- + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 21 +- + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h | 2 + + .../gpu/drm/amd/display/dc/clk_mgr/dcn401/dalsmc.h | 53 + + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 1577 + + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h | 113 + + .../dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.c | 313 + + .../dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.h | 29 + + .../dc/clk_mgr/dcn401/dcn401_smu14_driver_if.h | 66 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 246 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 45 +- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 9 +- + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 3 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 325 +- + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 116 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 386 +- + drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 1 + + drivers/gpu/drm/amd/display/dc/dc.h | 79 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 245 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 29 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 8 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 47 +- + drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 193 + + drivers/gpu/drm/amd/display/dc/dc_spl_translate.h | 22 + + drivers/gpu/drm/amd/display/dc/dc_state_priv.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 36 +- + drivers/gpu/drm/amd/display/dc/dc_stream_priv.h | 38 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 82 +- + drivers/gpu/drm/amd/display/dc/dccg/Makefile | 103 + + .../amd/display/dc/{ => dccg}/dcn20/dcn20_dccg.c | 0 + .../amd/display/dc/{ => dccg}/dcn20/dcn20_dccg.h | 27 + + .../amd/display/dc/{ => dccg}/dcn201/dcn201_dccg.c | 0 + .../amd/display/dc/{ => dccg}/dcn201/dcn201_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn21/dcn21_dccg.c | 0 + .../amd/display/dc/{ => dccg}/dcn21/dcn21_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn30/dcn30_dccg.c | 0 + .../amd/display/dc/{ => dccg}/dcn30/dcn30_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn301/dcn301_dccg.c | 0 + .../amd/display/dc/{ => dccg}/dcn301/dcn301_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn302/dcn302_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn303/dcn303_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn31/dcn31_dccg.c | 0 + .../amd/display/dc/{ => dccg}/dcn31/dcn31_dccg.h | 2 +- + .../amd/display/dc/{ => dccg}/dcn314/dcn314_dccg.c | 12 +- + .../amd/display/dc/{ => dccg}/dcn314/dcn314_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn32/dcn32_dccg.c | 13 +- + .../amd/display/dc/{ => dccg}/dcn32/dcn32_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn35/dcn35_dccg.c | 70 +- + .../amd/display/dc/{ => dccg}/dcn35/dcn35_dccg.h | 0 + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c | 999 + + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.h | 217 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 64 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 3 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 121 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 8 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 4 + + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.c | 6 +- + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 1 - + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 1 + + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 20 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.h | 2 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 5 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 146 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.h | 33 +- + .../display/dc/dce110/dce110_timing_generator.c | 18 + + .../display/dc/dce110/dce110_timing_generator.h | 2 + + .../display/dc/dce110/dce110_timing_generator_v.c | 3 +- + .../display/dc/dce120/dce120_timing_generator.c | 1 + + .../amd/display/dc/dce80/dce80_timing_generator.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 4 +- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 4 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 7 + + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 8 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_dwb_scl.c | 3 + + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 1 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 25 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h | 4 +- + drivers/gpu/drm/amd/display/dc/dcn201/Makefile | 9 +- + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.h | 3 +- + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 6 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 5 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 3 +- + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 14 + + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn314/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 20 - + drivers/gpu/drm/amd/display/dc/dcn321/Makefile | 17 - + drivers/gpu/drm/amd/display/dc/dcn35/Makefile | 20 - + drivers/gpu/drm/amd/display/dc/dcn401/Makefile | 11 + + drivers/gpu/drm/amd/display/dc/dio/Makefile | 63 + + .../dc/{ => dio}/dcn32/dcn32_dio_link_encoder.c | 3 - + .../dc/{ => dio}/dcn32/dcn32_dio_link_encoder.h | 0 + .../dc/{ => dio}/dcn32/dcn32_dio_stream_encoder.c | 40 +- + .../dc/{ => dio}/dcn32/dcn32_dio_stream_encoder.h | 0 + .../dc/{ => dio}/dcn321/dcn321_dio_link_encoder.c | 0 + .../dc/{ => dio}/dcn321/dcn321_dio_link_encoder.h | 0 + .../dc/{ => dio}/dcn35/dcn35_dio_link_encoder.c | 10 +- + .../dc/{ => dio}/dcn35/dcn35_dio_link_encoder.h | 0 + .../dc/{ => dio}/dcn35/dcn35_dio_stream_encoder.c | 43 +- + .../dc/{ => dio}/dcn35/dcn35_dio_stream_encoder.h | 6 + + .../dc/dio/dcn401/dcn401_dio_link_encoder.c | 322 + + .../dc/dio/dcn401/dcn401_dio_link_encoder.h | 134 + + .../dc/dio/dcn401/dcn401_dio_stream_encoder.c | 857 + + .../dc/dio/dcn401/dcn401_dio_stream_encoder.h | 217 + + drivers/gpu/drm/amd/display/dc/dm_pp_smu.h | 3 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 4 + + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 9 +- + .../gpu/drm/amd/display/dc/dml/dcn10/dcn10_fpu.h | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 20 +- + .../amd/display/dc/dml/dcn20/display_mode_vba_20.c | 16 +- + .../display/dc/dml/dcn20/display_mode_vba_20v2.c | 4 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 5 - + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 5 - + .../amd/display/dc/dml/dcn21/display_mode_vba_21.c | 2 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 8 - + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 8 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 5 - + .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dcn301/dcn301_fpu.h | 7 +- + .../gpu/drm/amd/display/dc/dml/dcn302/dcn302_fpu.c | 10 + + .../gpu/drm/amd/display/dc/dml/dcn303/dcn303_fpu.c | 10 + + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 20 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 4 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 5 - + .../display/dc/dml/dcn314/display_mode_vba_314.c | 14 +- + .../dc/dml/dcn314/display_rq_dlg_calc_314.c | 5 - + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 58 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 2 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 8 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 10 + + .../gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.c | 239 + + .../gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.h | 14 + + .../drm/amd/display/dc/dml/display_mode_structs.h | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 7 +- + .../amd/display/dc/dml/dml1_display_rq_dlg_calc.c | 5 - + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 80 + + .../drm/amd/display/dc/dml2/display_mode_core.c | 61 +- + .../drm/amd/display/dc/dml2/display_mode_core.h | 2 + + .../display/dc/dml2/display_mode_core_structs.h | 2 + + .../dc/dml2/dml21/dml21_translation_helper.c | 1166 + + .../dc/dml2/dml21/dml21_translation_helper.h | 29 + + .../drm/amd/display/dc/dml2/dml21/dml21_utils.c | 555 + + .../drm/amd/display/dc/dml2/dml21/dml21_utils.h | 50 + + .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 437 + + .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.h | 68 + + .../dc/dml2/dml21/inc/bounding_boxes/dcn3_soc_bb.h | 401 + + .../dc/dml2/dml21/inc/bounding_boxes/dcn4_soc_bb.h | 365 + + .../dc/dml2/dml21/inc/dml2_external_lib_deps.h | 10 + + .../drm/amd/display/dc/dml2/dml21/inc/dml_top.h | 47 + + .../dc/dml2/dml21/inc/dml_top_dchub_registers.h | 185 + + .../dc/dml2/dml21/inc/dml_top_display_cfg_types.h | 507 + + .../dc/dml2/dml21/inc/dml_top_policy_types.h | 14 + + .../dml2/dml21/inc/dml_top_soc_parameter_types.h | 196 + + .../amd/display/dc/dml2/dml21/inc/dml_top_types.h | 720 + + .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c | 719 + + .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.h | 16 + + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 12743 ++ + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.h | 39 + + .../dml2/dml21/src/dml2_core/dml2_core_factory.c | 38 + + .../dml2/dml21/src/dml2_core/dml2_core_factory.h | 14 + + .../dc/dml2/dml21/src/dml2_core/dml2_core_shared.c | 12387 ++ + .../dc/dml2/dml21/src/dml2_core/dml2_core_shared.h | 38 + + .../dml21/src/dml2_core/dml2_core_shared_types.h | 2049 + + .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 714 + + .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h | 17 + + .../dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 51 + + .../dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.h | 14 + + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.c | 195 + + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.h | 14 + + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.c | 40 + + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.h | 14 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.c | 707 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.h | 23 + + .../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 | 2101 + + .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.h | 27 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.c | 86 + + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.h | 14 + + .../src/dml2_standalone_libraries/lib_float_math.c | 150 + + .../src/dml2_standalone_libraries/lib_float_math.h | 26 + + .../dml21/src/dml2_top/dml2_top_optimization.c | 309 + + .../dml21/src/dml2_top/dml2_top_optimization.h | 34 + + .../display/dc/dml2/dml21/src/dml2_top/dml_top.c | 330 + + .../dc/dml2/dml21/src/dml2_top/dml_top_mcache.c | 550 + + .../dc/dml2/dml21/src/dml2_top/dml_top_mcache.h | 24 + + .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.c | 32 + + .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.h | 18 + + .../dml21/src/inc/dml2_internal_shared_types.h | 986 + + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 101 +- + .../drm/amd/display/dc/dml2/dml2_internal_types.h | 20 + + .../amd/display/dc/dml2/dml2_translation_helper.c | 187 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 47 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 19 + + drivers/gpu/drm/amd/display/dc/dpp/Makefile | 8 +- + .../drm/amd/display/dc/dpp/dcn10/CMakeLists.txt | 6 - + .../drm/amd/display/dc/dpp/dcn10/dcn10_dpp_cm.c | 3 +- + .../drm/amd/display/dc/dpp/dcn20/CMakeLists.txt | 5 - + .../gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.c | 56 + + .../gpu/drm/amd/display/dc/dpp/dcn20/dcn20_dpp.h | 9 +- + .../drm/amd/display/dc/dpp/dcn201/CMakeLists.txt | 4 - + .../gpu/drm/amd/display/dc/dpp/dcn201/dcn201_dpp.c | 13 +- + .../drm/amd/display/dc/dpp/dcn30/CMakeLists.txt | 5 - + .../gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.c | 34 +- + .../gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.h | 4 +- + .../drm/amd/display/dc/dpp/dcn32/CMakeLists.txt | 4 - + .../gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.c | 73 + + .../gpu/drm/amd/display/dc/dpp/dcn32/dcn32_dpp.h | 8 + + .../drm/amd/display/dc/dpp/dcn35/CMakeLists.txt | 4 - + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.c | 427 + + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h | 729 + + .../drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 311 + + .../amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 1219 + + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 9 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 31 +- + .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 18 +- + .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.h | 14 +- + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c | 418 + + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.h | 337 + + drivers/gpu/drm/amd/display/dc/dsc/dsc.h | 1 + + drivers/gpu/drm/amd/display/dc/dwb/Makefile | 37 + + .../drm/amd/display/dc/{ => dwb}/dcn35/dcn35_dwb.c | 0 + .../drm/amd/display/dc/{ => dwb}/dcn35/dcn35_dwb.h | 0 + drivers/gpu/drm/amd/display/dc/gpio/Makefile | 10 + + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 2 +- + .../amd/display/dc/gpio/dcn401/hw_factory_dcn401.c | 252 + + .../amd/display/dc/gpio/dcn401/hw_factory_dcn401.h | 11 + + .../display/dc/gpio/dcn401/hw_translate_dcn401.c | 335 + + .../display/dc/gpio/dcn401/hw_translate_dcn401.h | 13 + + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 17 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 11 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 4 + + drivers/gpu/drm/amd/display/dc/gpio/hw_generic.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_hpd.c | 2 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 4 + + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 19 +- + drivers/gpu/drm/amd/display/dc/hpo/Makefile | 35 + + .../dc/{ => hpo}/dcn32/dcn32_hpo_dp_link_encoder.c | 0 + .../dc/{ => hpo}/dcn32/dcn32_hpo_dp_link_encoder.h | 0 + drivers/gpu/drm/amd/display/dc/hubbub/Makefile | 104 + + .../display/dc/{ => hubbub}/dcn10/dcn10_hubbub.c | 2 +- + .../display/dc/{ => hubbub}/dcn10/dcn10_hubbub.h | 47 +- + .../display/dc/{ => hubbub}/dcn20/dcn20_hubbub.c | 27 +- + .../display/dc/{ => hubbub}/dcn20/dcn20_hubbub.h | 2 +- + .../display/dc/{ => hubbub}/dcn201/dcn201_hubbub.c | 0 + .../display/dc/{ => hubbub}/dcn201/dcn201_hubbub.h | 0 + .../display/dc/{ => hubbub}/dcn21/dcn21_hubbub.c | 0 + .../display/dc/{ => hubbub}/dcn21/dcn21_hubbub.h | 0 + .../display/dc/{ => hubbub}/dcn30/dcn30_hubbub.c | 0 + .../display/dc/{ => hubbub}/dcn30/dcn30_hubbub.h | 0 + .../display/dc/{ => hubbub}/dcn301/dcn301_hubbub.c | 0 + .../display/dc/{ => hubbub}/dcn301/dcn301_hubbub.h | 0 + .../display/dc/{ => hubbub}/dcn31/dcn31_hubbub.c | 0 + .../display/dc/{ => hubbub}/dcn31/dcn31_hubbub.h | 0 + .../display/dc/{ => hubbub}/dcn32/dcn32_hubbub.c | 2 +- + .../display/dc/{ => hubbub}/dcn32/dcn32_hubbub.h | 2 + + .../display/dc/{ => hubbub}/dcn35/dcn35_hubbub.c | 0 + .../display/dc/{ => hubbub}/dcn35/dcn35_hubbub.h | 0 + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 929 + + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.h | 192 + + drivers/gpu/drm/amd/display/dc/hubp/Makefile | 97 + + .../amd/display/dc/{ => hubp}/dcn10/dcn10_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn10/dcn10_hubp.h | 0 + .../amd/display/dc/{ => hubp}/dcn20/dcn20_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn20/dcn20_hubp.h | 35 +- + .../amd/display/dc/{ => hubp}/dcn201/dcn201_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn201/dcn201_hubp.h | 0 + .../amd/display/dc/{ => hubp}/dcn21/dcn21_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn21/dcn21_hubp.h | 0 + .../amd/display/dc/{ => hubp}/dcn30/dcn30_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn30/dcn30_hubp.h | 0 + .../amd/display/dc/{ => hubp}/dcn31/dcn31_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn31/dcn31_hubp.h | 0 + .../amd/display/dc/{ => hubp}/dcn32/dcn32_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn32/dcn32_hubp.h | 0 + .../amd/display/dc/{ => hubp}/dcn35/dcn35_hubp.c | 0 + .../amd/display/dc/{ => hubp}/dcn35/dcn35_hubp.h | 0 + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 1027 + + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h | 331 + + drivers/gpu/drm/amd/display/dc/hwss/Makefile | 9 +- + .../gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.h | 24 + + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 35 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 64 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 181 +- + .../drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.c | 10 +- + .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 2 +- + .../gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 7 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h | 2 +- + .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn301/dcn301_init.c | 4 +- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 2 +- + .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 51 +- + .../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 | 228 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.h | 6 +- + .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 4 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 128 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 2 + + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 5 +- + .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 12 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 1689 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 81 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 151 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.h | 12 + + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 26 + + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 9 +- + drivers/gpu/drm/amd/display/dc/inc/clock_source.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 27 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 6 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 55 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 8 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 24 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 56 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 9 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 726 +- + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/hw/optc.h | 4 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 3 +- + .../drm/amd/display/dc/inc/hw/timing_generator.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/transform.h | 28 +- + drivers/gpu/drm/amd/display/dc/inc/link.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 18 +- + drivers/gpu/drm/amd/display/dc/irq/Makefile | 9 + + .../amd/display/dc/irq/dcn401/irq_service_dcn401.c | 409 + + .../amd/display/dc/irq/dcn401/irq_service_dcn401.h | 13 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 2 +- + drivers/gpu/drm/amd/display/dc/irq_types.h | 8 + + .../drm/amd/display/dc/link/hwss/link_hwss_dio.c | 12 +- + .../hwss/link_hwss_hpo_fixed_vs_pe_retimer_dp.c | 5 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 2 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 68 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 67 +- + .../drm/amd/display/dc/link/protocols/link_ddc.c | 4 - + .../display/dc/link/protocols/link_dp_capability.c | 74 +- + .../dc/link/protocols/link_dp_irq_handler.c | 29 +- + .../amd/display/dc/link/protocols/link_dp_phy.c | 53 +- + .../display/dc/link/protocols/link_dp_training.c | 17 +- + .../dc/link/protocols/link_dp_training_dpia.c | 16 - + .../drm/amd/display/dc/link/protocols/link_dpcd.c | 1 + + .../dc/link/protocols/link_edp_panel_control.c | 4 +- + .../dc/link/protocols/link_edp_panel_control.h | 2 +- + drivers/gpu/drm/amd/display/dc/mmhubbub/Makefile | 45 + + .../dc/{ => mmhubbub}/dcn32/dcn32_mmhubbub.c | 0 + .../dc/{ => mmhubbub}/dcn32/dcn32_mmhubbub.h | 0 + .../dc/{ => mmhubbub}/dcn35/dcn35_mmhubbub.c | 0 + .../dc/{ => mmhubbub}/dcn35/dcn35_mmhubbub.h | 0 + drivers/gpu/drm/amd/display/dc/mpc/Makefile | 45 + + .../drm/amd/display/dc/{ => mpc}/dcn32/dcn32_mpc.c | 3 + + .../drm/amd/display/dc/{ => mpc}/dcn32/dcn32_mpc.h | 0 + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c | 653 + + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h | 239 + + drivers/gpu/drm/amd/display/dc/opp/Makefile | 35 + + .../drm/amd/display/dc/{ => opp}/dcn35/dcn35_opp.c | 0 + .../drm/amd/display/dc/{ => opp}/dcn35/dcn35_opp.h | 0 + drivers/gpu/drm/amd/display/dc/optc/Makefile | 6 + + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c | 50 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 10 +- + .../gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.c | 16 +- + .../gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.h | 3 +- + .../drm/amd/display/dc/optc/dcn201/dcn201_optc.c | 7 +- + .../drm/amd/display/dc/optc/dcn201/dcn201_optc.h | 3 - + .../gpu/drm/amd/display/dc/optc/dcn30/dcn30_optc.c | 9 +- + .../gpu/drm/amd/display/dc/optc/dcn30/dcn30_optc.h | 2 +- + .../drm/amd/display/dc/optc/dcn301/dcn301_optc.c | 1 + + .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c | 20 +- + .../drm/amd/display/dc/optc/dcn314/dcn314_optc.c | 10 +- + .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 10 +- + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 11 +- + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.c | 477 + + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.h | 167 + + drivers/gpu/drm/amd/display/dc/os_types.h | 2 - + drivers/gpu/drm/amd/display/dc/pg/Makefile | 35 + + .../amd/display/dc/{ => pg}/dcn35/dcn35_pg_cntl.c | 6 +- + .../amd/display/dc/{ => pg}/dcn35/dcn35_pg_cntl.h | 0 + drivers/gpu/drm/amd/display/dc/resource/Makefile | 10 +- + .../amd/display/dc/resource/dce80/CMakeLists.txt | 4 - + .../amd/display/dc/resource/dce80/dce80_resource.c | 1 + + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 18 +- + .../display/dc/resource/dcn201/dcn201_resource.c | 4 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 15 +- + .../display/dc/resource/dcn301/dcn301_resource.c | 20 +- + .../display/dc/resource/dcn303/dcn303_resource.c | 11 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 1 + + .../display/dc/resource/dcn314/dcn314_resource.c | 4 +- + .../display/dc/resource/dcn315/dcn315_resource.c | 12 + + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 19 +- + .../{ => resource}/dcn32/dcn32_resource_helpers.c | 15 +- + .../display/dc/resource/dcn321/dcn321_resource.c | 12 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 8 +- + .../display/dc/resource/dcn351/dcn351_resource.c | 8 +- + .../display/dc/resource/dcn401/dcn401_resource.c | 2139 + + .../display/dc/resource/dcn401/dcn401_resource.h | 644 + + drivers/gpu/drm/amd/display/dc/spl/Makefile | 33 + + drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 1470 + + drivers/gpu/drm/amd/display/dc/spl/dc_spl.h | 24 + + .../drm/amd/display/dc/spl/dc_spl_isharp_filters.c | 350 + + .../drm/amd/display/dc/spl/dc_spl_isharp_filters.h | 17 + + .../drm/amd/display/dc/spl/dc_spl_scl_filters.c | 1425 + + .../drm/amd/display/dc/spl/dc_spl_scl_filters.h | 59 + + drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h | 491 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 47 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 663 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 10 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c | 603 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.h | 287 + + drivers/gpu/drm/amd/display/dmub/src/dmub_reg.h | 1 - + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 89 + + .../gpu/drm/amd/display/dmub/src/dmub_srv_stat.c | 6 + + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 14 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 + + .../gpu/drm/amd/display/include/grph_object_id.h | 4 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 28 +- + .../drm/amd/display/modules/power/power_helpers.c | 22 +- + .../drm/amd/display/modules/power/power_helpers.h | 5 + + drivers/gpu/drm/amd/include/amd_shared.h | 2 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 108 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 56 + + .../amd/include/asic_reg/dcn/dcn_3_0_2_offset.h | 90 + + .../amd/include/asic_reg/dcn/dcn_3_0_2_sh_mask.h | 44 + + .../amd/include/asic_reg/dcn/dcn_3_0_3_offset.h | 16 + + .../amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h | 16 + + .../amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h | 28 + + .../amd/include/asic_reg/dcn/dcn_4_1_0_offset.h | 16618 ++ + .../amd/include/asic_reg/dcn/dcn_4_1_0_sh_mask.h | 145742 ++++++++++++++++++ + .../drm/amd/include/asic_reg/gc/gc_11_0_0_offset.h | 10 + + .../drm/amd/include/asic_reg/gc/gc_12_0_0_offset.h | 11061 ++ + .../amd/include/asic_reg/gc/gc_12_0_0_sh_mask.h | 40550 +++++ + .../include/asic_reg/mmhub/mmhub_4_1_0_offset.h | 1341 + + .../include/asic_reg/mmhub/mmhub_4_1_0_sh_mask.h | 6943 + + .../amd/include/asic_reg/thm/thm_14_0_2_offset.h | 228 + + .../amd/include/asic_reg/thm/thm_14_0_2_sh_mask.h | 940 + + drivers/gpu/drm/amd/include/discovery.h | 28 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 17 + + drivers/gpu/drm/amd/include/mes_api_def.h | 570 - + drivers/gpu/drm/amd/include/mes_v12_api_def.h | 798 + + drivers/gpu/drm/amd/include/soc21_enum.h | 2 +- + drivers/gpu/drm/amd/include/soc24_enum.h | 21073 +++ + drivers/gpu/drm/amd/include/v12_structs.h | 1189 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 49 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 211 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 10 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 1 - + drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 9 - + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 20 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 10 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/pp_psm.c | 21 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 5 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h | 36 +- + .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 2 - + .../drm/amd/pm/powerplay/hwmgr/processpptables.c | 2 - + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 37 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 78 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 29 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 115 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 20 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 31 +- + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 38 +- + .../gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c | 5 +- + .../drm/amd/pm/powerplay/smumgr/vega10_smumgr.c | 6 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 137 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 41 +- + .../pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0.h | 21 +- + .../pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0_0.h | 1 - + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 3 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 1 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 4 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 18 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 69 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 39 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 6 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 14 + + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 61 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 68 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 70 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 12 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 28 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 30 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 235 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 8 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 30 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 77 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 197 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 61 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 2 + + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 49 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 8 +- + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 1 + + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 4 +- + drivers/gpu/drm/ast/ast_drv.c | 4 +- + drivers/gpu/drm/atmel-hlcdc/Kconfig | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 172 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 105 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.h | 132 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 391 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 - + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 20 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 28 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 168 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 22 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 119 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 36 +- + drivers/gpu/drm/bridge/analogix/anx7625.h | 10 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 5 - + drivers/gpu/drm/bridge/imx/imx-ldb-helper.c | 5 - + .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 5 - + drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 5 - + drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 5 - + drivers/gpu/drm/bridge/ite-it6505.c | 88 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 1 + + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 6 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 5 - + drivers/gpu/drm/bridge/nxp-ptn3460.c | 5 - + drivers/gpu/drm/bridge/panel.c | 5 - + drivers/gpu/drm/bridge/samsung-dsim.c | 25 +- + drivers/gpu/drm/bridge/sii902x.c | 46 +- + drivers/gpu/drm/bridge/sii9234.c | 1 + + drivers/gpu/drm/bridge/sil-sii8620.c | 1 + + drivers/gpu/drm/bridge/simple-bridge.c | 18 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 5 - + drivers/gpu/drm/bridge/tc358767.c | 27 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 5 - + drivers/gpu/drm/ci/build-igt.sh | 41 +- + drivers/gpu/drm/ci/build.sh | 10 +- + drivers/gpu/drm/ci/build.yml | 1 + + drivers/gpu/drm/ci/container.yml | 12 +- + drivers/gpu/drm/ci/gitlab-ci.yml | 47 +- + drivers/gpu/drm/ci/igt_runner.sh | 15 +- + drivers/gpu/drm/ci/image-tags.yml | 4 +- + drivers/gpu/drm/ci/lava-submit.sh | 4 +- + drivers/gpu/drm/ci/test.yml | 41 +- + drivers/gpu/drm/ci/testlist.txt | 2761 - + drivers/gpu/drm/ci/x86_64.config | 1 + + drivers/gpu/drm/ci/xfails/amdgpu-stoney-fails.txt | 41 +- + drivers/gpu/drm/ci/xfails/amdgpu-stoney-flakes.txt | 7 + + drivers/gpu/drm/ci/xfails/amdgpu-stoney-skips.txt | 33 +- + drivers/gpu/drm/ci/xfails/i915-amly-fails.txt | 31 + + drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt | 9 + + drivers/gpu/drm/ci/xfails/i915-amly-skips.txt | 22 +- + drivers/gpu/drm/ci/xfails/i915-apl-fails.txt | 46 +- + drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt | 6 + + drivers/gpu/drm/ci/xfails/i915-apl-skips.txt | 26 +- + drivers/gpu/drm/ci/xfails/i915-cml-fails.txt | 38 + + drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt | 6 + + drivers/gpu/drm/ci/xfails/i915-cml-skips.txt | 23 + + drivers/gpu/drm/ci/xfails/i915-glk-fails.txt | 41 +- + drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt | 7 + + drivers/gpu/drm/ci/xfails/i915-glk-skips.txt | 26 +- + drivers/gpu/drm/ci/xfails/i915-kbl-fails.txt | 42 +- + drivers/gpu/drm/ci/xfails/i915-kbl-flakes.txt | 7 +- + drivers/gpu/drm/ci/xfails/i915-kbl-skips.txt | 36 +- + drivers/gpu/drm/ci/xfails/i915-tgl-fails.txt | 77 +- + drivers/gpu/drm/ci/xfails/i915-tgl-skips.txt | 28 +- + drivers/gpu/drm/ci/xfails/i915-whl-fails.txt | 63 +- + drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt | 6 + + drivers/gpu/drm/ci/xfails/i915-whl-skips.txt | 22 +- + .../gpu/drm/ci/xfails/mediatek-mt8173-fails.txt | 30 +- + .../gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt | 11 + + .../gpu/drm/ci/xfails/mediatek-mt8173-skips.txt | 16 + + .../gpu/drm/ci/xfails/mediatek-mt8183-fails.txt | 21 +- + .../gpu/drm/ci/xfails/mediatek-mt8183-skips.txt | 18 + + drivers/gpu/drm/ci/xfails/meson-g12b-fails.txt | 24 +- + drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt | 18 + + drivers/gpu/drm/ci/xfails/msm-apq8016-fails.txt | 26 +- + drivers/gpu/drm/ci/xfails/msm-apq8016-skips.txt | 15 + + drivers/gpu/drm/ci/xfails/msm-apq8096-fails.txt | 8 +- + drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt | 6 + + drivers/gpu/drm/ci/xfails/msm-apq8096-skips.txt | 26 +- + .../xfails/msm-sc7180-trogdor-kingoftown-fails.txt | 175 +- + .../msm-sc7180-trogdor-kingoftown-flakes.txt | 8 + + .../xfails/msm-sc7180-trogdor-kingoftown-skips.txt | 19 + + .../msm-sc7180-trogdor-lazor-limozeen-fails.txt | 175 +- + .../msm-sc7180-trogdor-lazor-limozeen-flakes.txt | 6 + + .../msm-sc7180-trogdor-lazor-limozeen-skips.txt | 16 + + drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt | 38 +- + drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt | 25 +- + drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt | 19 + + .../gpu/drm/ci/xfails/rockchip-rk3288-fails.txt | 62 +- + .../gpu/drm/ci/xfails/rockchip-rk3288-skips.txt | 21 +- + .../gpu/drm/ci/xfails/rockchip-rk3399-fails.txt | 83 +- + .../gpu/drm/ci/xfails/rockchip-rk3399-flakes.txt | 13 +- + .../gpu/drm/ci/xfails/rockchip-rk3399-skips.txt | 19 + + drivers/gpu/drm/ci/xfails/update-xfails.py | 4 +- + .../gpu/drm/ci/xfails/virtio_gpu-none-fails.txt | 94 +- + .../gpu/drm/ci/xfails/virtio_gpu-none-skips.txt | 20 +- + drivers/gpu/drm/ci/xfails/vkms-none-fails.txt | 57 + + drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt | 69 + + drivers/gpu/drm/ci/xfails/vkms-none-skips.txt | 119 + + drivers/gpu/drm/display/Kconfig | 7 + + drivers/gpu/drm/display/Makefile | 2 + + drivers/gpu/drm/display/drm_hdmi_helper.c | 61 + + drivers/gpu/drm/display/drm_hdmi_state_helper.c | 752 + + drivers/gpu/drm/drm_atomic.c | 11 + + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_bridge.c | 42 - + drivers/gpu/drm/drm_bridge_connector.c | 107 +- + drivers/gpu/drm/drm_connector.c | 201 + + drivers/gpu/drm/drm_crtc_internal.h | 2 + + drivers/gpu/drm/drm_debugfs.c | 158 +- + drivers/gpu/drm/drm_drv.c | 6 +- + drivers/gpu/drm/drm_edid.c | 61 +- + drivers/gpu/drm/drm_fb_helper.c | 11 +- + drivers/gpu/drm/drm_fbdev_dma.c | 66 +- + drivers/gpu/drm/drm_fbdev_shmem.c | 317 + + .../drm/{drm_fbdev_generic.c => drm_fbdev_ttm.c} | 80 +- + drivers/gpu/drm/drm_ioctl.c | 5 +- + drivers/gpu/drm/drm_mipi_dbi.c | 77 +- + drivers/gpu/drm/drm_mipi_dsi.c | 322 + + drivers/gpu/drm/drm_mm.c | 35 - + drivers/gpu/drm/drm_mode_object.c | 1 + + drivers/gpu/drm/drm_modes.c | 5 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 1 + + drivers/gpu/drm/drm_panic.c | 286 +- + drivers/gpu/drm/drm_print.c | 72 +- + drivers/gpu/drm/drm_probe_helper.c | 13 +- + drivers/gpu/drm/drm_simple_kms_helper.c | 1 + + drivers/gpu/drm/drm_sysfs.c | 24 +- + drivers/gpu/drm/gma500/cdv_intel_dp.c | 2 +- + drivers/gpu/drm/gud/gud_drv.c | 5 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 4 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_vdac.c | 17 +- + drivers/gpu/drm/hisilicon/kirin/Kconfig | 2 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 11 +- + drivers/gpu/drm/hisilicon/kirin/dw_dsi_reg.h | 2 + + drivers/gpu/drm/hisilicon/kirin/kirin_ade_reg.h | 2 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 4 +- + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 19 +- + drivers/gpu/drm/i915/Kconfig | 1 - + drivers/gpu/drm/i915/Kconfig.debug | 17 + + drivers/gpu/drm/i915/Makefile | 27 +- + drivers/gpu/drm/i915/display/dvo_ns2501.c | 1 - + drivers/gpu/drm/i915/display/g4x_dp.c | 37 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 104 +- + drivers/gpu/drm/i915/display/i9xx_plane_regs.h | 112 + + drivers/gpu/drm/i915/display/i9xx_wm.c | 114 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 46 +- + drivers/gpu/drm/i915/display/intel_alpm.c | 414 + + drivers/gpu/drm/i915/display/intel_alpm.h | 27 + + drivers/gpu/drm/i915/display/intel_atomic.c | 1 - + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 62 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 1 + + drivers/gpu/drm/i915/display/intel_audio.c | 17 +- + drivers/gpu/drm/i915/display/intel_audio_regs.h | 3 + + drivers/gpu/drm/i915/display/intel_bios.c | 243 +- + drivers/gpu/drm/i915/display/intel_bw.c | 65 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 130 +- + drivers/gpu/drm/i915/display/intel_color.c | 143 +- + drivers/gpu/drm/i915/display/intel_color.h | 4 +- + drivers/gpu/drm/i915/display/intel_color_regs.h | 5 + + drivers/gpu/drm/i915/display/intel_crt.c | 50 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 15 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 15 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 102 +- + drivers/gpu/drm/i915/display/intel_cursor_regs.h | 112 + + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 368 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 8 +- + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 48 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 129 +- + drivers/gpu/drm/i915/display/intel_display.c | 811 +- + drivers/gpu/drm/i915/display/intel_display.h | 13 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 12 +- + .../gpu/drm/i915/display/intel_display_device.c | 925 +- + .../gpu/drm/i915/display/intel_display_device.h | 89 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 46 +- + .../gpu/drm/i915/display/intel_display_limits.h | 21 +- + .../gpu/drm/i915/display/intel_display_params.c | 2 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 20 +- + .../drm/i915/display/intel_display_power_well.c | 14 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 87 +- + drivers/gpu/drm/i915/display/intel_dkl_phy.c | 1 - + drivers/gpu/drm/i915/display/intel_dmc.c | 21 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 6 +- + drivers/gpu/drm/i915/display/intel_dp.c | 410 +- + drivers/gpu/drm/i915/display/intel_dp.h | 24 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 149 +- + drivers/gpu/drm/i915/display/intel_dp_aux_regs.h | 18 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 5 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 538 +- + .../gpu/drm/i915/display/intel_dp_link_training.h | 8 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 84 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 63 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 1 + + drivers/gpu/drm/i915/display/intel_dpt.c | 9 +- + drivers/gpu/drm/i915/display/intel_dpt.h | 5 +- + drivers/gpu/drm/i915/display/intel_dpt_common.c | 1 + + drivers/gpu/drm/i915/display/intel_drrs.c | 8 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 31 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 9 + + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 6 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 5 +- + drivers/gpu/drm/i915/display/intel_encoder.c | 39 + + drivers/gpu/drm/i915/display/intel_encoder.h | 16 + + drivers/gpu/drm/i915/display/intel_fb.c | 45 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 73 +- + drivers/gpu/drm/i915/display/intel_fb_pin.h | 12 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 38 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 40 +- + drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 6 +- + drivers/gpu/drm/i915/display/intel_fbdev_fb.h | 4 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 15 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 13 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 2 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 27 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 2 +- + .../gpu/drm/i915/display/intel_hdcp_gsc_message.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 41 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 12 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- + drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 31 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 60 +- + .../gpu/drm/i915/display/intel_modeset_verify.c | 8 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 21 +- + drivers/gpu/drm/i915/display/intel_overlay.h | 6 +- + drivers/gpu/drm/i915/display/intel_panel.c | 2 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 21 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 21 +- + drivers/gpu/drm/i915/display/intel_pipe_crc_regs.h | 152 + + drivers/gpu/drm/i915/display/intel_pps.c | 32 +- + drivers/gpu/drm/i915/display/intel_pps_regs.h | 16 +- + drivers/gpu/drm/i915/display/intel_psr.c | 981 +- + drivers/gpu/drm/i915/display/intel_psr_regs.h | 93 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 1 - + drivers/gpu/drm/i915/display/intel_sprite_regs.h | 242 +- + drivers/gpu/drm/i915/display/intel_sprite_uapi.c | 2 +- + drivers/gpu/drm/i915/display/intel_tdf.h | 25 + + drivers/gpu/drm/i915/display/intel_vblank.c | 169 +- + drivers/gpu/drm/i915/display/intel_vblank.h | 5 + + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 729 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 19 +- + drivers/gpu/drm/i915/display/intel_vdsc_regs.h | 6 +- + drivers/gpu/drm/i915/display/intel_vga.c | 1 + + drivers/gpu/drm/i915/display/intel_vrr.c | 182 +- + drivers/gpu/drm/i915/display/intel_vrr_regs.h | 127 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 210 +- + drivers/gpu/drm/i915/display/skl_universal_plane.h | 2 + + .../drm/i915/display/skl_universal_plane_regs.h | 442 + + drivers/gpu/drm/i915/display/skl_watermark.c | 134 +- + drivers/gpu/drm/i915/display/skl_watermark.h | 13 +- + drivers/gpu/drm/i915/display/skl_watermark_regs.h | 83 - + drivers/gpu/drm/i915/display/vlv_dsi.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 113 + + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 2 +- + drivers/gpu/drm/i915/gt/intel_context.c | 2 + + drivers/gpu/drm/i915/gt/intel_context.h | 22 + + drivers/gpu/drm/i915/gt/intel_context_types.h | 3 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 4 +- + drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 3 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 1 - + drivers/gpu/drm/i915/gt/intel_lrc.c | 8 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 2 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 8 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 13 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 8 + + drivers/gpu/drm/i915/gt/selftest_context.c | 2 +- + .../gpu/drm/i915/gt/selftest_engine_heartbeat.c | 110 - + drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 32 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 15 +- + drivers/gpu/drm/i915/gvt/display.c | 73 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 3 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 23 +- + drivers/gpu/drm/i915/gvt/handlers.c | 153 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 1 + + drivers/gpu/drm/i915/gvt/reg.h | 3 - + drivers/gpu/drm/i915/i915_drv.h | 15 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 5 +- + drivers/gpu/drm/i915/i915_irq.c | 5 +- + drivers/gpu/drm/i915/i915_params.c | 5 + + drivers/gpu/drm/i915/i915_params.h | 3 +- + drivers/gpu/drm/i915/i915_pci.c | 157 +- + drivers/gpu/drm/i915/i915_reg.h | 923 +- + drivers/gpu/drm/i915/i915_suspend.c | 48 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 14 +- + drivers/gpu/drm/i915/intel_device_info.c | 92 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 353 +- + drivers/gpu/drm/i915/intel_memory_region.c | 2 +- + drivers/gpu/drm/i915/intel_memory_region.h | 5 - + drivers/gpu/drm/i915/intel_pci_config.h | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 9 +- + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 4 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 +- + drivers/gpu/drm/i915/soc/intel_dram.c | 216 +- + drivers/gpu/drm/i915/soc/intel_dram.h | 1 + + drivers/gpu/drm/i915/soc/intel_gmch.c | 2 +- + drivers/gpu/drm/i915/soc/intel_pch.c | 4 +- + drivers/gpu/drm/imx/ipuv3/imx-ldb.c | 24 +- + drivers/gpu/drm/imx/ipuv3/imx-tve.c | 14 +- + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 4 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 4 +- + drivers/gpu/drm/loongson/Kconfig | 1 + + drivers/gpu/drm/loongson/lsdc_drv.c | 4 +- + drivers/gpu/drm/loongson/lsdc_output_7a1000.c | 15 +- + drivers/gpu/drm/loongson/lsdc_output_7a2000.c | 15 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 4 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 11 - + drivers/gpu/drm/meson/meson_plane.c | 17 +- + drivers/gpu/drm/mgag200/Kconfig | 18 +- + drivers/gpu/drm/mgag200/Makefile | 5 +- + drivers/gpu/drm/mgag200/mgag200_bmc.c | 107 + + drivers/gpu/drm/mgag200/mgag200_ddc.c | 179 + + drivers/gpu/drm/mgag200/mgag200_ddc.h | 11 + + drivers/gpu/drm/mgag200/mgag200_drv.c | 27 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200eh.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200eh3.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200er.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200ew3.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200se.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_g200wb.c | 46 +- + drivers/gpu/drm/mgag200/mgag200_i2c.c | 129 - + drivers/gpu/drm/mgag200/mgag200_mode.c | 35 +- + drivers/gpu/drm/mgag200/mgag200_vga.c | 72 + + drivers/gpu/drm/nouveau/dispnv50/disp.c | 8 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 8 +- + drivers/gpu/drm/nouveau/include/nvkm/subdev/gsp.h | 6 + + drivers/gpu/drm/nouveau/nouveau_bo.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_chan.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_dmem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_exec.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 30 +- + drivers/gpu/drm/nouveau/nouveau_fence.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_sched.h | 4 +- + drivers/gpu/drm/nouveau/nouveau_uvmm.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/gsp/r535.c | 364 +- + drivers/gpu/drm/omapdrm/Kconfig | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 4 +- + drivers/gpu/drm/panel/Kconfig | 9 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-abt-y030xx067a.c | 1 + + drivers/gpu/drm/panel/panel-auo-a030jtn01.c | 1 + + drivers/gpu/drm/panel/panel-boe-himax8279d.c | 40 - + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 2745 +- + drivers/gpu/drm/panel/panel-edp.c | 260 +- + drivers/gpu/drm/panel/panel-himax-hx83102.c | 706 + + drivers/gpu/drm/panel/panel-himax-hx8394.c | 3 +- + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 7 +- + drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 764 +- + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 1 + + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 318 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 35 - + drivers/gpu/drm/panel/panel-khadas-ts050.c | 39 - + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 48 - + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 28 - + drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 28 - + drivers/gpu/drm/panel/panel-lg-sw43408.c | 74 +- + drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 226 + + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 29 - + drivers/gpu/drm/panel/panel-novatek-nt36672e.c | 643 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 1 + + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 44 - + drivers/gpu/drm/panel/panel-orisetech-ota5601a.c | 1 + + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 41 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 47 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 26 - + drivers/gpu/drm/panel/panel-raydium-rm692e5.c | 10 - + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 36 - + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 49 - + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 63 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 24 - + drivers/gpu/drm/panel/panel-simple.c | 185 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 35 +- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 6 - + drivers/gpu/drm/panel/panel-tdo-tl070wsh30.c | 23 - + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 28 - + drivers/gpu/drm/panfrost/panfrost_drv.c | 10 + + drivers/gpu/drm/qxl/qxl_drv.c | 4 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 12 +- + drivers/gpu/drm/radeon/evergreen_hdmi.c | 5 +- + drivers/gpu/drm/radeon/pptable.h | 2 +- + drivers/gpu/drm/radeon/radeon_audio.c | 13 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 37 +- + drivers/gpu/drm/radeon/radeon_display.c | 2 +- + drivers/gpu/drm/radeon/radeon_encoders.c | 4 +- + drivers/gpu/drm/radeon/radeon_mode.h | 2 - + drivers/gpu/drm/renesas/rcar-du/Kconfig | 2 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_drv.c | 4 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 4 +- + drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 4 +- + drivers/gpu/drm/rockchip/Kconfig | 3 + + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 20 + + drivers/gpu/drm/rockchip/inno_hdmi.c | 172 +- + drivers/gpu/drm/rockchip/rockchip_drm_drv.c | 4 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 2 +- + drivers/gpu/drm/solomon/ssd130x.c | 4 +- + drivers/gpu/drm/sti/Kconfig | 2 +- + drivers/gpu/drm/sti/sti_dvo.c | 1 + + drivers/gpu/drm/stm/Kconfig | 2 +- + drivers/gpu/drm/sun4i/Kconfig | 3 + + drivers/gpu/drm/sun4i/sun4i_backend.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 83 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 70 +- + drivers/gpu/drm/sun4i/sun8i_mixer.h | 20 + + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 85 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.h | 20 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 86 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.h | 20 +- + drivers/gpu/drm/sun4i/sunxi_engine.h | 13 +- + drivers/gpu/drm/tests/Makefile | 1 + + drivers/gpu/drm/tests/drm_buddy_test.c | 1 + + drivers/gpu/drm/tests/drm_cmdline_parser_test.c | 1 + + drivers/gpu/drm/tests/drm_connector_test.c | 1052 +- + drivers/gpu/drm/tests/drm_damage_helper_test.c | 1 + + drivers/gpu/drm/tests/drm_dp_mst_helper_test.c | 1 + + drivers/gpu/drm/tests/drm_exec_test.c | 1 + + drivers/gpu/drm/tests/drm_format_test.c | 1 + + drivers/gpu/drm/tests/drm_framebuffer_test.c | 1 + + drivers/gpu/drm/tests/drm_gem_shmem_test.c | 1 + + drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 1743 + + drivers/gpu/drm/tests/drm_kunit_edid.h | 484 + + drivers/gpu/drm/tests/drm_kunit_helpers.c | 1 + + drivers/gpu/drm/tests/drm_managed_test.c | 1 + + drivers/gpu/drm/tests/drm_mm_test.c | 1 + + drivers/gpu/drm/tests/drm_modes_test.c | 1 + + drivers/gpu/drm/tests/drm_plane_helper_test.c | 1 + + drivers/gpu/drm/tests/drm_probe_helper_test.c | 1 + + drivers/gpu/drm/tests/drm_rect_test.c | 1 + + drivers/gpu/drm/tidss/tidss_plane.c | 14 +- + drivers/gpu/drm/tiny/bochs.c | 28 +- + drivers/gpu/drm/tiny/cirrus.c | 5 +- + drivers/gpu/drm/tiny/gm12u320.c | 5 +- + drivers/gpu/drm/tiny/hx8357d.c | 4 +- + drivers/gpu/drm/tiny/ili9163.c | 4 +- + drivers/gpu/drm/tiny/ili9225.c | 5 +- + drivers/gpu/drm/tiny/ili9341.c | 4 +- + drivers/gpu/drm/tiny/ili9486.c | 4 +- + drivers/gpu/drm/tiny/mi0283qt.c | 5 +- + drivers/gpu/drm/tiny/ofdrm.c | 4 +- + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 60 +- + drivers/gpu/drm/tiny/repaper.c | 4 +- + drivers/gpu/drm/tiny/simpledrm.c | 4 +- + drivers/gpu/drm/tiny/st7586.c | 5 +- + drivers/gpu/drm/tiny/st7735r.c | 4 +- + drivers/gpu/drm/udl/Makefile | 8 +- + drivers/gpu/drm/udl/udl_drv.c | 5 +- + drivers/gpu/drm/udl/udl_drv.h | 12 +- + drivers/gpu/drm/udl/udl_edid.c | 80 + + drivers/gpu/drm/udl/udl_edid.h | 15 + + drivers/gpu/drm/udl/udl_modeset.c | 142 +- + drivers/gpu/drm/v3d/v3d_drv.c | 11 + + drivers/gpu/drm/v3d/v3d_drv.h | 11 +- + drivers/gpu/drm/v3d/v3d_perfmon.c | 228 +- + drivers/gpu/drm/v3d/v3d_performance_counters.h | 29 + + drivers/gpu/drm/v3d/v3d_sched.c | 2 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 4 +- + drivers/gpu/drm/vc4/Kconfig | 1 + + drivers/gpu/drm/vc4/tests/vc4_mock.c | 6 +- + drivers/gpu/drm/vc4/tests/vc4_mock.h | 9 +- + drivers/gpu/drm/vc4/tests/vc4_mock_plane.c | 44 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 644 +- + drivers/gpu/drm/vc4/vc4_hdmi.h | 44 +- + drivers/gpu/drm/vc4/vc4_hdmi_phy.c | 6 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 10 +- + drivers/gpu/drm/virtio/virtgpu_drv.c | 4 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 12 +- + drivers/gpu/drm/vkms/vkms_drv.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 1 - + drivers/gpu/drm/xe/Kconfig.debug | 10 - + drivers/gpu/drm/xe/Makefile | 39 +- + drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 190 + + drivers/gpu/drm/xe/abi/guc_errors_abi.h | 26 +- + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 40 +- + drivers/gpu/drm/xe/abi/guc_relay_actions_abi.h | 170 +- + .../gem/i915_gem_object_types.h | 11 + + .../{ => gem}/i915_gem_stolen.h | 0 + .../compat-i915-headers/{ => gt}/intel_gt_types.h | 0 + drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 67 +- + .../drm/xe/compat-i915-headers/intel_runtime_pm.h | 51 + + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 5 + + drivers/gpu/drm/xe/display/ext/i915_irq.c | 1 - + drivers/gpu/drm/xe/display/intel_fb_bo.c | 7 +- + drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 37 +- + drivers/gpu/drm/xe/display/intel_fbdev_fb.h | 21 - + drivers/gpu/drm/xe/display/xe_display.c | 46 +- + drivers/gpu/drm/xe/display/xe_display.h | 12 +- + drivers/gpu/drm/xe/display/xe_dsb_buffer.c | 9 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 24 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 3 +- + drivers/gpu/drm/xe/display/xe_plane_initial.c | 23 +- + drivers/gpu/drm/xe/display/xe_tdf.c | 13 + + .../xe/{regs => instructions}/xe_gpu_commands.h | 0 + drivers/gpu/drm/xe/regs/xe_bars.h | 11 + + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 10 +- + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 70 +- + drivers/gpu/drm/xe/regs/xe_guc_regs.h | 2 + + drivers/gpu/drm/xe/regs/xe_lrc_layout.h | 8 + + drivers/gpu/drm/xe/regs/xe_pcode_regs.h | 7 + + drivers/gpu/drm/xe/regs/xe_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_sriov_regs.h | 3 + + drivers/gpu/drm/xe/tests/Makefile | 1 + + drivers/gpu/drm/xe/tests/xe_args_test.c | 221 + + .../gpu/drm/xe/tests/xe_gt_sriov_pf_service_test.c | 232 + + drivers/gpu/drm/xe/tests/xe_migrate.c | 88 +- + drivers/gpu/drm/xe/xe_args.h | 143 + + drivers/gpu/drm/xe/xe_assert.h | 4 +- + drivers/gpu/drm/xe/xe_bb.c | 2 +- + drivers/gpu/drm/xe/xe_bo.c | 71 +- + drivers/gpu/drm/xe/xe_bo.h | 1 + + drivers/gpu/drm/xe/xe_debugfs.c | 58 + + drivers/gpu/drm/xe/xe_devcoredump.c | 19 +- + drivers/gpu/drm/xe/xe_devcoredump_types.h | 2 + + drivers/gpu/drm/xe/xe_device.c | 156 +- + drivers/gpu/drm/xe/xe_device.h | 15 +- + drivers/gpu/drm/xe/xe_device_sysfs.c | 4 +- + drivers/gpu/drm/xe/xe_device_types.h | 29 +- + drivers/gpu/drm/xe/xe_drm_client.c | 124 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 77 +- + drivers/gpu/drm/xe/xe_exec_queue.h | 10 + + drivers/gpu/drm/xe/xe_exec_queue_types.h | 16 +- + drivers/gpu/drm/xe/xe_execlist.c | 12 +- + drivers/gpu/drm/xe/xe_ggtt.c | 34 +- + drivers/gpu/drm/xe/xe_gsc.c | 3 + + drivers/gpu/drm/xe/xe_gsc.h | 3 +- + drivers/gpu/drm/xe/xe_gsc_proxy.c | 5 +- + drivers/gpu/drm/xe/xe_gsc_submit.c | 1 + + drivers/gpu/drm/xe/xe_gt.c | 142 +- + drivers/gpu/drm/xe/xe_gt.h | 27 + + drivers/gpu/drm/xe/xe_gt_ccs_mode.c | 10 +- + drivers/gpu/drm/xe/xe_gt_clock.c | 1 + + drivers/gpu/drm/xe/xe_gt_debugfs.c | 31 + + drivers/gpu/drm/xe/xe_gt_freq.c | 8 +- + drivers/gpu/drm/xe/xe_gt_idle.c | 57 +- + drivers/gpu/drm/xe/xe_gt_idle.h | 4 +- + drivers/gpu/drm/xe/xe_gt_mcr.c | 27 +- + drivers/gpu/drm/xe/xe_gt_mcr.h | 25 + + drivers/gpu/drm/xe/xe_gt_pagefault.c | 16 +- + drivers/gpu/drm/xe/xe_gt_printk.h | 3 + + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 32 + + drivers/gpu/drm/xe/xe_gt_sriov_pf.h | 5 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 105 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 6 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config_types.h | 4 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 427 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.h | 18 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.c | 147 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.h | 27 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor_types.h | 22 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 550 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.h | 36 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_service_types.h | 52 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 10 + + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 979 + + drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 30 + + drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c | 72 + + drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.h | 14 + + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 84 + + drivers/gpu/drm/xe/xe_gt_sysfs.c | 4 +- + .../{xe_gt_throttle_sysfs.c => xe_gt_throttle.c} | 30 +- + drivers/gpu/drm/xe/xe_gt_throttle.h | 17 + + drivers/gpu/drm/xe/xe_gt_throttle_sysfs.h | 16 - + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 160 +- + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h | 3 + + drivers/gpu/drm/xe/xe_gt_topology.c | 14 +- + drivers/gpu/drm/xe/xe_gt_topology.h | 3 + + drivers/gpu/drm/xe/xe_gt_types.h | 34 +- + drivers/gpu/drm/xe/xe_guc.c | 364 +- + drivers/gpu/drm/xe/xe_guc.h | 3 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 71 +- + drivers/gpu/drm/xe/xe_guc_ads.h | 3 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 4 + + drivers/gpu/drm/xe/xe_guc_db_mgr.c | 3 +- + drivers/gpu/drm/xe/xe_guc_id_mgr.c | 3 +- + drivers/gpu/drm/xe/xe_guc_klv_helpers.c | 12 + + drivers/gpu/drm/xe/xe_guc_klv_helpers.h | 15 +- + drivers/gpu/drm/xe/xe_guc_klv_thresholds_set.h | 64 + + .../gpu/drm/xe/xe_guc_klv_thresholds_set_types.h | 68 + + drivers/gpu/drm/xe/xe_guc_pc.c | 12 +- + drivers/gpu/drm/xe/xe_guc_pc.h | 5 +- + drivers/gpu/drm/xe/xe_guc_relay.c | 17 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 281 +- + drivers/gpu/drm/xe/xe_guc_submit.h | 4 +- + drivers/gpu/drm/xe/xe_guc_types.h | 9 - + drivers/gpu/drm/xe/xe_huc.c | 2 + + drivers/gpu/drm/xe/xe_huc.h | 3 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 193 +- + drivers/gpu/drm/xe/xe_hw_engine.h | 3 + + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 30 +- + drivers/gpu/drm/xe/xe_hw_engine_types.h | 26 +- + drivers/gpu/drm/xe/xe_hw_fence.c | 59 +- + drivers/gpu/drm/xe/xe_hw_fence.h | 7 +- + drivers/gpu/drm/xe/xe_hwmon.c | 37 +- + drivers/gpu/drm/xe/xe_irq.c | 6 +- + drivers/gpu/drm/xe/xe_lrc.c | 305 +- + drivers/gpu/drm/xe/xe_lrc.h | 58 +- + drivers/gpu/drm/xe/xe_lrc_types.h | 12 + + drivers/gpu/drm/xe/xe_migrate.c | 78 +- + drivers/gpu/drm/xe/xe_mmio.c | 442 +- + drivers/gpu/drm/xe/xe_mmio.h | 22 +- + drivers/gpu/drm/xe/xe_mocs.c | 301 +- + drivers/gpu/drm/xe/xe_mocs.h | 11 +- + drivers/gpu/drm/xe/xe_module.c | 5 + + drivers/gpu/drm/xe/xe_module.h | 1 + + drivers/gpu/drm/xe/xe_pat.c | 1 + + drivers/gpu/drm/xe/xe_pci.c | 109 +- + drivers/gpu/drm/xe/xe_pci_sriov.c | 143 + + drivers/gpu/drm/xe/xe_pci_sriov.h | 13 + + drivers/gpu/drm/xe/xe_pci_types.h | 4 + + drivers/gpu/drm/xe/xe_pcode.c | 6 +- + drivers/gpu/drm/xe/xe_pm.c | 42 +- + drivers/gpu/drm/xe/xe_pm.h | 9 +- + drivers/gpu/drm/xe/xe_preempt_fence.c | 14 +- + drivers/gpu/drm/xe/xe_pt.c | 69 +- + drivers/gpu/drm/xe/xe_query.c | 10 +- + drivers/gpu/drm/xe/xe_reg_sr.h | 4 +- + drivers/gpu/drm/xe/xe_res_cursor.h | 2 - + drivers/gpu/drm/xe/xe_ring_ops.c | 34 +- + drivers/gpu/drm/xe/xe_rtp.c | 6 + + drivers/gpu/drm/xe/xe_rtp.h | 18 +- + drivers/gpu/drm/xe/xe_rtp_helpers.h | 26 +- + drivers/gpu/drm/xe/xe_sched_job.c | 183 +- + drivers/gpu/drm/xe/xe_sched_job.h | 7 +- + drivers/gpu/drm/xe/xe_sched_job_types.h | 20 +- + drivers/gpu/drm/xe/xe_sriov.c | 11 + + drivers/gpu/drm/xe/xe_sync.c | 15 + + drivers/gpu/drm/xe/xe_sync.h | 1 + + drivers/gpu/drm/xe/xe_tile_sysfs.c | 4 +- + drivers/gpu/drm/xe/xe_trace.h | 11 +- + drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 2 + + drivers/gpu/drm/xe/xe_uc.c | 58 +- + drivers/gpu/drm/xe/xe_uc.h | 4 +- + drivers/gpu/drm/xe/xe_uc_fw.c | 5 + + drivers/gpu/drm/xe/xe_vm.c | 859 +- + drivers/gpu/drm/xe/xe_vm.h | 5 +- + drivers/gpu/drm/xe/xe_vm_doc.h | 24 +- + drivers/gpu/drm/xe/xe_vm_types.h | 29 +- + drivers/gpu/drm/xe/xe_vram.c | 368 + + drivers/gpu/drm/xe/xe_vram.h | 13 + + drivers/gpu/drm/xe/xe_vram_freq.c | 4 +- + drivers/gpu/drm/xe/xe_wa.c | 39 +- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 44 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 62 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 + + drivers/gpu/drm/xlnx/zynqmp_dpsub.h | 1 + + drivers/gpu/drm/xlnx/zynqmp_kms.c | 22 +- + drivers/gpu/drm/xlnx/zynqmp_kms.h | 4 +- + drivers/misc/mei/gsc_proxy/mei_gsc_proxy.c | 4 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 4 +- + drivers/misc/mei/pxp/mei_pxp.c | 4 +- + drivers/platform/x86/intel_ips.c | 2 +- + drivers/video/fbdev/core/fb_defio.c | 82 +- + include/drm/display/drm_dp.h | 28 +- + include/drm/display/drm_dp_helper.h | 3 +- + include/drm/display/drm_hdmi_helper.h | 4 + + include/drm/display/drm_hdmi_state_helper.h | 23 + + include/drm/drm_bridge.h | 84 +- + include/drm/drm_connector.h | 252 +- + include/drm/drm_drv.h | 2 +- + include/drm/drm_edid.h | 4 - + include/drm/drm_fbdev_generic.h | 15 - + include/drm/drm_fbdev_shmem.h | 15 + + include/drm/drm_fbdev_ttm.h | 15 + + include/drm/drm_mipi_dbi.h | 10 + + include/drm/drm_mipi_dsi.h | 122 +- + include/drm/drm_mm.h | 1 - + include/drm/drm_mode_config.h | 4 +- + include/drm/drm_panic.h | 9 + + include/drm/drm_print.h | 14 +- + include/drm/i915_pciids.h | 767 - + include/drm/{ => intel}/i915_component.h | 0 + include/drm/{ => intel}/i915_drm.h | 0 + .../drm/{ => intel}/i915_gsc_proxy_mei_interface.h | 0 + include/drm/{ => intel}/i915_hdcp_interface.h | 0 + include/drm/intel/i915_pciids.h | 800 + + include/drm/{ => intel}/i915_pxp_tee_interface.h | 0 + include/drm/{ => intel}/intel-gtt.h | 0 + include/drm/{ => intel}/intel_lpe_audio.h | 0 + include/drm/{ => intel}/xe_pciids.h | 0 + include/linux/dma-fence-array.h | 3 + + include/linux/dma-heap.h | 4 +- + include/linux/fb.h | 1 + + include/linux/mfd/atmel-hlcdc.h | 10 + + include/sound/hdaudio.h | 2 +- + include/uapi/drm/amdgpu_drm.h | 25 +- + include/uapi/drm/drm_fourcc.h | 19 + + include/uapi/drm/drm_mode.h | 8 - + include/uapi/drm/i915_drm.h | 27 + + include/uapi/drm/ivpu_accel.h | 69 +- + include/uapi/drm/v3d_drm.h | 48 + + include/uapi/drm/xe_drm.h | 2 + + include/uapi/linux/dma-heap.h | 2 +- + include/uapi/linux/kfd_ioctl.h | 5 +- + include/uapi/linux/kfd_sysfs.h | 19 +- + lib/fonts/Kconfig | 20 +- + sound/x86/intel_hdmi_audio.c | 2 +- + 1508 files changed, 374073 insertions(+), 27164 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/himax,hx83102.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-edp-legacy.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/samsung,atna33xc20.yaml + delete mode 100644 Documentation/devicetree/bindings/display/panel/sharp,ld-d5116z01b.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/wl-355608-a8.yaml + create mode 100644 Documentation/gpu/xe/xe-drm-usage-stats.rst + create mode 100644 drivers/accel/ivpu/ivpu_hw.c + delete mode 100644 drivers/accel/ivpu/ivpu_hw_37xx.c + delete mode 100644 drivers/accel/ivpu/ivpu_hw_40xx.c + create mode 100644 drivers/accel/ivpu/ivpu_hw_btrs.c + create mode 100644 drivers/accel/ivpu/ivpu_hw_btrs.h + create mode 100644 drivers/accel/ivpu/ivpu_hw_btrs_lnl_reg.h + create mode 100644 drivers/accel/ivpu/ivpu_hw_btrs_mtl_reg.h + create mode 100644 drivers/accel/ivpu/ivpu_hw_ip.c + create mode 100644 drivers/accel/ivpu/ivpu_hw_ip.h + create mode 100644 drivers/accel/ivpu/ivpu_ms.c + create mode 100644 drivers/accel/ivpu/ivpu_ms.h + create mode 100644 drivers/accel/ivpu/ivpu_sysfs.c + create mode 100644 drivers/accel/ivpu/ivpu_sysfs.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/clearstate_gfx12.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c + rename drivers/gpu/drm/amd/amdgpu/{mes_v10_1.h => gfx_v12_0.h} (87%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v12_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v12_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gmc_v12_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v12_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/imu_v12_0.h + delete mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v10_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v12_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mes_v12_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/sdma_v7_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc24.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/soc24.h + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager_v12.c + create mode 100644 drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/smu13_driver_if.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dalsmc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn401/dcn401_smu14_driver_if.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_spl_translate.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_spl_translate.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dccg/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn20/dcn20_dccg.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn20/dcn20_dccg.h (94%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn201/dcn201_dccg.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn201/dcn201_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn21/dcn21_dccg.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn21/dcn21_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn30/dcn30_dccg.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn30/dcn30_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn301/dcn301_dccg.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn301/dcn301_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn302/dcn302_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn303/dcn303_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn31/dcn31_dccg.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn31/dcn31_dccg.h (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn314/dcn314_dccg.c (98%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn314/dcn314_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn32/dcn32_dccg.c (97%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn32/dcn32_dccg.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn35/dcn35_dccg.c (92%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn35/dcn35_dccg.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dccg/dcn401/dcn401_dccg.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn32/Makefile + delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn321/Makefile + delete mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn32/dcn32_dio_link_encoder.c (98%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn32/dcn32_dio_link_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn32/dcn32_dio_stream_encoder.c (92%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn32/dcn32_dio_stream_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn321/dcn321_dio_link_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn321/dcn321_dio_link_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn35/dcn35_dio_link_encoder.c (98%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn35/dcn35_dio_link_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn35/dcn35_dio_stream_encoder.c (91%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn35/dcn35_dio_stream_encoder.h (99%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dio/dcn401/dcn401_dio_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_translation_helper.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_utils.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_utils.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/dml21_wrapper.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/bounding_boxes/dcn3_soc_bb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/bounding_boxes/dcn4_soc_bb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml2_external_lib_deps.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_dchub_registers.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_display_cfg_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_policy_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_soc_parameter_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/inc/dml_top_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_dcn4_calcs.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_core/dml2_core_shared.c + create 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_shared_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn3.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_standalone_libraries/lib_float_math.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_standalone_libraries/lib_float_math.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_optimization.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml2_top_optimization.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml_top.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml_top_mcache.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/dml2_top/dml_top_mcache.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_debug.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_debug.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml21/src/inc/dml2_internal_shared_types.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn10/CMakeLists.txt + delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn20/CMakeLists.txt + delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn201/CMakeLists.txt + delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn30/CMakeLists.txt + delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn32/CMakeLists.txt + delete mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn35/CMakeLists.txt + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dwb/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => dwb}/dcn35/dcn35_dwb.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dwb}/dcn35/dcn35_dwb.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_factory_dcn401.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_factory_dcn401.h + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_translate_dcn401.c + create mode 100644 drivers/gpu/drm/amd/display/dc/gpio/dcn401/hw_translate_dcn401.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hpo/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => hpo}/dcn32/dcn32_hpo_dp_link_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hpo}/dcn32/dcn32_hpo_dp_link_encoder.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/hubbub/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn10/dcn10_hubbub.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn10/dcn10_hubbub.h (89%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn20/dcn20_hubbub.c (97%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn20/dcn20_hubbub.h (99%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn201/dcn201_hubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn201/dcn201_hubbub.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn21/dcn21_hubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn21/dcn21_hubbub.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn30/dcn30_hubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn30/dcn30_hubbub.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn301/dcn301_hubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn301/dcn301_hubbub.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn31/dcn31_hubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn31/dcn31_hubbub.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn32/dcn32_hubbub.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn32/dcn32_hubbub.h (98%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn35/dcn35_hubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubbub}/dcn35/dcn35_hubbub.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn10/dcn10_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn10/dcn10_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn20/dcn20_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn20/dcn20_hubp.h (92%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn201/dcn201_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn201/dcn201_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn21/dcn21_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn21/dcn21_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn30/dcn30_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn30/dcn30_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn31/dcn31_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn31/dcn31_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn32/dcn32_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn32/dcn32_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn35/dcn35_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn35/dcn35_hubp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn401/dcn401_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn401/irq_service_dcn401.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn401/irq_service_dcn401.h + create mode 100644 drivers/gpu/drm/amd/display/dc/mmhubbub/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => mmhubbub}/dcn32/dcn32_mmhubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mmhubbub}/dcn32/dcn32_mmhubbub.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mmhubbub}/dcn35/dcn35_mmhubbub.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => mmhubbub}/dcn35/dcn35_mmhubbub.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/mpc/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn32/dcn32_mpc.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => mpc}/dcn32/dcn32_mpc.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/opp/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => opp}/dcn35/dcn35_opp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => opp}/dcn35/dcn35_opp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/optc/dcn401/dcn401_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/optc/dcn401/dcn401_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/pg/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => pg}/dcn35/dcn35_pg_cntl.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => pg}/dcn35/dcn35_pg_cntl.h (100%) + delete mode 100644 drivers/gpu/drm/amd/display/dc/resource/dce80/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => resource}/dcn32/dcn32_resource_helpers.c (97%) + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/resource/dcn401/dcn401_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_isharp_filters.c + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_isharp_filters.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters.c + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_scl_filters.h + create mode 100644 drivers/gpu/drm/amd/display/dc/spl/dc_spl_types.h + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_4_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_4_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_12_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_4_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_4_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_14_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_14_0_2_sh_mask.h + delete mode 100644 drivers/gpu/drm/amd/include/mes_api_def.h + create mode 100644 drivers/gpu/drm/amd/include/mes_v12_api_def.h + create mode 100644 drivers/gpu/drm/amd/include/soc24_enum.h + create mode 100644 drivers/gpu/drm/amd/include/v12_structs.h + delete mode 100644 drivers/gpu/drm/ci/testlist.txt + create mode 100644 drivers/gpu/drm/ci/xfails/i915-amly-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/i915-apl-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/i915-cml-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/i915-glk-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/i915-whl-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8173-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/mediatek-mt8183-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/meson-g12b-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8016-skips.txt + create mode 100644 drivers/gpu/drm/ci/xfails/msm-apq8096-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-kingoftown-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-fails.txt + create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-flakes.txt + create mode 100644 drivers/gpu/drm/ci/xfails/vkms-none-skips.txt + create mode 100644 drivers/gpu/drm/display/drm_hdmi_state_helper.c + create mode 100644 drivers/gpu/drm/drm_fbdev_shmem.c + rename drivers/gpu/drm/{drm_fbdev_generic.c => drm_fbdev_ttm.c} (76%) + create mode 100644 drivers/gpu/drm/i915/display/i9xx_plane_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_alpm.c + create mode 100644 drivers/gpu/drm/i915/display/intel_alpm.h + create mode 100644 drivers/gpu/drm/i915/display/intel_cursor_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_encoder.c + create mode 100644 drivers/gpu/drm/i915/display/intel_encoder.h + create mode 100644 drivers/gpu/drm/i915/display/intel_pipe_crc_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_tdf.h + create mode 100644 drivers/gpu/drm/i915/display/intel_vrr_regs.h + create mode 100644 drivers/gpu/drm/i915/display/skl_universal_plane_regs.h + create mode 100644 drivers/gpu/drm/mgag200/mgag200_ddc.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_ddc.h + delete mode 100644 drivers/gpu/drm/mgag200/mgag200_i2c.c + create mode 100644 drivers/gpu/drm/mgag200/mgag200_vga.c + create mode 100644 drivers/gpu/drm/panel/panel-himax-hx83102.c + create mode 100644 drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c + create mode 100644 drivers/gpu/drm/tests/drm_kunit_edid.h + create mode 100644 drivers/gpu/drm/udl/udl_edid.c + create mode 100644 drivers/gpu/drm/udl/udl_edid.h + create mode 100644 drivers/gpu/drm/v3d/v3d_performance_counters.h + create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/gem/i915_gem_object_types.h + rename drivers/gpu/drm/xe/compat-i915-headers/{ => gem}/i915_gem_stolen.h (100%) + rename drivers/gpu/drm/xe/compat-i915-headers/{ => gt}/intel_gt_types.h (100%) + delete mode 100644 drivers/gpu/drm/xe/display/intel_fbdev_fb.h + create mode 100644 drivers/gpu/drm/xe/display/xe_tdf.c + rename drivers/gpu/drm/xe/{regs => instructions}/xe_gpu_commands.h (100%) + create mode 100644 drivers/gpu/drm/xe/regs/xe_bars.h + create mode 100644 drivers/gpu/drm/xe/tests/xe_args_test.c + create mode 100644 drivers/gpu/drm/xe/tests/xe_gt_sriov_pf_service_test.c + create mode 100644 drivers/gpu/drm/xe/xe_args.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor_types.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_service.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_service_types.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h + rename drivers/gpu/drm/xe/{xe_gt_throttle_sysfs.c => xe_gt_throttle.c} (83%) + create mode 100644 drivers/gpu/drm/xe/xe_gt_throttle.h + delete mode 100644 drivers/gpu/drm/xe/xe_gt_throttle_sysfs.h + create mode 100644 drivers/gpu/drm/xe/xe_guc_klv_thresholds_set.h + create mode 100644 drivers/gpu/drm/xe/xe_guc_klv_thresholds_set_types.h + create mode 100644 drivers/gpu/drm/xe/xe_pci_sriov.c + create mode 100644 drivers/gpu/drm/xe/xe_pci_sriov.h + create mode 100644 drivers/gpu/drm/xe/xe_vram.c + create mode 100644 drivers/gpu/drm/xe/xe_vram.h + create mode 100644 include/drm/display/drm_hdmi_state_helper.h + delete mode 100644 include/drm/drm_fbdev_generic.h + create mode 100644 include/drm/drm_fbdev_shmem.h + create mode 100644 include/drm/drm_fbdev_ttm.h + delete mode 100644 include/drm/i915_pciids.h + rename include/drm/{ => intel}/i915_component.h (100%) + rename include/drm/{ => intel}/i915_drm.h (100%) + rename include/drm/{ => intel}/i915_gsc_proxy_mei_interface.h (100%) + rename include/drm/{ => intel}/i915_hdcp_interface.h (100%) + create mode 100644 include/drm/intel/i915_pciids.h + rename include/drm/{ => intel}/i915_pxp_tee_interface.h (100%) + rename include/drm/{ => intel}/intel-gtt.h (100%) + rename include/drm/{ => intel}/intel_lpe_audio.h (100%) + rename include/drm/{ => intel}/xe_pciids.h (100%) +$ git am -3 ../patches/0001-Revert-drm-omap-Allow-build-with-COMPILE_TEST-y.patch +Applying: Revert "drm/omap: Allow build with COMPILE_TEST=y" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/omapdrm/Kconfig +$ git add -A . +$ git commit -v -a --amend +[master 8279582a8eb3] next-20240627/drm + Date: Wed Jul 3 11:53:55 2024 +1000 +Merging drm-exynos/for-linux-next (9347028bfcfc drm/exynos/vidi: convert to struct drm_edid) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 82 +++++++++++++------------------- + 1 file changed, 34 insertions(+), 48 deletions(-) +Merging drm-misc/for-linux-next (e31538489908 drm/tests: Add tests for the new Monochrome value of tv_mode) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpu/drm/exynos/exynos_dp.c +Auto-merging drivers/gpu/drm/panel/Kconfig +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Merge made by the 'ort' strategy. + .../bindings/display/amlogic,meson-dw-hdmi.yaml | 5 + + .../bindings/display/bridge/synopsys,dw-hdmi.yaml | 13 + + .../bindings/display/bridge/toshiba,tc358767.yaml | 2 +- + .../bindings/display/imx/fsl,imx6-hdmi.yaml | 8 - + .../bindings/display/panel/ilitek,ili9806e.yaml | 63 + + .../bindings/display/panel/jadard,jd9365da-h3.yaml | 1 + + .../bindings/display/panel/panel-simple-dsi.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../display/rockchip/rockchip,dw-hdmi.yaml | 8 - + .../bindings/display/st,stm32mp25-lvds.yaml | 119 ++ + MAINTAINERS | 9 +- + drivers/gpu/drm/Kconfig | 4 +- + drivers/gpu/drm/ast/ast_mode.c | 45 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 197 ++-- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 7 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 38 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 9 + + drivers/gpu/drm/bridge/tc358767.c | 112 +- + drivers/gpu/drm/display/drm_hdmi_state_helper.c | 6 +- + drivers/gpu/drm/drm_panic.c | 71 +- + drivers/gpu/drm/exynos/exynos_dp.c | 5 +- + drivers/gpu/drm/lima/lima_drv.c | 1 + + drivers/gpu/drm/mediatek/Kconfig | 1 + + drivers/gpu/drm/panel/Kconfig | 20 + + drivers/gpu/drm/panel/Makefile | 2 + + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 136 +-- + drivers/gpu/drm/panel/panel-ilitek-ili9806e.c | 402 +++++++ + drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 1090 ++++++++++------- + drivers/gpu/drm/panel/panel-lincolntech-lcd197.c | 262 +++++ + drivers/gpu/drm/panel/panel-raydium-rm692e5.c | 228 ++-- + drivers/gpu/drm/panel/panel-simple.c | 27 + + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 820 +++++++------ + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 431 ++++--- + drivers/gpu/drm/qxl/qxl_display.c | 3 + + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 26 +- + drivers/gpu/drm/stm/Kconfig | 11 + + drivers/gpu/drm/stm/Makefile | 2 + + drivers/gpu/drm/stm/dw_mipi_dsi-stm.c | 279 ++++- + drivers/gpu/drm/stm/lvds.c | 1226 ++++++++++++++++++++ + drivers/gpu/drm/tests/drm_cmdline_parser_test.c | 11 + + drivers/gpu/drm/tests/drm_connector_test.c | 1 + + drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 1 + + drivers/gpu/drm/tests/drm_modes_test.c | 31 + + drivers/gpu/drm/ttm/tests/.kunitconfig | 1 - + drivers/gpu/drm/ttm/tests/Makefile | 2 + + drivers/gpu/drm/ttm/tests/TODO | 27 + + drivers/gpu/drm/ttm/tests/ttm_bo_test.c | 63 +- + drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c | 1225 +++++++++++++++++++ + drivers/gpu/drm/ttm/tests/ttm_device_test.c | 3 +- + drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 178 ++- + drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.h | 17 +- + drivers/gpu/drm/ttm/tests/ttm_mock_manager.c | 234 ++++ + drivers/gpu/drm/ttm/tests/ttm_mock_manager.h | 30 + + drivers/gpu/drm/ttm/tests/ttm_pool_test.c | 9 +- + drivers/gpu/drm/ttm/tests/ttm_resource_test.c | 21 +- + drivers/gpu/drm/ttm/tests/ttm_tt_test.c | 169 ++- + drivers/gpu/drm/ttm/ttm_tt.c | 3 + + drivers/gpu/drm/vc4/vc4_vec.c | 31 +- + drivers/gpu/ipu-v3/ipu-pre.c | 131 ++- + drivers/gpu/ipu-v3/ipu-prg.c | 2 +- + drivers/gpu/ipu-v3/ipu-prv.h | 2 +- + drivers/video/logo/Kconfig | 2 + + include/drm/bridge/analogix_dp.h | 4 +- + include/drm/display/drm_hdmi_state_helper.h | 2 +- + include/drm/drm_mipi_dsi.h | 7 + + include/drm/ttm/ttm_bo.h | 4 + + lib/fonts/Kconfig | 6 +- + 67 files changed, 6217 insertions(+), 1693 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili9806e.yaml + create mode 100644 Documentation/devicetree/bindings/display/st,stm32mp25-lvds.yaml + create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili9806e.c + create mode 100644 drivers/gpu/drm/panel/panel-lincolntech-lcd197.c + create mode 100644 drivers/gpu/drm/stm/lvds.c + create mode 100644 drivers/gpu/drm/ttm/tests/TODO + create mode 100644 drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c + create mode 100644 drivers/gpu/drm/ttm/tests/ttm_mock_manager.c + create mode 100644 drivers/gpu/drm/ttm/tests/ttm_mock_manager.h +Merging amdgpu/drm-next (4ed6a3689cab drm/amdgpu/atomfirmware: silence UBSAN warning) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_capability.c +Merge made by the 'ort' strategy. + Documentation/gpu/amdgpu/apu-asic-info-table.csv | 2 + + drivers/gpu/drm/amd/amdgpu/Kconfig | 11 + + drivers/gpu/drm/amd/amdgpu/Makefile | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 44 +++- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 94 ++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 4 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 5 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c | 210 +++++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h | 60 +++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 31 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 63 ++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 201 +++++++++++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 54 ++-- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 44 +--- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 33 +++ + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 4 - + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 28 ++ + drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 6 + + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c | 137 ++++++++++ + drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.h | 39 +++ + drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c | 137 ++++++++++ + drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.h | 39 +++ + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 165 ++++++++++-- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.h | 6 + + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 8 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 27 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 4 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 31 ++- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 5 +- + drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c | 14 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/soc21.c | 28 ++ + drivers/gpu/drm/amd/amdgpu/soc24.c | 1 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 7 + + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_kernel_queue.c | 21 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager.c | 63 +++-- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 24 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 111 ++++++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 3 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 50 +++- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 5 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 9 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 10 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 108 ++++++-- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 2 +- + drivers/gpu/drm/amd/display/dc/basics/dce_calcs.c | 2 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 3 +- + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 2 - + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 12 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 4 +- + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 44 ++-- + drivers/gpu/drm/amd/display/dc/core/dc.c | 12 + + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 11 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 8 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 35 ++- + drivers/gpu/drm/amd/display/dc/dc.h | 11 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 7 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c | 57 ++-- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 5 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 8 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 5 +- + .../gpu/drm/amd/display/dc/dce/dce_panel_cntl.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 18 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 1 - + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 1 - + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 - + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 11 +- + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 12 +- + drivers/gpu/drm/amd/display/dc/dcn314/Makefile | 11 +- + drivers/gpu/drm/amd/display/dc/dcn401/Makefile | 5 +- + drivers/gpu/drm/amd/display/dc/dio/Makefile | 36 +++ + .../dc/{ => dio}/dcn10/dcn10_link_encoder.c | 8 +- + .../dc/{ => dio}/dcn10/dcn10_link_encoder.h | 0 + .../dc/{ => dio}/dcn10/dcn10_stream_encoder.c | 0 + .../dc/{ => dio}/dcn10/dcn10_stream_encoder.h | 0 + .../dc/{ => dio}/dcn20/dcn20_link_encoder.c | 0 + .../dc/{ => dio}/dcn20/dcn20_link_encoder.h | 0 + .../dc/{ => dio}/dcn20/dcn20_stream_encoder.c | 0 + .../dc/{ => dio}/dcn20/dcn20_stream_encoder.h | 0 + .../dc/{ => dio}/dcn30/dcn30_dio_link_encoder.c | 0 + .../dc/{ => dio}/dcn30/dcn30_dio_link_encoder.h | 0 + .../dc/{ => dio}/dcn30/dcn30_dio_stream_encoder.c | 0 + .../dc/{ => dio}/dcn30/dcn30_dio_stream_encoder.h | 0 + .../dc/{ => dio}/dcn31/dcn31_dio_link_encoder.c | 0 + .../dc/{ => dio}/dcn31/dcn31_dio_link_encoder.h | 0 + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 2 +- + .../display/dc/dml/dcn20/display_rq_dlg_calc_20.c | 14 +- + .../dc/dml/dcn20/display_rq_dlg_calc_20v2.c | 14 +- + .../display/dc/dml/dcn21/display_rq_dlg_calc_21.c | 14 +- + .../display/dc/dml/dcn30/display_rq_dlg_calc_30.c | 14 +- + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 14 +- + .../dc/dml/dcn314/display_rq_dlg_calc_314.c | 14 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 2 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 3 + + .../dc/dml2/dml21/dml21_translation_helper.c | 2 +- + .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 26 +- + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 4 +- + .../dml2/dml21/src/dml2_core/dml2_core_factory.c | 2 +- + .../dc/dml2/dml21/src/dml2_core/dml2_core_shared.c | 46 ++-- + .../dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 2 +- + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_factory.c | 2 +- + .../dml2/dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 11 +- + .../dc/dml2/dml21/src/dml2_pmo/dml2_pmo_factory.c | 2 +- + .../display/dc/dml2/dml21/src/dml2_top/dml_top.c | 17 ++ + .../dml21/src/inc/dml2_internal_shared_types.h | 1 + + .../drm/amd/display/dc/dml2/dml2_mall_phantom.c | 2 + + .../amd/display/dc/dml2/dml2_translation_helper.c | 1 + + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c | 14 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 14 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 4 +- + .../drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 50 ---- + .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 24 +- + .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.h | 13 +- + .../gpu/drm/amd/display/dc/dsc/dcn35/dcn35_dsc.c | 58 ++++- + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c | 2 +- + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.h | 3 +- + .../drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.c | 3 +- + .../drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c | 3 + + .../drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c | 3 + + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 286 +++++++++++++++++++++ + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.h | 5 + + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h | 14 + + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 82 +++--- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h | 14 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 62 ++++- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 19 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 34 ++- + .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 6 + + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 5 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 11 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 186 ++++++-------- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 3 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 2 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 9 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 1 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 1 + + .../amd/display/dc/link/accessories/link_dp_cts.c | 2 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 6 +- + .../display/dc/link/protocols/link_dp_capability.c | 21 +- + .../display/dc/link/protocols/link_dp_training.c | 3 +- + .../dc/link/protocols/link_edp_panel_control.c | 2 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 3 +- + .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.c | 13 + + .../gpu/drm/amd/display/dc/optc/dcn32/dcn32_optc.h | 2 + + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.c | 1 + + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.h | 1 + + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 9 +- + .../display/dc/resource/dcn314/dcn314_resource.c | 22 -- + .../display/dc/resource/dcn315/dcn315_resource.c | 2 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 3 +- + .../display/dc/resource/dcn401/dcn401_resource.c | 12 + + .../display/dc/resource/dcn401/dcn401_resource.h | 2 + + drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 8 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 1 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 5 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 1 + + .../drm/amd/display/modules/freesync/freesync.c | 2 +- + .../drm/amd/display/modules/hdcp/hdcp1_execution.c | 24 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 12 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_psp.c | 3 - + drivers/gpu/drm/amd/include/amd_shared.h | 2 + + .../amd/include/asic_reg/dcn/dcn_4_1_0_offset.h | 18 ++ + .../amd/include/asic_reg/dcn/dcn_4_1_0_sh_mask.h | 110 ++++++++ + drivers/gpu/drm/amd/include/atomfirmware.h | 2 +- + .../drm/amd/include/ivsrcid/isp/irqsrcs_isp_4_1.h | 62 +++++ + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 20 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 30 +-- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 30 +-- + drivers/gpu/drm/radeon/radeon_gem.c | 2 +- + include/uapi/drm/drm_fourcc.h | 5 +- + 202 files changed, 2994 insertions(+), 1018 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/isp_v4_1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.h + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn10/dcn10_link_encoder.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn10/dcn10_link_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn10/dcn10_stream_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn10/dcn10_stream_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn20/dcn20_link_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn20/dcn20_link_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn20/dcn20_stream_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn20/dcn20_stream_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn30/dcn30_dio_link_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn30/dcn30_dio_link_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn30/dcn30_dio_stream_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn30/dcn30_dio_stream_encoder.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn31/dcn31_dio_link_encoder.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dio}/dcn31/dcn31_dio_link_encoder.h (100%) + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/isp/irqsrcs_isp_4_1.h +Merging drm-intel/for-linux-next (9fc97277eb2d drm/i915: Skip programming FIA link enable bits for MTL+) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/drm_atomic.c +Auto-merging drivers/gpu/drm/drm_crtc_internal.h +Auto-merging drivers/gpu/drm/i915/display/intel_ddi.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/drm_atomic.c | 7 +- + drivers/gpu/drm/drm_crtc.c | 6 +- + drivers/gpu/drm/drm_crtc_internal.h | 2 - + drivers/gpu/drm/drm_plane.c | 32 ++-- + drivers/gpu/drm/drm_vblank_work.c | 22 +++ + drivers/gpu/drm/i915/display/i9xx_plane.c | 75 +++++++++- + drivers/gpu/drm/i915/display/intel_alpm.c | 9 +- + drivers/gpu/drm/i915/display/intel_alpm.h | 2 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 35 ++++- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 6 + + drivers/gpu/drm/i915/display/intel_color.c | 13 +- + drivers/gpu/drm/i915/display/intel_color.h | 3 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 57 +++++-- + drivers/gpu/drm/i915/display/intel_crtc.h | 1 + + drivers/gpu/drm/i915/display/intel_cursor.c | 64 +++++++- + drivers/gpu/drm/i915/display/intel_cursor.h | 3 + + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 13 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 8 +- + drivers/gpu/drm/i915/display/intel_display.c | 15 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 50 ++++++- + .../gpu/drm/i915/display/intel_display_params.c | 3 + + .../gpu/drm/i915/display/intel_display_params.h | 1 + + drivers/gpu/drm/i915/display/intel_display_trace.h | 50 +++++++ + drivers/gpu/drm/i915/display/intel_display_types.h | 8 + + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 1 + + drivers/gpu/drm/i915/display/intel_dsb.c | 66 ++++---- + drivers/gpu/drm/i915/display/intel_dsb.h | 4 +- + drivers/gpu/drm/i915/display/intel_dsb_regs.h | 6 +- + drivers/gpu/drm/i915/display/intel_encoder.c | 44 ++++++ + drivers/gpu/drm/i915/display/intel_encoder.h | 4 + + drivers/gpu/drm/i915/display/intel_fb.c | 151 ++++--------------- + drivers/gpu/drm/i915/display/intel_fb.h | 3 - + drivers/gpu/drm/i915/display/intel_fb_pin.c | 39 +++-- + drivers/gpu/drm/i915/display/intel_fb_pin.h | 3 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 5 +- + drivers/gpu/drm/i915/display/intel_psr.c | 166 +++++++++++++++++---- + drivers/gpu/drm/i915/display/intel_sprite.c | 26 ++++ + drivers/gpu/drm/i915/display/intel_tc.c | 3 + + drivers/gpu/drm/i915/display/intel_vblank.c | 10 ++ + drivers/gpu/drm/i915/display/intel_vblank.h | 1 + + drivers/gpu/drm/i915/display/intel_vrr.c | 2 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 85 ++++++++++- + drivers/gpu/drm/i915/i915_driver.c | 51 +------ + drivers/gpu/drm/i915/i915_reg.h | 80 +++++----- + drivers/gpu/drm/xe/display/xe_display.c | 18 +-- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 3 +- + drivers/gpu/drm/xe/display/xe_plane_initial.c | 4 +- + include/drm/drm_plane.h | 2 + + include/drm/drm_vblank_work.h | 2 + + 49 files changed, 873 insertions(+), 391 deletions(-) +Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (7775352a5f52 drm/msm/gem: Add missing rcu_dereference()) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Merge made by the 'ort' strategy. + .../bindings/display/msm/dsi-controller-main.yaml | 17 + + .../bindings/display/msm/dsi-phy-28nm.yaml | 1 + + .../devicetree/bindings/display/msm/gmu.yaml | 4 + + .../devicetree/bindings/display/msm/gpu.yaml | 27 +- + .../devicetree/bindings/display/msm/qcom,mdp5.yaml | 1 + + .../devicetree/bindings/display/msm/qcom,mdss.yaml | 1 + + .../bindings/display/msm/qcom,sm7150-dpu.yaml | 143 +++ + .../bindings/display/msm/qcom,sm7150-mdss.yaml | 458 +++++++ + drivers/gpu/drm/msm/Kconfig | 1 + + drivers/gpu/drm/msm/Makefile | 5 + + drivers/gpu/drm/msm/adreno/a2xx_catalog.c | 52 + + drivers/gpu/drm/msm/adreno/a3xx_catalog.c | 81 ++ + drivers/gpu/drm/msm/adreno/a4xx_catalog.c | 50 + + drivers/gpu/drm/msm/adreno/a5xx_catalog.c | 161 +++ + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 29 +- + drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 1259 ++++++++++++++++++++ + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 38 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 997 ++-------------- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 12 + + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 13 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 624 +--------- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 6 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 44 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 335 ++++++ + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 25 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.h | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 61 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.h | 15 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 13 + + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 36 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 34 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 19 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 26 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 45 + + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 7 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 4 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 91 +- + drivers/gpu/drm/msm/dp/dp_aux.c | 5 +- + drivers/gpu/drm/msm/dp/dp_display.c | 11 +- + drivers/gpu/drm/msm/dp/dp_panel.c | 47 +- + drivers/gpu/drm/msm/dp/dp_panel.h | 2 +- + drivers/gpu/drm/msm/dsi/dsi.h | 1 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 59 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 5 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 6 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_10nm.c | 273 ++--- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_14nm.c | 214 ++-- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_20nm.c | 109 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm.c | 323 ++--- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_28nm_8960.c | 205 ++-- + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 318 +++-- + drivers/gpu/drm/msm/msm_drv.h | 11 + + drivers/gpu/drm/msm/msm_gem.c | 37 + + drivers/gpu/drm/msm/msm_gpu.c | 6 +- + drivers/gpu/drm/msm/msm_gpu.h | 9 + + drivers/gpu/drm/msm/msm_mdss.c | 8 + + include/uapi/drm/msm_drm.h | 1 + + 65 files changed, 3950 insertions(+), 2485 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm7150-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm7150-mdss.yaml + create mode 100644 drivers/gpu/drm/msm/adreno/a2xx_catalog.c + create mode 100644 drivers/gpu/drm/msm/adreno/a3xx_catalog.c + create mode 100644 drivers/gpu/drm/msm/adreno/a4xx_catalog.c + create mode 100644 drivers/gpu/drm/msm/adreno/a5xx_catalog.c + create mode 100644 drivers/gpu/drm/msm/adreno/a6xx_catalog.c + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h +Merging drm-msm-lumag/msm-next-lumag (104e548a7c97 drm/msm/mdp4: use drmm-managed allocation for mdp4_plane) +$ 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 (7c0389c615b5 drm/xe/guc: Demote GuC IDs usage message to debug) +$ 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/display/xe_fb_pin.c +Auto-merging drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c +Auto-merging drivers/gpu/drm/xe/xe_guc.c +Merge made by the 'ort' strategy. + drivers/base/devcoredump.c | 23 +- + drivers/gpu/drm/xe/Kconfig | 1 - + drivers/gpu/drm/xe/Makefile | 7 + + drivers/gpu/drm/xe/abi/guc_actions_abi.h | 6 - + drivers/gpu/drm/xe/abi/guc_actions_slpc_abi.h | 22 + + drivers/gpu/drm/xe/abi/guc_errors_abi.h | 31 + + drivers/gpu/drm/xe/abi/guc_messages_abi.h | 41 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 4 +- + drivers/gpu/drm/xe/instructions/xe_mi_commands.h | 5 + + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 2 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 11 +- + drivers/gpu/drm/xe/regs/xe_oa_regs.h | 100 + + drivers/gpu/drm/xe/tests/xe_mocs.c | 8 +- + drivers/gpu/drm/xe/tests/xe_rtp_test.c | 64 +- + drivers/gpu/drm/xe/xe_bo.c | 11 +- + drivers/gpu/drm/xe/xe_devcoredump.c | 8 +- + drivers/gpu/drm/xe/xe_device.c | 45 +- + drivers/gpu/drm/xe/xe_device_types.h | 4 + + drivers/gpu/drm/xe/xe_drm_client.c | 11 +- + drivers/gpu/drm/xe/xe_exec.c | 8 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 8 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 26 +- + drivers/gpu/drm/xe/xe_force_wake.c | 102 +- + drivers/gpu/drm/xe/xe_force_wake.h | 13 +- + drivers/gpu/drm/xe/xe_ggtt.c | 47 +- + drivers/gpu/drm/xe/xe_ggtt.h | 1 - + drivers/gpu/drm/xe/xe_ggtt_types.h | 12 +- + drivers/gpu/drm/xe/xe_gsc.c | 5 + + drivers/gpu/drm/xe/xe_gt.c | 26 + + drivers/gpu/drm/xe/xe_gt.h | 1 + + drivers/gpu/drm/xe/xe_gt_ccs_mode.c | 9 +- + drivers/gpu/drm/xe/xe_gt_clock.c | 20 + + drivers/gpu/drm/xe/xe_gt_clock.h | 1 + + drivers/gpu/drm/xe/xe_gt_idle.c | 16 + + drivers/gpu/drm/xe/xe_gt_mcr.c | 6 +- + drivers/gpu/drm/xe/xe_gt_pagefault.c | 154 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 12 + + drivers/gpu/drm/xe/xe_gt_sriov_pf.h | 5 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 78 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 4 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c | 21 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.h | 1 + + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 61 +- + drivers/gpu/drm/xe/xe_gt_types.h | 4 + + drivers/gpu/drm/xe/xe_guc.c | 29 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 89 +- + drivers/gpu/drm/xe/xe_guc_ct.h | 2 + + drivers/gpu/drm/xe/xe_guc_ct_types.h | 2 + + drivers/gpu/drm/xe/xe_guc_id_mgr.c | 4 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 215 +- + drivers/gpu/drm/xe/xe_guc_pc.h | 5 + + drivers/gpu/drm/xe/xe_guc_pc_types.h | 4 + + drivers/gpu/drm/xe/xe_guc_submit.c | 350 ++- + drivers/gpu/drm/xe/xe_huc.c | 30 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 9 +- + drivers/gpu/drm/xe/xe_hw_engine.h | 1 + + drivers/gpu/drm/xe/xe_hw_engine_types.h | 2 + + drivers/gpu/drm/xe/xe_hwmon.c | 89 +- + drivers/gpu/drm/xe/xe_irq.c | 8 +- + drivers/gpu/drm/xe/xe_irq.h | 1 - + drivers/gpu/drm/xe/xe_lrc.c | 89 +- + drivers/gpu/drm/xe/xe_lrc.h | 6 + + drivers/gpu/drm/xe/xe_migrate.c | 36 +- + drivers/gpu/drm/xe/xe_mmio.c | 23 +- + drivers/gpu/drm/xe/xe_mocs.c | 74 +- + drivers/gpu/drm/xe/xe_module.c | 5 + + drivers/gpu/drm/xe/xe_oa.c | 2512 ++++++++++++++++++++++ + drivers/gpu/drm/xe/xe_oa.h | 27 + + drivers/gpu/drm/xe/xe_oa_types.h | 242 +++ + drivers/gpu/drm/xe/xe_pci.c | 8 +- + drivers/gpu/drm/xe/xe_pci_sriov.c | 27 + + drivers/gpu/drm/xe/xe_pci_sriov.h | 7 + + drivers/gpu/drm/xe/xe_perf.c | 92 + + drivers/gpu/drm/xe/xe_perf.h | 20 + + drivers/gpu/drm/xe/xe_preempt_fence.c | 2 +- + drivers/gpu/drm/xe/xe_pt.c | 8 +- + drivers/gpu/drm/xe/xe_query.c | 77 + + drivers/gpu/drm/xe/xe_reg_whitelist.c | 24 +- + drivers/gpu/drm/xe/xe_ring_ops.c | 21 + + drivers/gpu/drm/xe/xe_rtp.c | 45 +- + drivers/gpu/drm/xe/xe_rtp.h | 69 +- + drivers/gpu/drm/xe/xe_rtp_helpers.h | 2 + + drivers/gpu/drm/xe/xe_rtp_types.h | 3 + + drivers/gpu/drm/xe/xe_sched_job.c | 6 + + drivers/gpu/drm/xe/xe_sched_job.h | 3 + + drivers/gpu/drm/xe/xe_sriov.h | 6 +- + drivers/gpu/drm/xe/xe_trace.h | 372 +--- + drivers/gpu/drm/xe/xe_trace_bo.c | 9 + + drivers/gpu/drm/xe/xe_trace_bo.h | 247 +++ + drivers/gpu/drm/xe/xe_trace_guc.c | 9 + + drivers/gpu/drm/xe/xe_trace_guc.h | 110 + + drivers/gpu/drm/xe/xe_uc_fw.h | 2 +- + drivers/gpu/drm/xe/xe_vm.c | 101 +- + drivers/gpu/drm/xe/xe_wa.c | 25 +- + drivers/gpu/drm/xe/xe_wa.h | 2 - + drivers/gpu/drm/xe/xe_wa_oob.rules | 2 + + include/drm/intel/xe_pciids.h | 7 + + include/linux/devcoredump.h | 53 +- + include/uapi/drm/xe_drm.h | 308 +++ + 99 files changed, 5625 insertions(+), 941 deletions(-) + create mode 100644 drivers/gpu/drm/xe/regs/xe_oa_regs.h + create mode 100644 drivers/gpu/drm/xe/xe_oa.c + create mode 100644 drivers/gpu/drm/xe/xe_oa.h + create mode 100644 drivers/gpu/drm/xe/xe_oa_types.h + create mode 100644 drivers/gpu/drm/xe/xe_perf.c + create mode 100644 drivers/gpu/drm/xe/xe_perf.h + create mode 100644 drivers/gpu/drm/xe/xe_trace_bo.c + create mode 100644 drivers/gpu/drm/xe/xe_trace_bo.h + create mode 100644 drivers/gpu/drm/xe/xe_trace_guc.c + create mode 100644 drivers/gpu/drm/xe/xe_trace_guc.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 +Merge made by the 'ort' strategy. + drivers/gpu/drm/etnaviv/cmdstream.xml.h | 52 ++++++++++++++-- + drivers/gpu/drm/etnaviv/common.xml.h | 12 ++-- + drivers/gpu/drm/etnaviv/etnaviv_dump.c | 5 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 6 +- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 83 ++++++++++++++------------ + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 8 +++ + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 9 ++- + drivers/gpu/drm/etnaviv/state.xml.h | 101 +++++++++++++++++++++++++++----- + drivers/gpu/drm/etnaviv/state_blt.xml.h | 20 +++---- + drivers/gpu/drm/etnaviv/state_hi.xml.h | 28 +++++---- + 10 files changed, 235 insertions(+), 89 deletions(-) +Merging fbdev/for-next (7ee6cfe6d9cf fbdev: omap2: Return clk_prepare_enable to transfer the error) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/char/agp/ali-agp.c | 1 + + drivers/char/agp/alpha-agp.c | 1 + + drivers/char/agp/amd-k7-agp.c | 1 + + drivers/char/agp/ati-agp.c | 1 + + drivers/char/agp/efficeon-agp.c | 1 + + drivers/char/agp/nvidia-agp.c | 1 + + drivers/char/agp/parisc-agp.c | 1 + + drivers/char/agp/sworks-agp.c | 1 + + drivers/video/console/mdacon.c | 1 + + drivers/video/console/newport_con.c | 1 + + drivers/video/console/sticon.c | 1 + + drivers/video/console/vgacon.c | 1 + + drivers/video/fbdev/amifb.c | 1 + + drivers/video/fbdev/c2p_planar.c | 1 + + drivers/video/fbdev/goldfishfb.c | 1 + + drivers/video/fbdev/kyro/fbdev.c | 1 + + drivers/video/fbdev/macmodes.c | 1 + + drivers/video/fbdev/matrox/matroxfb_DAC1064.c | 1 + + drivers/video/fbdev/matrox/matroxfb_Ti3026.c | 1 + + drivers/video/fbdev/matrox/matroxfb_accel.c | 1 + + drivers/video/fbdev/matrox/matroxfb_maven.c | 2 +- + drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 2 +- + drivers/video/fbdev/offb.c | 1 + + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 15 +-------------- + drivers/video/fbdev/omap2/omapfb/dss/omapdss-boot-init.c | 3 +-- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 4 +--- + drivers/video/fbdev/ssd1307fb.c | 8 ++++---- + drivers/video/fbdev/vesafb.c | 2 +- + drivers/video/fbdev/vfb.c | 1 + + drivers/video/fbdev/via/viafbdev.c | 1 + + drivers/video/logo/pnmtologo.c | 4 ++-- + include/linux/linux_logo.h | 3 --- + include/linux/screen_info.h | 10 ++++++++++ + include/video/mmp_disp.h | 4 ++-- + 34 files changed, 47 insertions(+), 33 deletions(-) +Merging regmap/for-next (438685f6714a Merge remote-tracking branch 'regmap/for-6.11' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/regcache-maple.c | 13 +++--- + drivers/base/regmap/regcache.c | 6 +-- + drivers/base/regmap/regmap-i2c.c | 1 + + drivers/base/regmap/regmap-kunit.c | 85 ++++++++++++++++++++++-------------- + drivers/base/regmap/regmap.c | 2 +- + 5 files changed, 63 insertions(+), 44 deletions(-) +Merging sound/for-next (5b707581c072 selftests/alsa:Fix printf format string in pcm-test.c) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging MAINTAINERS +Auto-merging include/linux/pci_ids.h +Merge made by the 'ort' strategy. + MAINTAINERS | 6 + + include/linux/pci_ids.h | 1 + + sound/core/control.c | 9 +- + sound/core/pcm_dmaengine.c | 34 ++--- + sound/core/pcm_lib.c | 1 + + sound/core/vmaster.c | 8 + + sound/hda/hdac_device.c | 1 + + sound/hda/hdmi_chmap.c | 18 +++ + sound/hda/intel-dsp-config.c | 9 ++ + sound/isa/sb/emu8000.c | 6 +- + sound/isa/sb/sb16_csp.c | 12 +- + sound/pci/hda/Kconfig | 11 ++ + sound/pci/hda/Makefile | 2 + + sound/pci/hda/cs35l41_hda.c | 43 +++--- + sound/pci/hda/cs35l56_hda.c | 115 ++++++++++---- + sound/pci/hda/cs35l56_hda.h | 3 + + sound/pci/hda/hda_codec.c | 23 ++- + sound/pci/hda/hda_component.c | 75 +++++---- + sound/pci/hda/hda_component.h | 48 ++++-- + sound/pci/hda/hda_cs_dsp_ctl.c | 2 +- + sound/pci/hda/hda_intel.c | 2 + + sound/pci/hda/patch_realtek.c | 17 +-- + sound/pci/hda/patch_senarytech.c | 244 ++++++++++++++++++++++++++++++ + sound/pci/hda/tas2781_hda_i2c.c | 44 +++--- + sound/spi/at73c213.c | 8 +- + sound/xen/xen_snd_front_alsa.c | 5 - + tools/testing/selftests/alsa/mixer-test.c | 45 ++++-- + tools/testing/selftests/alsa/pcm-test.c | 2 +- + 28 files changed, 603 insertions(+), 191 deletions(-) + create mode 100644 sound/pci/hda/patch_senarytech.c +Merging ieee1394/for-next (502099acb8cb firewire: core: Fix spelling mistakes in tracepoint messages) +$ 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. + drivers/firewire/.kunitconfig | 1 + + drivers/firewire/Kconfig | 15 + + drivers/firewire/Makefile | 1 + + drivers/firewire/core-iso.c | 32 ++ + drivers/firewire/core-topology.c | 219 ++++------ + drivers/firewire/core-trace.c | 22 + + drivers/firewire/core-transaction.c | 24 +- + drivers/firewire/ohci.c | 177 +++++--- + drivers/firewire/packet-header-definitions.h | 2 + + drivers/firewire/packet-serdes-test.c | 334 +++++++++++++++ + drivers/firewire/phy-packet-definitions.h | 302 +++++++++++++ + drivers/firewire/self-id-sequence-helper-test.c | 152 +++++++ + include/trace/events/firewire.h | 536 +++++++++++++++++++++++- + include/trace/events/firewire_ohci.h | 47 +++ + 14 files changed, 1660 insertions(+), 204 deletions(-) + create mode 100644 drivers/firewire/phy-packet-definitions.h + create mode 100644 drivers/firewire/self-id-sequence-helper-test.c + create mode 100644 include/trace/events/firewire_ohci.h +Merging sound-asoc/for-next (2b5b8270c6ea Merge remote-tracking branch 'asoc/for-6.11' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging MAINTAINERS +Auto-merging include/linux/acpi.h +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/sound/ak4104.txt | 25 - + Documentation/devicetree/bindings/sound/ak4554.txt | 11 - + .../bindings/sound/amlogic,g12a-tohdmitx.txt | 58 - + .../bindings/sound/amlogic,g12a-tohdmitx.yaml | 54 + + .../bindings/sound/amlogic,gx-sound-card.yaml | 1 - + .../bindings/sound/asahi-kasei,ak4104.yaml | 49 + + .../sound/{ak4375.yaml => asahi-kasei,ak4375.yaml} | 2 +- + .../bindings/sound/asahi-kasei,ak4554.yaml | 27 + + .../sound/{ak4613.yaml => asahi-kasei,ak4613.yaml} | 2 +- + .../bindings/sound/asahi-kasei,ak4619.yaml | 62 + + .../sound/{ak4642.yaml => asahi-kasei,ak4642.yaml} | 2 +- + .../bindings/sound/audio-graph-card2.yaml | 5 + + .../bindings/sound/audio-graph-port.yaml | 9 + + .../devicetree/bindings/sound/cirrus,cs530x.yaml | 85 + + .../devicetree/bindings/sound/everest,es7134.txt | 15 - + .../devicetree/bindings/sound/everest,es71x4.yaml | 62 + + .../devicetree/bindings/sound/everest,es7241.txt | 28 - + .../devicetree/bindings/sound/everest,es7241.yaml | 67 + + .../devicetree/bindings/sound/everest,es8316.yaml | 7 +- + .../devicetree/bindings/sound/fsl,mqs.yaml | 2 + + .../devicetree/bindings/sound/fsl,rpmsg.yaml | 1 + + .../sound/{sgtl5000.yaml => fsl,sgtl5000.yaml} | 2 +- + .../devicetree/bindings/sound/fsl,xcvr.yaml | 43 +- + .../{linux,spdif-dit.yaml => linux,spdif.yaml} | 8 +- + .../devicetree/bindings/sound/maxim,max98088.txt | 23 - + .../devicetree/bindings/sound/maxim,max98088.yaml | 47 + + .../sound/{zl38060.yaml => mscc,zl38060.yaml} | 2 +- + .../devicetree/bindings/sound/nuvoton,nau8824.yaml | 8 + + .../devicetree/bindings/sound/nxp,lpc3220-i2s.yaml | 73 + + .../devicetree/bindings/sound/omap-mcpdm.txt | 30 - + .../devicetree/bindings/sound/pcm512x.txt | 2 +- + .../bindings/sound/qcom,wcd937x-sdw.yaml | 91 + + .../devicetree/bindings/sound/qcom,wcd937x.yaml | 82 + + .../devicetree/bindings/sound/qcom,wsa883x.yaml | 8 + + .../devicetree/bindings/sound/qcom,wsa8840.yaml | 8 + + .../sound/{rt1019.yaml => realtek,rt1019.yaml} | 2 +- + .../devicetree/bindings/sound/realtek,rt5514.yaml | 70 + + .../devicetree/bindings/sound/realtek,rt5631.yaml | 67 + + .../devicetree/bindings/sound/realtek,rt5645.yaml | 131 + + .../devicetree/bindings/sound/realtek,rt5659.yaml | 129 + + .../devicetree/bindings/sound/realtek,rt5677.yaml | 135 + + Documentation/devicetree/bindings/sound/rt5514.txt | 37 - + Documentation/devicetree/bindings/sound/rt5631.txt | 48 - + Documentation/devicetree/bindings/sound/rt5645.txt | 82 - + Documentation/devicetree/bindings/sound/rt5659.txt | 89 - + Documentation/devicetree/bindings/sound/rt5677.txt | 78 - + .../bindings/sound/samsung,midas-audio.yaml | 33 + + .../bindings/sound/simple-audio-mux.yaml | 6 + + .../devicetree/bindings/sound/spdif-receiver.txt | 10 - + .../devicetree/bindings/sound/tas571x.txt | 49 - + .../devicetree/bindings/sound/ti,omap4-mcpdm.yaml | 73 + + .../sound/{tas2562.yaml => ti,tas2562.yaml} | 2 +- + .../sound/{tas2770.yaml => ti,tas2770.yaml} | 2 +- + .../sound/{tas27xx.yaml => ti,tas27xx.yaml} | 2 +- + .../devicetree/bindings/sound/ti,tas57xx.yaml | 133 + + .../sound/{tas5805m.yaml => ti,tas5805m.yaml} | 2 +- + .../bindings/sound/ti,tlv320adc3xxx.yaml | 32 +- + .../{tlv320adcx140.yaml => ti,tlv320adcx140.yaml} | 2 +- + .../sound/{wm8750.yaml => wlf,wm8750.yaml} | 2 +- + .../devicetree/bindings/sound/wlf,wm8782.yaml | 47 + + .../devicetree/bindings/sound/wlf,wm8804.yaml | 58 + + Documentation/devicetree/bindings/sound/wm8782.txt | 24 - + Documentation/devicetree/bindings/sound/wm8804.txt | 25 - + MAINTAINERS | 20 +- + drivers/acpi/utils.c | 16 +- + drivers/firmware/cirrus/cs_dsp.c | 3 + + drivers/soundwire/slave.c | 13 +- + include/dt-bindings/sound/audio-graph.h | 26 + + include/linux/acpi.h | 1 + + include/linux/firmware/mediatek/mtk-adsp-ipc.h | 2 +- + include/sound/cs35l41.h | 4 +- + include/sound/cs35l56.h | 11 +- + include/sound/rt1318.h | 16 + + include/sound/simple_card_utils.h | 8 +- + include/sound/soc-dai.h | 36 +- + include/sound/soc-topology.h | 2 +- + include/sound/soc.h | 19 +- + include/sound/sof.h | 1 + + include/sound/tas2781-dsp.h | 11 +- + include/sound/tas2781.h | 1 + + scripts/const_structs.checkpatch | 1 + + sound/hda/intel-sdw-acpi.c | 6 +- + sound/soc/amd/acp/acp-i2s.c | 19 +- + sound/soc/amd/acp/acp-legacy-common.c | 1 + + sound/soc/amd/acp/acp-pci.c | 1 + + sound/soc/amd/acp/acp-pdm.c | 1 + + sound/soc/amd/acp/acp-platform.c | 14 + + sound/soc/amd/acp/acp-rembrandt.c | 7 +- + sound/soc/amd/acp/acp-renoir.c | 2 - + sound/soc/amd/acp/acp63.c | 7 +- + sound/soc/amd/acp/acp70.c | 2 - + sound/soc/amd/acp/amd.h | 3 +- + sound/soc/amd/ps/ps-mach.c | 1 + + sound/soc/amd/renoir/acp3x-rn.c | 1 + + sound/soc/amd/yc/acp6x-mach.c | 1 + + sound/soc/codecs/Kconfig | 56 + + sound/soc/codecs/Makefile | 19 + + sound/soc/codecs/adau7118.c | 6 +- + sound/soc/codecs/ak4118.c | 1 - + sound/soc/codecs/ak4458.c | 1 - + sound/soc/codecs/ak4613.c | 2 +- + sound/soc/codecs/ak4619.c | 912 ++++++ + sound/soc/codecs/aw87390.c | 2 +- + sound/soc/codecs/aw88261.c | 2 +- + sound/soc/codecs/aw88395/aw88395.c | 4 +- + sound/soc/codecs/aw88399.c | 4 +- + sound/soc/codecs/cs35l41-lib.c | 4 +- + sound/soc/codecs/cs35l41.c | 3 +- + sound/soc/codecs/cs35l56-sdw.c | 75 - + sound/soc/codecs/cs35l56-shared.c | 133 +- + sound/soc/codecs/cs35l56.c | 205 +- + sound/soc/codecs/cs35l56.h | 2 - + sound/soc/codecs/cs530x-i2c.c | 72 + + sound/soc/codecs/cs530x.c | 966 +++++++ + sound/soc/codecs/cs530x.h | 223 ++ + sound/soc/codecs/cs53l30.c | 1 - + sound/soc/codecs/cx2072x.c | 5 - + sound/soc/codecs/da7213.c | 2 +- + sound/soc/codecs/es8311.c | 973 +++++++ + sound/soc/codecs/es8311.h | 162 ++ + sound/soc/codecs/es8326.c | 58 +- + sound/soc/codecs/framer-codec.c | 2 +- + sound/soc/codecs/hdmi-codec.c | 2 +- + sound/soc/codecs/idt821034.c | 2 +- + sound/soc/codecs/lpass-macro-common.c | 23 + + sound/soc/codecs/lpass-macro-common.h | 36 + + sound/soc/codecs/lpass-rx-macro.c | 606 ++-- + sound/soc/codecs/lpass-tx-macro.c | 2 +- + sound/soc/codecs/lpass-va-macro.c | 31 +- + sound/soc/codecs/lpass-wsa-macro.c | 646 ++++- + sound/soc/codecs/max98088.c | 10 +- + sound/soc/codecs/max98390.c | 1 - + sound/soc/codecs/max98504.c | 6 +- + sound/soc/codecs/mt6358.c | 38 +- + sound/soc/codecs/nau8822.c | 76 +- + sound/soc/codecs/nau8822.h | 1 + + sound/soc/codecs/nau8824.c | 21 +- + sound/soc/codecs/nau8824.h | 1 + + sound/soc/codecs/pcm3168a.c | 3 +- + sound/soc/codecs/pcm512x-i2c.c | 2 + + sound/soc/codecs/pcm512x-spi.c | 2 + + sound/soc/codecs/pcm6240.c | 6 +- + sound/soc/codecs/peb2466.c | 2 +- + sound/soc/codecs/rk817_codec.c | 1 - + sound/soc/codecs/rt1318.c | 1354 +++++++++ + sound/soc/codecs/rt1318.h | 342 +++ + sound/soc/codecs/rt1320-sdw.c | 2260 +++++++++++++++ + sound/soc/codecs/rt1320-sdw.h | 94 + + sound/soc/codecs/rt711-sdca.c | 72 + + sound/soc/codecs/rt711-sdca.h | 1 + + sound/soc/codecs/rt712-sdca-sdw.c | 36 +- + sound/soc/codecs/rt712-sdca-sdw.h | 95 +- + sound/soc/codecs/rt712-sdca.c | 665 ++++- + sound/soc/codecs/rt712-sdca.h | 48 +- + sound/soc/codecs/simple-mux.c | 55 +- + 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 | 13 +- + sound/soc/codecs/tas2781-fmwlib.c | 18 +- + sound/soc/codecs/tas2781-i2c.c | 59 +- + sound/soc/codecs/tlv320adc3xxx.c | 106 +- + sound/soc/codecs/tlv320adcx140.c | 1 - + sound/soc/codecs/tlv320aic31xx.c | 1 - + sound/soc/codecs/ts3a227e.c | 1 - + sound/soc/codecs/wcd-mbhc-v2.c | 4 +- + sound/soc/codecs/wcd-mbhc-v2.h | 4 +- + sound/soc/codecs/wcd9335.c | 106 +- + sound/soc/codecs/wcd934x.c | 50 +- + sound/soc/codecs/wcd937x-sdw.c | 1139 ++++++++ + sound/soc/codecs/wcd937x.c | 3024 ++++++++++++++++++++ + sound/soc/codecs/wcd937x.h | 624 ++++ + sound/soc/codecs/wcd938x-sdw.c | 4 +- + sound/soc/codecs/wcd938x.c | 36 +- + sound/soc/codecs/wcd938x.h | 10 +- + sound/soc/codecs/wcd939x-sdw.c | 4 +- + sound/soc/codecs/wcd939x.c | 63 +- + sound/soc/codecs/wcd939x.h | 18 +- + sound/soc/codecs/wm0010.c | 8 - + sound/soc/codecs/wsa883x.c | 9 +- + sound/soc/codecs/wsa884x.c | 8 + + sound/soc/fsl/Kconfig | 8 + + sound/soc/fsl/Makefile | 2 + + sound/soc/fsl/fsl_aud2htx.c | 11 +- + sound/soc/fsl/fsl_audmix.c | 16 +- + sound/soc/fsl/fsl_easrc.c | 10 +- + sound/soc/fsl/fsl_mqs.c | 46 +- + sound/soc/fsl/fsl_rpmsg.c | 9 + + sound/soc/fsl/fsl_sai.c | 141 +- + sound/soc/fsl/fsl_sai.h | 4 +- + sound/soc/fsl/fsl_xcvr.c | 136 +- + sound/soc/fsl/fsl_xcvr.h | 91 + + sound/soc/fsl/imx-audmix.c | 79 +- + sound/soc/fsl/imx-es8328.c | 1 - + sound/soc/fsl/imx-pcm-fiq.c | 1 + + sound/soc/fsl/imx-rpmsg.c | 2 - + sound/soc/fsl/lpc3xxx-i2s.c | 375 +++ + sound/soc/fsl/lpc3xxx-i2s.h | 80 + + sound/soc/fsl/lpc3xxx-pcm.c | 72 + + sound/soc/generic/audio-graph-card.c | 108 +- + .../soc/generic/audio-graph-card2-custom-sample.c | 3 +- + sound/soc/generic/audio-graph-card2.c | 184 +- + sound/soc/generic/simple-card-utils.c | 120 +- + sound/soc/generic/simple-card.c | 66 +- + sound/soc/generic/test-component.c | 2 +- + sound/soc/intel/avs/boards/es8336.c | 8 +- + sound/soc/intel/avs/pcm.c | 4 +- + sound/soc/intel/avs/topology.c | 2 +- + sound/soc/intel/boards/Kconfig | 2 + + sound/soc/intel/boards/bdw-rt5650.c | 2 +- + sound/soc/intel/boards/ehl_rt5660.c | 2 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 4 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 6 +- + sound/soc/intel/boards/kbl_rt5660.c | 2 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 8 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 6 +- + sound/soc/intel/boards/sof_board_helpers.h | 2 - + sound/soc/intel/boards/sof_da7219.c | 57 +- + sound/soc/intel/boards/sof_es8336.c | 2 +- + sound/soc/intel/boards/sof_maxim_common.c | 114 +- + sound/soc/intel/boards/sof_nau8825.c | 2 +- + sound/soc/intel/boards/sof_realtek_common.c | 2 +- + sound/soc/intel/boards/sof_rt5682.c | 2 +- + sound/soc/intel/boards/sof_sdw.c | 58 +- + sound/soc/intel/boards/sof_sdw_common.h | 6 +- + sound/soc/intel/boards/sof_sdw_cs42l42.c | 11 +- + sound/soc/intel/boards/sof_sdw_rt5682.c | 11 +- + sound/soc/intel/boards/sof_sdw_rt700.c | 11 +- + sound/soc/intel/boards/sof_sdw_rt711.c | 11 +- + sound/soc/intel/boards/sof_sdw_rt_amp.c | 2 +- + sound/soc/intel/boards/sof_sdw_rt_dmic.c | 14 +- + .../soc/intel/boards/sof_sdw_rt_sdca_jack_common.c | 11 +- + sound/soc/intel/boards/sof_wm8804.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-arl-match.c | 50 + + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 50 + + sound/soc/intel/skylake/skl-topology.c | 2 +- + sound/soc/meson/axg-fifo.c | 2 +- + sound/soc/meson/axg-frddr.c | 4 +- + sound/soc/meson/axg-tdm.h | 2 +- + sound/soc/meson/axg-toddr.c | 4 +- + sound/soc/qcom/common.c | 35 + + sound/soc/qcom/common.h | 3 + + sound/soc/qcom/lpass-cpu.c | 4 + + sound/soc/qcom/qdsp6/audioreach.c | 30 +- + sound/soc/qcom/qdsp6/audioreach.h | 2 +- + sound/soc/qcom/qdsp6/q6afe-dai.c | 16 +- + sound/soc/qcom/qdsp6/q6apm-dai.c | 3 + + sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 21 +- + sound/soc/qcom/qdsp6/topology.c | 28 +- + sound/soc/qcom/sc8280xp.c | 15 + + sound/soc/qcom/x1e80100.c | 38 + + sound/soc/rockchip/rockchip_i2s.c | 1 - + sound/soc/rockchip/rockchip_spdif.c | 1 - + sound/soc/samsung/Kconfig | 2 +- + sound/soc/samsung/aries_wm8994.c | 2 +- + sound/soc/samsung/midas_wm1811.c | 350 ++- + sound/soc/sh/fsi.c | 2 +- + sound/soc/sh/rcar/core.c | 2 +- + sound/soc/soc-core.c | 4 +- + sound/soc/soc-dai.c | 18 +- + sound/soc/soc-pcm.c | 26 +- + sound/soc/soc-topology.c | 4 +- + sound/soc/soc-utils.c | 19 +- + sound/soc/sof/intel/hda.c | 4 +- + sound/soc/sof/intel/pci-tgl.c | 4 +- + sound/soc/sof/ipc3-topology.c | 14 +- + sound/soc/sof/ipc4-topology.c | 42 +- + sound/soc/sof/mediatek/mt8186/mt8186.c | 2 +- + sound/soc/sof/mediatek/mt8195/mt8195.c | 2 +- + sound/soc/sof/sof-audio.c | 20 +- + sound/soc/sof/sof-audio.h | 9 +- + sound/soc/sof/topology.c | 4 +- + sound/soc/tegra/tegra210_i2s.c | 71 +- + sound/soc/tegra/tegra210_i2s.h | 2 + + 275 files changed, 18638 insertions(+), 2584 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/ak4104.txt + delete mode 100644 Documentation/devicetree/bindings/sound/ak4554.txt + delete mode 100644 Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.txt + create mode 100644 Documentation/devicetree/bindings/sound/amlogic,g12a-tohdmitx.yaml + create mode 100644 Documentation/devicetree/bindings/sound/asahi-kasei,ak4104.yaml + rename Documentation/devicetree/bindings/sound/{ak4375.yaml => asahi-kasei,ak4375.yaml} (94%) + create mode 100644 Documentation/devicetree/bindings/sound/asahi-kasei,ak4554.yaml + rename Documentation/devicetree/bindings/sound/{ak4613.yaml => asahi-kasei,ak4613.yaml} (94%) + create mode 100644 Documentation/devicetree/bindings/sound/asahi-kasei,ak4619.yaml + rename Documentation/devicetree/bindings/sound/{ak4642.yaml => asahi-kasei,ak4642.yaml} (94%) + create mode 100644 Documentation/devicetree/bindings/sound/cirrus,cs530x.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/everest,es7134.txt + create mode 100644 Documentation/devicetree/bindings/sound/everest,es71x4.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/everest,es7241.txt + create mode 100644 Documentation/devicetree/bindings/sound/everest,es7241.yaml + rename Documentation/devicetree/bindings/sound/{sgtl5000.yaml => fsl,sgtl5000.yaml} (97%) + rename Documentation/devicetree/bindings/sound/{linux,spdif-dit.yaml => linux,spdif.yaml} (75%) + delete mode 100644 Documentation/devicetree/bindings/sound/maxim,max98088.txt + create mode 100644 Documentation/devicetree/bindings/sound/maxim,max98088.yaml + rename Documentation/devicetree/bindings/sound/{zl38060.yaml => mscc,zl38060.yaml} (96%) + create mode 100644 Documentation/devicetree/bindings/sound/nxp,lpc3220-i2s.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/omap-mcpdm.txt + create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd937x-sdw.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd937x.yaml + rename Documentation/devicetree/bindings/sound/{rt1019.yaml => realtek,rt1019.yaml} (90%) + create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5514.yaml + create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5631.yaml + create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5645.yaml + create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5659.yaml + create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5677.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/rt5514.txt + delete mode 100644 Documentation/devicetree/bindings/sound/rt5631.txt + delete mode 100644 Documentation/devicetree/bindings/sound/rt5645.txt + delete mode 100644 Documentation/devicetree/bindings/sound/rt5659.txt + delete mode 100644 Documentation/devicetree/bindings/sound/rt5677.txt + delete mode 100644 Documentation/devicetree/bindings/sound/spdif-receiver.txt + delete mode 100644 Documentation/devicetree/bindings/sound/tas571x.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,omap4-mcpdm.yaml + rename Documentation/devicetree/bindings/sound/{tas2562.yaml => ti,tas2562.yaml} (97%) + rename Documentation/devicetree/bindings/sound/{tas2770.yaml => ti,tas2770.yaml} (97%) + rename Documentation/devicetree/bindings/sound/{tas27xx.yaml => ti,tas27xx.yaml} (97%) + create mode 100644 Documentation/devicetree/bindings/sound/ti,tas57xx.yaml + rename Documentation/devicetree/bindings/sound/{tas5805m.yaml => ti,tas5805m.yaml} (95%) + rename Documentation/devicetree/bindings/sound/{tlv320adcx140.yaml => ti,tlv320adcx140.yaml} (99%) + rename Documentation/devicetree/bindings/sound/{wm8750.yaml => wlf,wm8750.yaml} (92%) + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8782.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8804.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8782.txt + delete mode 100644 Documentation/devicetree/bindings/sound/wm8804.txt + create mode 100644 include/dt-bindings/sound/audio-graph.h + create mode 100644 include/sound/rt1318.h + create mode 100644 sound/soc/codecs/ak4619.c + create mode 100644 sound/soc/codecs/cs530x-i2c.c + create mode 100644 sound/soc/codecs/cs530x.c + create mode 100644 sound/soc/codecs/cs530x.h + create mode 100644 sound/soc/codecs/es8311.c + create mode 100644 sound/soc/codecs/es8311.h + create mode 100644 sound/soc/codecs/rt1318.c + create mode 100644 sound/soc/codecs/rt1318.h + create mode 100644 sound/soc/codecs/rt1320-sdw.c + create mode 100644 sound/soc/codecs/rt1320-sdw.h + create mode 100644 sound/soc/codecs/wcd937x-sdw.c + create mode 100644 sound/soc/codecs/wcd937x.c + create mode 100644 sound/soc/codecs/wcd937x.h + create mode 100644 sound/soc/fsl/lpc3xxx-i2s.c + create mode 100644 sound/soc/fsl/lpc3xxx-i2s.h + create mode 100644 sound/soc/fsl/lpc3xxx-pcm.c +Merging modules/modules-next (61842868de13 module: create weak dependecies) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging include/linux/module.h +Merge made by the 'ort' strategy. + include/linux/module.h | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging input/next (7c459517252e Input: ili210x - use guard notation when disabling and reenabling IRQ) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/joystick/xpad.c +Auto-merging drivers/input/serio/ambakmi.c +Auto-merging drivers/input/touchscreen/ads7846.c +Auto-merging drivers/input/touchscreen/ili210x.c +Auto-merging include/linux/interrupt.h +CONFLICT (content): Merge conflict in include/linux/interrupt.h +Resolved 'include/linux/interrupt.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master db67a5b65ab4] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/input/touchscreen/ads7846.txt | 1 + + .../bindings/input/touchscreen/edt-ft5x06.yaml | 1 + + .../bindings/input/touchscreen/ektf2127.txt | 25 --- + .../bindings/input/touchscreen/elan,ektf2127.yaml | 58 ++++++ + drivers/input/gameport/emu10k1-gp.c | 2 +- + drivers/input/gameport/fm801-gp.c | 2 +- + drivers/input/gameport/gameport.c | 2 +- + drivers/input/gameport/ns558.c | 4 +- + drivers/input/joystick/a3d.c | 2 +- + drivers/input/joystick/adc-joystick.c | 130 ++++++++------ + drivers/input/joystick/adi.c | 2 +- + drivers/input/joystick/analog.c | 3 +- + drivers/input/joystick/as5011.c | 2 +- + drivers/input/joystick/cobra.c | 2 +- + drivers/input/joystick/db9.c | 2 +- + drivers/input/joystick/gamecon.c | 2 +- + drivers/input/joystick/gf2k.c | 2 +- + drivers/input/joystick/grip.c | 3 +- + drivers/input/joystick/grip_mp.c | 3 +- + drivers/input/joystick/guillemot.c | 2 +- + drivers/input/joystick/interact.c | 2 +- + drivers/input/joystick/magellan.c | 2 +- + drivers/input/joystick/maplecontrol.c | 2 +- + drivers/input/joystick/n64joy.c | 2 +- + drivers/input/joystick/sidewinder.c | 2 +- + drivers/input/joystick/spaceball.c | 2 +- + drivers/input/joystick/spaceorb.c | 2 +- + drivers/input/joystick/stinger.c | 2 +- + drivers/input/joystick/tmdc.c | 3 +- + drivers/input/joystick/turbografx.c | 2 +- + drivers/input/joystick/twidjoy.c | 2 +- + drivers/input/joystick/warrior.c | 2 +- + drivers/input/joystick/xpad.c | 4 +- + drivers/input/joystick/zhenhua.c | 2 +- + drivers/input/keyboard/atkbd.c | 2 +- + drivers/input/keyboard/cap11xx.c | 125 +++++++------ + drivers/input/keyboard/lkkbd.c | 2 +- + drivers/input/keyboard/locomokbd.c | 2 +- + drivers/input/keyboard/maple_keyb.c | 2 +- + drivers/input/keyboard/newtonkbd.c | 2 +- + drivers/input/keyboard/qt1050.c | 7 +- + drivers/input/keyboard/stowaway.c | 2 +- + drivers/input/keyboard/sunkbd.c | 2 +- + drivers/input/keyboard/xtkbd.c | 2 +- + drivers/input/matrix-keymap.c | 1 + + drivers/input/misc/88pm80x_onkey.c | 2 +- + drivers/input/misc/adxl34x-i2c.c | 9 +- + drivers/input/misc/adxl34x-spi.c | 9 +- + drivers/input/misc/adxl34x.c | 159 ++++++---------- + drivers/input/misc/adxl34x.h | 2 +- + drivers/input/misc/cma3000_d0x.c | 2 +- + drivers/input/misc/ims-pcu.c | 199 ++++++++++----------- + drivers/input/misc/max8997_haptic.c | 2 +- + drivers/input/misc/pcap_keys.c | 2 +- + drivers/input/misc/powermate.c | 2 +- + drivers/input/misc/sgi_btns.c | 1 + + drivers/input/misc/soc_button_array.c | 1 + + drivers/input/misc/uinput.c | 2 +- + drivers/input/misc/yealink.c | 2 +- + drivers/input/mouse/alps.c | 2 +- + drivers/input/mouse/appletouch.c | 2 +- + drivers/input/mouse/bcm5974.c | 2 +- + drivers/input/mouse/cypress_ps2.c | 2 +- + drivers/input/mouse/focaltech.c | 3 +- + drivers/input/mouse/hgpk.c | 2 +- + drivers/input/mouse/lifebook.c | 2 +- + drivers/input/mouse/maplemouse.c | 2 +- + drivers/input/mouse/psmouse-base.c | 2 +- + drivers/input/mouse/sentelic.c | 2 +- + drivers/input/mouse/sermouse.c | 2 +- + drivers/input/mouse/synaptics.c | 4 +- + drivers/input/mouse/synaptics_i2c.c | 2 +- + drivers/input/mouse/vsxxxaa.c | 2 +- + drivers/input/serio/altera_ps2.c | 2 +- + drivers/input/serio/ambakmi.c | 4 +- + drivers/input/serio/apbps2.c | 2 +- + drivers/input/serio/arc_ps2.c | 2 +- + drivers/input/serio/ct82c710.c | 2 +- + drivers/input/serio/gscps2.c | 4 +- + drivers/input/serio/hyperv-keyboard.c | 4 +- + drivers/input/serio/i8042.c | 4 +- + drivers/input/serio/maceps2.c | 2 +- + drivers/input/serio/olpc_apsp.c | 4 +- + drivers/input/serio/parkbd.c | 2 +- + drivers/input/serio/pcips2.c | 4 +- + drivers/input/serio/ps2-gpio.c | 4 +- + drivers/input/serio/ps2mult.c | 2 +- + drivers/input/serio/q40kbd.c | 4 +- + drivers/input/serio/rpckbd.c | 2 +- + drivers/input/serio/sa1111ps2.c | 4 +- + drivers/input/serio/serio.c | 2 +- + drivers/input/serio/serio_raw.c | 4 +- + drivers/input/serio/serport.c | 4 +- + drivers/input/serio/sun4i-ps2.c | 4 +- + drivers/input/serio/userio.c | 4 +- + drivers/input/serio/xilinx_ps2.c | 4 +- + drivers/input/tablet/acecad.c | 2 +- + drivers/input/tablet/aiptek.c | 2 +- + drivers/input/tablet/hanwang.c | 2 +- + drivers/input/tablet/kbtab.c | 2 +- + drivers/input/tablet/wacom_serial4.c | 2 +- + drivers/input/tests/input_test.c | 1 + + drivers/input/touchscreen/ads7846.c | 35 +++- + drivers/input/touchscreen/cyttsp_i2c_common.c | 1 + + drivers/input/touchscreen/da9052_tsi.c | 2 +- + drivers/input/touchscreen/dynapro.c | 2 +- + drivers/input/touchscreen/edt-ft5x06.c | 1 + + drivers/input/touchscreen/egalax_ts_serial.c | 2 +- + drivers/input/touchscreen/ektf2127.c | 36 +++- + drivers/input/touchscreen/elo.c | 2 +- + drivers/input/touchscreen/fujitsu_ts.c | 2 +- + drivers/input/touchscreen/goodix_berlin_spi.c | 24 +-- + drivers/input/touchscreen/gunze.c | 2 +- + drivers/input/touchscreen/hampshire.c | 2 +- + drivers/input/touchscreen/ili210x.c | 127 ++++++------- + drivers/input/touchscreen/inexio.c | 2 +- + drivers/input/touchscreen/mtouch.c | 2 +- + drivers/input/touchscreen/penmount.c | 2 +- + drivers/input/touchscreen/rohm_bu21023.c | 95 ++++------ + drivers/input/touchscreen/sur40.c | 2 +- + drivers/input/touchscreen/touchit213.c | 2 +- + drivers/input/touchscreen/touchright.c | 2 +- + drivers/input/touchscreen/touchwin.c | 2 +- + drivers/input/touchscreen/tsc40.c | 2 +- + drivers/input/touchscreen/usbtouchscreen.c | 15 +- + drivers/input/touchscreen/wacom_w8001.c | 37 ++-- + drivers/input/vivaldi-fmap.c | 1 + + include/linux/interrupt.h | 4 + + 128 files changed, 699 insertions(+), 647 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/ektf2127.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/elan,ektf2127.yaml +Merging block/for-next (5b3974db2723 Merge branch 'for-6.11/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging MAINTAINERS +Auto-merging arch/m68k/emu/nfblock.c +Auto-merging drivers/md/bcache/super.c +Auto-merging drivers/s390/block/dcssblk.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging fs/aio.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/stat.c +CONFLICT (content): Merge conflict in fs/stat.c +Auto-merging include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +Auto-merging include/linux/io_uring_types.h +Auto-merging include/linux/socket.h +Auto-merging include/uapi/linux/fs.h +Auto-merging io_uring/io_uring.c +Auto-merging io_uring/net.c +Auto-merging io_uring/rsrc.c +Resolved 'fs/stat.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 +[master 0eb184358320] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-block | 53 ++ + Documentation/block/data-integrity.rst | 49 +- + Documentation/block/writeback_cache_control.rst | 69 +-- + MAINTAINERS | 16 +- + arch/m68k/emu/nfblock.c | 1 + + arch/um/drivers/ubd_kern.c | 53 +- + arch/xtensa/platforms/iss/simdisk.c | 5 +- + block/Kconfig | 8 +- + block/Makefile | 3 +- + block/bdev.c | 38 +- + block/bfq-cgroup.c | 51 -- + block/bfq-iosched.c | 46 +- + block/bfq-iosched.h | 3 - + block/bio-integrity.c | 126 ++--- + block/blk-cgroup.h | 13 - + block/blk-core.c | 40 +- + block/blk-flush.c | 36 +- + block/blk-integrity.c | 228 +++------ + block/blk-map.c | 2 +- + block/blk-merge.c | 67 ++- + block/blk-mq-debugfs.c | 13 - + block/blk-mq.c | 89 ++-- + block/blk-settings.c | 543 +++++++++----------- + block/blk-sysfs.c | 434 ++++++++-------- + block/blk-throttle.c | 3 + + block/blk-wbt.c | 22 +- + block/blk-zoned.c | 38 +- + block/blk.h | 18 +- + block/elevator.c | 9 +- + block/elevator.h | 4 +- + block/fops.c | 25 +- + block/genhd.c | 2 +- + block/mq-deadline.c | 20 +- + block/t10-pi.c | 298 ++++++----- + drivers/ata/libata-scsi.c | 3 +- + drivers/ata/pata_macio.c | 4 +- + drivers/block/Kconfig | 9 + + drivers/block/Makefile | 3 + + drivers/block/amiflop.c | 6 +- + drivers/block/aoe/aoeblk.c | 1 + + drivers/block/ataflop.c | 6 +- + drivers/block/brd.c | 7 +- + drivers/block/drbd/drbd_main.c | 6 +- + drivers/block/floppy.c | 3 +- + drivers/block/loop.c | 169 +++---- + drivers/block/mtip32xx/mtip32xx.c | 2 - + drivers/block/n64cart.c | 2 - + drivers/block/nbd.c | 26 +- + drivers/block/null_blk/main.c | 15 +- + drivers/block/null_blk/zoned.c | 5 +- + drivers/block/pktcdvd.c | 1 + + drivers/block/ps3disk.c | 8 +- + drivers/block/rbd.c | 15 +- + drivers/block/rnbd/rnbd-clt.c | 16 +- + drivers/block/rnull.rs | 73 +++ + drivers/block/sunvdc.c | 1 + + drivers/block/swim.c | 5 +- + drivers/block/swim3.c | 5 +- + drivers/block/ublk_drv.c | 21 +- + drivers/block/virtio_blk.c | 37 +- + drivers/block/xen-blkfront.c | 73 ++- + drivers/block/z2ram.c | 1 + + drivers/block/zram/zram_drv.c | 6 +- + drivers/cdrom/cdrom.c | 1 + + drivers/cdrom/gdrom.c | 1 + + drivers/md/bcache/super.c | 13 +- + drivers/md/dm-cache-target.c | 1 - + drivers/md/dm-clone-target.c | 1 - + drivers/md/dm-core.h | 1 - + drivers/md/dm-crypt.c | 4 +- + drivers/md/dm-integrity.c | 47 +- + drivers/md/dm-raid.c | 2 +- + drivers/md/dm-table.c | 351 +++---------- + drivers/md/dm-zone.c | 208 ++++++-- + drivers/md/dm-zoned-target.c | 2 +- + drivers/md/dm.c | 15 +- + drivers/md/dm.h | 1 + + drivers/md/md-bitmap.c | 6 +- + drivers/md/md.c | 630 +++++++++++++----------- + drivers/md/md.h | 132 ++++- + drivers/md/raid0.c | 30 +- + drivers/md/raid1.c | 34 +- + drivers/md/raid10.c | 23 +- + drivers/md/raid5.c | 38 +- + drivers/mmc/core/block.c | 42 +- + drivers/mmc/core/queue.c | 20 +- + drivers/mmc/core/queue.h | 3 +- + drivers/mtd/mtd_blkdevs.c | 9 +- + drivers/nvdimm/btt.c | 17 +- + drivers/nvdimm/pmem.c | 14 +- + drivers/nvme/host/Kconfig | 1 - + drivers/nvme/host/core.c | 159 ++++-- + drivers/nvme/host/multipath.c | 23 +- + drivers/nvme/host/pci.c | 6 +- + drivers/nvme/host/zns.c | 3 +- + drivers/nvme/target/Kconfig | 1 - + drivers/nvme/target/io-cmd-bdev.c | 16 +- + drivers/s390/block/dasd_genhd.c | 1 - + drivers/s390/block/dcssblk.c | 2 +- + drivers/s390/block/scm_blk.c | 5 - + drivers/scsi/Kconfig | 1 - + drivers/scsi/iscsi_tcp.c | 8 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 2 - + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 6 - + drivers/scsi/scsi_debug.c | 588 +++++++++++++++++----- + drivers/scsi/scsi_lib.c | 9 +- + drivers/scsi/scsi_trace.c | 22 + + drivers/scsi/sd.c | 369 ++++++++------ + drivers/scsi/sd.h | 31 +- + drivers/scsi/sd_dif.c | 45 +- + drivers/scsi/sd_zbc.c | 52 +- + drivers/scsi/sr.c | 42 +- + drivers/target/target_core_iblock.c | 53 +- + drivers/ufs/core/ufshcd.c | 10 +- + fs/aio.c | 8 +- + fs/btrfs/ioctl.c | 2 +- + fs/read_write.c | 18 +- + fs/stat.c | 50 +- + include/linux/blk-integrity.h | 87 ++-- + include/linux/blk_types.h | 8 +- + include/linux/blkdev.h | 350 ++++++++----- + include/linux/fs.h | 20 +- + include/linux/io_uring_types.h | 14 +- + include/linux/socket.h | 3 + + include/linux/stat.h | 3 + + include/linux/t10-pi.h | 20 +- + include/scsi/scsi_proto.h | 1 + + include/trace/events/block.h | 41 +- + include/trace/events/scsi.h | 1 + + include/uapi/linux/fs.h | 5 +- + include/uapi/linux/io_uring.h | 2 + + include/uapi/linux/stat.h | 10 +- + io_uring/Makefile | 6 +- + io_uring/advise.c | 16 +- + io_uring/eventfd.c | 160 ++++++ + io_uring/eventfd.h | 8 + + io_uring/io-wq.c | 19 +- + io_uring/io-wq.h | 2 +- + io_uring/io_uring.c | 154 +++--- + io_uring/io_uring.h | 9 +- + io_uring/msg_ring.c | 134 +++-- + io_uring/msg_ring.h | 1 + + io_uring/net.c | 84 +++- + io_uring/net.h | 6 + + io_uring/opdef.c | 34 ++ + io_uring/opdef.h | 4 +- + io_uring/register.c | 65 +-- + io_uring/rsrc.c | 65 +-- + io_uring/rw.c | 9 +- + net/socket.c | 48 +- + rust/bindings/bindings_helper.h | 5 + + rust/helpers.c | 16 + + rust/kernel/block.rs | 5 + + rust/kernel/block/mq.rs | 98 ++++ + rust/kernel/block/mq/gen_disk.rs | 198 ++++++++ + rust/kernel/block/mq/operations.rs | 245 +++++++++ + rust/kernel/block/mq/raw_writer.rs | 55 +++ + rust/kernel/block/mq/request.rs | 253 ++++++++++ + rust/kernel/block/mq/tag_set.rs | 86 ++++ + rust/kernel/error.rs | 6 + + rust/kernel/lib.rs | 2 + + 161 files changed, 5022 insertions(+), 3469 deletions(-) + create mode 100644 drivers/block/rnull.rs + create mode 100644 io_uring/eventfd.c + create mode 100644 io_uring/eventfd.h + create mode 100644 rust/kernel/block.rs + create mode 100644 rust/kernel/block/mq.rs + create mode 100644 rust/kernel/block/mq/gen_disk.rs + create mode 100644 rust/kernel/block/mq/operations.rs + create mode 100644 rust/kernel/block/mq/raw_writer.rs + create mode 100644 rust/kernel/block/mq/request.rs + create mode 100644 rust/kernel/block/mq/tag_set.rs +Merging device-mapper/for-next (92b14c0230ff dm verity: add support for signature verification with platform keyring) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Merge made by the 'ort' strategy. + drivers/md/Kconfig | 10 + + drivers/md/dm-cache-metadata.c | 9 - + drivers/md/dm-core.h | 2 + + drivers/md/dm-init.c | 4 +- + drivers/md/dm-io.c | 84 +++---- + drivers/md/dm-linear.c | 1 + + drivers/md/dm-raid.c | 7 +- + drivers/md/dm-stripe.c | 1 + + drivers/md/dm-table.c | 4 + + drivers/md/dm-verity-fec.c | 32 +-- + drivers/md/dm-verity-fec.h | 6 +- + drivers/md/dm-verity-target.c | 461 ++++++++++++++++++-------------------- + drivers/md/dm-verity-verify-sig.c | 7 + + drivers/md/dm-verity.h | 39 ++-- + drivers/md/dm.c | 50 ++++- + include/linux/device-mapper.h | 15 ++ + 16 files changed, 359 insertions(+), 373 deletions(-) +Merging libata/for-next (f5a0205ad031 Merge remote-tracking branch 'libata/for-6.11' into HEAD) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/ata/ahci-fsl-qoriq.txt | 21 -------- + .../devicetree/bindings/ata/fsl,ahci.yaml | 58 ++++++++++++++++++++++ + drivers/ata/Kconfig | 2 +- + 3 files changed, 59 insertions(+), 22 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/ata/ahci-fsl-qoriq.txt + create mode 100644 Documentation/devicetree/bindings/ata/fsl,ahci.yaml +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 +Merge made by the 'ort' strategy. + drivers/pcmcia/bcm63xx_pcmcia.c | 1 - + drivers/pcmcia/i82092.c | 1 + + drivers/pcmcia/i82365.c | 1 + + drivers/pcmcia/max1600.c | 1 + + drivers/pcmcia/rsrc_mgr.c | 1 + + drivers/pcmcia/yenta_socket.c | 7 ++++--- + 6 files changed, 8 insertions(+), 4 deletions(-) +Merging mmc/next (f7e7e00f7b86 MAINTAINERS: drop entry for VIA SD/MMC controller) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/bcm/bcm2835.yaml | 6 ++ + .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 3 + + .../bindings/mmc/brcm,sdhci-brcmstb.yaml | 1 + + .../devicetree/bindings/mmc/fsl,esdhc.yaml | 105 +++++++++++++++++++++ + .../devicetree/bindings/mmc/fsl-esdhc.txt | 52 ---------- + .../devicetree/bindings/mmc/mmc-spi-slot.yaml | 16 ++-- + .../devicetree/bindings/mmc/sdhci-msm.yaml | 1 + + MAINTAINERS | 6 -- + drivers/mmc/core/core.c | 1 + + drivers/mmc/core/pwrseq_emmc.c | 1 + + drivers/mmc/core/pwrseq_sd8787.c | 1 + + drivers/mmc/core/pwrseq_simple.c | 1 + + drivers/mmc/core/sdio_uart.c | 1 + + drivers/mmc/host/Kconfig | 2 +- + drivers/mmc/host/of_mmc_spi.c | 1 + + drivers/mmc/host/renesas_sdhi_core.c | 1 + + drivers/mmc/host/sdhci-brcmstb.c | 60 ++++++++++++ + drivers/mmc/host/sdhci-of-dwcmshc.c | 1 + + drivers/mmc/host/sdhci-pci-core.c | 27 +++++- + drivers/mmc/host/sdhci.c | 31 ++---- + drivers/mmc/host/sdhci.h | 3 +- + drivers/mmc/host/tmio_mmc.h | 3 - + drivers/mmc/host/tmio_mmc_core.c | 9 +- + include/linux/mfd/tmio.h | 2 - + 24 files changed, 224 insertions(+), 111 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/fsl,esdhc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/fsl-esdhc.txt +Merging mfd/for-mfd-next (33c0e553c8c3 dt-bindings: mfd: syscon: Add APM poweroff mailbox) +$ 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/amlogic/analog-top.txt | 20 -- + .../devicetree/bindings/arm/amlogic/assist.txt | 17 -- + .../devicetree/bindings/arm/amlogic/bootrom.txt | 17 -- + .../devicetree/bindings/arm/amlogic/pmu.txt | 18 -- + .../devicetree/bindings/arm/atmel-sysregs.txt | 29 --- + Documentation/devicetree/bindings/arm/axis.txt | 16 -- + .../bindings/arm/cpu-enable-method/al,alpine-smp | 10 - + .../arm/freescale/fsl,vf610-mscm-cpucfg.txt | 14 - + .../bindings/arm/marvell/marvell,dove.txt | 15 -- + .../devicetree/bindings/arm/spear-misc.txt | 9 - + .../bindings/clock/ti-keystone-pllctrl.txt | 20 -- + .../bindings/mfd/mediatek,mt8195-scpsys.yaml | 2 + + Documentation/devicetree/bindings/mfd/mfd.txt | 15 +- + .../devicetree/bindings/mfd/qcom,pm8008.yaml | 162 +++++++----- + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 2 + + .../devicetree/bindings/mfd/rockchip,rk809.yaml | 288 --------------------- + .../devicetree/bindings/mfd/rockchip,rk817.yaml | 70 ++--- + .../devicetree/bindings/mfd/syscon-common.yaml | 71 +++++ + Documentation/devicetree/bindings/mfd/syscon.yaml | 278 +++++++++++++------- + Documentation/devicetree/bindings/mips/mscc.txt | 17 -- + .../devicetree/bindings/mtd/atmel-nand.txt | 9 - + .../bindings/net/hisilicon-hip04-net.txt | 10 - + .../bindings/soc/intel/intel,lgm-syscon.yaml | 57 ++++ + .../soc/microchip/microchip,sparx5-cpu-syscon.yaml | 49 ++++ + .../bindings/soc/sprd/sprd,sc9863a-glbregs.yaml | 55 ++++ + .../bindings/soc/ti/ti,am654-serdes-ctrl.yaml | 42 +++ + drivers/mfd/88pm800.c | 2 +- + drivers/mfd/88pm805.c | 2 +- + drivers/mfd/88pm860x-core.c | 2 +- + drivers/mfd/Kconfig | 1 + + drivers/mfd/Makefile | 6 +- + drivers/mfd/aat2870-core.c | 2 +- + drivers/mfd/act8945a.c | 2 +- + drivers/mfd/arizona-core.c | 1 + + drivers/mfd/arizona-spi.c | 9 +- + drivers/mfd/as3722.c | 4 +- + drivers/mfd/axp20x-i2c.c | 24 +- + drivers/mfd/bd9571mwv.c | 2 +- + drivers/mfd/cros_ec_dev.c | 2 + + drivers/mfd/da9055-i2c.c | 2 +- + drivers/mfd/intel-lpss-pci.c | 162 ++++++------ + drivers/mfd/intel_soc_pmic_bxtwc.c | 1 + + drivers/mfd/intel_soc_pmic_crc.c | 4 +- + drivers/mfd/lm3533-core.c | 28 +- + drivers/mfd/lp3943.c | 2 +- + drivers/mfd/lp873x.c | 4 +- + drivers/mfd/lp87565.c | 4 +- + drivers/mfd/lp8788.c | 2 +- + drivers/mfd/madera-spi.c | 9 +- + drivers/mfd/max14577.c | 2 +- + drivers/mfd/max8907.c | 2 +- + drivers/mfd/max8925-i2c.c | 4 +- + drivers/mfd/menelaus.c | 3 +- + drivers/mfd/mfd-core.c | 6 +- + drivers/mfd/mt6397-core.c | 10 + + drivers/mfd/mxs-lradc.c | 2 +- + drivers/mfd/omap-usb-host.c | 1 - + drivers/mfd/omap-usb-tll.c | 7 +- + drivers/mfd/pcf50633-gpio.c | 1 + + drivers/mfd/qcom-pm8008.c | 174 +++++++++---- + drivers/mfd/retu-mfd.c | 4 +- + drivers/mfd/rsmu_core.c | 2 + + drivers/mfd/rt4831.c | 1 + + drivers/mfd/ssbi.c | 1 + + drivers/mfd/stw481x.c | 4 +- + drivers/mfd/timberdale.c | 1 + + drivers/mfd/tps6105x.c | 4 +- + drivers/mfd/tps6507x.c | 2 +- + drivers/mfd/tps65086.c | 2 +- + drivers/mfd/tps65090.c | 4 +- + drivers/mfd/tps6586x.c | 4 +- + drivers/mfd/tps65912-core.c | 21 +- + drivers/mfd/tps65912-i2c.c | 10 +- + drivers/mfd/tps65912-spi.c | 8 - + drivers/mfd/tps6594-core.c | 2 +- + drivers/mfd/twl6040.c | 6 +- + drivers/mfd/vexpress-sysreg.c | 1 + + drivers/mfd/wl1273-core.c | 2 +- + drivers/mfd/wm8350-i2c.c | 6 +- + drivers/mfd/wm8400-core.c | 2 +- + drivers/mfd/wm8994-core.c | 2 +- + drivers/regulator/Kconfig | 7 + + drivers/regulator/Makefile | 1 + + drivers/regulator/qcom-pm8008-regulator.c | 198 ++++++++++++++ + include/dt-bindings/mfd/qcom-pm8008.h | 19 -- + include/dt-bindings/mfd/st,stpmic1.h | 2 +- + include/linux/mfd/idt8a340_reg.h | 8 +- + include/linux/mfd/lm3533.h | 5 +- + include/linux/mfd/tps65912.h | 1 - + 89 files changed, 1124 insertions(+), 1007 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/amlogic/analog-top.txt + delete mode 100644 Documentation/devicetree/bindings/arm/amlogic/assist.txt + delete mode 100644 Documentation/devicetree/bindings/arm/amlogic/bootrom.txt + delete mode 100644 Documentation/devicetree/bindings/arm/amlogic/pmu.txt + delete mode 100644 Documentation/devicetree/bindings/arm/freescale/fsl,vf610-mscm-cpucfg.txt + delete mode 100644 Documentation/devicetree/bindings/arm/spear-misc.txt + delete mode 100644 Documentation/devicetree/bindings/clock/ti-keystone-pllctrl.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/rockchip,rk809.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/syscon-common.yaml + create mode 100644 Documentation/devicetree/bindings/soc/intel/intel,lgm-syscon.yaml + create mode 100644 Documentation/devicetree/bindings/soc/microchip/microchip,sparx5-cpu-syscon.yaml + create mode 100644 Documentation/devicetree/bindings/soc/sprd/sprd,sc9863a-glbregs.yaml + create mode 100644 Documentation/devicetree/bindings/soc/ti/ti,am654-serdes-ctrl.yaml + create mode 100644 drivers/regulator/qcom-pm8008-regulator.c + delete mode 100644 include/dt-bindings/mfd/qcom-pm8008.h +Merging backlight/for-backlight-next (b337cc3ce475 backlight: lm3509_bl: Fix early returns in for_each_child_of_node()) +$ 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. + .../bindings/leds/backlight/ti,lm3509.yaml | 136 ++++++++ + drivers/video/backlight/Kconfig | 7 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/adp8870_bl.c | 2 +- + drivers/video/backlight/bd6107.c | 2 +- + drivers/video/backlight/ktz8866.c | 4 +- + drivers/video/backlight/lm3509_bl.c | 343 +++++++++++++++++++++ + drivers/video/backlight/lm3630a_bl.c | 2 +- + drivers/video/backlight/lm3639_bl.c | 2 +- + drivers/video/backlight/lv5207lp.c | 2 +- + drivers/video/backlight/mp3309c.c | 2 +- + drivers/video/backlight/platform_lcd.c | 1 + + drivers/video/backlight/rt4831-backlight.c | 1 + + 13 files changed, 497 insertions(+), 8 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/ti,lm3509.yaml + create mode 100644 drivers/video/backlight/lm3509_bl.c +Merging battery/for-next (b498ddb6f283 power: reset: piix4: add missing MODULE_DESCRIPTION() macro) +$ 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/platform/Makefile +Merge made by the 'ort' strategy. + .../bindings/platform/lenovo,yoga-c630-ec.yaml | 83 ++++ + drivers/leds/led-class-multicolor.c | 1 + + drivers/leds/led-core.c | 31 ++ + drivers/leds/led-triggers.c | 20 + + drivers/leds/rgb/Kconfig | 1 - + drivers/leds/rgb/leds-ktd202x.c | 80 ++-- + drivers/platform/Makefile | 2 +- + drivers/platform/arm64/Kconfig | 14 + + drivers/platform/arm64/Makefile | 1 + + drivers/platform/arm64/lenovo-yoga-c630.c | 291 ++++++++++++ + drivers/power/reset/piix4-poweroff.c | 1 + + drivers/power/supply/Kconfig | 9 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/ab8500_chargalg.c | 2 +- + drivers/power/supply/ab8500_charger.c | 52 ++- + drivers/power/supply/ab8500_fg.c | 5 - + drivers/power/supply/adp5061.c | 2 +- + drivers/power/supply/bd99954-charger.c | 7 - + drivers/power/supply/bq24735-charger.c | 2 +- + drivers/power/supply/bq25890_charger.c | 10 +- + drivers/power/supply/cw2015_battery.c | 2 +- + drivers/power/supply/ingenic-battery.c | 10 +- + drivers/power/supply/lenovo_yoga_c630_battery.c | 501 +++++++++++++++++++++ + drivers/power/supply/lp8727_charger.c | 2 +- + drivers/power/supply/ltc4162-l-charger.c | 4 +- + drivers/power/supply/max14656_charger_detector.c | 2 +- + drivers/power/supply/max77976_charger.c | 4 +- + drivers/power/supply/mm8013.c | 2 +- + drivers/power/supply/power_supply_core.c | 4 +- + drivers/power/supply/power_supply_hwmon.c | 25 + + drivers/power/supply/power_supply_leds.c | 179 +++++--- + drivers/power/supply/rt9455_charger.c | 4 +- + drivers/power/supply/samsung-sdi-battery.c | 26 +- + drivers/power/supply/sbs-charger.c | 2 +- + drivers/power/supply/sbs-manager.c | 4 +- + include/linux/leds.h | 26 ++ + include/linux/platform_data/lenovo-yoga-c630.h | 44 ++ + include/linux/power_supply.h | 19 +- + 38 files changed, 1290 insertions(+), 185 deletions(-) + create mode 100644 Documentation/devicetree/bindings/platform/lenovo,yoga-c630-ec.yaml + create mode 100644 drivers/platform/arm64/lenovo-yoga-c630.c + create mode 100644 drivers/power/supply/lenovo_yoga_c630_battery.c + create mode 100644 include/linux/platform_data/lenovo-yoga-c630.h +Merging regulator/for-next (db576ed76232 Add USB VBUS regulator for RZ/G2L) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging drivers/regulator/Kconfig +Auto-merging drivers/regulator/Makefile +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mfd/ti,twl.yaml | 166 ++++++++++++- + .../mediatek,mt6873-dvfsrc-regulator.yaml | 43 ++++ + .../bindings/regulator/mt6315-regulator.yaml | 6 +- + .../bindings/regulator/qcom,qca6390-pmu.yaml | 185 +++++++++++++++ + .../bindings/regulator/richtek,rtq2208.yaml | 11 +- + .../bindings/regulator/st,stm32mp1-pwr-reg.yaml | 7 +- + .../bindings/regulator/twl-regulator.txt | 80 ------- + Documentation/power/regulator/consumer.rst | 6 + + drivers/regulator/Kconfig | 9 + + drivers/regulator/Makefile | 1 + + drivers/regulator/core.c | 28 +++ + drivers/regulator/da9121-regulator.c | 1 + + drivers/regulator/da9210-regulator.c | 4 +- + drivers/regulator/lp3971.c | 2 +- + drivers/regulator/lp3972.c | 2 +- + drivers/regulator/lp8755.c | 2 +- + drivers/regulator/max1586.c | 2 +- + drivers/regulator/max20411-regulator.c | 5 +- + drivers/regulator/max77503-regulator.c | 8 - + drivers/regulator/max8649.c | 2 +- + drivers/regulator/max8893.c | 4 +- + drivers/regulator/max8952.c | 4 +- + drivers/regulator/mcp16502.c | 2 +- + drivers/regulator/mt6311-regulator.c | 4 +- + drivers/regulator/mtk-dvfsrc-regulator.c | 258 ++++++++++----------- + drivers/regulator/pf8x00-regulator.c | 8 +- + drivers/regulator/pv88060-regulator.c | 4 +- + drivers/regulator/pv88090-regulator.c | 4 +- + drivers/regulator/renesas-usb-vbus-regulator.c | 74 ++++++ + drivers/regulator/rt4831-regulator.c | 1 + + drivers/regulator/rtq2208-regulator.c | 44 +++- + drivers/regulator/slg51000-regulator.c | 4 +- + drivers/regulator/stm32-pwr.c | 1 + + drivers/regulator/sy8106a-regulator.c | 4 +- + drivers/regulator/tps6286x-regulator.c | 11 +- + drivers/regulator/tps6287x-regulator.c | 10 +- + drivers/regulator/userspace-consumer.c | 6 +- + include/linux/regulator/consumer.h | 13 +- + 38 files changed, 744 insertions(+), 282 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6873-dvfsrc-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/qcom,qca6390-pmu.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/twl-regulator.txt + create mode 100644 drivers/regulator/renesas-usb-vbus-regulator.c +Merging security/next (9ca51b3176e0 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. + include/linux/lsm_hook_defs.h | 1 + + include/linux/lsm_hooks.h | 1 + + security/apparmor/include/net.h | 3 +- + security/apparmor/lsm.c | 17 +----- + security/apparmor/net.c | 2 +- + security/security.c | 106 +++++++++++++++++++++++++++++--------- + security/selinux/hooks.c | 104 +++++++++++++++++++------------------ + security/selinux/include/objsec.h | 5 ++ + security/selinux/netlabel.c | 23 +++++---- + security/smack/smack.h | 5 ++ + security/smack/smack_lsm.c | 101 ++++++++++++++++++++++-------------- + security/smack/smack_netfilter.c | 4 +- + 12 files changed, 229 insertions(+), 143 deletions(-) +Merging apparmor/apparmor-next (3dd384108d53 apparmor: fix possible NULL pointer dereference) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging security/apparmor/lsm.c +Merge made by the 'ort' strategy. + security/apparmor/apparmorfs.c | 4 ++++ + security/apparmor/file.c | 13 ------------- + security/apparmor/lsm.c | 9 ++++++++- + security/apparmor/policy.c | 2 +- + security/apparmor/policy_unpack.c | 1 + + 5 files changed, 14 insertions(+), 15 deletions(-) +Merging integrity/next-integrity (fbf06cee6087 ima: fix wrong zero-assignment during securityfs dentry remove) +$ 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_fs.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging selinux/next (e123134b39dc selinux: Use 1UL for EBITMAP_BIT to match maps type) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. + security/selinux/ss/ebitmap.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging smack/next (e86cac0acdb1 smack: unix sockets: fix accept()ed socket label) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + security/smack/smack_lsm.c | 14 ++++++++++---- + 1 file changed, 10 insertions(+), 4 deletions(-) +Merging tomoyo/master (b96342141183 rtnetlink: print rtnl_mutex holder/waiter for debug purpose) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Auto-merging include/linux/fs.h +Auto-merging net/core/rtnetlink.c +Merge made by the 'ort' strategy. + drivers/input/input-mt.c | 3 ++ + drivers/tty/tty_io.c | 34 ++++++++++++++++++ + include/linux/fs.h | 2 +- + kernel/ksysfs.c | 27 +++++++++++--- + kernel/profile.c | 6 ++-- + net/core/rtnetlink.c | 93 ++++++++++++++++++++++++++++++++++++++++++++++-- + 6 files changed, 153 insertions(+), 12 deletions(-) +Merging tpmdd/next (cf5ae3c7d48e tpm_tis_spi: add missing attpm20p SPI device ID entry) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'ort' strategy. + drivers/char/tpm/eventlog/common.c | 2 ++ + drivers/char/tpm/tpm_tis_spi_main.c | 1 + + security/keys/encrypted-keys/encrypted.c | 1 + + security/keys/trusted-keys/trusted_core.c | 1 + + 4 files changed, 5 insertions(+) +Merging watchdog/master (22a40d14b572 Linux 6.10-rc6) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (cfb822815752 Merge branches 'fixes', 'allwinner/sun50i', 'qualcomm/msm', '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 +Merge made by the 'ort' strategy. + .../bindings/iommu/allwinner,sun50i-h6-iommu.yaml | 7 ++++++- + Documentation/devicetree/bindings/iommu/qcom,iommu.yaml | 1 + + drivers/iommu/amd/io_pgtable_v2.c | 2 +- + drivers/iommu/dma-iommu.c | 16 ++++++---------- + drivers/iommu/intel/pasid.c | 7 +++++-- + drivers/iommu/iommu-sva.c | 6 ++++-- + drivers/iommu/iommufd/pages.c | 7 ++++--- + drivers/iommu/iova.c | 1 + + drivers/iommu/sun50i-iommu.c | 15 +++++++++++++-- + include/linux/iommu.h | 8 -------- + 10 files changed, 41 insertions(+), 29 deletions(-) +Merging audit/next (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (bbf9b1ffa198 dt-bindings: interrupt-controller: convert fsl,ls-scfg-msi to 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/riscv/cpus.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/of/of_private.h +Auto-merging scripts/Makefile.lib +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 6 + + .../bindings/arm/freescale/fsl,imx7ulp-sim.yaml | 4 +- + .../devicetree/bindings/clock/imx6q-clock.yaml | 3 +- + .../devicetree/bindings/clock/imx6sl-clock.yaml | 3 +- + .../devicetree/bindings/clock/imx6sll-clock.yaml | 3 +- + .../devicetree/bindings/clock/imx6sx-clock.yaml | 3 +- + .../devicetree/bindings/clock/imx6ul-clock.yaml | 3 +- + .../devicetree/bindings/clock/imx7d-clock.yaml | 1 - + .../devicetree/bindings/clock/imx8m-clock.yaml | 3 +- + .../bindings/clock/stericsson,abx500.txt | 20 -- + .../bindings/display/panel/lg,sw43408.yaml | 4 +- + .../bindings/display/panel/raydium,rm69380.yaml | 5 +- + .../devicetree/bindings/dma/qcom,gpi.yaml | 1 + + .../devicetree/bindings/gpio/fsl-imx-gpio.yaml | 4 +- + .../devicetree/bindings/gpio/gpio-mxs.yaml | 1 - + .../devicetree/bindings/i2c/i2c-imx-lpi2c.yaml | 4 +- + .../bindings/iio/magnetometer/fsl,mag3110.yaml | 2 +- + .../interrupt-controller/fsl,irqsteer.yaml | 23 +- + .../bindings/interrupt-controller/fsl,ls-msi.yaml | 79 +++++++ + .../interrupt-controller/fsl,ls-scfg-msi.txt | 30 --- + .../bindings/interrupt-controller/qcom,pdc.yaml | 1 + + .../bindings/media/renesas,rzg2l-cru.yaml | 35 ++- + .../bindings/media/renesas,rzg2l-csi2.yaml | 1 + + .../bindings/memory-controllers/fsl/mmdc.yaml | 4 +- + .../devicetree/bindings/misc/fsl,qoriq-mc.txt | 196 ----------------- + .../devicetree/bindings/misc/fsl,qoriq-mc.yaml | 187 ++++++++++++++++ + .../devicetree/bindings/nvmem/imx-iim.yaml | 4 +- + .../devicetree/bindings/nvmem/imx-ocotp.yaml | 4 +- + .../devicetree/bindings/nvmem/mxs-ocotp.yaml | 4 +- + .../devicetree/bindings/pwm/imx-tpm-pwm.yaml | 4 +- + Documentation/devicetree/bindings/pwm/mxs-pwm.yaml | 1 - + .../devicetree/bindings/soc/fsl/bman-portals.txt | 56 ----- + Documentation/devicetree/bindings/soc/fsl/bman.txt | 137 ------------ + .../bindings/soc/fsl/fsl,bman-portal.yaml | 52 +++++ + .../devicetree/bindings/soc/fsl/fsl,bman.yaml | 83 +++++++ + .../devicetree/bindings/soc/fsl/fsl,qman-fqd.yaml | 69 ++++++ + .../bindings/soc/fsl/fsl,qman-portal.yaml | 110 ++++++++++ + .../devicetree/bindings/soc/fsl/fsl,qman.yaml | 93 ++++++++ + .../devicetree/bindings/soc/fsl/qman-portals.txt | 134 ------------ + Documentation/devicetree/bindings/soc/fsl/qman.txt | 187 ---------------- + .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 4 +- + .../devicetree/bindings/thermal/imx-thermal.yaml | 1 - + .../bindings/thermal/imx8mm-thermal.yaml | 4 +- + .../devicetree/bindings/thermal/qoriq-thermal.yaml | 4 +- + .../devicetree/bindings/timer/renesas,tmu.yaml | 1 + + .../devicetree/bindings/ufs/qcom,ufs.yaml | 12 +- + .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 4 +- + .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 4 +- + .../devicetree/bindings/watchdog/img,pdc-wdt.yaml | 55 +++++ + .../devicetree/bindings/watchdog/imgpdc-wdt.txt | 19 -- + .../ethernet/freescale/dpaa2/overview.rst | 2 +- + drivers/of/dynamic.c | 27 ++- + drivers/of/fdt.c | 35 +-- + drivers/of/of_private.h | 3 +- + drivers/of/of_reserved_mem.c | 242 +++++++++++++++------ + drivers/of/unittest.c | 166 ++++++++++++++ + drivers/pci/of_property.c | 24 ++ + include/linux/of.h | 5 +- + include/linux/of_reserved_mem.h | 2 +- + kernel/dma/coherent.c | 10 +- + kernel/dma/contiguous.c | 8 +- + kernel/dma/swiotlb.c | 10 +- + scripts/Makefile.lib | 9 +- + 63 files changed, 1283 insertions(+), 932 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/stericsson,abx500.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,ls-msi.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,ls-scfg-msi.txt + delete mode 100644 Documentation/devicetree/bindings/misc/fsl,qoriq-mc.txt + create mode 100644 Documentation/devicetree/bindings/misc/fsl,qoriq-mc.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/fsl/bman-portals.txt + delete mode 100644 Documentation/devicetree/bindings/soc/fsl/bman.txt + create mode 100644 Documentation/devicetree/bindings/soc/fsl/fsl,bman-portal.yaml + create mode 100644 Documentation/devicetree/bindings/soc/fsl/fsl,bman.yaml + create mode 100644 Documentation/devicetree/bindings/soc/fsl/fsl,qman-fqd.yaml + create mode 100644 Documentation/devicetree/bindings/soc/fsl/fsl,qman-portal.yaml + create mode 100644 Documentation/devicetree/bindings/soc/fsl/fsl,qman.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/fsl/qman-portals.txt + delete mode 100644 Documentation/devicetree/bindings/soc/fsl/qman.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/img,pdc-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/imgpdc-wdt.txt +Merging dt-krzk/for-next (828f810f69f3 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../hisilicon/hisilicon,hi3660-usb3-otg-bc.yaml | 46 ++++++++++++++++++++++ + .../devicetree/bindings/soc/sti/st,sti-syscon.yaml | 9 +++++ + MAINTAINERS | 41 ++++++++++++++++++- + arch/arm/boot/dts/aspeed/aspeed-g4.dtsi | 28 ++++++------- + arch/arm/boot/dts/aspeed/aspeed-g5.dtsi | 28 ++++++------- + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 32 +++++++-------- + arch/arm/boot/dts/cirrus/ep7211-edb7211.dts | 2 +- + arch/arm/boot/dts/nspire/nspire-classic.dtsi | 2 +- + arch/arm/boot/dts/nspire/nspire-cx.dts | 2 +- + arch/arm/boot/dts/nspire/nspire.dtsi | 5 ++- + arch/arm/boot/dts/nuvoton/nuvoton-npcm730-kudo.dts | 22 +++++------ + .../dts/nuvoton/nuvoton-npcm750-runbmc-olympus.dts | 22 +++++------ + arch/arm/boot/dts/ti/davinci/da850-evm.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-guardian.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-pdu001.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-pepper.dts | 2 +- + arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts | 1 - + arch/arm/boot/dts/vt8500/vt8500-bv07.dts | 2 +- + arch/arm/boot/dts/vt8500/vt8500.dtsi | 2 +- + arch/arm/boot/dts/vt8500/wm8505-ref.dts | 2 +- + arch/arm/boot/dts/vt8500/wm8505.dtsi | 2 +- + arch/arm/boot/dts/vt8500/wm8650-mid.dts | 2 +- + arch/arm/boot/dts/vt8500/wm8650.dtsi | 2 +- + arch/arm/boot/dts/vt8500/wm8750.dtsi | 4 +- + arch/arm/boot/dts/vt8500/wm8850-w70v2.dts | 2 +- + arch/arm/boot/dts/vt8500/wm8850.dtsi | 4 +- + arch/arm64/boot/dts/apm/apm-merlin.dts | 2 +- + arch/arm64/boot/dts/apm/apm-mustang.dts | 2 +- + arch/arm64/boot/dts/hisilicon/hi3660.dtsi | 2 +- + arch/arm64/boot/dts/sprd/ums512.dtsi | 14 +++++-- + arch/arm64/boot/dts/sprd/ums9620.dtsi | 14 +++++-- + 31 files changed, 206 insertions(+), 98 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/hisilicon/hisilicon,hi3660-usb3-otg-bc.yaml +Merging mailbox/for-next (10b98582bc76 dt-bindings: mailbox: qcom-ipcc: Document the SDX75 IPCC) +$ 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 (5b6cad81d0c1 Merge remote-tracking branch 'spi/for-6.11' 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/mrvl,pxa-ssp.txt | 64 ----- + .../devicetree/bindings/spi/amlogic,a1-spifc.yaml | 3 + + .../devicetree/bindings/spi/brcm,bcm2835-spi.txt | 23 -- + .../devicetree/bindings/spi/brcm,bcm2835-spi.yaml | 50 ++++ + .../bindings/spi/fsl,dspi-peripheral-props.yaml | 30 +++ + .../devicetree/bindings/spi/fsl,dspi.yaml | 103 ++++++++ + .../devicetree/bindings/spi/ibm,spi-fsi.yaml | 55 +++++ + .../devicetree/bindings/spi/marvell,mmp2-ssp.yaml | 35 ++- + .../bindings/spi/microchip,mpfs-spi.yaml | 29 ++- + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 4 + + .../devicetree/bindings/spi/spi-cadence.yaml | 7 + + .../devicetree/bindings/spi/spi-fsl-dspi.txt | 65 ------ + .../bindings/spi/spi-peripheral-props.yaml | 1 + + Documentation/driver-api/driver-model/devres.rst | 3 + + MAINTAINERS | 2 +- + drivers/base/regmap/regmap-spi.c | 3 +- + drivers/spi/Makefile | 3 +- + drivers/spi/atmel-quadspi.c | 11 +- + drivers/spi/internals.h | 8 + + drivers/spi/spi-altera-core.c | 1 + + drivers/spi/spi-axi-spi-engine.c | 42 +++- + drivers/spi/spi-bitbang.c | 73 +++--- + drivers/spi/spi-cadence.c | 27 ++- + drivers/spi/spi-cs42l43.c | 99 +++++--- + drivers/spi/spi-dw-bt1.c | 10 +- + drivers/spi/spi-dw-core.c | 4 +- + drivers/spi/spi-fsl-cpm.c | 1 + + drivers/spi/spi-fsl-dspi.c | 17 +- + drivers/spi/spi-fsl-lib.c | 1 + + drivers/spi/spi-fsl-lpspi.c | 8 +- + drivers/spi/spi-gpio.c | 66 ++---- + drivers/spi/spi-imx.c | 20 +- + drivers/spi/spi-ingenic.c | 4 +- + drivers/spi/spi-meson-spicc.c | 22 +- + drivers/spi/spi-microchip-core.c | 6 +- + drivers/spi/spi-mxic.c | 2 +- + drivers/spi/spi-omap-uwire.c | 1 + + drivers/spi/spi-omap2-mcspi.c | 9 +- + drivers/spi/spi-pci1xxxx.c | 5 +- + drivers/spi/spi-pxa2xx-pci.c | 39 ++-- + drivers/spi/spi-pxa2xx-platform.c | 214 +++++++++++++++++ + drivers/spi/spi-pxa2xx.c | 259 +++------------------ + drivers/spi/spi-pxa2xx.h | 6 + + drivers/spi/spi-qup.c | 10 +- + drivers/spi/spi-rpc-if.c | 12 +- + drivers/spi/spi-wpcm-fiu.c | 6 +- + drivers/spi/spi.c | 130 ++++++----- + include/linux/spi/spi.h | 13 +- + include/linux/spi/spi_bitbang.h | 7 +- + 49 files changed, 933 insertions(+), 680 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/serial/mrvl,pxa-ssp.txt + delete mode 100644 Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.txt + create mode 100644 Documentation/devicetree/bindings/spi/brcm,bcm2835-spi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/fsl,dspi-peripheral-props.yaml + create mode 100644 Documentation/devicetree/bindings/spi/fsl,dspi.yaml + create mode 100644 Documentation/devicetree/bindings/spi/ibm,spi-fsi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-fsl-dspi.txt + create mode 100644 drivers/spi/spi-pxa2xx-platform.c +Merging tip/master (e70c87e103e2 Merge x86/cache into tip/master) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/ABI/testing/sysfs-devices-system-cpu +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/arm/tools/syscall.tbl +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/x86/include/asm/cpufeatures.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/include/asm/msr-index.h +Auto-merging arch/x86/mm/init_64.c +Auto-merging arch/x86/mm/pat/set_memory.c +Auto-merging drivers/acpi/processor_core.c +Auto-merging drivers/irqchip/irq-gic-v3-its.c +Auto-merging drivers/irqchip/irq-gic-v3.c +Auto-merging drivers/net/ethernet/intel/ice/ice_ptp.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c +Auto-merging fs/configfs/dir.c +Auto-merging include/linux/acpi.h +Auto-merging include/linux/cacheinfo.h +CONFLICT (content): Merge conflict in include/linux/cacheinfo.h +Auto-merging include/linux/cleanup.h +Auto-merging include/linux/cpu.h +Auto-merging include/linux/sched.h +Auto-merging kernel/cpu.c +Auto-merging kernel/events/core.c +Resolved 'arch/x86/include/asm/cpufeatures.h' using previous resolution. +Resolved 'include/linux/cacheinfo.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fde08a29b1b1] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/configfs-tsm | 63 + + Documentation/ABI/testing/sysfs-devices-system-cpu | 12 + + Documentation/admin-guide/hw-vuln/spectre.rst | 86 +- + Documentation/admin-guide/kernel-parameters.txt | 20 +- + Documentation/arch/x86/amd-memory-encryption.rst | 29 +- + Documentation/arch/x86/resctrl.rst | 27 + + .../microchip,lan966x-oic.yaml | 55 + + .../interrupt-controller/renesas,rzg2l-irqc.yaml | 17 +- + Documentation/virt/coco/sev-guest.rst | 11 + + MAINTAINERS | 6 + + arch/arm/mach-stm32/Kconfig | 2 +- + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/Kconfig.platforms | 1 - + arch/um/drivers/virt-pci.c | 16 +- + arch/x86/Kconfig | 10 +- + arch/x86/Kconfig.assembler | 2 +- + arch/x86/boot/compressed/misc.c | 5 - + arch/x86/boot/compressed/sev.c | 86 +- + arch/x86/boot/cpucheck.c | 2 +- + arch/x86/boot/main.c | 42 +- + arch/x86/coco/Makefile | 1 + + arch/x86/coco/core.c | 1 - + arch/x86/coco/sev/Makefile | 11 + + arch/x86/{kernel/sev.c => coco/sev/core.c} | 449 ++++- + .../x86/{kernel/sev-shared.c => coco/sev/shared.c} | 464 ++++- + arch/x86/coco/tdx/tdx.c | 160 +- + arch/x86/entry/syscall_32.c | 10 +- + arch/x86/entry/syscall_64.c | 9 +- + arch/x86/entry/syscall_x32.c | 7 +- + arch/x86/entry/syscalls/syscall_32.tbl | 7 +- + arch/x86/entry/syscalls/syscall_64.tbl | 7 +- + arch/x86/events/amd/core.c | 4 +- + arch/x86/events/amd/uncore.c | 8 +- + arch/x86/events/core.c | 3 + + arch/x86/events/intel/core.c | 212 +-- + arch/x86/events/intel/uncore.c | 95 +- + arch/x86/events/intel/uncore.h | 8 +- + arch/x86/events/intel/uncore_discovery.c | 312 ++-- + arch/x86/events/intel/uncore_discovery.h | 22 +- + arch/x86/events/intel/uncore_snbep.c | 128 +- + arch/x86/events/rapl.c | 90 +- + arch/x86/hyperv/ivm.c | 22 +- + arch/x86/include/asm/acpi.h | 7 + + arch/x86/include/asm/alternative.h | 237 +-- + arch/x86/include/asm/amd_nb.h | 4 +- + arch/x86/include/asm/cpu_device_id.h | 8 +- + arch/x86/include/asm/cpufeatures.h | 805 ++++----- + arch/x86/include/asm/init.h | 3 + + arch/x86/include/asm/intel_pconfig.h | 65 - + arch/x86/include/asm/irqflags.h | 20 + + arch/x86/include/asm/mce.h | 3 +- + arch/x86/include/asm/msr-index.h | 3 + + arch/x86/include/asm/page_64.h | 2 +- + arch/x86/include/asm/percpu.h | 535 +++--- + arch/x86/include/asm/pgtable.h | 5 + + arch/x86/include/asm/pgtable_types.h | 1 + + arch/x86/include/asm/processor.h | 12 +- + arch/x86/include/asm/set_memory.h | 3 + + arch/x86/include/asm/setup.h | 8 + + arch/x86/include/asm/sev-common.h | 18 + + arch/x86/include/asm/sev.h | 135 +- + arch/x86/include/asm/smp.h | 1 + + arch/x86/include/asm/tsc.h | 3 - + arch/x86/include/asm/vmware.h | 340 +++- + arch/x86/include/asm/vmxfeatures.h | 108 +- + arch/x86/include/asm/x86_init.h | 14 +- + arch/x86/include/uapi/asm/svm.h | 1 + + arch/x86/kernel/Makefile | 6 - + arch/x86/kernel/acpi/Makefile | 1 + + arch/x86/kernel/acpi/boot.c | 86 +- + arch/x86/kernel/acpi/madt_playdead.S | 28 + + arch/x86/kernel/acpi/madt_wakeup.c | 292 +++ + arch/x86/kernel/alternative.c | 22 +- + arch/x86/kernel/amd_nb.c | 44 +- + arch/x86/kernel/cpu/Makefile | 2 +- + arch/x86/kernel/cpu/amd.c | 11 - + arch/x86/kernel/cpu/bugs.c | 16 +- + arch/x86/kernel/cpu/intel.c | 188 +- + arch/x86/kernel/cpu/intel_pconfig.c | 84 - + arch/x86/kernel/cpu/mce/core.c | 7 +- + arch/x86/kernel/cpu/mce/inject.c | 9 +- + arch/x86/kernel/cpu/mkcapflags.sh | 3 +- + arch/x86/kernel/cpu/resctrl/core.c | 350 ++-- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 89 +- + arch/x86/kernel/cpu/resctrl/internal.h | 108 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 250 ++- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 42 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 288 +-- + arch/x86/kernel/cpu/vmware.c | 223 ++- + arch/x86/kernel/crash.c | 12 + + arch/x86/kernel/devicetree.c | 2 +- + arch/x86/kernel/e820.c | 9 +- + arch/x86/kernel/fpu/xstate.h | 14 +- + arch/x86/kernel/process.c | 7 + + arch/x86/kernel/reboot.c | 18 + + arch/x86/kernel/relocate_kernel_64.S | 27 +- + arch/x86/kernel/setup.c | 2 + + arch/x86/kernel/tsc.c | 92 +- + arch/x86/kernel/x86_init.c | 8 +- + arch/x86/kvm/emulate.c | 2 +- + arch/x86/lib/cmdline.c | 8 + + arch/x86/lib/getuser.S | 69 +- + arch/x86/lib/iomem.c | 5 +- + arch/x86/mm/ident_map.c | 73 + + arch/x86/mm/init_64.c | 16 +- + arch/x86/mm/mem_encrypt_amd.c | 16 +- + arch/x86/mm/pat/set_memory.c | 75 +- + arch/x86/pci/intel_mid_pci.c | 8 +- + arch/x86/pci/xen.c | 4 +- + arch/x86/platform/intel-mid/intel-mid.c | 6 +- + arch/x86/platform/intel/iosf_mbi.c | 4 +- + arch/x86/um/sys_call_table_32.c | 10 +- + arch/x86/um/sys_call_table_64.c | 11 +- + arch/x86/virt/svm/sev.c | 44 +- + arch/x86/virt/vmx/tdx/tdx.c | 8 +- + drivers/acpi/processor_core.c | 15 + + drivers/acpi/tables.c | 14 + + drivers/edac/amd64_edac.c | 69 +- + drivers/edac/amd64_edac.h | 4 - + drivers/gpu/drm/vmwgfx/vmwgfx_msg.c | 171 +- + drivers/gpu/drm/vmwgfx/vmwgfx_msg_arm64.h | 198 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_msg_x86.h | 185 -- + drivers/hwmon/k10temp.c | 62 +- + drivers/input/mouse/vmmouse.c | 76 +- + drivers/irqchip/Kconfig | 21 + + drivers/irqchip/Makefile | 2 + + drivers/irqchip/irq-armada-370-xp.c | 121 +- + drivers/irqchip/irq-gic-v3-its.c | 4 + + drivers/irqchip/irq-gic-v3.c | 9 + + drivers/irqchip/irq-imx-mu-msi.c | 6 +- + drivers/irqchip/irq-lan966x-oic.c | 278 +++ + drivers/irqchip/irq-meson-gpio.c | 1 + + drivers/irqchip/irq-mvebu-pic.c | 1 + + drivers/irqchip/irq-renesas-rzg2l.c | 150 +- + drivers/irqchip/irq-riscv-aplic-main.c | 13 +- + drivers/irqchip/irq-riscv-intc.c | 4 +- + drivers/irqchip/irq-stm32-exti.c | 670 +------ + drivers/irqchip/irq-stm32mp-exti.c | 729 ++++++++ + drivers/irqchip/irq-ts4800.c | 1 + + drivers/net/ethernet/intel/e1000e/ptp.c | 3 +- + drivers/net/ethernet/intel/ice/ice_ptp.c | 3 +- + drivers/net/ethernet/intel/igc/igc_ptp.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 3 +- + drivers/ptp/ptp_vmw.c | 12 +- + drivers/virt/coco/sev-guest/sev-guest.c | 211 ++- + drivers/virt/coco/tdx-guest/tdx-guest.c | 26 +- + drivers/virt/coco/tsm.c | 177 +- + fs/configfs/dir.c | 10 + + include/acpi/actbl2.h | 19 +- + include/linux/acpi.h | 3 + + include/linux/cacheinfo.h | 37 +- + include/linux/cc_platform.h | 10 - + include/linux/cleanup.h | 6 +- + include/linux/clocksource.h | 27 + + include/linux/clocksource_ids.h | 1 + + include/linux/configfs.h | 3 + + include/linux/cpu.h | 33 +- + include/linux/cpuhotplug.h | 2 +- + include/linux/cpuhplock.h | 49 + + include/linux/irq.h | 43 + + include/linux/irqdomain.h | 116 +- + include/linux/perf_event.h | 1 + + include/linux/preempt.h | 41 + + include/linux/resctrl.h | 88 +- + include/linux/sched.h | 41 - + include/linux/spinlock.h | 14 +- + include/linux/task_work.h | 3 +- + include/linux/tick.h | 1 - + include/linux/timekeeping.h | 6 + + include/linux/tsm.h | 59 +- + kernel/cpu.c | 16 +- + kernel/events/core.c | 49 +- + kernel/irq/debugfs.c | 10 +- + kernel/irq/devres.c | 41 + + kernel/irq/generic-chip.c | 167 +- + kernel/irq/internals.h | 10 + + kernel/irq/irqdomain.c | 290 ++- + kernel/irq/manage.c | 2 +- + kernel/irq/proc.c | 7 +- + kernel/jump_label.c | 74 +- + kernel/sched/build_policy.c | 1 + + kernel/sched/clock.c | 4 +- + kernel/sched/core.c | 1858 +------------------- + kernel/sched/core_sched.c | 2 +- + kernel/sched/cputime.c | 14 +- + kernel/sched/deadline.c | 15 +- + kernel/sched/fair.c | 23 +- + kernel/sched/idle.c | 12 +- + kernel/sched/loadavg.c | 4 +- + kernel/sched/pelt.c | 4 +- + kernel/sched/psi.c | 27 +- + kernel/sched/rt.c | 22 +- + kernel/sched/sched.h | 433 +++-- + kernel/sched/stats.h | 13 +- + kernel/sched/syscalls.c | 1699 ++++++++++++++++++ + kernel/sched/topology.c | 12 +- + kernel/sched/wait_bit.c | 4 +- + kernel/smp.c | 4 +- + kernel/task_work.c | 34 +- + kernel/time/clocksource-wdtest.c | 1 + + kernel/time/test_udelay.c | 1 + + kernel/time/tick-sched.c | 14 - + kernel/time/time_test.c | 1 + + kernel/time/timekeeping.c | 131 +- + lib/debugobjects.c | 21 +- + scripts/Kconfig.include | 3 +- + scripts/syscalltbl.sh | 18 +- + security/keys/keyctl.c | 2 +- + sound/pci/hda/hda_controller.c | 3 +- + tools/arch/x86/kcpuid/Makefile | 4 +- + tools/objtool/Documentation/objtool.txt | 19 + + tools/objtool/arch/x86/special.c | 23 + + tools/objtool/noreturns.h | 4 + + tools/objtool/special.c | 16 +- + 214 files changed, 10301 insertions(+), 6232 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/microchip,lan966x-oic.yaml + create mode 100644 arch/x86/coco/sev/Makefile + rename arch/x86/{kernel/sev.c => coco/sev/core.c} (86%) + rename arch/x86/{kernel/sev-shared.c => coco/sev/shared.c} (72%) + delete mode 100644 arch/x86/include/asm/intel_pconfig.h + create mode 100644 arch/x86/kernel/acpi/madt_playdead.S + create mode 100644 arch/x86/kernel/acpi/madt_wakeup.c + delete mode 100644 arch/x86/kernel/cpu/intel_pconfig.c + create mode 100644 drivers/irqchip/irq-lan966x-oic.c + create mode 100644 drivers/irqchip/irq-stm32mp-exti.c + create mode 100644 include/linux/cpuhplock.h + create mode 100644 kernel/sched/syscalls.c +Merging clockevents/timers/drivers/next (2030a7e11f16 clocksource/drivers/arm_arch_timer: Mark hisi_161010101_oem_info const) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (9a1c5fe0f0a8 Merge ras/edac-misc 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 +Auto-merging drivers/ras/amd/atl/internal.h +Auto-merging drivers/ras/amd/atl/system.c +Merge made by the 'ort' strategy. + drivers/edac/Makefile | 10 +- + drivers/edac/dmc520_edac.c | 4 +- + drivers/edac/ghes_edac.c | 2 +- + drivers/edac/i10nm_base.c | 20 +- + drivers/edac/igen6_edac.c | 8 + + drivers/edac/layerscape_edac.c | 1 + + drivers/edac/mpc85xx_edac.c | 1 + + drivers/edac/octeon_edac-l2c.c | 1 + + drivers/edac/octeon_edac-lmc.c | 1 + + drivers/edac/octeon_edac-pc.c | 1 + + drivers/edac/octeon_edac-pci.c | 1 + + drivers/edac/pnd2_edac.c | 4 +- + drivers/edac/sb_edac.c | 14 +- + drivers/edac/skx_base.c | 2 +- + drivers/edac/skx_common.c | 21 +- + drivers/edac/skx_common.h | 4 +- + drivers/edac/thunderx_edac.c | 6 - + drivers/ras/amd/atl/core.c | 52 ++-- + drivers/ras/amd/atl/dehash.c | 43 --- + drivers/ras/amd/atl/denormalize.c | 561 ++++++++++++++++++++++++++++++++++++++ + drivers/ras/amd/atl/internal.h | 48 ++++ + drivers/ras/amd/atl/map.c | 97 +++++++ + drivers/ras/amd/atl/system.c | 21 +- + drivers/ras/amd/fmpm.c | 4 +- + 24 files changed, 819 insertions(+), 108 deletions(-) +Merging ftrace/for-next (5dfebf3c26dc 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 arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging include/linux/ftrace.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/syscalls.h +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging kernel/events/uprobes.c +Auto-merging kernel/sys_ni.c +Auto-merging kernel/trace/ftrace.c +Auto-merging tools/testing/selftests/bpf/bpf_testmod/bpf_testmod.c +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ed44f4c77a63] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 9 + + Documentation/trace/ftrace-design.rst | 12 - + arch/arm64/include/asm/ftrace.h | 11 - + arch/csky/include/asm/ftrace.h | 2 - + arch/loongarch/include/asm/ftrace.h | 1 - + arch/powerpc/include/asm/ftrace.h | 2 - + arch/riscv/include/asm/ftrace.h | 1 - + arch/s390/include/asm/ftrace.h | 1 - + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/ftrace.h | 2 - + arch/x86/include/asm/shstk.h | 4 + + arch/x86/kernel/shstk.c | 16 + + arch/x86/kernel/uprobes.c | 124 ++- + include/linux/ftrace.h | 50 +- + include/linux/ring_buffer.h | 20 + + include/linux/sched.h | 2 +- + include/linux/syscalls.h | 2 + + include/linux/trace_recursion.h | 39 - + include/linux/uprobes.h | 3 + + include/uapi/asm-generic/unistd.h | 5 +- + kernel/events/uprobes.c | 24 +- + kernel/sys_ni.c | 2 + + kernel/trace/fgraph.c | 1058 ++++++++++++++++---- + kernel/trace/ftrace.c | 688 +++++++++++-- + kernel/trace/ftrace_internal.h | 18 +- + kernel/trace/pid_list.c | 1 + + kernel/trace/ring_buffer.c | 876 ++++++++++++++-- + kernel/trace/trace.c | 242 ++++- + kernel/trace/trace.h | 103 +- + kernel/trace/trace_functions.c | 15 +- + kernel/trace/trace_functions_graph.c | 96 +- + kernel/trace/trace_irqsoff.c | 10 +- + kernel/trace/trace_kprobe.c | 54 +- + kernel/trace/trace_output.c | 12 +- + kernel/trace/trace_sched_wakeup.c | 10 +- + kernel/trace/trace_selftest.c | 259 ++++- + samples/fprobe/fprobe_example.c | 1 + + samples/kprobes/kprobe_example.c | 1 + + samples/kprobes/kretprobe_example.c | 1 + + tools/include/linux/compiler.h | 4 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 123 ++- + .../selftests/bpf/prog_tests/uprobe_syscall.c | 385 +++++++ + tools/testing/selftests/bpf/progs/uprobe_syscall.c | 15 + + .../selftests/bpf/progs/uprobe_syscall_executed.c | 17 + + .../selftests/ftrace/test.d/ftrace/fgraph-multi.tc | 103 ++ + .../ftrace/test.d/ftrace/func-filter-pid.tc | 29 +- + tools/testing/selftests/x86/test_shadow_stack.c | 145 +++ + 47 files changed, 3994 insertions(+), 605 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe_syscall.c + create mode 100644 tools/testing/selftests/bpf/progs/uprobe_syscall.c + create mode 100644 tools/testing/selftests/bpf/progs/uprobe_syscall_executed.c + create mode 100644 tools/testing/selftests/ftrace/test.d/ftrace/fgraph-multi.tc +Merging rcu/next (a9e1661087f1 Merge branches 'doc.2024.06.06a', 'fixes.2024.06.18a', 'mb.2024.06.28a', 'nocb.2024.06.03a', 'rcu-tasks.2024.06.06a', 'rcutorture.2024.06.06a' and 'srcu.2024.06.18a' into HEAD) +$ 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 MAINTAINERS +Auto-merging include/linux/rcupdate.h +Auto-merging kernel/pid_namespace.c +Auto-merging kernel/rcu/tree_exp.h +Auto-merging kernel/rcu/tree_stall.h +Auto-merging kernel/sched/core.c +Merge made by the 'ort' strategy. + .../Memory-Ordering/Tree-RCU-Memory-Ordering.rst | 6 +- + .../RCU/Design/Requirements/Requirements.rst | 16 +++ + Documentation/RCU/whatisRCU.rst | 28 ++-- + Documentation/admin-guide/kernel-parameters.txt | 8 ++ + MAINTAINERS | 1 + + include/linux/rcu_segcblist.h | 88 ++++++------ + include/linux/rcupdate.h | 62 ++++++++- + include/linux/srcu.h | 35 +++++ + kernel/pid_namespace.c | 17 --- + kernel/rcu/rcuscale.c | 1 + + kernel/rcu/rcutorture.c | 49 ++++--- + kernel/rcu/refscale.c | 1 + + kernel/rcu/srcutiny.c | 3 +- + kernel/rcu/srcutree.c | 13 +- + kernel/rcu/sync.c | 12 +- + kernel/rcu/tasks.h | 26 ++-- + kernel/rcu/tree.c | 91 +++++++++---- + kernel/rcu/tree.h | 2 +- + kernel/rcu/tree_exp.h | 24 +++- + kernel/rcu/tree_nocb.h | 149 ++++++--------------- + kernel/rcu/tree_plugin.h | 14 +- + kernel/rcu/tree_stall.h | 4 +- + kernel/sched/core.c | 14 +- + tools/rcu/rcu-updaters.sh | 52 +++++++ + 24 files changed, 438 insertions(+), 278 deletions(-) + create mode 100755 tools/rcu/rcu-updaters.sh +Merging paulmck/non-rcu/next (32584f42dec8 rcutorture: Make rcu_torture_write_types() print number of update types) +$ 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/arm/Kconfig +Auto-merging arch/x86/kernel/tsc.c +Auto-merging include/linux/compiler.h +Auto-merging include/linux/rcupdate.h +Auto-merging kernel/locking/lockdep.c +Auto-merging kernel/rcu/tree_exp.h +CONFLICT (content): Merge conflict in kernel/rcu/tree_exp.h +Auto-merging kernel/rcu/tree_stall.h +Auto-merging kernel/smp.c +Recorded preimage for 'kernel/rcu/tree_exp.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'kernel/rcu/tree_exp.h'. +[master eb52b064da25] Merge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 4 + + arch/arc/Kconfig | 1 + + arch/arc/include/asm/cmpxchg.h | 33 ++- + arch/arm/Kconfig | 1 + + arch/arm/include/asm/cmpxchg.h | 7 +- + arch/sh/Kconfig | 1 + + arch/sh/include/asm/cmpxchg.h | 3 + + arch/x86/kernel/tsc.c | 2 +- + arch/xtensa/Kconfig | 1 + + arch/xtensa/include/asm/cmpxchg.h | 2 + + include/linux/compiler.h | 10 +- + include/linux/context_tracking_state.h | 2 +- + include/linux/rcu_segcblist.h | 6 +- + include/linux/rcupdate.h | 7 + + include/linux/smp.h | 6 + + kernel/kcsan/debugfs.c | 2 +- + kernel/kcsan/kcsan_test.c | 1 + + kernel/locking/lockdep.c | 50 ++-- + kernel/locking/locktorture.c | 1 + + kernel/rcu/rcu_segcblist.c | 11 - + kernel/rcu/rcu_segcblist.h | 11 +- + kernel/rcu/rcutorture.c | 53 ++-- + kernel/rcu/tree.c | 47 +--- + kernel/rcu/tree.h | 6 +- + kernel/rcu/tree_exp.h | 117 +++++---- + kernel/rcu/tree_nocb.h | 266 ++++++++------------- + kernel/rcu/tree_plugin.h | 5 +- + kernel/rcu/tree_stall.h | 7 +- + kernel/scftorture.c | 3 +- + kernel/smp.c | 20 +- + kernel/time/clocksource.c | 38 ++- + kernel/torture.c | 1 + + tools/include/nolibc/stdint.h | 19 ++ + tools/include/nolibc/stdio.h | 10 + + tools/include/nolibc/stdlib.h | 109 +++++++++ + tools/memory-model/Documentation/README | 28 ++- + .../memory-model/Documentation/access-marking.txt | 34 ++- + .../Documentation/herd-representation.txt | 110 +++++++++ + tools/memory-model/Documentation/simple.txt | 2 +- + tools/memory-model/linux-kernel.def | 27 +++ + tools/memory-model/lock.cat | 60 +++-- + tools/testing/selftests/kselftest.h | 8 - + tools/testing/selftests/nolibc/Makefile | 2 +- + tools/testing/selftests/nolibc/nolibc-test.c | 109 +++++++-- + tools/testing/selftests/nolibc/run-tests.sh | 9 +- + .../selftests/rcutorture/bin/kvm-test-1-run.sh | 2 + + .../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 + + 50 files changed, 853 insertions(+), 408 deletions(-) + create mode 100644 tools/memory-model/Documentation/herd-representation.txt + 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 +Merging kvm/next (02b0d3b9d4dd Merge branch 'kvm-6.10-fixes' into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/include/asm/sev-common.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/sev-common.h +Auto-merging arch/x86/include/asm/sev.h +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging include/linux/pagemap.h +Auto-merging mm/truncate.c +Resolved 'arch/x86/include/asm/sev-common.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 17170e47b77f] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + .../virt/kvm/x86/amd-memory-encryption.rst | 110 +- + arch/x86/include/asm/kvm-x86-ops.h | 3 + + arch/x86/include/asm/kvm_host.h | 5 + + arch/x86/include/asm/sev-common.h | 25 + + arch/x86/include/asm/sev.h | 3 + + arch/x86/include/asm/svm.h | 9 +- + arch/x86/include/uapi/asm/kvm.h | 48 + + arch/x86/kvm/Kconfig | 3 + + arch/x86/kvm/mmu.h | 2 - + arch/x86/kvm/mmu/mmu.c | 48 +- + arch/x86/kvm/mmu/tdp_mmu.c | 13 +- + arch/x86/kvm/svm/sev.c | 1364 +++++++++++++++++++- + arch/x86/kvm/svm/svm.c | 29 +- + arch/x86/kvm/svm/svm.h | 47 + + arch/x86/kvm/trace.h | 31 + + arch/x86/kvm/x86.c | 30 + + include/linux/kvm_host.h | 36 + + include/linux/pagemap.h | 1 + + include/linux/psp-sev.h | 4 +- + mm/truncate.c | 3 +- + virt/kvm/Kconfig | 8 + + virt/kvm/guest_memfd.c | 175 ++- + 22 files changed, 1938 insertions(+), 59 deletions(-) +Merging kvm-arm/next (62933f02c855 Merge branch kvm-arm64/docs into kvmarm/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/arm64/include/asm/esr.h +Auto-merging arch/arm64/kvm/hyp/nvhe/ffa.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 18 + + Documentation/virt/kvm/api.rst | 10 +- + Documentation/virt/kvm/devices/arm-vgic.rst | 2 +- + arch/arm64/include/asm/esr.h | 12 + + arch/arm64/include/asm/kvm_arm.h | 1 - + arch/arm64/include/asm/kvm_asm.h | 2 + + arch/arm64/include/asm/kvm_emulate.h | 95 +- + arch/arm64/include/asm/kvm_host.h | 68 +- + arch/arm64/include/asm/kvm_hyp.h | 4 +- + arch/arm64/include/asm/kvm_mmu.h | 26 + + arch/arm64/include/asm/kvm_nested.h | 131 ++- + arch/arm64/include/asm/sysreg.h | 17 + + arch/arm64/kernel/asm-offsets.c | 1 + + arch/arm64/kernel/debug-monitors.c | 4 +- + arch/arm64/kernel/traps.c | 8 +- + arch/arm64/kvm/arm.c | 86 +- + arch/arm64/kvm/emulate-nested.c | 104 ++ + arch/arm64/kvm/fpsimd.c | 19 +- + arch/arm64/kvm/handle_exit.c | 43 +- + arch/arm64/kvm/hyp/entry.S | 8 + + arch/arm64/kvm/hyp/include/hyp/switch.h | 29 +- + arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 35 +- + arch/arm64/kvm/hyp/include/nvhe/ffa.h | 2 +- + arch/arm64/kvm/hyp/nvhe/Makefile | 6 +- + arch/arm64/kvm/hyp/nvhe/ffa.c | 286 ++++-- + arch/arm64/kvm/hyp/nvhe/gen-hyprel.c | 6 + + arch/arm64/kvm/hyp/nvhe/host.S | 6 - + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 30 +- + arch/arm64/kvm/hyp/nvhe/setup.c | 4 +- + arch/arm64/kvm/hyp/vhe/switch.c | 202 +++- + arch/arm64/kvm/hyp/vhe/tlb.c | 147 +++ + arch/arm64/kvm/mmu.c | 213 ++++- + arch/arm64/kvm/nested.c | 1048 ++++++++++++++++++--- + arch/arm64/kvm/pmu-emul.c | 2 +- + arch/arm64/kvm/reset.c | 6 + + arch/arm64/kvm/sys_regs.c | 593 +++++++++++- + include/linux/arm_ffa.h | 3 + + tools/testing/selftests/kvm/aarch64/set_id_regs.c | 17 + + 38 files changed, 2838 insertions(+), 456 deletions(-) +Merging kvms390/next (39cd87c4eb2b Linux 6.9-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-ppc/topic/ppc-kvm (0b65365f3fa9 KVM: PPC: Book3S HV nestedv2: Keep nested guest HASHPKEYR in sync) +$ 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 +Auto-merging Documentation/virt/kvm/api.rst +Merge made by the 'ort' strategy. + Documentation/arch/powerpc/kvm-nested.rst | 4 +- + Documentation/virt/kvm/api.rst | 3 + + arch/powerpc/include/asm/guest-state-buffer.h | 3 +- + arch/powerpc/include/asm/kvm_book3s.h | 1 + + arch/powerpc/include/asm/kvm_book3s_64.h | 5 ++ + arch/powerpc/include/asm/kvm_host.h | 3 + + arch/powerpc/include/asm/lppaca.h | 11 ++- + arch/powerpc/include/uapi/asm/kvm.h | 3 + + arch/powerpc/kvm/book3s_hv.c | 102 +++++++++++++++++++++++++- + arch/powerpc/kvm/book3s_hv.h | 3 + + arch/powerpc/kvm/book3s_hv_nestedv2.c | 25 +++++++ + arch/powerpc/kvm/test-guest-state-buffer.c | 2 +- + arch/powerpc/kvm/trace_hv.h | 29 ++++++++ + 13 files changed, 186 insertions(+), 8 deletions(-) +Merging kvm-riscv/riscv_kvm_next (e325618349cd RISC-V: KVM: Redirect AMO load/store access fault traps to guest) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Auto-merging tools/perf/arch/riscv/util/Build +CONFLICT (content): Merge conflict in tools/perf/arch/riscv/util/Build +Resolved 'tools/perf/arch/riscv/util/Build' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 10d8f61685fb] Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/riscv/include/asm/kvm_aia_aplic.h | 58 ---------------- + arch/riscv/include/asm/kvm_aia_imsic.h | 38 ----------- + arch/riscv/kvm/aia.c | 35 ++++++---- + arch/riscv/kvm/aia_aplic.c | 2 +- + arch/riscv/kvm/aia_device.c | 2 +- + arch/riscv/kvm/aia_imsic.c | 2 +- + arch/riscv/kvm/trace.h | 67 +++++++++++++++++++ + arch/riscv/kvm/vcpu.c | 7 ++ + arch/riscv/kvm/vcpu_exit.c | 2 + + tools/perf/arch/riscv/Makefile | 1 + + tools/perf/arch/riscv/util/Build | 1 + + tools/perf/arch/riscv/util/kvm-stat.c | 78 ++++++++++++++++++++++ + tools/perf/arch/riscv/util/riscv_exception_types.h | 35 ++++++++++ + 13 files changed, 215 insertions(+), 113 deletions(-) + delete mode 100644 arch/riscv/include/asm/kvm_aia_aplic.h + delete mode 100644 arch/riscv/include/asm/kvm_aia_imsic.h + create mode 100644 arch/riscv/kvm/trace.h + create mode 100644 tools/perf/arch/riscv/util/kvm-stat.c + create mode 100644 tools/perf/arch/riscv/util/riscv_exception_types.h +Merging kvm-x86/next (771df9ffadb8 Merge branch 'static_calls') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/mips/kvm/mips.c +Auto-merging arch/powerpc/include/asm/kvm_host.h +Auto-merging arch/powerpc/kvm/powerpc.c +Auto-merging arch/riscv/kvm/vcpu.c +Auto-merging arch/s390/include/asm/kvm_host.h +Auto-merging arch/s390/kvm/kvm-s390.c +Auto-merging arch/x86/kvm/emulate.c +Auto-merging include/linux/srcu.h +Auto-merging tools/testing/selftests/kvm/Makefile +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 92 ++- + Documentation/virt/kvm/halt-polling.rst | 12 +- + Documentation/virt/kvm/x86/errata.rst | 18 + + arch/arm64/include/asm/kvm_host.h | 1 - + arch/arm64/kvm/arm.c | 2 +- + arch/loongarch/include/asm/kvm_host.h | 1 - + arch/loongarch/kvm/vcpu.c | 2 +- + arch/mips/include/asm/kvm_host.h | 1 - + arch/mips/kvm/mips.c | 2 +- + arch/powerpc/include/asm/kvm_host.h | 1 - + arch/powerpc/kvm/powerpc.c | 2 +- + arch/riscv/include/asm/kvm_host.h | 1 - + arch/riscv/kvm/vcpu.c | 2 +- + arch/s390/include/asm/kvm_host.h | 1 - + arch/s390/kvm/kvm-s390.c | 11 +- + arch/x86/include/asm/kvm-x86-ops.h | 2 - + arch/x86/include/asm/kvm_host.h | 85 +-- + arch/x86/include/uapi/asm/kvm.h | 1 + + arch/x86/kvm/cpuid.c | 14 +- + arch/x86/kvm/cpuid.h | 18 - + arch/x86/kvm/emulate.c | 71 +-- + arch/x86/kvm/hyperv.c | 9 +- + arch/x86/kvm/irq.c | 2 +- + arch/x86/kvm/irq.h | 1 - + arch/x86/kvm/irq_comm.c | 7 - + arch/x86/kvm/kvm_cache_regs.h | 10 +- + arch/x86/kvm/kvm_emulate.h | 1 + + arch/x86/kvm/lapic.c | 48 +- + arch/x86/kvm/lapic.h | 5 +- + arch/x86/kvm/mmu.h | 40 +- + arch/x86/kvm/mmu/mmu.c | 60 +- + arch/x86/kvm/mmu/paging_tmpl.h | 3 +- + arch/x86/kvm/mmu/spte.c | 30 +- + arch/x86/kvm/mmu/tdp_mmu.c | 78 +-- + arch/x86/kvm/mtrr.c | 644 +-------------------- + arch/x86/kvm/pmu.c | 73 +-- + arch/x86/kvm/pmu.h | 10 +- + arch/x86/kvm/smm.c | 44 +- + arch/x86/kvm/svm/nested.c | 2 +- + arch/x86/kvm/svm/pmu.c | 11 +- + arch/x86/kvm/svm/sev.c | 10 +- + arch/x86/kvm/svm/svm.c | 49 +- + arch/x86/kvm/svm/svm.h | 20 +- + arch/x86/kvm/trace.h | 24 +- + arch/x86/kvm/vmx/main.c | 5 +- + arch/x86/kvm/vmx/nested.c | 55 +- + arch/x86/kvm/vmx/pmu_intel.c | 52 +- + arch/x86/kvm/vmx/posted_intr.h | 10 + + arch/x86/kvm/vmx/vmcs12.h | 14 +- + arch/x86/kvm/vmx/vmx.c | 205 +++---- + arch/x86/kvm/vmx/vmx.h | 3 +- + arch/x86/kvm/vmx/x86_ops.h | 4 - + arch/x86/kvm/x86.c | 530 +++++++++-------- + arch/x86/kvm/x86.h | 25 +- + arch/x86/kvm/xen.c | 6 +- + include/linux/kvm_host.h | 12 +- + include/linux/srcu.h | 14 + + include/uapi/linux/kvm.h | 17 +- + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/include/x86_64/apic.h | 8 + + .../selftests/kvm/include/x86_64/processor.h | 18 + + tools/testing/selftests/kvm/lib/kvm_util.c | 9 +- + tools/testing/selftests/kvm/lib/x86_64/processor.c | 11 + + .../kvm/memslot_modification_stress_test.c | 6 - + .../selftests/kvm/x86_64/apic_bus_clock_test.c | 194 +++++++ + .../selftests/kvm/x86_64/max_vcpuid_cap_test.c | 22 +- + .../selftests/kvm/x86_64/pmu_counters_test.c | 44 +- + .../selftests/kvm/x86_64/pmu_event_filter_test.c | 35 +- + .../testing/selftests/kvm/x86_64/set_boot_cpu_id.c | 16 + + virt/kvm/async_pf.c | 13 +- + virt/kvm/irqchip.c | 24 + + virt/kvm/kvm_main.c | 46 +- + virt/kvm/pfncache.c | 3 + + 73 files changed, 1345 insertions(+), 1578 deletions(-) + create mode 100644 tools/testing/selftests/kvm/x86_64/apic_bus_clock_test.c +Merging xen-tip/linux-next (611ff1b1ae98 xen: privcmd: Fix possible access to a freed kirqfd instance) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Merge made by the 'ort' strategy. + arch/x86/xen/p2m.c | 4 ++-- + arch/x86/xen/time.c | 2 +- + drivers/xen/evtchn.c | 1 + + drivers/xen/manage.c | 2 +- + drivers/xen/privcmd-buf.c | 1 + + drivers/xen/privcmd.c | 36 +++++++++++++++++++++++++----------- + drivers/xen/xen-pciback/pci_stub.c | 1 + + 7 files changed, 32 insertions(+), 15 deletions(-) +Merging percpu/for-next (2d9ad81ef935 Merge branch 'for-6.8-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (c6eff66fe16e Merge branch 'for-6.11' 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 +Merge made by the 'ort' strategy. + kernel/workqueue.c | 185 ++++++++++++++++++++++------------------------------- + 1 file changed, 77 insertions(+), 108 deletions(-) +Merging sched-ext/for-next (18b2bd03371b sched_ext: Documentation: Remove mentions of scx_bpf_switch_all) +$ 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 MAINTAINERS +Auto-merging drivers/tty/sysrq.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/cgroup.h +Auto-merging include/linux/sched.h +Auto-merging kernel/fork.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/sched.h +Auto-merging lib/dump_stack.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 | 203 + + include/linux/sched/task.h | 3 +- + include/trace/events/sched_ext.h | 32 + + include/uapi/linux/sched.h | 1 + + init/init_task.c | 12 + + kernel/Kconfig.preempt | 24 + + kernel/fork.c | 17 +- + kernel/sched/build_policy.c | 10 + + kernel/sched/core.c | 190 +- + kernel/sched/cpufreq_schedutil.c | 50 +- + kernel/sched/debug.c | 3 + + kernel/sched/ext.c | 6207 ++++++++++++++++++++ + kernel/sched/ext.h | 119 + + kernel/sched/fair.c | 21 +- + kernel/sched/idle.c | 2 + + kernel/sched/sched.h | 78 +- + kernel/sched/syscalls.c | 26 + + lib/dump_stack.c | 1 + + tools/Makefile | 10 +- + tools/sched_ext/.gitignore | 2 + + tools/sched_ext/Makefile | 246 + + tools/sched_ext/README.md | 258 + + tools/sched_ext/include/bpf-compat/gnu/stubs.h | 11 + + tools/sched_ext/include/scx/common.bpf.h | 397 ++ + 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_qmap.bpf.c | 660 +++ + tools/sched_ext/scx_qmap.c | 139 + + 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 | 132 + + 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 | 32 + + 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 + + 93 files changed, 13420 insertions(+), 85 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_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 (4261031484d8 Merge branch 'pdx86/platform-drivers-x86-lenovo-c630' into review-ilpo) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/platform/x86/dell/dell-smbios-base.c +Auto-merging drivers/platform/x86/intel/pmc/pltdrv.c +Auto-merging drivers/platform/x86/intel_ips.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-tpmi | 9 + + MAINTAINERS | 6 + + arch/x86/platform/atom/punit_atom_debug.c | 11 +- + drivers/platform/x86/amd/pmf/tee-if.c | 11 +- + drivers/platform/x86/asus-tf103c-dock.c | 10 +- + drivers/platform/x86/dell/Kconfig | 13 + + drivers/platform/x86/dell/Makefile | 1 + + drivers/platform/x86/dell/dell-laptop.c | 23 -- + drivers/platform/x86/dell/dell-pc.c | 309 ++++++++++++++++++ + drivers/platform/x86/dell/dell-smbios-base.c | 35 ++ + drivers/platform/x86/dell/dell-smbios.h | 7 + + .../platform/x86/hp/hp-bioscfg/enum-attributes.c | 18 +- + .../platform/x86/hp/hp-bioscfg/int-attributes.c | 7 +- + .../x86/hp/hp-bioscfg/order-list-attributes.c | 18 +- + .../x86/hp/hp-bioscfg/passwdobj-attributes.c | 19 +- + .../platform/x86/hp/hp-bioscfg/spmobj-attributes.c | 3 +- + .../platform/x86/hp/hp-bioscfg/string-attributes.c | 12 +- + drivers/platform/x86/intel/Kconfig | 11 + + drivers/platform/x86/intel/Makefile | 4 + + drivers/platform/x86/intel/chtwc_int33fe.c | 6 +- + drivers/platform/x86/intel/ifs/core.c | 15 +- + drivers/platform/x86/intel/intel_plr_tpmi.c | 353 +++++++++++++++++++++ + drivers/platform/x86/intel/pmc/core.c | 46 +-- + drivers/platform/x86/intel/pmc/pltdrv.c | 16 +- + .../x86/intel/speed_select_if/isst_if_common.c | 75 +++-- + .../x86/intel/speed_select_if/isst_if_common.h | 3 + + .../x86/intel/speed_select_if/isst_if_mbox_msr.c | 4 +- + drivers/platform/x86/intel/telemetry/debugfs.c | 4 +- + drivers/platform/x86/intel/telemetry/pltdrv.c | 4 +- + drivers/platform/x86/intel/tpmi.c | 11 + + drivers/platform/x86/intel/tpmi_power_domains.c | 235 ++++++++++++++ + drivers/platform/x86/intel/tpmi_power_domains.h | 18 ++ + drivers/platform/x86/intel/turbo_max_3.c | 4 +- + .../uncore-frequency/uncore-frequency-common.c | 83 ++--- + .../uncore-frequency/uncore-frequency-common.h | 13 +- + .../intel/uncore-frequency/uncore-frequency-tpmi.c | 101 ++++-- + .../x86/intel/uncore-frequency/uncore-frequency.c | 108 ++++--- + drivers/platform/x86/intel_ips.c | 3 +- + drivers/platform/x86/intel_scu_wdt.c | 2 +- + drivers/platform/x86/p2sb.c | 2 +- + drivers/platform/x86/serial-multi-instantiate.c | 4 +- + drivers/platform/x86/think-lmi.c | 4 +- + drivers/platform/x86/thinkpad_acpi.c | 6 +- + include/linux/intel_tpmi.h | 2 + + 44 files changed, 1328 insertions(+), 321 deletions(-) + create mode 100644 drivers/platform/x86/dell/dell-pc.c + create mode 100644 drivers/platform/x86/intel/intel_plr_tpmi.c + create mode 100644 drivers/platform/x86/intel/tpmi_power_domains.c + create mode 100644 drivers/platform/x86/intel/tpmi_power_domains.h +Merging chrome-platform/for-next (3664706e875f power: supply: cros_charge-control: don't load if Framework control is present) +$ 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 +Auto-merging Documentation/hwmon/index.rst +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/battery.c +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/hwmon/Makefile +Auto-merging drivers/power/supply/Kconfig +Auto-merging drivers/power/supply/Makefile +Merge made by the 'ort' strategy. + Documentation/hwmon/cros_ec_hwmon.rst | 26 ++ + Documentation/hwmon/index.rst | 1 + + MAINTAINERS | 14 + + drivers/acpi/battery.c | 15 ++ + drivers/hwmon/Kconfig | 11 + + drivers/hwmon/Makefile | 1 + + drivers/hwmon/cros_ec_hwmon.c | 283 ++++++++++++++++++++ + drivers/platform/chrome/cros_ec.c | 4 +- + drivers/platform/chrome/cros_ec_debugfs.c | 9 +- + drivers/platform/chrome/cros_ec_lpc.c | 210 +++++++++++---- + drivers/platform/chrome/cros_ec_lpc_mec.c | 91 ++++++- + drivers/platform/chrome/cros_ec_lpc_mec.h | 18 +- + drivers/platform/chrome/cros_ec_proto.c | 95 ++++++- + drivers/platform/chrome/cros_ec_proto_test.c | 9 +- + drivers/platform/chrome/wilco_ec/mailbox.c | 22 +- + drivers/power/supply/Kconfig | 12 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/cros_charge-control.c | 354 +++++++++++++++++++++++++ + include/acpi/battery.h | 2 + + include/dt-bindings/input/cros-ec-keyboard.h | 104 ++++++++ + include/linux/platform_data/cros_ec_commands.h | 83 +++++- + include/linux/platform_data/cros_ec_proto.h | 6 +- + 22 files changed, 1272 insertions(+), 99 deletions(-) + create mode 100644 Documentation/hwmon/cros_ec_hwmon.rst + create mode 100644 drivers/hwmon/cros_ec_hwmon.c + create mode 100644 drivers/power/supply/cros_charge-control.c +Merging chrome-platform-firmware/for-firmware-next (fc2c1d716d4a firmware: google: add missing MODULE_DESCRIPTION() macros) +$ 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 +Merge made by the 'ort' strategy. + drivers/firmware/google/cbmem.c | 1 + + drivers/firmware/google/coreboot_table.c | 1 + + drivers/firmware/google/framebuffer-coreboot.c | 1 + + drivers/firmware/google/gsmi.c | 1 + + drivers/firmware/google/memconsole-coreboot.c | 1 + + drivers/firmware/google/memconsole-x86-legacy.c | 1 + + drivers/firmware/google/memconsole.c | 1 + + drivers/firmware/google/vpd.c | 1 + + 8 files changed, 8 insertions(+) +Merging hsi/for-next (f02cfe695047 HSI: ssi_protocol: Remove unused linux/gpio.h) +$ 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/clients/ssi_protocol.c | 1 - + 1 file changed, 1 deletion(-) +Merging leds-lj/for-leds-next (940b27161afc Revert "leds: led-core: Fix refcount leak in of_led_get()") +$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/leds/led-class.c +Auto-merging drivers/mfd/cros_ec_dev.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 90713bc04c8a] Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/leds/leds-lp55xx.yaml | 11 + + .../devicetree/bindings/leds/silergy,sy7802.yaml | 100 +++ + Documentation/leds/leds-blinkm.rst | 2 +- + MAINTAINERS | 7 +- + drivers/leds/Kconfig | 32 +- + drivers/leds/Makefile | 2 + + drivers/leds/blink/leds-bcm63138.c | 1 + + drivers/leds/flash/Kconfig | 11 + + drivers/leds/flash/Makefile | 1 + + drivers/leds/flash/leds-as3645a.c | 4 +- + drivers/leds/flash/leds-mt6360.c | 5 +- + drivers/leds/flash/leds-rt4505.c | 1 + + drivers/leds/flash/leds-sy7802.c | 539 +++++++++++++++ + drivers/leds/led-class-multicolor.c | 2 +- + drivers/leds/led-class.c | 10 +- + drivers/leds/led-core.c | 31 +- + drivers/leds/led-triggers.c | 15 +- + drivers/leds/leds-an30259a.c | 4 +- + drivers/leds/leds-bd2802.c | 2 +- + drivers/leds/leds-blinkm.c | 2 +- + drivers/leds/leds-cros_ec.c | 277 ++++++++ + drivers/leds/leds-is31fl319x.c | 4 +- + drivers/leds/leds-lm3530.c | 2 +- + drivers/leds/leds-lm3532.c | 2 +- + drivers/leds/leds-lm3642.c | 2 +- + drivers/leds/leds-lm3697.c | 2 +- + drivers/leds/leds-lp3944.c | 2 +- + drivers/leds/leds-lp3952.c | 2 +- + drivers/leds/leds-lp5521.c | 405 +---------- + drivers/leds/leds-lp5523.c | 734 ++------------------ + drivers/leds/leds-lp5562.c | 261 +------- + drivers/leds/leds-lp5569.c | 544 +++++++++++++++ + drivers/leds/leds-lp55xx-common.c | 743 +++++++++++++++++++-- + drivers/leds/leds-lp55xx-common.h | 163 +++-- + drivers/leds/leds-lp8501.c | 313 +-------- + drivers/leds/leds-lp8860.c | 2 +- + drivers/leds/leds-pca9532.c | 81 ++- + drivers/leds/leds-powernv.c | 28 +- + drivers/leds/leds-spi-byte.c | 63 +- + drivers/leds/leds-ss4200.c | 7 +- + drivers/leds/leds-tlc591xx.c | 18 +- + drivers/leds/leds-turris-omnia.c | 2 +- + drivers/leds/leds.h | 1 - + drivers/leds/rgb/leds-ncp5623.c | 16 +- + drivers/leds/rgb/leds-qcom-lpg.c | 8 +- + .../leds/simple/simatic-ipc-leds-gpio-apollolake.c | 1 + + drivers/leds/simple/simatic-ipc-leds-gpio-core.c | 1 + + .../simple/simatic-ipc-leds-gpio-elkhartlake.c | 1 + + drivers/leds/simple/simatic-ipc-leds-gpio-f7188x.c | 1 + + drivers/leds/simple/simatic-ipc-leds.c | 1 + + drivers/leds/trigger/Kconfig | 16 + + drivers/leds/trigger/Makefile | 1 + + drivers/leds/trigger/ledtrig-input-events.c | 165 +++++ + drivers/leds/trigger/ledtrig-timer.c | 5 - + drivers/mfd/cros_ec_dev.c | 18 + + drivers/platform/chrome/Kconfig | 2 +- + drivers/platform/chrome/cros_kbd_led_backlight.c | 40 +- + include/linux/leds.h | 13 +- + 58 files changed, 2933 insertions(+), 1796 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/silergy,sy7802.yaml + create mode 100644 drivers/leds/flash/leds-sy7802.c + create mode 100644 drivers/leds/leds-cros_ec.c + create mode 100644 drivers/leds/leds-lp5569.c + create mode 100644 drivers/leds/trigger/ledtrig-input-events.c +Merging ipmi/for-next (0627cef36145 ipmi: ssif_bmc: prevent integer overflow on 32bit systems) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/ssif_bmc.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging driver-core/driver-core-next (6b521fc111a2 MAINTAINERS: add Rust device abstractions to DRIVER CORE) +$ 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 MAINTAINERS +Auto-merging drivers/fsi/fsi-occ.c +CONFLICT (content): Merge conflict in drivers/fsi/fsi-occ.c +Auto-merging drivers/gpu/ipu-v3/ipu-pre.c +Auto-merging drivers/gpu/ipu-v3/ipu-prg.c +Auto-merging drivers/net/ethernet/intel/ice/ice_ptp.c +Auto-merging drivers/reset/reset-meson-audio-arb.c +CONFLICT (content): Merge conflict in drivers/reset/reset-meson-audio-arb.c +Auto-merging drivers/reset/reset-rzg2l-usbphy-ctrl.c +Auto-merging rust/bindings/bindings_helper.h +Auto-merging rust/helpers.c +Auto-merging rust/kernel/lib.rs +Resolved 'drivers/fsi/fsi-occ.c' using previous resolution. +Resolved 'drivers/reset/reset-meson-audio-arb.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8bf8acbd4443] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 3 + + drivers/base/arch_topology.c | 143 +++++++++++++------------- + drivers/base/auxiliary.c | 8 +- + drivers/base/base.h | 15 +-- + drivers/base/core.c | 17 ++- + drivers/base/dd.c | 30 +++--- + drivers/base/driver.c | 4 +- + drivers/base/firmware_loader/Kconfig | 7 ++ + drivers/base/platform.c | 22 ++-- + drivers/dca/dca-sysfs.c | 20 ++-- + drivers/dma/idxd/compat.c | 1 - + drivers/fsi/fsi-master-aspeed.c | 6 +- + drivers/fsi/fsi-master-ast-cf.c | 6 +- + drivers/fsi/fsi-master-gpio.c | 6 +- + drivers/fsi/fsi-occ.c | 6 +- + drivers/gpu/drm/imagination/pvr_drv.c | 7 +- + drivers/gpu/drm/mediatek/mtk_padding.c | 5 +- + drivers/gpu/host1x/dev.c | 6 +- + drivers/gpu/host1x/mipi.c | 17 +-- + drivers/gpu/ipu-v3/ipu-common.c | 6 +- + drivers/gpu/ipu-v3/ipu-pre.c | 5 +- + drivers/gpu/ipu-v3/ipu-prg.c | 6 +- + drivers/media/pci/intel/ipu6/ipu6-bus.h | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 4 +- + drivers/net/ethernet/intel/ice/ice_ptp.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 4 +- + drivers/nvdimm/bus.c | 19 ++-- + drivers/nvdimm/e820.c | 5 +- + drivers/nvdimm/of_pmem.c | 6 +- + drivers/parport/share.c | 2 +- + drivers/pps/clients/pps-gpio.c | 5 +- + drivers/reset/reset-meson-audio-arb.c | 6 +- + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 6 +- + drivers/reset/reset-ti-sci.c | 6 +- + include/linux/auxiliary_bus.h | 2 +- + include/linux/device.h | 21 ++-- + include/linux/platform_device.h | 15 ++- + lib/kobject_uevent.c | 17 ++- + rust/bindings/bindings_helper.h | 1 + + rust/helpers.c | 1 + + rust/kernel/device.rs | 105 +++++++++++++++++++ + rust/kernel/firmware.rs | 100 ++++++++++++++++++ + rust/kernel/lib.rs | 3 + + samples/kobject/kobject-example.c | 1 + + samples/kobject/kset-example.c | 1 + + samples/qmi/qmi_sample_client.c | 6 +- + sound/soc/sof/sof-client.c | 4 +- + 47 files changed, 447 insertions(+), 243 deletions(-) + create mode 100644 rust/kernel/device.rs + create mode 100644 rust/kernel/firmware.rs +$ git am -3 ../patches/0001-net-ethernet-rtsn-Fix-up-for-remove-coversion-to-ret.patch +Applying: net: ethernet: rtsn: Fix up for remove() coversion to return void +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/net/ethernet/renesas/rtsn.c +$ git add -A . +$ git commit -v -a --amend +[master 1b9f7c84d1de] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git + Date: Wed Jul 3 14:14:44 2024 +1000 +$ git am -3 ../patches/0001-drm-Fix-up-STM-LVDS-driver-for-void-remove-conversio.patch +Applying: drm: Fix up STM LVDS driver for void remove() conversion +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/stm/lvds.c +$ git add -A . +$ git commit -v -a --amend +[master 516c3128c87b] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git + Date: Wed Jul 3 14:14:44 2024 +1000 +Merging usb/usb-next (f7697db8b1b3 Merge 6.10-rc6 into usb-next) +$ 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/admin-guide/kernel-parameters.txt +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-bus-pci-drivers-xhci_hcd | 10 + + Documentation/admin-guide/kernel-parameters.txt | 3 + + .../devicetree/bindings/usb/cdns,usb3.yaml | 15 +- + Documentation/devicetree/bindings/usb/dwc2.yaml | 2 +- + .../devicetree/bindings/usb/genesys,gl850g.yaml | 60 +- + .../devicetree/bindings/usb/gpio-sbu-mux.yaml | 8 +- + .../bindings/usb/microchip,mpfs-musb.yaml | 7 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 29 + + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 36 +- + drivers/phy/ti/phy-da8xx-usb.c | 49 ++ + drivers/thunderbolt/Kconfig | 17 +- + drivers/thunderbolt/debugfs.c | 648 +++++++++++++++------ + drivers/thunderbolt/retimer.c | 53 +- + drivers/thunderbolt/sb_regs.h | 18 +- + drivers/thunderbolt/tb.h | 45 +- + drivers/thunderbolt/usb4.c | 187 +++--- + drivers/usb/cdns3/cdns3-ti.c | 15 +- + drivers/usb/cdns3/core.h | 1 + + drivers/usb/cdns3/drd.c | 10 +- + drivers/usb/cdns3/drd.h | 3 + + drivers/usb/chipidea/ci_hdrc_imx.c | 19 +- + drivers/usb/chipidea/ci_hdrc_msm.c | 1 + + drivers/usb/chipidea/ci_hdrc_tegra.c | 9 +- + drivers/usb/class/usbtmc.c | 1 + + drivers/usb/common/common.c | 1 + + drivers/usb/common/usb-otg-fsm.c | 1 + + drivers/usb/core/usb.c | 1 + + drivers/usb/dwc2/gadget.c | 4 +- + drivers/usb/dwc3/host.c | 4 +- + drivers/usb/gadget/composite.c | 1 + + drivers/usb/gadget/function/f_acm.c | 1 + + drivers/usb/gadget/function/f_ecm.c | 1 + + drivers/usb/gadget/function/f_eem.c | 1 + + drivers/usb/gadget/function/f_fs.c | 1 + + drivers/usb/gadget/function/f_hid.c | 1 + + drivers/usb/gadget/function/f_loopback.c | 1 + + drivers/usb/gadget/function/f_mass_storage.c | 1 + + drivers/usb/gadget/function/f_midi.c | 1 + + drivers/usb/gadget/function/f_midi2.c | 1 + + drivers/usb/gadget/function/f_ncm.c | 1 + + drivers/usb/gadget/function/f_obex.c | 1 + + drivers/usb/gadget/function/f_phonet.c | 1 + + drivers/usb/gadget/function/f_printer.c | 1 + + drivers/usb/gadget/function/f_rndis.c | 1 + + drivers/usb/gadget/function/f_serial.c | 1 + + drivers/usb/gadget/function/f_sourcesink.c | 1 + + drivers/usb/gadget/function/f_subset.c | 1 + + drivers/usb/gadget/function/f_tcm.c | 1 + + drivers/usb/gadget/function/f_uac1.c | 1 + + drivers/usb/gadget/function/f_uac1_legacy.c | 1 + + drivers/usb/gadget/function/f_uac2.c | 1 + + drivers/usb/gadget/function/f_uvc.c | 1 + + drivers/usb/gadget/function/storage_common.c | 1 + + drivers/usb/gadget/function/u_ether.c | 1 + + drivers/usb/gadget/function/u_serial.c | 1 + + drivers/usb/gadget/legacy/dbgp.c | 1 + + drivers/usb/gadget/legacy/gmidi.c | 1 + + drivers/usb/gadget/legacy/zero.c | 1 + + drivers/usb/gadget/udc/aspeed_udc.c | 2 + + drivers/usb/host/ohci-exynos.c | 1 + + drivers/usb/host/oxu210hp-hcd.c | 25 - + drivers/usb/host/xhci-dbgcap.c | 38 ++ + drivers/usb/host/xhci-dbgcap.h | 2 +- + drivers/usb/host/xhci-mem.c | 40 +- + drivers/usb/host/xhci-pci-renesas.c | 1 + + drivers/usb/host/xhci-pci.c | 4 +- + drivers/usb/host/xhci-plat.c | 3 + + drivers/usb/host/xhci-ring.c | 306 ++++------ + drivers/usb/host/xhci-trace.h | 5 +- + drivers/usb/host/xhci.h | 45 +- + drivers/usb/misc/ezusb.c | 1 + + drivers/usb/misc/isight_firmware.c | 1 + + drivers/usb/misc/onboard_usb_dev.c | 11 +- + drivers/usb/misc/usb251xb.c | 18 +- + drivers/usb/misc/usb3503.c | 2 +- + drivers/usb/misc/usb4604.c | 2 +- + drivers/usb/misc/yurex.c | 1 + + drivers/usb/mon/mon_main.c | 1 + + drivers/usb/musb/da8xx.c | 20 +- + drivers/usb/musb/mpfs.c | 2 + + drivers/usb/phy/phy-am335x-control.c | 1 + + drivers/usb/phy/phy-am335x.c | 1 + + drivers/usb/storage/uas.c | 2 + + drivers/usb/storage/usb.c | 101 +++- + drivers/usb/typec/altmodes/displayport.c | 2 +- + drivers/usb/typec/class.c | 18 +- + drivers/usb/typec/mux/gpio-sbu-mux.c | 6 +- + drivers/usb/typec/mux/nb7vpq904m.c | 95 +-- + drivers/usb/typec/mux/ptn36502.c | 33 +- + drivers/usb/typec/tcpm/tcpm.c | 37 +- + drivers/usb/typec/tipd/core.c | 33 +- + drivers/usb/typec/ucsi/Kconfig | 9 + + drivers/usb/typec/ucsi/Makefile | 1 + + drivers/usb/typec/ucsi/displayport.c | 2 +- + drivers/usb/typec/ucsi/psy.c | 32 + + drivers/usb/typec/ucsi/ucsi.c | 79 ++- + drivers/usb/typec/ucsi/ucsi.h | 46 +- + drivers/usb/typec/ucsi/ucsi_yoga_c630.c | 204 +++++++ + drivers/usb/usbip/stub_rx.c | 77 ++- + include/linux/usb/typec.h | 3 + + .../selftests/devices/boards/google,spherion.yaml | 4 + + .../selftests/devices/test_discoverable_devices.py | 37 +- + 102 files changed, 1899 insertions(+), 741 deletions(-) + create mode 100644 drivers/usb/typec/ucsi/ucsi_yoga_c630.c +Merging thunderbolt/next (49056c95df44 thunderbolt: debugfs: Use FIELD_GET()) +$ 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 (6ba59ff42279 Linux 6.10-rc4) +$ 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 (33827dc4ad89 Merge 6.10-rc6 into tty-next) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging arch/riscv/boot/dts/starfive/jh7110.dtsi +Auto-merging drivers/tty/serial/8250/8250_core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/mediatek,uart.yaml | 1 + + .../devicetree/bindings/serial/nxp,sc16is7xx.yaml | 5 + + .../devicetree/bindings/serial/renesas,scif.yaml | 136 ++++-- + .../bindings/serial/snps-dw-apb-uart.yaml | 18 +- + .../bindings/serial/via,vt8500-uart.yaml | 46 +++ + .../devicetree/bindings/serial/vt8500-uart.txt | 27 -- + arch/riscv/boot/dts/starfive/jh7110.dtsi | 30 +- + drivers/tty/amiserial.c | 1 + + drivers/tty/goldfish.c | 1 + + drivers/tty/n_gsm.c | 1 + + drivers/tty/n_hdlc.c | 1 + + drivers/tty/serial/8250/8250.h | 29 +- + drivers/tty/serial/8250/8250_core.c | 460 +-------------------- + drivers/tty/serial/8250/8250_dw.c | 2 +- + drivers/tty/serial/8250/8250_parisc.c | 1 + + drivers/tty/serial/8250/8250_pcilib.c | 1 + + drivers/tty/serial/8250/8250_platform.c | 337 +++++++++++++++ + drivers/tty/serial/8250/8250_port.c | 1 + + drivers/tty/serial/8250/8250_pxa.c | 1 + + drivers/tty/serial/8250/8250_rsa.c | 133 ++++++ + drivers/tty/serial/8250/Makefile | 6 +- + drivers/tty/serial/8250/serial_cs.c | 1 + + drivers/tty/serial/esp32_acm.c | 1 + + drivers/tty/serial/esp32_uart.c | 1 + + drivers/tty/serial/imx.c | 41 +- + drivers/tty/serial/owl-uart.c | 1 + + drivers/tty/serial/sc16is7xx.c | 31 +- + drivers/tty/serial/serial_mctrl_gpio.c | 1 + + drivers/tty/serial/sh-sci.c | 55 ++- + drivers/tty/serial/sunsu.c | 37 +- + drivers/tty/synclink_gt.c | 1 + + drivers/tty/ttynull.c | 1 + + drivers/tty/vt/keyboard.c | 4 +- + include/linux/serial_sci.h | 1 + + 34 files changed, 831 insertions(+), 583 deletions(-) + create mode 100644 Documentation/devicetree/bindings/serial/via,vt8500-uart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/vt8500-uart.txt + create mode 100644 drivers/tty/serial/8250/8250_platform.c + create mode 100644 drivers/tty/serial/8250/8250_rsa.c +Merging char-misc/char-misc-next (19ed3bb5587b Merge 6.10-rc6 into char-misc-next) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/parport/share.c +Resolved 'Documentation/devicetree/bindings/vendor-prefixes.yaml' using previous resolution. +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b3b0b1f31675] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-bus-iio-inv_icm42600 | 18 + + Documentation/devicetree/bindings/iio/adc/adc.yaml | 19 + + .../devicetree/bindings/iio/adc/adi,ad7192.yaml | 95 +++ + .../devicetree/bindings/iio/adc/adi,ad7380.yaml | 148 ++++ + .../bindings/iio/adc/amlogic,meson-saradc.yaml | 3 + + .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 1 + + .../bindings/iio/chemical/sciosense,ens160.yaml | 70 ++ + .../devicetree/bindings/iio/dac/adi,ad3552r.yaml | 43 +- + .../devicetree/bindings/iio/imu/adi,adis16475.yaml | 31 + + .../devicetree/bindings/iio/imu/adi,adis16480.yaml | 6 + + .../devicetree/bindings/iio/imu/bosch,bmi160.yaml | 6 +- + .../bindings/iio/light/vishay,veml6075.yaml | 9 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/iio/adis16475.rst | 23 +- + Documentation/iio/adis16480.rst | 443 +++++++++++ + Documentation/iio/iio_tools.rst | 27 + + Documentation/iio/index.rst | 2 + + MAINTAINERS | 19 + + drivers/char/lp.c | 1 + + drivers/char/nvram.c | 1 + + drivers/char/ppdev.c | 1 + + drivers/char/tlclk.c | 1 + + drivers/char/ttyprintk.c | 1 + + drivers/hwmon/peci/cputemp.c | 8 +- + drivers/iio/accel/adxl313_spi.c | 8 +- + drivers/iio/accel/adxl355_spi.c | 10 +- + drivers/iio/accel/adxl367_i2c.c | 4 +- + drivers/iio/accel/adxl372_i2c.c | 2 +- + drivers/iio/accel/bma400_i2c.c | 2 +- + drivers/iio/accel/bmi088-accel-core.c | 5 - + drivers/iio/accel/da311.c | 2 +- + drivers/iio/accel/dmard06.c | 6 +- + drivers/iio/accel/dmard09.c | 4 +- + drivers/iio/accel/dmard10.c | 2 +- + drivers/iio/accel/kxsd9-i2c.c | 4 +- + drivers/iio/accel/mc3230.c | 2 +- + drivers/iio/accel/mma7455_i2c.c | 4 +- + drivers/iio/accel/mma7660.c | 52 +- + drivers/iio/accel/mma9551.c | 2 +- + drivers/iio/accel/mma9553.c | 4 +- + drivers/iio/accel/mxc4005.c | 6 +- + drivers/iio/accel/mxc6255.c | 4 +- + drivers/iio/accel/stk8312.c | 4 +- + drivers/iio/accel/stk8ba50.c | 2 +- + drivers/iio/adc/Kconfig | 28 +- + drivers/iio/adc/Makefile | 25 +- + drivers/iio/adc/ad7192.c | 273 +++++-- + drivers/iio/adc/ad7291.c | 2 +- + drivers/iio/adc/ad7380.c | 833 ++++++++++++++++++++ + drivers/iio/adc/ad7606.c | 19 +- + drivers/iio/adc/ad7944.c | 8 +- + drivers/iio/adc/ad9467.c | 103 ++- + drivers/iio/adc/adi-axi-adc.c | 18 +- + drivers/iio/adc/axp20x_adc.c | 279 +++++++ + drivers/iio/adc/ingenic-adc.c | 1 + + drivers/iio/adc/ltc2485.c | 2 +- + drivers/iio/adc/max11205.c | 5 +- + drivers/iio/adc/mcp3564.c | 6 - + drivers/iio/adc/nau7802.c | 2 +- + drivers/iio/adc/pac1934.c | 5 - + drivers/iio/adc/ti-adc161s626.c | 18 +- + drivers/iio/adc/ti-ads131e08.c | 4 +- + drivers/iio/adc/ti-ads7924.c | 2 +- + drivers/iio/adc/ti-tsc2046.c | 7 +- + drivers/iio/adc/xilinx-ams.c | 1 + + drivers/iio/addac/ad74413r.c | 13 +- + drivers/iio/buffer/kfifo_buf.c | 1 + + drivers/iio/chemical/Kconfig | 20 + + drivers/iio/chemical/Makefile | 3 + + drivers/iio/chemical/ams-iaq-core.c | 4 +- + drivers/iio/chemical/bme680_i2c.c | 4 +- + drivers/iio/chemical/ccs811.c | 2 +- + drivers/iio/chemical/ens160.h | 10 + + drivers/iio/chemical/ens160_core.c | 367 +++++++++ + drivers/iio/chemical/ens160_i2c.c | 62 ++ + drivers/iio/chemical/ens160_spi.c | 61 ++ + drivers/iio/dac/Kconfig | 1 + + drivers/iio/dac/ad3552r.c | 140 ++-- + drivers/iio/dac/max5522.c | 11 +- + drivers/iio/dac/mcp4728.c | 2 +- + drivers/iio/frequency/adrf6780.c | 1 - + drivers/iio/gyro/bmg160_i2c.c | 6 +- + drivers/iio/gyro/fxas21002c_i2c.c | 2 +- + drivers/iio/gyro/itg3200_core.c | 2 +- + drivers/iio/health/afe4404.c | 2 +- + drivers/iio/health/max30100.c | 2 +- + drivers/iio/humidity/am2315.c | 2 +- + drivers/iio/humidity/hdc100x.c | 12 +- + drivers/iio/humidity/si7005.c | 4 +- + drivers/iio/humidity/si7020.c | 141 +++- + drivers/iio/imu/Kconfig | 4 +- + drivers/iio/imu/adis16475.c | 809 +++++++++++++++++--- + drivers/iio/imu/adis16480.c | 393 ++++++++-- + drivers/iio/imu/adis_buffer.c | 32 +- + drivers/iio/imu/adis_trigger.c | 37 +- + drivers/iio/imu/bmi160/bmi160_core.c | 26 +- + drivers/iio/imu/bmi160/bmi160_i2c.c | 5 +- + drivers/iio/imu/bmi160/bmi160_spi.c | 3 + + drivers/iio/imu/bmi323/bmi323_core.c | 8 +- + drivers/iio/imu/bno055/bno055_i2c.c | 2 +- + drivers/iio/imu/fxos8700_i2c.c | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 4 + + drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 124 ++- + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 71 ++ + drivers/iio/imu/kmx61.c | 2 +- + drivers/iio/industrialio-buffer.c | 129 +++- + drivers/iio/industrialio-core.c | 7 +- + drivers/iio/industrialio-event.c | 13 +- + drivers/iio/industrialio-gts-helper.c | 7 +- + drivers/iio/inkern.c | 32 +- + drivers/iio/light/Kconfig | 11 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/adjd_s311.c | 2 +- + drivers/iio/light/adux1020.c | 2 +- + drivers/iio/light/al3320a.c | 2 +- + drivers/iio/light/apds9300.c | 2 +- + drivers/iio/light/apds9960.c | 2 +- + drivers/iio/light/bh1780.c | 4 +- + drivers/iio/light/cm3232.c | 2 +- + drivers/iio/light/cm3323.c | 2 +- + drivers/iio/light/cm36651.c | 2 +- + drivers/iio/light/gp2ap002.c | 4 +- + drivers/iio/light/gp2ap020a00f.c | 3 +- + drivers/iio/light/isl29028.c | 4 +- + drivers/iio/light/isl29125.c | 2 +- + drivers/iio/light/jsa1212.c | 2 +- + drivers/iio/light/lv0104cs.c | 2 +- + drivers/iio/light/max44000.c | 2 +- + drivers/iio/light/max44009.c | 2 +- + drivers/iio/light/noa1305.c | 2 +- + drivers/iio/light/opt3001.c | 2 +- + drivers/iio/light/pa12203001.c | 2 +- + drivers/iio/light/rohm-bu27034.c | 6 - + drivers/iio/light/rpr0521.c | 2 +- + drivers/iio/light/si1133.c | 2 +- + drivers/iio/light/stk3310.c | 37 +- + drivers/iio/light/tcs3414.c | 2 +- + drivers/iio/light/tcs3472.c | 2 +- + drivers/iio/light/tsl4531.c | 2 +- + drivers/iio/light/us5182d.c | 2 +- + drivers/iio/light/vcnl4035.c | 2 +- + drivers/iio/light/veml6030.c | 2 +- + drivers/iio/light/veml6040.c | 281 +++++++ + drivers/iio/light/veml6070.c | 2 +- + drivers/iio/light/vl6180.c | 2 +- + drivers/iio/light/zopt2201.c | 2 +- + drivers/iio/magnetometer/af8133j.c | 2 +- + drivers/iio/magnetometer/ak8974.c | 8 +- + drivers/iio/magnetometer/bmc150_magn_i2c.c | 6 +- + drivers/iio/magnetometer/mag3110.c | 2 +- + drivers/iio/magnetometer/mmc35240.c | 2 +- + drivers/iio/magnetometer/tmag5273.c | 2 - + drivers/iio/multiplexer/iio-mux.c | 1 - + drivers/iio/potentiostat/lmp91000.c | 4 +- + drivers/iio/pressure/bmp280-core.c | 835 ++++++++++++--------- + drivers/iio/pressure/bmp280-regmap.c | 8 +- + drivers/iio/pressure/bmp280-spi.c | 4 +- + drivers/iio/pressure/bmp280.h | 65 +- + drivers/iio/pressure/dps310.c | 2 +- + drivers/iio/pressure/hp03.c | 4 +- + drivers/iio/pressure/icp10100.c | 2 +- + drivers/iio/pressure/mpl115_i2c.c | 2 +- + drivers/iio/pressure/mpl3115.c | 2 +- + drivers/iio/pressure/t5403.c | 2 +- + drivers/iio/pressure/zpa2326_i2c.c | 4 +- + drivers/iio/proximity/isl29501.c | 2 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 6 +- + drivers/iio/proximity/rfd77402.c | 2 +- + drivers/iio/proximity/sx9500.c | 4 +- + drivers/iio/proximity/vl53l0x-i2c.c | 2 +- + drivers/iio/temperature/max30208.c | 1 - + drivers/iio/temperature/mcp9600.c | 363 ++++++++- + drivers/iio/temperature/mlx90632.c | 2 +- + drivers/iio/temperature/tmp006.c | 2 +- + drivers/iio/temperature/tmp007.c | 2 +- + drivers/iio/temperature/tsys01.c | 2 +- + drivers/iio/temperature/tsys02d.c | 2 +- + drivers/iio/test/iio-test-gts.c | 8 +- + drivers/mcb/mcb-pci.c | 16 +- + drivers/misc/eeprom/digsy_mtc_eeprom.c | 46 +- + drivers/misc/eeprom/ee1004.c | 2 +- + drivers/misc/eeprom/eeprom_93xx46.c | 178 ++--- + drivers/misc/eeprom/idt_89hpesx.c | 96 +-- + drivers/misc/eeprom/max6875.c | 2 +- + drivers/misc/mei/bus-fixup.c | 8 +- + drivers/misc/open-dice.c | 1 + + drivers/parport/share.c | 1 + + drivers/peci/controller/peci-aspeed.c | 1 + + drivers/peci/core.c | 5 +- + drivers/peci/cpu.c | 21 +- + drivers/peci/device.c | 3 +- + drivers/peci/internal.h | 6 +- + drivers/siox/siox-bus-gpio.c | 1 + + drivers/staging/iio/addac/adt7316-i2c.c | 12 +- + drivers/staging/iio/addac/adt7316.c | 9 - + drivers/staging/iio/impedance-analyzer/ad5933.c | 4 +- + drivers/uio/uio.c | 1 + + drivers/uio/uio_aec.c | 1 + + drivers/uio/uio_cif.c | 1 + + drivers/uio/uio_mf624.c | 3 +- + drivers/uio/uio_netx.c | 1 + + include/linux/eeprom_93xx46.h | 32 - + include/linux/iio/iio.h | 94 ++- + include/linux/iio/imu/adis.h | 21 +- + include/linux/peci-cpu.h | 24 + + include/linux/peci.h | 6 +- + lib/math/prime_numbers.c | 1 + + lib/math/rational-test.c | 1 + + lib/test_dynamic_debug.c | 1 + + 209 files changed, 6293 insertions(+), 1399 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-inv_icm42600 + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7380.yaml + create mode 100644 Documentation/devicetree/bindings/iio/chemical/sciosense,ens160.yaml + create mode 100644 Documentation/iio/adis16480.rst + create mode 100644 Documentation/iio/iio_tools.rst + create mode 100644 drivers/iio/adc/ad7380.c + create mode 100644 drivers/iio/chemical/ens160.h + create mode 100644 drivers/iio/chemical/ens160_core.c + create mode 100644 drivers/iio/chemical/ens160_i2c.c + create mode 100644 drivers/iio/chemical/ens160_spi.c + create mode 100644 drivers/iio/light/veml6040.c + delete mode 100644 include/linux/eeprom_93xx46.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 (2e5657aa5966 hwtracing: use for_each_endpoint_of_node()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Merge made by the 'ort' strategy. + drivers/hwtracing/coresight/coresight-platform.c | 8 +++++--- + drivers/hwtracing/coresight/coresight-priv.h | 2 +- + drivers/hwtracing/coresight/coresight-sysfs.c | 2 +- + drivers/hwtracing/coresight/coresight-tmc-core.c | 1 - + 4 files changed, 7 insertions(+), 6 deletions(-) +Merging fastrpc/for-next (47bf4198bf38 MAINTAINERS: CC dri-devel list on Qualcomm FastRPC patches) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/misc/fastrpc.c | 87 +++++++++++++++++++++++++++++++++------------ + include/uapi/misc/fastrpc.h | 3 ++ + 3 files changed, 68 insertions(+), 23 deletions(-) +Merging fpga/for-next (3a0fa8e97d30 fpga: altera-fpga2sdram: remove unused struct 'prop_map') +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + drivers/fpga/altera-fpga2sdram.c | 6 ------ + drivers/fpga/tests/Kconfig | 4 ++-- + 2 files changed, 2 insertions(+), 8 deletions(-) +Merging icc/icc-next (3c6ffb017091 Merge branch 'icc-msm8953' 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 +Merge made by the 'ort' strategy. + .../bindings/interconnect/mediatek,mt8183-emi.yaml | 51 + + .../bindings/interconnect/qcom,msm8953.yaml | 101 ++ + .../bindings/interconnect/qcom,sc7280-rpmh.yaml | 53 + + drivers/interconnect/Kconfig | 1 + + drivers/interconnect/Makefile | 1 + + drivers/interconnect/imx/imx.c | 1 + + drivers/interconnect/imx/imx8mm.c | 1 + + drivers/interconnect/imx/imx8mn.c | 1 + + drivers/interconnect/imx/imx8mp.c | 1 + + drivers/interconnect/imx/imx8mq.c | 1 + + drivers/interconnect/mediatek/Kconfig | 29 + + drivers/interconnect/mediatek/Makefile | 5 + + drivers/interconnect/mediatek/icc-emi.c | 153 +++ + drivers/interconnect/mediatek/icc-emi.h | 40 + + drivers/interconnect/mediatek/mt8183.c | 143 +++ + drivers/interconnect/mediatek/mt8195.c | 339 +++++ + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/icc-common.c | 1 + + drivers/interconnect/qcom/icc-rpmh.c | 94 ++ + drivers/interconnect/qcom/icc-rpmh.h | 35 + + drivers/interconnect/qcom/msm8953.c | 1321 ++++++++++++++++++++ + drivers/interconnect/qcom/qcm2290.c | 2 +- + drivers/interconnect/qcom/sc7280.c | 274 ++++ + include/dt-bindings/interconnect/mediatek,mt8183.h | 23 + + include/dt-bindings/interconnect/mediatek,mt8195.h | 44 + + include/dt-bindings/interconnect/qcom,msm8953.h | 93 ++ + 27 files changed, 2818 insertions(+), 1 deletion(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/mediatek,mt8183-emi.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,msm8953.yaml + create mode 100644 drivers/interconnect/mediatek/Kconfig + create mode 100644 drivers/interconnect/mediatek/Makefile + create mode 100644 drivers/interconnect/mediatek/icc-emi.c + create mode 100644 drivers/interconnect/mediatek/icc-emi.h + create mode 100644 drivers/interconnect/mediatek/mt8183.c + create mode 100644 drivers/interconnect/mediatek/mt8195.c + create mode 100644 drivers/interconnect/qcom/msm8953.c + create mode 100644 include/dt-bindings/interconnect/mediatek,mt8183.h + create mode 100644 include/dt-bindings/interconnect/mediatek,mt8195.h + create mode 100644 include/dt-bindings/interconnect/qcom,msm8953.h +Merging iio/togreg (529d2e190064 iio: adc: ad7173: Fix uninitialized symbol is_current_chan) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Auto-merging drivers/hwmon/iio_hwmon.c +Auto-merging drivers/iio/adc/ad7266.c +Auto-merging drivers/iio/adc/xilinx-ams.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/iio/adc/adc.yaml | 11 + + .../devicetree/bindings/iio/adc/adi,ad7173.yaml | 194 ++++- + .../devicetree/bindings/iio/adc/adi,ad7606.yaml | 5 +- + .../bindings/iio/adc/mediatek,mt6359-auxadc.yaml | 33 + + .../bindings/iio/adc/st,stm32-dfsdm-adc.yaml | 4 + + .../devicetree/bindings/iio/adc/ti,ads1119.yaml | 155 ++++ + .../bindings/iio/frequency/adi,adf4350.yaml | 6 + + .../devicetree/bindings/iio/st,st-sensors.yaml | 1 + + Documentation/driver-api/dmaengine/client.rst | 9 + + Documentation/driver-api/dmaengine/provider.rst | 10 + + Documentation/iio/iio_dmabuf_api.rst | 54 ++ + Documentation/iio/index.rst | 1 + + MAINTAINERS | 17 +- + drivers/dma/dma-axi-dmac.c | 40 + + drivers/hwmon/iio_hwmon.c | 45 +- + drivers/iio/Kconfig | 1 + + drivers/iio/accel/fxls8962af-core.c | 18 +- + drivers/iio/accel/kxsd9.c | 5 +- + drivers/iio/accel/msa311.c | 8 +- + drivers/iio/accel/st_accel.h | 1 + + drivers/iio/accel/st_accel_core.c | 81 ++ + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/accel/st_accel_spi.c | 5 + + drivers/iio/adc/Kconfig | 24 + + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/ad4130.c | 4 +- + drivers/iio/adc/ad7124.c | 14 +- + drivers/iio/adc/ad7173.c | 676 ++++++++++++----- + drivers/iio/adc/ad7192.c | 128 ++-- + drivers/iio/adc/ad7266.c | 33 +- + drivers/iio/adc/ad7292.c | 36 +- + drivers/iio/adc/ad7793.c | 24 +- + drivers/iio/adc/ad7944.c | 80 +- + drivers/iio/adc/ad_sigma_delta.c | 1 + + drivers/iio/adc/adi-axi-adc.c | 9 +- + drivers/iio/adc/aspeed_adc.c | 30 +- + drivers/iio/adc/axp20x_adc.c | 5 +- + drivers/iio/adc/axp288_adc.c | 4 +- + drivers/iio/adc/bcm_iproc_adc.c | 8 +- + drivers/iio/adc/berlin2-adc.c | 24 +- + drivers/iio/adc/cpcap-adc.c | 46 +- + drivers/iio/adc/fsl-imx25-gcq.c | 16 +- + drivers/iio/adc/hx711.c | 78 +- + drivers/iio/adc/ina2xx-adc.c | 3 +- + drivers/iio/adc/intel_mrfld_adc.c | 4 +- + drivers/iio/adc/ltc2309.c | 45 +- + drivers/iio/adc/max1363.c | 28 +- + drivers/iio/adc/meson_saradc.c | 101 ++- + drivers/iio/adc/mp2629_adc.c | 19 +- + drivers/iio/adc/mt6359-auxadc.c | 606 +++++++++++++++ + drivers/iio/adc/qcom-spmi-rradc.c | 50 +- + drivers/iio/adc/rn5t618-adc.c | 5 +- + drivers/iio/adc/sc27xx_adc.c | 41 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 29 +- + drivers/iio/adc/ti-adc108s102.c | 28 +- + drivers/iio/adc/ti-ads1119.c | 825 +++++++++++++++++++++ + drivers/iio/adc/ti-ads8688.c | 59 +- + drivers/iio/adc/xilinx-ams.c | 107 +-- + drivers/iio/buffer/industrialio-buffer-dma.c | 178 ++++- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 64 +- + drivers/iio/common/scmi_sensors/scmi_iio.c | 45 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 3 +- + drivers/iio/dac/ad3552r.c | 28 +- + drivers/iio/dac/adi-axi-dac.c | 9 +- + drivers/iio/dac/ltc2688.c | 5 +- + drivers/iio/dac/stm32-dac-core.c | 5 +- + drivers/iio/frequency/adf4350.c | 124 +++- + drivers/iio/gyro/adis16136.c | 26 +- + drivers/iio/gyro/adis16260.c | 19 +- + drivers/iio/gyro/bmg160_core.c | 4 +- + drivers/iio/gyro/mpu3050-core.c | 35 +- + drivers/iio/health/afe4403.c | 9 +- + drivers/iio/health/afe4404.c | 9 +- + drivers/iio/health/max30100.c | 5 +- + drivers/iio/health/max30102.c | 5 +- + drivers/iio/iio_core.h | 4 + + drivers/iio/imu/adis.c | 11 +- + drivers/iio/imu/adis16400.c | 72 +- + drivers/iio/imu/adis16475.c | 44 +- + drivers/iio/imu/adis16480.c | 65 +- + drivers/iio/imu/adis_buffer.c | 41 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 14 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 9 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 4 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 4 +- + drivers/iio/industrialio-backend.c | 8 +- + drivers/iio/industrialio-buffer.c | 459 ++++++++++++ + drivers/iio/industrialio-core.c | 25 +- + drivers/iio/inkern.c | 6 + + drivers/iio/light/adux1020.c | 13 +- + drivers/iio/light/iqs621-als.c | 4 +- + drivers/iio/light/isl29018.c | 6 +- + drivers/iio/light/st_uvis25_core.c | 4 +- + drivers/iio/light/veml6030.c | 4 +- + drivers/iio/magnetometer/ak8974.c | 10 +- + drivers/iio/magnetometer/mmc35240.c | 8 +- + drivers/iio/pressure/bmp280-core.c | 4 +- + drivers/iio/proximity/sx9324.c | 5 +- + drivers/iio/proximity/sx9360.c | 5 +- + drivers/iio/proximity/sx9500.c | 12 +- + drivers/iio/proximity/sx_common.c | 9 +- + drivers/iio/temperature/ltc2983.c | 260 +++---- + drivers/iio/temperature/mlx90632.c | 4 +- + drivers/iio/trigger/stm32-timer-trigger.c | 34 +- + .../dt-bindings/iio/adc/mediatek,mt6357-auxadc.h | 21 + + .../dt-bindings/iio/adc/mediatek,mt6358-auxadc.h | 22 + + .../dt-bindings/iio/adc/mediatek,mt6359-auxadc.h | 22 + + include/linux/dev_printk.h | 8 + + include/linux/dmaengine.h | 33 + + include/linux/iio/adc/ad_sigma_delta.h | 14 + + include/linux/iio/buffer-dma.h | 31 + + include/linux/iio/buffer_impl.h | 33 + + include/linux/iio/consumer.h | 10 + + include/linux/iio/imu/adis.h | 66 +- + include/linux/math.h | 2 + + include/uapi/linux/iio/buffer.h | 22 + + 116 files changed, 4413 insertions(+), 1493 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/mediatek,mt6359-auxadc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads1119.yaml + create mode 100644 Documentation/iio/iio_dmabuf_api.rst + create mode 100644 drivers/iio/adc/mt6359-auxadc.c + create mode 100644 drivers/iio/adc/ti-ads1119.c + create mode 100644 include/dt-bindings/iio/adc/mediatek,mt6357-auxadc.h + create mode 100644 include/dt-bindings/iio/adc/mediatek,mt6358-auxadc.h + create mode 100644 include/dt-bindings/iio/adc/mediatek,mt6359-auxadc.h +Merging phy-next/next (2a011c3c12e8 phy: airoha: Add dtime and Rx AEQ IO registers) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging MAINTAINERS +Auto-merging include/linux/soc/samsung/exynos-regs-pmu.h +CONFLICT (content): Merge conflict in include/linux/soc/samsung/exynos-regs-pmu.h +Recorded preimage for 'include/linux/soc/samsung/exynos-regs-pmu.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'include/linux/soc/samsung/exynos-regs-pmu.h'. +[master 1ff4717867ba] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/phy/airoha,en7581-pcie-phy.yaml | 69 ++ + .../bindings/phy/amlogic,g12a-usb2-phy.yaml | 3 + + .../devicetree/bindings/phy/fsl,imx8qm-hsio.yaml | 164 +++ + .../phy/marvell,armada-cp110-utmi-phy.yaml | 6 + + .../bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml | 2 + + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 7 +- + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 5 +- + .../devicetree/bindings/phy/qcom,usb-hs-phy.yaml | 2 + + .../bindings/phy/rockchip,rk3399-emmc-phy.yaml | 64 + + .../devicetree/bindings/phy/rockchip-emmc-phy.txt | 43 - + .../bindings/phy/samsung,usb3-drd-phy.yaml | 77 +- + .../bindings/phy/starfive,jh7110-dphy-tx.yaml | 68 ++ + .../devicetree/bindings/soc/rockchip/grf.yaml | 16 +- + MAINTAINERS | 15 + + drivers/phy/Kconfig | 10 + + drivers/phy/Makefile | 1 + + drivers/phy/broadcom/phy-bcm-ns-usb2.c | 1 + + drivers/phy/broadcom/phy-bcm-ns-usb3.c | 1 + + drivers/phy/cadence/phy-cadence-torrent.c | 207 +++- + drivers/phy/freescale/Kconfig | 9 +- + drivers/phy/freescale/Makefile | 1 + + drivers/phy/freescale/phy-fsl-imx8qm-hsio.c | 611 ++++++++++ + drivers/phy/phy-airoha-pcie-regs.h | 494 ++++++++ + drivers/phy/phy-airoha-pcie.c | 1286 ++++++++++++++++++++ + drivers/phy/phy-core.c | 2 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 318 ++++- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5.h | 14 + + drivers/phy/qualcomm/phy-qcom-qmp-qserdes-pll.h | 3 + + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 3 + + drivers/phy/rockchip/Kconfig | 2 + + drivers/phy/samsung/phy-exynos5-usbdrd.c | 1053 +++++++++++++--- + drivers/phy/samsung/phy-exynos5250-usb2.c | 2 +- + drivers/phy/st/phy-miphy28lp.c | 5 - + drivers/phy/starfive/Kconfig | 10 + + drivers/phy/starfive/Makefile | 1 + + drivers/phy/starfive/phy-jh7110-dphy-rx.c | 5 - + drivers/phy/starfive/phy-jh7110-dphy-tx.c | 461 +++++++ + drivers/phy/ti/phy-am654-serdes.c | 1 - + drivers/phy/ti/phy-j721e-wiz.c | 133 +- + drivers/phy/xilinx/phy-zynqmp.c | 198 +-- + include/linux/soc/samsung/exynos-regs-pmu.h | 4 + + 41 files changed, 4925 insertions(+), 452 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/airoha,en7581-pcie-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8qm-hsio.yaml + create mode 100644 Documentation/devicetree/bindings/phy/rockchip,rk3399-emmc-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/rockchip-emmc-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/starfive,jh7110-dphy-tx.yaml + create mode 100644 drivers/phy/freescale/phy-fsl-imx8qm-hsio.c + create mode 100644 drivers/phy/phy-airoha-pcie-regs.h + create mode 100644 drivers/phy/phy-airoha-pcie.c + create mode 100644 drivers/phy/starfive/phy-jh7110-dphy-tx.c +Merging soundwire/next (518aee32c551 drivers:soundwire: qcom: cleanup port maask calculations) +$ 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_auxdevice.c +Merge made by the 'ort' strategy. + drivers/soundwire/bus.c | 6 +- + drivers/soundwire/debugfs.c | 150 +++++++++++++++++++++++ + drivers/soundwire/generic_bandwidth_allocation.c | 14 +-- + drivers/soundwire/intel.h | 5 + + drivers/soundwire/intel_ace2x.c | 17 ++- + drivers/soundwire/intel_ace2x_debugfs.c | 2 +- + drivers/soundwire/intel_auxdevice.c | 20 +++ + drivers/soundwire/intel_bus_common.c | 2 +- + drivers/soundwire/qcom.c | 22 +--- + drivers/soundwire/stream.c | 5 + + include/linux/soundwire/sdw.h | 2 + + include/linux/soundwire/sdw_intel.h | 5 + + 12 files changed, 220 insertions(+), 30 deletions(-) +Merging extcon/extcon-next (e508f2606c0b extcon: Add LC824206XA microUSB switch driver) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + drivers/extcon/Kconfig | 11 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-axp288.c | 2 +- + drivers/extcon/extcon-lc824206xa.c | 500 +++++++++++++++++++++++++++++++++++++ + 4 files changed, 513 insertions(+), 1 deletion(-) + create mode 100644 drivers/extcon/extcon-lc824206xa.c +Merging gnss/gnss-next (6ba59ff42279 Linux 6.10-rc4) +$ 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 (abe8103da3c5 vfio/pci: Fix typo in macro to declare accessors) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Merge made by the 'ort' strategy. + drivers/vfio/pci/vfio_pci_rdwr.c | 122 ++++++++++++++++++++------------------- + include/linux/vfio_pci_core.h | 21 ++++--- + 2 files changed, 74 insertions(+), 69 deletions(-) +Merging w1/for-next (26bf5fc86033 w1: Drop allocation error message) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Merge made by the 'ort' strategy. + drivers/w1/w1.c | 2 +- + drivers/w1/w1_int.c | 6 +----- + include/linux/w1.h | 7 ++++--- + 3 files changed, 6 insertions(+), 9 deletions(-) +Merging spmi/spmi-next (1613e604df0c Linux 6.10-rc1) +$ 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 (d67f063101f5 Merge 6.10-rc6 into staging-next) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Merge made by the 'ort' strategy. + drivers/staging/fbtft/fbtft-core.c | 1 + + drivers/staging/greybus/audio_manager.c | 1 + + drivers/staging/greybus/audio_topology.c | 6 - + drivers/staging/greybus/bootrom.c | 1 + + drivers/staging/greybus/camera.c | 1 + + drivers/staging/greybus/gbphy.c | 1 + + drivers/staging/greybus/gpio.c | 1 + + drivers/staging/greybus/hid.c | 1 + + drivers/staging/greybus/i2c.c | 1 + + drivers/staging/greybus/light.c | 1 + + drivers/staging/greybus/log.c | 1 + + drivers/staging/greybus/loopback.c | 1 + + drivers/staging/greybus/power_supply.c | 1 + + drivers/staging/greybus/pwm.c | 1 + + drivers/staging/greybus/raw.c | 1 + + drivers/staging/greybus/sdio.c | 1 + + drivers/staging/greybus/spi.c | 1 + + drivers/staging/greybus/spilib.c | 1 + + drivers/staging/greybus/uart.c | 1 + + drivers/staging/greybus/usb.c | 1 + + drivers/staging/greybus/vibrator.c | 1 + + drivers/staging/nvec/nvec.c | 41 +-- + drivers/staging/rtl8192e/rtl8192e/r8190P_def.h | 9 - + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 21 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 1 + + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 6 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 176 ++++++------ + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 6 +- + drivers/staging/rtl8192e/rtl8192e/rtl_pci.h | 1 + + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 2 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 4 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 10 +- + drivers/staging/rtl8192e/rtllib.h | 64 ++--- + drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 5 +- + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 11 +- + drivers/staging/rtl8192e/rtllib_crypt_wep.c | 5 +- + drivers/staging/rtl8192e/rtllib_module.c | 1 + + drivers/staging/rtl8192e/rtllib_rx.c | 228 ++++++++-------- + drivers/staging/rtl8192e/rtllib_softmac.c | 8 +- + drivers/staging/rtl8192e/rtllib_tx.c | 135 +++++----- + drivers/staging/rtl8712/rtl8712_xmit.c | 2 +- + drivers/staging/rtl8712/rtl871x_event.h | 2 +- + drivers/staging/rtl8712/rtl871x_io.h | 2 +- + drivers/staging/rtl8712/rtl871x_mlme.c | 2 +- + drivers/staging/rtl8712/rtl871x_xmit.c | 13 +- + drivers/staging/rtl8712/rtl871x_xmit.h | 1 - + drivers/staging/rtl8712/usb_ops_linux.c | 7 - + drivers/staging/rtl8723bs/hal/odm.h | 4 +- + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 4 +- + drivers/staging/rtl8723bs/include/drv_types.h | 1 - + drivers/staging/rtl8723bs/include/rtw_io.h | 57 ---- + drivers/staging/rtl8723bs/include/rtw_mlme.h | 156 ----------- + drivers/staging/rtl8723bs/include/rtw_mp.h | 29 -- + drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 38 --- + drivers/staging/rtl8723bs/include/rtw_recv.h | 16 -- + drivers/staging/rtl8723bs/include/rtw_security.h | 5 - + drivers/staging/rtl8723bs/include/rtw_xmit.h | 10 - + drivers/staging/rtl8723bs/include/sdio_hal.h | 4 - + drivers/staging/rtl8723bs/include/sdio_osintf.h | 16 -- + drivers/staging/rtl8723bs/include/sta_info.h | 44 --- + drivers/staging/rtl8723bs/include/wifi.h | 299 --------------------- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 17 -- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 8 +- + drivers/staging/vc04_services/interface/TESTING | 45 +++- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 258 +++++++++--------- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 3 - + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 10 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 6 - + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 2 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 8 +- + drivers/staging/vme_user/vme_user.c | 1 + + drivers/staging/vt6656/TODO | 1 - + 72 files changed, 573 insertions(+), 1258 deletions(-) + delete mode 100644 drivers/staging/rtl8723bs/include/sdio_osintf.h +Merging counter-next/counter-next (7b47e79eac4c Merge tag 'ib-mfd-counter-v5.11' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/lee/mfd into counter-next) +$ 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. + .../devicetree/bindings/counter/ti-eqep.yaml | 27 +++- + drivers/counter/Kconfig | 2 +- + drivers/counter/ftm-quaddec.c | 1 + + drivers/counter/stm32-timer-cnt.c | 4 +- + drivers/counter/ti-eqep.c | 131 +++++++++++++-- + include/linux/mfd/stm32-timers.h | 179 +++++++++++---------- + 6 files changed, 235 insertions(+), 109 deletions(-) +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 (44c026a73be8 Linux 6.4-rc3) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (316d1225b112 dmaengine: fsl-dpaa2-qdma: add missing MODULE_DESCRIPTION() macro) +$ 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/Kconfig +Auto-merging drivers/dma/ioat/init.c +Auto-merging drivers/dma/ti/k3-udma-glue.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/fsl,imx-dma.yaml | 56 + + .../devicetree/bindings/dma/fsl-imx-dma.txt | 50 - + Documentation/devicetree/bindings/dma/fsl-qdma.txt | 58 - + .../devicetree/bindings/dma/fsl-qdma.yaml | 124 ++ + .../bindings/dma/{ => stm32}/st,stm32-dma.yaml | 4 +- + .../bindings/dma/stm32/st,stm32-dma3.yaml | 135 ++ + .../bindings/dma/{ => stm32}/st,stm32-dmamux.yaml | 4 +- + .../bindings/dma/{ => stm32}/st,stm32-mdma.yaml | 4 +- + .../devicetree/bindings/spi/st,stm32-spi.yaml | 2 +- + MAINTAINERS | 9 + + drivers/base/firmware_loader/main.c | 106 +- + drivers/dma/Kconfig | 34 +- + drivers/dma/Makefile | 4 +- + drivers/dma/altera-msgdma.c | 16 +- + drivers/dma/dmaengine.c | 16 +- + drivers/dma/dmatest.c | 1 + + drivers/dma/fsl-dpaa2-qdma/dpdmai.c | 1 + + drivers/dma/fsl-edma-common.c | 24 +- + drivers/dma/fsl-edma-common.h | 4 +- + drivers/dma/fsl-edma-main.c | 34 +- + drivers/dma/idxd/dma.c | 2 +- + drivers/dma/idxd/init.c | 1 + + drivers/dma/imx-sdma.c | 5 +- + drivers/dma/ioat/init.c | 1 + + drivers/dma/mcf-edma-main.c | 2 - + drivers/dma/moxart-dma.c | 5 - + drivers/dma/qcom/gpi.c | 11 +- + drivers/dma/qcom/hidma.c | 1 + + drivers/dma/qcom/hidma_mgmt.c | 1 + + drivers/dma/sh/rz-dmac.c | 2 +- + drivers/dma/stm32/Kconfig | 47 + + drivers/dma/stm32/Makefile | 5 + + drivers/dma/{ => stm32}/stm32-dma.c | 2 +- + drivers/dma/stm32/stm32-dma3.c | 1847 ++++++++++++++++++++ + drivers/dma/{ => stm32}/stm32-dmamux.c | 0 + drivers/dma/{ => stm32}/stm32-mdma.c | 2 +- + drivers/dma/ti/cppi41.c | 1 + + drivers/dma/ti/k3-psil.c | 1 + + drivers/dma/ti/k3-udma-glue.c | 1 + + drivers/dma/ti/k3-udma.c | 6 +- + drivers/dma/ti/omap-dma.c | 1 + + drivers/dma/virt-dma.c | 1 + + include/linux/dmaengine.h | 3 +- + include/linux/firmware.h | 12 + + 44 files changed, 2400 insertions(+), 246 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/fsl,imx-dma.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-dma.txt + delete mode 100644 Documentation/devicetree/bindings/dma/fsl-qdma.txt + create mode 100644 Documentation/devicetree/bindings/dma/fsl-qdma.yaml + rename Documentation/devicetree/bindings/dma/{ => stm32}/st,stm32-dma.yaml (97%) + create mode 100644 Documentation/devicetree/bindings/dma/stm32/st,stm32-dma3.yaml + rename Documentation/devicetree/bindings/dma/{ => stm32}/st,stm32-dmamux.yaml (90%) + rename Documentation/devicetree/bindings/dma/{ => stm32}/st,stm32-mdma.yaml (96%) + create mode 100644 drivers/dma/stm32/Kconfig + create mode 100644 drivers/dma/stm32/Makefile + rename drivers/dma/{ => stm32}/stm32-dma.c (99%) + create mode 100644 drivers/dma/stm32/stm32-dma3.c + rename drivers/dma/{ => stm32}/stm32-dmamux.c (100%) + rename drivers/dma/{ => stm32}/stm32-mdma.c (99%) +Merging cgroup/for-next (3756b08be683 Merge branch 'for-6.11' 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 include/linux/cgroup-defs.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v1/pids.rst | 3 +- + Documentation/admin-guide/cgroup-v2.rst | 33 +++- + include/linux/cgroup-defs.h | 7 +- + include/linux/misc_cgroup.h | 7 +- + kernel/cgroup/cgroup.c | 34 +++- + kernel/cgroup/cpuset.c | 197 ++++++++++++++++------ + kernel/cgroup/pids.c | 129 +++++++++++--- + tools/testing/selftests/cgroup/.gitignore | 11 +- + tools/testing/selftests/cgroup/Makefile | 25 +-- + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 75 +++++--- + tools/testing/selftests/cgroup/test_pids.c | 178 +++++++++++++++++++ + 11 files changed, 567 insertions(+), 132 deletions(-) + create mode 100644 tools/testing/selftests/cgroup/test_pids.c +Merging scsi/for-next (dbe36d249533 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-ufs | 14 +++--- + block/bsg-lib.c | 3 +- + drivers/scsi/BusLogic.c | 1 + + drivers/scsi/advansys.c | 1 + + drivers/scsi/aha1542.c | 2 + + drivers/scsi/aha1740.c | 1 + + drivers/scsi/arm/acornscsi.c | 9 ++-- + drivers/scsi/arm/cumana_2.c | 2 +- + drivers/scsi/arm/eesox.c | 2 +- + drivers/scsi/arm/powertec.c | 2 +- + drivers/scsi/atari_scsi.c | 1 + + drivers/scsi/atp870u.c | 2 + + drivers/scsi/elx/efct/efct_driver.c | 1 + + drivers/scsi/g_NCR5380.c | 1 + + drivers/scsi/imm.c | 1 + + drivers/scsi/isci/init.c | 1 + + drivers/scsi/mac_scsi.c | 1 + + drivers/scsi/pcmcia/aha152x_stub.c | 1 + + drivers/scsi/ppa.c | 1 + + drivers/scsi/qla2xxx/qla_isr.c | 6 --- + drivers/scsi/scsi_common.c | 1 + + drivers/scsi/scsi_devinfo.c | 11 ++--- + drivers/scsi/scsi_scan.c | 3 +- + drivers/scsi/sun3_scsi.c | 1 + + drivers/ufs/core/ufs-mcq.c | 58 +++++++++++++++--------- + drivers/ufs/core/ufs-sysfs.c | 73 +++++++++++++++++++++++++++++- + drivers/ufs/core/ufshcd.c | 41 +++++++++++++++++ + drivers/ufs/host/ufs-mediatek.c | 1 + + drivers/ufs/host/ufs-mediatek.h | 3 ++ + drivers/ufs/host/ufshcd-pci.c | 48 +++++++++++++++++++- + include/ufs/ufs.h | 2 + + include/ufs/ufshcd.h | 18 ++++++++ + include/ufs/ufshci.h | 1 + + 33 files changed, 261 insertions(+), 53 deletions(-) +Merging scsi-mkp/for-next (06b91c00db39 Merge patch series "mpi3mr: Host diag buffer support") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/mpi3mr/mpi3mr_app.c +Merge made by the 'ort' strategy. + drivers/scsi/lpfc/lpfc_attr.c | 5 + + drivers/scsi/mpi3mr/mpi/mpi30_tool.h | 44 ++ + drivers/scsi/mpi3mr/mpi3mr.h | 133 ++++- + drivers/scsi/mpi3mr/mpi3mr_app.c | 1080 ++++++++++++++++++++++++++++++++++ + drivers/scsi/mpi3mr/mpi3mr_fw.c | 272 ++++++++- + drivers/scsi/mpi3mr/mpi3mr_os.c | 113 ++++ + drivers/ufs/host/ufs-qcom.c | 1 + + drivers/ufs/host/ufshcd-pci.c | 1 + + include/uapi/scsi/scsi_bsg_mpi3mr.h | 3 +- + 9 files changed, 1641 insertions(+), 11 deletions(-) + create mode 100644 drivers/scsi/mpi3mr/mpi/mpi30_tool.h +Merging vhost/linux-next (c8fae27d141a virtio-pci: Check if is_avq is NULL) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (54fb559c5467 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 +Auto-merging drivers/soc/qcom/smem.c +Auto-merging include/linux/soc/qcom/smem.h +Merge made by the 'ort' strategy. + .../bindings/remoteproc/fsl,imx-rproc.yaml | 15 ++++ + .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 89 +++++++++++++--------- + Documentation/locking/hwspinlock.rst | 11 +++ + drivers/hwspinlock/hwspinlock_core.c | 28 +++++++ + drivers/hwspinlock/hwspinlock_internal.h | 3 + + drivers/hwspinlock/qcom_hwspinlock.c | 25 ++++++ + drivers/remoteproc/Kconfig | 1 + + drivers/remoteproc/imx_rproc.c | 10 ++- + drivers/remoteproc/mtk_scp.c | 14 ++-- + drivers/remoteproc/omap_remoteproc.c | 46 +++++------ + drivers/remoteproc/qcom_common.c | 87 +++++++++++++++++++++ + drivers/remoteproc/qcom_common.h | 10 +++ + drivers/remoteproc/qcom_q6v5_adsp.c | 3 + + drivers/remoteproc/qcom_q6v5_mss.c | 3 + + drivers/remoteproc/qcom_q6v5_pas.c | 14 ++++ + drivers/remoteproc/qcom_q6v5_wcss.c | 3 + + drivers/remoteproc/stm32_rproc.c | 2 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 13 ++-- + drivers/rpmsg/rpmsg_char.c | 5 +- + drivers/soc/qcom/smem.c | 26 +++++++ + include/linux/hwspinlock.h | 6 ++ + include/linux/soc/qcom/smem.h | 2 + + 22 files changed, 332 insertions(+), 84 deletions(-) +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 (6f2a87502499 gpiolib: unexport gpiochip_get_desc()) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging Documentation/dev-tools/index.rst +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/gpio-pca953x.c +Auto-merging drivers/gpio/gpiolib-cdev.c +Auto-merging drivers/gpio/gpiolib-of.c +Auto-merging drivers/staging/greybus/gpio.c +Merge made by the 'ort' strategy. + .../dev-tools/gpio-sloppy-logic-analyzer.rst | 93 +++ + Documentation/dev-tools/index.rst | 1 + + .../devicetree/bindings/gpio/aspeed,sgpio.yaml | 10 + + .../devicetree/bindings/gpio/fsl,qoriq-gpio.yaml | 86 +++ + .../devicetree/bindings/gpio/gpio-mpc8xxx.txt | 53 -- + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 1 + + .../devicetree/bindings/gpio/gpio-zevio.txt | 16 - + .../devicetree/bindings/gpio/lsi,zevio-gpio.yaml | 43 ++ + Documentation/driver-api/gpio/board.rst | 6 - + Documentation/driver-api/gpio/consumer.rst | 4 +- + Documentation/driver-api/gpio/driver.rst | 5 +- + Documentation/driver-api/gpio/index.rst | 1 - + Documentation/driver-api/gpio/intro.rst | 12 - + Documentation/driver-api/gpio/legacy.rst | 679 --------------------- + .../translations/zh_CN/driver-api/gpio/index.rst | 2 - + .../translations/zh_CN/driver-api/gpio/legacy.rst | 618 ------------------- + Documentation/translations/zh_TW/gpio.txt | 574 ----------------- + .../gpio/gpio-handle-get-line-values-ioctl.rst | 7 + + .../gpio/gpio-handle-set-config-ioctl.rst | 5 +- + .../gpio/gpio-handle-set-line-values-ioctl.rst | 7 + + .../gpio/gpio-lineevent-data-read.rst | 5 + + .../userspace-api/gpio/gpio-v2-line-event-read.rst | 5 + + .../gpio/gpio-v2-line-get-values-ioctl.rst | 7 + + .../gpio/gpio-v2-line-set-config-ioctl.rst | 7 +- + .../gpio/gpio-v2-line-set-values-ioctl.rst | 7 + + Documentation/userspace-api/gpio/sysfs.rst | 7 +- + drivers/gpio/Kconfig | 21 +- + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-amd8111.c | 4 +- + drivers/gpio/gpio-ath79.c | 2 - + drivers/gpio/gpio-pca953x.c | 1 + + drivers/gpio/gpio-rdc321x.c | 6 +- + drivers/gpio/gpio-sim.c | 35 +- + drivers/gpio/gpio-sloppy-logic-analyzer.c | 344 +++++++++++ + drivers/gpio/gpio-syscon.c | 27 +- + drivers/gpio/gpiolib-acpi.c | 4 +- + drivers/gpio/gpiolib-cdev.c | 80 +-- + drivers/gpio/gpiolib-of.c | 4 +- + drivers/gpio/gpiolib.c | 36 +- + drivers/gpio/gpiolib.h | 4 +- + drivers/pinctrl/pinctrl-da9062.c | 2 +- + drivers/staging/greybus/gpio.c | 2 +- + include/linux/gpio.h | 6 +- + include/linux/gpio/driver.h | 5 - + tools/gpio/gpio-sloppy-logic-analyzer.sh | 246 ++++++++ + 45 files changed, 1004 insertions(+), 2087 deletions(-) + create mode 100644 Documentation/dev-tools/gpio-sloppy-logic-analyzer.rst + create mode 100644 Documentation/devicetree/bindings/gpio/fsl,qoriq-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-mpc8xxx.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-zevio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/lsi,zevio-gpio.yaml + delete mode 100644 Documentation/driver-api/gpio/legacy.rst + delete mode 100644 Documentation/translations/zh_CN/driver-api/gpio/legacy.rst + delete mode 100644 Documentation/translations/zh_TW/gpio.txt + create mode 100644 drivers/gpio/gpio-sloppy-logic-analyzer.c + create mode 100755 tools/gpio/gpio-sloppy-logic-analyzer.sh +Merging gpio-intel/for-next (1613e604df0c Linux 6.10-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 (0cd9f140389b pinctrl: mlxbf3: Fix return value check for devm_platform_ioremap_resource) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging Documentation/devicetree/bindings/firmware/arm,scmi.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/qcom,pmic-gpio.yaml +Auto-merging drivers/pinctrl/bcm/pinctrl-bcm2835.c +Auto-merging drivers/pinctrl/core.c +Auto-merging drivers/pinctrl/pinctrl-rockchip.c +Auto-merging drivers/pinctrl/pinctrl-tps6594.c +Auto-merging drivers/pinctrl/qcom/pinctrl-spmi-gpio.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/firmware/arm,scmi.yaml | 4 +- + .../bindings/firmware/nxp,imx95-scmi-pinctrl.yaml | 53 + + .../bindings/pinctrl/aspeed,ast2400-pinctrl.yaml | 169 +- + .../bindings/pinctrl/aspeed,ast2500-pinctrl.yaml | 188 +- + .../bindings/pinctrl/aspeed,ast2600-pinctrl.yaml | 514 +++++- + ...sl,imx93-pinctrl.yaml => fsl,imx9-pinctrl.yaml} | 8 +- + .../bindings/pinctrl/nuvoton,ma35d1-pinctrl.yaml | 178 ++ + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 2 + + .../pinctrl/qcom,sm4250-lpass-lpi-pinctrl.yaml | 118 ++ + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 52 +- + .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 349 ++-- + .../bindings/reset/nuvoton,ma35d1-reset.yaml | 3 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 10 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 5 +- + drivers/pinctrl/bcm/pinctrl-bcm4908.c | 1 + + drivers/pinctrl/bcm/pinctrl-bcm63xx.c | 4 +- + drivers/pinctrl/berlin/berlin.c | 21 +- + drivers/pinctrl/berlin/berlin.h | 6 - + drivers/pinctrl/core.c | 30 +- + drivers/pinctrl/core.h | 2 +- + drivers/pinctrl/freescale/Kconfig | 18 + + drivers/pinctrl/freescale/Makefile | 2 + + drivers/pinctrl/freescale/pinctrl-imx-scmi.c | 357 ++++ + drivers/pinctrl/freescale/pinctrl-imx.c | 14 +- + drivers/pinctrl/freescale/pinctrl-imx91.c | 271 +++ + drivers/pinctrl/freescale/pinctrl-mxs.c | 4 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 10 +- + drivers/pinctrl/mediatek/pinctrl-moore.h | 6 + + drivers/pinctrl/mediatek/pinctrl-mt7622.c | 32 +- + drivers/pinctrl/mediatek/pinctrl-mt7623.c | 42 +- + drivers/pinctrl/mediatek/pinctrl-mt7629.c | 20 +- + drivers/pinctrl/mediatek/pinctrl-mt76x8.c | 88 +- + drivers/pinctrl/mediatek/pinctrl-mt7981.c | 34 +- + drivers/pinctrl/mediatek/pinctrl-mt7986.c | 24 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 4 +- + drivers/pinctrl/mediatek/pinctrl-paris.c | 4 +- + drivers/pinctrl/meson/pinctrl-meson-a1.c | 1 + + drivers/pinctrl/meson/pinctrl-meson-axg-pmx.c | 1 + + drivers/pinctrl/meson/pinctrl-meson-axg.c | 1 + + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 1 + + drivers/pinctrl/meson/pinctrl-meson-gxbb.c | 1 + + drivers/pinctrl/meson/pinctrl-meson-gxl.c | 1 + + drivers/pinctrl/meson/pinctrl-meson-s4.c | 1 + + drivers/pinctrl/meson/pinctrl-meson.c | 1 + + drivers/pinctrl/meson/pinctrl-meson8-pmx.c | 1 + + drivers/pinctrl/nomadik/pinctrl-abx500.c | 4 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 4 +- + drivers/pinctrl/nuvoton/Kconfig | 19 + + drivers/pinctrl/nuvoton/Makefile | 2 + + drivers/pinctrl/nuvoton/pinctrl-ma35.c | 1187 +++++++++++++ + drivers/pinctrl/nuvoton/pinctrl-ma35.h | 52 + + drivers/pinctrl/nuvoton/pinctrl-ma35d1.c | 1799 ++++++++++++++++++++ + drivers/pinctrl/nxp/pinctrl-s32cc.c | 31 +- + drivers/pinctrl/pinconf-generic.c | 7 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 7 +- + drivers/pinctrl/pinctrl-at91.c | 14 +- + drivers/pinctrl/pinctrl-cy8c95x0.c | 205 +-- + drivers/pinctrl/pinctrl-equilibrium.c | 24 +- + drivers/pinctrl/pinctrl-equilibrium.h | 12 - + drivers/pinctrl/pinctrl-ingenic.c | 707 ++++---- + drivers/pinctrl/pinctrl-k210.c | 7 +- + drivers/pinctrl/pinctrl-keembay.c | 24 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 1 + + drivers/pinctrl/pinctrl-mcp23s08_i2c.c | 1 + + drivers/pinctrl/pinctrl-mcp23s08_spi.c | 1 + + drivers/pinctrl/pinctrl-mlxbf3.c | 12 +- + drivers/pinctrl/pinctrl-rockchip.c | 28 +- + drivers/pinctrl/pinctrl-scmi.c | 9 + + drivers/pinctrl/pinctrl-single.c | 7 +- + drivers/pinctrl/pinctrl-st.c | 37 +- + drivers/pinctrl/pinctrl-tb10x.c | 1 + + drivers/pinctrl/pinctrl-tps6594.c | 4 +- + drivers/pinctrl/pinctrl-zynqmp.c | 85 +- + drivers/pinctrl/pinmux.c | 19 +- + drivers/pinctrl/pinmux.h | 19 +- + drivers/pinctrl/qcom/Kconfig | 9 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-sdm670.c | 19 + + drivers/pinctrl/qcom/pinctrl-sm4250-lpass-lpi.c | 236 +++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 + + drivers/pinctrl/renesas/pinctrl-rza1.c | 14 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 778 +++++++-- + drivers/pinctrl/renesas/pinctrl-rzn1.c | 26 +- + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 7 +- + drivers/pinctrl/renesas/pinctrl.c | 7 +- + drivers/pinctrl/spear/pinctrl-spear.c | 13 +- + drivers/pinctrl/sprd/pinctrl-sprd.c | 14 +- + drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 27 +- + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 18 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 4 +- + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 7 +- + drivers/pinctrl/tegra/pinctrl-tegra.c | 4 +- + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 11 +- + 93 files changed, 6756 insertions(+), 1425 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/nxp,imx95-scmi-pinctrl.yaml + rename Documentation/devicetree/bindings/pinctrl/{fsl,imx93-pinctrl.yaml => fsl,imx9-pinctrl.yaml} (93%) + create mode 100644 Documentation/devicetree/bindings/pinctrl/nuvoton,ma35d1-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm4250-lpass-lpi-pinctrl.yaml + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx-scmi.c + create mode 100644 drivers/pinctrl/freescale/pinctrl-imx91.c + create mode 100644 drivers/pinctrl/nuvoton/pinctrl-ma35.c + create mode 100644 drivers/pinctrl/nuvoton/pinctrl-ma35.h + create mode 100644 drivers/pinctrl/nuvoton/pinctrl-ma35d1.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm4250-lpass-lpi.c +Merging pinctrl-intel/for-next (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (71062e52fc0a pinctrl: renesas: r8a779h0: Remove unneeded separators) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + drivers/pinctrl/renesas/pfc-r8a779g0.c | 834 ++++++++++++++++++-------------- + drivers/pinctrl/renesas/pfc-r8a779h0.c | 82 +++- + drivers/pinctrl/renesas/pfc-sh73a0.c | 4 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 59 +-- + 4 files changed, 559 insertions(+), 420 deletions(-) +Merging pinctrl-samsung/for-next (707807f4c112 pinctrl: samsung: Use scope based of_node_put() cleanups) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 16 ++++------------ + drivers/pinctrl/samsung/pinctrl-samsung.c | 19 +++++-------------- + 2 files changed, 9 insertions(+), 26 deletions(-) +Merging pwm/pwm/for-next (b8689bb9b901 pwm-stm32: Make use of parametrised register definitions) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/adi,axi-pwmgen.yaml | 48 ++++ + .../devicetree/bindings/pwm/fsl,vf610-ftm-pwm.yaml | 92 ++++++++ + Documentation/devicetree/bindings/pwm/imx-pwm.yaml | 1 - + .../devicetree/bindings/pwm/pwm-fsl-ftm.txt | 55 ----- + .../devicetree/bindings/pwm/pwm-gpio.yaml | 46 ++++ + Documentation/devicetree/bindings/pwm/pwm.yaml | 6 +- + Documentation/driver-api/gpio/drivers-on-gpio.rst | 7 +- + MAINTAINERS | 9 + + drivers/bus/ts-nbus.c | 2 +- + drivers/pwm/Kconfig | 24 ++ + drivers/pwm/Makefile | 2 + + drivers/pwm/core.c | 10 +- + drivers/pwm/pwm-axi-pwmgen.c | 241 +++++++++++++++++++++ + drivers/pwm/pwm-cros-ec.c | 64 +----- + drivers/pwm/pwm-gpio.c | 241 +++++++++++++++++++++ + drivers/pwm/pwm-imx1.c | 1 + + drivers/pwm/pwm-imx27.c | 1 + + drivers/pwm/pwm-intel-lgm.c | 1 + + drivers/pwm/pwm-jz4740.c | 9 +- + drivers/pwm/pwm-mediatek.c | 1 + + drivers/pwm/pwm-meson.c | 39 ++++ + drivers/pwm/pwm-pxa.c | 1 + + drivers/pwm/pwm-samsung.c | 1 + + drivers/pwm/pwm-spear.c | 1 + + drivers/pwm/pwm-stm32.c | 22 +- + drivers/pwm/pwm-visconti.c | 1 + + include/linux/pwm.h | 26 +-- + 27 files changed, 797 insertions(+), 155 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/adi,axi-pwmgen.yaml + create mode 100644 Documentation/devicetree/bindings/pwm/fsl,vf610-ftm-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-fsl-ftm.txt + create mode 100644 Documentation/devicetree/bindings/pwm/pwm-gpio.yaml + create mode 100644 drivers/pwm/pwm-axi-pwmgen.c + create mode 100644 drivers/pwm/pwm-gpio.c +Merging ktest/for-next (07283c1873a4 ktest: force $buildonly = 1 for 'make_warnings_file' test type) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (15a783a493b0 selftests: Add information about TAP conformance in tests) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging tools/testing/selftests/lib.mk +Auto-merging tools/testing/selftests/resctrl/cat_test.c +Merge made by the 'ort' strategy. + Documentation/dev-tools/kselftest.rst | 7 + + tools/testing/selftests/lib.mk | 8 + + tools/testing/selftests/resctrl/cache.c | 10 +- + tools/testing/selftests/resctrl/cat_test.c | 5 +- + tools/testing/selftests/resctrl/cmt_test.c | 22 +- + tools/testing/selftests/resctrl/mba_test.c | 26 +- + tools/testing/selftests/resctrl/mbm_test.c | 26 +- + tools/testing/selftests/resctrl/resctrl.h | 49 ++-- + tools/testing/selftests/resctrl/resctrl_val.c | 373 ++++++++++++-------------- + tools/testing/selftests/resctrl/resctrlfs.c | 65 ++--- + tools/testing/selftests/sched/cs_prctl_test.c | 10 +- + 11 files changed, 311 insertions(+), 290 deletions(-) +Merging kunit/test (1613e604df0c Linux 6.10-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 (67c9971cd6d3 kunit/usercopy: Add missing MODULE_DESCRIPTION()) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Auto-merging MAINTAINERS +Auto-merging kernel/fork.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/util.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + include/kunit/assert.h | 11 ++ + include/kunit/test.h | 17 ++ + kernel/fork.c | 3 + + lib/Kconfig.debug | 21 +-- + lib/Makefile | 2 +- + lib/kunit/Makefile | 2 + + lib/kunit/assert.c | 19 +- + lib/kunit/assert_test.c | 388 +++++++++++++++++++++++++++++++++++++++++ + lib/kunit/kunit-example-test.c | 1 + + lib/kunit/kunit-test.c | 1 + + lib/kunit/test.c | 1 + + lib/kunit/user_alloc.c | 117 +++++++++++++ + lib/list-test.c | 7 +- + lib/test_user_copy.c | 331 ----------------------------------- + lib/usercopy_kunit.c | 335 +++++++++++++++++++++++++++++++++++ + mm/util.c | 5 + + 17 files changed, 904 insertions(+), 358 deletions(-) + create mode 100644 lib/kunit/assert_test.c + create mode 100644 lib/kunit/user_alloc.c + delete mode 100644 lib/test_user_copy.c + create mode 100644 lib/usercopy_kunit.c +Merging livepatching/for-next (9871e6af43db Merge branch 'for-6.11/sysfs-patch-replace' 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/ABI/testing/sysfs-kernel-livepatch | 8 ++ + kernel/livepatch/core.c | 17 ++- + .../testing/selftests/livepatch/test-livepatch.sh | 138 +++++++++++++-------- + tools/testing/selftests/livepatch/test-syscall.sh | 5 +- + tools/testing/selftests/livepatch/test-sysfs.sh | 48 +++++++ + 5 files changed, 163 insertions(+), 53 deletions(-) +Merging rtc/rtc-next (43696b3a9e46 rtc: isl1208: Update correct procedure for clearing alarm) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/rtc/fsl,ls-ftm-alarm.yaml | 73 +++++++++++++++++++++ + .../devicetree/bindings/rtc/rtc-fsl-ftm-alarm.txt | 36 ----------- + drivers/rtc/lib_test.c | 1 + + drivers/rtc/rtc-abx80x.c | 12 ++-- + drivers/rtc/rtc-cmos.c | 10 ++- + drivers/rtc/rtc-goldfish.c | 1 + + drivers/rtc/rtc-isl1208.c | 36 +++++++---- + drivers/rtc/rtc-mpc5121.c | 1 + + drivers/rtc/rtc-omap.c | 1 + + drivers/rtc/rtc-rc5t583.c | 1 + + drivers/rtc/rtc-tps65910.c | 1 + + drivers/rtc/rtc-tps6594.c | 75 ++++++++++++++++++---- + drivers/rtc/rtc-twl.c | 1 + + 13 files changed, 179 insertions(+), 70 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/fsl,ls-ftm-alarm.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-fsl-ftm-alarm.txt +Merging nvdimm/libnvdimm-for-next (b0d478e34dbf testing: nvdimm: Add MODULE_DESCRIPTION() macros) +$ 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 +Auto-merging drivers/nvdimm/btt.c +Auto-merging drivers/nvdimm/e820.c +Auto-merging drivers/nvdimm/of_pmem.c +Auto-merging drivers/nvdimm/pmem.c +Merge made by the 'ort' strategy. + drivers/acpi/nfit/core.c | 1 + + drivers/dax/cxl.c | 1 + + drivers/dax/device.c | 1 + + drivers/dax/hmem/hmem.c | 1 + + drivers/dax/kmem.c | 1 + + drivers/dax/pmem.c | 1 + + drivers/dax/super.c | 1 + + drivers/nvdimm/btt.c | 5 +++-- + drivers/nvdimm/core.c | 1 + + drivers/nvdimm/e820.c | 1 + + drivers/nvdimm/nd_virtio.c | 1 + + drivers/nvdimm/of_pmem.c | 1 + + drivers/nvdimm/pmem.c | 1 + + tools/testing/nvdimm/test/iomap.c | 1 + + tools/testing/nvdimm/test/ndtest.c | 1 + + tools/testing/nvdimm/test/nfit.c | 1 + + 16 files changed, 18 insertions(+), 2 deletions(-) +Merging at24/at24/for-next (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/ntb/test/ntb_perf.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging seccomp/for-next/seccomp (f0c508faea64 selftests/seccomp: check that a zombie leader doesn't affect others) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Auto-merging kernel/exit.c +Merge made by the 'ort' strategy. + kernel/exit.c | 3 +- + kernel/seccomp.c | 30 ++++-- + tools/testing/selftests/seccomp/seccomp_bpf.c | 131 ++++++++++++++++++++++++++ + 3 files changed, 157 insertions(+), 7 deletions(-) +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 (1613e604df0c Linux 6.10-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 (65f09ab3b3ef Merge branches 'nvmem-fixes' and 'for-6.11' into nvmem-for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-bus-nvmem | 30 ++++++- + .../bindings/nvmem/amlogic,meson-gxbb-efuse.yaml | 3 + + .../devicetree/bindings/nvmem/mediatek,efuse.yaml | 2 + + drivers/nvmem/apple-efuses.c | 1 + + drivers/nvmem/brcm_nvram.c | 1 + + drivers/nvmem/core.c | 99 +++++++++++++--------- + drivers/nvmem/meson-efuse.c | 19 +++-- + drivers/nvmem/rmem.c | 5 +- + drivers/nvmem/rockchip-efuse.c | 1 + + drivers/nvmem/rockchip-otp.c | 2 + + drivers/nvmem/u-boot-env.c | 1 + + 11 files changed, 114 insertions(+), 50 deletions(-) +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 (f2580a907e5c x86/hyperv: Use Hyper-V entropy to seed guest random number generator) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/for-next (2ccfe94bc3ac auxdisplay: ht16k33: Drop reference after LED registration) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Merge made by the 'ort' strategy. + drivers/auxdisplay/Kconfig | 2 +- + drivers/auxdisplay/arm-charlcd.c | 2 +- + drivers/auxdisplay/charlcd.h | 2 ++ + drivers/auxdisplay/hd44780.c | 2 +- + drivers/auxdisplay/hd44780_common.c | 1 + + drivers/auxdisplay/ht16k33.c | 1 + + drivers/auxdisplay/line-display.c | 11 ++++++++++- + 7 files changed, 17 insertions(+), 4 deletions(-) +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 +Merge made by the 'ort' strategy. + kernel/debug/kdb/kdb_bt.c | 2 +- + kernel/debug/kdb/kdb_io.c | 6 +++--- + kernel/debug/kdb/kdb_main.c | 18 ++++-------------- + kernel/debug/kdb/kdb_private.h | 2 -- + 4 files changed, 8 insertions(+), 20 deletions(-) +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 (06c2afb862f9 Linux 6.5-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 (f08d4bdad612 bus: mhi: host: pci_generic: Use unique 'mhi_pci_dev_info' for product families) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. + drivers/bus/mhi/ep/main.c | 14 +++--- + drivers/bus/mhi/host/pci_generic.c | 88 +++++++++++++++++++++++++++----------- + 2 files changed, 71 insertions(+), 31 deletions(-) +Merging memblock/for-next (94ff46de4a73 memblock: Move late alloc warning down to phys alloc) +$ 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging include/linux/memblock.h +Auto-merging include/linux/mm.h +Auto-merging mm/memblock.c +CONFLICT (content): Merge conflict in mm/memblock.c +Auto-merging mm/mm_init.c +Resolved 'mm/memblock.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0fa4ac672212] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 22 ++ + Documentation/admin-guide/ramoops.rst | 13 + + fs/pstore/ram.c | 14 ++ + include/linux/memblock.h | 21 +- + include/linux/mm.h | 2 + + mm/memblock.c | 151 ++++++++++-- + mm/mm_init.c | 69 +++--- + tools/include/linux/mm.h | 1 + + tools/testing/memblock/tests/basic_api.c | 314 +++++++++++++++++++++++- + tools/testing/memblock/tests/common.c | 8 +- + tools/testing/memblock/tests/common.h | 4 + + 11 files changed, 537 insertions(+), 82 deletions(-) +Merging cxl/next (f3d70720e92c cxl/region: Simplify cxl_region_nid()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging drivers/cxl/core/region.c +Auto-merging drivers/cxl/cxl.h +Auto-merging drivers/cxl/mem.c +Merge made by the 'ort' strategy. + drivers/cxl/acpi.c | 1 + + drivers/cxl/core/mbox.c | 2 +- + drivers/cxl/core/port.c | 1 + + drivers/cxl/core/region.c | 44 ++++++++++++++++++++++++++++++++---- + drivers/cxl/core/trace.h | 32 +++++++++++++------------- + drivers/cxl/cxl.h | 2 ++ + drivers/cxl/mem.c | 1 + + drivers/cxl/pci.c | 1 + + drivers/cxl/pmem.c | 1 + + drivers/cxl/port.c | 1 + + include/linux/cxl-event.h | 45 ++++++++++++++++-------------------- + tools/testing/cxl/test/mem.c | 54 ++++++++++++++++++++++++-------------------- + 12 files changed, 113 insertions(+), 72 deletions(-) +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 +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 (d68cc8abc357 x86/efistub: Call Apple set_os protocol on dual GPU Intel Macs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/setup.c +Auto-merging drivers/firmware/efi/libstub/Makefile +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 21 --- + arch/x86/Kconfig | 20 --- + arch/x86/boot/compressed/kaslr.c | 43 ++---- + arch/x86/include/asm/efi.h | 15 -- + arch/x86/kernel/setup.c | 1 - + arch/x86/platform/efi/Makefile | 1 - + arch/x86/platform/efi/efi.c | 2 - + arch/x86/platform/efi/fake_mem.c | 197 ------------------------ + arch/x86/platform/efi/memmap.c | 1 + + drivers/firmware/efi/libstub/Makefile | 2 +- + drivers/firmware/efi/libstub/arm64.c | 3 +- + drivers/firmware/efi/libstub/efistub.h | 9 +- + drivers/firmware/efi/libstub/smbios.c | 39 +++-- + drivers/firmware/efi/libstub/x86-stub.c | 73 ++++++++- + include/linux/efi.h | 5 +- + 15 files changed, 113 insertions(+), 319 deletions(-) + delete mode 100644 arch/x86/platform/efi/fake_mem.c +Merging unicode/for-next (68318904a775 unicode: add MODULE_DESCRIPTION() macros) +$ 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 | 1 + + fs/unicode/utf8-selftest.c | 5 +++-- + fs/unicode/utf8data.c_shipped | 1 + + 3 files changed, 5 insertions(+), 2 deletions(-) +Merging slab/slab/for-next (a7555f5f17d7 mm/util: Use dedicated slab buckets for memdup_user()) +$ 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 include/linux/mm.h +Auto-merging include/linux/slab.h +Auto-merging lib/fortify_kunit.c +CONFLICT (content): Merge conflict in lib/fortify_kunit.c +Auto-merging mm/Kconfig +Auto-merging mm/slab.h +Auto-merging mm/slab_common.c +Auto-merging mm/slub.c +Auto-merging mm/util.c +Resolved 'lib/fortify_kunit.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3c3b511f1acd] Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git +$ git diff -M --stat --summary HEAD^.. + include/linux/mm.h | 6 +- + include/linux/poison.h | 7 +-- + include/linux/slab.h | 94 ++++++++++++++++++---------- + ipc/msgutil.c | 13 +++- + kernel/configs/hardening.config | 1 + + lib/fortify_kunit.c | 2 - + lib/slub_kunit.c | 2 +- + mm/Kconfig | 17 ++++++ + mm/slab.h | 10 +-- + mm/slab_common.c | 102 ++++++++++++++++++++++++++++++- + mm/slub.c | 131 +++++++++++++++++++++++----------------- + mm/util.c | 23 +++++-- + scripts/kernel-doc | 1 + + tools/include/linux/poison.h | 7 +-- + 14 files changed, 299 insertions(+), 117 deletions(-) +Merging random/master (886d4870bede x86: vdso: Wire up getrandom() vDSO implementation) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging MAINTAINERS +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging fs/proc/task_mmu.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/syscalls.h +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging kernel/sys_ni.c +Auto-merging mm/Kconfig +Auto-merging mm/mprotect.c +Auto-merging mm/rmap.c +CONFLICT (content): Merge conflict in mm/rmap.c +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd.h' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_64.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Recorded preimage for 'mm/rmap.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'mm/rmap.c'. +[master 36bf4137b769] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 + + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/Kconfig | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/entry/vdso/Makefile | 3 +- + arch/x86/entry/vdso/vdso.lds.S | 2 + + arch/x86/entry/vdso/vgetrandom-chacha.S | 178 +++++++++++ + arch/x86/entry/vdso/vgetrandom.c | 17 ++ + arch/x86/include/asm/vdso/getrandom.h | 55 ++++ + arch/x86/include/asm/vdso/vsyscall.h | 2 + + arch/x86/include/asm/vvar.h | 16 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + drivers/char/random.c | 140 ++++++++- + fs/proc/task_mmu.c | 3 + + include/linux/mm.h | 8 + + include/linux/syscalls.h | 3 + + include/trace/events/mmflags.h | 7 + + include/uapi/asm-generic/unistd.h | 5 +- + include/uapi/linux/random.h | 17 ++ + include/vdso/datapage.h | 11 + + include/vdso/getrandom.h | 46 +++ + kernel/sys_ni.c | 3 + + lib/vdso/Kconfig | 6 + + lib/vdso/getrandom.c | 236 +++++++++++++++ + mm/Kconfig | 3 + + mm/mprotect.c | 2 +- + mm/rmap.c | 15 +- + tools/include/uapi/asm-generic/unistd.h | 5 +- + .../perf/arch/mips/entry/syscalls/syscall_n64.tbl | 1 + + tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 1 + + tools/perf/arch/s390/entry/syscalls/syscall.tbl | 1 + + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 1 + + tools/testing/selftests/vDSO/.gitignore | 2 + + tools/testing/selftests/vDSO/Makefile | 19 ++ + tools/testing/selftests/vDSO/vdso_test_chacha.c | 43 +++ + tools/testing/selftests/vDSO/vdso_test_getrandom.c | 330 +++++++++++++++++++++ + 50 files changed, 1196 insertions(+), 9 deletions(-) + create mode 100644 arch/x86/entry/vdso/vgetrandom-chacha.S + create mode 100644 arch/x86/entry/vdso/vgetrandom.c + create mode 100644 arch/x86/include/asm/vdso/getrandom.h + create mode 100644 include/vdso/getrandom.h + create mode 100644 lib/vdso/getrandom.c + create mode 100644 tools/testing/selftests/vDSO/vdso_test_chacha.c + create mode 100644 tools/testing/selftests/vDSO/vdso_test_getrandom.c +Merging landlock/next (591561c2b47b landlock: Use bit-fields for storing handled layer access masks) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Merge made by the 'ort' strategy. + security/landlock/limits.h | 2 -- + security/landlock/ruleset.c | 4 --- + security/landlock/ruleset.h | 24 ++++++---------- + tools/testing/selftests/kselftest_harness.h | 43 ++++++++++++++++------------- + 4 files changed, 33 insertions(+), 40 deletions(-) +Merging rust/rust-next (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging sysctl/sysctl-next (acc154691fc7 sysctl: Warn on an empty procname element) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Auto-merging kernel/locking/lockdep.c +Auto-merging lib/alloc_tag.c +Merge made by the 'ort' strategy. + fs/proc/proc_sysctl.c | 70 ++++++++++++++++++++++++++---------------------- + include/linux/sysctl.h | 2 +- + kernel/locking/lockdep.c | 1 - + kernel/sysctl-test.c | 50 ++++++++++++++++++++++++++++++++++ + kernel/sysctl.c | 31 +++++++++------------ + kernel/utsname_sysctl.c | 2 +- + lib/alloc_tag.c | 1 - + net/sysctl_net.c | 11 ++------ + 8 files changed, 105 insertions(+), 63 deletions(-) +Merging execve/for-next/execve (2a97388a807b ELF: fix kernel.randomize_va_space double read) +$ 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 MAINTAINERS +Auto-merging fs/binfmt_elf.c +Auto-merging fs/exec.c +Auto-merging tools/testing/selftests/exec/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + fs/Kconfig.binfmt | 8 ++ + fs/binfmt_elf.c | 119 ++++++++++++++++++---------- + fs/exec.c | 13 +++ + fs/exec_test.c | 113 ++++++++++++++++++++++++++ + tools/testing/selftests/exec/Makefile | 19 +++-- + tools/testing/selftests/exec/load_address.c | 67 +++++++++++++--- + 7 files changed, 279 insertions(+), 62 deletions(-) + create mode 100644 fs/exec_test.c +Merging bitmap/bitmap-for-next (e0eeb938adb0 bitops: Add a comment explaining the double underscore macros) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging include/linux/cpumask.h +CONFLICT (content): Merge conflict in include/linux/cpumask.h +Resolved 'include/linux/cpumask.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d5ca055d2c9e] Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git +$ git diff -M --stat --summary HEAD^.. + include/linux/bitops.h | 5 +++++ + include/linux/cpumask.h | 42 +++++++----------------------------------- + lib/cpumask_kunit.c | 1 + + lib/find_bit_benchmark.c | 1 + + lib/test_bitmap.c | 1 + + 5 files changed, 15 insertions(+), 35 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 +Merge made by the 'ort' strategy. + drivers/hte/hte-tegra194-test.c | 1 + + 1 file changed, 1 insertion(+) +Merging kspp/for-next/kspp (350e853715b2 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 arch/x86/Kconfig +Auto-merging arch/x86/kernel/alternative.c +Auto-merging lib/fortify_kunit.c +Merge made by the 'ort' strategy. + arch/x86/Kconfig | 9 +++++++++ + arch/x86/include/asm/cfi.h | 2 +- + arch/x86/kernel/alternative.c | 8 ++++---- + drivers/misc/lkdtm/bugs.c | 30 ++++++++++++++++++++++++++++++ + include/linux/fortify-string.h | 8 ++------ + lib/fortify_kunit.c | 3 +-- + tools/testing/selftests/lkdtm/tests.txt | 1 + + 7 files changed, 48 insertions(+), 13 deletions(-) +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 (1613e604df0c Linux 6.10-rc1) +$ 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 (53e6b65693b6 iommufd/iova_bitmap: Remove iterator logic) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Merge made by the 'ort' strategy. + drivers/iommu/iommufd/iova_bitmap.c | 124 ++++++++++---------------- + drivers/iommu/iommufd/selftest.c | 6 +- + tools/testing/selftests/iommu/iommufd.c | 76 ++++++++++------ + tools/testing/selftests/iommu/iommufd_utils.h | 6 +- + 4 files changed, 103 insertions(+), 109 deletions(-) +Merging turbostat/next (eff04be3f4aa tools/power turbostat: Extend --add option with perf counters) +$ 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/Makefile | 1 + + tools/power/x86/turbostat/turbostat.8 | 5 +- + tools/power/x86/turbostat/turbostat.c | 1415 ++++++++++++++++++++++----------- + 3 files changed, 956 insertions(+), 465 deletions(-) +Merging pwrseq/pwrseq/for-next (6140d185a43d PCI/pwrctl: Add a PCI power control driver for power sequenced devices) +$ 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/pci/bus.c +Auto-merging drivers/pci/of.c +Auto-merging drivers/pci/probe.c +Merge made by the 'ort' strategy. + MAINTAINERS | 8 ++ + drivers/pci/Kconfig | 1 + + drivers/pci/Makefile | 1 + + drivers/pci/bus.c | 9 +++ + drivers/pci/of.c | 14 +++- + drivers/pci/probe.c | 2 + + drivers/pci/pwrctl/Kconfig | 17 ++++ + drivers/pci/pwrctl/Makefile | 6 ++ + drivers/pci/pwrctl/core.c | 137 +++++++++++++++++++++++++++++++++ + drivers/pci/pwrctl/pci-pwrctl-pwrseq.c | 89 +++++++++++++++++++++ + drivers/pci/remove.c | 3 +- + include/linux/pci-pwrctl.h | 51 ++++++++++++ + 12 files changed, 333 insertions(+), 5 deletions(-) + create mode 100644 drivers/pci/pwrctl/Kconfig + create mode 100644 drivers/pci/pwrctl/Makefile + create mode 100644 drivers/pci/pwrctl/core.c + create mode 100644 drivers/pci/pwrctl/pci-pwrctl-pwrseq.c + create mode 100644 include/linux/pci-pwrctl.h +Merging header_cleanup/header_cleanup (5f4c01f1e3c7 spinlock: Fix failing build for PREEMPT_RT) +$ git merge -m Merge branch 'header_cleanup' of https://evilpiepirate.org/git/bcachefs.git header_cleanup/header_cleanup +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..f9b6a0dc98e5 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20240703 |