diff options
| -rw-r--r-- | Next/SHA1s | 375 | ||||
| -rw-r--r-- | Next/Trees | 377 | ||||
| -rw-r--r-- | Next/merge.log | 14761 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 15514 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 00000000000000..e72ab71ed1b763 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,375 @@ +Name SHA1 +---- ---- +origin 1b10b390d945a19747d75b34a6e01035ac7b9155 +fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +mm-hotfixes 9ff3ffc369ed398f45a88673b81b2866c62c516f +kbuild-current 89e5462bb5aee1e634a3d5bd41125809a929a486 +arc-current e67572cd2204894179d89bd7b984072f19313b03 +arm-current 0c66c6f4e21cb22220cbd8821c5c73fc157d20dc +arm64-fixes 50449ca66cc5a8cbc64749cf4b9f3d3fc5f4b457 +arm-soc-fixes 5549d1e39989e2ba86c4775546d0bd8055746cfa +davinci-current 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory-fixes 4cece764965020c22cff7665b18a012006359095 +sophgo-fixes 4cece764965020c22cff7665b18a012006359095 +m68k-current ec8c8266373f6283a3e99b036aea7b9428480625 +powerpc-fixes 49a940dbdc3107fecd5e6d3063dc07128177e058 +s390-fixes 7bbe449d0bdb68892cc67e9f5f1bfa106a3588d5 +fscrypt-current 4cece764965020c22cff7665b18a012006359095 +fsverity-current 4cece764965020c22cff7665b18a012006359095 +net aea27a92a41dae14843f92c79e9e42d8f570105c +bpf aea27a92a41dae14843f92c79e9e42d8f570105c +ipsec b6d2e438e16c7d4dbde08cfb2b95b0f3f325ba40 +netfilter a26ff37e624d12e28077e5b24d2b264f62764ad6 +ipvs a26ff37e624d12e28077e5b24d2b264f62764ad6 +wireless 838c7b8f1f278404d9d684c34a8cb26dc41aaaa1 +wpan b85ea95d086471afb4ad062012a4d73cd328fa86 +rdma-fixes ed30a4a51bb196781c8058073ea720133a65596f +sound-current d731b1ed15052580b7b2f40559021012d280f1d9 +sound-asoc-fixes c277ee8f90abf3359be213d2ee9de5a7bd6e4324 +regmap-fixes fec50db7033ea478773b159e0e2efb135270e3b7 +regulator-fixes 2a4b49bb58123bad6ec0e07b02845f74c23d5e04 +spi-fixes ef13561d2b163ac0ae6befa53bca58a26dc3320b +pci-current f3d049b35b01fff656d720606fcbab0b819f26d1 +driver-core.current ed30a4a51bb196781c8058073ea720133a65596f +tty.current 8492bd91aa055907c67ef04f2b56f6dadd1f44bf +usb.current dd5a440a31fae6e459c0d6271dddd62825505361 +usb-serial-fixes dd5a440a31fae6e459c0d6271dddd62825505361 +phy bf6e4ee5c43690e4c5a8a057bbcd4ff986bed052 +staging.current 39cd87c4eb2b893354f3b850f916353f2658ae6f +iio-fixes bb198e29fe75158990b7384fe3d30fe898da19cd +counter-current 39cd87c4eb2b893354f3b850f916353f2658ae6f +char-misc.current 008ab3c53bc4f0b2f20013c8f6c204a3203d0b8b +soundwire-fixes e67572cd2204894179d89bd7b984072f19313b03 +thunderbolt-fixes a38297e3fb012ddfa7ce0321a7e5a8daeb1872b6 +input-current 0537c8eef4f699aacdeb67c6181c66cccd63c7f5 +crypto-current 13909a0c88972c5ef5d13f44d1a8bf065a31bdf4 +vfio-fixes 4ea95c04fa6b9043a1a301240996aeebe3cb28ec +kselftest-fixes 72d7cb5c190befbb095bae7737e71560ec0fcaa6 +dmaengine-fixes e67572cd2204894179d89bd7b984072f19313b03 +backlight-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +mtd-fixes d2d73a6dd17365c43e109263841f7c26da55cfb0 +mfd-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +v4l-dvb-fixes d353c3c34af08cfd4eaafc8c55f664eacec274ee +reset-fixes 4a6756f56bcf8e64c87144a626ce53aea4899c0e +mips-fixes 0bbac3facb5d6cc0171c45c9873a2dc96bea9680 +at91-fixes 1fe5e0a31e6202025a100fc08cd5902f6abbaaba +omap-fixes 9b6a51aab5f5f9f71d2fa16e8b4d530e1643dfcb +kvm-fixes 0a9c28bec202bbd14ae3fd184522490e5f5498b5 +kvms390-fixes 175f2f5bcdfce9e728f1ff956a50f28824d28791 +hwmon-fixes 26e8383b116d0dbe74e28f86646563ab46d66d83 +nvdimm-fixes 33908660e814203e996f6e775d033c5c32fcf9a7 +cxl-fixes 5d211c7090590033581175d6405ae40917ca3a06 +btrfs-fixes cbf613cd4d3c568e926e9d9b9c7ce415d623a716 +vfs-fixes aa23317d0268b309bb3f0801ddd0d61813ff5afb +dma-mapping-fixes 75961ffb5cb3e5196f19cae7683f35cc88b50800 +drivers-x86-fixes a38297e3fb012ddfa7ce0321a7e5a8daeb1872b6 +samsung-krzk-fixes 4cece764965020c22cff7665b18a012006359095 +pinctrl-samsung-fixes 4cece764965020c22cff7665b18a012006359095 +devicetree-fixes de164a7f19248fb03229a4af9b0db333d9591e55 +dt-krzk-fixes 4cece764965020c22cff7665b18a012006359095 +scsi-fixes 961990efc608d559249f5637254fa0a9aa888b1c +drm-fixes a38297e3fb012ddfa7ce0321a7e5a8daeb1872b6 +drm-intel-fixes 43b26bdd2ee5cfca80939be910d5b23a50cd7f9d +mmc-fixes e027e72ecc1683e04f33aedf0196ad6c3278d309 +rtc-fixes 4cece764965020c22cff7665b18a012006359095 +gnss-fixes 0bbac3facb5d6cc0171c45c9873a2dc96bea9680 +hyperv-fixes fb836d64a2ea41fe7b445e14dd156ca77b95fe42 +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes 6beb6bc5a81e1433a1534e75173f67d42a6f225a +riscv-dt-fixes e0503d47e93dead8c0475ea1eb624e03fada21d3 +riscv-soc-fixes 3aa20d1f7bcb19a79b8062e49153eb3b16a88adb +fpga-fixes 54435d1f21b3458b82ffe9ce8614710fc48b79e8 +spdx 4cece764965020c22cff7665b18a012006359095 +gpio-brgl-fixes a38297e3fb012ddfa7ce0321a7e5a8daeb1872b6 +gpio-intel-fixes 7d045025a24b6336d444d359bd4312f351d017f9 +pinctrl-intel-fixes 5d10a157ebe02ac9b8abacfd529f8b045e8aa41b +auxdisplay-fixes 4cece764965020c22cff7665b18a012006359095 +erofs-fixes 7af2ae1b1531feab5d38ec9c8f472dc6cceb4606 +kunit-fixes cfedfb24c9ddee2bf1641545f6e9b6a02b924aee +memblock-fixes 592447f6cb3c20d606d6c5d8e6af68e99707b786 +nfsd-fixes 18180a4550d08be4eb0387fe83f02f703f92d4e7 +renesas-fixes 8c987693dc2d292d777f1be63cb35233049ae25e +perf-current 1cebd7f74976455ccd89c1dfbcf00bca52d0a512 +efi-fixes 1c5a1627f48105cbab81d25ec2f72232bfaa8185 +zstd-fixes 77618db346455129424fadbbaec596a09feaf3bb +battery-fixes 1e0fb113646182e073539db96016b00cfeb18ecc +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +iommufd-fixes dd5a440a31fae6e459c0d6271dddd62825505361 +rust-fixes e67572cd2204894179d89bd7b984072f19313b03 +v9fs-fixes a38297e3fb012ddfa7ce0321a7e5a8daeb1872b6 +w1-fixes 4cece764965020c22cff7665b18a012006359095 +pmdomain-fixes 670c900f69645db394efb38934b3344d8804171a +overlayfs-fixes 77a28aa476873048024ad56daf8f4f17d58ee48e +i2c-host-fixes 55750148e5595bb85605e8fbb40b2759c2c4c2d7 +sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +clk-fixes aacb99de1099346244d488bdf7df489a44278574 +drm-misc-fixes aed9a1a4f7106ff99a882ad06318cebfa71016a2 +mm-stable 76edc534cc289308130272a2ac28694fc9b72a03 +mm-nonmm-stable 5cbcb62dddf5346077feb82b7b0c9254222d3445 +mm 529891be59970ad787ac4afa87be3ccafde29902 +kbuild bfb57ef0544ae6f67bf83430aa0bb877897da783 +clang-format 5a205c6a9f79d14db38006aa2d7c4f4e76b1bfc7 +perf ea558c86248b4955e5c5f3c0c921df450880605e +compiler-attributes 2993eb7a8d34aee6165e1f6676e81cdf1d22aa62 +dma-mapping a6016aac5252da9d22a4dc0b98121b0acdf6d2f5 +asm-generic 02af68767d27aa66c95ef0850545a9616c5e847e +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm b7e329ac0464e1c23d063edea355f8b3d285f5c4 +arm64 f0cc697f9f651d8d1a3279c1c3bed8e829e99f9f +arm-perf 410e471f87465f04d7ae7f8ed16ef8e7a3b5517c +arm-soc 1e3dd71e2587a67cdd7afbafce95bdaa47ba8235 +amlogic e30237bd4f71204ffe13e7f92763cda3873376c7 +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed c44211af1aa9c6b93178a3993e18a7ebffab7488 +at91 fa8e55345b646f3eb5b1dc889bad4a2a1fa360d9 +broadcom 3d83aa97a6f760a9eaad4cd7883af61f406a2dec +davinci 6613476e225e090cc9aad49be7fa504e290dd33d +drivers-memory bf11908757eeab716536d16a32693b5dcd6990de +imx-mxs 8c4bf8c96748fac9e6db17ea58ecd505a2217fb7 +mediatek 4cece764965020c22cff7665b18a012006359095 +mvebu da8e8356f59487331aab2c3cf5250e29b05c4b3e +omap 5856330c3d569dcc2aa2d157d6e5a8984cb03409 +qcom 7468eb6710ce312298c26af9268d0cdfc2d359bc +renesas 1e2995ef0bb889af02b852db23914354d7ecb763 +reset 6d89df61650d155b9033d9f507f3580f9177e623 +rockchip 160b088184ec81028ff67a5032be33f1baea4b67 +samsung-krzk a9c32618cd2a0475f1f10037e32d8ee0aea9368a +scmi 02ba7b5a731ac9fcb70177be3586cc62edc692f5 +sophgo 1eba0b61be72506549e79dd11a132b5d73aed094 +stm32 dccdbccb70450c83a8daf35320a7ec9ec2c456e9 +sunxi 547c853141d11081383323efcbdc005b0e51c5e6 +tee 60757f1264a2d88502d05977c791757ee5eb9f5e +tegra 2fd759c1796c8e637cf019746b7d20185fc545c3 +ti f532f23757713d920383fad74bcf736d89563bf0 +xilinx 3bdc4c661d4719301c4099e788895e18c6d3a487 +clk 429fe5372451dbeee16eecb93a570556839c0a81 +clk-imx f5072cffb35c122ec85d91ef327fa8814f04297b +clk-renesas 5add5ebc4e35a703a49976abfd82e708d9aea4ad +csky 2c40c1c6adab90ee4660caf03722b3a3ec67767b +loongarch 9f4047a4c9ca865d69f0b3821ce688d86179c25f +m68k ec8c8266373f6283a3e99b036aea7b9428480625 +m68knommu a5044ce7d1d94cd37be99e86964aa054f7e5564c +microblaze 58d647506c92ccd3cfa0c453c68ddd14f40bf06f +mips 07e6a6d7f1d9fa4685003a195032698ba99577bb +openrisc 4dc70e1aadfadf968676d983587c6f5d455aba85 +parisc-hd 0ca4f51fa522df285ebff76ec8bd2bde7d1c080d +powerpc e789d4499abdb488dd9cabce4f95c74dac6bcbe5 +powerpc-kdump-hotplug 9803af291162dbca4b9773586a3f5c392f0dd974 +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v 92cce91949a497a8a4615f9ba5813b03f7a1f1d5 +riscv-dt 1c80d50bb697f84bfbc3876e08e1a1d42bfbdddb +riscv-soc 16d9122246cc05b5e89e207757ca2a69f720509c +s390 a99fb341e8d246410c3d991b414994855cbfbc24 +sh efe976b7eecfa3f81e241da67d1a511e30a87779 +sparc 1c9e709cde80fb612e07d9503ad04457e8a58da2 +uml 919e3ece7f5aaf7b5f3c54538d5303b6eeeb053b +xtensa b7cf2a1d9881823133acc48427815a48b35b49f4 +bcachefs 07f9a27f1969764d11374942961d51fee0ab628f +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt 7f016edaa0f385da0c37eee1ebb64c7f6929c533 +afs abcbd3bfbbfe97a8912d0c929d4aa18f50d9bc52 +btrfs 55b52af44d5021cde810d7d02f01cdd05828ced1 +ceph d3e0469306793972fd2b1ea016fa7ab0658c9849 +cifs edfc6481faf896301cab940da776229fe39e9fc9 +configfs 4425c1d9b44ded655d2668e1ce95a62bccf7b21b +erofs 7c35de4df1056a5a1fb4de042197b8f5b1033b61 +exfat f19257997d9c31864b4cf3fcef6e2d2b9ede148d +exportfs e8f897f4afef0031fe618a8e94127a0934896aba +ext3 82172cca18b25e36c0c2bdd96ed6c158617ead2f +ext4 26770a717cac57041d9414725e3e01dd19b08dd2 +f2fs 991b6bdf1b009832256f8bc3035d4bcba664657b +fsverity ee5814dddefbaa181cb247a75676dd5103775db1 +fuse 529395d2ae6456c556405016ea0c43081fe607f3 +gfs2 c1c53c26e3380a79b65e6b53dac6c3c797a7e8f1 +jfs e42e29cc442395d62f1a8963ec2dfb700ba6a5d7 +ksmbd c91ecba9e421e4f2c9219cf5042fa63a12025310 +nfs 24457f1be29f1e7042e50a7749f5c2dde8c433c8 +nfs-anna 57331a59ac0d680f606403eb24edd3c35aecba31 +nfsd 8d915bbf39266bb66082c1e4980e123883f19830 +ntfs3 24f6f5020b0b2c89c2cba5ec224547be95f753ee +orangefs 53e4efa470d5fc6a96662d2d3322cfc925818517 +overlayfs e9229c18dae3b3c2556cea8413edd1f76c78d767 +ubifs af9a8730ddb6a4b2edd779ccc0aceb994d616830 +v9fs 2a0505cdd8c8b12670f4b5a6eb5c996c0861c2d5 +v9fs-ericvh a38297e3fb012ddfa7ce0321a7e5a8daeb1872b6 +xfs 25576c5420e61dea4c2b52942460f2221b8e46e8 +zonefs 567e629fd296561aacd04547a603b163de3dabbe +iomap 3ac974796e5d94509b85a403449132ea660127c2 +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner 584bbf439d0fa83d728ec49f3a38c581bdc828b4 +vfs 4faeedb807f84af8cc5a05ec580cde4d25bd8dbe +printk 596ffa476e201ecbf7ea024f1b59d4f28e91060c +pci a38bebb2868274a1e9316c9e99500395b08ccb12 +pstore 9dd12ed95c2d06a29a5d289c6e65589c577ef8ca +hid 14ee3d12f37b2594b9aa01fee2f7cff51bc71b26 +i2c 24a9d78e808cf7523be4281bd3dddbe45443b954 +i2c-host 61e05bad821cb293418794738e7cc359949f44fe +i3c acec16dbb3382304a4993de8c2dd54a625c6240d +dmi 4d1b28a8119c615f1e932520f9ee1f80bdda5204 +hwmon-staging 5fbf8734fb36cf67339f599f0e51747a6aff690c +jc_docs 955e15969c1d1abb53fc61018bc176bec570b8f4 +v4l-dvb 4a7d735191dec9ccaf95f26f63cb6b46fb8cd260 +v4l-dvb-next 8771b7f31b7fff91a998e6afdb60650d4bac59a5 +pm 9b0087147da0a0175d376cd636bc795f2e943f95 +cpufreq-arm fde234239d161f958390e41d26cda2bb166f1994 +cpupower 55f9f60852ef0dfcb270fd088ea9f493a5a7bdf8 +devfreq ccad360a2d415447bd6f0de9e873eec05442d159 +pmdomain d88ea30340963d87c267cf1c7ebb2a205ef04e25 +opp 4cece764965020c22cff7665b18a012006359095 +thermal 69b08420b6972425b52c2f0562e5c2c33bf10a59 +dlm 7b72ab2c6a468305449db8f204bf1e406fd3e147 +rdma 49ca2b2ef3d003402584c68ae7b3055ba72e750a +net-next 654de42f3fc6edc29d743c1dbcd1424f7793f63d +bpf-next 5c1672705a1a2389f5ad78e0fea6f08ed32d6f18 +ipsec-next dcf280ea0aad87e70ef1646d579d11f8a52f8b67 +mlx5-next d727d27db536faea7178290c677cc0567f647231 +netfilter-next 5c1672705a1a2389f5ad78e0fea6f08ed32d6f18 +ipvs-next fa23e0d4b756d25829e124d6b670a4c6bbd4bf7e +bluetooth 6a486c1361ea588938898ae812b32dcfbd4022f2 +wireless-next 1d60eabb82694e58543e2b6366dae3e7465892a5 +wpan-next 9187210eee7d87eea37b45ea93454a88681894a4 +wpan-staging 9187210eee7d87eea37b45ea93454a88681894a4 +mtd 6277967d872e229de53b0585ebc34c8172965492 +nand 6819db94e1cd3ce24a432f3616cd563ed0c4eaba +spi-nor c84b3925c7d6c649f5add009084ff409139f894d +crypto 13909a0c88972c5ef5d13f44d1a8bf065a31bdf4 +drm 275654c02f0ba09d409c36d71dc238e470741e30 +drm-exynos 7a5bdb7ca1b4bb4ffb20ea610ef4e09c56552667 +drm-misc 959314c438caf1b62d787f02d54a193efda38880 +amdgpu a83048bfa402decfb0c69600d88585fc270acda0 +drm-intel ce698dcf10d5d85c712b8cf3140d125e3112daf9 +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm b587f413ca47530b41aadc6f6bda6fc76153f77f +drm-msm-lumag 104e548a7c97da24224b375632fca0fc8b64c0db +drm-xe b31cfb47b27ae02ea7fb3f956b99c79356730e2a +etnaviv b735ee173f84d5d0d0733c53946a83c12d770d05 +fbdev ce4a7ae84a58b9f33aae8d6c769b3c94f3d5ce76 +regmap 9b1fe0510494c989ab6a131ce8b97cdd02a1c869 +sound d731b1ed15052580b7b2f40559021012d280f1d9 +ieee1394 21151fd8f0ea5dcff27e8db25b65bf892d408bdc +sound-asoc c277ee8f90abf3359be213d2ee9de5a7bd6e4324 +modules 2c9e5d4a008293407836d29d35dfd4353615bd2f +input 5852f2afcdd9b7c9dedec4fdf14b8b079349828f +block ba94750e4f9048bdbed681da49149ba78cadaa6d +device-mapper 8b21ac87d550acc4f6207764fed0cf6f0e3966cd +libata d4a89339f17c87c4990070e9116462d16e75894f +pcmcia ccae53aa8aa2d902242555638c5de104aab08879 +mmc 35eea0defb6e46b26e286066e0e77ac5d53e7fba +mfd 1482489b5196f4203576ae1dc2ba4ce3ada381c7 +backlight 1fd949f653ee1a3c1776ef8a5295ae072c9b67f2 +battery 50f0ff7c8cc4c1d10fabc4b3b3f3b9e942b08187 +regulator 00d1d63ef2da3363bd9770f0c1a10392c1027eab +security dd80c7465029dd0671e6f9fc2678ae0fbdf785ac +apparmor 3dd384108d53834002be5630132ad5c3f32166ad +integrity 9fa8e76250082a45d0d3dad525419ab98bd01658 +selinux 4b60f3cd1134b46557ceffb8fecd6d0493b9f740 +smack 69b6d71052b54fb10feba68564ccb41c0f0ce1e9 +tomoyo 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tpmdd f4e8d80292859809ea135e9f4c43bae47e4f58bc +watchdog c45b8cfc6d5c12fbbc4d89b24b59402df99c1ecb +iommu 2bd5059c6cc04b02073d4d9f57137ab74e1d8e7a +audit 4cece764965020c22cff7665b18a012006359095 +devicetree d976c6f4b32c2d273d44ff9ad7099efe16279a39 +dt-krzk 3d679a406f3a323361247c42268ed6031d366e61 +mailbox 0ac39d85a7415cb2e68a8d239f3d2f67175a14fe +spi e958cffa42dfa99c25ec855b124d9bbc47173826 +tip 346ec194187ea36343c438cf8d76a58225fc49f0 +clockevents 2030a7e11f161b4067bd4eadd984cdb36446fcca +edac ab80b31cd7b2913902f79c9b9bae343d28fdcf71 +ftrace 7604256cecef34a82333d9f78262d3180f4eb525 +rcu 0e9b1d2b05601ee54f26a3f562450db708707e85 +kvm 4aad0b1893a141f114ba40ed509066f3c9bc24b0 +kvm-arm eaa46a28d59655aa89a8fb885affa6fc0de44376 +kvms390 39cd87c4eb2b893354f3b850f916353f2658ae6f +kvm-ppc b52e8cd3f835869370f8540f1bc804a47a47f02b +kvm-riscv 5ef2f3d4e747c7851678ad2b70e37be886a8c9eb +kvm-x86 d91a9cc16417b8247213a0144a1f0fd61dc855dd +xen-tip d4c16b4755de8df5ba25ea00e189e97a89c2bc8c +percpu 2d9ad81ef93570bc0d4929d05d0601ea400d6fcf +workqueues 24283babc61f6e188013e533ac8bad2d1f849fea +drivers-x86 d41393f6c605cbcb0395c89e2d6e02dadf6bacd2 +chrome-platform 2fbe479c0024e1c6b992184a799055e19932aa48 +chrome-platform-firmware 7f20f21c22aa22e488530f66bf4fc168e427f5bd +hsi c076486b6a28aa584b3e86312442bac09279a015 +leds-lj f2994f5341e03b8680a88abc5f1dee950033c3a9 +ipmi 999dff3c13930ad77a7070a5fb4473b1fafdcecc +driver-core 880a746fa3ea5916a012fa320fdfbcd3f331bea3 +usb 51474ab44abf907023a8a875e799b07de461e466 +thunderbolt a3dc6d82de9bd88871dbc4ac511409e69ecacbfb +usb-serial 39cd87c4eb2b893354f3b850f916353f2658ae6f +tty e21de1455a721a0cb4217b18589ede846f5b0686 +char-misc 9799873717398e8fa1727482e578b9d777da645e +accel f03eee5fc922158654405318a02db9982c0ddf07 +coresight 9b47d9982d1de5adf0abcb8f1a400e51d68cca1f +fastrpc 4cece764965020c22cff7665b18a012006359095 +fpga b7c0e1ecee403a43abc89eb3e75672b01ff2ece9 +icc 230d05b1179f6ce6f8dc8a2b99eba92799ac22d7 +iio 827dca3129708a8465bde90c86c2e3c38e62dd4f +phy-next 960b3f023d3bda0efd6e573a0647227d1115d266 +soundwire a0df7e04eab07cb2c08517209f792a8070504f0d +extcon 3e8e45b65d9f3f1811c020325a306da0f01e485b +gnss 0bbac3facb5d6cc0171c45c9873a2dc96bea9680 +vfio dda057ad8c9c5f1dcd6cc33ada0fa5fceb5acacc +w1 cde37a5bdb0ed2c4c7b86ef688e5fdb697525a57 +spmi 4cece764965020c22cff7665b18a012006359095 +staging eb563dc752d33b0a5d4952964af15ca892f59524 +counter-next 89d5d9e9500826cbd3b15ea7b6e8d9fae966f073 +siox db418d5f1ca5b7bafc8eaa9393ea18a7901bb0ed +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 28059ddbee0eb92730931a652e16a994499a7858 +cgroup 8f6d24a5db2acac3f52a34e6df347ec131d231ab +scsi 9ba1fbe2ed0cb367d609466a51d787acff406847 +scsi-mkp 3668651def2c1622904e58b0280ee93121f2b10b +vhost 0b8dbbdcf2e42273fbac9b752919e2e5b2abac21 +rpmsg c8d8f841e95bcc07ac8c5621fc171a24f1fd5cdb +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl 7f45fe2ea3b8c85787976293126a4a7133b107de +gpio-intel ecc4b1418e2399753af7ef304d01f45e8e942286 +pinctrl 9429f847dd7274a445eb9e6743046afcfe527c82 +pinctrl-intel 5d10a157ebe02ac9b8abacfd529f8b045e8aa41b +pinctrl-renesas cd27553b0dee6fdc4a2535ab9fc3c8fbdd811d13 +pinctrl-samsung e5b3732a9654f26d21647d9e7b4fec846f6d4810 +pwm 4817118f257e49b043f3d80f021a327b7e1d796f +ktest 07283c1873a4d0eaa0e822536881bfdaea853910 +kselftest 2c3b8f8f37c6c0c926d584cf4158db95e62b960c +kunit 4cece764965020c22cff7665b18a012006359095 +kunit-next 5496b9b77d7420652202b73cf036e69760be5deb +livepatching 73a98bc5a947f7db6e7e3e614284e3026341fcd7 +rtc 1c431b92e21bcbfc374f97d801840c1df47e3d6b +nvdimm 41147b006be2174b825a54b0620ecf4cc7ec5c84 +at24 4cece764965020c22cff7665b18a012006359095 +ntb 9341b37ec17a8793e8439e9b18354ba69556b786 +seccomp e406737b11103752838cf50fd197ec8e9352bbf7 +fsi c5eeb63edac9497f9a0d46d3b75cf8b293771ecf +slimbus 4cece764965020c22cff7665b18a012006359095 +nvmem 4cece764965020c22cff7665b18a012006359095 +xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af +hyperv f2580a907e5c0e8fc9354fd095b011301c64f949 +auxdisplay 93ee235f55d3e1c881e766a320cedcad0b9aca42 +kgdb b2aba15ad6f908d1a620fd97f6af5620c3639742 +hmm 6613476e225e090cc9aad49be7fa504e290dd33d +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi 48f98496b1de132f2e056605b5330209136066dc +memblock e5d1fdecfaf8470bad3874d00c7921e3883495b7 +cxl d99f13843237cf9dbdc1bd873a901662b4aee16f +zstd 3f832dfb8a8eafee3cecd479d99651a64a61485a +efi 4b2543f7e1e6b91cfc8dd1696e3cdf01c3ac8974 +unicode 0131c1f3cce7c01b0eb657a9e9e1a5e42c09a68b +slab 4a8dd3b3d55099efba5d98975ebf78c05e52d1ab +random 7b1bcd6b50a615671d4dcb0ad0378a2660a1a368 +landlock 5bf9e57e634bd72a97b4b12c87186fc052a6a116 +rust 97ab3e8eec0ce79d9e265e6c9e4c480492180409 +sysctl a35dd3a786f57903151b18275b1eed105084cf72 +execve 4bbf9c3b53e637eb3a14ee27b996300ce88e752a +bitmap c3052c2f53d3546a53f05165a62a2d31abab0e27 +hte 297f26dbf870d4f19591b74a0ab535c327917b81 +kspp 5a1f2a9c4236d782770bd6795a36b7adbd735c00 +kspp-gustavo 6613476e225e090cc9aad49be7fa504e290dd33d +nolibc 0adab2b6b7336fb6ee3c6456a432dad3b1d25647 +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd 4cece764965020c22cff7665b18a012006359095 +turbostat dedcf3a8e704acc60804c62838acfcc36f507527 +refactor-heap 940c306fd77984112185b93c4edd9c8fc7e84194 +header_cleanup 5f4c01f1e3c7b0c8d1e5dd6f080531de7aa5e47b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 00000000000000..0580f46e87ba70 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,377 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.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 +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/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 +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git https://gitlab.freedesktop.org/drm/kernel.git#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +auxdisplay-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +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 +v9fs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +w1-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +overlayfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-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 +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 +powerpc-kdump-hotplug git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/kdump-hotplug +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 +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 +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 +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/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 git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +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 https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.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/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-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 +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 +refactor-heap git https://evilpiepirate.org/git/bcachefs.git#refactor-heap +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 00000000000000..dd2c278bdd4cc9 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,14761 @@ +$ date -R +Wed, 15 May 2024 08:41:42 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 47% (5057/10610)
Updating files: 48% (5093/10610)
Updating files: 49% (5199/10610)
Updating files: 50% (5305/10610)
Updating files: 51% (5412/10610)
Updating files: 52% (5518/10610)
Updating files: 53% (5624/10610)
Updating files: 54% (5730/10610)
Updating files: 55% (5836/10610)
Updating files: 56% (5942/10610)
Updating files: 57% (6048/10610)
Updating files: 58% (6154/10610)
Updating files: 59% (6260/10610)
Updating files: 60% (6366/10610)
Updating files: 61% (6473/10610)
Updating files: 62% (6579/10610)
Updating files: 63% (6685/10610)
Updating files: 64% (6791/10610)
Updating files: 65% (6897/10610)
Updating files: 66% (7003/10610)
Updating files: 67% (7109/10610)
Updating files: 68% (7215/10610)
Updating files: 69% (7321/10610)
Updating files: 70% (7427/10610)
Updating files: 71% (7534/10610)
Updating files: 72% (7640/10610)
Updating files: 73% (7746/10610)
Updating files: 74% (7852/10610)
Updating files: 75% (7958/10610)
Updating files: 76% (8064/10610)
Updating files: 77% (8170/10610)
Updating files: 78% (8276/10610)
Updating files: 79% (8382/10610)
Updating files: 80% (8488/10610)
Updating files: 81% (8595/10610)
Updating files: 82% (8701/10610)
Updating files: 82% (8800/10610)
Updating files: 83% (8807/10610)
Updating files: 84% (8913/10610)
Updating files: 85% (9019/10610)
Updating files: 86% (9125/10610)
Updating files: 87% (9231/10610)
Updating files: 88% (9337/10610)
Updating files: 89% (9443/10610)
Updating files: 90% (9549/10610)
Updating files: 91% (9656/10610)
Updating files: 92% (9762/10610)
Updating files: 93% (9868/10610)
Updating files: 94% (9974/10610)
Updating files: 95% (10080/10610)
Updating files: 96% (10186/10610)
Updating files: 97% (10292/10610)
Updating files: 98% (10398/10610)
Updating files: 99% (10504/10610)
Updating files: 100% (10610/10610)
Updating files: 100% (10610/10610), done. +HEAD is now at 8f5b5f78113e Merge tag 'rust-6.10' of https://github.com/Rust-for-Linux/linux +Merging origin/master (1b10b390d945 Merge tag 'efi-next-for-v6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 8f5b5f78113e..1b10b390d945 +Fast-forward (no commit created; -m option ignored) + Documentation/ABI/removed/sysfs-firmware-efi-vars | 12 + + Documentation/ABI/stable/sysfs-firmware-efi-vars | 79 - + Documentation/admin-guide/kernel-parameters.txt | 6 + + Documentation/admin-guide/perf/hisi-pmu.rst | 1 - + Documentation/admin-guide/perf/hns3-pmu.rst | 8 +- + Documentation/admin-guide/perf/qcom_l2_pmu.rst | 2 +- + Documentation/admin-guide/perf/qcom_l3_pmu.rst | 2 +- + Documentation/admin-guide/perf/thunderx2-pmu.rst | 2 +- + Documentation/admin-guide/perf/xgene-pmu.rst | 2 +- + Documentation/arch/x86/resctrl.rst | 6 + + Documentation/dev-tools/kselftest.rst | 2 +- + .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 2 + + .../bindings/gpio/brcm,brcmstb-gpio.yaml | 3 + + .../bindings/gpio/microchip,mpfs-gpio.yaml | 17 +- + .../devicetree/bindings/hwmon/adc128d818.txt | 38 - + .../devicetree/bindings/hwmon/adi,adm1275.yaml | 4 +- + Documentation/devicetree/bindings/hwmon/as370.txt | 11 - + .../devicetree/bindings/hwmon/ibm,opal-sensor.yaml | 37 + + .../devicetree/bindings/hwmon/ibm,p8-occ-hwmon.txt | 25 - + .../devicetree/bindings/hwmon/ibmpowernv.txt | 23 - + Documentation/devicetree/bindings/hwmon/lm87.txt | 30 - + .../devicetree/bindings/hwmon/max6650.txt | 28 - + .../devicetree/bindings/hwmon/maxim,max6650.yaml | 70 + + .../bindings/hwmon/pmbus/adi,adp1050.yaml | 49 + + .../devicetree/bindings/hwmon/pwm-fan.txt | 1 - + .../devicetree/bindings/hwmon/st,stts751.yaml | 41 + + .../devicetree/bindings/hwmon/stts751.txt | 15 - + .../devicetree/bindings/hwmon/syna,as370.yaml | 32 + + .../devicetree/bindings/hwmon/ti,adc128d818.yaml | 63 + + .../devicetree/bindings/hwmon/ti,lm87.yaml | 69 + + .../bindings/interrupt-controller/riscv,aplic.yaml | 172 + + .../interrupt-controller/riscv,imsics.yaml | 172 + + .../interrupt-controller/st,stm32-exti.yaml | 17 +- + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 2 + + .../opp/allwinner,sun50i-h6-operating-points.yaml | 93 +- + .../devicetree/bindings/pwm/atmel,at91sam-pwm.yaml | 3 + + .../bindings/pwm/google,cros-ec-pwm.yaml | 1 - + .../devicetree/bindings/pwm/marvell,pxa-pwm.yaml | 1 - + .../bindings/pwm/mediatek,mt2712-pwm.yaml | 1 - + .../devicetree/bindings/pwm/mediatek,pwm-disp.yaml | 2 +- + .../devicetree/bindings/pwm/pwm-bcm2835.yaml | 1 - + .../bindings/pwm/snps,dw-apb-timers-pwm2.yaml | 1 - + .../regulator/allwinner,sun20i-d1-system-ldos.yaml | 37 + + .../bindings/regulator/fixed-regulator.yaml | 7 + + .../bindings/regulator/nxp,pca9450-regulator.yaml | 1 + + .../regulator/qcom,usb-vbus-regulator.yaml | 1 + + .../bindings/spi/airoha,en7581-snand.yaml | 65 + + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 8 +- + .../bindings/spi/marvell,armada-3700-spi.yaml | 55 + + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 1 + + .../devicetree/bindings/spi/spi-armada-3700.txt | 25 - + Documentation/devicetree/bindings/spi/ti,qspi.yaml | 96 + + Documentation/devicetree/bindings/spi/ti_qspi.txt | 53 - + .../bindings/thermal/amlogic,thermal.yaml | 12 +- + .../bindings/thermal/loongson,ls2k-thermal.yaml | 24 +- + .../bindings/thermal/mediatek,lvts-thermal.yaml | 6 + + .../devicetree/bindings/thermal/qcom-lmh.yaml | 12 +- + .../bindings/thermal/st,stih407-thermal.yaml | 58 + + .../devicetree/bindings/thermal/st-thermal.txt | 32 - + .../devicetree/bindings/timer/renesas,ostm.yaml | 2 + + .../devicetree/bindings/trivial-devices.yaml | 4 + + Documentation/driver-api/driver-model/devres.rst | 1 + + Documentation/driver-api/gpio/driver.rst | 28 +- + Documentation/driver-api/gpio/legacy.rst | 16 - + Documentation/filesystems/efivarfs.rst | 2 +- + Documentation/firmware-guide/acpi/namespace.rst | 4 +- + Documentation/hid/hid-bpf.rst | 2 +- + Documentation/hid/intel-ish-hid.rst | 137 +- + Documentation/hwmon/adm1275.rst | 14 +- + Documentation/hwmon/adp1050.rst | 64 + + Documentation/hwmon/aquacomputer_d5next.rst | 9 +- + Documentation/hwmon/emc1403.rst | 17 +- + Documentation/hwmon/index.rst | 2 + + Documentation/hwmon/lm70.rst | 2 +- + Documentation/hwmon/nzxt-kraken3.rst | 19 +- + Documentation/hwmon/pmbus.rst | 2 +- + Documentation/hwmon/xdp710.rst | 83 + + Documentation/power/pci.rst | 2 +- + Documentation/process/changes.rst | 9 + + Documentation/process/maintainer-tip.rst | 18 +- + Documentation/scheduler/sched-domains.rst | 12 +- + Documentation/scheduler/sched-stats.rst | 37 +- + Documentation/spi/index.rst | 1 - + Documentation/spi/pxa2xx.rst | 211 -- + Documentation/spi/spi-summary.rst | 5 - + .../translations/zh_CN/driver-api/gpio/legacy.rst | 16 - + .../translations/zh_CN/scheduler/sched-domains.rst | 10 +- + .../translations/zh_CN/scheduler/sched-stats.rst | 30 +- + Documentation/translations/zh_TW/gpio.txt | 17 - + .../userspace-api/gpio/gpio-v2-get-line-ioctl.rst | 2 +- + MAINTAINERS | 49 +- + arch/arm/boot/dts/st/stm32mp131.dtsi | 74 +- + arch/arm/boot/dts/st/stm32mp151.dtsi | 75 + + arch/arm/include/asm/topology.h | 6 +- + arch/arm/kernel/hw_breakpoint.c | 8 +- + arch/arm/kernel/topology.c | 2 +- + arch/arm/mach-pxa/devices.c | 18 - + arch/arm/mach-pxa/spitz.c | 35 +- + arch/arm/mach-pxa/spitz_pm.c | 22 +- + arch/arm/mach-sa1100/h3600.c | 47 +- + arch/arm64/Kconfig | 2 + + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/Makefile | 11 +- + arch/arm64/boot/.gitignore | 1 + + arch/arm64/boot/Makefile | 6 +- + .../dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 5 + + .../boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi | 115 + + .../dts/allwinner/sun50i-h616-orangepi-zero2.dts | 5 + + .../boot/dts/allwinner/sun50i-h616-x96-mate.dts | 5 + + arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 8 + + .../allwinner/sun50i-h618-longan-module-3h.dtsi | 5 + + .../dts/allwinner/sun50i-h618-orangepi-zero2w.dts | 5 + + .../dts/allwinner/sun50i-h618-orangepi-zero3.dts | 5 + + .../allwinner/sun50i-h618-transpeed-8k618-t.dts | 5 + + arch/arm64/boot/dts/st/stm32mp251.dtsi | 176 + + arch/arm64/include/asm/assembler.h | 13 +- + arch/arm64/include/asm/cputype.h | 2 + + arch/arm64/include/asm/el2_setup.h | 9 +- + arch/arm64/include/asm/irqflags.h | 1 - + arch/arm64/include/asm/jump_label.h | 28 +- + arch/arm64/include/asm/pgtable-prot.h | 19 +- + arch/arm64/include/asm/pgtable.h | 114 +- + arch/arm64/include/asm/sysreg.h | 24 +- + arch/arm64/include/asm/tlbflush.h | 33 +- + arch/arm64/include/asm/topology.h | 6 +- + arch/arm64/kernel/acpi.c | 10 + + arch/arm64/kernel/hw_breakpoint.c | 4 +- + arch/arm64/kernel/perf_callchain.c | 118 +- + arch/arm64/kernel/pi/idreg-override.c | 2 + + arch/arm64/kernel/setup.c | 11 +- + arch/arm64/kernel/smp.c | 7 + + arch/arm64/kernel/stacktrace.c | 120 + + arch/arm64/mm/mmu.c | 101 +- + arch/arm64/mm/proc.S | 10 - + arch/m68k/Kconfig | 4 +- + arch/m68k/amiga/config.c | 2 +- + arch/m68k/configs/amiga_defconfig | 4 +- + arch/m68k/configs/apollo_defconfig | 4 +- + arch/m68k/configs/atari_defconfig | 4 +- + arch/m68k/configs/bvme6000_defconfig | 4 +- + arch/m68k/configs/hp300_defconfig | 4 +- + arch/m68k/configs/mac_defconfig | 4 +- + arch/m68k/configs/multi_defconfig | 4 +- + arch/m68k/configs/mvme147_defconfig | 4 +- + arch/m68k/configs/mvme16x_defconfig | 4 +- + arch/m68k/configs/q40_defconfig | 4 +- + arch/m68k/configs/sun3_defconfig | 4 +- + arch/m68k/configs/sun3x_defconfig | 4 +- + arch/m68k/include/asm/thread_info.h | 9 +- + arch/m68k/kernel/entry.S | 4 +- + arch/m68k/mac/misc.c | 36 +- + arch/mips/dec/setup.c | 2 +- + arch/openrisc/Kconfig | 9 + + arch/openrisc/include/asm/fpu.h | 22 + + arch/openrisc/include/asm/processor.h | 1 + + arch/openrisc/include/asm/ptrace.h | 3 +- + arch/openrisc/include/uapi/asm/elf.h | 75 +- + arch/openrisc/kernel/entry.S | 15 +- + arch/openrisc/kernel/module.c | 18 +- + arch/openrisc/kernel/process.c | 13 +- + arch/openrisc/kernel/ptrace.c | 18 +- + arch/openrisc/kernel/signal.c | 36 +- + arch/openrisc/kernel/traps.c | 136 +- + arch/parisc/kernel/smp.c | 2 +- + arch/powerpc/include/asm/Kbuild | 1 - + arch/powerpc/include/asm/cputime.h | 13 - + arch/powerpc/include/asm/vdso/gettimeofday.h | 26 +- + arch/powerpc/kernel/time.c | 22 + + arch/powerpc/kvm/book3s_hv_rm_xics.c | 2 +- + arch/riscv/Kconfig | 2 + + arch/s390/include/asm/vdso/gettimeofday.h | 7 +- + arch/s390/include/asm/vtime.h | 2 - + arch/s390/kernel/irq.c | 1 + + arch/s390/kernel/nmi.c | 1 + + arch/sh/Kconfig | 3 +- + arch/sh/boards/board-sh7757lcr.c | 2 +- + arch/sh/boards/board-sh7785lcr.c | 2 +- + arch/sh/boards/mach-dreamcast/setup.c | 3 + + arch/sh/boards/mach-highlander/pinmux-r7785rp.c | 1 + + arch/sh/boards/mach-sh03/rtc.c | 2 +- + arch/sh/boards/of-generic.c | 2 + + arch/sh/boot/compressed/Makefile | 2 +- + arch/sh/boot/compressed/cache.c | 13 - + arch/sh/boot/compressed/misc.c | 9 +- + arch/sh/boot/compressed/misc.h | 9 + + arch/sh/boot/dts/j2_mimas_v2.dts | 2 - + arch/sh/drivers/dma/dma-api.c | 143 - + arch/sh/drivers/push-switch.c | 6 +- + arch/sh/include/asm/cacheflush.h | 12 + + arch/sh/include/asm/dma.h | 7 - + arch/sh/include/asm/fpu.h | 3 + + arch/sh/include/asm/ftrace.h | 10 + + arch/sh/include/asm/hw_breakpoint.h | 2 + + arch/sh/include/asm/setup.h | 1 + + arch/sh/include/asm/syscalls.h | 1 + + arch/sh/include/asm/tlb.h | 4 + + arch/sh/kernel/cpu/sh2a/opcode_helper.c | 2 + + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 3 + + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 1 + + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 3 + + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 14 - + arch/sh/kernel/dwarf.c | 2 +- + arch/sh/kernel/kprobes.c | 13 +- + arch/sh/kernel/return_address.c | 2 + + arch/sh/kernel/smp.c | 6 +- + arch/sh/kernel/traps.c | 10 +- + arch/sh/kernel/traps_32.c | 5 +- + arch/sh/lib/checksum.S | 67 +- + arch/sh/math-emu/math.c | 2 + + arch/sh/mm/cache-sh4.c | 2 - + arch/sh/mm/cache-shx3.c | 1 + + arch/sh/mm/cache.c | 14 - + arch/sh/mm/nommu.c | 2 + + arch/sh/mm/pgtable.c | 4 +- + arch/sh/mm/tlbex_32.c | 1 + + arch/um/include/asm/cpufeature.h | 3 +- + arch/x86/Kconfig | 54 +- + arch/x86/boot/compressed/head_64.S | 5 + + arch/x86/boot/compressed/sev.c | 197 +- + arch/x86/boot/main.c | 4 +- + arch/x86/entry/Makefile | 2 +- + arch/x86/entry/entry_64_compat.S | 1 - + arch/x86/entry/entry_fred.c | 2 + + arch/x86/entry/syscalls/syscall_64.tbl | 2 +- + arch/x86/entry/{thunk_64.S => thunk.S} | 0 + arch/x86/entry/thunk_32.S | 18 - + arch/x86/events/amd/core.c | 37 +- + arch/x86/events/amd/lbr.c | 13 +- + arch/x86/events/intel/cstate.c | 116 +- + arch/x86/events/intel/lbr.c | 3 +- + arch/x86/events/intel/pt.c | 12 +- + arch/x86/events/intel/uncore.c | 100 +- + arch/x86/events/intel/uncore_nhmex.c | 3 +- + arch/x86/events/intel/uncore_snbep.c | 5 +- + arch/x86/events/msr.c | 116 +- + arch/x86/events/perf_event.h | 13 + + arch/x86/events/rapl.c | 7 +- + arch/x86/hyperv/hv_vtl.c | 1 - + arch/x86/include/asm/acpi.h | 2 + + arch/x86/include/asm/alternative.h | 28 +- + arch/x86/include/asm/apic.h | 8 +- + arch/x86/include/asm/asm.h | 3 - + arch/x86/include/asm/atomic.h | 12 +- + arch/x86/include/asm/atomic64_32.h | 81 +- + arch/x86/include/asm/atomic64_64.h | 12 +- + arch/x86/include/asm/boot.h | 5 - + arch/x86/include/asm/cmpxchg_32.h | 209 +- + arch/x86/include/asm/cmpxchg_64.h | 8 +- + arch/x86/include/asm/cpu_device_id.h | 101 + + arch/x86/include/asm/cpufeature.h | 16 +- + arch/x86/include/asm/extable_fixup_types.h | 2 +- + arch/x86/include/asm/hardirq.h | 6 + + arch/x86/include/asm/ia32.h | 11 - + arch/x86/include/asm/ia32_unistd.h | 12 - + arch/x86/include/asm/idtentry.h | 6 + + arch/x86/include/asm/intel-family.h | 84 + + arch/x86/include/asm/irq_remapping.h | 7 + + arch/x86/include/asm/irq_stack.h | 2 +- + arch/x86/include/asm/irq_vectors.h | 8 +- + arch/x86/include/asm/mce.h | 2 + + arch/x86/include/asm/msr-index.h | 9 +- + arch/x86/include/asm/page_types.h | 8 +- + arch/x86/include/asm/percpu.h | 157 +- + arch/x86/include/asm/pgtable_types.h | 2 + + arch/x86/include/asm/posted_intr.h | 118 + + arch/x86/include/asm/processor.h | 32 +- + arch/x86/include/asm/prom.h | 9 +- + arch/x86/include/asm/qspinlock.h | 13 +- + arch/x86/include/asm/qspinlock_paravirt.h | 7 +- + arch/x86/include/asm/seccomp.h | 2 +- + arch/x86/include/asm/sev.h | 2 +- + arch/x86/include/asm/sparsemem.h | 2 - + arch/x86/include/asm/special_insns.h | 8 +- + arch/x86/include/asm/string_64.h | 45 +- + arch/x86/include/asm/text-patching.h | 2 +- + arch/x86/include/asm/uaccess.h | 4 +- + arch/x86/include/asm/vdso/gettimeofday.h | 42 +- + arch/x86/include/asm/vm86.h | 2 +- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/alternative.c | 135 +- + arch/x86/kernel/apic/apic.c | 46 +- + arch/x86/kernel/apic/vector.c | 5 +- + arch/x86/kernel/apic/x2apic_cluster.c | 7 +- + arch/x86/kernel/callthunks.c | 9 +- + arch/x86/kernel/cpu/amd.c | 12 + + arch/x86/kernel/cpu/aperfmperf.c | 17 +- + arch/x86/kernel/cpu/bugs.c | 30 +- + arch/x86/kernel/cpu/common.c | 174 +- + arch/x86/kernel/cpu/cpuid-deps.c | 3 + + arch/x86/kernel/cpu/intel.c | 1 + + arch/x86/kernel/cpu/intel_epb.c | 12 +- + arch/x86/kernel/cpu/match.c | 5 +- + arch/x86/kernel/cpu/mce/core.c | 24 +- + arch/x86/kernel/cpu/mce/genpool.c | 36 +- + arch/x86/kernel/cpu/mce/intel.c | 21 +- + arch/x86/kernel/cpu/mce/severity.c | 27 +- + arch/x86/kernel/cpu/microcode/amd.c | 4 +- + arch/x86/kernel/cpu/microcode/core.c | 5 - + arch/x86/kernel/cpu/microcode/intel.c | 5 +- + arch/x86/kernel/cpu/resctrl/core.c | 65 +- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 40 +- + arch/x86/kernel/cpu/resctrl/internal.h | 5 +- + arch/x86/kernel/cpu/resctrl/monitor.c | 11 + + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 24 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 12 +- + .../cpu/resctrl/{pseudo_lock_event.h => trace.h} | 24 +- + arch/x86/kernel/cpu/topology_amd.c | 19 +- + arch/x86/kernel/cpu/topology_ext.c | 15 + + arch/x86/kernel/devicetree.c | 24 +- + arch/x86/kernel/dumpstack.c | 4 +- + arch/x86/kernel/fpu/core.c | 4 +- + arch/x86/kernel/fpu/xstate.c | 4 +- + arch/x86/kernel/head_32.S | 13 +- + arch/x86/kernel/head_64.S | 4 +- + arch/x86/kernel/idt.c | 3 + + arch/x86/kernel/irq.c | 172 +- + arch/x86/kernel/kvm.c | 2 +- + arch/x86/kernel/rtc.c | 1 - + arch/x86/kernel/setup.c | 40 +- + arch/x86/kernel/sev.c | 14 +- + arch/x86/kernel/shstk.c | 4 +- + arch/x86/kernel/signal_32.c | 2 +- + arch/x86/kernel/signal_64.c | 6 + + arch/x86/kernel/smpboot.c | 28 +- + arch/x86/kernel/topology.c | 43 - + arch/x86/kernel/tsc.c | 8 +- + arch/x86/kernel/tsc_msr.c | 14 +- + arch/x86/kernel/tsc_sync.c | 6 +- + arch/x86/kernel/vmlinux.lds.S | 10 +- + arch/x86/kvm/vmx/posted_intr.c | 4 +- + arch/x86/kvm/vmx/posted_intr.h | 93 +- + arch/x86/kvm/vmx/vmx.c | 3 +- + arch/x86/kvm/vmx/vmx.h | 2 +- + arch/x86/math-emu/fpu_etc.c | 9 +- + arch/x86/math-emu/fpu_trig.c | 6 +- + arch/x86/math-emu/reg_constant.c | 7 +- + arch/x86/mm/extable.c | 9 - + arch/x86/mm/fault.c | 7 +- + arch/x86/mm/init.c | 16 +- + arch/x86/mm/numa.c | 4 +- + arch/x86/mm/pat/set_memory.c | 68 +- + arch/x86/pci/ce4100.c | 6 - + arch/x86/platform/ce4100/ce4100.c | 1 - + arch/x86/platform/iris/iris.c | 5 +- + arch/x86/platform/olpc/olpc-xo1-pm.c | 7 +- + arch/x86/platform/olpc/olpc-xo1-sci.c | 5 +- + arch/x86/purgatory/Makefile | 3 +- + arch/x86/tools/relocs.c | 371 +-- + arch/x86/virt/vmx/tdx/tdx.c | 1 - + arch/x86/xen/enlighten.c | 3 - + arch/x86/xen/xen-head.S | 2 +- + drivers/acpi/Kconfig | 3 + + drivers/acpi/Makefile | 8 +- + drivers/acpi/acpi_ipmi.c | 23 +- + drivers/acpi/acpica/Makefile | 1 + + drivers/acpi/acpica/aclocal.h | 2 +- + drivers/acpi/acpica/acobject.h | 107 +- + drivers/acpi/acpica/evgpeinit.c | 1 + + drivers/acpi/acpica/tbfadt.c | 30 +- + drivers/acpi/acpica/tbutils.c | 7 +- + drivers/acpi/acpica/utdebug.c | 5 + + drivers/acpi/apei/einj-core.c | 12 +- + drivers/acpi/bus.c | 25 +- + drivers/acpi/cppc_acpi.c | 4 +- + drivers/acpi/dock.c | 48 +- + drivers/acpi/dptf/dptf_pch_fivr.c | 1 + + drivers/acpi/dptf/dptf_power.c | 2 + + drivers/acpi/dptf/int340x_thermal.c | 6 + + drivers/acpi/fan.h | 1 + + drivers/acpi/internal.h | 3 +- + drivers/acpi/nhlt.c | 289 ++ + drivers/acpi/numa/srat.c | 82 +- + drivers/acpi/property.c | 11 +- + drivers/acpi/resource.c | 25 + + drivers/acpi/scan.c | 30 +- + drivers/acpi/video_detect.c | 8 + + drivers/acpi/x86/Makefile | 8 + + drivers/acpi/{ => x86}/blacklist.c | 2 +- + drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} | 2 +- + drivers/acpi/{acpi_lpss.c => x86/lpss.c} | 5 +- + drivers/acpi/x86/utils.c | 29 +- + drivers/base/arch_topology.c | 26 +- + drivers/base/power/main.c | 6 +- + drivers/base/power/wakeup.c | 11 +- + drivers/base/regmap/internal.h | 14 +- + drivers/base/regmap/regcache-maple.c | 2 +- + drivers/base/regmap/regmap-i3c.c | 2 +- + drivers/base/regmap/regmap-kunit.c | 994 ++++-- + drivers/base/regmap/regmap-mdio.c | 2 +- + drivers/base/regmap/regmap-ram.c | 5 +- + drivers/base/regmap/regmap-raw-ram.c | 5 +- + drivers/base/regmap/regmap-sdw-mbq.c | 2 +- + drivers/base/regmap/regmap-sdw.c | 2 +- + drivers/base/regmap/regmap-spi.c | 1 + + drivers/clocksource/arm_arch_timer.c | 2 +- + drivers/clocksource/renesas-ostm.c | 3 +- + drivers/clocksource/timer-ti-dm.c | 1 - + drivers/cpufreq/amd-pstate.c | 280 +- + drivers/cpufreq/brcmstb-avs-cpufreq.c | 5 +- + drivers/cpufreq/cppc_cpufreq.c | 14 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 10 +- + drivers/cpufreq/cpufreq-dt.c | 21 +- + drivers/cpufreq/cpufreq.c | 47 +- + drivers/cpufreq/freq_table.c | 12 +- + drivers/cpufreq/intel_pstate.c | 181 +- + drivers/cpufreq/mediatek-cpufreq.c | 10 + + drivers/cpufreq/qcom-cpufreq-hw.c | 4 +- + drivers/cpufreq/sun50i-cpufreq-nvmem.c | 209 +- + drivers/cpufreq/tegra124-cpufreq.c | 19 +- + drivers/cpufreq/ti-cpufreq.c | 4 +- + drivers/cpuidle/coupled.c | 13 +- + drivers/cpuidle/cpuidle-kirkwood.c | 5 +- + drivers/cpuidle/governors/ladder.c | 1 + + drivers/devfreq/event/exynos-nocp.c | 6 +- + drivers/devfreq/event/exynos-ppmu.c | 6 +- + drivers/devfreq/exynos-bus.c | 9 +- + drivers/devfreq/mtk-cci-devfreq.c | 6 +- + drivers/devfreq/rk3399_dmc.c | 6 +- + drivers/devfreq/sun8i-a33-mbus.c | 6 +- + drivers/dma/idxd/cdev.c | 77 + + drivers/dma/idxd/idxd.h | 3 + + drivers/dma/idxd/init.c | 4 + + drivers/dma/idxd/registers.h | 3 - + drivers/dma/idxd/sysfs.c | 27 +- + drivers/edac/altera_edac.c | 8 +- + drivers/edac/amd64_edac.h | 1 - + drivers/edac/amd8111_edac.c | 3 +- + drivers/edac/armada_xp_edac.c | 2 +- + drivers/edac/cpc925_edac.c | 2 +- + drivers/edac/edac_device.c | 53 +- + drivers/edac/edac_device.h | 22 +- + drivers/edac/edac_device_sysfs.c | 22 +- + drivers/edac/edac_mc_sysfs.c | 47 +- + drivers/edac/edac_pci.h | 5 - + drivers/edac/highbank_l2_edac.c | 2 +- + drivers/edac/mpc85xx_edac.c | 2 +- + drivers/edac/octeon_edac-l2c.c | 2 +- + drivers/edac/octeon_edac-pc.c | 2 +- + drivers/edac/qcom_edac.c | 1 - + drivers/edac/sifive_edac.c | 3 +- + drivers/edac/skx_common.c | 2 +- + drivers/edac/thunderx_edac.c | 6 +- + drivers/edac/xgene_edac.c | 10 +- + drivers/edac/zynqmp_edac.c | 2 +- + drivers/firmware/efi/efi-pstore.c | 10 +- + drivers/firmware/efi/libstub/fdt.c | 4 +- + drivers/firmware/efi/vars.c | 2 +- + drivers/firmware/google/cbmem.c | 1 - + drivers/firmware/google/coreboot_table.c | 6 +- + drivers/firmware/google/coreboot_table.h | 6 +- + drivers/firmware/smccc/smccc.c | 1 + + drivers/gpio/Kconfig | 27 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-brcmstb.c | 21 +- + drivers/gpio/gpio-cros-ec.c | 8 + + drivers/gpio/gpio-graniterapids.c | 383 +++ + drivers/gpio/gpio-npcm-sgpio.c | 10 +- + drivers/gpio/gpio-pca953x.c | 2 +- + drivers/gpio/gpio-pcie-idio-24.c | 2 +- + drivers/gpio/gpio-regmap.c | 4 +- + drivers/gpio/gpio-sch.c | 35 +- + drivers/gpio/gpiolib-acpi.c | 65 +- + drivers/gpio/gpiolib-legacy.c | 49 +- + drivers/gpio/gpiolib-of.c | 23 +- + drivers/gpio/gpiolib-swnode.c | 44 + + drivers/gpio/gpiolib-sysfs.c | 2 +- + drivers/gpio/gpiolib.c | 26 +- + drivers/gpio/gpiolib.h | 2 +- + drivers/hid/Kconfig | 16 + + drivers/hid/Makefile | 1 + + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 5 +- + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 17 +- + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c | 2 +- + drivers/hid/bpf/hid_bpf_dispatch.c | 226 +- + drivers/hid/bpf/progs/FR-TEC__Raptor-Mach-2.bpf.c | 185 ++ + drivers/hid/bpf/progs/HP__Elite-Presenter.bpf.c | 58 + + drivers/hid/bpf/progs/Huion__Kamvas-Pro-19.bpf.c | 290 ++ + .../hid/bpf/progs/IOGEAR__Kaliber-MMOmentum.bpf.c | 59 + + drivers/hid/bpf/progs/Makefile | 91 + + .../hid/bpf/progs/Microsoft__XBox-Elite-2.bpf.c | 133 + + drivers/hid/bpf/progs/README | 102 + + drivers/hid/bpf/progs/Wacom__ArtPen.bpf.c | 173 + + drivers/hid/bpf/progs/XPPen__Artist24.bpf.c | 229 ++ + drivers/hid/bpf/progs/XPPen__ArtistPro16Gen2.bpf.c | 274 ++ + drivers/hid/bpf/progs/hid_bpf.h | 15 + + drivers/hid/bpf/progs/hid_bpf_helpers.h | 168 + + drivers/hid/hid-asus.c | 132 +- + drivers/hid/hid-core.c | 2 + + drivers/hid/hid-corsair.c | 4 +- + drivers/hid/hid-debug.c | 3437 +++++++++++++++++--- + drivers/hid/hid-google-hammer.c | 5 +- + drivers/hid/hid-ids.h | 3 + + drivers/hid/hid-kye.c | 75 +- + drivers/hid/hid-lenovo.c | 23 +- + drivers/hid/hid-logitech-hidpp.c | 14 +- + drivers/hid/hid-multitouch.c | 6 + + drivers/hid/hid-nintendo.c | 57 +- + drivers/hid/hid-picolcd_core.c | 6 +- + drivers/hid/hid-picolcd_fb.c | 8 +- + drivers/hid/hid-playstation.c | 138 +- + drivers/hid/hid-roccat-isku.c | 2 +- + drivers/hid/hid-roccat-kone.c | 12 +- + drivers/hid/hid-roccat-koneplus.c | 4 +- + drivers/hid/hid-roccat-kovaplus.c | 10 +- + drivers/hid/hid-roccat-pyra.c | 6 +- + drivers/hid/hid-sensor-custom.c | 17 +- + drivers/hid/hid-sony.c | 7 +- + drivers/hid/hid-steam.c | 155 +- + drivers/hid/hid-uclogic-params.c | 3 + + drivers/hid/hid-winwing.c | 226 ++ + drivers/hid/i2c-hid/i2c-hid-core.c | 44 +- + drivers/hid/intel-ish-hid/Makefile | 1 + + drivers/hid/intel-ish-hid/ipc/hw-ish.h | 45 +- + drivers/hid/intel-ish-hid/ipc/ipc.c | 21 +- + drivers/hid/intel-ish-hid/ipc/pci-ish.c | 80 +- + drivers/hid/intel-ish-hid/ishtp/hbm.c | 21 + + drivers/hid/intel-ish-hid/ishtp/init.c | 8 + + drivers/hid/intel-ish-hid/ishtp/ishtp-dev.h | 28 + + drivers/hid/intel-ish-hid/ishtp/loader.c | 275 ++ + drivers/hid/intel-ish-hid/ishtp/loader.h | 226 ++ + drivers/hid/surface-hid/surface_kbd.c | 5 +- + drivers/hte/hte-tegra194-test.c | 6 +- + drivers/hwmon/Kconfig | 38 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/acpi_power_meter.c | 16 + + drivers/hwmon/ad7414.c | 2 +- + drivers/hwmon/adc128d818.c | 59 +- + drivers/hwmon/adm1026.c | 2 +- + drivers/hwmon/adm1029.c | 2 +- + drivers/hwmon/adm1177.c | 2 +- + drivers/hwmon/adt7410.c | 4 +- + drivers/hwmon/adt7411.c | 2 +- + drivers/hwmon/adt7462.c | 2 +- + drivers/hwmon/adt7470.c | 2 +- + drivers/hwmon/aquacomputer_d5next.c | 51 +- + drivers/hwmon/asb100.c | 2 +- + drivers/hwmon/aspeed-g6-pwm-tach.c | 27 +- + drivers/hwmon/atxp1.c | 2 +- + drivers/hwmon/coretemp.c | 2 +- + drivers/hwmon/da9052-hwmon.c | 38 +- + drivers/hwmon/dell-smm-hwmon.c | 15 + + drivers/hwmon/ds620.c | 2 +- + drivers/hwmon/emc1403.c | 846 +++-- + drivers/hwmon/emc2103.c | 2 +- + drivers/hwmon/emc2305.c | 8 +- + drivers/hwmon/emc6w201.c | 2 +- + drivers/hwmon/ftsteutates.c | 2 +- + drivers/hwmon/g760a.c | 2 +- + drivers/hwmon/g762.c | 4 +- + drivers/hwmon/gl518sm.c | 2 +- + drivers/hwmon/gl520sm.c | 2 +- + drivers/hwmon/hih6130.c | 2 +- + drivers/hwmon/hs3001.c | 2 +- + drivers/hwmon/ina209.c | 2 +- + drivers/hwmon/ina238.c | 2 +- + drivers/hwmon/ina3221.c | 2 +- + drivers/hwmon/it87.c | 127 +- + drivers/hwmon/jc42.c | 4 +- + drivers/hwmon/lenovo-ec-sensors.c | 602 ++++ + drivers/hwmon/lineage-pem.c | 2 +- + drivers/hwmon/lm70.c | 4 +- + drivers/hwmon/lm73.c | 2 +- + drivers/hwmon/lm77.c | 2 +- + drivers/hwmon/lm87.c | 4 +- + drivers/hwmon/lm93.c | 4 +- + drivers/hwmon/lm95241.c | 4 +- + drivers/hwmon/lm95245.c | 4 +- + drivers/hwmon/ltc2945.c | 2 +- + drivers/hwmon/ltc2947-i2c.c | 2 +- + drivers/hwmon/ltc2990.c | 2 +- + drivers/hwmon/ltc2991.c | 2 +- + drivers/hwmon/ltc2992.c | 2 +- + drivers/hwmon/ltc4151.c | 2 +- + drivers/hwmon/ltc4215.c | 2 +- + drivers/hwmon/ltc4222.c | 2 +- + drivers/hwmon/ltc4245.c | 2 +- + drivers/hwmon/ltc4260.c | 2 +- + drivers/hwmon/ltc4261.c | 2 +- + drivers/hwmon/max127.c | 2 +- + drivers/hwmon/max1619.c | 2 +- + drivers/hwmon/max31730.c | 2 +- + drivers/hwmon/max31790.c | 10 +- + drivers/hwmon/max6620.c | 2 +- + drivers/hwmon/max6621.c | 2 +- + drivers/hwmon/max6639.c | 341 +- + drivers/hwmon/max6642.c | 2 +- + drivers/hwmon/mc34vr500.c | 2 +- + drivers/hwmon/nct7802.c | 2 +- + drivers/hwmon/nct7904.c | 2 +- + drivers/hwmon/npcm750-pwm-fan.c | 7 +- + drivers/hwmon/nzxt-kraken3.c | 58 +- + drivers/hwmon/pcf8591.c | 2 +- + drivers/hwmon/pmbus/Kconfig | 23 +- + drivers/hwmon/pmbus/Makefile | 2 + + drivers/hwmon/pmbus/adm1266.c | 2 +- + drivers/hwmon/pmbus/adm1275.c | 7 +- + drivers/hwmon/pmbus/adp1050.c | 56 + + drivers/hwmon/pmbus/inspur-ipsps.c | 2 +- + drivers/hwmon/pmbus/ir35221.c | 2 +- + drivers/hwmon/pmbus/ir36021.c | 2 +- + drivers/hwmon/pmbus/ir38064.c | 8 +- + drivers/hwmon/pmbus/irps5401.c | 2 +- + drivers/hwmon/pmbus/lt7182s.c | 2 +- + drivers/hwmon/pmbus/ltc3815.c | 2 +- + drivers/hwmon/pmbus/max15301.c | 4 +- + drivers/hwmon/pmbus/max16064.c | 2 +- + drivers/hwmon/pmbus/max20751.c | 2 +- + drivers/hwmon/pmbus/max31785.c | 6 +- + drivers/hwmon/pmbus/max8688.c | 2 +- + drivers/hwmon/pmbus/mp2888.c | 2 +- + drivers/hwmon/pmbus/mp2975.c | 136 +- + drivers/hwmon/pmbus/mp5990.c | 2 +- + drivers/hwmon/pmbus/mpq8785.c | 2 +- + drivers/hwmon/pmbus/pli1209bc.c | 2 +- + drivers/hwmon/pmbus/pm6764tr.c | 2 +- + drivers/hwmon/pmbus/pxe1610.c | 6 +- + drivers/hwmon/pmbus/stpddc60.c | 4 +- + drivers/hwmon/pmbus/tda38640.c | 2 +- + drivers/hwmon/pmbus/tps40422.c | 2 +- + drivers/hwmon/pmbus/tps546d24.c | 2 +- + drivers/hwmon/pmbus/xdp710.c | 131 + + drivers/hwmon/pmbus/xdpe12284.c | 6 +- + drivers/hwmon/pmbus/xdpe152c4.c | 4 +- + drivers/hwmon/pt5161l.c | 2 +- + drivers/hwmon/pwm-fan.c | 45 +- + drivers/hwmon/sbrmi.c | 2 +- + drivers/hwmon/sbtsi_temp.c | 2 +- + drivers/hwmon/sht21.c | 2 +- + drivers/hwmon/sht4x.c | 2 +- + drivers/hwmon/smsc47m192.c | 2 +- + drivers/hwmon/stts751.c | 3 +- + drivers/hwmon/tc654.c | 4 +- + drivers/hwmon/tc74.c | 2 +- + drivers/hwmon/tmp102.c | 2 +- + drivers/hwmon/tmp103.c | 2 +- + drivers/hwmon/tmp108.c | 2 +- + drivers/hwmon/w83791d.c | 2 +- + drivers/hwmon/w83792d.c | 2 +- + drivers/hwmon/w83793.c | 2 +- + drivers/hwmon/w83l785ts.c | 2 +- + drivers/hwmon/w83l786ng.c | 2 +- + drivers/iio/addac/ad74115.c | 40 +- + drivers/iio/frequency/admv1013.c | 40 +- + drivers/input/misc/atlas_btns.c | 1 - + drivers/iommu/intel/irq_remapping.c | 113 +- + drivers/iommu/irq_remapping.c | 5 +- + drivers/irqchip/Kconfig | 27 +- + drivers/irqchip/Makefile | 3 + + drivers/irqchip/irq-alpine-msi.c | 2 +- + drivers/irqchip/irq-bcm6345-l1.c | 6 +- + drivers/irqchip/irq-brcmstb-l2.c | 17 +- + drivers/irqchip/irq-gic-v3-its.c | 17 +- + drivers/irqchip/irq-loongson-eiointc.c | 12 +- + drivers/irqchip/irq-loongson-pch-msi.c | 2 +- + drivers/irqchip/irq-loongson-pch-pic.c | 76 +- + drivers/irqchip/irq-mxs.c | 2 +- + drivers/irqchip/irq-renesas-rzg2l.c | 28 +- + drivers/irqchip/irq-riscv-aplic-direct.c | 323 ++ + drivers/irqchip/irq-riscv-aplic-main.c | 211 ++ + drivers/irqchip/irq-riscv-aplic-main.h | 52 + + drivers/irqchip/irq-riscv-aplic-msi.c | 257 ++ + drivers/irqchip/irq-riscv-imsic-early.c | 201 ++ + drivers/irqchip/irq-riscv-imsic-platform.c | 375 +++ + drivers/irqchip/irq-riscv-imsic-state.c | 865 +++++ + drivers/irqchip/irq-riscv-imsic-state.h | 108 + + drivers/irqchip/irq-sifive-plic.c | 7 +- + drivers/irqchip/irq-stm32-exti.c | 139 +- + drivers/irqchip/irq-sunxi-nmi.c | 1 - + drivers/irqchip/irq-tb10x.c | 1 - + drivers/macintosh/via-macii.c | 11 +- + drivers/mfd/axp20x-i2c.c | 2 + + drivers/mfd/axp20x-rsb.c | 1 + + drivers/mfd/axp20x.c | 90 + + drivers/mmc/host/sdhci-pci-core.c | 2 +- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 2 +- + drivers/net/fjes/fjes_main.c | 1 - + drivers/opp/of.c | 17 +- + drivers/perf/alibaba_uncore_drw_pmu.c | 11 +- + drivers/perf/amlogic/meson_ddr_pmu_core.c | 1 + + drivers/perf/arm-cci.c | 1 + + drivers/perf/arm-ccn.c | 1 + + drivers/perf/arm-cmn.c | 11 +- + drivers/perf/arm_cspmu/arm_cspmu.c | 9 +- + drivers/perf/arm_dmc620_pmu.c | 1 + + drivers/perf/arm_dsu_pmu.c | 20 +- + drivers/perf/arm_pmu_platform.c | 1 + + drivers/perf/arm_smmuv3_pmu.c | 1 + + drivers/perf/arm_spe_pmu.c | 1 + + drivers/perf/dwc_pcie_pmu.c | 10 +- + drivers/perf/fsl_imx8_ddr_perf.c | 1 + + drivers/perf/hisilicon/hisi_pcie_pmu.c | 24 +- + drivers/perf/hisilicon/hisi_uncore_pmu.c | 7 +- + drivers/perf/hisilicon/hns3_pmu.c | 17 +- + drivers/perf/qcom_l2_pmu.c | 9 +- + drivers/perf/qcom_l3_pmu.c | 1 + + drivers/perf/riscv_pmu_legacy.c | 1 + + drivers/perf/riscv_pmu_sbi.c | 2 +- + drivers/perf/thunderx2_pmu.c | 30 +- + drivers/perf/xgene_pmu.c | 1 + + drivers/pinctrl/pinctrl-cy8c95x0.c | 2 +- + drivers/platform/chrome/Kconfig | 1 + + drivers/platform/chrome/cros_ec.c | 16 +- + drivers/platform/chrome/cros_ec_chardev.c | 9 +- + drivers/platform/chrome/cros_ec_debugfs.c | 9 +- + drivers/platform/chrome/cros_ec_lightbar.c | 9 +- + drivers/platform/chrome/cros_ec_lpc.c | 81 +- + drivers/platform/chrome/cros_ec_proto_test.c | 72 +- + drivers/platform/chrome/cros_ec_sensorhub.c | 9 +- + drivers/platform/chrome/cros_ec_sysfs.c | 9 +- + drivers/platform/chrome/cros_ec_vbc.c | 9 +- + drivers/platform/chrome/cros_hps_i2c.c | 4 +- + drivers/platform/chrome/cros_kbd_led_backlight.c | 11 +- + drivers/platform/chrome/cros_usbpd_logger.c | 9 +- + drivers/platform/chrome/cros_usbpd_notify.c | 9 +- + drivers/platform/chrome/wilco_ec/Kconfig | 1 + + drivers/platform/chrome/wilco_ec/core.c | 9 +- + drivers/platform/chrome/wilco_ec/debugfs.c | 9 +- + drivers/platform/chrome/wilco_ec/event.c | 2 - + drivers/platform/chrome/wilco_ec/sysfs.c | 2 +- + drivers/platform/chrome/wilco_ec/telemetry.c | 9 +- + drivers/platform/x86/asus-laptop.c | 1 - + drivers/platform/x86/classmate-laptop.c | 5 - + drivers/platform/x86/dell/dell-rbtn.c | 1 - + drivers/platform/x86/eeepc-laptop.c | 1 - + drivers/platform/x86/intel/rst.c | 1 - + drivers/platform/x86/intel/smartconnect.c | 1 - + drivers/platform/x86/lg-laptop.c | 1 - + drivers/platform/x86/sony-laptop.c | 2 - + drivers/platform/x86/toshiba_acpi.c | 1 - + drivers/platform/x86/toshiba_bluetooth.c | 1 - + drivers/platform/x86/toshiba_haps.c | 1 - + drivers/platform/x86/wireless-hotkey.c | 1 - + drivers/pnp/isapnp/Kconfig | 2 +- + drivers/powercap/dtpm_cpu.c | 8 +- + drivers/powercap/intel_rapl_common.c | 611 +++- + drivers/powercap/intel_rapl_tpmi.c | 3 + + drivers/ptp/ptp_vmw.c | 1 - + drivers/pwm/Kconfig | 4 - + drivers/pwm/Makefile | 1 - + drivers/pwm/core.c | 606 +++- + drivers/pwm/pwm-bcm2835.c | 30 +- + drivers/pwm/pwm-meson.c | 213 +- + drivers/pwm/pwm-pca9685.c | 4 +- + drivers/pwm/pwm-sti.c | 161 +- + drivers/pwm/pwm-stm32.c | 60 +- + drivers/pwm/sysfs.c | 545 ---- + drivers/regulator/Kconfig | 8 + + drivers/regulator/Makefile | 1 + + drivers/regulator/axp20x-regulator.c | 94 +- + drivers/regulator/core.c | 4 +- + drivers/regulator/da9121-regulator.c | 4 +- + drivers/regulator/da9211-regulator.c | 2 +- + drivers/regulator/devres.c | 59 + + drivers/regulator/isl9305.c | 2 +- + drivers/regulator/max8973-regulator.c | 2 +- + drivers/regulator/mt6311-regulator.c | 2 +- + drivers/regulator/pca9450-regulator.c | 196 +- + drivers/regulator/pf8x00-regulator.c | 2 +- + drivers/regulator/pfuze100-regulator.c | 2 +- + drivers/regulator/rpi-panel-attiny-regulator.c | 2 +- + drivers/regulator/rtmv20-regulator.c | 2 +- + drivers/regulator/rtq2208-regulator.c | 100 +- + drivers/regulator/rtq6752-regulator.c | 2 +- + drivers/regulator/sun20i-regulator.c | 157 + + drivers/regulator/tps51632-regulator.c | 2 +- + drivers/regulator/tps62360-regulator.c | 2 +- + drivers/soc/pxa/ssp.c | 2 +- + drivers/soc/samsung/exynos-asv.c | 10 +- + drivers/spi/Kconfig | 22 +- + drivers/spi/Makefile | 1 + + drivers/spi/spi-airoha-snfi.c | 1129 +++++++ + drivers/spi/spi-altera-platform.c | 1 - + drivers/spi/spi-amd.c | 112 + + drivers/spi/spi-armada-3700.c | 8 +- + drivers/spi/spi-atmel.c | 8 +- + drivers/spi/spi-au1550.c | 29 +- + drivers/spi/spi-bitbang.c | 23 +- + drivers/spi/spi-cadence-quadspi.c | 109 +- + drivers/spi/spi-cadence-xspi.c | 8 +- + drivers/spi/spi-coldfire-qspi.c | 1 - + drivers/spi/spi-cs42l43.c | 127 +- + drivers/spi/spi-dw-core.c | 20 +- + drivers/spi/spi-dw-mmio.c | 13 +- + drivers/spi/spi-dw.h | 2 +- + drivers/spi/spi-fsl-cpm.c | 14 +- + drivers/spi/spi-fsl-cpm.h | 5 +- + drivers/spi/spi-fsl-dspi.c | 1 - + drivers/spi/spi-fsl-lpspi.c | 14 +- + drivers/spi/spi-fsl-spi.c | 7 +- + drivers/spi/spi-imx.c | 20 +- + drivers/spi/spi-loopback-test.c | 1 - + drivers/spi/spi-mt65xx.c | 32 +- + drivers/spi/spi-mt7621.c | 95 +- + drivers/spi/spi-mux.c | 2 + + drivers/spi/spi-oc-tiny.c | 2 - + drivers/spi/spi-omap2-mcspi.c | 95 +- + drivers/spi/spi-pic32-sqi.c | 6 +- + drivers/spi/spi-pic32.c | 6 +- + drivers/spi/spi-pxa2xx-dma.c | 38 +- + drivers/spi/spi-pxa2xx-pci.c | 10 +- + drivers/spi/spi-pxa2xx.c | 223 +- + drivers/spi/spi-pxa2xx.h | 42 +- + drivers/spi/spi-rspi.c | 12 +- + drivers/spi/spi-s3c64xx.c | 6 +- + drivers/spi/spi-sun4i.c | 9 +- + drivers/spi/spi-sun6i.c | 17 +- + drivers/spi/spi-xlp.c | 8 +- + drivers/spi/spi.c | 126 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 26 +- + drivers/thermal/amlogic_thermal.c | 10 + + drivers/thermal/armada_thermal.c | 9 +- + drivers/thermal/cpufreq_cooling.c | 3 - + drivers/thermal/gov_bang_bang.c | 97 +- + drivers/thermal/gov_fair_share.c | 82 +- + drivers/thermal/gov_power_allocator.c | 45 +- + drivers/thermal/gov_step_wise.c | 98 +- + drivers/thermal/gov_user_space.c | 10 +- + .../intel/int340x_thermal/acpi_thermal_rel.c | 4 +- + .../intel/int340x_thermal/int3400_thermal.c | 1 + + .../intel/int340x_thermal/int3403_thermal.c | 1 + + .../intel/int340x_thermal/processor_thermal_mbox.c | 1 + + .../processor_thermal_power_floor.c | 1 + + .../intel/int340x_thermal/processor_thermal_rapl.c | 1 + + .../intel/int340x_thermal/processor_thermal_rfim.c | 1 + + .../int340x_thermal/processor_thermal_wt_hint.c | 1 + + .../int340x_thermal/processor_thermal_wt_req.c | 1 + + drivers/thermal/intel/intel_hfi.c | 113 +- + drivers/thermal/intel/intel_soc_dts_iosf.c | 1 + + drivers/thermal/k3_bandgap.c | 1 - + drivers/thermal/loongson2_thermal.c | 121 +- + drivers/thermal/mediatek/lvts_thermal.c | 438 ++- + drivers/thermal/qcom/lmh.c | 3 + + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 1 - + drivers/thermal/qcom/tsens-v2.c | 1 + + drivers/thermal/qcom/tsens.c | 33 +- + drivers/thermal/qcom/tsens.h | 5 + + drivers/thermal/rcar_gen3_thermal.c | 165 +- + drivers/thermal/thermal_core.c | 186 +- + drivers/thermal/thermal_core.h | 121 +- + drivers/thermal/thermal_debugfs.c | 113 +- + drivers/thermal/thermal_debugfs.h | 8 +- + drivers/thermal/thermal_helpers.c | 8 +- + drivers/thermal/thermal_netlink.c | 68 +- + drivers/thermal/thermal_netlink.h | 26 + + drivers/thermal/thermal_sysfs.c | 20 +- + drivers/thermal/thermal_trace.h | 2 + + drivers/thermal/thermal_trace_ipa.h | 2 + + drivers/thermal/thermal_trip.c | 16 +- + drivers/vfio/pci/vfio_pci.c | 2 + + drivers/virt/coco/sev-guest/sev-guest.c | 28 +- + drivers/virt/vmgenid.c | 1 - + drivers/zorro/zorro.c | 14 +- + fs/efivarfs/internal.h | 5 +- + fs/efivarfs/vars.c | 5 +- + include/acpi/acpi_bus.h | 41 +- + include/acpi/acpixf.h | 2 +- + include/acpi/actbl1.h | 8 +- + include/acpi/actbl2.h | 516 +-- + include/acpi/actbl3.h | 18 +- + include/acpi/nhlt.h | 181 ++ + include/asm-generic/sections.h | 5 + + include/asm-generic/vmlinux.lds.h | 8 +- + include/asm-generic/vtime.h | 1 - + .../dt-bindings/thermal/mediatek,lvts-thermal.h | 26 + + include/kunit/test.h | 24 +- + include/kunit/try-catch.h | 3 - + include/linux/acpi.h | 21 +- + include/linux/amd-pstate.h | 20 +- + include/linux/arch_topology.h | 8 +- + include/linux/cpufreq.h | 10 + + include/linux/cpuhotplug.h | 1 + + include/linux/cpumask.h | 40 + + include/linux/efi.h | 9 +- + include/linux/energy_model.h | 5 + + include/linux/find.h | 27 + + include/linux/gpio.h | 21 +- + include/linux/gpio/driver.h | 4 +- + include/linux/gpio/property.h | 4 + + include/linux/hid.h | 6 +- + include/linux/hid_bpf.h | 3 + + include/linux/intel_rapl.h | 32 + + include/linux/irq.h | 2 +- + include/linux/irqchip/riscv-aplic.h | 145 + + include/linux/irqchip/riscv-imsic.h | 87 + + include/linux/irqdesc.h | 16 +- + include/linux/jump_label.h | 3 + + include/linux/kernel_stat.h | 8 + + include/linux/math64.h | 8 +- + include/linux/mfd/axp20x.h | 98 +- + include/linux/numa.h | 7 +- + include/linux/pci_ids.h | 2 + + include/linux/perf_event.h | 37 +- + include/linux/platform_data/spi-omap2-mcspi.h | 3 - + include/linux/pm_opp.h | 8 + + include/linux/pm_wakeup.h | 12 +- + include/linux/pwm.h | 36 +- + include/linux/pxa2xx_ssp.h | 2 +- + include/linux/regmap.h | 62 +- + include/linux/regulator/consumer.h | 7 + + include/linux/regulator/pca9450.h | 1 + + include/linux/sched.h | 3 +- + include/linux/sched/idle.h | 2 +- + include/linux/sched/topology.h | 10 +- + include/linux/spi/pxa2xx_spi.h | 56 - + include/linux/spi/rspi.h | 18 - + include/linux/spi/spi.h | 12 +- + include/linux/spi/xilinx_spi.h | 14 +- + include/linux/thermal.h | 109 +- + include/linux/timerqueue.h | 5 - + include/linux/vtime.h | 5 - + .../events/{thermal_pressure.h => hw_pressure.h} | 14 +- + include/trace/events/mce.h | 25 +- + include/trace/events/sched.h | 2 +- + include/vdso/datapage.h | 4 + + include/vdso/math64.h | 38 + + init/Kconfig | 12 +- + init/init_task.c | 1 + + init/main.c | 1 + + kernel/context_tracking.c | 2 +- + kernel/events/core.c | 273 +- + kernel/events/ring_buffer.c | 4 + + kernel/irq/Kconfig | 4 + + kernel/irq/cpuhotplug.c | 27 +- + kernel/irq/internals.h | 9 +- + kernel/irq/irqdesc.c | 65 +- + kernel/irq/irqdomain.c | 5 +- + kernel/irq/manage.c | 28 +- + kernel/irq/proc.c | 9 +- + kernel/irq/resend.c | 2 +- + kernel/jump_label.c | 53 + + kernel/kthread.c | 1 + + kernel/locking/lock_events.h | 4 +- + kernel/locking/qspinlock.c | 13 +- + kernel/locking/qspinlock_paravirt.h | 49 +- + kernel/power/energy_model.c | 106 +- + kernel/power/hibernate.c | 2 +- + kernel/sched/core.c | 14 +- + kernel/sched/cputime.c | 13 - + kernel/sched/fair.c | 501 +-- + kernel/sched/loadavg.c | 2 +- + kernel/sched/pelt.c | 22 +- + kernel/sched/pelt.h | 16 +- + kernel/sched/sched.h | 71 +- + kernel/sched/stats.c | 5 +- + kernel/sched/topology.c | 56 +- + kernel/time/Kconfig | 2 +- + kernel/time/clockevents.c | 2 +- + kernel/time/clocksource.c | 44 +- + kernel/time/hrtimer.c | 41 +- + kernel/time/timekeeping.c | 106 +- + kernel/time/timer.c | 2 +- + kernel/time/vsyscall.c | 6 + + kernel/watchdog.c | 215 +- + kernel/workqueue.c | 2 +- + lib/Kconfig.debug | 16 +- + lib/find_bit.c | 12 + + lib/kunit/Kconfig | 11 + + lib/kunit/device.c | 2 +- + lib/kunit/kunit-test.c | 45 +- + lib/kunit/string-stream-test.c | 12 +- + lib/kunit/test.c | 3 + + lib/kunit/try-catch.c | 40 +- + lib/kunit_iov_iter.c | 18 +- + lib/vdso/Kconfig | 7 + + lib/vdso/gettimeofday.c | 55 +- + rust/kernel/time.rs | 63 + + scripts/Makefile.lib | 16 + + scripts/gdb/linux/interrupts.py | 6 +- + scripts/make_fit.py | 290 ++ + tools/arch/arm64/include/asm/sysreg.h | 24 +- + tools/include/nolibc/stdlib.h | 2 +- + tools/include/nolibc/string.h | 44 +- + tools/include/nolibc/sys.h | 27 + + tools/power/acpi/tools/pfrut/pfrut.c | 2 + + tools/testing/selftests/Makefile | 4 +- + tools/testing/selftests/arm64/abi/tpidr2.c | 2 +- + tools/testing/selftests/arm64/tags/tags_test.c | 4 + + tools/testing/selftests/bpf/prog_tests/perf_skip.c | 137 + + tools/testing/selftests/bpf/progs/test_perf_skip.c | 15 + + tools/testing/selftests/capabilities/test_execve.c | 12 +- + .../testing/selftests/capabilities/validate_cap.c | 7 +- + tools/testing/selftests/clone3/clone3.c | 7 +- + .../selftests/clone3/clone3_clear_sighand.c | 2 +- + tools/testing/selftests/clone3/clone3_set_tid.c | 121 +- + tools/testing/selftests/cpufreq/cpufreq.sh | 3 +- + tools/testing/selftests/cpufreq/main.sh | 47 +- + tools/testing/selftests/cpufreq/module.sh | 6 +- + tools/testing/selftests/dmabuf-heaps/dmabuf-heap.c | 253 +- + tools/testing/selftests/exec/recursion-depth.c | 10 +- + .../selftests/filesystems/binderfs/Makefile | 2 - + .../filesystems/statmount/statmount_test.c | 1 + + tools/testing/selftests/ftrace/ftracetest | 8 +- + tools/testing/selftests/ftrace/ftracetest-ktap | 2 +- + .../ftrace/test.d/dynevent/add_remove_btfarg.tc | 2 +- + .../ftrace/test.d/dynevent/fprobe_entry_arg.tc | 2 +- + .../ftrace/test.d/ftrace/func_set_ftrace_file.tc | 2 +- + .../ftrace/test.d/kprobe/kretprobe_entry_arg.tc | 2 +- + tools/testing/selftests/hid/config.common | 1 + + tools/testing/selftests/hid/hid_bpf.c | 112 +- + tools/testing/selftests/hid/progs/hid.c | 46 + + .../testing/selftests/hid/progs/hid_bpf_helpers.h | 6 + + tools/testing/selftests/hid/tests/base.py | 92 +- + tools/testing/selftests/hid/tests/base_device.py | 421 +++ + tools/testing/selftests/hid/tests/base_gamepad.py | 238 ++ + tools/testing/selftests/hid/tests/test_gamepad.py | 457 ++- + tools/testing/selftests/hid/tests/test_tablet.py | 721 ++-- + tools/testing/selftests/ipc/msgque.c | 11 +- + tools/testing/selftests/kselftest.h | 49 +- + tools/testing/selftests/kselftest/ktap_helpers.sh | 4 +- + tools/testing/selftests/kselftest_deps.sh | 1 + + tools/testing/selftests/kselftest_harness.h | 2 +- + tools/testing/selftests/lib.mk | 14 +- + .../membarrier/membarrier_test_multi_thread.c | 2 +- + .../membarrier/membarrier_test_single_thread.c | 2 +- + tools/testing/selftests/mm/compaction_test.c | 6 +- + tools/testing/selftests/mm/cow.c | 2 +- + tools/testing/selftests/mm/gup_longterm.c | 2 +- + tools/testing/selftests/mm/gup_test.c | 4 +- + tools/testing/selftests/mm/ksm_functional_tests.c | 2 +- + tools/testing/selftests/mm/madv_populate.c | 2 +- + tools/testing/selftests/mm/mkdirty.c | 2 +- + tools/testing/selftests/mm/pagemap_ioctl.c | 4 +- + tools/testing/selftests/mm/soft-dirty.c | 2 +- + tools/testing/selftests/nolibc/nolibc-test.c | 82 + + tools/testing/selftests/perf_events/.gitignore | 1 + + tools/testing/selftests/perf_events/Makefile | 2 +- + .../selftests/perf_events/watermark_signal.c | 146 + + tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_open_test.c | 4 +- + tools/testing/selftests/pidfd/pidfd_poll_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_test.c | 2 +- + .../power_supply/test_power_supply_properties.sh | 2 +- + tools/testing/selftests/resctrl/Makefile | 4 +- + tools/testing/selftests/resctrl/cat_test.c | 8 +- + tools/testing/selftests/resctrl/cmt_test.c | 8 +- + tools/testing/selftests/resctrl/mba_test.c | 10 +- + tools/testing/selftests/resctrl/mbm_test.c | 10 +- + tools/testing/selftests/resctrl/resctrl.h | 9 +- + tools/testing/selftests/resctrl/resctrl_tests.c | 26 +- + tools/testing/selftests/resctrl/resctrl_val.c | 8 +- + tools/testing/selftests/sgx/Makefile | 2 +- + tools/testing/selftests/sgx/sigstruct.c | 1 - + tools/testing/selftests/sync/sync_test.c | 3 +- + tools/testing/selftests/timers/adjtick.c | 4 +- + .../testing/selftests/timers/alarmtimer-suspend.c | 4 +- + tools/testing/selftests/timers/change_skew.c | 4 +- + tools/testing/selftests/timers/freq-step.c | 4 +- + tools/testing/selftests/timers/leap-a-day.c | 10 +- + tools/testing/selftests/timers/leapcrash.c | 4 +- + tools/testing/selftests/timers/mqueue-lat.c | 4 +- + tools/testing/selftests/timers/posix_timers.c | 12 +- + tools/testing/selftests/timers/raw_skew.c | 6 +- + tools/testing/selftests/timers/set-2038.c | 4 +- + tools/testing/selftests/timers/set-tai.c | 4 +- + tools/testing/selftests/timers/set-timer-lat.c | 4 +- + tools/testing/selftests/timers/set-tz.c | 4 +- + tools/testing/selftests/timers/skew_consistency.c | 4 +- + tools/testing/selftests/timers/threadtest.c | 2 +- + tools/testing/selftests/timers/valid-adjtimex.c | 6 +- + tools/testing/selftests/tty/tty_tstamp_update.c | 48 +- + tools/testing/selftests/x86/amx.c | 27 +- + tools/testing/selftests/x86/lam.c | 4 +- + tools/testing/selftests/x86/test_mremap_vdso.c | 43 +- + tools/testing/selftests/x86/test_vsyscall.c | 702 ++-- + 1064 files changed, 30529 insertions(+), 10799 deletions(-) + create mode 100644 Documentation/ABI/removed/sysfs-firmware-efi-vars + delete mode 100644 Documentation/ABI/stable/sysfs-firmware-efi-vars + delete mode 100644 Documentation/devicetree/bindings/hwmon/adc128d818.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/as370.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/ibm,opal-sensor.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/ibm,p8-occ-hwmon.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/ibmpowernv.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/lm87.txt + delete mode 100644 Documentation/devicetree/bindings/hwmon/max6650.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/maxim,max6650.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/adi,adp1050.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/pwm-fan.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/st,stts751.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/stts751.txt + create mode 100644 Documentation/devicetree/bindings/hwmon/syna,as370.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,adc128d818.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/ti,lm87.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/riscv,aplic.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/riscv,imsics.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/allwinner,sun20i-d1-system-ldos.yaml + create mode 100644 Documentation/devicetree/bindings/spi/airoha,en7581-snand.yaml + create mode 100644 Documentation/devicetree/bindings/spi/marvell,armada-3700-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-armada-3700.txt + create mode 100644 Documentation/devicetree/bindings/spi/ti,qspi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/ti_qspi.txt + create mode 100644 Documentation/devicetree/bindings/thermal/st,stih407-thermal.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/st-thermal.txt + create mode 100644 Documentation/hwmon/adp1050.rst + create mode 100644 Documentation/hwmon/xdp710.rst + delete mode 100644 Documentation/spi/pxa2xx.rst + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-cpu-opp.dtsi + create mode 100644 arch/openrisc/include/asm/fpu.h + delete mode 100644 arch/sh/boot/compressed/cache.c + create mode 100644 arch/sh/boot/compressed/misc.h + rename arch/x86/entry/{thunk_64.S => thunk.S} (100%) + delete mode 100644 arch/x86/entry/thunk_32.S + delete mode 100644 arch/x86/include/asm/ia32_unistd.h + create mode 100644 arch/x86/include/asm/posted_intr.h + rename arch/x86/kernel/cpu/resctrl/{pseudo_lock_event.h => trace.h} (56%) + delete mode 100644 arch/x86/kernel/topology.c + create mode 100644 drivers/acpi/nhlt.c + create mode 100644 drivers/acpi/x86/Makefile + rename drivers/acpi/{ => x86}/blacklist.c (99%) + rename drivers/acpi/{acpi_cmos_rtc.c => x86/cmos_rtc.c} (98%) + rename drivers/acpi/{acpi_lpss.c => x86/lpss.c} (99%) + create mode 100644 drivers/gpio/gpio-graniterapids.c + create mode 100644 drivers/hid/bpf/progs/FR-TEC__Raptor-Mach-2.bpf.c + create mode 100644 drivers/hid/bpf/progs/HP__Elite-Presenter.bpf.c + create mode 100644 drivers/hid/bpf/progs/Huion__Kamvas-Pro-19.bpf.c + create mode 100644 drivers/hid/bpf/progs/IOGEAR__Kaliber-MMOmentum.bpf.c + create mode 100644 drivers/hid/bpf/progs/Makefile + create mode 100644 drivers/hid/bpf/progs/Microsoft__XBox-Elite-2.bpf.c + create mode 100644 drivers/hid/bpf/progs/README + create mode 100644 drivers/hid/bpf/progs/Wacom__ArtPen.bpf.c + create mode 100644 drivers/hid/bpf/progs/XPPen__Artist24.bpf.c + create mode 100644 drivers/hid/bpf/progs/XPPen__ArtistPro16Gen2.bpf.c + create mode 100644 drivers/hid/bpf/progs/hid_bpf.h + create mode 100644 drivers/hid/bpf/progs/hid_bpf_helpers.h + create mode 100644 drivers/hid/hid-winwing.c + create mode 100644 drivers/hid/intel-ish-hid/ishtp/loader.c + create mode 100644 drivers/hid/intel-ish-hid/ishtp/loader.h + create mode 100644 drivers/hwmon/lenovo-ec-sensors.c + create mode 100644 drivers/hwmon/pmbus/adp1050.c + create mode 100644 drivers/hwmon/pmbus/xdp710.c + create mode 100644 drivers/irqchip/irq-riscv-aplic-direct.c + create mode 100644 drivers/irqchip/irq-riscv-aplic-main.c + create mode 100644 drivers/irqchip/irq-riscv-aplic-main.h + create mode 100644 drivers/irqchip/irq-riscv-aplic-msi.c + create mode 100644 drivers/irqchip/irq-riscv-imsic-early.c + create mode 100644 drivers/irqchip/irq-riscv-imsic-platform.c + create mode 100644 drivers/irqchip/irq-riscv-imsic-state.c + create mode 100644 drivers/irqchip/irq-riscv-imsic-state.h + delete mode 100644 drivers/pwm/sysfs.c + create mode 100644 drivers/regulator/sun20i-regulator.c + create mode 100644 drivers/spi/spi-airoha-snfi.c + create mode 100644 include/acpi/nhlt.h + delete mode 100644 include/asm-generic/vtime.h + create mode 100644 include/linux/irqchip/riscv-aplic.h + create mode 100644 include/linux/irqchip/riscv-imsic.h + delete mode 100644 include/linux/spi/pxa2xx_spi.h + delete mode 100644 include/linux/spi/rspi.h + rename include/trace/events/{thermal_pressure.h => hw_pressure.h} (55%) + create mode 100755 scripts/make_fit.py + create mode 100644 tools/testing/selftests/bpf/prog_tests/perf_skip.c + create mode 100644 tools/testing/selftests/bpf/progs/test_perf_skip.c + create mode 100644 tools/testing/selftests/hid/tests/base_device.py + create mode 100644 tools/testing/selftests/hid/tests/base_gamepad.py + create mode 100644 tools/testing/selftests/perf_events/watermark_signal.c +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 (9ff3ffc369ed mm/vmalloc: fix vmalloc which may return null if called with __GFP_NOFAIL) +$ 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. + mm/vmalloc.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging kbuild-current/fixes (89e5462bb5ae kconfig: Fix typo HEIGTH to HEIGHT) +$ 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 (50449ca66cc5 arm64: hibernate: Fix level3 translation fault in swsusp_save()) +$ 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 (5549d1e39989 Merge tag 'qcom-arm64-fixes-for-6.9-2' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging davinci-current/davinci/for-current (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 (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (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 (49a940dbdc31 powerpc/pseries/iommu: LPAR panics during boot up with a frozen PE) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (7bbe449d0bdb s390/paes: Reestablish retry loop in paes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging 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 net/main (aea27a92a41d net: micrel: Fix receiving the timestamp in the frame for lan8841) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + drivers/dpll/dpll_core.c | 2 +- + drivers/net/ethernet/cortina/gemini.c | 12 +- + drivers/net/ethernet/freescale/fec_main.c | 26 --- + drivers/net/ethernet/intel/ice/ice_ddp.c | 10 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 240 ++++++++++++--------- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 29 +-- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 46 +++- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 10 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 4 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 28 ++- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 6 +- + .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 14 +- + .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 19 +- + drivers/net/ethernet/smsc/smc91x.h | 4 +- + drivers/net/ethernet/sun/sungem.c | 14 -- + drivers/net/phy/micrel.c | 3 +- + drivers/net/usb/ax88179_178a.c | 37 +++- + drivers/ptp/ptp_ocp.c | 6 +- + include/linux/mlx5/driver.h | 1 + + include/net/ax25.h | 3 +- + include/net/cipso_ipv4.h | 6 +- + include/net/netlabel.h | 12 +- + kernel/bpf/syscall.c | 5 + + net/ax25/ax25_dev.c | 48 ++--- + net/ipv4/cipso_ipv4.c | 7 +- + net/ipv4/devinet.c | 13 +- + net/ipv6/seg6.c | 5 +- + net/netlabel/netlabel_kapi.c | 31 ++- + net/openvswitch/flow.c | 3 +- + net/unix/af_unix.c | 2 +- + security/selinux/netlabel.c | 5 +- + security/smack/smack_lsm.c | 3 +- + tools/testing/selftests/bpf/prog_tests/sockopt.c | 65 +++++- + tools/testing/selftests/net/amt.sh | 12 +- + tools/testing/selftests/net/config | 1 + + 36 files changed, 438 insertions(+), 298 deletions(-) +Merging bpf/master (aea27a92a41d net: micrel: Fix receiving the timestamp in the frame for lan8841) +$ 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 (b6d2e438e16c xfrm: Correct spelling mistake in xfrm.h comment) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/main (a26ff37e624d net: fix out-of-bounds access in ops_init) +$ 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 (a26ff37e624d net: fix out-of-bounds access in ops_init) +$ 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 (838c7b8f1f27 wifi: nl80211: Avoid address calculations via out of bounds array indexing) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 10 +--------- + net/wireless/nl80211.c | 14 +++++++------- + 2 files changed, 8 insertions(+), 16 deletions(-) +Merging wpan/master (b85ea95d0864 Linux 6.7-rc1) +$ 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 (ed30a4a51bb1 Linux 6.9-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 (d731b1ed1505 ALSA: hda/realtek: Drop doubly quirk entry for 103c:8a2e) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Auto-merging MAINTAINERS +Auto-merging include/linux/pci_ids.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/davinci-mcbsp.txt | 50 - + .../devicetree/bindings/sound/davinci-mcbsp.yaml | 113 + + .../devicetree/bindings/sound/fsl,audmix.txt | 50 - + .../devicetree/bindings/sound/fsl,audmix.yaml | 83 + + .../devicetree/bindings/sound/fsl,esai.txt | 68 - + .../devicetree/bindings/sound/fsl,esai.yaml | 118 + + .../devicetree/bindings/sound/fsl,imx-asrc.yaml | 14 + + .../bindings/sound/fsl,imx-audio-spdif.yaml | 66 + + .../devicetree/bindings/sound/fsl,sai.yaml | 6 +- + .../devicetree/bindings/sound/fsl,spdif.yaml | 35 +- + .../devicetree/bindings/sound/fsl,ssi.txt | 87 - + .../devicetree/bindings/sound/fsl,ssi.yaml | 194 ++ + .../devicetree/bindings/sound/fsl-asoc-card.txt | 117 - + .../devicetree/bindings/sound/fsl-asoc-card.yaml | 197 ++ + .../devicetree/bindings/sound/imx-audio-spdif.txt | 36 - + .../bindings/sound/mediatek,mt2701-wm8960.yaml | 54 + + .../devicetree/bindings/sound/mt2701-wm8960.txt | 24 - + .../sound/mt8186-mt6366-da7219-max98357.yaml | 131 +- + .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 120 +- + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 139 +- + .../devicetree/bindings/sound/mt8195-mt6359.yaml | 134 + + .../devicetree/bindings/sound/nuvoton,nau8325.yaml | 80 + + .../devicetree/bindings/sound/nuvoton,nau8821.yaml | 7 + + .../bindings/sound/nvidia,tegra20-ac97.txt | 36 - + .../bindings/sound/nvidia,tegra20-ac97.yaml | 82 + + .../bindings/sound/nvidia,tegra20-das.txt | 12 - + .../bindings/sound/nvidia,tegra20-das.yaml | 36 + + .../bindings/sound/nvidia,tegra30-i2s.txt | 27 - + .../bindings/sound/nvidia,tegra30-i2s.yaml | 67 + + .../devicetree/bindings/sound/qcom,sm8250.yaml | 2 + + .../devicetree/bindings/sound/renesas,rsnd.yaml | 5 +- + .../bindings/sound/rockchip,rk3308-codec.yaml | 98 + + .../devicetree/bindings/sound/ti,pcm1681.txt | 15 - + .../devicetree/bindings/sound/ti,pcm1681.yaml | 43 + + .../devicetree/bindings/sound/ti,pcm6240.yaml | 177 ++ + .../devicetree/bindings/sound/wlf,wm8776.yaml | 41 + + .../devicetree/bindings/sound/wlf,wm8974.txt | 15 - + .../devicetree/bindings/sound/wlf,wm8974.yaml | 41 + + Documentation/devicetree/bindings/sound/wm8776.txt | 18 - + .../sound/kernel-api/writing-an-alsa-driver.rst | 4 +- + Documentation/sound/soc/dapm-graph.svg | 375 +++ + Documentation/sound/soc/dapm.rst | 167 +- + MAINTAINERS | 13 + + drivers/firmware/cirrus/cs_dsp.c | 54 + + include/linux/firmware/cirrus/cs_dsp.h | 4 + + include/linux/pci_ids.h | 1 + + include/linux/platform_data/davinci_asp.h | 15 - + include/sound/control.h | 23 + + include/sound/cs35l41.h | 5 + + include/sound/dmaengine_pcm.h | 2 + + include/sound/emu10k1.h | 33 +- + include/sound/hda-mlink.h | 2 +- + include/sound/hda_codec.h | 11 - + include/sound/hdaudio.h | 2 + + include/sound/pcm.h | 5 + + include/sound/soc-acpi-intel-match.h | 2 +- + .../sound/soc-acpi-intel-ssp-common.h | 29 +- + include/sound/soc-acpi.h | 14 +- + include/sound/soc-jack.h | 2 - + include/sound/soc.h | 56 +- + include/sound/sof.h | 4 +- + include/sound/sof/channel_map.h | 2 +- + include/sound/sof/control.h | 2 +- + include/sound/sof/dai-intel.h | 2 +- + include/sound/sof/dai.h | 2 +- + include/sound/sof/debug.h | 2 +- + include/sound/sof/ext_manifest.h | 2 +- + include/sound/sof/ext_manifest4.h | 2 +- + include/sound/sof/header.h | 2 +- + include/sound/sof/info.h | 2 +- + include/sound/sof/ipc4/header.h | 2 +- + include/sound/sof/pm.h | 2 +- + include/sound/sof/stream.h | 2 +- + include/sound/sof/topology.h | 2 +- + include/sound/sof/trace.h | 2 +- + include/sound/sof/xtensa.h | 2 +- + include/sound/soundfont.h | 2 +- + include/trace/events/asoc.h | 2 + + include/trace/events/sof.h | 2 +- + include/trace/events/sof_intel.h | 2 +- + include/uapi/sound/asoc.h | 56 - + include/uapi/sound/intel/avs/tokens.h | 2 +- + include/uapi/sound/skl-tplg-interface.h | 74 - + include/uapi/sound/sof/abi.h | 2 +- + include/uapi/sound/sof/fw.h | 2 +- + include/uapi/sound/sof/header.h | 2 +- + include/uapi/sound/sof/tokens.h | 2 +- + sound/Makefile | 2 +- + sound/ac97/bus.c | 1 + + sound/ac97_bus.c | 1 + + sound/aoa/codecs/Makefile | 6 +- + sound/aoa/core/Makefile | 2 +- + sound/aoa/fabrics/Makefile | 2 +- + sound/aoa/soundbus/Makefile | 2 +- + sound/aoa/soundbus/i2sbus/Makefile | 2 +- + sound/aoa/soundbus/i2sbus/pcm.c | 10 +- + sound/arm/Makefile | 4 +- + sound/arm/pxa2xx-pcm-lib.c | 4 +- + sound/atmel/Makefile | 2 +- + sound/core/Makefile | 18 +- + sound/core/control_led.c | 15 +- + sound/core/init.c | 11 +- + sound/core/oss/Makefile | 2 +- + sound/core/pcm_dmaengine.c | 1 + + sound/core/pcm_native.c | 2 +- + sound/core/seq/Makefile | 14 +- + sound/core/seq/oss/Makefile | 2 +- + sound/core/seq/seq_dummy.c | 24 +- + sound/core/sound_kunit.c | 11 +- + sound/drivers/Makefile | 18 +- + sound/drivers/aloop.c | 9 +- + sound/drivers/mpu401/Makefile | 4 +- + sound/drivers/opl3/Makefile | 2 +- + sound/drivers/opl4/Makefile | 4 +- + sound/drivers/pcmtest.c | 1 + + sound/drivers/pcsp/Makefile | 2 +- + sound/drivers/vx/Makefile | 2 +- + sound/firewire/Makefile | 4 +- + sound/firewire/amdtp-stream.c | 10 +- + sound/firewire/bebob/Makefile | 2 +- + sound/firewire/dice/Makefile | 2 +- + sound/firewire/digi00x/Makefile | 2 +- + sound/firewire/fireface/Makefile | 2 +- + sound/firewire/fireworks/Makefile | 2 +- + sound/firewire/motu/Makefile | 2 +- + sound/firewire/oxfw/Makefile | 2 +- + sound/firewire/tascam/Makefile | 2 +- + sound/hda/Kconfig | 1 + + sound/hda/Makefile | 8 +- + sound/hda/ext/Makefile | 2 +- + sound/hda/hdac_controller.c | 127 +- + sound/hda/intel-dsp-config.c | 16 +- + sound/i2c/Makefile | 6 +- + sound/i2c/other/Makefile | 10 +- + sound/isa/Makefile | 18 +- + sound/isa/ad1816a/Makefile | 2 +- + sound/isa/ad1848/Makefile | 2 +- + sound/isa/cs423x/Makefile | 4 +- + sound/isa/es1688/Makefile | 4 +- + sound/isa/galaxy/Makefile | 4 +- + sound/isa/gus/Makefile | 12 +- + sound/isa/msnd/Makefile | 6 +- + sound/isa/opti9xx/Makefile | 8 +- + sound/isa/sb/Makefile | 18 +- + sound/isa/sb/emu8000_patch.c | 13 - + sound/isa/wavefront/Makefile | 2 +- + sound/isa/wss/Makefile | 2 +- + sound/mips/Makefile | 4 +- + sound/oss/dmasound/dmasound_atari.c | 2 + + sound/oss/dmasound/dmasound_paula.c | 1 + + sound/parisc/Makefile | 2 +- + sound/pci/Makefile | 48 +- + sound/pci/ali5451/Makefile | 2 +- + sound/pci/asihpi/Makefile | 2 +- + sound/pci/au88x0/Makefile | 6 +- + sound/pci/aw2/Makefile | 2 +- + sound/pci/ca0106/Makefile | 2 +- + sound/pci/ctxfi/Makefile | 2 +- + sound/pci/echoaudio/Makefile | 28 +- + sound/pci/emu10k1/Makefile | 6 +- + sound/pci/emu10k1/emu10k1_callback.c | 13 +- + sound/pci/emu10k1/emu10k1_main.c | 75 +- + sound/pci/emu10k1/emu10k1_patch.c | 207 +- + sound/pci/emu10k1/io.c | 53 + + sound/pci/emu10k1/memory.c | 55 +- + sound/pci/hda/Kconfig | 2 + + sound/pci/hda/Makefile | 52 +- + sound/pci/hda/cirrus_scodec_test.c | 1 + + sound/pci/hda/cs35l41_hda.c | 418 ++- + sound/pci/hda/cs35l41_hda.h | 6 + + sound/pci/hda/cs35l41_hda_property.c | 24 +- + sound/pci/hda/cs35l56_hda.c | 8 +- + sound/pci/hda/hda_codec.c | 37 +- + sound/pci/hda/hda_component.c | 16 +- + sound/pci/hda/hda_component.h | 7 +- + sound/pci/hda/hda_controller.c | 11 +- + sound/pci/hda/hda_controller.h | 1 + + sound/pci/hda/hda_cs_dsp_ctl.c | 69 +- + sound/pci/hda/hda_generic.c | 4 - + sound/pci/hda/hda_generic.h | 2 - + sound/pci/hda/hda_intel.c | 55 +- + sound/pci/hda/hda_intel_trace.h | 2 - + sound/pci/hda/hda_sysfs.c | 4 - + sound/pci/hda/patch_analog.c | 4 - + sound/pci/hda/patch_ca0132.c | 4 - + sound/pci/hda/patch_cirrus.c | 4 - + sound/pci/hda/patch_conexant.c | 4 - + sound/pci/hda/patch_cs8409.c | 8 - + sound/pci/hda/patch_hdmi.c | 11 +- + sound/pci/hda/patch_realtek.c | 49 +- + sound/pci/hda/patch_sigmatel.c | 8 - + sound/pci/hda/patch_via.c | 6 - + sound/pci/ice1712/Makefile | 6 +- + sound/pci/korg1212/Makefile | 2 +- + sound/pci/lx6464es/Makefile | 2 +- + sound/pci/mixart/Makefile | 2 +- + sound/pci/nm256/Makefile | 2 +- + sound/pci/oxygen/Makefile | 8 +- + sound/pci/pcxhr/Makefile | 2 +- + sound/pci/riptide/Makefile | 2 +- + sound/pci/rme9652/Makefile | 6 +- + sound/pci/trident/Makefile | 2 +- + sound/pci/vx222/Makefile | 2 +- + sound/pci/ymfpci/Makefile | 2 +- + sound/pcmcia/pdaudiocf/Makefile | 2 +- + sound/pcmcia/vx/Makefile | 2 +- + sound/ppc/Makefile | 2 +- + sound/sh/Makefile | 4 +- + sound/soc/Kconfig | 8 + + sound/soc/Makefile | 20 +- + sound/soc/adi/Makefile | 4 +- + sound/soc/amd/Kconfig | 21 +- + sound/soc/amd/Makefile | 12 +- + sound/soc/amd/acp-da7219-max98357a.c | 2 +- + sound/soc/amd/acp/Makefile | 26 +- + sound/soc/amd/acp/acp-legacy-common.c | 98 +- + sound/soc/amd/acp/acp-mach-common.c | 2 +- + sound/soc/amd/acp/acp-pci.c | 9 +- + sound/soc/amd/acp/amd.h | 10 +- + sound/soc/amd/acp/chip_offset_byte.h | 1 + + sound/soc/amd/acp3x-rt5682-max9836.c | 2 +- + sound/soc/amd/ps/Makefile | 8 +- + sound/soc/amd/ps/ps-sdw-dma.c | 2 +- + sound/soc/amd/raven/Makefile | 6 +- + sound/soc/amd/renoir/Makefile | 6 +- + sound/soc/amd/rpl/Makefile | 2 +- + sound/soc/amd/vangogh/Makefile | 8 +- + sound/soc/amd/yc/Makefile | 6 +- + sound/soc/apple/Makefile | 2 +- + sound/soc/atmel/Makefile | 30 +- + sound/soc/atmel/tse850-pcm5142.c | 3 +- + sound/soc/au1x/Makefile | 16 +- + sound/soc/bcm/Makefile | 6 +- + sound/soc/cirrus/Makefile | 6 +- + sound/soc/codecs/Kconfig | 25 + + sound/soc/codecs/Makefile | 784 +++--- + sound/soc/codecs/ab8500-codec.c | 1 + + sound/soc/codecs/adau1372-i2c.c | 2 +- + sound/soc/codecs/adau1373.c | 2 +- + sound/soc/codecs/adau1701.c | 8 +- + sound/soc/codecs/adau7118-i2c.c | 2 +- + sound/soc/codecs/adav803.c | 2 +- + sound/soc/codecs/ak4118.c | 2 +- + sound/soc/codecs/ak4535.c | 2 +- + sound/soc/codecs/ak4641.c | 2 +- + sound/soc/codecs/ak4671.c | 2 +- + sound/soc/codecs/cs35l32.c | 2 +- + sound/soc/codecs/cs35l33.c | 2 +- + sound/soc/codecs/cs35l34.c | 2 +- + sound/soc/codecs/cs35l35.c | 2 +- + sound/soc/codecs/cs35l36.c | 2 +- + sound/soc/codecs/cs35l41-i2c.c | 8 +- + sound/soc/codecs/cs35l41.c | 7 +- + sound/soc/codecs/cs35l45-i2c.c | 2 +- + sound/soc/codecs/cs35l56-i2c.c | 2 +- + sound/soc/codecs/cs35l56-shared.c | 1 + + sound/soc/codecs/cs35l56.c | 1 + + sound/soc/codecs/cs4265.c | 2 +- + sound/soc/codecs/cs4270.c | 2 +- + sound/soc/codecs/cs4271-i2c.c | 2 +- + sound/soc/codecs/cs42l42-i2c.c | 2 +- + sound/soc/codecs/cs42l51-i2c.c | 2 +- + sound/soc/codecs/cs42l52.c | 2 +- + sound/soc/codecs/cs42l56.c | 2 +- + sound/soc/codecs/cs42l73.c | 2 +- + sound/soc/codecs/cs43130.c | 8 +- + sound/soc/codecs/cs4341.c | 2 +- + sound/soc/codecs/cs4349.c | 2 +- + sound/soc/codecs/cs53l30.c | 2 +- + sound/soc/codecs/cx2072x.c | 4 +- + sound/soc/codecs/da7210.c | 2 +- + sound/soc/codecs/da7213.c | 2 +- + sound/soc/codecs/da732x.c | 2 +- + sound/soc/codecs/da9055.c | 2 +- + sound/soc/codecs/es8316.c | 2 +- + sound/soc/codecs/es8326.c | 43 +- + sound/soc/codecs/es8328-i2c.c | 4 +- + sound/soc/codecs/hda-dai.c | 2 +- + sound/soc/codecs/hda.c | 2 +- + sound/soc/codecs/hda.h | 2 +- + sound/soc/codecs/hdac_hda.c | 44 +- + sound/soc/codecs/isabelle.c | 2 +- + sound/soc/codecs/lm4857.c | 2 +- + sound/soc/codecs/lm49453.c | 2 +- + sound/soc/codecs/max9768.c | 2 +- + sound/soc/codecs/max98371.c | 2 +- + sound/soc/codecs/max98373-i2c.c | 2 +- + sound/soc/codecs/max98373-sdw.c | 1 - + sound/soc/codecs/max98388.c | 2 +- + sound/soc/codecs/max98390.c | 2 +- + sound/soc/codecs/max9850.c | 2 +- + sound/soc/codecs/max98520.c | 2 +- + sound/soc/codecs/max9867.c | 2 +- + sound/soc/codecs/max9877.c | 2 +- + sound/soc/codecs/max98925.c | 2 +- + sound/soc/codecs/max98926.c | 2 +- + sound/soc/codecs/max98927.c | 2 +- + sound/soc/codecs/ml26124.c | 2 +- + sound/soc/codecs/mt6660.c | 2 +- + sound/soc/codecs/nau8325.c | 900 ++++++ + sound/soc/codecs/nau8325.h | 391 +++ + sound/soc/codecs/nau8540.c | 2 +- + sound/soc/codecs/nau8810.c | 6 +- + sound/soc/codecs/nau8821.c | 21 +- + sound/soc/codecs/nau8821.h | 1 + + sound/soc/codecs/nau8822.c | 2 +- + sound/soc/codecs/nau8822.h | 1 - + sound/soc/codecs/nau8824.c | 2 +- + sound/soc/codecs/nau8825.c | 2 +- + sound/soc/codecs/pcm1681.c | 2 +- + sound/soc/codecs/pcm1789-i2c.c | 2 +- + sound/soc/codecs/pcm179x-i2c.c | 2 +- + sound/soc/codecs/pcm6240.c | 2217 +++++++++++++++ + sound/soc/codecs/pcm6240.h | 252 ++ + sound/soc/codecs/rk3308_codec.c | 974 +++++++ + sound/soc/codecs/rk3308_codec.h | 579 ++++ + sound/soc/codecs/rt1011.c | 2 +- + sound/soc/codecs/rt1015.c | 2 +- + sound/soc/codecs/rt1016.c | 2 +- + sound/soc/codecs/rt1017-sdca-sdw.c | 1 - + sound/soc/codecs/rt1019.c | 2 +- + sound/soc/codecs/rt1305.c | 4 +- + sound/soc/codecs/rt1308-sdw.c | 1 - + sound/soc/codecs/rt1308.c | 2 +- + sound/soc/codecs/rt1316-sdw.c | 1 - + sound/soc/codecs/rt1318-sdw.c | 1 - + sound/soc/codecs/rt274.c | 2 +- + sound/soc/codecs/rt286.c | 4 +- + sound/soc/codecs/rt298.c | 2 +- + sound/soc/codecs/rt5514.c | 2 +- + sound/soc/codecs/rt5616.c | 2 +- + sound/soc/codecs/rt5631.c | 4 +- + sound/soc/codecs/rt5640.c | 6 +- + sound/soc/codecs/rt5645.c | 4 +- + sound/soc/codecs/rt5651.c | 2 +- + sound/soc/codecs/rt5659.c | 4 +- + sound/soc/codecs/rt5660.c | 2 +- + sound/soc/codecs/rt5663.c | 2 +- + sound/soc/codecs/rt5665.c | 2 +- + sound/soc/codecs/rt5668.c | 2 +- + sound/soc/codecs/rt5670.c | 6 +- + sound/soc/codecs/rt5682-i2c.c | 2 +- + sound/soc/codecs/rt5682-sdw.c | 1 - + sound/soc/codecs/rt5682s.c | 2 +- + sound/soc/codecs/rt700-sdw.c | 1 - + sound/soc/codecs/rt711-sdca-sdw.c | 1 - + sound/soc/codecs/rt711-sdw.c | 1 - + sound/soc/codecs/rt712-sdca-dmic.c | 1 - + sound/soc/codecs/rt712-sdca-sdw.c | 1 - + sound/soc/codecs/rt715-sdca-sdw.c | 5 +- + sound/soc/codecs/rt715-sdca.c | 4 +- + sound/soc/codecs/rt715-sdw.c | 1 - + sound/soc/codecs/rt722-sdca-sdw.c | 1 - + sound/soc/codecs/sdw-mockup.c | 1 - + sound/soc/codecs/sgtl5000.c | 2 +- + sound/soc/codecs/sigmadsp.c | 1 + + sound/soc/codecs/sma1303.c | 2 +- + sound/soc/codecs/src4xxx-i2c.c | 2 +- + sound/soc/codecs/ssm2518.c | 2 +- + sound/soc/codecs/ssm4567.c | 2 +- + sound/soc/codecs/sta32x.c | 6 +- + sound/soc/codecs/sta350.c | 2 +- + sound/soc/codecs/sta529.c | 2 +- + sound/soc/codecs/tas2552.c | 2 +- + sound/soc/codecs/tas2764.c | 2 +- + sound/soc/codecs/tas2770.c | 2 +- + sound/soc/codecs/tas2780.c | 5 +- + sound/soc/codecs/tas2781-fmwlib.c | 6 +- + sound/soc/codecs/tas5086.c | 2 +- + sound/soc/codecs/tas6424.c | 2 +- + sound/soc/codecs/tda7419.c | 2 +- + sound/soc/codecs/tfa9879.c | 2 +- + sound/soc/codecs/tlv320aic23-i2c.c | 2 +- + sound/soc/codecs/tlv320aic32x4-spi.c | 1 - + sound/soc/codecs/tlv320aic3x-spi.c | 1 - + sound/soc/codecs/ts3a227e.c | 2 +- + sound/soc/codecs/tscs42xx.c | 4 +- + sound/soc/codecs/tscs454.c | 2 +- + sound/soc/codecs/uda1380.c | 2 +- + sound/soc/codecs/wcd934x.c | 1 - + sound/soc/codecs/wm1250-ev1.c | 2 +- + sound/soc/codecs/wm2000.c | 2 +- + sound/soc/codecs/wm2200.c | 2 +- + sound/soc/codecs/wm5100.c | 2 +- + sound/soc/codecs/wm8510.c | 2 +- + sound/soc/codecs/wm8523.c | 2 +- + sound/soc/codecs/wm8711.c | 2 +- + sound/soc/codecs/wm8728.c | 2 +- + sound/soc/codecs/wm8731-i2c.c | 2 +- + sound/soc/codecs/wm8737.c | 2 +- + sound/soc/codecs/wm8741.c | 2 +- + sound/soc/codecs/wm8750.c | 4 +- + sound/soc/codecs/wm8753.c | 2 +- + sound/soc/codecs/wm8804-i2c.c | 2 +- + sound/soc/codecs/wm8900.c | 2 +- + sound/soc/codecs/wm8903.c | 2 +- + sound/soc/codecs/wm8940.c | 2 +- + sound/soc/codecs/wm8955.c | 2 +- + sound/soc/codecs/wm8960.c | 2 +- + sound/soc/codecs/wm8961.c | 2 +- + sound/soc/codecs/wm8962.c | 14 +- + sound/soc/codecs/wm8971.c | 2 +- + sound/soc/codecs/wm8974.c | 2 +- + sound/soc/codecs/wm8978.c | 2 +- + sound/soc/codecs/wm8983.c | 2 +- + sound/soc/codecs/wm8988.c | 2 +- + sound/soc/codecs/wm8990.c | 2 +- + sound/soc/codecs/wm8991.c | 2 +- + sound/soc/codecs/wm8993.c | 14 +- + sound/soc/codecs/wm8994.c | 8 +- + sound/soc/codecs/wm8995.c | 2 +- + sound/soc/codecs/wm8996.c | 16 +- + sound/soc/codecs/wm9081.c | 2 +- + sound/soc/codecs/wm9090.c | 4 +- + sound/soc/codecs/wm_adsp.c | 33 +- + sound/soc/fsl/Makefile | 52 +- + sound/soc/fsl/fsl-asoc-card.c | 10 +- + sound/soc/fsl/fsl_rpmsg.c | 43 +- + sound/soc/fsl/fsl_ssi.c | 4 +- + sound/soc/fsl/imx-audio-rpmsg.c | 21 +- + sound/soc/fsl/imx-card.c | 6 +- + sound/soc/fsl/imx-es8328.c | 17 +- + sound/soc/fsl/imx-hdmi.c | 2 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 19 +- + sound/soc/fsl/imx-rpmsg.c | 28 +- + sound/soc/generic/Makefile | 12 +- + sound/soc/generic/audio-graph-card2.c | 4 +- + sound/soc/generic/simple-card-utils.c | 2 - + sound/soc/img/img-i2s-in.c | 2 +- + sound/soc/img/img-i2s-out.c | 2 +- + sound/soc/intel/Kconfig | 1 + + sound/soc/intel/atom/Makefile | 2 +- + sound/soc/intel/atom/sst/Makefile | 6 +- + sound/soc/intel/avs/Makefile | 10 +- + sound/soc/intel/avs/apl.c | 22 +- + sound/soc/intel/avs/avs.h | 14 +- + sound/soc/intel/avs/board_selection.c | 9 +- + sound/soc/intel/avs/boards/Makefile | 34 +- + sound/soc/intel/avs/boards/da7219.c | 2 +- + sound/soc/intel/avs/boards/dmic.c | 2 +- + sound/soc/intel/avs/boards/es8336.c | 6 +- + sound/soc/intel/avs/boards/hdaudio.c | 8 +- + sound/soc/intel/avs/boards/i2s_test.c | 81 +- + sound/soc/intel/avs/boards/max98357a.c | 2 +- + sound/soc/intel/avs/boards/max98373.c | 2 +- + sound/soc/intel/avs/boards/max98927.c | 2 +- + sound/soc/intel/avs/boards/nau8825.c | 6 +- + sound/soc/intel/avs/boards/probe.c | 2 +- + sound/soc/intel/avs/boards/rt274.c | 7 +- + sound/soc/intel/avs/boards/rt286.c | 8 +- + sound/soc/intel/avs/boards/rt298.c | 8 +- + sound/soc/intel/avs/boards/rt5514.c | 2 +- + sound/soc/intel/avs/boards/rt5663.c | 4 +- + sound/soc/intel/avs/boards/rt5682.c | 4 +- + sound/soc/intel/avs/boards/ssm4567.c | 7 +- + sound/soc/intel/avs/cldma.c | 46 +- + sound/soc/intel/avs/cldma.h | 3 +- + sound/soc/intel/avs/cnl.c | 83 +- + sound/soc/intel/avs/control.c | 2 +- + sound/soc/intel/avs/control.h | 2 +- + sound/soc/intel/avs/core.c | 99 +- + sound/soc/intel/avs/debugfs.c | 2 +- + sound/soc/intel/avs/dsp.c | 2 +- + sound/soc/intel/avs/icl.c | 17 +- + sound/soc/intel/avs/ipc.c | 50 +- + sound/soc/intel/avs/loader.c | 8 +- + sound/soc/intel/avs/messages.c | 2 +- + sound/soc/intel/avs/messages.h | 49 +- + sound/soc/intel/avs/path.c | 47 +- + sound/soc/intel/avs/path.h | 2 +- + sound/soc/intel/avs/pcm.c | 274 +- + sound/soc/intel/avs/probes.c | 16 +- + sound/soc/intel/avs/registers.h | 2 +- + sound/soc/intel/avs/skl.c | 75 +- + sound/soc/intel/avs/sysfs.c | 2 +- + sound/soc/intel/avs/tgl.c | 5 +- + sound/soc/intel/avs/topology.c | 2 +- + sound/soc/intel/avs/topology.h | 2 +- + sound/soc/intel/avs/trace.c | 2 +- + sound/soc/intel/avs/utils.c | 10 +- + sound/soc/intel/avs/utils.h | 2 +- + sound/soc/intel/boards/Kconfig | 70 +- + sound/soc/intel/boards/Makefile | 98 +- + sound/soc/intel/boards/bdw_rt286.c | 2 +- + sound/soc/intel/boards/bridge_cs35l56.c | 137 + + sound/soc/intel/boards/bxt_da7219_max98357a.c | 182 +- + sound/soc/intel/boards/bxt_rt298.c | 3 +- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 609 ---- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 691 ----- + sound/soc/intel/boards/hda_dsp_common.c | 2 +- + sound/soc/intel/boards/hsw_rt5640.c | 2 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 1 + + sound/soc/intel/boards/kbl_da7219_max98927.c | 4 + + sound/soc/intel/boards/kbl_rt5660.c | 1 + + sound/soc/intel/boards/kbl_rt5663_max98927.c | 4 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 3 +- + sound/soc/intel/boards/skl_hda_dsp_common.h | 1 + + sound/soc/intel/boards/skl_hda_dsp_generic.c | 50 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 3 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 4 +- + sound/soc/intel/boards/skl_rt286.c | 5 +- + sound/soc/intel/boards/sof_board_helpers.c | 163 +- + sound/soc/intel/boards/sof_board_helpers.h | 108 +- + sound/soc/intel/boards/sof_cirrus_common.h | 2 +- + sound/soc/intel/boards/sof_cs42l42.c | 89 +- + sound/soc/intel/boards/sof_da7219.c | 521 ++-- + sound/soc/intel/boards/sof_maxim_common.c | 137 +- + sound/soc/intel/boards/sof_maxim_common.h | 9 +- + sound/soc/intel/boards/sof_nau8825.c | 104 +- + sound/soc/intel/boards/sof_nuvoton_common.h | 2 +- + sound/soc/intel/boards/sof_realtek_common.c | 330 ++- + sound/soc/intel/boards/sof_realtek_common.h | 7 +- + sound/soc/intel/boards/sof_rt5682.c | 418 +-- + sound/soc/intel/boards/sof_sdw.c | 1415 +++++----- + sound/soc/intel/boards/sof_sdw_common.h | 98 +- + sound/soc/intel/boards/sof_sdw_cs42l42.c | 27 +- + sound/soc/intel/boards/sof_sdw_cs42l43.c | 66 +- + sound/soc/intel/boards/sof_sdw_cs_amp.c | 16 +- + sound/soc/intel/boards/sof_sdw_maxim.c | 29 +- + sound/soc/intel/boards/sof_sdw_rt5682.c | 27 +- + sound/soc/intel/boards/sof_sdw_rt700.c | 29 +- + sound/soc/intel/boards/sof_sdw_rt711.c | 28 +- + sound/soc/intel/boards/sof_sdw_rt712_sdca.c | 49 +- + sound/soc/intel/boards/sof_sdw_rt715.c | 26 - + sound/soc/intel/boards/sof_sdw_rt715_sdca.c | 26 - + sound/soc/intel/boards/sof_sdw_rt722_sdca.c | 60 +- + sound/soc/intel/boards/sof_sdw_rt_amp.c | 43 +- + sound/soc/intel/boards/sof_sdw_rt_dmic.c | 54 + + .../soc/intel/boards/sof_sdw_rt_sdca_jack_common.c | 49 +- + sound/soc/intel/boards/sof_ssp_amp.c | 266 +- + sound/soc/intel/boards/sof_ssp_common.c | 122 - + sound/soc/intel/catpt/Makefile | 2 +- + sound/soc/intel/catpt/core.h | 2 +- + sound/soc/intel/catpt/device.c | 2 +- + sound/soc/intel/catpt/dsp.c | 2 +- + sound/soc/intel/catpt/ipc.c | 2 +- + sound/soc/intel/catpt/loader.c | 2 +- + sound/soc/intel/catpt/messages.c | 2 +- + sound/soc/intel/catpt/messages.h | 2 +- + sound/soc/intel/catpt/pcm.c | 2 +- + sound/soc/intel/catpt/registers.h | 2 +- + sound/soc/intel/catpt/sysfs.c | 2 +- + sound/soc/intel/catpt/trace.h | 2 +- + sound/soc/intel/common/Makefile | 8 +- + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 150 +- + sound/soc/intel/common/soc-acpi-intel-arl-match.c | 24 + + sound/soc/intel/common/soc-acpi-intel-cml-match.c | 12 +- + sound/soc/intel/common/soc-acpi-intel-glk-match.c | 4 +- + sound/soc/intel/common/soc-acpi-intel-icl-match.c | 2 +- + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 4 +- + sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 104 +- + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 244 +- + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 97 +- + sound/soc/intel/common/soc-acpi-intel-ssp-common.c | 159 ++ + sound/soc/intel/common/soc-acpi-intel-tgl-match.c | 85 +- + sound/soc/intel/common/sst-dsp-priv.h | 2 +- + sound/soc/intel/common/sst-dsp.c | 2 +- + sound/soc/intel/common/sst-dsp.h | 2 +- + sound/soc/intel/common/sst-ipc.c | 2 +- + sound/soc/intel/common/sst-ipc.h | 2 +- + sound/soc/intel/keembay/Makefile | 2 +- + sound/soc/intel/skylake/Makefile | 6 +- + sound/soc/intel/skylake/skl-topology.c | 169 -- + sound/soc/jz4740/Makefile | 2 +- + sound/soc/kirkwood/Makefile | 4 +- + sound/soc/kirkwood/kirkwood-dma.c | 5 +- + sound/soc/loongson/Makefile | 4 +- + sound/soc/loongson/loongson_card.c | 2 +- + sound/soc/loongson/loongson_dma.c | 2 +- + sound/soc/loongson/loongson_i2s_pci.c | 1 - + sound/soc/mediatek/Kconfig | 24 +- + sound/soc/mediatek/common/Makefile | 4 +- + .../soc/mediatek/common/mtk-afe-platform-driver.c | 18 + + sound/soc/mediatek/common/mtk-dai-adda-common.c | 70 + + sound/soc/mediatek/common/mtk-dai-adda-common.h | 45 + + sound/soc/mediatek/common/mtk-dsp-sof-common.c | 15 +- + sound/soc/mediatek/common/mtk-dsp-sof-common.h | 1 - + sound/soc/mediatek/common/mtk-soc-card.h | 7 +- + sound/soc/mediatek/common/mtk-soundcard-driver.c | 205 +- + sound/soc/mediatek/common/mtk-soundcard-driver.h | 42 + + sound/soc/mediatek/mt2701/Makefile | 2 +- + sound/soc/mediatek/mt6797/Makefile | 2 +- + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 14 +- + sound/soc/mediatek/mt6797/mt6797-dai-adda.c | 85 +- + sound/soc/mediatek/mt7986/Makefile | 2 +- + sound/soc/mediatek/mt7986/mt7986-afe-pcm.c | 18 +- + sound/soc/mediatek/mt8183/Makefile | 2 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 14 +- + sound/soc/mediatek/mt8183/mt8183-dai-adda.c | 90 +- + sound/soc/mediatek/mt8186/Makefile | 5 +- + sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 14 +- + sound/soc/mediatek/mt8186/mt8186-dai-adda.c | 92 +- + .../mt8186/mt8186-mt6366-da7219-max98357.c | 1189 -------- + ...186-mt6366-rt1019-rt5682s.c => mt8186-mt6366.c} | 586 ++-- + sound/soc/mediatek/mt8188/Makefile | 2 +- + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 29 +- + sound/soc/mediatek/mt8188/mt8188-dai-adda.c | 89 +- + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 209 +- + sound/soc/mediatek/mt8192/Makefile | 2 +- + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 114 +- + sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 90 +- + sound/soc/mediatek/mt8192/mt8192-dai-tdm.c | 4 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 301 +- + sound/soc/mediatek/mt8195/Makefile | 2 +- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 31 +- + sound/soc/mediatek/mt8195/mt8195-dai-adda.c | 90 +- + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 495 ++-- + sound/soc/meson/Makefile | 50 +- + sound/soc/meson/aiu-fifo-i2s.c | 2 +- + sound/soc/meson/aiu-fifo-spdif.c | 2 +- + sound/soc/meson/aiu-fifo.c | 2 +- + sound/soc/meson/aiu-fifo.h | 2 +- + sound/soc/meson/axg-fifo.c | 4 +- + sound/soc/mxs/Makefile | 6 +- + sound/soc/pxa/Makefile | 12 +- + sound/soc/qcom/Makefile | 38 +- + sound/soc/qcom/apq8016_sbc.c | 4 +- + sound/soc/qcom/common.c | 2 + + sound/soc/qcom/qdsp6/Makefile | 4 +- + sound/soc/qcom/qdsp6/q6apm-dai.c | 16 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 2 +- + sound/soc/qcom/qdsp6/q6dsp-common.c | 2 + + sound/soc/qcom/sc7180.c | 10 +- + sound/soc/qcom/sc7280.c | 12 +- + sound/soc/qcom/sc8280xp.c | 10 +- + sound/soc/qcom/sdw.c | 8 +- + sound/soc/qcom/sm8250.c | 10 +- + sound/soc/qcom/x1e80100.c | 8 +- + sound/soc/rockchip/Makefile | 16 +- + sound/soc/samsung/Makefile | 38 +- + sound/soc/samsung/i2s.c | 1 - + sound/soc/samsung/midas_wm1811.c | 2 +- + sound/soc/sh/Makefile | 16 +- + sound/soc/sh/rcar/Makefile | 2 +- + sound/soc/sh/rcar/cmd.c | 6 +- + sound/soc/sh/rcar/core.c | 4 +- + sound/soc/sh/rcar/ctu.c | 6 +- + sound/soc/sh/rcar/dma.c | 6 +- + sound/soc/sh/rcar/dvc.c | 6 +- + sound/soc/sh/rcar/gen.c | 515 ++-- + sound/soc/sh/rcar/mix.c | 6 +- + sound/soc/sh/rcar/rsnd.h | 22 +- + sound/soc/sh/rcar/src.c | 12 +- + sound/soc/sh/rcar/ssi.c | 2 +- + sound/soc/sh/rcar/ssiu.c | 2 +- + sound/soc/soc-card-test.c | 186 ++ + sound/soc/soc-card.c | 21 +- + sound/soc/soc-core.c | 8 +- + sound/soc/soc-dai.c | 2 +- + sound/soc/soc-dapm.c | 54 +- + sound/soc/soc-generic-dmaengine-pcm.c | 4 + + sound/soc/soc-jack.c | 23 +- + sound/soc/soc-pcm.c | 11 +- + sound/soc/soc-topology-test.c | 3 +- + sound/soc/soc-topology.c | 252 +- + sound/soc/sof/Makefile | 30 +- + sound/soc/sof/amd/Makefile | 20 +- + sound/soc/sof/amd/acp-common.c | 2 +- + sound/soc/sof/amd/acp-loader.c | 2 + + sound/soc/sof/amd/acp.h | 2 +- + sound/soc/sof/control.c | 2 +- + sound/soc/sof/core.c | 2 +- + sound/soc/sof/debug.c | 46 +- + sound/soc/sof/fw-file-profile.c | 2 +- + sound/soc/sof/imx/Makefile | 8 +- + sound/soc/sof/imx/imx-common.c | 24 - + sound/soc/sof/imx/imx-common.h | 9 - + sound/soc/sof/imx/imx8.c | 45 +- + sound/soc/sof/imx/imx8m.c | 42 +- + sound/soc/sof/imx/imx8ulp.c | 44 +- + sound/soc/sof/intel/Kconfig | 25 +- + sound/soc/sof/intel/Makefile | 35 +- + sound/soc/sof/intel/apl.c | 5 +- + sound/soc/sof/intel/atom.c | 2 +- + sound/soc/sof/intel/atom.h | 2 +- + sound/soc/sof/intel/bdw.c | 4 +- + sound/soc/sof/intel/byt.c | 6 +- + sound/soc/sof/intel/cnl.c | 17 +- + sound/soc/sof/intel/ext_manifest.h | 2 +- + sound/soc/sof/intel/hda-bus.c | 9 +- + sound/soc/sof/intel/hda-codec.c | 17 +- + sound/soc/sof/intel/hda-common-ops.c | 5 +- + sound/soc/sof/intel/hda-ctrl.c | 21 +- + sound/soc/sof/intel/hda-dai-ops.c | 43 +- + sound/soc/sof/intel/hda-dai.c | 132 +- + sound/soc/sof/intel/hda-dsp.c | 504 +++- + sound/soc/sof/intel/hda-ipc.c | 117 +- + sound/soc/sof/intel/hda-ipc.h | 2 +- + sound/soc/sof/intel/hda-loader-skl.c | 2 +- + sound/soc/sof/intel/hda-loader.c | 122 +- + sound/soc/sof/intel/hda-mlink.c | 2 +- + sound/soc/sof/intel/hda-pcm.c | 8 +- + sound/soc/sof/intel/hda-probes.c | 4 +- + sound/soc/sof/intel/hda-stream.c | 39 +- + sound/soc/sof/intel/hda-trace.c | 5 +- + sound/soc/sof/intel/hda.c | 834 ++---- + sound/soc/sof/intel/hda.h | 47 +- + sound/soc/sof/intel/icl.c | 6 +- + sound/soc/sof/intel/lnl.c | 35 +- + sound/soc/sof/intel/lnl.h | 15 + + sound/soc/sof/intel/mtl.c | 91 +- + sound/soc/sof/intel/mtl.h | 50 +- + sound/soc/sof/intel/pci-apl.c | 3 +- + sound/soc/sof/intel/pci-cnl.c | 3 +- + sound/soc/sof/intel/pci-icl.c | 4 +- + sound/soc/sof/intel/pci-lnl.c | 5 +- + sound/soc/sof/intel/pci-mtl.c | 3 +- + sound/soc/sof/intel/pci-skl.c | 3 +- + sound/soc/sof/intel/pci-tgl.c | 4 +- + sound/soc/sof/intel/pci-tng.c | 4 +- + sound/soc/sof/intel/shim.h | 5 +- + sound/soc/sof/intel/skl.c | 2 +- + sound/soc/sof/intel/telemetry.c | 3 +- + sound/soc/sof/intel/telemetry.h | 2 +- + sound/soc/sof/intel/tgl.c | 27 +- + sound/soc/sof/intel/tracepoints.c | 5 + + sound/soc/sof/iomem-utils.c | 2 +- + sound/soc/sof/ipc.c | 2 +- + sound/soc/sof/ipc3-control.c | 2 +- + sound/soc/sof/ipc3-dtrace.c | 2 +- + sound/soc/sof/ipc3-loader.c | 2 +- + sound/soc/sof/ipc3-pcm.c | 2 +- + sound/soc/sof/ipc3-priv.h | 8 +- + sound/soc/sof/ipc3-topology.c | 2 +- + sound/soc/sof/ipc3.c | 2 +- + sound/soc/sof/ipc4-control.c | 2 +- + sound/soc/sof/ipc4-fw-reg.h | 2 +- + sound/soc/sof/ipc4-loader.c | 10 +- + sound/soc/sof/ipc4-mtrace.c | 2 +- + sound/soc/sof/ipc4-pcm.c | 2 +- + sound/soc/sof/ipc4-priv.h | 4 +- + sound/soc/sof/ipc4-telemetry.c | 2 +- + sound/soc/sof/ipc4-telemetry.h | 2 +- + sound/soc/sof/ipc4-topology.c | 368 ++- + sound/soc/sof/ipc4-topology.h | 5 +- + sound/soc/sof/ipc4.c | 2 +- + sound/soc/sof/loader.c | 2 +- + sound/soc/sof/mediatek/mt8186/Makefile | 2 +- + sound/soc/sof/mediatek/mt8186/mt8186.c | 2 +- + sound/soc/sof/mediatek/mt8195/Makefile | 2 +- + sound/soc/sof/mediatek/mt8195/mt8195.c | 2 +- + sound/soc/sof/nocodec.c | 2 +- + sound/soc/sof/ops.c | 2 +- + sound/soc/sof/ops.h | 2 +- + sound/soc/sof/pcm.c | 62 +- + sound/soc/sof/pm.c | 2 +- + sound/soc/sof/sof-acpi-dev.c | 2 +- + sound/soc/sof/sof-acpi-dev.h | 2 +- + sound/soc/sof/sof-audio.c | 31 +- + sound/soc/sof/sof-audio.h | 4 +- + sound/soc/sof/sof-client-ipc-flood-test.c | 19 +- + sound/soc/sof/sof-client-ipc-kernel-injector.c | 2 +- + sound/soc/sof/sof-client-ipc-msg-injector.c | 2 +- + sound/soc/sof/sof-client-probes-ipc3.c | 2 +- + sound/soc/sof/sof-client-probes-ipc4.c | 2 +- + sound/soc/sof/sof-client-probes.c | 2 +- + sound/soc/sof/sof-client.c | 2 +- + sound/soc/sof/sof-pci-dev.c | 2 +- + sound/soc/sof/sof-pci-dev.h | 2 +- + sound/soc/sof/sof-priv.h | 2 +- + sound/soc/sof/sof-utils.c | 2 +- + sound/soc/sof/sof-utils.h | 2 +- + sound/soc/sof/stream-ipc.c | 2 +- + sound/soc/sof/topology.c | 9 +- + sound/soc/sof/trace.c | 2 +- + sound/soc/sof/xtensa/Makefile | 2 +- + sound/soc/sof/xtensa/core.c | 2 +- + sound/soc/spear/Makefile | 6 +- + sound/soc/sprd/Makefile | 2 +- + sound/soc/sti/Makefile | 2 +- + sound/soc/stm/Makefile | 8 +- + sound/soc/sunxi/sun4i-i2s.c | 33 +- + sound/soc/sunxi/sun50i-codec-analog.c | 73 +- + sound/soc/sunxi/sun50i-dmic.c | 36 +- + sound/soc/sunxi/sun8i-codec.c | 346 ++- + sound/soc/tegra/Makefile | 46 +- + sound/soc/tegra/tegra_asoc_machine.c | 2 +- + sound/soc/tegra/tegra_pcm.c | 6 +- + sound/soc/ti/Makefile | 36 +- + sound/soc/ti/davinci-i2s.c | 278 +- + sound/soc/ti/omap-hdmi.c | 2 +- + sound/soc/uniphier/Makefile | 8 +- + sound/soc/uniphier/aio-dma.c | 2 +- + sound/soc/ux500/Makefile | 6 +- + sound/soc/ux500/ux500_msp_dai.c | 1 + + sound/soc/xilinx/Makefile | 6 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 2 + + sound/soc/xilinx/xlnx_i2s.c | 1 + + sound/soc/xtensa/Makefile | 2 +- + sound/sparc/Makefile | 6 +- + sound/spi/Makefile | 2 +- + sound/synth/Makefile | 2 +- + sound/synth/emux/Makefile | 2 +- + sound/synth/emux/emux.c | 6 +- + sound/synth/emux/emux_hwdep.c | 3 +- + sound/synth/emux/emux_oss.c | 3 +- + sound/synth/emux/emux_proc.c | 1 + + sound/synth/emux/emux_seq.c | 6 +- + sound/synth/emux/soundfont.c | 73 +- + sound/usb/6fire/Makefile | 2 +- + sound/usb/Makefile | 4 +- + sound/usb/card.c | 4 + + sound/usb/hiface/Makefile | 2 +- + sound/usb/misc/Makefile | 2 +- + sound/usb/mixer_quirks.c | 2 + + sound/usb/mixer_scarlett2.c | 2945 ++++++++++++++++---- + sound/usb/quirks-table.h | 38 +- + sound/usb/quirks.c | 74 +- + sound/usb/usx2y/Makefile | 4 +- + sound/virtio/Makefile | 2 +- + sound/x86/Makefile | 2 +- + sound/xen/Makefile | 2 +- + tools/sound/dapm-graph | 303 ++ + tools/testing/selftests/alsa/conf.c | 2 +- + 814 files changed, 21220 insertions(+), 12870 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/davinci-mcbsp.txt + create mode 100644 Documentation/devicetree/bindings/sound/davinci-mcbsp.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl,audmix.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,audmix.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl,esai.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,esai.yaml + create mode 100644 Documentation/devicetree/bindings/sound/fsl,imx-audio-spdif.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl,ssi.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl,ssi.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/fsl-asoc-card.txt + create mode 100644 Documentation/devicetree/bindings/sound/fsl-asoc-card.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/imx-audio-spdif.txt + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt2701-wm8960.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/mt2701-wm8960.txt + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8325.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-ac97.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-das.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra20-das.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra30-i2s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/rockchip,rk3308-codec.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/ti,pcm1681.txt + create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm1681.yaml + create mode 100644 Documentation/devicetree/bindings/sound/ti,pcm6240.yaml + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8776.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8974.txt + create mode 100644 Documentation/devicetree/bindings/sound/wlf,wm8974.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/wm8776.txt + create mode 100644 Documentation/sound/soc/dapm-graph.svg + rename sound/soc/intel/boards/sof_ssp_common.h => include/sound/soc-acpi-intel-ssp-common.h (66%) + create mode 100644 sound/soc/codecs/nau8325.c + create mode 100644 sound/soc/codecs/nau8325.h + create mode 100644 sound/soc/codecs/pcm6240.c + create mode 100644 sound/soc/codecs/pcm6240.h + create mode 100644 sound/soc/codecs/rk3308_codec.c + create mode 100644 sound/soc/codecs/rk3308_codec.h + create mode 100644 sound/soc/intel/boards/bridge_cs35l56.c + delete mode 100644 sound/soc/intel/boards/cml_rt1011_rt5682.c + delete mode 100644 sound/soc/intel/boards/glk_rt5682_max98357a.c + delete mode 100644 sound/soc/intel/boards/sof_sdw_rt715.c + delete mode 100644 sound/soc/intel/boards/sof_sdw_rt715_sdca.c + create mode 100644 sound/soc/intel/boards/sof_sdw_rt_dmic.c + delete mode 100644 sound/soc/intel/boards/sof_ssp_common.c + create mode 100644 sound/soc/intel/common/soc-acpi-intel-ssp-common.c + create mode 100644 sound/soc/mediatek/common/mtk-dai-adda-common.c + create mode 100644 sound/soc/mediatek/common/mtk-dai-adda-common.h + delete mode 100644 sound/soc/mediatek/mt8186/mt8186-mt6366-da7219-max98357.c + rename sound/soc/mediatek/mt8186/{mt8186-mt6366-rt1019-rt5682s.c => mt8186-mt6366.c} (72%) + create mode 100644 sound/soc/soc-card-test.c + create mode 100644 sound/soc/sof/intel/lnl.h + create mode 100644 sound/soc/sof/intel/tracepoints.c + create mode 100755 tools/sound/dapm-graph +Merging sound-asoc-fixes/for-linus (c277ee8f90ab Merge remote-tracking branch 'asoc/for-6.9' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/codecs/rt5645.c | 1 + + sound/soc/intel/boards/sof_sdw_rt_sdca_jack_common.c | 2 +- + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging regmap-fixes/for-linus (fec50db7033e Linux 6.9-rc3) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (2a4b49bb5812 regulator: core: fix debugfs creation regression) +$ 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 (ef13561d2b16 spi: microchip-core-qspi: fix setting spi bus clock rate) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (f3d049b35b01 PCI/ASPM: Restore parent state to parent, child state to child) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (ed30a4a51bb1 Linux 6.9-rc5) +$ 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 (8492bd91aa05 serial: sc16is7xx: fix bug in sc16is7xx_set_baud() when using prescaler) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Merge made by the 'ort' strategy. + drivers/tty/n_gsm.c | 140 +++++++++++++++++++++++---------- + drivers/tty/serial/8250/8250_bcm7271.c | 99 +++++++++++++---------- + drivers/tty/serial/8250/8250_mtk.c | 8 +- + drivers/tty/serial/sc16is7xx.c | 23 ++++-- + 4 files changed, 180 insertions(+), 90 deletions(-) +Merging usb.current/usb-linus (dd5a440a31fa Linux 6.9-rc7) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (dd5a440a31fa Linux 6.9-rc7) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (bf6e4ee5c436 phy: ti: tusb1210: Resolve charger-det crash if charger psy is unregistered) +$ 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 (39cd87c4eb2b Linux 6.9-rc2) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (bb198e29fe75 iio: dac: ad5592r: fix temperature channel scaling value) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/iio/dac/adi,ad3552r.yaml | 2 +- + drivers/iio/adc/ad9467.c | 4 ++-- + drivers/iio/dac/ad5592r-base.c | 2 +- + drivers/iio/pressure/bmp280-core.c | 10 +++++----- + 4 files changed, 9 insertions(+), 9 deletions(-) +Merging counter-current/counter-current (39cd87c4eb2b Linux 6.9-rc2) +$ 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 (008ab3c53bc4 speakup: Fix sizeof() vs ARRAY_SIZE() bug) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Merge made by the 'ort' strategy. + drivers/accessibility/speakup/main.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging soundwire-fixes/fixes (e67572cd2204 Linux 6.9-rc6) +$ 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 (a38297e3fb01 Linux 6.9) +$ 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 (0537c8eef4f6 Input: amimouse - mark driver struct with __refdata to prevent section mismatch) +$ 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 (13909a0c8897 crypto: atmel-sha204a - provide the otp content) +$ 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 (4ea95c04fa6b vfio: Drop vfio_file_iommu_group() stub to fudge around a KVM wart) +$ 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 (72d7cb5c190b selftests/harness: Prevent infinite loop due to Assert in FIXTURE_TEARDOWN) +$ 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 (e67572cd2204 Linux 6.9-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (6613476e225e Linux 6.8-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 (d2d73a6dd173 mtd: limit OTP NVMEM cell parse to non-NAND devices) +$ 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 (6613476e225e Linux 6.8-rc1) +$ 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 (d353c3c34af0 media: mediatek: vcodec: support 36 bits physical address) +$ git merge -m Merge branch 'fixes' of https://git.linuxtv.org/media_stage.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (4a6756f56bcf reset: Fix crash when freeing non-existent optional resets) +$ 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 (0bbac3facb5d Linux 6.9-rc4) +$ 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 (1fe5e0a31e62 ARM: dts: microchip: at91-sama7g54_curiosity: Replace regulator-suspend-voltage with the valid property) +$ 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 (0a9c28bec202 Merge tag 'kvm-s390-master-6.9-1' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/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 (175f2f5bcdfc KVM: s390: Check kvm pointer when testing KVM_CAP_S390_HPAGE_1M) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (26e8383b116d hwmon: (pmbus/ucd9000) Increase delay from 250 to 500us) +$ 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 (5d211c709059 cxl: Fix cxl_endpoint_get_perf_coordinate() support for RCH) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (cbf613cd4d3c Merge branch 'misc-6.9' 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/qgroup.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging vfs-fixes/fixes (aa23317d0268 qibfs: fix dentry leak) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (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 (a38297e3fb01 Linux 6.9) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-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 (de164a7f1924 nios2: Only use built-in devicetree blob if configured to do so) +$ 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 (4cece7649650 Linux 6.9-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 (961990efc608 scsi: sd: Only print updates to permanent stream count) +$ 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 (a38297e3fb01 Linux 6.9) +$ 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 (43b26bdd2ee5 drm/i915/bios: Fix parsing backlight BDB data) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (e027e72ecc16 mmc: moxart: fix handling of sgm->consumed, otherwise WARN_ON triggers) +$ 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 (4cece7649650 Linux 6.9-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 (0bbac3facb5d Linux 6.9-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 (fb836d64a2ea hv/vmbus_drv: rename hv_acpi_init() to vmbus_init()) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Auto-merging drivers/hv/vmbus_drv.c +Merge made by the 'ort' strategy. + arch/x86/hyperv/ivm.c | 14 ++++++++------ + drivers/hv/vmbus_drv.c | 6 +++--- + tools/hv/hv_kvp_daemon.c | 14 ++++++++++++++ + 3 files changed, 25 insertions(+), 9 deletions(-) +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 (6beb6bc5a81e Merge patch series "RISC-V: Test th.sxstatus.MAEE bit before enabling MAEE") +$ 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 (e0503d47e93d riscv: dts: starfive: visionfive 2: Remove non-existing I2S hardware) +$ 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 +Merge made by the 'ort' strategy. + .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 99 ---------------------- + 1 file changed, 99 deletions(-) +Merging riscv-soc-fixes/riscv-soc-fixes (3aa20d1f7bcb firmware: microchip: clarify that sizes and addresses are in hex) +$ 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 (54435d1f21b3 fpga: dfl-pci: add PCI subdevice ID for Intel D5005 card) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Merge made by the 'ort' strategy. +Merging spdx/spdx-linus (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (a38297e3fb01 Linux 6.9) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (7d045025a24b gpio: tangier: Use correct type for the IRQ chip data) +$ 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 (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3) +$ 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 (4cece7649650 Linux 6.9-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 erofs-fixes/fixes (7af2ae1b1531 erofs: reliably distinguish block based and fscache mode) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (cfedfb24c9dd kunit: configs: Enable CONFIG_DAMON_DBGFS_DEPRECATED for --alltests) +$ 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 (592447f6cb3c memblock tests: fix undefined reference to `BIT') +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (18180a4550d0 NFSD: Fix nfsd4_encode_fattr4() crasher) +$ 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 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 (1cebd7f74976 tools/include: Sync arm64 asm/cputype.h with the kernel sources) +$ 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 (1c5a1627f481 efi/unaccepted: touch soft lockup during memory accept) +$ 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 (1e0fb1136461 power: supply: mt6360_charger: Fix of_match for usb-otg-vbus regulator) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging 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 (e67572cd2204 Linux 6.9-rc6) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (a38297e3fb01 Linux 6.9) +$ 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 w1-fixes/fixes (4cece7649650 Linux 6.9-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 (670c900f6964 pmdomain: ti-sci: Fix duplicate PD referrals) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pmdomain/ti/ti_sci_pm_domains.c | 20 +++++++++++++++++++- + 1 file changed, 19 insertions(+), 1 deletion(-) +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 i2c-host-fixes/i2c/i2c-host-fixes (55750148e559 i2c: synquacer: Fix an error handling path in synquacer_i2c_probe()) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-cadence.c | 1 + + drivers/i2c/busses/i2c-synquacer.c | 18 ++++++------------ + 2 files changed, 7 insertions(+), 12 deletions(-) +Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging clk-fixes/clk-fixes (aacb99de1099 clk: samsung: Revert "clk: Use device_get_match_data()") +$ git merge -m Merge branch 'clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (aed9a1a4f710 drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations) +$ 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/gpu/drm/nouveau/nouveau_abi16.c | 3 +++ + drivers/gpu/drm/nouveau/nouveau_bo.c | 44 ++++++++++++++------------------- + include/uapi/drm/nouveau_drm.h | 7 ++++++ + 3 files changed, 29 insertions(+), 25 deletions(-) +Merging mm-stable/mm-stable (76edc534cc28 memcg, oom: cleanup unused memcg_oom_gfp_mask and memcg_oom_order) +$ 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 Documentation/driver-api/crypto/iaa/iaa-crypto.rst +Auto-merging MAINTAINERS +Auto-merging arch/alpha/lib/checksum.c +Auto-merging arch/alpha/lib/fpreg.c +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/mm/hugetlbpage.c +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/powerpc/kernel/iommu.c +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/s390/kernel/ipl.c +Auto-merging arch/s390/mm/hugetlbpage.c +Auto-merging arch/sh/Kconfig +Auto-merging arch/sh/mm/cache-sh4.c +Auto-merging arch/sh/mm/cache.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/mm/fault.c +Auto-merging arch/x86/mm/init.c +Auto-merging drivers/dax/device.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Auto-merging drivers/scsi/mpi3mr/mpi3mr_transport.c +Auto-merging fs/exec.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/userfaultfd.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/crypto/hash.h +Auto-merging include/crypto/internal/acompress.h +Auto-merging include/crypto/skcipher.h +Auto-merging include/linux/fortify-string.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/hid_bpf.h +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/pagemap.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/skmsg.h +Auto-merging include/linux/slab.h +Auto-merging include/linux/string.h +Auto-merging include/net/netlabel.h +Auto-merging init/Kconfig +Auto-merging io_uring/io_uring.c +CONFLICT (content): Merge conflict in io_uring/io_uring.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/events/core.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging lib/test_xarray.c +Auto-merging lib/xarray.c +Auto-merging mm/Kconfig +Auto-merging mm/filemap.c +Auto-merging mm/mmap.c +Auto-merging mm/nommu.c +Auto-merging mm/page-writeback.c +Auto-merging mm/page_owner.c +Auto-merging mm/readahead.c +Auto-merging mm/shmem.c +Auto-merging mm/slab.h +Auto-merging mm/slab_common.c +Auto-merging mm/slub.c +Auto-merging mm/userfaultfd.c +Auto-merging mm/vmalloc.c +Auto-merging rust/helpers.c +Auto-merging scripts/kernel-doc +Auto-merging sound/pci/hda/cs35l41_hda.c +Auto-merging tools/testing/selftests/lib.mk +Auto-merging tools/testing/selftests/mm/Makefile +Auto-merging tools/testing/selftests/mm/cow.c +Auto-merging tools/testing/selftests/mm/gup_longterm.c +Auto-merging tools/testing/selftests/mm/ksm_functional_tests.c +Auto-merging tools/testing/selftests/mm/soft-dirty.c +CONFLICT (content): Merge conflict in tools/testing/selftests/mm/soft-dirty.c +Auto-merging virt/kvm/kvm_main.c +Resolved 'io_uring/io_uring.c' using previous resolution. +Resolved 'tools/testing/selftests/mm/soft-dirty.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cdb6b5f59683] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-mm-damon | 6 +- + .../testing/sysfs-kernel-mm-transparent-hugepage | 18 + + Documentation/admin-guide/blockdev/zram.rst | 5 + + Documentation/admin-guide/cgroup-v1/memory.rst | 8 +- + Documentation/admin-guide/kernel-parameters.txt | 6 + + Documentation/admin-guide/mm/damon/usage.rst | 32 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 7 + + Documentation/admin-guide/mm/transhuge.rst | 35 +- + Documentation/admin-guide/mm/zswap.rst | 29 - + Documentation/admin-guide/sysctl/vm.rst | 16 + + Documentation/driver-api/crypto/iaa/iaa-crypto.rst | 2 - + Documentation/filesystems/api-summary.rst | 3 - + Documentation/filesystems/buffer.rst | 12 + + Documentation/filesystems/index.rst | 1 + + Documentation/filesystems/proc.rst | 29 + + Documentation/mm/allocation-profiling.rst | 100 +++ + Documentation/mm/arch_pgtable_helpers.rst | 6 +- + Documentation/mm/damon/design.rst | 42 +- + Documentation/mm/damon/maintainer-profile.rst | 13 +- + Documentation/mm/index.rst | 1 + + Documentation/mm/page_table_check.rst | 9 +- + Documentation/mm/transhuge.rst | 12 +- + Documentation/mm/vmemmap_dedup.rst | 22 +- + .../translations/zh_CN/core-api/cachetlb.rst | 2 +- + MAINTAINERS | 18 + + arch/alpha/kernel/osf_sys.c | 5 +- + arch/alpha/kernel/pci_iommu.c | 2 +- + arch/alpha/lib/checksum.c | 1 + + arch/alpha/lib/fpreg.c | 1 + + arch/arc/include/asm/mmu-arcv2.h | 2 + + arch/arc/mm/mmap.c | 4 +- + arch/arm/Kconfig | 2 +- + arch/arm/include/asm/hugetlb.h | 6 +- + arch/arm/include/asm/pgtable-2level.h | 5 +- + arch/arm/include/asm/pgtable-3level-hwdef.h | 1 + + arch/arm/include/asm/pgtable-3level.h | 5 +- + arch/arm/kernel/irq.c | 1 + + arch/arm/kernel/traps.c | 1 + + arch/arm/lib/uaccess_with_memcpy.c | 4 +- + arch/arm/mm/Makefile | 1 - + arch/arm/mm/fault.c | 32 +- + arch/arm/mm/hugetlbpage.c | 34 - + arch/arm/mm/mmap.c | 5 +- + arch/arm64/Kconfig | 2 +- + arch/arm64/include/asm/hugetlb.h | 6 +- + arch/arm64/include/asm/pgtable.h | 80 +- + arch/arm64/kernel/efi.c | 1 + + arch/arm64/mm/contpte.c | 29 + + arch/arm64/mm/fault.c | 56 +- + arch/arm64/mm/hugetlbpage.c | 18 +- + arch/arm64/mm/mteswap.c | 45 ++ + arch/csky/abiv1/mmap.c | 12 +- + arch/loongarch/Kconfig | 2 +- + arch/loongarch/include/asm/kfence.h | 1 + + arch/loongarch/mm/hugetlbpage.c | 12 +- + arch/loongarch/mm/mmap.c | 3 +- + arch/mips/Kconfig | 2 +- + arch/mips/include/asm/pgtable-32.h | 2 +- + arch/mips/include/asm/pgtable-64.h | 2 +- + arch/mips/jazz/jazzdma.c | 2 +- + arch/mips/mm/hugetlbpage.c | 10 - + arch/mips/mm/mmap.c | 3 +- + arch/mips/mm/tlb-r4k.c | 2 +- + arch/parisc/kernel/sys_parisc.c | 6 +- + arch/parisc/mm/hugetlbpage.c | 11 - + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/book3s/64/pgtable-4k.h | 20 - + arch/powerpc/include/asm/book3s/64/pgtable-64k.h | 25 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 27 +- + arch/powerpc/include/asm/mmu.h | 4 - + arch/powerpc/include/asm/nohash/pgtable.h | 10 - + arch/powerpc/kernel/dma-iommu.c | 2 +- + arch/powerpc/kernel/fadump.c | 5 - + arch/powerpc/kernel/iommu.c | 1 + + arch/powerpc/mm/book3s64/pgtable.c | 1 + + arch/powerpc/mm/book3s64/slice.c | 20 +- + arch/powerpc/mm/fault.c | 33 +- + arch/powerpc/mm/mem.c | 1 + + arch/powerpc/mm/pgtable_64.c | 6 +- + arch/powerpc/platforms/ps3/system-bus.c | 4 +- + arch/powerpc/platforms/pseries/vio.c | 2 +- + arch/riscv/Kconfig | 2 +- + arch/riscv/include/asm/hugetlb.h | 6 +- + arch/riscv/include/asm/pgtable.h | 1 + + arch/riscv/kernel/elf_kexec.c | 1 + + arch/riscv/kernel/probes/kprobes.c | 1 + + arch/riscv/mm/fault.c | 5 +- + arch/riscv/mm/hugetlbpage.c | 10 - + arch/s390/Kconfig | 2 +- + arch/s390/include/asm/hugetlb.h | 6 +- + arch/s390/include/asm/pgtable.h | 5 +- + arch/s390/kernel/cert_store.c | 1 + + arch/s390/kernel/ipl.c | 1 + + arch/s390/mm/fault.c | 3 +- + arch/s390/mm/hugetlbpage.c | 19 +- + arch/s390/mm/mmap.c | 9 +- + arch/s390/pci/pci_mmio.c | 4 +- + arch/sh/Kconfig | 2 +- + arch/sh/include/asm/hugetlb.h | 6 +- + arch/sh/mm/cache-sh4.c | 5 +- + arch/sh/mm/cache.c | 2 +- + arch/sh/mm/hugetlbpage.c | 10 - + arch/sh/mm/mmap.c | 5 +- + arch/sparc/include/asm/pgtable_64.h | 3 +- + arch/sparc/kernel/sys_sparc_32.c | 3 +- + arch/sparc/kernel/sys_sparc_64.c | 20 +- + arch/sparc/mm/hugetlbpage.c | 21 +- + arch/sparc/mm/tlb.c | 7 +- + arch/um/include/shared/um_malloc.h | 3 +- + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/io.h | 1 + + arch/x86/include/asm/pgtable.h | 20 +- + arch/x86/include/asm/pgtable_64.h | 1 + + arch/x86/kernel/amd_gart_64.c | 2 +- + arch/x86/kernel/cpu/sgx/driver.c | 2 +- + arch/x86/kernel/cpu/sgx/main.c | 1 + + arch/x86/kernel/irq_64.c | 1 + + arch/x86/kernel/setup.c | 2 - + arch/x86/kernel/sys_x86_64.c | 42 +- + arch/x86/mm/fault.c | 24 +- + arch/x86/mm/hugetlbpage.c | 35 +- + arch/x86/mm/init.c | 47 -- + arch/x86/mm/mmap.c | 4 +- + arch/x86/mm/numa_32.c | 1 + + arch/x86/mm/pat/memtype.c | 26 +- + arch/x86/mm/pgtable.c | 6 +- + arch/xtensa/mm/cache.c | 6 +- + arch/xtensa/mm/tlb.c | 11 +- + drivers/accel/ivpu/ivpu_mmu_context.c | 1 + + drivers/block/zram/zram_drv.c | 31 +- + drivers/char/mem.c | 2 +- + drivers/dax/bus.c | 66 +- + drivers/dax/device.c | 6 +- + drivers/dax/kmem.c | 30 +- + drivers/gpu/drm/gma500/mmu.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 1 + + drivers/gpu/drm/i915/gem/selftests/mock_dmabuf.c | 1 + + drivers/gpu/drm/i915/gt/shmem_utils.c | 1 + + drivers/gpu/drm/i915/gvt/firmware.c | 1 + + drivers/gpu/drm/i915/gvt/gtt.c | 1 + + drivers/gpu/drm/i915/gvt/handlers.c | 1 + + drivers/gpu/drm/i915/gvt/mmio.c | 1 + + drivers/gpu/drm/i915/gvt/vgpu.c | 1 + + drivers/gpu/drm/i915/intel_gvt.c | 1 + + drivers/gpu/drm/imagination/pvr_vm_mips.c | 1 + + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 1 + + drivers/gpu/drm/omapdrm/omap_gem.c | 1 + + drivers/gpu/drm/v3d/v3d_bo.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_binding.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_devcaps.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_ioctl.c | 1 + + drivers/gpu/drm/xen/xen_drm_front_gem.c | 1 + + drivers/hwtracing/coresight/coresight-trbe.c | 1 + + drivers/iommu/amd/amd_iommu.h | 5 +- + drivers/iommu/dma-iommu.c | 2 +- + .../ethernet/marvell/octeon_ep/octep_pfvf_mbox.c | 1 + + .../ethernet/marvell/octeon_ep_vf/octep_vf_mbox.c | 1 + + drivers/net/ethernet/microsoft/mana/hw_channel.c | 1 + + drivers/parisc/ccio-dma.c | 2 +- + drivers/parisc/sba_iommu.c | 2 +- + drivers/platform/x86/uv_sysfs.c | 1 + + drivers/scsi/mpi3mr/mpi3mr_transport.c | 2 + + drivers/staging/media/atomisp/pci/hmm/hmm.c | 2 +- + drivers/vfio/pci/pds/dirty.c | 1 + + drivers/vfio/vfio_iommu_type1.c | 4 +- + drivers/virt/acrn/mm.c | 61 +- + drivers/virtio/virtio_mem.c | 1 + + drivers/xen/grant-dma-ops.c | 2 +- + drivers/xen/swiotlb-xen.c | 2 +- + fs/buffer.c | 153 ++-- + fs/crypto/inline_crypt.c | 6 +- + fs/dax.c | 14 +- + fs/exec.c | 11 + + fs/f2fs/data.c | 5 +- + fs/hugetlbfs/inode.c | 11 +- + fs/nfs/iostat.h | 5 +- + fs/proc/inode.c | 10 +- + fs/proc/meminfo.c | 3 +- + fs/proc/page.c | 73 +- + fs/proc/task_mmu.c | 93 +-- + fs/ramfs/file-mmu.c | 2 +- + fs/userfaultfd.c | 5 +- + include/acpi/platform/aclinuxex.h | 19 +- + include/asm-generic/codetag.lds.h | 14 + + include/asm-generic/io.h | 2 +- + include/asm-generic/pgalloc.h | 35 +- + include/asm-generic/vmlinux.lds.h | 3 + + include/crypto/hash.h | 7 +- + include/crypto/internal/acompress.h | 5 +- + include/crypto/skcipher.h | 7 +- + include/linux/alloc_tag.h | 216 ++++++ + include/linux/bpf.h | 33 +- + include/linux/bpfptr.h | 5 +- + include/linux/buffer_head.h | 48 +- + include/linux/codetag.h | 81 ++ + include/linux/damon.h | 2 + + include/linux/dma-fence-chain.h | 6 +- + include/linux/dma-map-ops.h | 2 +- + include/linux/fortify-string.h | 5 +- + include/linux/fs.h | 6 +- + include/linux/gfp.h | 130 ++-- + include/linux/gfp_types.h | 11 + + include/linux/hid_bpf.h | 6 +- + include/linux/huge_mm.h | 135 ++-- + include/linux/hugetlb.h | 95 +-- + include/linux/io.h | 1 + + include/linux/jbd2.h | 12 +- + include/linux/ksm.h | 35 +- + include/linux/memcontrol.h | 151 ++-- + include/linux/memory-tiers.h | 13 + + include/linux/mempolicy.h | 5 +- + include/linux/mempool.h | 73 +- + include/linux/mm.h | 219 ++++-- + include/linux/mm_types.h | 35 +- + include/linux/mmap_lock.h | 10 +- + include/linux/page-flags.h | 64 +- + include/linux/page-isolation.h | 5 +- + include/linux/page_ext.h | 5 +- + include/linux/page_idle.h | 68 +- + include/linux/page_ref.h | 15 +- + include/linux/pageblock-flags.h | 8 +- + include/linux/pagemap.h | 22 +- + include/linux/pds/pds_common.h | 2 + + include/linux/percpu.h | 30 +- + include/linux/pgalloc_tag.h | 132 ++++ + include/linux/pgtable.h | 119 ++- + include/linux/ptr_ring.h | 28 +- + include/linux/rhashtable-types.h | 11 +- + include/linux/rmap.h | 50 +- + include/linux/sched.h | 26 +- + include/linux/sched/coredump.h | 5 +- + include/linux/sched/mm.h | 22 + + include/linux/secretmem.h | 21 +- + include/linux/skb_array.h | 19 +- + include/linux/skbuff.h | 20 +- + include/linux/skmsg.h | 8 +- + include/linux/slab.h | 186 ++--- + include/linux/sockptr.h | 10 +- + include/linux/string.h | 4 +- + include/linux/swap.h | 35 +- + include/linux/vmalloc.h | 62 +- + include/linux/vmstat.h | 8 - + include/linux/writeback.h | 1 + + include/linux/xarray.h | 14 +- + include/linux/zpool.h | 4 +- + include/linux/zswap.h | 2 +- + include/net/netlabel.h | 16 +- + include/net/netlink.h | 5 +- + include/net/request_sock.h | 5 +- + include/net/tcx.h | 5 +- + include/rdma/rdmavt_qp.h | 1 + + include/trace/events/fs_dax.h | 16 +- + include/trace/events/huge_memory.h | 12 +- + include/trace/events/mmflags.h | 2 +- + include/trace/events/page_ref.h | 4 +- + init/Kconfig | 4 + + kernel/bpf/arena.c | 2 +- + kernel/bpf/memalloc.c | 6 +- + kernel/bpf/syscall.c | 2 +- + kernel/dma/mapping.c | 4 +- + kernel/events/core.c | 4 +- + kernel/fork.c | 2 +- + kernel/kallsyms_selftest.c | 2 +- + kernel/module/main.c | 29 +- + kernel/vmcore_info.c | 3 +- + lib/Kconfig.debug | 31 + + lib/Makefile | 3 + + lib/alloc_tag.c | 246 ++++++ + lib/codetag.c | 283 +++++++ + lib/rhashtable.c | 22 +- + lib/test_hmm.c | 8 +- + lib/test_xarray.c | 93 +++ + lib/xarray.c | 56 +- + mm/Kconfig | 8 +- + mm/Makefile | 1 + + mm/backing-dev.c | 210 +++-- + mm/cma.c | 4 - + mm/compaction.c | 8 +- + mm/damon/core.c | 10 +- + mm/damon/paddr.c | 84 +- + mm/damon/sysfs-schemes.c | 1 + + mm/debug.c | 25 +- + mm/debug_page_alloc.c | 12 +- + mm/debug_vm_pgtable.c | 2 + + mm/filemap.c | 115 ++- + mm/folio-compat.c | 6 - + mm/gup.c | 816 +++++++++++++------- + mm/hmm.c | 9 +- + mm/huge_memory.c | 428 +++++------ + mm/hugetlb.c | 418 +++++----- + mm/hugetlb_cgroup.c | 2 +- + mm/hugetlb_vmemmap.c | 1 - + mm/hwpoison-inject.c | 11 +- + mm/internal.h | 205 +++-- + mm/kasan/hw_tags.c | 1 + + mm/kfence/core.c | 14 +- + mm/kfence/kfence.h | 4 +- + mm/khugepaged.c | 335 ++++---- + mm/kmemleak.c | 6 +- + mm/ksm.c | 291 +++---- + mm/madvise.c | 226 +++--- + mm/memcontrol.c | 490 ++++++++---- + mm/memory-failure.c | 179 +++-- + mm/memory-tiers.c | 123 ++- + mm/memory.c | 305 ++++---- + mm/memory_hotplug.c | 5 +- + mm/mempolicy.c | 104 +-- + mm/mempool.c | 36 +- + mm/memremap.c | 40 +- + mm/migrate.c | 43 +- + mm/migrate_device.c | 41 +- + mm/mlock.c | 2 +- + mm/mm_init.c | 216 +++--- + mm/mmap.c | 233 +++--- + mm/mprotect.c | 3 +- + mm/mremap.c | 2 +- + mm/nommu.c | 77 +- + mm/oom_kill.c | 1 - + mm/page-writeback.c | 80 +- + mm/page_alloc.c | 844 +++++++++++---------- + mm/page_ext.c | 15 +- + mm/page_io.c | 3 +- + mm/page_isolation.c | 121 ++- + mm/page_owner.c | 2 +- + mm/page_table_check.c | 30 + + mm/page_vma_mapped.c | 22 +- + mm/percpu-internal.h | 26 +- + mm/percpu-vm.c | 4 +- + mm/percpu.c | 118 ++- + mm/pgtable-generic.c | 2 + + mm/readahead.c | 8 +- + mm/rmap.c | 111 +-- + mm/shmem.c | 13 +- + mm/show_mem.c | 26 + + mm/slab.h | 60 +- + mm/slab_common.c | 6 +- + mm/slub.c | 496 +++++++----- + mm/sparse.c | 28 +- + mm/swap.c | 66 +- + mm/swap_slots.c | 8 +- + mm/swap_state.c | 10 +- + mm/swapfile.c | 372 +++++---- + mm/truncate.c | 36 +- + mm/userfaultfd.c | 31 +- + mm/util.c | 40 +- + mm/vmalloc.c | 138 ++-- + mm/vmscan.c | 52 +- + mm/workingset.c | 7 +- + mm/z3fold.c | 10 +- + mm/zbud.c | 10 +- + mm/zpool.c | 10 +- + mm/zsmalloc.c | 6 +- + mm/zswap.c | 389 ++++------ + net/sunrpc/auth_gss/auth_gss_internal.h | 6 +- + rust/helpers.c | 8 + + scripts/kallsyms.c | 13 + + scripts/kernel-doc | 1 + + scripts/module.lds.S | 7 + + security/Kconfig.hardening | 15 + + sound/pci/hda/cs35l41_hda.c | 1 + + tools/cgroup/memcg_slabinfo.py | 5 +- + tools/include/uapi/linux/memfd.h | 39 + + tools/include/uapi/linux/userfaultfd.h | 386 ++++++++++ + tools/testing/selftests/cgroup/test_zswap.c | 132 +++- + tools/testing/selftests/damon/Makefile | 13 +- + tools/testing/selftests/damon/_damon_sysfs.py | 179 ++++- + tools/testing/selftests/damon/damos_quota_goal.py | 77 ++ + tools/testing/selftests/lib.mk | 9 + + tools/testing/selftests/memfd/fuse_test.c | 2 +- + tools/testing/selftests/memfd/memfd_test.c | 2 +- + tools/testing/selftests/mm/Makefile | 2 +- + tools/testing/selftests/mm/cow.c | 106 ++- + tools/testing/selftests/mm/gup_longterm.c | 16 +- + tools/testing/selftests/mm/hugetlb_madv_vs_map.c | 16 +- + tools/testing/selftests/mm/ksm_functional_tests.c | 135 +++- + tools/testing/selftests/mm/memfd_secret.c | 51 +- + tools/testing/selftests/mm/mlock2-tests.c | 15 +- + tools/testing/selftests/mm/mremap_test.c | 202 +++-- + tools/testing/selftests/mm/run_vmtests.sh | 13 +- + tools/testing/selftests/mm/soft-dirty.c | 2 +- + tools/testing/selftests/mm/virtual_address_range.c | 78 +- + tools/testing/selftests/x86/test_shadow_stack.c | 67 +- + tools/writeback/wb_monitor.py | 172 +++++ + virt/kvm/kvm_main.c | 4 +- + 387 files changed, 9728 insertions(+), 5750 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-mm-transparent-hugepage + create mode 100644 Documentation/filesystems/buffer.rst + create mode 100644 Documentation/mm/allocation-profiling.rst + delete mode 100644 arch/arm/mm/hugetlbpage.c + create mode 100644 include/asm-generic/codetag.lds.h + create mode 100644 include/linux/alloc_tag.h + create mode 100644 include/linux/codetag.h + create mode 100644 include/linux/pgalloc_tag.h + create mode 100644 lib/alloc_tag.c + create mode 100644 lib/codetag.c + create mode 100644 tools/include/uapi/linux/memfd.h + create mode 100644 tools/include/uapi/linux/userfaultfd.h + create mode 100644 tools/testing/selftests/damon/damos_quota_goal.py + create mode 100644 tools/writeback/wb_monitor.py +$ git am -3 ../patches/0001-fix-up-for-mm-switch-mm-get_unmapped_area-to-a-flag.patch +Applying: fix up for "mm: switch mm->get_unmapped_area() to a flag" +$ git reset HEAD^ +Unstaged changes after reset: +M io_uring/memmap.c +$ git add -A . +$ git commit -v -a --amend +[master f080a7fc4d33] Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Wed May 15 08:59:56 2024 +1000 +Merging mm-nonmm-stable/mm-nonmm-stable (5cbcb62dddf5 fs/proc: fix softlockup in __read_vmcore) +$ 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging fs/binfmt_elf.c +Auto-merging fs/nilfs2/dir.c +Auto-merging include/linux/cpumask.h +Auto-merging init/main.c +Auto-merging kernel/watchdog.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kdump/kdump.rst | 8 +- + Documentation/admin-guide/kernel-parameters.txt | 5 +- + Documentation/dev-tools/checkpatch.rst | 14 + + Documentation/process/coding-style.rst | 23 ++ + arch/x86/lib/copy_mc.c | 21 +- + block/partitions/ldm.c | 6 +- + drivers/hwtracing/intel_th/core.c | 6 +- + drivers/media/cec/platform/sti/stih-cec.c | 1 + + drivers/media/rc/mtk-cir.c | 1 + + drivers/media/rc/serial_ir.c | 1 + + drivers/media/rc/st_rc.c | 1 + + drivers/media/rc/sunxi-cir.c | 1 + + drivers/mux/core.c | 4 +- + drivers/pps/clients/pps_parport.c | 6 +- + fs/binfmt_elf.c | 2 +- + fs/fat/dir.c | 12 + + fs/nilfs2/btree.c | 23 +- + fs/nilfs2/dir.c | 1 - + fs/nilfs2/gcinode.c | 1 + + fs/nilfs2/nilfs.h | 4 +- + fs/nilfs2/recovery.c | 5 +- + fs/nilfs2/segment.c | 8 +- + fs/nilfs2/super.c | 386 +++++++++++------------- + fs/nilfs2/the_nilfs.c | 25 +- + fs/nilfs2/the_nilfs.h | 6 +- + fs/ocfs2/aops.c | 2 - + fs/ocfs2/dlm/dlmdomain.c | 12 +- + fs/ocfs2/export.c | 12 +- + fs/ocfs2/file.c | 2 + + fs/ocfs2/inode.c | 2 + + fs/ocfs2/ioctl.c | 1 + + fs/ocfs2/localalloc.c | 34 +-- + fs/ocfs2/move_extents.c | 2 +- + fs/ocfs2/namei.c | 4 +- + fs/ocfs2/ocfs2_fs.h | 3 +- + fs/ocfs2/refcounttree.c | 2 +- + fs/ocfs2/reservations.c | 2 +- + fs/ocfs2/resize.c | 8 + + fs/ocfs2/suballoc.c | 117 +++++-- + fs/ocfs2/suballoc.h | 6 +- + fs/proc/vmcore.c | 7 +- + fs/squashfs/file.c | 6 +- + fs/squashfs/file_direct.c | 3 +- + fs/squashfs/namei.c | 14 +- + fs/squashfs/symlink.c | 35 +-- + include/linux/cpumask.h | 5 - + include/linux/instrumented.h | 35 +++ + include/linux/kexec.h | 6 +- + include/linux/kfifo.h | 9 +- + include/linux/kmsan-checks.h | 15 + + include/linux/nmi.h | 2 + + include/trace/events/nilfs2.h | 6 +- + init/do_mounts_initrd.c | 1 - + init/main.c | 26 +- + ipc/ipc_sysctl.c | 1 - + ipc/mq_sysctl.c | 1 - + kernel/crash_core.c | 2 + + kernel/crash_reserve.c | 4 +- + kernel/kcov.c | 3 +- + kernel/regset.c | 6 +- + kernel/trace/blktrace.c | 3 +- + kernel/watchdog.c | 9 + + kernel/watchdog_perf.c | 47 ++- + lib/Kconfig.kgdb | 1 + + lib/build_OID_registry | 5 +- + lib/devres.c | 26 +- + lib/kfifo.c | 10 +- + lib/test_hexdump.c | 2 +- + mm/kmsan/hooks.c | 11 + + samples/kfifo/dma-example.c | 3 +- + scripts/checkpatch.pl | 6 + + scripts/gdb/linux/cpus.py | 11 +- + scripts/gdb/linux/tasks.py | 2 +- + scripts/gdb/linux/utils.py | 2 +- + tools/include/linux/rbtree_augmented.h | 4 +- + tools/lib/rbtree.c | 2 +- + tools/testing/selftests/kcmp/kcmp_test.c | 2 +- + 77 files changed, 683 insertions(+), 430 deletions(-) +Merging mm/mm-everything (529891be5997 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 Documentation/admin-guide/cgroup-v2.rst +Auto-merging Makefile +Auto-merging arch/Kconfig +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/Makefile +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/Makefile +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging mm/filemap.c +Auto-merging mm/mmap.c +Auto-merging tools/testing/selftests/kselftest_harness.h +CONFLICT (content): Merge conflict in tools/testing/selftests/kselftest_harness.h +Resolved 'tools/testing/selftests/kselftest_harness.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2ec885850321] 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/core-api/floating-point.rst | 78 + + Documentation/core-api/index.rst | 1 + + Documentation/filesystems/proc.rst | 5 +- + Documentation/userspace-api/index.rst | 1 + + Documentation/userspace-api/mseal.rst | 199 +++ + Makefile | 5 + + arch/Kconfig | 6 + + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/Kconfig | 1 + + arch/arm/Makefile | 7 + + arch/arm/include/asm/fpu.h | 15 + + arch/arm/lib/Makefile | 3 +- + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/Kconfig | 1 + + arch/arm64/Makefile | 9 +- + arch/arm64/include/asm/fpu.h | 15 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/arm64/lib/Makefile | 6 +- + arch/loongarch/Kconfig | 1 + + arch/loongarch/Makefile | 5 +- + arch/loongarch/include/asm/fpu.h | 1 + + 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/Kconfig | 1 + + arch/powerpc/Makefile | 5 +- + arch/powerpc/include/asm/fpu.h | 28 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/riscv/Kconfig | 1 + + arch/riscv/Makefile | 3 + + arch/riscv/include/asm/fpu.h | 16 + + arch/riscv/kernel/Makefile | 1 + + arch/riscv/kernel/kernel_mode_fpu.c | 28 + + 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/Makefile | 20 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/x86/include/asm/fpu.h | 13 + + arch/x86/include/asm/fpu/types.h | 6 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + drivers/gpu/drm/amd/display/Kconfig | 2 +- + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 35 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 36 +- + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 36 +- + fs/nilfs2/recovery.c | 4 + + include/linux/fpu.h | 12 + + include/linux/gfp.h | 25 + + include/linux/swap.h | 5 +- + include/linux/syscalls.h | 1 + + include/uapi/asm-generic/unistd.h | 5 +- + kernel/sys_ni.c | 1 + + lib/Kconfig.debug | 2 +- + lib/Makefile | 26 +- + lib/alloc_tag.c | 47 +- + lib/raid6/Makefile | 33 +- + lib/stackdepot.c | 11 +- + lib/test_fpu.h | 8 + + lib/{test_fpu.c => test_fpu_glue.c} | 37 +- + lib/test_fpu_impl.c | 37 + + mm/Makefile | 4 + + mm/filemap.c | 3 +- + mm/huge_memory.c | 2 + + mm/internal.h | 37 + + mm/kmemleak.c | 12 +- + mm/madvise.c | 12 + + mm/memcontrol.c | 64 +- + mm/mmap.c | 31 +- + mm/mprotect.c | 10 + + mm/mremap.c | 31 + + mm/mseal.c | 307 ++++ + mm/page_alloc.c | 44 +- + mm/page_owner.c | 7 +- + mm/vmscan.c | 37 +- + scripts/Makefile.extrawarn | 29 +- + tools/testing/selftests/kselftest_harness.h | 11 +- + tools/testing/selftests/mm/.gitignore | 2 + + tools/testing/selftests/mm/Makefile | 2 + + tools/testing/selftests/mm/mdwe_test.c | 1 - + tools/testing/selftests/mm/mseal_test.c | 1894 ++++++++++++++++++++++++ + tools/testing/selftests/mm/seal_elf.c | 179 +++ + 88 files changed, 3303 insertions(+), 298 deletions(-) + create mode 100644 Documentation/core-api/floating-point.rst + create mode 100644 Documentation/userspace-api/mseal.rst + create mode 100644 arch/arm/include/asm/fpu.h + create mode 100644 arch/arm64/include/asm/fpu.h + create mode 100644 arch/powerpc/include/asm/fpu.h + create mode 100644 arch/riscv/include/asm/fpu.h + create mode 100644 arch/riscv/kernel/kernel_mode_fpu.c + create mode 100644 arch/x86/include/asm/fpu.h + create mode 100644 include/linux/fpu.h + create mode 100644 lib/test_fpu.h + rename lib/{test_fpu.c => test_fpu_glue.c} (71%) + create mode 100644 lib/test_fpu_impl.c + create mode 100644 mm/mseal.c + create mode 100644 tools/testing/selftests/mm/mseal_test.c + create mode 100644 tools/testing/selftests/mm/seal_elf.c +Merging kbuild/for-next (bfb57ef0544a rapidio: remove choice for enumeration) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Documentation/Makefile +Auto-merging Makefile +Auto-merging arch/sh/Kconfig +Auto-merging arch/sh/boot/compressed/Makefile +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/purgatory/Makefile +Auto-merging drivers/hid/intel-ish-hid/Makefile +Auto-merging drivers/misc/lkdtm/Makefile +CONFLICT (content): Merge conflict in drivers/misc/lkdtm/Makefile +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging lib/Makefile +Auto-merging lib/raid6/Makefile +Auto-merging rust/Makefile +CONFLICT (content): Merge conflict in rust/Makefile +Auto-merging scripts/Makefile.build +Auto-merging scripts/Makefile.lib +Auto-merging scripts/module.lds.S +Resolved 'drivers/misc/lkdtm/Makefile' using previous resolution. +Resolved 'rust/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ad37125905c9] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git +$ git diff -M --stat --summary HEAD^.. + Documentation/Makefile | 8 +- + Documentation/devicetree/bindings/Makefile | 36 ++++--- + Documentation/kbuild/kconfig-language.rst | 3 - + Documentation/kbuild/makefiles.rst | 12 +-- + Makefile | 44 +++++--- + arch/arc/boot/dts/Makefile | 3 +- + arch/arm/Kbuild | 2 +- + arch/arm/boot/Makefile | 3 +- + arch/arm/boot/bootp/Makefile | 1 - + arch/arm/boot/compressed/Makefile | 7 -- + arch/arm/mach-s3c/Makefile | 2 +- + arch/arm/plat-orion/Makefile | 2 +- + arch/arm/tools/Makefile | 2 +- + arch/arm/vdso/Makefile | 9 -- + arch/arm64/kernel/pi/Makefile | 6 -- + arch/arm64/kernel/vdso/Makefile | 10 +- + arch/arm64/kernel/vdso32/Makefile | 2 +- + arch/arm64/kvm/Makefile | 4 +- + arch/arm64/kvm/hyp/Makefile | 2 +- + arch/arm64/kvm/hyp/nvhe/Makefile | 13 --- + arch/csky/boot/dts/Makefile | 4 +- + arch/csky/kernel/vdso/Makefile | 8 +- + arch/loongarch/kvm/Makefile | 2 +- + arch/loongarch/vdso/Makefile | 9 +- + arch/mips/boot/compressed/Makefile | 6 -- + arch/mips/kernel/syscalls/Makefile | 2 +- + arch/mips/vdso/Makefile | 11 +- + arch/nios2/boot/dts/Makefile | 3 +- + arch/parisc/boot/compressed/Makefile | 4 - + arch/parisc/kernel/vdso32/Makefile | 9 +- + arch/parisc/kernel/vdso64/Makefile | 4 +- + arch/powerpc/boot/Makefile | 6 +- + arch/powerpc/boot/dts/Makefile | 3 +- + arch/powerpc/boot/dts/fsl/Makefile | 3 +- + arch/powerpc/kernel/vdso/Makefile | 16 +-- + arch/powerpc/purgatory/Makefile | 3 - + arch/riscv/boot/Makefile | 2 - + arch/riscv/kernel/compat_vdso/Makefile | 8 +- + arch/riscv/kernel/pi/Makefile | 6 -- + arch/riscv/kernel/vdso/Makefile | 8 +- + arch/riscv/kvm/Makefile | 2 +- + arch/riscv/purgatory/Makefile | 8 -- + arch/s390/kernel/syscalls/Makefile | 4 +- + arch/s390/kernel/vdso32/Makefile | 12 +-- + arch/s390/kernel/vdso64/Makefile | 12 +-- + arch/s390/purgatory/Makefile | 8 -- + arch/sh/Kconfig | 6 +- + arch/sh/boot/compressed/Makefile | 3 - + arch/sh/configs/apsh4a3a_defconfig | 1 + + arch/sh/configs/apsh4ad0a_defconfig | 1 + + arch/sh/configs/edosk7705_defconfig | 1 + + arch/sh/configs/hp6xx_defconfig | 1 + + arch/sh/configs/landisk_defconfig | 1 + + arch/sh/configs/magicpanelr2_defconfig | 1 + + arch/sh/configs/rsk7264_defconfig | 1 + + arch/sh/configs/rsk7269_defconfig | 1 + + arch/sh/configs/se7619_defconfig | 1 + + arch/sh/configs/se7705_defconfig | 1 + + arch/sh/configs/se7722_defconfig | 1 + + arch/sh/configs/se7750_defconfig | 1 + + arch/sh/configs/secureedge5410_defconfig | 1 + + arch/sh/configs/sh7710voipgw_defconfig | 1 + + arch/sh/configs/sh7724_generic_defconfig | 1 + + arch/sh/configs/sh7770_generic_defconfig | 1 + + arch/sh/configs/sh7785lcr_32bit_defconfig | 1 + + arch/sh/configs/sh7785lcr_defconfig | 1 + + arch/sh/configs/urquell_defconfig | 1 + + arch/sh/kernel/vsyscall/Makefile | 4 +- + arch/sparc/vdso/Makefile | 4 +- + arch/um/kernel/Makefile | 2 +- + arch/x86/boot/Makefile | 17 +-- + arch/x86/boot/compressed/Makefile | 11 -- + arch/x86/entry/vdso/Makefile | 28 +---- + arch/x86/kernel/Makefile | 2 +- + arch/x86/kernel/cpu/Makefile | 2 +- + arch/x86/mm/Makefile | 2 +- + arch/x86/purgatory/Makefile | 9 -- + arch/x86/realmode/rm/Makefile | 11 -- + arch/x86/um/vdso/Makefile | 9 +- + arch/xtensa/boot/dts/Makefile | 3 +- + certs/Makefile | 4 +- + drivers/Makefile | 5 - + drivers/crypto/intel/qat/qat_420xx/Makefile | 2 +- + drivers/crypto/intel/qat/qat_4xxx/Makefile | 2 +- + drivers/crypto/intel/qat/qat_c3xxx/Makefile | 2 +- + drivers/crypto/intel/qat/qat_c3xxxvf/Makefile | 2 +- + drivers/crypto/intel/qat/qat_c62x/Makefile | 2 +- + drivers/crypto/intel/qat/qat_c62xvf/Makefile | 2 +- + drivers/crypto/intel/qat/qat_dh895xcc/Makefile | 2 +- + drivers/crypto/intel/qat/qat_dh895xccvf/Makefile | 2 +- + drivers/firmware/efi/libstub/Makefile | 11 -- + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/arm/display/komeda/Makefile | 4 +- + drivers/gpu/drm/i915/Makefile | 4 +- + drivers/gpu/drm/imagination/Makefile | 2 +- + drivers/gpu/drm/msm/Makefile | 8 +- + drivers/gpu/drm/nouveau/Kbuild | 10 +- + drivers/gpu/drm/xe/Makefile | 10 +- + drivers/hid/amd-sfh-hid/Makefile | 2 +- + drivers/hid/intel-ish-hid/Makefile | 2 +- + drivers/md/dm-vdo/Makefile | 2 +- + drivers/misc/lkdtm/Makefile | 4 - + drivers/net/ethernet/aquantia/atlantic/Makefile | 2 +- + drivers/net/ethernet/chelsio/libcxgb/Makefile | 2 +- + drivers/net/ethernet/fungible/funeth/Makefile | 2 +- + drivers/net/ethernet/hisilicon/hns3/Makefile | 2 +- + .../wireless/broadcom/brcm80211/brcmfmac/Makefile | 4 +- + .../broadcom/brcm80211/brcmfmac/bca/Makefile | 6 +- + .../broadcom/brcm80211/brcmfmac/cyw/Makefile | 6 +- + .../broadcom/brcm80211/brcmfmac/wcc/Makefile | 6 +- + .../wireless/broadcom/brcm80211/brcmsmac/Makefile | 6 +- + .../wireless/broadcom/brcm80211/brcmutil/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/mei/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 2 +- + drivers/net/wireless/intel/iwlwifi/tests/Makefile | 2 +- + .../net/wireless/realtek/rtl818x/rtl8180/Makefile | 2 +- + .../net/wireless/realtek/rtl818x/rtl8187/Makefile | 2 +- + drivers/rapidio/Kconfig | 17 +-- + drivers/scsi/aic7xxx/Makefile | 12 +-- + drivers/staging/rtl8723bs/Makefile | 2 +- + fs/iomap/Makefile | 2 +- + fs/unicode/Makefile | 14 +-- + fs/xfs/Makefile | 4 +- + include/asm-generic/vmlinux.lds.h | 19 ++++ + init/Makefile | 5 +- + kernel/kallsyms.c | 6 -- + kernel/kallsyms_internal.h | 30 +++--- + kernel/ksysfs.c | 4 +- + lib/Makefile | 6 +- + lib/buildid.c | 4 +- + lib/raid6/Makefile | 2 +- + net/wireless/Makefile | 2 +- + rust/Makefile | 4 +- + samples/bpf/Makefile | 2 +- + samples/hid/Makefile | 2 +- + scripts/Kbuild.include | 3 +- + scripts/Makefile.asm-generic | 6 +- + scripts/Makefile.build | 36 +++---- + scripts/Makefile.clean | 2 +- + scripts/Makefile.host | 4 +- + scripts/Makefile.lib | 34 +++--- + scripts/Makefile.modfinal | 4 +- + scripts/Makefile.modpost | 2 +- + scripts/Makefile.vdsoinst | 7 +- + scripts/Makefile.vmlinux | 3 - + scripts/dtc/Makefile | 6 +- + scripts/gdb/linux/Makefile | 2 +- + scripts/genksyms/Makefile | 4 +- + scripts/kconfig/Makefile | 8 +- + scripts/kconfig/conf.c | 16 ++- + scripts/kconfig/confdata.c | 46 +++----- + scripts/kconfig/expr.h | 6 +- + scripts/kconfig/gconf.c | 80 +++----------- + scripts/kconfig/lexer.l | 1 - + scripts/kconfig/lkc.h | 13 +-- + scripts/kconfig/lkc_proto.h | 1 + + scripts/kconfig/lxdialog/util.c | 9 -- + scripts/kconfig/mconf.c | 104 ++++++++---------- + scripts/kconfig/menu.c | 45 ++++---- + scripts/kconfig/nconf.c | 118 ++++++++------------- + scripts/kconfig/parser.y | 76 +++++++++---- + scripts/kconfig/symbol.c | 73 +++++++++---- + scripts/kconfig/tests/choice/Kconfig | 26 ----- + scripts/kconfig/tests/choice/__init__.py | 2 - + .../kconfig/tests/choice/allmod_expected_config | 4 - + .../kconfig/tests/choice/allyes_expected_config | 4 - + .../kconfig/tests/choice/oldask0_expected_stdout | 2 - + scripts/kconfig/tests/choice/oldask1_config | 1 - + .../kconfig/tests/choice/oldask1_expected_stdout | 6 -- + scripts/mod/Makefile | 1 - + scripts/module.lds.S | 1 + + scripts/package/buildtar | 34 +++--- + scripts/unifdef.c | 12 +-- + security/tomoyo/Makefile | 2 +- + usr/Makefile | 2 +- + usr/include/Makefile | 2 +- + 177 files changed, 607 insertions(+), 940 deletions(-) +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 (ea558c86248b tools lib subcmd: Show parent options in help) +$ 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 MAINTAINERS +Merge made by the 'ort' strategy. + .../testing/sysfs-bus-event_source-devices-events | 6 + + MAINTAINERS | 1 + + tools/arch/x86/include/asm/cpufeatures.h | 7 +- + tools/arch/x86/include/asm/msr-index.h | 9 +- + tools/include/linux/bits.h | 8 +- + tools/include/uapi/asm-generic/bitsperlong.h | 4 + + tools/include/uapi/asm-generic/fcntl.h | 221 -- + tools/include/uapi/linux/bits.h | 15 + + tools/include/uapi/linux/openat2.h | 43 - + tools/lib/perf/cpumap.c | 33 +- + tools/lib/perf/include/perf/cpumap.h | 16 + + tools/lib/perf/libperf.map | 4 + + tools/lib/perf/mmap.c | 2 +- + tools/lib/subcmd/parse-options.c | 40 +- + tools/lib/subcmd/run-command.c | 70 +- + tools/lib/subcmd/run-command.h | 3 + + tools/perf/Build | 14 + + tools/perf/Documentation/perf-arm-spe.txt | 12 +- + tools/perf/Documentation/perf-list.txt | 1 + + tools/perf/Documentation/perf-report.txt | 9 +- + tools/perf/Documentation/perf-sched.txt | 36 + + tools/perf/Documentation/perf-script.txt | 7 +- + tools/perf/Documentation/perf-test.txt | 13 +- + tools/perf/Makefile.config | 25 +- + tools/perf/Makefile.perf | 100 +- + tools/perf/arch/arm/util/cs-etm.c | 387 ++-- + tools/perf/arch/arm64/util/arm-spe.c | 4 +- + tools/perf/arch/arm64/util/header.c | 13 +- + tools/perf/arch/x86/Build | 14 + + tools/perf/arch/x86/tests/Build | 14 + + tools/perf/arch/x86/tests/gen-insn-x86-dat.sh | 2 +- + tools/perf/arch/x86/util/intel-bts.c | 4 +- + tools/perf/arch/x86/util/intel-pt.c | 10 +- + tools/perf/bench/bench.h | 2 + + tools/perf/bench/inject-buildid.c | 2 +- + tools/perf/bench/uprobe.c | 22 +- + tools/perf/builtin-annotate.c | 128 +- + tools/perf/builtin-bench.c | 2 + + tools/perf/builtin-buildid-cache.c | 2 +- + tools/perf/builtin-buildid-list.c | 18 +- + tools/perf/builtin-c2c.c | 21 +- + tools/perf/builtin-daemon.c | 4 +- + tools/perf/builtin-inject.c | 96 +- + tools/perf/builtin-kallsyms.c | 2 +- + tools/perf/builtin-kmem.c | 2 +- + tools/perf/builtin-kwork.c | 2 +- + tools/perf/builtin-list.c | 24 +- + tools/perf/builtin-lock.c | 18 +- + tools/perf/builtin-mem.c | 4 +- + tools/perf/builtin-probe.c | 2 +- + tools/perf/builtin-record.c | 14 +- + tools/perf/builtin-report.c | 18 +- + tools/perf/builtin-sched.c | 13 +- + tools/perf/builtin-script.c | 86 +- + tools/perf/builtin-stat.c | 52 +- + tools/perf/builtin-top.c | 4 +- + tools/perf/builtin-trace.c | 35 +- + tools/perf/builtin.h | 4 +- + tools/perf/check-headers.sh | 23 +- + tools/perf/perf-archive.sh | 2 +- + tools/perf/perf-completion.sh | 23 +- + tools/perf/perf.c | 23 +- + .../arch/arm64/ampere/ampereone/cache.json | 4 +- + .../arch/arm64/ampere/ampereonex/cache.json | 4 +- + .../pmu-events/arch/s390/cf_z16/transaction.json | 28 +- + tools/perf/pmu-events/arch/s390/mapfile.csv | 2 +- + .../arch/x86/amdzen5/branch-prediction.json | 93 + + tools/perf/pmu-events/arch/x86/amdzen5/decode.json | 115 + + .../pmu-events/arch/x86/amdzen5/execution.json | 174 ++ + .../arch/x86/amdzen5/floating-point.json | 812 +++++++ + .../pmu-events/arch/x86/amdzen5/inst-cache.json | 72 + + .../perf/pmu-events/arch/x86/amdzen5/l2-cache.json | 266 +++ + .../perf/pmu-events/arch/x86/amdzen5/l3-cache.json | 177 ++ + .../pmu-events/arch/x86/amdzen5/load-store.json | 451 ++++ + .../arch/x86/amdzen5/memory-controller.json | 101 + + .../perf/pmu-events/arch/x86/amdzen5/pipeline.json | 99 + + .../pmu-events/arch/x86/amdzen5/recommended.json | 345 +++ + .../arch/x86/broadwellx/bdx-metrics.json | 35 +- + .../arch/x86/cascadelakex/clx-metrics.json | 85 +- + .../pmu-events/arch/x86/cascadelakex/frontend.json | 10 +- + .../pmu-events/arch/x86/cascadelakex/memory.json | 2 +- + .../pmu-events/arch/x86/cascadelakex/other.json | 2 +- + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 2 +- + .../arch/x86/cascadelakex/uncore-interconnect.json | 14 +- + .../arch/x86/cascadelakex/virtual-memory.json | 2 +- + .../arch/x86/emeraldrapids/frontend.json | 2 +- + .../pmu-events/arch/x86/emeraldrapids/memory.json | 1 + + .../arch/x86/emeraldrapids/pipeline.json | 3 + + .../arch/x86/emeraldrapids/uncore-cache.json | 112 +- + .../x86/emeraldrapids/uncore-interconnect.json | 26 +- + .../pmu-events/arch/x86/grandridge/pipeline.json | 43 +- + .../arch/x86/grandridge/uncore-cache.json | 28 +- + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 35 +- + .../pmu-events/arch/x86/icelakex/frontend.json | 2 +- + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 95 +- + .../perf/pmu-events/arch/x86/icelakex/memory.json | 1 + + .../pmu-events/arch/x86/icelakex/uncore-cache.json | 22 +- + .../arch/x86/icelakex/uncore-interconnect.json | 64 +- + .../pmu-events/arch/x86/icelakex/uncore-io.json | 11 - + .../perf/pmu-events/arch/x86/lunarlake/cache.json | 24 +- + .../pmu-events/arch/x86/lunarlake/frontend.json | 2 +- + .../perf/pmu-events/arch/x86/lunarlake/memory.json | 4 +- + .../perf/pmu-events/arch/x86/lunarlake/other.json | 4 +- + .../pmu-events/arch/x86/lunarlake/pipeline.json | 109 +- + tools/perf/pmu-events/arch/x86/mapfile.csv | 21 +- + .../perf/pmu-events/arch/x86/meteorlake/cache.json | 30 + + .../pmu-events/arch/x86/meteorlake/frontend.json | 4 +- + .../pmu-events/arch/x86/meteorlake/memory.json | 20 + + .../perf/pmu-events/arch/x86/meteorlake/other.json | 42 +- + .../pmu-events/arch/x86/meteorlake/pipeline.json | 44 +- + .../arch/x86/meteorlake/uncore-interconnect.json | 22 +- + .../pmu-events/arch/x86/sapphirerapids/cache.json | 1 + + .../arch/x86/sapphirerapids/frontend.json | 2 +- + .../pmu-events/arch/x86/sapphirerapids/memory.json | 1 + + .../arch/x86/sapphirerapids/pipeline.json | 19 +- + .../arch/x86/sapphirerapids/spr-metrics.json | 119 +- + .../arch/x86/sapphirerapids/uncore-cache.json | 112 +- + .../x86/sapphirerapids/uncore-interconnect.json | 26 +- + .../pmu-events/arch/x86/sierraforest/pipeline.json | 36 +- + .../perf/pmu-events/arch/x86/skylake/frontend.json | 10 +- + tools/perf/pmu-events/arch/x86/skylakex/cache.json | 9 + + .../pmu-events/arch/x86/skylakex/frontend.json | 10 +- + .../perf/pmu-events/arch/x86/skylakex/memory.json | 2 +- + tools/perf/pmu-events/arch/x86/skylakex/other.json | 2 +- + .../pmu-events/arch/x86/skylakex/pipeline.json | 2 +- + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 85 +- + .../arch/x86/skylakex/uncore-interconnect.json | 14 +- + .../pmu-events/arch/x86/skylakex/uncore-io.json | 2 +- + .../arch/x86/skylakex/virtual-memory.json | 2 +- + .../arch/x86/snowridgex/uncore-cache.json | 4 +- + .../arch/x86/snowridgex/uncore-interconnect.json | 6 +- + .../pmu-events/arch/x86/snowridgex/uncore-io.json | 11 - + tools/perf/scripts/python/parallel-perf.py | 988 +++++++++ + tools/perf/tests/bitmap.c | 13 +- + tools/perf/tests/builtin-test.c | 62 +- + tools/perf/tests/code-reading.c | 18 +- + tools/perf/tests/config-fragments/config | 3 + + tools/perf/tests/dso-data.c | 67 +- + tools/perf/tests/evsel-roundtrip-name.c | 4 +- + tools/perf/tests/hists_common.c | 6 +- + tools/perf/tests/hists_cumulate.c | 4 +- + tools/perf/tests/hists_output.c | 2 +- + tools/perf/tests/maps.c | 4 +- + tools/perf/tests/mem.c | 11 +- + tools/perf/tests/parse-events.c | 58 +- + tools/perf/tests/pmu-events.c | 4 +- + tools/perf/tests/pmu.c | 515 +++-- + tools/perf/tests/shell/annotate.sh | 83 + + .../tests/shell/base_probe/test_adding_kernel.sh | 1 + + tools/perf/tests/shell/lib/stat_output.sh | 2 +- + tools/perf/tests/shell/script.sh | 26 +- + tools/perf/tests/shell/stat+json_output.sh | 2 +- + tools/perf/tests/shell/stat_bpf_counters.sh | 71 +- + tools/perf/tests/shell/test_arm_callgraph_fp.sh | 4 +- + tools/perf/tests/shell/test_arm_coresight.sh | 2 +- + tools/perf/tests/symbols.c | 8 +- + tools/perf/tests/topology.c | 46 +- + tools/perf/tests/vmlinux-kallsyms.c | 6 +- + tools/perf/tests/workloads/datasym.c | 16 + + tools/perf/trace/beauty/Build | 15 + + .../beauty}/arch/x86/include/asm/irq_vectors.h | 0 + .../beauty}/arch/x86/include/uapi/asm/prctl.h | 0 + tools/perf/trace/beauty/arch_errno_names.sh | 8 +- + tools/perf/trace/beauty/beauty.h | 7 +- + tools/perf/trace/beauty/clone.c | 46 +- + tools/perf/trace/beauty/clone.sh | 17 + + tools/perf/trace/beauty/fcntl.c | 2 +- + tools/perf/trace/beauty/flock.c | 2 +- + tools/perf/trace/beauty/fs_at_flags.c | 58 + + tools/perf/trace/beauty/fs_at_flags.sh | 21 + + tools/perf/trace/beauty/fsconfig.sh | 6 +- + tools/perf/trace/beauty/fsmount.c | 9 +- + tools/perf/trace/beauty/fsmount.sh | 6 +- + tools/perf/trace/beauty/fspick.sh | 6 +- + .../trace/beauty}/include/uapi/linux/fcntl.h | 0 + .../trace/beauty}/include/uapi/linux/fs.h | 0 + .../trace/beauty}/include/uapi/linux/mount.h | 0 + .../trace/beauty}/include/uapi/linux/prctl.h | 0 + .../trace/beauty}/include/uapi/linux/sched.h | 0 + tools/perf/trace/beauty/include/uapi/linux/stat.h | 195 ++ + .../beauty}/include/uapi/linux/usbdevice_fs.h | 0 + .../trace/beauty}/include/uapi/linux/vhost.h | 20 +- + .../trace/beauty}/include/uapi/sound/asound.h | 0 + tools/perf/trace/beauty/mount_flags.sh | 6 +- + tools/perf/trace/beauty/move_mount_flags.sh | 6 +- + tools/perf/trace/beauty/prctl.c | 2 +- + tools/perf/trace/beauty/prctl_option.sh | 6 +- + tools/perf/trace/beauty/rename_flags.sh | 2 +- + tools/perf/trace/beauty/sndrv_ctl_ioctl.sh | 4 +- + tools/perf/trace/beauty/sndrv_pcm_ioctl.sh | 4 +- + tools/perf/trace/beauty/statx.c | 67 +- + tools/perf/trace/beauty/statx_mask.sh | 23 + + tools/perf/trace/beauty/sync_file_range.c | 11 +- + tools/perf/trace/beauty/sync_file_range.sh | 2 +- + .../trace/beauty/tracepoints/x86_irq_vectors.sh | 6 +- + tools/perf/trace/beauty/usbdevfs_ioctl.sh | 6 +- + tools/perf/trace/beauty/vhost_virtio_ioctl.sh | 6 +- + tools/perf/trace/beauty/x86_arch_prctl.sh | 4 +- + tools/perf/ui/browser.c | 6 +- + tools/perf/ui/browser.h | 2 +- + tools/perf/ui/browsers/Build | 1 + + tools/perf/ui/browsers/annotate-data.c | 313 +++ + tools/perf/ui/browsers/annotate.c | 21 +- + tools/perf/ui/browsers/hists.c | 39 +- + tools/perf/ui/browsers/map.c | 4 +- + tools/perf/ui/hist.c | 92 +- + tools/perf/util/Build | 16 + + tools/perf/util/annotate-data.c | 1650 ++++++++++++++- + tools/perf/util/annotate-data.h | 74 +- + tools/perf/util/annotate.c | 2234 +++++--------------- + tools/perf/util/annotate.h | 129 +- + tools/perf/util/auxtrace.c | 19 +- + tools/perf/util/auxtrace.h | 1 + + tools/perf/util/block-info.c | 26 +- + tools/perf/util/block-info.h | 15 +- + tools/perf/util/bpf-event.c | 8 +- + tools/perf/util/bpf_counter_cgroup.c | 5 +- + tools/perf/util/bpf_kwork.c | 16 +- + tools/perf/util/bpf_kwork_top.c | 12 +- + .../util/bpf_skel/augmented_raw_syscalls.bpf.c | 21 + + tools/perf/util/bpf_skel/bench_uprobe.bpf.c | 16 + + tools/perf/util/build-id.c | 142 +- + tools/perf/util/build-id.h | 2 - + tools/perf/util/callchain.c | 4 +- + tools/perf/util/cgroup.c | 4 +- + tools/perf/util/comm.c | 225 +- + tools/perf/util/cpumap.c | 14 +- + tools/perf/util/cpumap.h | 2 - + tools/perf/util/cs-etm.c | 5 +- + tools/perf/util/data-convert-json.c | 2 +- + tools/perf/util/db-export.c | 6 +- + tools/perf/util/debug.c | 3 + + tools/perf/util/debug.h | 1 + + tools/perf/util/disasm.c | 1837 ++++++++++++++++ + tools/perf/util/disasm.h | 112 + + tools/perf/util/dlfilter.c | 12 +- + tools/perf/util/dso.c | 470 ++-- + tools/perf/util/dso.h | 560 ++++- + tools/perf/util/dsos.c | 549 +++-- + tools/perf/util/dsos.h | 40 +- + tools/perf/util/dump-insn.h | 1 + + tools/perf/util/dwarf-aux.c | 450 +++- + tools/perf/util/dwarf-aux.h | 41 +- + tools/perf/util/event.c | 8 +- + tools/perf/util/evlist.c | 3 +- + tools/perf/util/evsel.c | 20 +- + tools/perf/util/evsel.h | 4 +- + tools/perf/util/genelf.h | 3 + + tools/perf/util/header.c | 8 +- + tools/perf/util/help-unknown-cmd.c | 51 +- + tools/perf/util/hist.c | 78 +- + tools/perf/util/hist.h | 217 +- + .../perf/util/intel-pt-decoder/intel-pt-decoder.c | 2 + + tools/perf/util/intel-pt.c | 24 +- + tools/perf/util/machine.c | 227 +- + tools/perf/util/machine.h | 4 +- + tools/perf/util/map.c | 91 +- + tools/perf/util/map.h | 3 + + tools/perf/util/maps.c | 44 +- + tools/perf/util/mem-events.c | 36 +- + tools/perf/util/mem-events.h | 29 +- + tools/perf/util/mem-info.c | 35 + + tools/perf/util/mem-info.h | 54 + + tools/perf/util/metricgroup.c | 10 +- + tools/perf/util/metricgroup.h | 1 + + tools/perf/util/parse-events.c | 552 ++--- + tools/perf/util/parse-events.h | 60 +- + tools/perf/util/parse-events.l | 200 +- + tools/perf/util/parse-events.y | 267 +-- + tools/perf/util/perf_event_attr_fprintf.c | 26 +- + tools/perf/util/pmu.c | 291 ++- + tools/perf/util/pmu.h | 16 +- + tools/perf/util/pmus.c | 110 +- + tools/perf/util/pmus.h | 3 + + tools/perf/util/print-events.c | 57 +- + tools/perf/util/print_insn.c | 75 +- + tools/perf/util/print_insn.h | 8 +- + tools/perf/util/probe-event.c | 32 +- + tools/perf/util/python.c | 10 + + tools/perf/util/record.c | 2 +- + .../perf/util/scripting-engines/trace-event-perl.c | 6 +- + .../util/scripting-engines/trace-event-python.c | 45 +- + tools/perf/util/session.c | 26 +- + tools/perf/util/session.h | 2 + + tools/perf/util/sort.c | 118 +- + tools/perf/util/sort.h | 190 +- + tools/perf/util/srcline.c | 65 +- + tools/perf/util/stat-display.c | 3 + + tools/perf/util/stat.c | 2 +- + tools/perf/util/stat.h | 1 + + tools/perf/util/svghelper.c | 20 +- + tools/perf/util/symbol-elf.c | 145 +- + tools/perf/util/symbol-minimal.c | 4 +- + tools/perf/util/symbol.c | 261 ++- + tools/perf/util/symbol.h | 12 - + tools/perf/util/symbol_fprintf.c | 4 +- + tools/perf/util/synthetic-events.c | 24 +- + tools/perf/util/thread.c | 18 +- + tools/perf/util/tracepoint.c | 50 +- + tools/perf/util/tracepoint.h | 3 +- + tools/perf/util/unwind-libunwind-local.c | 18 +- + tools/perf/util/unwind-libunwind.c | 2 +- + tools/perf/util/values.h | 1 + + tools/perf/util/vdso.c | 56 +- + 304 files changed, 15205 insertions(+), 6269 deletions(-) + delete mode 100644 tools/include/uapi/asm-generic/fcntl.h + create mode 100644 tools/include/uapi/linux/bits.h + delete mode 100644 tools/include/uapi/linux/openat2.h + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen5/branch-prediction.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen5/decode.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen5/execution.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen5/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen5/inst-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen5/l2-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen5/l3-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen5/load-store.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen5/memory-controller.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen5/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/amdzen5/recommended.json + create mode 100755 tools/perf/scripts/python/parallel-perf.py + create mode 100755 tools/perf/tests/shell/annotate.sh + rename tools/{ => perf/trace/beauty}/arch/x86/include/asm/irq_vectors.h (100%) + rename tools/{ => perf/trace/beauty}/arch/x86/include/uapi/asm/prctl.h (100%) + create mode 100755 tools/perf/trace/beauty/clone.sh + create mode 100644 tools/perf/trace/beauty/fs_at_flags.c + create mode 100755 tools/perf/trace/beauty/fs_at_flags.sh + rename tools/{ => perf/trace/beauty}/include/uapi/linux/fcntl.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/fs.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/mount.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/prctl.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/sched.h (100%) + create mode 100644 tools/perf/trace/beauty/include/uapi/linux/stat.h + rename tools/{ => perf/trace/beauty}/include/uapi/linux/usbdevice_fs.h (100%) + rename tools/{ => perf/trace/beauty}/include/uapi/linux/vhost.h (97%) + rename tools/{ => perf/trace/beauty}/include/uapi/sound/asound.h (100%) + create mode 100755 tools/perf/trace/beauty/statx_mask.sh + create mode 100644 tools/perf/ui/browsers/annotate-data.c + create mode 100644 tools/perf/util/disasm.c + create mode 100644 tools/perf/util/disasm.h + create mode 100644 tools/perf/util/mem-info.c + create mode 100644 tools/perf/util/mem-info.h +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 (a6016aac5252 dma: fix DMA sync for drivers not calling dma_set_mask*()) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Auto-merging Documentation/core-api/index.rst +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/xen/swiotlb-xen.c +Auto-merging include/linux/dma-map-ops.h +Auto-merging kernel/dma/mapping.c +Auto-merging kernel/dma/swiotlb.c +Merge made by the 'ort' strategy. + Documentation/core-api/index.rst | 1 + + Documentation/core-api/swiotlb.rst | 321 +++++++++++++++++++++ + drivers/iommu/dma-iommu.c | 34 ++- + drivers/net/ethernet/engleder/tsnep_main.c | 2 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-xsk.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 2 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 2 +- + drivers/net/ethernet/intel/igc/igc_main.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfd3/xsk.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 2 +- + drivers/xen/swiotlb-xen.c | 2 +- + include/linux/device.h | 4 + + include/linux/dma-map-ops.h | 12 + + include/linux/dma-mapping.h | 105 +++++-- + include/linux/iova.h | 5 + + include/linux/swiotlb.h | 2 +- + include/net/page_pool/types.h | 25 +- + include/net/xdp_sock_drv.h | 7 +- + include/net/xsk_buff_pool.h | 14 +- + kernel/dma/Kconfig | 5 + + kernel/dma/mapping.c | 69 +++-- + kernel/dma/swiotlb.c | 62 +++- + net/core/page_pool.c | 78 +++-- + net/xdp/xsk_buff_pool.c | 29 +- + 27 files changed, 634 insertions(+), 163 deletions(-) + create mode 100644 Documentation/core-api/swiotlb.rst +Merging asm-generic/master (02af68767d27 Merge branch 'alpha-cleanup-6.9' into asm-generic) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging arch/x86/Makefile +Merge made by the 'ort' strategy. + arch/arc/include/asm/fb.h | 8 --- + arch/arm/include/asm/fb.h | 6 -- + arch/arm64/include/asm/fb.h | 10 --- + arch/loongarch/include/asm/{fb.h => video.h} | 8 +-- + arch/m68k/include/asm/{fb.h => video.h} | 8 +-- + arch/mips/include/asm/{fb.h => video.h} | 12 ++-- + arch/parisc/Makefile | 2 +- + arch/parisc/include/asm/fb.h | 14 ---- + arch/parisc/include/asm/video.h | 16 +++++ + arch/parisc/video/Makefile | 2 +- + arch/parisc/video/{fbdev.c => video-sti.c} | 9 +-- + arch/powerpc/include/asm/{fb.h => video.h} | 8 +-- + arch/powerpc/kernel/pci-common.c | 2 +- + arch/sh/include/asm/fb.h | 7 -- + arch/sparc/Makefile | 4 +- + arch/sparc/include/asm/{fb.h => video.h} | 15 ++-- + arch/sparc/video/Makefile | 2 +- + arch/sparc/video/fbdev.c | 26 ------- + arch/sparc/video/video.c | 25 +++++++ + arch/um/include/asm/Kbuild | 2 +- + arch/x86/Makefile | 2 +- + arch/x86/include/asm/fb.h | 19 ----- + arch/x86/include/asm/video.h | 21 ++++++ + arch/x86/video/Makefile | 3 +- + arch/x86/video/{fbdev.c => video.c} | 21 +++--- + drivers/video/fbdev/core/fbcon.c | 2 +- + include/asm-generic/Kbuild | 2 +- + include/asm-generic/bitops/__ffs.h | 4 +- + include/asm-generic/bitops/__fls.h | 4 +- + include/asm-generic/bitops/builtin-__ffs.h | 2 +- + include/asm-generic/bitops/builtin-__fls.h | 2 +- + include/asm-generic/bug.h | 2 +- + include/asm-generic/page.h | 103 --------------------------- + include/asm-generic/{fb.h => video.h} | 17 ++--- + include/linux/bitops.h | 6 +- + include/linux/fb.h | 2 +- + tools/include/asm-generic/bitops/__ffs.h | 4 +- + tools/include/asm-generic/bitops/__fls.h | 4 +- + tools/include/linux/bitops.h | 2 +- + 39 files changed, 139 insertions(+), 269 deletions(-) + delete mode 100644 arch/arc/include/asm/fb.h + delete mode 100644 arch/arm/include/asm/fb.h + delete mode 100644 arch/arm64/include/asm/fb.h + rename arch/loongarch/include/asm/{fb.h => video.h} (86%) + rename arch/m68k/include/asm/{fb.h => video.h} (86%) + rename arch/mips/include/asm/{fb.h => video.h} (76%) + delete mode 100644 arch/parisc/include/asm/fb.h + create mode 100644 arch/parisc/include/asm/video.h + rename arch/parisc/video/{fbdev.c => video-sti.c} (78%) + rename arch/powerpc/include/asm/{fb.h => video.h} (76%) + delete mode 100644 arch/sh/include/asm/fb.h + rename arch/sparc/include/asm/{fb.h => video.h} (75%) + delete mode 100644 arch/sparc/video/fbdev.c + create mode 100644 arch/sparc/video/video.c + delete mode 100644 arch/x86/include/asm/fb.h + create mode 100644 arch/x86/include/asm/video.h + rename arch/x86/video/{fbdev.c => video.c} (66%) + delete mode 100644 include/asm-generic/page.h + rename include/asm-generic/{fb.h => video.h} (89%) +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 (b7e329ac0464 Merge branches 'amba', 'cfi', '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 +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/include/asm/pgtable-3level-hwdef.h +Auto-merging arch/arm/kernel/hw_breakpoint.c +Auto-merging arch/arm/mm/Makefile +Auto-merging arch/arm/mm/fault.c +Auto-merging drivers/dma/pl330.c +Merge made by the 'ort' strategy. + arch/arm/Kconfig | 23 +- + arch/arm/include/asm/assembler.h | 1 + + arch/arm/include/asm/glue-cache.h | 28 +- + arch/arm/include/asm/hw_breakpoint.h | 1 + + arch/arm/include/asm/pgtable-3level-hwdef.h | 26 + + arch/arm/include/asm/proc-fns.h | 12 + + arch/arm/include/asm/ptrace.h | 1 + + arch/arm/include/asm/uaccess-asm.h | 58 +- + arch/arm/include/asm/uaccess.h | 45 +- + arch/arm/kernel/asm-offsets.c | 1 + + arch/arm/kernel/entry-ftrace.S | 4 + + arch/arm/kernel/hw_breakpoint.c | 35 ++ + arch/arm/kernel/suspend.c | 8 + + arch/arm/lib/csumpartialcopyuser.S | 20 +- + arch/arm/lib/delay-loop.S | 16 +- + arch/arm/mm/Makefile | 3 + + arch/arm/mm/cache-b15-rac.c | 1 + + arch/arm/mm/cache-fa.S | 47 +- + arch/arm/mm/cache-nop.S | 61 +- + arch/arm/mm/cache-v4.S | 55 +- + arch/arm/mm/cache-v4wb.S | 49 +- + arch/arm/mm/cache-v4wt.S | 55 +- + arch/arm/mm/cache-v6.S | 51 +- + arch/arm/mm/cache-v7.S | 76 +-- + arch/arm/mm/cache-v7m.S | 55 +- + arch/arm/mm/cache.c | 663 +++++++++++++++++++++ + arch/arm/mm/fault.c | 29 + + arch/arm/mm/mmu.c | 7 +- + arch/arm/mm/proc-arm1020.S | 69 ++- + arch/arm/mm/proc-arm1020e.S | 70 ++- + arch/arm/mm/proc-arm1022.S | 69 ++- + arch/arm/mm/proc-arm1026.S | 70 ++- + arch/arm/mm/proc-arm720.S | 25 +- + arch/arm/mm/proc-arm740.S | 26 +- + arch/arm/mm/proc-arm7tdmi.S | 34 +- + arch/arm/mm/proc-arm920.S | 76 +-- + arch/arm/mm/proc-arm922.S | 69 ++- + arch/arm/mm/proc-arm925.S | 66 +- + arch/arm/mm/proc-arm926.S | 75 ++- + arch/arm/mm/proc-arm940.S | 69 ++- + arch/arm/mm/proc-arm946.S | 65 +- + arch/arm/mm/proc-arm9tdmi.S | 26 +- + arch/arm/mm/proc-fa526.S | 24 +- + arch/arm/mm/proc-feroceon.S | 105 ++-- + arch/arm/mm/proc-macros.S | 33 - + arch/arm/mm/proc-mohawk.S | 74 ++- + arch/arm/mm/proc-sa110.S | 23 +- + arch/arm/mm/proc-sa1100.S | 31 +- + arch/arm/mm/proc-v6.S | 31 +- + arch/arm/mm/proc-v7-2level.S | 8 +- + arch/arm/mm/proc-v7-3level.S | 8 +- + arch/arm/mm/proc-v7.S | 66 +- + arch/arm/mm/proc-v7m.S | 41 +- + arch/arm/mm/proc-xsc3.S | 75 ++- + arch/arm/mm/proc-xscale.S | 127 ++-- + arch/arm/mm/proc.c | 500 ++++++++++++++++ + arch/arm/mm/tlb-fa.S | 12 +- + arch/arm/mm/tlb-v4.S | 15 +- + arch/arm/mm/tlb-v4wb.S | 12 +- + arch/arm/mm/tlb-v4wbi.S | 12 +- + arch/arm/mm/tlb-v6.S | 12 +- + arch/arm/mm/tlb-v7.S | 14 +- + arch/arm/mm/tlb.c | 84 +++ + drivers/amba/bus.c | 11 +- + drivers/char/hw_random/nomadik-rng.c | 1 - + drivers/clk/clkdev.c | 35 +- + drivers/dma/pl330.c | 1 - + drivers/hwtracing/coresight/coresight-catu.c | 1 - + drivers/hwtracing/coresight/coresight-cti-core.c | 1 - + drivers/hwtracing/coresight/coresight-etb10.c | 1 - + drivers/hwtracing/coresight/coresight-etm3x-core.c | 1 - + drivers/hwtracing/coresight/coresight-etm4x-core.c | 1 - + drivers/hwtracing/coresight/coresight-funnel.c | 1 - + drivers/hwtracing/coresight/coresight-replicator.c | 1 - + drivers/hwtracing/coresight/coresight-stm.c | 1 - + drivers/hwtracing/coresight/coresight-tmc-core.c | 1 - + drivers/hwtracing/coresight/coresight-tpda.c | 1 - + drivers/hwtracing/coresight/coresight-tpdm.c | 1 - + drivers/hwtracing/coresight/coresight-tpiu.c | 1 - + drivers/i2c/busses/i2c-nomadik.c | 1 - + drivers/input/serio/ambakmi.c | 1 - + drivers/memory/pl353-smc.c | 1 - + drivers/vfio/platform/vfio_amba.c | 1 - + include/linux/amba/bus.h | 11 +- + 84 files changed, 2608 insertions(+), 1014 deletions(-) + create mode 100644 arch/arm/mm/cache.c + create mode 100644 arch/arm/mm/proc.c + create mode 100644 arch/arm/mm/tlb.c +Merging arm64/for-next/core (f0cc697f9f65 Merge branch 'for-next/errata' 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 arch/arm64/Kconfig +Merge made by the 'ort' strategy. + Documentation/arch/arm64/silicon-errata.rst | 4 +++ + arch/arm64/Kconfig | 42 +++++++++++++++++++++++++++++ + arch/arm64/include/asm/barrier.h | 4 +++ + arch/arm64/include/asm/cpucaps.h | 2 ++ + arch/arm64/include/asm/cputype.h | 4 +++ + arch/arm64/kernel/cpu_errata.c | 19 +++++++++++++ + arch/arm64/kernel/cpufeature.c | 8 ++++++ + arch/arm64/kernel/proton-pack.c | 12 +++++++++ + arch/arm64/tools/cpucaps | 1 + + 9 files changed, 96 insertions(+) +Merging arm-perf/for-next/perf (410e471f8746 arm64: Add USER_STACKTRACE support) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (1e3dd71e2587 Merge branch 'soc/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 13 + + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 6 + + .../devicetree/bindings/riscv/starfive.yaml | 1 + + .../bindings/serial/amlogic,meson-uart.yaml | 4 +- + .../devicetree/bindings/trivial-devices.yaml | 2 + + arch/arm/arm-soc-for-next-contents.txt | 144 ++ + arch/arm/boot/dts/aspeed/Makefile | 9 +- + .../dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts | 1 - + .../dts/aspeed/aspeed-bmc-asrock-e3c246d4i.dts | 9 + + .../dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts | 322 ++++ + .../dts/aspeed/aspeed-bmc-asrock-romed8hm3.dts | 9 + + .../dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts | 324 ++++ + .../boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts | 360 +++++ + arch/arm/boot/dts/aspeed/aspeed-bmc-asus-x4tf.dts | 581 +++++++ + .../boot/dts/aspeed/aspeed-bmc-delta-ahe50dc.dts | 2 +- + .../dts/aspeed/aspeed-bmc-facebook-cloudripper.dts | 544 ------- + .../dts/aspeed/aspeed-bmc-facebook-greatlakes.dts | 4 +- + .../boot/dts/aspeed/aspeed-bmc-facebook-harma.dts | 648 ++++++++ + .../dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts | 265 ---- + .../dts/aspeed/aspeed-bmc-facebook-minerva.dts | 543 +++++++ + .../dts/aspeed/aspeed-bmc-facebook-yosemite4.dts | 15 +- + .../dts/aspeed/aspeed-bmc-facebook-yosemitev2.dts | 2 +- + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts | 8 +- + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts | 1623 ++++++++++++++++++++ + arch/arm/boot/dts/aspeed/aspeed-g6.dtsi | 4 + + arch/arm/boot/dts/aspeed/ibm-power10-dual.dtsi | 2 + + arch/arm64/boot/dts/amlogic/Makefile | 7 + + .../boot/dts/amlogic/amlogic-a4-a113l2-ba400.dts | 42 + + arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi | 66 + + arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi | 40 + + .../boot/dts/amlogic/amlogic-a5-a113x2-av400.dts | 42 + + arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi | 40 + + arch/arm64/boot/dts/amlogic/amlogic-t7-reset.h | 197 +++ + arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 7 + + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 70 + + .../meson-g12b-bananapi-cm4-mnt-reform2.dts | 384 +++++ + .../boot/dts/amlogic/meson-khadas-vim3-ts050.dtso | 108 ++ + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 13 +- + arch/riscv/boot/dts/microchip/mpfs-icicle-kit.dts | 32 + + arch/riscv/boot/dts/starfive/Makefile | 1 + + arch/riscv/boot/dts/starfive/jh7100.dtsi | 2 +- + arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 599 ++++++++ + arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts | 30 + + .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 584 +------ + arch/riscv/boot/dts/starfive/jh7110.dtsi | 2 +- + arch/riscv/boot/dts/thead/th1520.dtsi | 54 +- + 46 files changed, 6322 insertions(+), 1443 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-e3c256d4i.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-spc621d8hm3.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asrock-x570d4u.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-asus-x4tf.dts + delete mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-cloudripper.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-harma.dts + delete mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-ibm-system1.dts + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a4-a113l2-ba400.dts + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a4-common.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a5-a113x2-av400.dts + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/amlogic-t7-reset.h + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-bananapi-cm4-mnt-reform2.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-khadas-vim3-ts050.dtso + create mode 100644 arch/riscv/boot/dts/starfive/jh7110-common.dtsi + create mode 100644 arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts +Merging amlogic/for-next (e30237bd4f71 Merge branch 'v6.10/defconfig' 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 (c44211af1aa9 ARM: dts: aspeed: Add ASRock E3C256D4I BMC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Already up to date. +Merging at91/at91-next (fa8e55345b64 Merge branch 'microchip-dt64' 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. +Merging broadcom/next (3d83aa97a6f7 Merge branch 'devicetree/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. +Merging davinci/davinci/for-next (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 (bf11908757ee memory: mtk-smi: fix module autoloading) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merging imx-mxs/for-next (8c4bf8c96748 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (4cece7649650 Linux 6.9-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 (7468eb6710ce Merge branches 'arm32-for-6.10', 'arm64-defconfig-for-6.10', 'arm64-fixes-for-6.9', 'arm64-for-6.10', 'clk-fixes-for-6.9', 'clk-for-6.10', 'drivers-fixes-for-6.9' and 'drivers-for-6.10' 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/qcom,hfpll.txt | 63 -------- + .../devicetree/bindings/clock/qcom,hfpll.yaml | 69 +++++++++ + drivers/clk/qcom/Kconfig | 2 + + drivers/clk/qcom/apss-ipq-pll.c | 79 +++++----- + drivers/clk/qcom/clk-alpha-pll.c | 24 ++- + drivers/clk/qcom/clk-alpha-pll.h | 5 +- + drivers/clk/qcom/clk-cbf-8996.c | 13 +- + drivers/clk/qcom/clk-rcg.h | 24 ++- + drivers/clk/qcom/clk-rcg2.c | 166 +++++++++++++++++++++ + drivers/clk/qcom/clk-rpm.c | 1 - + drivers/clk/qcom/common.c | 18 +++ + drivers/clk/qcom/common.h | 2 + + drivers/clk/qcom/dispcc-sm6350.c | 11 +- + drivers/clk/qcom/dispcc-sm8450.c | 20 +-- + drivers/clk/qcom/dispcc-sm8550.c | 20 +-- + drivers/clk/qcom/dispcc-sm8650.c | 20 +-- + drivers/clk/qcom/gcc-ipq8074.c | 120 +++++++++------ + drivers/clk/qcom/gcc-msm8917.c | 1 + + drivers/clk/qcom/gcc-msm8953.c | 1 + + drivers/clk/qcom/gcc-sm8150.c | 61 -------- + drivers/clk/qcom/hfpll.c | 6 +- + drivers/clk/qcom/mmcc-msm8998.c | 8 + + 22 files changed, 447 insertions(+), 287 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,hfpll.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,hfpll.yaml +Merging renesas/next (1e2995ef0bb8 Merge branch 'renesas-dts-for-v6.10' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. +Merging reset/reset/next (6d89df61650d reset: ti-sci: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Merge made by the 'ort' strategy. + drivers/reset/reset-meson-audio-arb.c | 6 ++---- + drivers/reset/reset-rzg2l-usbphy-ctrl.c | 6 ++---- + drivers/reset/reset-ti-sci.c | 6 ++---- + 3 files changed, 6 insertions(+), 12 deletions(-) +Merging rockchip/for-next (160b088184ec Merge branch 'v6.10-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. + 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-mmc-phase.c | 1 - + drivers/clk/rockchip/clk-rk3568.c | 5 + + drivers/clk/rockchip/rst-rk3588.c | 1 + + include/dt-bindings/clock/rk3568-cru.h | 1 + + include/dt-bindings/reset/rockchip,rk3588-cru.h | 2 + + 8 files changed, 148 insertions(+), 1 deletion(-) + 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 (a9c32618cd2a Merge branch 'next/clk' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + .../bindings/clock/samsung,s3c6400-clock.yaml | 57 + + .../bindings/clock/samsung,s3c64xx-clock.txt | 76 -- + drivers/clk/samsung/clk-exynos-arm64.c | 56 +- + drivers/clk/samsung/clk-exynos850.c | 440 +++++++- + drivers/clk/samsung/clk-exynosautov9.c | 8 +- + drivers/clk/samsung/clk-gs101.c | 1192 ++++++++++++++++++-- + drivers/clk/samsung/clk.h | 15 +- + 7 files changed, 1638 insertions(+), 206 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c6400-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c64xx-clock.txt +Merging scmi/for-linux-next (02ba7b5a731a Merge branch 'for-next/vexpress/updates' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rtsm-dcscb.txt | 19 --- + 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 ---- + 6 files changed, 238 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/rtsm-dcscb.txt + delete mode 100644 arch/arm/mach-versatile/dcscb.c + delete mode 100644 arch/arm/mach-versatile/dcscb_setup.S +Merging sophgo/for-next (1eba0b61be72 riscv: dts: sophgo: add reserved memory node for CV1800B) +$ 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 (dccdbccb7045 arm64: dts: st: correct masks for GIC PPI interrupts on stm32mp25) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/st/stm32mp131.dtsi +Auto-merging arch/arm/boot/dts/st/stm32mp151.dtsi +Auto-merging arch/arm64/boot/dts/st/stm32mp251.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi +Recorded preimage for 'arch/arm64/boot/dts/st/stm32mp251.dtsi' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/arm64/boot/dts/st/stm32mp251.dtsi'. +[master 63291cb900ff] Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git +$ git diff -M --stat --summary HEAD^.. + arch/arm64/boot/dts/st/stm32mp251.dtsi | 176 --------------------------------- + 1 file changed, 176 deletions(-) +Merging sunxi/sunxi/for-next (547c853141d1 Merge branch 'sunxi/dt-for-6.10' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + 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 | 13 ++++++++----- + 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 | 1 + + 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_nkm.c | 21 +++++++++++++++++++++ + drivers/clk/sunxi-ng/ccu_nkm.h | 2 ++ + 25 files changed, 53 insertions(+), 5 deletions(-) +Merging tee/next (60757f1264a2 Merge branch 'tee_ts_for_v6.10' 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 (2fd759c1796c Merge branch for-6.10/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. +Merging ti/ti-next (f532f2375771 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 +Merge made by the 'ort' strategy. +Merging xilinx/for-next (3bdc4c661d47 Merge branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Auto-merging arch/arm64/boot/dts/xilinx/zynqmp.dtsi +Merge made by the 'ort' strategy. + .../arm64/boot/dts/xilinx/zynqmp-zcu102-rev1.0.dts | 8 +++ + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 67 ++++++++++++++++++++-- + include/clocksource/timer-xilinx.h | 2 +- + 3 files changed, 71 insertions(+), 6 deletions(-) +Merging clk/clk-next (429fe5372451 Merge branch 'clk-microchip' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Auto-merging drivers/clk/Kconfig +Merge made by the 'ort' strategy. + .../bindings/clock/airoha,en7523-scu.yaml | 31 +- + .../devicetree/bindings/clock/fixed-clock.yaml | 9 + + .../bindings/clock/fixed-factor-clock.yaml | 9 + + .../bindings/clock/loongson,ls2k-clk.yaml | 4 +- + .../bindings/clock/nxp,imx95-blk-ctl.yaml | 56 + + .../clock/nxp,imx95-display-master-csr.yaml | 64 + + .../bindings/clock/renesas,rzg2l-cpg.yaml | 18 +- + .../bindings/clock/sophgo,cv1800-clk.yaml | 3 +- + .../bindings/clock/st,stm32mp25-rcc.yaml | 172 +- + drivers/clk/Kconfig | 1 + + drivers/clk/Makefile | 1 + + drivers/clk/bcm/clk-bcm2711-dvp.c | 3 +- + drivers/clk/bcm/clk-raspberrypi.c | 2 +- + drivers/clk/clk-en7523.c | 191 +- + drivers/clk/clk-gemini.c | 2 - + drivers/clk/clk-highbank.c | 1 - + drivers/clk/clk-loongson2.c | 584 +++--- + drivers/clk/clk-renesas-pcie.c | 10 +- + drivers/clk/clk-scmi.c | 249 ++- + drivers/clk/imx/Kconfig | 7 + + drivers/clk/imx/Makefile | 1 + + drivers/clk/imx/clk-imx8mp-audiomix.c | 155 +- + drivers/clk/imx/clk-imx95-blk-ctl.c | 438 +++++ + drivers/clk/mediatek/clk-mt8365-mm.c | 2 +- + drivers/clk/mediatek/clk-pllfh.c | 2 +- + drivers/clk/meson/Kconfig | 5 + + drivers/clk/meson/Makefile | 1 + + drivers/clk/meson/a1-peripherals.c | 1 + + drivers/clk/meson/a1-pll.c | 1 + + drivers/clk/meson/axg-aoclk.c | 2 +- + drivers/clk/meson/axg-audio.c | 2 +- + drivers/clk/meson/axg.c | 2 +- + drivers/clk/meson/clk-cpu-dyndiv.c | 2 +- + drivers/clk/meson/clk-dualdiv.c | 2 +- + drivers/clk/meson/clk-mpll.c | 2 +- + drivers/clk/meson/clk-phase.c | 2 +- + drivers/clk/meson/clk-pll.c | 6 +- + drivers/clk/meson/clk-regmap.c | 2 +- + drivers/clk/meson/g12a-aoclk.c | 2 +- + drivers/clk/meson/g12a.c | 78 +- + drivers/clk/meson/gxbb-aoclk.c | 2 +- + drivers/clk/meson/gxbb.c | 2 +- + drivers/clk/meson/meson-aoclk.c | 2 +- + drivers/clk/meson/meson-eeclk.c | 2 +- + drivers/clk/meson/s4-peripherals.c | 2 + + drivers/clk/meson/s4-pll.c | 2 + + drivers/clk/meson/sclk-div.c | 2 +- + drivers/clk/meson/vclk.c | 141 ++ + drivers/clk/meson/vclk.h | 51 + + drivers/clk/meson/vid-pll-div.c | 2 +- + drivers/clk/microchip/clk-mpfs.c | 92 +- + drivers/clk/nxp/clk-lpc18xx-cgu.c | 1 - + drivers/clk/renesas/clk-r8a73a4.c | 2 - + drivers/clk/renesas/clk-r8a7740.c | 27 +- + drivers/clk/renesas/clk-sh73a0.c | 2 - + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 2 +- + drivers/clk/renesas/r8a779h0-cpg-mssr.c | 21 + + drivers/clk/renesas/r9a07g043-cpg.c | 13 +- + drivers/clk/renesas/r9a07g044-cpg.c | 2 +- + drivers/clk/renesas/r9a08g045-cpg.c | 41 + + drivers/clk/renesas/rzg2l-cpg.c | 199 ++- + drivers/clk/renesas/rzg2l-cpg.h | 67 + + drivers/clk/sophgo/Kconfig | 11 + + drivers/clk/sophgo/Makefile | 7 + + drivers/clk/sophgo/clk-cv1800.c | 1537 ++++++++++++++++ + drivers/clk/sophgo/clk-cv1800.h | 123 ++ + drivers/clk/sophgo/clk-cv18xx-common.c | 66 + + drivers/clk/sophgo/clk-cv18xx-common.h | 81 + + drivers/clk/sophgo/clk-cv18xx-ip.c | 887 +++++++++ + drivers/clk/sophgo/clk-cv18xx-ip.h | 261 +++ + drivers/clk/sophgo/clk-cv18xx-pll.c | 419 +++++ + drivers/clk/sophgo/clk-cv18xx-pll.h | 118 ++ + drivers/clk/stm32/Kconfig | 7 + + drivers/clk/stm32/Makefile | 1 + + drivers/clk/stm32/clk-stm32-core.c | 11 +- + drivers/clk/stm32/clk-stm32mp13.c | 72 +- + drivers/clk/stm32/clk-stm32mp25.c | 1875 ++++++++++++++++++++ + drivers/clk/stm32/reset-stm32.c | 59 +- + drivers/clk/stm32/reset-stm32.h | 7 + + drivers/clk/stm32/stm32mp25_rcc.h | 712 ++++++++ + drivers/clk/ti/dpll.c | 10 +- + drivers/reset/reset-mpfs.c | 95 +- + include/dt-bindings/clock/loongson,ls2k-clk.h | 54 +- + include/dt-bindings/clock/nxp,imx95-clock.h | 28 + + include/dt-bindings/clock/r9a07g043-cpg.h | 58 +- + include/dt-bindings/clock/r9a07g044-cpg.h | 58 + + include/dt-bindings/clock/r9a07g054-cpg.h | 58 + + include/dt-bindings/clock/r9a08g045-cpg.h | 70 + + include/dt-bindings/reset/st,stm32mp25-rcc.h | 2 +- + include/soc/microchip/mpfs.h | 10 +- + 90 files changed, 8808 insertions(+), 691 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/nxp,imx95-blk-ctl.yaml + create mode 100644 Documentation/devicetree/bindings/clock/nxp,imx95-display-master-csr.yaml + create mode 100644 drivers/clk/imx/clk-imx95-blk-ctl.c + create mode 100644 drivers/clk/meson/vclk.c + create mode 100644 drivers/clk/meson/vclk.h + create mode 100644 drivers/clk/sophgo/Kconfig + create mode 100644 drivers/clk/sophgo/Makefile + create mode 100644 drivers/clk/sophgo/clk-cv1800.c + create mode 100644 drivers/clk/sophgo/clk-cv1800.h + create mode 100644 drivers/clk/sophgo/clk-cv18xx-common.c + create mode 100644 drivers/clk/sophgo/clk-cv18xx-common.h + create mode 100644 drivers/clk/sophgo/clk-cv18xx-ip.c + create mode 100644 drivers/clk/sophgo/clk-cv18xx-ip.h + create mode 100644 drivers/clk/sophgo/clk-cv18xx-pll.c + create mode 100644 drivers/clk/sophgo/clk-cv18xx-pll.h + create mode 100644 drivers/clk/stm32/clk-stm32mp25.c + create mode 100644 drivers/clk/stm32/stm32mp25_rcc.h + create mode 100644 include/dt-bindings/clock/nxp,imx95-clock.h +Merging clk-imx/for-next (f5072cffb35c clk: imx: imx8mp: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (5add5ebc4e35 clk: renesas: r9a08g045: Add support for power domains) +$ 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 (9f4047a4c9ca LoongArch: Update Loongson-3 default config file) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/loongarch/Makefile +Auto-merging arch/loongarch/configs/loongson3_defconfig +Auto-merging rust/Makefile +Auto-merging scripts/generate_rust_target.rs +Merge made by the 'ort' strategy. + arch/loongarch/Kconfig | 6 +- + arch/loongarch/Makefile | 2 +- + arch/loongarch/boot/dts/loongson-2k0500.dtsi | 86 ++++++++++++++++++++++++- + arch/loongarch/boot/dts/loongson-2k1000-ref.dts | 4 -- + arch/loongarch/boot/dts/loongson-2k1000.dtsi | 1 - + arch/loongarch/boot/dts/loongson-2k2000.dtsi | 49 ++++++++++++-- + arch/loongarch/configs/loongson3_defconfig | 23 +++++++ + arch/loongarch/include/asm/acpi.h | 1 + + arch/loongarch/include/asm/asm-prototypes.h | 6 ++ + arch/loongarch/include/asm/perf_event.h | 3 +- + arch/loongarch/include/asm/smp.h | 6 ++ + arch/loongarch/kernel/irq.c | 2 + + arch/loongarch/kernel/machine_kexec.c | 2 +- + arch/loongarch/lib/Makefile | 2 + + arch/loongarch/lib/tishift.S | 56 ++++++++++++++++ + arch/loongarch/mm/tlbex.S | 9 ++- + arch/loongarch/power/suspend.c | 4 +- + rust/Makefile | 2 +- + scripts/Makefile | 2 +- + scripts/generate_rust_target.rs | 7 +- + 20 files changed, 244 insertions(+), 29 deletions(-) + create mode 100644 arch/loongarch/lib/tishift.S +Merging m68k/for-next (ec8c8266373f m68k: defconfig: Update defconfigs for v6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (a5044ce7d1d9 m68k: Avoid CONFIG_COLDFIRE switch in uapi header) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/include/uapi/asm/ptrace.h | 2 +- + scripts/headers_install.sh | 1 - + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging microblaze/next (58d647506c92 microblaze: Remove early printk call from cpuinfo-static.c) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'ort' strategy. + arch/microblaze/kernel/Makefile | 1 - + arch/microblaze/kernel/cpu/cpuinfo-static.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging mips/mips-next (07e6a6d7f1d9 MIPS: Take in account load hazards for HI/LO restoring) +$ 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. + arch/mips/bcm47xx/prom.c | 3 +- + arch/mips/boot/dts/ralink/mt7621.dtsi | 440 +++++++++++++++++++--------------- + arch/mips/include/asm/asm.h | 3 + + arch/mips/include/asm/setup.h | 6 + + arch/mips/include/asm/stackframe.h | 19 +- + arch/mips/pci/pcie-octeon.c | 6 + + arch/mips/rb532/gpio.c | 2 +- + arch/mips/rb532/prom.c | 2 +- + arch/mips/sgi-ip27/ip27-irq.c | 15 +- + 9 files changed, 279 insertions(+), 217 deletions(-) + mode change 100644 => 100755 arch/mips/pci/pcie-octeon.c +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 (0ca4f51fa522 parisc/math-emu: Remove unused struct 'exc_reg') +$ 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/signal.h | 12 ------------ + arch/parisc/include/uapi/asm/signal.h | 10 ++++++++++ + arch/parisc/math-emu/driver.c | 6 ------ + 3 files changed, 10 insertions(+), 18 deletions(-) +Merging powerpc/next (e789d4499abd Merge branch 'topic/kdump-hotplug' into next) +$ 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/Makefile +Auto-merging arch/powerpc/boot/Makefile +Auto-merging arch/powerpc/include/asm/mmu.h +Auto-merging arch/powerpc/kernel/fadump.c +Auto-merging arch/powerpc/mm/mem.c +Auto-merging arch/powerpc/platforms/pseries/vio.c +Auto-merging include/linux/kexec.h +Auto-merging kernel/crash_core.c +Auto-merging tools/include/uapi/linux/kvm.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 14 +- + .../ABI/testing/sysfs-firmware-opal-powercap | 4 +- + Documentation/ABI/testing/sysfs-firmware-opal-psr | 4 +- + .../ABI/testing/sysfs-firmware-opal-sensor-groups | 4 +- + .../testing/sysfs-firmware-papr-energy-scale-info | 10 +- + Documentation/ABI/testing/sysfs-kernel-fadump | 18 + + Documentation/arch/powerpc/dexcr.rst | 141 +++++- + .../arch/powerpc/firmware-assisted-dump.rst | 91 ++-- + Documentation/virt/kvm/api.rst | 8 +- + MAINTAINERS | 3 +- + arch/powerpc/Kbuild | 3 +- + arch/powerpc/Kconfig | 4 + + arch/powerpc/Makefile | 6 +- + arch/powerpc/boot/Makefile | 4 +- + arch/powerpc/boot/decompress.c | 2 +- + arch/powerpc/boot/dts/acadia.dts | 2 +- + arch/powerpc/boot/dts/fsl/b4si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/bsc9131rdb.dts | 2 +- + arch/powerpc/boot/dts/fsl/bsc9131si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/bsc9132qds.dts | 2 +- + arch/powerpc/boot/dts/fsl/bsc9132si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/c293pcie.dts | 2 +- + arch/powerpc/boot/dts/fsl/c293si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/mpc8536si-post.dtsi | 14 +- + arch/powerpc/boot/dts/fsl/mpc8544si-post.dtsi | 2 + + arch/powerpc/boot/dts/fsl/mpc8548si-post.dtsi | 2 + + arch/powerpc/boot/dts/fsl/mpc8572si-post.dtsi | 2 + + arch/powerpc/boot/dts/fsl/p1010rdb-pb.dts | 16 + + arch/powerpc/boot/dts/fsl/p1010rdb-pb_36b.dts | 16 + + arch/powerpc/boot/dts/fsl/p1010rdb.dtsi | 16 - + arch/powerpc/boot/dts/fsl/p1010rdb_32b.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/p1010rdb_36b.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/p1010si-post.dtsi | 16 +- + arch/powerpc/boot/dts/fsl/p1020si-post.dtsi | 5 + + arch/powerpc/boot/dts/fsl/p1021si-post.dtsi | 5 + + arch/powerpc/boot/dts/fsl/p1022si-post.dtsi | 7 +- + arch/powerpc/boot/dts/fsl/p2020si-post.dtsi | 17 +- + arch/powerpc/boot/dts/fsl/pq3-power.dtsi | 19 + + arch/powerpc/boot/dts/fsl/t1023si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t1024rdb.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1040rdb.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1040si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t1042rdb.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1042rdb_pi.dts | 2 +- + arch/powerpc/boot/dts/fsl/t2081si-post.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t4240si-post.dtsi | 2 +- + arch/powerpc/boot/main.c | 2 +- + arch/powerpc/boot/ps3.c | 2 +- + arch/powerpc/include/asm/cpu_has_feature.h | 2 +- + arch/powerpc/include/asm/eeh.h | 2 +- + arch/powerpc/include/asm/fadump-internal.h | 36 +- + arch/powerpc/include/asm/fadump.h | 2 + + arch/powerpc/include/asm/feature-fixups.h | 2 + + arch/powerpc/include/asm/hvcall.h | 10 +- + arch/powerpc/include/asm/interrupt.h | 10 + + arch/powerpc/include/asm/io.h | 28 +- + arch/powerpc/include/asm/kexec.h | 15 + + arch/powerpc/include/asm/kexec_ranges.h | 20 +- + arch/powerpc/include/asm/mmu.h | 2 +- + arch/powerpc/include/asm/module.h | 5 - + arch/powerpc/include/asm/opal-api.h | 4 +- + arch/powerpc/include/asm/percpu.h | 10 + + arch/powerpc/include/asm/pmac_feature.h | 2 +- + arch/powerpc/include/asm/ppc-opcode.h | 4 + + arch/powerpc/include/asm/processor.h | 13 +- + arch/powerpc/include/asm/reg.h | 2 +- + arch/powerpc/include/asm/uninorth.h | 2 +- + arch/powerpc/include/uapi/asm/bootx.h | 2 +- + arch/powerpc/kernel/Makefile | 7 +- + arch/powerpc/kernel/cpu_setup_6xx.S | 4 +- + arch/powerpc/kernel/dexcr.c | 124 +++++ + arch/powerpc/kernel/eeh.c | 11 +- + arch/powerpc/kernel/eeh_driver.c | 13 +- + arch/powerpc/kernel/eeh_pe.c | 8 +- + arch/powerpc/kernel/fadump.c | 542 +++++++++++++-------- + arch/powerpc/kernel/misc_64.S | 4 +- + arch/powerpc/kernel/module.c | 2 - + arch/powerpc/kernel/process.c | 29 +- + arch/powerpc/kernel/prom.c | 23 +- + arch/powerpc/kernel/prom_init.c | 4 +- + arch/powerpc/kernel/ptrace/ptrace-tm.c | 2 +- + arch/powerpc/kernel/ptrace/ptrace-view.c | 7 +- + arch/powerpc/kernel/setup-common.c | 2 +- + arch/powerpc/kernel/setup_64.c | 2 + + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/kernel/sysfs.c | 4 +- + arch/powerpc/kexec/Makefile | 4 +- + arch/powerpc/kexec/core_64.c | 91 ++++ + arch/powerpc/kexec/crash.c | 195 ++++++++ + arch/powerpc/kexec/elf_64.c | 3 +- + arch/powerpc/kexec/file_load_64.c | 314 ++---------- + arch/powerpc/kexec/ranges.c | 312 +++++++++++- + arch/powerpc/kvm/book3s.c | 4 - + arch/powerpc/kvm/book3s_emulate.c | 4 +- + arch/powerpc/kvm/book3s_hv.c | 2 +- + arch/powerpc/kvm/book3s_hv_nestedv2.c | 4 +- + arch/powerpc/kvm/book3s_xive.c | 2 +- + arch/powerpc/lib/Makefile | 2 - + arch/powerpc/lib/code-patching.c | 31 +- + arch/powerpc/lib/feature-fixups.c | 8 + + arch/powerpc/lib/test-code-patching.c | 92 ++++ + arch/powerpc/mm/Makefile | 2 - + arch/powerpc/mm/book3s64/Makefile | 2 - + arch/powerpc/mm/cacheflush.c | 2 +- + arch/powerpc/mm/kasan/init_book3e_64.c | 2 +- + arch/powerpc/mm/kasan/init_book3s_64.c | 2 +- + arch/powerpc/mm/mem.c | 2 +- + arch/powerpc/mm/nohash/Makefile | 2 - + arch/powerpc/mm/nohash/kaslr_booke.c | 2 +- + arch/powerpc/mm/ptdump/hashpagetable.c | 2 +- + arch/powerpc/net/bpf_jit_comp.c | 10 + + arch/powerpc/net/bpf_jit_comp32.c | 137 ++++-- + arch/powerpc/net/bpf_jit_comp64.c | 77 ++- + arch/powerpc/platforms/512x/mpc512x_shared.c | 2 +- + arch/powerpc/platforms/52xx/lite5200_sleep.S | 6 +- + arch/powerpc/platforms/52xx/mpc52xx_common.c | 2 - + arch/powerpc/platforms/52xx/mpc52xx_gpt.c | 2 +- + arch/powerpc/platforms/83xx/suspend-asm.S | 6 +- + arch/powerpc/platforms/85xx/smp.c | 9 +- + arch/powerpc/platforms/cell/iommu.c | 17 - + arch/powerpc/platforms/cell/smp.c | 1 + + arch/powerpc/platforms/cell/spufs/file.c | 20 +- + arch/powerpc/platforms/cell/spufs/sched.c | 2 +- + arch/powerpc/platforms/maple/pci.c | 2 +- + arch/powerpc/platforms/powermac/pic.c | 2 +- + arch/powerpc/platforms/powermac/sleep.S | 2 +- + arch/powerpc/platforms/powernv/opal-fadump.c | 35 +- + arch/powerpc/platforms/powernv/pci-sriov.c | 4 +- + arch/powerpc/platforms/powernv/vas-window.c | 2 +- + arch/powerpc/platforms/ps3/device-init.c | 61 +-- + arch/powerpc/platforms/pseries/Makefile | 1 - + arch/powerpc/platforms/pseries/lpar.c | 6 +- + arch/powerpc/platforms/pseries/lparcfg.c | 45 +- + arch/powerpc/platforms/pseries/pci.c | 27 - + arch/powerpc/platforms/pseries/rtas-fadump.c | 320 +++++++----- + arch/powerpc/platforms/pseries/rtas-fadump.h | 29 +- + arch/powerpc/platforms/pseries/vas.c | 2 +- + arch/powerpc/platforms/pseries/vio.c | 8 +- + arch/powerpc/sysdev/Makefile | 2 - + arch/powerpc/sysdev/dart_iommu.c | 4 - + arch/powerpc/sysdev/fsl_gtm.c | 6 +- + arch/powerpc/sysdev/fsl_msi.c | 2 + + arch/powerpc/sysdev/xive/common.c | 4 +- + arch/powerpc/sysdev/xive/native.c | 2 +- + arch/powerpc/xmon/Makefile | 2 - + arch/powerpc/xmon/xmon.c | 6 +- + arch/x86/include/asm/kexec.h | 13 +- + arch/x86/kernel/crash.c | 32 +- + drivers/base/cpu.c | 2 +- + drivers/base/memory.c | 2 +- + drivers/cpufreq/pmac32-cpufreq.c | 8 +- + drivers/macintosh/Kconfig | 2 +- + drivers/macintosh/macio-adb.c | 24 +- + include/linux/crash_core.h | 15 +- + include/linux/kexec.h | 11 +- + include/uapi/linux/kexec.h | 1 + + include/uapi/linux/kvm.h | 4 +- + include/uapi/linux/prctl.h | 16 + + kernel/crash_core.c | 29 +- + kernel/kexec.c | 4 +- + kernel/kexec_file.c | 5 + + kernel/sys.c | 16 + + tools/include/uapi/linux/kvm.h | 2 +- + tools/testing/selftests/powerpc/Makefile | 11 +- + tools/testing/selftests/powerpc/alignment/Makefile | 1 + + .../testing/selftests/powerpc/benchmarks/Makefile | 5 +- + .../testing/selftests/powerpc/cache_shape/Makefile | 1 + + tools/testing/selftests/powerpc/copyloops/Makefile | 21 +- + tools/testing/selftests/powerpc/dexcr/.gitignore | 2 + + tools/testing/selftests/powerpc/dexcr/Makefile | 9 +- + tools/testing/selftests/powerpc/dexcr/chdexcr.c | 112 +++++ + tools/testing/selftests/powerpc/dexcr/dexcr.c | 40 ++ + tools/testing/selftests/powerpc/dexcr/dexcr.h | 57 +++ + tools/testing/selftests/powerpc/dexcr/dexcr_test.c | 215 ++++++++ + .../testing/selftests/powerpc/dexcr/hashchk_test.c | 8 +- + tools/testing/selftests/powerpc/dexcr/lsdexcr.c | 103 ++-- + tools/testing/selftests/powerpc/dscr/Makefile | 1 + + tools/testing/selftests/powerpc/eeh/Makefile | 1 + + tools/testing/selftests/powerpc/flags.mk | 12 + + tools/testing/selftests/powerpc/math/Makefile | 1 + + tools/testing/selftests/powerpc/mce/Makefile | 1 + + tools/testing/selftests/powerpc/mm/Makefile | 1 + + tools/testing/selftests/powerpc/nx-gzip/Makefile | 5 +- + .../selftests/powerpc/papr_attributes/Makefile | 3 +- + .../selftests/powerpc/papr_sysparm/Makefile | 1 + + tools/testing/selftests/powerpc/papr_vpd/Makefile | 1 + + tools/testing/selftests/powerpc/pmu/Makefile | 44 +- + tools/testing/selftests/powerpc/pmu/ebb/Makefile | 21 +- + .../powerpc/pmu/event_code_tests/Makefile | 5 +- + .../selftests/powerpc/pmu/sampling_tests/Makefile | 5 +- + .../testing/selftests/powerpc/primitives/Makefile | 5 +- + tools/testing/selftests/powerpc/ptrace/Makefile | 1 + + tools/testing/selftests/powerpc/security/Makefile | 5 +- + tools/testing/selftests/powerpc/signal/Makefile | 4 +- + .../testing/selftests/powerpc/stringloops/Makefile | 11 +- + .../selftests/powerpc/switch_endian/Makefile | 5 +- + tools/testing/selftests/powerpc/syscalls/Makefile | 5 +- + tools/testing/selftests/powerpc/tm/Makefile | 1 + + tools/testing/selftests/powerpc/vphn/Makefile | 5 +- + 199 files changed, 3052 insertions(+), 1270 deletions(-) + create mode 100644 arch/powerpc/boot/dts/fsl/pq3-power.dtsi + create mode 100644 arch/powerpc/kernel/dexcr.c + create mode 100644 tools/testing/selftests/powerpc/dexcr/chdexcr.c + create mode 100644 tools/testing/selftests/powerpc/dexcr/dexcr_test.c + create mode 100644 tools/testing/selftests/powerpc/flags.mk +Merging powerpc-kdump-hotplug/topic/kdump-hotplug (9803af291162 powerpc/crash: remove unnecessary NULL check before kvfree()) +$ git merge -m Merge branch 'topic/kdump-hotplug' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-kdump-hotplug/topic/kdump-hotplug +Already up to date. +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 (92cce91949a4 riscv: defconfig: Enable CONFIG_CLK_SOPHGO_CV1800) +$ 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 Documentation/rust/arch-support.rst +CONFLICT (content): Merge conflict in Documentation/rust/arch-support.rst +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/Makefile +CONFLICT (content): Merge conflict in arch/riscv/Makefile +Auto-merging arch/riscv/configs/defconfig +Auto-merging arch/riscv/include/asm/errata_list.h +Auto-merging arch/riscv/include/uapi/asm/hwprobe.h +Auto-merging arch/riscv/kernel/patch.c +Auto-merging arch/riscv/mm/tlbflush.c +Auto-merging include/linux/cpumask.h +Auto-merging include/uapi/linux/prctl.h +CONFLICT (content): Merge conflict in include/uapi/linux/prctl.h +Auto-merging kernel/sys.c +CONFLICT (content): Merge conflict in kernel/sys.c +Auto-merging scripts/generate_rust_target.rs +Resolved 'Documentation/rust/arch-support.rst' using previous resolution. +Resolved 'arch/riscv/Makefile' using previous resolution. +Resolved 'include/uapi/linux/prctl.h' using previous resolution. +Resolved 'kernel/sys.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f725fb3518e0] 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/cmodx.rst | 98 ++++++++ + Documentation/arch/riscv/hwprobe.rst | 4 + + Documentation/arch/riscv/index.rst | 1 + + Documentation/rust/arch-support.rst | 1 + + arch/riscv/Kconfig | 22 +- + arch/riscv/Makefile | 26 ++- + arch/riscv/configs/defconfig | 1 + + arch/riscv/errata/sifive/errata.c | 5 + + arch/riscv/include/asm/atomic.h | 164 ++++++------- + arch/riscv/include/asm/cache.h | 2 +- + arch/riscv/include/asm/cacheflush.h | 7 +- + arch/riscv/include/asm/cmpxchg.h | 422 ++++++++++++---------------------- + arch/riscv/include/asm/errata_list.h | 12 +- + arch/riscv/include/asm/irqflags.h | 1 - + arch/riscv/include/asm/mmu.h | 5 + + arch/riscv/include/asm/patch.h | 1 + + arch/riscv/include/asm/pgalloc.h | 32 ++- + arch/riscv/include/asm/processor.h | 10 + + arch/riscv/include/asm/sbi.h | 4 + + arch/riscv/include/asm/signal.h | 12 - + arch/riscv/include/asm/smp.h | 15 +- + arch/riscv/include/asm/suspend.h | 1 - + arch/riscv/include/asm/switch_to.h | 23 ++ + arch/riscv/include/asm/tlbflush.h | 52 ++--- + arch/riscv/include/uapi/asm/hwprobe.h | 1 + + arch/riscv/kernel/ftrace.c | 44 +++- + arch/riscv/kernel/patch.c | 17 +- + arch/riscv/kernel/sbi-ipi.c | 11 +- + arch/riscv/kernel/smp.c | 11 +- + arch/riscv/kernel/smpboot.c | 7 +- + arch/riscv/kernel/suspend.c | 3 +- + arch/riscv/kernel/sys_hwprobe.c | 1 + + arch/riscv/kernel/sys_riscv.c | 1 - + arch/riscv/kernel/traps_misaligned.c | 106 ++------- + arch/riscv/mm/Makefile | 5 +- + arch/riscv/mm/cacheflush.c | 120 +++++++++- + arch/riscv/mm/context.c | 42 ++-- + arch/riscv/mm/init.c | 20 +- + arch/riscv/mm/tlbflush.c | 77 ++----- + drivers/clocksource/timer-clint.c | 2 +- + include/linux/cpumask.h | 16 ++ + include/uapi/linux/prctl.h | 6 + + kernel/sys.c | 6 + + scripts/generate_rust_target.rs | 6 + + 44 files changed, 755 insertions(+), 668 deletions(-) + create mode 100644 Documentation/arch/riscv/cmodx.rst + delete mode 100644 arch/riscv/include/asm/signal.h +Merging riscv-dt/riscv-dt-for-next (1c80d50bb697 riscv: dts: microchip: add pac1934 power-monitor to icicle) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Already up to date. +Merging riscv-soc/riscv-soc-for-next (16d9122246cc Merge branch 'riscv-config' 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 +Merge made by the 'ort' strategy. +Merging s390/for-next (a99fb341e8d2 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/include/asm/pgtable.h +Auto-merging arch/s390/kernel/ipl.c +Auto-merging arch/s390/kernel/irq.c +Auto-merging arch/s390/kernel/vdso32/Makefile +Auto-merging arch/s390/kernel/vdso64/Makefile +Auto-merging scripts/Makefile.vdsoinst +CONFLICT (content): Merge conflict in scripts/Makefile.vdsoinst +Resolved 'scripts/Makefile.vdsoinst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bbcad83dc8d9] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/s390/include/asm/alternative-asm.h | 1 + + arch/s390/include/asm/alternative.h | 1 + + arch/s390/include/asm/pgtable.h | 12 +- + arch/s390/include/asm/processor.h | 17 +- + arch/s390/include/asm/stacktrace.h | 12 ++ + arch/s390/kernel/alternative.c | 7 - + arch/s390/kernel/asm-offsets.c | 9 +- + arch/s390/kernel/entry.S | 23 -- + arch/s390/kernel/idle.c | 10 +- + arch/s390/kernel/ipl.c | 319 ++++++++++++---------------- + arch/s390/kernel/irq.c | 1 + + arch/s390/kernel/perf_event.c | 34 +-- + arch/s390/kernel/process.c | 5 - + arch/s390/kernel/stacktrace.c | 89 ++++++-- + arch/s390/kernel/vdso.c | 13 +- + arch/s390/kernel/vdso32/Makefile | 4 +- + arch/s390/kernel/vdso64/Makefile | 4 +- + arch/s390/kernel/vdso64/vdso_user_wrapper.S | 19 +- + arch/s390/kernel/vtime.c | 10 +- + drivers/s390/char/vmlogrdr.c | 20 +- + drivers/s390/cio/airq.c | 1 - + drivers/s390/cio/cio.c | 1 - + drivers/s390/crypto/pkey_api.c | 109 +++++----- + drivers/s390/net/netiucv.c | 20 +- + drivers/s390/net/smsgiucv_app.c | 21 +- + drivers/tty/hvc/hvc_iucv.c | 15 +- + include/net/iucv/iucv.h | 7 +- + net/iucv/iucv.c | 38 +++- + scripts/Makefile.vdsoinst | 2 +- + 29 files changed, 397 insertions(+), 427 deletions(-) +Merging sh/for-next (efe976b7eecf sh: setup: Add missing forward declaration for sh_fdt_init()) +$ 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 +Merge made by the 'ort' strategy. + arch/sparc/include/asm/asm-prototypes.h | 23 ++++++++++++------- + arch/sparc/include/asm/floppy_64.h | 4 +--- + arch/sparc/include/asm/parport_64.h | 6 ++--- + arch/sparc/include/asm/smp_64.h | 2 -- + arch/sparc/include/uapi/asm/termbits.h | 10 --------- + arch/sparc/include/uapi/asm/termios.h | 9 ++++++++ + arch/sparc/kernel/adi_64.c | 14 ++++++------ + arch/sparc/kernel/chmc.c | 5 ++--- + arch/sparc/kernel/irq_64.c | 10 +++------ + arch/sparc/kernel/kernel.h | 4 ++++ + arch/sparc/kernel/leon_kernel.c | 7 +++--- + arch/sparc/kernel/of_device_64.c | 5 +---- + arch/sparc/kernel/pci_msi.c | 5 +---- + arch/sparc/kernel/pci_sun4v.c | 6 ++--- + arch/sparc/kernel/prom_64.c | 4 +++- + arch/sparc/kernel/setup_64.c | 3 +-- + arch/sparc/kernel/smp_64.c | 14 ------------ + arch/sparc/kernel/time_64.c | 1 + + arch/sparc/kernel/traps_64.c | 10 ++++----- + arch/sparc/kernel/uprobes.c | 2 ++ + arch/sparc/mm/init_64.c | 5 ----- + arch/sparc/mm/srmmu.c | 40 ++++++++++----------------------- + arch/sparc/prom/tree_64.c | 2 +- + arch/sparc/vdso/vma.c | 5 +++-- + 24 files changed, 79 insertions(+), 117 deletions(-) +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 +Auto-merging arch/um/include/shared/um_malloc.h +CONFLICT (content): Merge conflict in arch/um/include/shared/um_malloc.h +Resolved 'arch/um/include/shared/um_malloc.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 134a0bfb7ec5] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/um/Makefile | 2 +- + arch/um/drivers/line.c | 14 ++++---- + arch/um/drivers/pcap_kern.c | 4 +-- + arch/um/drivers/rtc_kern.c | 5 ++- + arch/um/drivers/slirp_user.c | 3 +- + arch/um/drivers/ubd_kern.c | 4 +-- + arch/um/drivers/ubd_user.c | 2 +- + arch/um/drivers/vector_kern.c | 6 ++-- + arch/um/drivers/virtio_uml.c | 5 ++- + arch/um/include/asm/kasan.h | 1 - + arch/um/include/asm/mmu.h | 2 -- + arch/um/include/asm/processor-generic.h | 1 - + arch/um/include/asm/ptrace-generic.h | 3 ++ + arch/um/include/shared/as-layout.h | 1 - + arch/um/include/shared/kern_util.h | 3 ++ + arch/um/include/shared/skas/mm_id.h | 2 ++ + arch/um/include/shared/um_malloc.h | 2 +- + arch/um/kernel/kmsg_dump.c | 2 +- + arch/um/kernel/mem.c | 2 ++ + arch/um/kernel/physmem.c | 3 +- + arch/um/kernel/process.c | 52 +++++++----------------------- + arch/um/kernel/ptrace.c | 3 -- + arch/um/kernel/reboot.c | 1 + + arch/um/kernel/skas/mmu.c | 1 + + arch/um/kernel/skas/process.c | 5 +-- + arch/um/kernel/time.c | 7 ++-- + arch/um/kernel/tlb.c | 7 +--- + arch/um/kernel/um_arch.c | 1 + + arch/um/kernel/um_arch.h | 2 ++ + arch/um/os-Linux/drivers/ethertap_kern.c | 2 +- + arch/um/os-Linux/drivers/tuntap_kern.c | 2 +- + arch/um/os-Linux/elf_aux.c | 1 + + arch/um/os-Linux/internal.h | 20 ++++++++++++ + arch/um/os-Linux/main.c | 8 +++-- + arch/um/os-Linux/mem.c | 2 ++ + arch/um/os-Linux/signal.c | 4 +-- + arch/um/os-Linux/skas/mem.c | 3 +- + arch/um/os-Linux/skas/process.c | 1 + + arch/um/os-Linux/start_up.c | 4 +-- + arch/x86/um/asm/ptrace.h | 6 ++++ + arch/x86/um/bugs_32.c | 1 + + arch/x86/um/bugs_64.c | 1 + + arch/x86/um/elfcore.c | 1 + + arch/x86/um/fault.c | 1 + + arch/x86/um/os-Linux/mcontext.c | 1 + + arch/x86/um/os-Linux/registers.c | 2 +- + arch/x86/um/os-Linux/tls.c | 1 + + arch/x86/um/ptrace_32.c | 2 -- + arch/x86/um/shared/sysdep/archsetjmp.h | 7 ++++ + arch/x86/um/shared/sysdep/kernel-offsets.h | 3 ++ + arch/x86/um/signal.c | 14 ++++---- + arch/x86/um/tls_32.c | 19 +---------- + arch/x86/um/user-offsets.c | 3 ++ + arch/x86/um/vdso/um_vdso.c | 10 ++++-- + 54 files changed, 136 insertions(+), 129 deletions(-) + create mode 100644 arch/um/os-Linux/internal.h +Merging xtensa/xtensa-for-next (b7cf2a1d9881 xtensa: remove redundant flush_dcache_page and ARCH_IMPLEMENTS_FLUSH_DCACHE_PAGE macros) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging bcachefs/for-next (07f9a27f1969 bcachefs: add no_invalid_checks flag) +$ git merge -m Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git bcachefs/for-next +Auto-merging fs/bcachefs/fs.c +Merge made by the 'ort' strategy. + Documentation/filesystems/bcachefs/CodingStyle.rst | 186 ++++ + Documentation/filesystems/bcachefs/index.rst | 1 + + fs/bcachefs/acl.c | 45 +- + fs/bcachefs/alloc_background.c | 339 ++++--- + fs/bcachefs/alloc_background.h | 109 +- + fs/bcachefs/alloc_foreground.c | 304 ++++-- + fs/bcachefs/alloc_foreground.h | 15 +- + fs/bcachefs/alloc_types.h | 7 + + fs/bcachefs/backpointers.c | 158 +-- + fs/bcachefs/backpointers.h | 43 +- + fs/bcachefs/bcachefs.h | 34 +- + fs/bcachefs/bcachefs_format.h | 10 +- + fs/bcachefs/bkey.c | 15 +- + fs/bcachefs/bkey.h | 33 +- + fs/bcachefs/bkey_methods.c | 22 +- + fs/bcachefs/bkey_methods.h | 73 +- + fs/bcachefs/bkey_sort.c | 81 +- + fs/bcachefs/bkey_sort.h | 4 +- + fs/bcachefs/bset.c | 29 +- + fs/bcachefs/bset.h | 6 +- + fs/bcachefs/btree_cache.c | 149 ++- + fs/bcachefs/btree_cache.h | 5 +- + fs/bcachefs/btree_gc.c | 1050 ++++---------------- + fs/bcachefs/btree_gc.h | 44 +- + fs/bcachefs/btree_io.c | 117 ++- + fs/bcachefs/btree_io.h | 2 - + fs/bcachefs/btree_iter.c | 347 +++++-- + fs/bcachefs/btree_iter.h | 95 +- + fs/bcachefs/btree_journal_iter.c | 17 + + fs/bcachefs/btree_journal_iter.h | 2 + + fs/bcachefs/btree_key_cache.c | 107 +- + fs/bcachefs/btree_key_cache_types.h | 8 + + fs/bcachefs/btree_locking.c | 183 ++-- + fs/bcachefs/btree_locking.h | 4 +- + fs/bcachefs/btree_trans_commit.c | 70 +- + fs/bcachefs/btree_types.h | 127 ++- + fs/bcachefs/btree_update.c | 95 +- + fs/bcachefs/btree_update.h | 14 +- + fs/bcachefs/btree_update_interior.c | 95 +- + fs/bcachefs/btree_update_interior.h | 7 +- + fs/bcachefs/btree_write_buffer.c | 8 +- + fs/bcachefs/buckets.c | 725 +++++++++----- + fs/bcachefs/buckets.h | 70 +- + fs/bcachefs/chardev.c | 66 +- + fs/bcachefs/checksum.c | 17 +- + fs/bcachefs/data_update.c | 54 +- + fs/bcachefs/debug.c | 80 +- + fs/bcachefs/dirent.c | 97 +- + fs/bcachefs/dirent.h | 8 +- + fs/bcachefs/disk_groups.c | 11 +- + fs/bcachefs/ec.c | 415 ++++---- + fs/bcachefs/ec.h | 7 +- + fs/bcachefs/error.c | 59 +- + fs/bcachefs/extent_update.c | 2 +- + fs/bcachefs/extents.c | 151 +-- + fs/bcachefs/extents.h | 12 +- + fs/bcachefs/eytzinger.c | 105 +- + fs/bcachefs/fs-common.c | 38 +- + fs/bcachefs/fs-io-buffered.c | 14 +- + fs/bcachefs/fs-io-direct.c | 2 +- + fs/bcachefs/fs-io-pagecache.c | 2 +- + fs/bcachefs/fs-io.c | 9 +- + fs/bcachefs/fs-ioctl.c | 2 +- + fs/bcachefs/fs.c | 109 +- + fs/bcachefs/fsck.c | 212 ++-- + fs/bcachefs/inode.c | 64 +- + fs/bcachefs/inode.h | 23 +- + fs/bcachefs/io_misc.c | 10 +- + fs/bcachefs/io_read.c | 68 +- + fs/bcachefs/io_write.c | 95 +- + fs/bcachefs/io_write_types.h | 1 + + fs/bcachefs/journal.c | 131 ++- + fs/bcachefs/journal.h | 6 +- + fs/bcachefs/journal_io.c | 163 ++- + fs/bcachefs/journal_io.h | 5 +- + fs/bcachefs/journal_reclaim.c | 10 +- + fs/bcachefs/journal_sb.c | 10 +- + fs/bcachefs/journal_seq_blacklist.c | 77 +- + fs/bcachefs/journal_seq_blacklist.h | 2 +- + fs/bcachefs/journal_types.h | 17 +- + fs/bcachefs/logged_ops.c | 2 +- + fs/bcachefs/lru.c | 4 +- + fs/bcachefs/lru.h | 2 +- + fs/bcachefs/migrate.c | 8 +- + fs/bcachefs/move.c | 82 +- + fs/bcachefs/movinggc.c | 4 +- + fs/bcachefs/opts.h | 7 +- + fs/bcachefs/printbuf.c | 232 +++-- + fs/bcachefs/printbuf.h | 53 +- + fs/bcachefs/quota.c | 123 +-- + fs/bcachefs/quota.h | 4 +- + fs/bcachefs/rebalance.c | 10 +- + fs/bcachefs/recovery.c | 154 +-- + fs/bcachefs/recovery_passes.c | 8 +- + fs/bcachefs/reflink.c | 72 +- + fs/bcachefs/reflink.h | 16 +- + fs/bcachefs/replicas.c | 20 +- + fs/bcachefs/sb-clean.c | 15 +- + fs/bcachefs/sb-counters.c | 20 +- + fs/bcachefs/sb-downgrade.c | 25 +- + fs/bcachefs/sb-errors.c | 2 +- + fs/bcachefs/sb-errors_types.h | 3 +- + fs/bcachefs/sb-members.c | 149 ++- + fs/bcachefs/sb-members.h | 167 +++- + fs/bcachefs/sb-members_types.h | 21 + + fs/bcachefs/snapshot.c | 53 +- + fs/bcachefs/snapshot.h | 16 +- + fs/bcachefs/str_hash.h | 70 +- + fs/bcachefs/subvolume.c | 22 +- + fs/bcachefs/subvolume.h | 7 +- + fs/bcachefs/super-io.c | 117 +-- + fs/bcachefs/super-io.h | 3 +- + fs/bcachefs/super.c | 112 ++- + fs/bcachefs/super_types.h | 15 - + fs/bcachefs/sysfs.c | 176 +--- + fs/bcachefs/tests.c | 16 +- + fs/bcachefs/trace.h | 97 +- + fs/bcachefs/util.c | 61 +- + fs/bcachefs/xattr.c | 47 +- + fs/bcachefs/xattr.h | 2 +- + include/linux/closure.h | 12 + + include/uapi/linux/magic.h | 1 + + lib/closure.c | 37 + + 123 files changed, 4692 insertions(+), 4384 deletions(-) + create mode 100644 Documentation/filesystems/bcachefs/CodingStyle.rst + create mode 100644 fs/bcachefs/sb-members_types.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 +Merge made by the 'ort' strategy. + fs/crypto/hooks.c | 32 ++++++++++++++++++++++++++------ + 1 file changed, 26 insertions(+), 6 deletions(-) +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 (55b52af44d50 Merge branch 'for-next-next-v6.9-20240508' into for-next-20240508) +$ 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 block/bio.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/inode.c +Merge made by the 'ort' strategy. + block/bio.c | 1 + + fs/btrfs/backref.c | 48 +- + fs/btrfs/block-rsv.c | 11 +- + fs/btrfs/btrfs_inode.h | 10 +- + fs/btrfs/compression.c | 119 +++-- + fs/btrfs/compression.h | 42 +- + fs/btrfs/ctree.c | 51 +-- + fs/btrfs/defrag.c | 2 +- + fs/btrfs/delayed-inode.c | 2 +- + fs/btrfs/delayed-ref.c | 365 +++++---------- + fs/btrfs/delayed-ref.h | 148 +++--- + fs/btrfs/disk-io.c | 157 +++---- + fs/btrfs/export.c | 8 +- + fs/btrfs/extent-io-tree.c | 58 +-- + fs/btrfs/extent-tree.c | 366 +++++++-------- + fs/btrfs/extent_io.c | 223 +++++---- + fs/btrfs/extent_io.h | 11 +- + fs/btrfs/extent_map.c | 316 ++++++++++--- + fs/btrfs/extent_map.h | 67 ++- + fs/btrfs/file-item.c | 90 ++-- + fs/btrfs/file-item.h | 3 +- + fs/btrfs/file.c | 327 ++++++++++---- + fs/btrfs/fs.h | 5 +- + fs/btrfs/inode-item.c | 16 +- + fs/btrfs/inode.c | 923 +++++++++++++++++--------------------- + fs/btrfs/ioctl.c | 114 +++-- + fs/btrfs/locking.c | 26 +- + fs/btrfs/locking.h | 18 +- + fs/btrfs/lzo.c | 132 +++--- + fs/btrfs/ordered-data.c | 8 +- + fs/btrfs/ordered-data.h | 1 + + fs/btrfs/props.c | 2 +- + fs/btrfs/qgroup.c | 89 ++-- + fs/btrfs/ref-verify.c | 8 +- + fs/btrfs/reflink.c | 56 +-- + fs/btrfs/relocation.c | 417 ++++++++--------- + fs/btrfs/root-tree.c | 3 +- + fs/btrfs/send.c | 74 +-- + fs/btrfs/super.c | 33 +- + fs/btrfs/sysfs.c | 8 +- + fs/btrfs/tests/btrfs-tests.c | 3 +- + fs/btrfs/tests/extent-map-tests.c | 216 +++++---- + fs/btrfs/transaction.c | 76 ++-- + fs/btrfs/tree-checker.c | 2 +- + fs/btrfs/tree-log.c | 46 +- + fs/btrfs/tree-mod-log.c | 2 +- + fs/btrfs/volumes.c | 67 ++- + fs/btrfs/volumes.h | 10 +- + fs/btrfs/xattr.c | 10 +- + fs/btrfs/zlib.c | 172 ++++--- + fs/btrfs/zstd.c | 153 ++++--- + include/trace/events/btrfs.h | 158 +++++-- + 52 files changed, 2842 insertions(+), 2431 deletions(-) +Merging ceph/master (d3e046930679 MAINTAINERS: remove myself as a Reviewer for Ceph) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (edfc6481faf8 smb3: fix perf regression with cached writes with netfs conversion) +$ 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/netfs/direct_read.c | 3 ++- + fs/smb/client/cifsfs.c | 4 ++-- + fs/smb/client/cifsglob.h | 1 + + fs/smb/client/file.c | 34 +++++++++++++++++++++++++--------- + fs/smb/client/inode.c | 3 --- + fs/smb/client/smb2pdu.h | 12 ++++++------ + fs/smb/common/smb2pdu.h | 33 ++++++++++++++++++--------------- + fs/smb/server/smb2pdu.h | 18 +++++++++--------- + include/linux/netfs.h | 1 + + 9 files changed, 64 insertions(+), 45 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 erofs/dev (7c35de4df105 erofs: Zstandard compression support) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Merge made by the 'ort' strategy. + fs/erofs/Kconfig | 15 +++ + fs/erofs/Makefile | 5 +- + fs/erofs/compress.h | 4 + + fs/erofs/decompressor.c | 15 ++- + fs/erofs/decompressor_zstd.c | 279 ++++++++++++++++++++++++++++++++++++++++++ + fs/erofs/erofs_fs.h | 15 ++- + fs/erofs/internal.h | 28 +++-- + fs/erofs/pcpubuf.c | 148 ---------------------- + fs/erofs/super.c | 28 +++-- + fs/erofs/zmap.c | 24 ++-- + fs/erofs/{utils.c => zutil.c} | 206 ++++++++++++++++++++++++++++--- + 11 files changed, 555 insertions(+), 212 deletions(-) + create mode 100644 fs/erofs/decompressor_zstd.c + delete mode 100644 fs/erofs/pcpubuf.c + rename fs/erofs/{utils.c => zutil.c} (58%) +Merging exfat/dev (f19257997d9c exfat: zero the reserved fields of file and stream extension dentries) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Already up to date. +Merging 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 (82172cca18b2 Merge isofs Makefile cleanup.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Auto-merging fs/super.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/ext2/Kconfig | 1 - + fs/ext2/dir.c | 1 - + fs/ext2/file.c | 8 +- + fs/ext2/inode.c | 2 - + fs/isofs/Makefile | 7 +- + fs/isofs/compress.c | 4 - + fs/isofs/inode.c | 467 +++++++++++++++++++------------------ + fs/nfsd/filecache.c | 4 +- + fs/notify/dnotify/dnotify.c | 4 +- + fs/notify/fanotify/fanotify_user.c | 143 ++++-------- + fs/notify/fdinfo.c | 20 +- + fs/notify/fsnotify.c | 27 ++- + fs/notify/fsnotify.h | 47 ++-- + fs/notify/inotify/inotify_user.c | 2 +- + fs/notify/mark.c | 174 ++++++++++---- + fs/quota/dquot.c | 33 +-- + fs/reiserfs/README | 16 +- + fs/reiserfs/inode.c | 16 +- + fs/super.c | 1 + + fs/udf/file.c | 20 +- + fs/udf/inode.c | 65 +++--- + fs/udf/super.c | 8 +- + fs/udf/symlink.c | 34 +-- + fs/udf/udftime.c | 11 +- + include/linux/fs.h | 14 +- + include/linux/fsnotify.h | 21 +- + include/linux/fsnotify_backend.h | 97 +++++--- + kernel/audit_tree.c | 2 +- + kernel/audit_watch.c | 2 +- + 29 files changed, 681 insertions(+), 570 deletions(-) +Merging ext4/dev (26770a717cac jbd2: add prefix 'jbd2' for 'shrink_type') +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/file.c +CONFLICT (content): Merge conflict in fs/ext4/file.c +Auto-merging fs/ext4/super.c +Auto-merging include/linux/jbd2.h +Resolved 'fs/ext4/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2c115311779b] Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git +$ git diff -M --stat --summary HEAD^.. + fs/ext4/acl.h | 5 - + fs/ext4/ext4.h | 9 +- + fs/ext4/extents.c | 3 +- + fs/ext4/file.c | 5 +- + fs/ext4/inode.c | 11 +- + fs/ext4/ioctl.c | 3 +- + fs/ext4/mballoc-test.c | 76 ++++++++++++ + fs/ext4/mballoc.c | 322 ++++++++++++++++++++++++++----------------------- + fs/ext4/mballoc.h | 14 +-- + fs/ext4/move_extent.c | 4 +- + fs/ext4/namei.c | 2 +- + fs/ext4/page-io.c | 3 - + fs/ext4/readpage.c | 1 - + fs/ext4/super.c | 36 +++--- + fs/ext4/sysfs.c | 180 ++++++++++++++++----------- + fs/ext4/xattr.c | 147 +++++++++++----------- + fs/jbd2/checkpoint.c | 24 ++-- + fs/jbd2/commit.c | 3 +- + include/linux/jbd2.h | 4 +- + 19 files changed, 485 insertions(+), 367 deletions(-) +Merging f2fs/dev (991b6bdf1b00 f2fs: fix some ambiguous comments) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/super.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 2 +- + Documentation/filesystems/f2fs.rst | 29 ++++ + fs/f2fs/checkpoint.c | 13 +- + fs/f2fs/compress.c | 96 ++++++++---- + fs/f2fs/data.c | 210 +++++++++++++++----------- + fs/f2fs/f2fs.h | 57 +++---- + fs/f2fs/file.c | 256 ++++++++++++++++++++------------ + fs/f2fs/gc.c | 11 +- + fs/f2fs/gc.h | 1 + + fs/f2fs/inline.c | 36 ++--- + fs/f2fs/inode.c | 22 ++- + fs/f2fs/node.c | 20 ++- + fs/f2fs/recovery.c | 3 +- + fs/f2fs/segment.c | 132 +++++++++++----- + fs/f2fs/super.c | 80 +++++++--- + fs/f2fs/sysfs.c | 21 ++- + include/linux/f2fs_fs.h | 10 +- + include/trace/events/f2fs.h | 42 +++--- + 18 files changed, 676 insertions(+), 365 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 +Merge made by the 'ort' strategy. + fs/verity/init.c | 7 +------ + 1 file changed, 1 insertion(+), 6 deletions(-) +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 +Merge made by the 'ort' strategy. + fs/fuse/dev.c | 3 ++- + fs/fuse/file.c | 10 +++----- + fs/fuse/ioctl.c | 60 +++++++++++++++++++++++++++++++++++++++++++ + fs/fuse/virtio_fs.c | 73 +++++++++++++++++++++++++++++++++++++++++++++++------ + 4 files changed, 130 insertions(+), 16 deletions(-) +Merging gfs2/for-next (c1c53c26e338 gfs2: make timeout values more explicit) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/gfs2/bmap.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/gfs2/ops_fstype.c +Merge made by the 'ort' strategy. + fs/gfs2/aops.c | 4 +- + fs/gfs2/bmap.c | 2 +- + fs/gfs2/dir.c | 31 +++++---- + fs/gfs2/file.c | 59 ++++++++-------- + fs/gfs2/glock.c | 192 +++++++++++++++++++++++++++++++-------------------- + fs/gfs2/glock.h | 3 +- + fs/gfs2/glops.c | 37 ++++++---- + fs/gfs2/incore.h | 1 + + fs/gfs2/lock_dlm.c | 40 ++++++++--- + fs/gfs2/log.c | 5 +- + fs/gfs2/meta_io.c | 16 ++--- + fs/gfs2/ops_fstype.c | 49 ++++--------- + fs/gfs2/rgrp.c | 10 +-- + fs/gfs2/super.c | 28 ++++---- + fs/gfs2/sys.c | 4 +- + fs/gfs2/util.c | 63 ++++++++--------- + fs/gfs2/util.h | 6 +- + fs/gfs2/xattr.c | 28 ++++---- + 18 files changed, 320 insertions(+), 258 deletions(-) +Merging jfs/jfs-next (e42e29cc4423 Revert "jfs: fix shift-out-of-bounds in dbJoin") +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (c91ecba9e421 ksmbd: avoid to send duplicate oplock break notifications) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/smb/server/oplock.c | 21 +++++++++++++-------- + 1 file changed, 13 insertions(+), 8 deletions(-) +Merging nfs/linux-next (24457f1be29f nfs: Handle error of rpc_proc_register() in nfs_net_init().) +$ 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 (57331a59ac0d NFSv4.1: Use the nfs_client's rpc timeouts for backchannel) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (8d915bbf3926 NFSD: Force all NFSv4.2 COPY requests to be synchronous) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Merge made by the 'ort' strategy. + Documentation/netlink/specs/nfsd.yaml | 110 +++++++ + fs/lockd/host.c | 1 - + fs/nfsd/export.c | 16 +- + fs/nfsd/netlink.c | 66 +++++ + fs/nfsd/netlink.h | 10 + + fs/nfsd/netns.h | 1 + + fs/nfsd/nfs4callback.c | 31 +- + fs/nfsd/nfs4proc.c | 79 ++++- + fs/nfsd/nfs4state.c | 188 ++++++------ + fs/nfsd/nfs4xdr.c | 83 +++++- + fs/nfsd/nfsctl.c | 526 +++++++++++++++++++++++++++++++++- + fs/nfsd/nfsd.h | 3 +- + fs/nfsd/nfsfh.c | 4 +- + fs/nfsd/nfssvc.c | 11 +- + fs/nfsd/state.h | 6 +- + fs/nfsd/stats.c | 42 --- + fs/nfsd/stats.h | 5 - + fs/nfsd/trace.h | 100 ++++++- + fs/nfsd/vfs.c | 2 +- + fs/nfsd/vfs.h | 8 + + fs/nfsd/xdr4.h | 24 +- + include/linux/nfs4.h | 6 + + include/linux/sunrpc/svc_xprt.h | 5 + + include/trace/misc/nfs.h | 2 - + include/uapi/linux/nfs.h | 1 - + include/uapi/linux/nfsd_netlink.h | 47 +++ + net/sunrpc/auth_gss/svcauth_gss.c | 10 +- + net/sunrpc/svc.c | 2 - + net/sunrpc/svc_xprt.c | 168 +++++++---- + 29 files changed, 1286 insertions(+), 271 deletions(-) +Merging ntfs3/master (24f6f5020b0b fs/ntfs3: Mark volume as dirty if xattr is broken) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/super.c +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 32 ++++++++++++++ + fs/ntfs3/file.c | 9 ++++ + fs/ntfs3/frecord.c | 2 +- + fs/ntfs3/fslog.c | 5 ++- + fs/ntfs3/inode.c | 46 +++++++++++--------- + fs/ntfs3/namei.c | 121 ++++------------------------------------------------- + fs/ntfs3/ntfs.h | 2 +- + fs/ntfs3/ntfs_fs.h | 10 ++--- + fs/ntfs3/record.c | 11 +---- + fs/ntfs3/super.c | 2 - + fs/ntfs3/xattr.c | 5 ++- + 11 files changed, 91 insertions(+), 154 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 +Auto-merging fs/orangefs/super.c +Merge made by the 'ort' strategy. + fs/orangefs/super.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +Merging overlayfs/overlayfs-next (e9229c18dae3 ovl: remove duplicate included header) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Auto-merging fs/namei.c +Merge made by the 'ort' strategy. + fs/backing-file.c | 23 +++++++ + fs/internal.h | 3 + + fs/namei.c | 6 +- + fs/overlayfs/dir.c | 152 ++++++++++++++++++++++++++++++++++++------- + fs/overlayfs/file.c | 3 - + fs/overlayfs/inode.c | 1 - + fs/overlayfs/overlayfs.h | 3 + + include/linux/backing-file.h | 3 + + 8 files changed, 165 insertions(+), 29 deletions(-) +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 +Merge made by the 'ort' strategy. + fs/jffs2/background.c | 4 ++-- + fs/jffs2/malloc.c | 32 ++++++++------------------------ + fs/jffs2/nodemgmt.c | 24 +++++++++++++++--------- + fs/jffs2/super.c | 1 + + 4 files changed, 26 insertions(+), 35 deletions(-) +Merging v9fs/9p-next (2a0505cdd8c8 9p: remove SLAB_MEM_SPREAD flag usage) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (a38297e3fb01 Linux 6.9) +$ 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 (25576c5420e6 xfs: simplify iext overflow checking and upgrade) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/read_write.c +Auto-merging fs/xfs/Makefile +Auto-merging fs/xfs/xfs_file.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + .../filesystems/xfs/xfs-online-fsck-design.rst | 632 ++++--- + fs/read_write.c | 1 + + fs/remap_range.c | 4 +- + fs/xfs/Makefile | 18 + + fs/xfs/libxfs/xfs_ag.c | 12 +- + fs/xfs/libxfs/xfs_ag_resv.c | 24 +- + fs/xfs/libxfs/xfs_ag_resv.h | 2 +- + fs/xfs/libxfs/xfs_alloc.c | 4 +- + fs/xfs/libxfs/xfs_attr.c | 233 ++- + fs/xfs/libxfs/xfs_attr.h | 46 +- + fs/xfs/libxfs/xfs_attr_leaf.c | 154 +- + fs/xfs/libxfs/xfs_attr_leaf.h | 4 +- + fs/xfs/libxfs/xfs_attr_remote.c | 104 +- + fs/xfs/libxfs/xfs_attr_remote.h | 8 +- + fs/xfs/libxfs/xfs_attr_sf.h | 1 + + fs/xfs/libxfs/xfs_bmap.c | 377 ++-- + fs/xfs/libxfs/xfs_bmap.h | 13 +- + fs/xfs/libxfs/xfs_da_btree.c | 189 +- + fs/xfs/libxfs/xfs_da_btree.h | 34 +- + fs/xfs/libxfs/xfs_da_format.h | 37 +- + fs/xfs/libxfs/xfs_defer.c | 12 +- + fs/xfs/libxfs/xfs_defer.h | 10 +- + fs/xfs/libxfs/xfs_dir2.c | 283 ++- + fs/xfs/libxfs/xfs_dir2.h | 23 +- + fs/xfs/libxfs/xfs_dir2_block.c | 42 +- + fs/xfs/libxfs/xfs_dir2_data.c | 18 +- + fs/xfs/libxfs/xfs_dir2_leaf.c | 100 +- + fs/xfs/libxfs/xfs_dir2_node.c | 44 +- + fs/xfs/libxfs/xfs_dir2_priv.h | 15 +- + fs/xfs/libxfs/xfs_errortag.h | 4 +- + fs/xfs/libxfs/xfs_exchmaps.c | 1235 ++++++++++++ + fs/xfs/libxfs/xfs_exchmaps.h | 124 ++ + fs/xfs/libxfs/xfs_format.h | 34 +- + fs/xfs/libxfs/xfs_fs.h | 158 +- + fs/xfs/libxfs/xfs_health.h | 4 +- + fs/xfs/libxfs/xfs_ialloc.c | 56 +- + fs/xfs/libxfs/xfs_ialloc.h | 5 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 4 +- + fs/xfs/libxfs/xfs_inode_buf.c | 8 + + fs/xfs/libxfs/xfs_inode_fork.c | 57 +- + fs/xfs/libxfs/xfs_inode_fork.h | 6 +- + fs/xfs/libxfs/xfs_log_format.h | 89 +- + fs/xfs/libxfs/xfs_log_recover.h | 4 + + fs/xfs/libxfs/xfs_log_rlimit.c | 46 + + fs/xfs/libxfs/xfs_ondisk.h | 6 + + fs/xfs/libxfs/xfs_parent.c | 379 ++++ + fs/xfs/libxfs/xfs_parent.h | 110 ++ + fs/xfs/libxfs/xfs_rtbitmap.c | 57 + + fs/xfs/libxfs/xfs_rtbitmap.h | 17 + + fs/xfs/libxfs/xfs_sb.c | 9 + + fs/xfs/libxfs/xfs_shared.h | 6 +- + fs/xfs/libxfs/xfs_symlink_remote.c | 54 +- + fs/xfs/libxfs/xfs_symlink_remote.h | 8 +- + fs/xfs/libxfs/xfs_trans_resv.c | 328 +++- + fs/xfs/libxfs/xfs_trans_space.c | 121 ++ + fs/xfs/libxfs/xfs_trans_space.h | 29 +- + fs/xfs/scrub/agheader.c | 43 +- + fs/xfs/scrub/agheader_repair.c | 879 ++++++++- + fs/xfs/scrub/agino_bitmap.h | 49 + + fs/xfs/scrub/alloc_repair.c | 2 +- + fs/xfs/scrub/attr.c | 218 ++- + fs/xfs/scrub/attr.h | 7 + + fs/xfs/scrub/attr_repair.c | 1663 +++++++++++++++++ + fs/xfs/scrub/attr_repair.h | 15 + + fs/xfs/scrub/bitmap.c | 22 +- + fs/xfs/scrub/common.c | 41 +- + fs/xfs/scrub/common.h | 27 +- + fs/xfs/scrub/dab_bitmap.h | 37 + + fs/xfs/scrub/dabtree.c | 24 + + fs/xfs/scrub/dabtree.h | 3 + + fs/xfs/scrub/dir.c | 377 +++- + fs/xfs/scrub/dir_repair.c | 1958 ++++++++++++++++++++ + fs/xfs/scrub/dirtree.c | 985 ++++++++++ + fs/xfs/scrub/dirtree.h | 178 ++ + fs/xfs/scrub/dirtree_repair.c | 821 ++++++++ + fs/xfs/scrub/findparent.c | 454 +++++ + fs/xfs/scrub/findparent.h | 56 + + fs/xfs/scrub/fscounters.c | 14 +- + fs/xfs/scrub/fscounters.h | 1 + + fs/xfs/scrub/fscounters_repair.c | 12 +- + fs/xfs/scrub/health.c | 1 + + fs/xfs/scrub/ino_bitmap.h | 37 + + fs/xfs/scrub/inode.c | 19 + + fs/xfs/scrub/inode_repair.c | 153 +- + fs/xfs/scrub/iscan.c | 67 +- + fs/xfs/scrub/iscan.h | 16 + + fs/xfs/scrub/listxattr.c | 320 ++++ + fs/xfs/scrub/listxattr.h | 19 + + fs/xfs/scrub/nlinks.c | 133 +- + fs/xfs/scrub/nlinks.h | 7 + + fs/xfs/scrub/nlinks_repair.c | 186 +- + fs/xfs/scrub/orphanage.c | 627 +++++++ + fs/xfs/scrub/orphanage.h | 86 + + fs/xfs/scrub/parent.c | 700 ++++++- + fs/xfs/scrub/parent_repair.c | 1612 ++++++++++++++++ + fs/xfs/scrub/quota_repair.c | 6 - + fs/xfs/scrub/readdir.c | 150 +- + fs/xfs/scrub/readdir.h | 3 + + fs/xfs/scrub/reap.c | 443 ++++- + fs/xfs/scrub/reap.h | 21 + + fs/xfs/scrub/repair.c | 127 +- + fs/xfs/scrub/repair.h | 31 + + fs/xfs/scrub/rmap_repair.c | 24 +- + fs/xfs/scrub/rtbitmap_repair.c | 2 - + fs/xfs/scrub/rtsummary.c | 33 +- + fs/xfs/scrub/rtsummary.h | 37 + + fs/xfs/scrub/rtsummary_repair.c | 175 ++ + fs/xfs/scrub/scrub.c | 310 +++- + fs/xfs/scrub/scrub.h | 91 + + fs/xfs/scrub/stats.c | 1 + + fs/xfs/scrub/symlink.c | 13 +- + fs/xfs/scrub/symlink_repair.c | 509 +++++ + fs/xfs/scrub/tempexch.h | 22 + + fs/xfs/scrub/tempfile.c | 851 +++++++++ + fs/xfs/scrub/tempfile.h | 48 + + fs/xfs/scrub/trace.c | 6 + + fs/xfs/scrub/trace.h | 1307 ++++++++++++- + fs/xfs/scrub/xfarray.c | 27 +- + fs/xfs/scrub/xfarray.h | 6 + + fs/xfs/scrub/xfblob.c | 168 ++ + fs/xfs/scrub/xfblob.h | 50 + + fs/xfs/scrub/xfile.c | 14 +- + fs/xfs/scrub/xfile.h | 6 + + fs/xfs/scrub/xfs_scrub.h | 6 +- + fs/xfs/xfs_acl.c | 17 +- + fs/xfs/xfs_aops.c | 60 +- + fs/xfs/xfs_attr_item.c | 560 +++++- + fs/xfs/xfs_attr_item.h | 10 + + fs/xfs/xfs_attr_list.c | 120 +- + fs/xfs/xfs_bmap_item.c | 4 +- + fs/xfs/xfs_bmap_util.c | 71 +- + fs/xfs/xfs_bmap_util.h | 2 +- + fs/xfs/xfs_buf.c | 3 + + fs/xfs/xfs_dir2_readdir.c | 25 +- + fs/xfs/xfs_discard.c | 153 +- + fs/xfs/xfs_dquot.c | 47 +- + fs/xfs/xfs_dquot.h | 1 + + fs/xfs/xfs_error.c | 3 + + fs/xfs/xfs_exchmaps_item.c | 614 ++++++ + fs/xfs/xfs_exchmaps_item.h | 64 + + fs/xfs/xfs_exchrange.c | 804 ++++++++ + fs/xfs/xfs_exchrange.h | 38 + + fs/xfs/xfs_export.c | 4 +- + fs/xfs/xfs_export.h | 2 + + fs/xfs/xfs_extent_busy.c | 80 +- + fs/xfs/xfs_file.c | 88 +- + fs/xfs/xfs_file.h | 15 + + fs/xfs/xfs_fsmap.c | 4 +- + fs/xfs/xfs_fsops.c | 29 +- + fs/xfs/xfs_fsops.h | 2 +- + fs/xfs/xfs_handle.c | 952 ++++++++++ + fs/xfs/xfs_handle.h | 33 + + fs/xfs/xfs_health.c | 1 + + fs/xfs/xfs_icache.c | 4 +- + fs/xfs/xfs_inode.c | 496 ++++- + fs/xfs/xfs_inode.h | 41 +- + fs/xfs/xfs_ioctl.c | 625 +------ + fs/xfs/xfs_ioctl.h | 28 - + fs/xfs/xfs_ioctl32.c | 1 + + fs/xfs/xfs_iomap.c | 105 +- + fs/xfs/xfs_iops.c | 23 +- + fs/xfs/xfs_iops.h | 7 +- + fs/xfs/xfs_itable.c | 8 + + fs/xfs/xfs_iwalk.c | 4 +- + fs/xfs/xfs_linux.h | 5 + + fs/xfs/xfs_log.c | 28 +- + fs/xfs/xfs_log.h | 2 - + fs/xfs/xfs_log_cil.c | 2 +- + fs/xfs/xfs_log_priv.h | 8 +- + fs/xfs/xfs_log_recover.c | 85 +- + fs/xfs/xfs_mount.c | 111 +- + fs/xfs/xfs_mount.h | 88 +- + fs/xfs/xfs_qm.c | 4 +- + fs/xfs/xfs_qm.h | 2 +- + fs/xfs/xfs_quota.h | 23 +- + fs/xfs/xfs_reflink.c | 48 +- + fs/xfs/xfs_rtalloc.c | 29 +- + fs/xfs/xfs_super.c | 76 +- + fs/xfs/xfs_symlink.c | 93 +- + fs/xfs/xfs_trace.c | 3 + + fs/xfs/xfs_trace.h | 440 ++++- + fs/xfs/xfs_trans.c | 72 +- + fs/xfs/xfs_trans_dquot.c | 15 +- + fs/xfs/xfs_xattr.c | 92 +- + fs/xfs/xfs_xattr.h | 3 +- + include/linux/fs.h | 1 + + 186 files changed, 25098 insertions(+), 3038 deletions(-) + create mode 100644 fs/xfs/libxfs/xfs_exchmaps.c + create mode 100644 fs/xfs/libxfs/xfs_exchmaps.h + create mode 100644 fs/xfs/libxfs/xfs_parent.c + create mode 100644 fs/xfs/libxfs/xfs_parent.h + create mode 100644 fs/xfs/libxfs/xfs_trans_space.c + create mode 100644 fs/xfs/scrub/agino_bitmap.h + create mode 100644 fs/xfs/scrub/attr_repair.c + create mode 100644 fs/xfs/scrub/attr_repair.h + create mode 100644 fs/xfs/scrub/dab_bitmap.h + create mode 100644 fs/xfs/scrub/dir_repair.c + create mode 100644 fs/xfs/scrub/dirtree.c + create mode 100644 fs/xfs/scrub/dirtree.h + create mode 100644 fs/xfs/scrub/dirtree_repair.c + create mode 100644 fs/xfs/scrub/findparent.c + create mode 100644 fs/xfs/scrub/findparent.h + create mode 100644 fs/xfs/scrub/ino_bitmap.h + create mode 100644 fs/xfs/scrub/listxattr.c + create mode 100644 fs/xfs/scrub/listxattr.h + create mode 100644 fs/xfs/scrub/orphanage.c + create mode 100644 fs/xfs/scrub/orphanage.h + create mode 100644 fs/xfs/scrub/parent_repair.c + create mode 100644 fs/xfs/scrub/rtsummary.h + create mode 100644 fs/xfs/scrub/rtsummary_repair.c + create mode 100644 fs/xfs/scrub/symlink_repair.c + create mode 100644 fs/xfs/scrub/tempexch.h + create mode 100644 fs/xfs/scrub/tempfile.c + create mode 100644 fs/xfs/scrub/tempfile.h + create mode 100644 fs/xfs/scrub/xfblob.c + create mode 100644 fs/xfs/scrub/xfblob.h + create mode 100644 fs/xfs/xfs_exchmaps_item.c + create mode 100644 fs/xfs/xfs_exchmaps_item.h + create mode 100644 fs/xfs/xfs_exchrange.c + create mode 100644 fs/xfs/xfs_exchrange.h + create mode 100644 fs/xfs/xfs_file.h + create mode 100644 fs/xfs/xfs_handle.c + create mode 100644 fs/xfs/xfs_handle.h +Merging zonefs/for-next (567e629fd296 zonefs: convert zonefs to use the new mount api) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (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 (584bbf439d0f 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 include/linux/fs.h +CONFLICT (content): Merge conflict in include/linux/fs.h +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 ed33cd8e7b8e] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + +Merging vfs/for-next (4faeedb807f8 Merge branch 'work.bd_inode' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging Documentation/filesystems/porting.rst +Auto-merging block/bdev.c +Auto-merging block/blk-core.c +CONFLICT (content): Merge conflict in block/blk-core.c +Auto-merging block/blk-mq.c +Auto-merging block/blk-zoned.c +Auto-merging block/blk.h +Auto-merging block/fops.c +Auto-merging block/genhd.c +Auto-merging block/ioctl.c +CONFLICT (content): Merge conflict in block/ioctl.c +Auto-merging block/partitions/core.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging drivers/md/bcache/super.c +Auto-merging fs/aio.c +Auto-merging fs/btrfs/disk-io.c +CONFLICT (content): Merge conflict in fs/btrfs/disk-io.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/buffer.c +Auto-merging fs/erofs/internal.h +Auto-merging fs/erofs/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/nilfs2/segment.c +Auto-merging fs/proc/fd.c +Auto-merging fs/read_write.c +Auto-merging fs/xfs/xfs_buf.c +Auto-merging include/linux/blk_types.h +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/jbd2.h +Auto-merging include/linux/swap.h +Auto-merging io_uring/rw.c +CONFLICT (content): Merge conflict in io_uring/rw.c +Auto-merging mm/swapfile.c +Resolved 'block/blk-core.c' using previous resolution. +Resolved 'block/ioctl.c' using previous resolution. +Resolved 'fs/btrfs/disk-io.c' using previous resolution. +Resolved 'io_uring/rw.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 749c6dd7f3fb] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/porting.rst | 7 +++ + block/bdev.c | 97 +++++++++++++++++++++++----------- + block/blk-core.c | 17 +++--- + block/blk-mq.c | 2 +- + block/blk-zoned.c | 4 +- + block/blk.h | 2 + + block/early-lookup.c | 2 +- + block/fops.c | 4 +- + block/genhd.c | 23 ++++---- + block/ioctl.c | 40 +++++++------- + block/partitions/core.c | 20 +++---- + drivers/block/loop.c | 4 +- + drivers/block/pktcdvd.c | 7 +-- + drivers/block/zram/zram_drv.c | 29 +++------- + drivers/block/zram/zram_drv.h | 2 +- + drivers/md/bcache/super.c | 6 +-- + drivers/md/dm-vdo/dm-vdo-target.c | 4 +- + drivers/md/dm-vdo/indexer/io-factory.c | 2 +- + drivers/mtd/devices/block2mtd.c | 6 ++- + drivers/s390/block/dasd_ioctl.c | 2 +- + drivers/scsi/scsicam.c | 2 +- + drivers/target/target_core_file.c | 4 +- + fs/aio.c | 4 +- + fs/bcachefs/util.h | 5 -- + fs/btrfs/dev-replace.c | 2 +- + fs/btrfs/disk-io.c | 6 +-- + fs/btrfs/volumes.c | 15 +++--- + fs/btrfs/zoned.c | 2 +- + fs/buffer.c | 26 ++++----- + fs/cachefiles/namei.c | 3 +- + fs/cramfs/inode.c | 2 +- + fs/erofs/data.c | 12 ++--- + fs/erofs/dir.c | 4 +- + fs/erofs/internal.h | 4 +- + fs/erofs/namei.c | 6 +-- + fs/erofs/super.c | 8 +-- + fs/erofs/xattr.c | 37 +++++-------- + fs/erofs/zdata.c | 6 +-- + fs/ext4/dir.c | 2 +- + fs/ext4/ext4_jbd2.c | 2 +- + fs/ext4/super.c | 26 ++------- + fs/file.c | 19 +++---- + fs/gfs2/glock.c | 2 +- + fs/gfs2/ops_fstype.c | 2 +- + fs/jbd2/journal.c | 2 +- + fs/nilfs2/segment.c | 2 +- + fs/open.c | 11 ++-- + fs/overlayfs/util.c | 2 +- + fs/proc/fd.c | 4 +- + fs/read_write.c | 12 ++--- + fs/reiserfs/journal.c | 5 +- + fs/splice.c | 4 +- + fs/xfs/xfs_buf.c | 2 +- + include/linux/blk_types.h | 19 +++---- + include/linux/blkdev.h | 40 +++++++++----- + include/linux/buffer_head.h | 4 +- + include/linux/fdtable.h | 15 ++---- + include/linux/fs.h | 14 +---- + include/linux/jbd2.h | 4 +- + include/linux/part_stat.h | 2 +- + include/linux/swap.h | 2 - + io_uring/rw.c | 4 +- + kernel/power/swap.c | 7 +-- + lib/vsprintf.c | 4 +- + mm/swapfile.c | 29 +--------- + 65 files changed, 313 insertions(+), 356 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-bdev-move-bd_has_subit_bio-to-__bd_flags.patch +Applying: fix up for "bdev: move ->bd_has_subit_bio to ->__bd_flags" +$ git reset HEAD^ +Unstaged changes after reset: +M block/blk-zoned.c +$ git add -A . +$ git commit -v -a --amend +[master bf7a88dee3d1] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git + Date: Wed May 15 10:00:30 2024 +1000 +Merging printk/for-next (596ffa476e20 Merge branch 'for-6.10' 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 arch/riscv/configs/nommu_k210_defconfig +Auto-merging arch/riscv/configs/nommu_k210_sdcard_defconfig +Auto-merging arch/riscv/configs/nommu_virt_defconfig +Auto-merging arch/sh/configs/edosk7705_defconfig +Auto-merging arch/sh/configs/se7619_defconfig +Auto-merging include/linux/udp.h +Auto-merging include/linux/xarray.h +Auto-merging init/Kconfig +Auto-merging kernel/printk/printk.c +Merge made by the 'ort' strategy. + arch/arm/configs/collie_defconfig | 2 +- + arch/arm/configs/keystone_defconfig | 2 +- + arch/arm/configs/lpc18xx_defconfig | 2 +- + arch/arm/configs/moxart_defconfig | 2 +- + arch/arm/configs/mps2_defconfig | 2 +- + arch/arm/configs/omap1_defconfig | 2 +- + arch/arm/configs/stm32_defconfig | 2 +- + arch/microblaze/configs/mmu_defconfig | 2 +- + arch/mips/configs/rs90_defconfig | 2 +- + arch/powerpc/configs/adder875_defconfig | 2 +- + arch/powerpc/configs/ep88xc_defconfig | 2 +- + arch/powerpc/configs/mpc866_ads_defconfig | 2 +- + arch/powerpc/configs/mpc885_ads_defconfig | 2 +- + arch/powerpc/configs/tqm8xx_defconfig | 2 +- + arch/riscv/configs/nommu_k210_defconfig | 2 +- + arch/riscv/configs/nommu_k210_sdcard_defconfig | 2 +- + arch/riscv/configs/nommu_virt_defconfig | 2 +- + arch/sh/configs/edosk7705_defconfig | 2 +- + arch/sh/configs/se7619_defconfig | 2 +- + arch/sh/configs/se7712_defconfig | 2 +- + arch/sh/configs/se7721_defconfig | 2 +- + arch/sh/configs/shmin_defconfig | 2 +- + arch/x86/include/asm/mpspec.h | 6 ++--- + drivers/tty/vt/vc_screen.c | 2 +- + include/linux/ceph/ceph_debug.h | 18 ++++++--------- + include/linux/dev_printk.h | 25 +++++++++++---------- + include/linux/dynamic_debug.h | 4 ++-- + include/linux/printk.h | 4 ++-- + include/linux/threads.h | 4 ++-- + include/linux/udp.h | 2 +- + include/linux/xarray.h | 2 +- + init/Kconfig | 14 ++++-------- + kernel/futex/core.c | 2 +- + kernel/printk/printk.c | 26 +++++++++++----------- + kernel/user.c | 2 +- + .../testing/selftests/wireguard/qemu/kernel.config | 1 - + 36 files changed, 73 insertions(+), 83 deletions(-) +Merging pci/next (a38bebb28682 Merge branch 'pci/misc') + 8b77e887b96c ("dt-bindings: gpio: mpfs: Add coreGPIO support") + 8c24b6f1709f ("dt-bindings: gpio: mpfs: Allow gpio-line-names") +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging drivers/cxl/core/regs.c +Auto-merging drivers/cxl/cxl.h +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/iommu/intel/irq_remapping.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/ethernet/wangxun/libwx/wx_lib.c +Auto-merging drivers/pci/pcie/aspm.c +Auto-merging drivers/pci/quirks.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/tty/serial/8250/8250_pci.c +Auto-merging include/linux/pci_ids.h +Auto-merging sound/soc/intel/avs/core.c +Merge made by the 'ort' strategy. + Documentation/PCI/endpoint/pci-endpoint.rst | 4 +- + Documentation/PCI/msi-howto.rst | 2 +- + Documentation/PCI/pci.rst | 2 +- + Documentation/PCI/pcieaer-howto.rst | 2 +- + Documentation/devicetree/bindings/net/sff,sfp.yaml | 12 +- + .../devicetree/bindings/pci/amlogic,axg-pcie.yaml | 2 +- + .../devicetree/bindings/pci/apple,pcie.yaml | 2 +- + .../devicetree/bindings/pci/brcm,iproc-pcie.yaml | 2 +- + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 2 +- + .../bindings/pci/cdns,cdns-pcie-host.yaml | 3 - + .../devicetree/bindings/pci/cdns-pcie-host.yaml | 2 +- + .../devicetree/bindings/pci/faraday,ftpci100.yaml | 2 +- + .../bindings/pci/fsl,layerscape-pcie-ep.yaml | 102 ++++++ + .../bindings/pci/fsl,layerscape-pcie.yaml | 167 ++++++++++ + .../devicetree/bindings/pci/host-generic-pci.yaml | 2 +- + .../devicetree/bindings/pci/intel,ixp4xx-pci.yaml | 2 +- + .../bindings/pci/intel,keembay-pcie.yaml | 2 +- + .../devicetree/bindings/pci/layerscape-pci.txt | 79 ----- + .../devicetree/bindings/pci/loongson.yaml | 2 +- + .../bindings/pci/mediatek,mt7621-pcie.yaml | 7 +- + .../bindings/pci/mediatek-pcie-gen3.yaml | 2 +- + .../bindings/pci/microchip,pcie-host.yaml | 5 +- + .../devicetree/bindings/pci/qcom,pcie-common.yaml | 2 +- + .../devicetree/bindings/pci/qcom,pcie-sm8350.yaml | 22 -- + .../devicetree/bindings/pci/qcom,pcie.yaml | 2 +- + .../devicetree/bindings/pci/rcar-gen4-pci-ep.yaml | 4 +- + .../bindings/pci/rcar-gen4-pci-host.yaml | 4 +- + .../devicetree/bindings/pci/rcar-pci-host.yaml | 5 +- + .../bindings/pci/renesas,pci-rcar-gen2.yaml | 2 +- + .../bindings/pci/rockchip,rk3399-pcie.yaml | 2 +- + .../devicetree/bindings/pci/snps,dw-pcie.yaml | 2 +- + .../devicetree/bindings/pci/ti,am65-pci-host.yaml | 22 +- + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 5 + + .../devicetree/bindings/pci/versatile.yaml | 2 +- + .../devicetree/bindings/pci/xilinx-versal-cpm.yaml | 9 +- + .../bindings/pci/xlnx,axi-pcie-host.yaml | 2 +- + .../devicetree/bindings/pci/xlnx,nwl-pcie.yaml | 4 +- + .../devicetree/bindings/pci/xlnx,xdma-host.yaml | 2 +- + .../devicetree/bindings/phy/brcm,sata-phy.yaml | 8 +- + .../devicetree/bindings/regulator/ti,tps62864.yaml | 2 +- + .../devicetree/bindings/riscv/microchip.yaml | 1 + + .../bindings/soc/tegra/nvidia,tegra20-pmc.yaml | 6 +- + .../devicetree/bindings/tpm/ibm,vtpm.yaml | 4 +- + Documentation/translations/zh_CN/PCI/msi-howto.rst | 2 +- + Documentation/translations/zh_CN/PCI/pci.rst | 2 +- + arch/x86/kernel/apic/msi.c | 5 - + arch/x86/pci/mmconfig-shared.c | 40 ++- + arch/x86/pci/olpc.c | 3 - + drivers/ata/pata_cs5520.c | 6 - + drivers/cxl/core/pci.c | 35 +- + drivers/cxl/core/regs.c | 2 +- + drivers/cxl/cxl.h | 2 + + drivers/cxl/cxlpci.h | 1 - + drivers/cxl/pci.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7220.c | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 5 +- + drivers/infiniband/hw/qib/qib_pcie.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_main.c | 2 +- + drivers/iommu/amd/iommu.c | 17 +- + drivers/iommu/intel/irq_remapping.c | 19 +- + drivers/mfd/intel-lpss-pci.c | 2 +- + drivers/misc/pci_endpoint_test.c | 60 +++- + drivers/misc/vmw_vmci/vmci_guest.c | 3 +- + drivers/net/ethernet/amd/xgbe/xgbe-pci.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_cfg.h | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_hw.h | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 2 +- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 9 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_a0.c | 2 +- + .../ethernet/aquantia/atlantic/hw_atl/hw_atl_b0.c | 2 +- + .../ethernet/aquantia/atlantic/hw_atl2/hw_atl2.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 2 +- + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 8 +- + drivers/net/wireless/ath/ath10k/ahb.c | 18 +- + drivers/net/wireless/ath/ath10k/pci.c | 36 +-- + drivers/net/wireless/ath/ath10k/pci.h | 6 +- + drivers/net/wireless/realtek/rtw88/pci.c | 2 +- + drivers/net/wireless/realtek/rtw89/pci.c | 2 +- + drivers/ntb/hw/idt/ntb_hw_idt.c | 2 +- + drivers/pci/access.c | 44 ++- + drivers/pci/controller/cadence/pcie-cadence-ep.c | 7 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 13 +- + drivers/pci/controller/dwc/pci-imx6.c | 10 + + drivers/pci/controller/dwc/pci-keystone.c | 167 +++++----- + drivers/pci/controller/dwc/pci-layerscape-ep.c | 9 + + drivers/pci/controller/dwc/pcie-artpec6.c | 23 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 354 ++++++++++++++------- + drivers/pci/controller/dwc/pcie-designware-host.c | 145 +++++++-- + drivers/pci/controller/dwc/pcie-designware-plat.c | 11 + + drivers/pci/controller/dwc/pcie-designware.c | 56 ++-- + drivers/pci/controller/dwc/pcie-designware.h | 44 ++- + drivers/pci/controller/dwc/pcie-dw-rockchip.c | 23 +- + drivers/pci/controller/dwc/pcie-keembay.c | 18 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 17 +- + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 28 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 10 +- + drivers/pci/controller/dwc/pcie-uniphier-ep.c | 15 +- + drivers/pci/controller/pcie-mt7621.c | 2 +- + drivers/pci/controller/pcie-rcar-ep.c | 2 + + drivers/pci/controller/pcie-rockchip-ep.c | 10 +- + drivers/pci/controller/pcie-rockchip-host.c | 3 + + drivers/pci/controller/pcie-rockchip.c | 2 +- + drivers/pci/doe.c | 12 +- + drivers/pci/endpoint/functions/pci-epf-mhi.c | 47 ++- + drivers/pci/endpoint/functions/pci-epf-test.c | 175 +++++----- + drivers/pci/endpoint/pci-ep-cfs.c | 10 +- + drivers/pci/endpoint/pci-epc-core.c | 76 ++++- + drivers/pci/endpoint/pci-epf-core.c | 9 +- + drivers/pci/hotplug/TODO | 12 +- + drivers/pci/msi/api.c | 58 +--- + drivers/pci/msi/irqdomain.c | 59 ---- + drivers/pci/msi/msi.c | 15 +- + drivers/pci/of_property.c | 2 + + drivers/pci/pci.c | 143 +++++++-- + drivers/pci/pci.h | 30 +- + drivers/pci/pcie/Kconfig | 2 +- + drivers/pci/pcie/aer_inject.c | 2 +- + drivers/pci/pcie/aspm.c | 182 ++++++----- + drivers/pci/pcie/edr.c | 28 +- + drivers/pci/pcie/err.c | 12 +- + drivers/pci/pcie/portdrv.c | 8 +- + drivers/pci/probe.c | 8 +- + drivers/pci/quirks.c | 24 ++ + drivers/perf/cxl_pmu.c | 2 +- + drivers/platform/x86/intel_ips.c | 2 +- + drivers/scsi/arcmsr/arcmsr_hba.c | 2 +- + drivers/scsi/hpsa.c | 2 +- + drivers/scsi/ipr.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 4 +- + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- + drivers/scsi/pmcraid.c | 2 +- + drivers/scsi/vmw_pvscsi.c | 2 +- + drivers/tty/serial/8250/8250_pci.c | 2 +- + drivers/usb/core/hcd-pci.c | 3 +- + include/linux/irqdomain_defs.h | 1 - + include/linux/lockdep.h | 5 + + include/linux/msi.h | 2 - + include/linux/msi_api.h | 1 - + include/linux/pci-epc.h | 10 +- + include/linux/pci-epf.h | 10 +- + include/linux/pci.h | 74 ++--- + include/linux/pci_ids.h | 2 + + include/uapi/linux/pci_regs.h | 6 + + sound/soc/intel/avs/core.c | 2 +- + 146 files changed, 1833 insertions(+), 1088 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pci/fsl,layerscape-pcie-ep.yaml + create mode 100644 Documentation/devicetree/bindings/pci/fsl,layerscape-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/layerscape-pci.txt +Merging pstore/for-next/pstore (9dd12ed95c2d pstore/blk: replace deprecated strncpy with strscpy) +$ 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 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging hid/for-next (14ee3d12f37b Merge branch 'for-6.10/hid-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. +Merging i2c/i2c/for-next (24a9d78e808c Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/i2c/busses/i2c-nomadik.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/i2c/i2c-pnx.txt | 34 -- + .../devicetree/bindings/i2c/nxp,pnx-i2c.yaml | 46 +++ + .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 19 + + .../devicetree/bindings/i2c/renesas,riic.yaml | 19 +- + MAINTAINERS | 12 +- + drivers/gpu/drm/bridge/sii902x.c | 2 +- + drivers/i2c/busses/Kconfig | 49 ++- + drivers/i2c/busses/Makefile | 3 + + drivers/i2c/busses/i2c-ali1535.c | 8 +- + drivers/i2c/busses/i2c-ali1563.c | 1 - + drivers/i2c/busses/i2c-ali15x3.c | 4 +- + drivers/i2c/busses/i2c-amd-mp2-plat.c | 8 +- + drivers/i2c/busses/i2c-at91-master.c | 1 - + drivers/i2c/busses/i2c-bcm-iproc.c | 2 - + drivers/i2c/busses/i2c-bcm2835.c | 1 - + drivers/i2c/busses/i2c-cadence.c | 2 - + drivers/i2c/busses/i2c-davinci.c | 1 - + drivers/i2c/busses/i2c-designware-pcidrv.c | 2 - + drivers/i2c/busses/i2c-designware-platdrv.c | 9 +- + drivers/i2c/busses/i2c-digicolor.c | 6 +- + drivers/i2c/busses/i2c-exynos5.c | 12 +- + drivers/i2c/busses/i2c-hix5hd2.c | 8 +- + drivers/i2c/busses/i2c-i801.c | 41 +- + drivers/i2c/busses/i2c-img-scb.c | 5 +- + drivers/i2c/busses/i2c-imx-lpi2c.c | 25 +- + drivers/i2c/busses/i2c-ismt.c | 1 - + drivers/i2c/busses/i2c-jz4780.c | 22 +- + drivers/i2c/busses/i2c-mpc.c | 11 +- + drivers/i2c/busses/i2c-nomadik.c | 7 +- + drivers/i2c/busses/i2c-ocores.c | 21 +- + drivers/i2c/busses/i2c-octeon-core.c | 141 +++++-- + drivers/i2c/busses/i2c-octeon-core.h | 53 ++- + drivers/i2c/busses/i2c-omap.c | 11 +- + drivers/i2c/busses/i2c-pxa.c | 14 +- + drivers/i2c/busses/i2c-qcom-geni.c | 10 +- + drivers/i2c/busses/i2c-qup.c | 4 +- + drivers/i2c/busses/i2c-riic.c | 125 ++++-- + drivers/i2c/busses/i2c-rk3x.c | 14 +- + drivers/i2c/busses/i2c-s3c2410.c | 6 +- + drivers/i2c/busses/i2c-sh_mobile.c | 1 - + drivers/i2c/busses/i2c-st.c | 11 +- + drivers/i2c/busses/i2c-stm32f4.c | 8 +- + drivers/i2c/busses/i2c-stm32f7.c | 8 +- + drivers/i2c/busses/i2c-synquacer.c | 8 +- + drivers/i2c/busses/i2c-tegra.c | 2 - + drivers/i2c/busses/i2c-thunderx-pcidrv.c | 13 +- + drivers/i2c/busses/i2c-uniphier-f.c | 1 - + drivers/i2c/busses/i2c-uniphier.c | 4 +- + drivers/i2c/busses/i2c-viai2c-common.c | 256 +++++++++++++ + drivers/i2c/busses/i2c-viai2c-common.h | 85 +++++ + drivers/i2c/busses/i2c-viai2c-wmt.c | 148 ++++++++ + drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 298 +++++++++++++++ + drivers/i2c/busses/i2c-viperboard.c | 1 - + drivers/i2c/busses/i2c-wmt.c | 421 --------------------- + drivers/i2c/i2c-core-acpi.c | 19 +- + drivers/i2c/i2c-core-smbus.c | 2 +- + drivers/i2c/i2c-mux.c | 24 +- + drivers/i2c/muxes/i2c-arb-gpio-challenge.c | 2 +- + drivers/i2c/muxes/i2c-mux-gpio.c | 3 +- + drivers/i2c/muxes/i2c-mux-gpmux.c | 2 +- + drivers/i2c/muxes/i2c-mux-ltc4306.c | 2 +- + drivers/i2c/muxes/i2c-mux-mlxcpld.c | 2 +- + drivers/i2c/muxes/i2c-mux-pca9541.c | 2 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 2 +- + drivers/i2c/muxes/i2c-mux-pinctrl.c | 2 +- + drivers/i2c/muxes/i2c-mux-reg.c | 2 +- + drivers/iio/gyro/mpu3050-i2c.c | 2 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 2 +- + drivers/media/dvb-frontends/af9013.c | 2 +- + drivers/media/dvb-frontends/lgdt3306a.c | 2 +- + drivers/media/dvb-frontends/m88ds3103.c | 2 +- + drivers/media/dvb-frontends/rtl2830.c | 2 +- + drivers/media/dvb-frontends/rtl2832.c | 2 +- + drivers/media/dvb-frontends/si2168.c | 2 +- + drivers/media/i2c/max9286.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-i2c.c | 5 +- + drivers/of/unittest.c | 2 +- + drivers/power/supply/sbs-manager.c | 2 +- + include/linux/i2c-mux.h | 3 +- + include/linux/platform_data/i2c-mux-gpio.h | 2 - + 80 files changed, 1334 insertions(+), 787 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-pnx.txt + create mode 100644 Documentation/devicetree/bindings/i2c/nxp,pnx-i2c.yaml + create mode 100644 drivers/i2c/busses/i2c-viai2c-common.c + create mode 100644 drivers/i2c/busses/i2c-viai2c-common.h + create mode 100644 drivers/i2c/busses/i2c-viai2c-wmt.c + create mode 100644 drivers/i2c/busses/i2c-viai2c-zhaoxin.c + delete mode 100644 drivers/i2c/busses/i2c-wmt.c +Merging i2c-host/i2c/i2c-host (61e05bad821c i2c: designware: Replace MODULE_ALIAS() with MODULE_DEVICE_TABLE()) +$ 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 +Already up to date. +Merging i3c/i3c/next (acec16dbb338 i3c: dw: Add hot-join support.) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'ort' strategy. + drivers/i3c/device.c | 4 +++ + drivers/i3c/master.c | 6 ++++ + drivers/i3c/master/dw-i3c-master.c | 65 ++++++++++++++++++++++++++++++------- + drivers/i3c/master/dw-i3c-master.h | 2 ++ + drivers/i3c/master/svc-i3c-master.c | 18 +++++++--- + 5 files changed, 79 insertions(+), 16 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 +Merge made by the 'ort' strategy. + drivers/firmware/dmi-id.c | 7 ++++++- + drivers/firmware/dmi_scan.c | 17 +++++++++++++++++ + 2 files changed, 23 insertions(+), 1 deletion(-) +Merging hwmon-staging/hwmon-next (5fbf8734fb36 hwmon: (nzxt-kraken3) Bail out for unsupported device variants) +$ 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 +Already up to date. +Merging jc_docs/docs-next (955e15969c1d 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 +Merge made by the 'ort' strategy. +Merging v4l-dvb/master (4a7d735191de media: dw2102: fix coding style issues) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Auto-merging drivers/media/dvb-frontends/m88ds3103.c +Auto-merging drivers/media/platform/mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h +Auto-merging drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_hevc_req_multi_if.c +Auto-merging drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp8_if.c +Auto-merging drivers/media/platform/mediatek/vcodec/decoder/vdec/vdec_vp9_if.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/mgb4.rst | 35 +- + .../bindings/media/i2c/galaxycore,gc0308.yaml | 2 +- + .../bindings/media/i2c/galaxycore,gc2145.yaml | 2 +- + .../devicetree/bindings/media/i2c/ovti,ov2680.yaml | 35 +- + .../devicetree/bindings/media/i2c/sony,imx214.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx290.yaml | 5 +- + .../devicetree/bindings/media/i2c/sony,imx415.yaml | 2 +- + .../devicetree/bindings/media/nxp,imx8-isi.yaml | 1 + + .../devicetree/bindings/media/nxp,imx8-jpeg.yaml | 11 + + .../bindings/media/qcom,sc8280xp-camss.yaml | 512 +++++++++++ + .../userspace-api/media/cec/cec-func-open.rst | 4 +- + .../userspace-api/media/dvb/frontend_f_open.rst | 2 +- + .../userspace-api/media/v4l/func-open.rst | 4 +- + Documentation/userspace-api/media/v4l/mmap.rst | 2 +- + .../userspace-api/media/v4l/user-func.rst | 1 + + .../userspace-api/media/v4l/vidioc-remove-bufs.rst | 86 ++ + .../userspace-api/media/v4l/vidioc-reqbufs.rst | 1 + + drivers/media/cec/core/cec-core.c | 4 +- + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 9 +- + drivers/media/common/videobuf2/videobuf2-core.c | 231 +++-- + drivers/media/common/videobuf2/videobuf2-v4l2.c | 34 +- + drivers/media/dvb-core/dvbdev.c | 2 +- + drivers/media/dvb-frontends/as102_fe_types.h | 2 +- + drivers/media/dvb-frontends/cxd2880/Kconfig | 2 +- + drivers/media/dvb-frontends/drx39xyj/drx_driver.h | 2 - + drivers/media/dvb-frontends/drx39xyj/drxj.c | 51 +- + drivers/media/dvb-frontends/m88ds3103.c | 7 + + drivers/media/i2c/Kconfig | 2 + + drivers/media/i2c/adv7180.c | 2 +- + drivers/media/i2c/adv748x/adv748x-hdmi.c | 16 +- + drivers/media/i2c/adv7511-v4l2.c | 16 +- + drivers/media/i2c/adv7604.c | 20 +- + drivers/media/i2c/adv7842.c | 25 +- + drivers/media/i2c/dw9714.c | 6 +- + drivers/media/i2c/et8ek8/et8ek8_driver.c | 4 +- + drivers/media/i2c/hi556.c | 105 ++- + drivers/media/i2c/imx219.c | 77 +- + drivers/media/i2c/imx335.c | 641 +++++++------- + drivers/media/i2c/max9271.h | 5 + + drivers/media/i2c/ov2680.c | 103 ++- + drivers/media/i2c/ov2740.c | 11 +- + drivers/media/i2c/ov4689.c | 675 ++++++++------- + drivers/media/i2c/rdacm20.c | 4 +- + drivers/media/i2c/tc358743.c | 25 +- + drivers/media/i2c/tda1997x.c | 14 +- + drivers/media/i2c/ths7303.c | 10 +- + drivers/media/i2c/ths8200.c | 14 +- + drivers/media/i2c/tvp7002.c | 32 +- + drivers/media/mc/mc-devnode.c | 5 +- + drivers/media/mc/mc-entity.c | 6 + + drivers/media/mmc/siano/smssdio.c | 25 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 12 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 29 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 4 - + drivers/media/pci/ngene/ngene-core.c | 4 +- + drivers/media/pci/saa7134/saa7134-alsa.c | 9 +- + drivers/media/pci/solo6x10/solo6x10-core.c | 16 +- + drivers/media/pci/ttpci/budget-av.c | 571 ++++++------ + drivers/media/pci/ttpci/budget-ci.c | 495 ++++++----- + drivers/media/pci/ttpci/budget-core.c | 38 +- + drivers/media/pci/ttpci/budget.c | 173 ++-- + drivers/media/pci/ttpci/budget.h | 21 +- + drivers/media/platform/cadence/cdns-csi2rx.c | 26 +- + .../platform/chips-media/wave5/wave5-helper.c | 17 +- + .../platform/chips-media/wave5/wave5-vpu-dec.c | 13 +- + .../platform/chips-media/wave5/wave5-vpu-enc.c | 13 +- + .../media/platform/chips-media/wave5/wave5-vpu.c | 125 ++- + .../platform/chips-media/wave5/wave5-vpuapi.h | 4 + + .../mediatek/vcodec/common/mtk_vcodec_util.c | 23 +- + .../mediatek/vcodec/decoder/mtk_vcodec_dec.c | 2 +- + .../mediatek/vcodec/decoder/mtk_vcodec_dec_drv.h | 4 +- + .../vcodec/decoder/vdec/vdec_av1_req_lat_if.c | 42 +- + .../mediatek/vcodec/decoder/vdec/vdec_h264_if.c | 12 +- + .../vcodec/decoder/vdec/vdec_h264_req_common.h | 15 +- + .../vcodec/decoder/vdec/vdec_h264_req_if.c | 14 +- + .../vcodec/decoder/vdec/vdec_h264_req_multi_if.c | 6 +- + .../vcodec/decoder/vdec/vdec_hevc_req_multi_if.c | 4 +- + .../mediatek/vcodec/decoder/vdec/vdec_vp8_if.c | 4 +- + .../mediatek/vcodec/decoder/vdec/vdec_vp8_req_if.c | 2 +- + .../mediatek/vcodec/decoder/vdec/vdec_vp9_if.c | 4 +- + .../mediatek/vcodec/decoder/vdec_msg_queue.h | 4 +- + .../platform/mediatek/vcodec/decoder/vdec_vpu_if.h | 4 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 2 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc_pm.c | 4 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc_pm.h | 2 +- + .../mediatek/vcodec/encoder/venc/venc_h264_if.c | 5 +- + .../platform/mediatek/vcodec/encoder/venc_drv_if.c | 5 +- + .../platform/mediatek/vcodec/encoder/venc_drv_if.h | 2 +- + drivers/media/platform/nxp/imx-mipi-csis.c | 34 +- + drivers/media/platform/qcom/camss/Makefile | 2 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 108 ++- + drivers/media/platform/qcom/camss/camss-csiphy.c | 1 + + .../camss/{camss-vfe-170.c => camss-vfe-17x.c} | 0 + drivers/media/platform/qcom/camss/camss-vfe.c | 25 +- + drivers/media/platform/qcom/camss/camss-video.c | 1 + + drivers/media/platform/qcom/camss/camss.c | 307 +++++++ + drivers/media/platform/qcom/camss/camss.h | 1 + + .../media/platform/renesas/rcar-vin/rcar-v4l2.c | 9 +- + drivers/media/platform/renesas/rcar-vin/rcar-vin.h | 2 +- + drivers/media/platform/st/sti/c8sectpfe/Kconfig | 1 - + drivers/media/platform/st/sti/c8sectpfe/Makefile | 7 +- + .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 3 +- + .../platform/st/sti/c8sectpfe/c8sectpfe-debugfs.h | 5 + + drivers/media/platform/st/sti/hva/hva-hw.c | 3 +- + drivers/media/platform/ti/davinci/vpif_capture.c | 4 +- + drivers/media/platform/ti/davinci/vpif_display.c | 2 +- + .../media/platform/ti/j721e-csi2rx/j721e-csi2rx.c | 5 +- + drivers/media/platform/verisilicon/hantro_v4l2.c | 1 + + drivers/media/radio/radio-shark2.c | 2 +- + drivers/media/rc/gpio-ir-recv.c | 1 - + drivers/media/rc/imon.c | 12 +- + drivers/media/rc/ir-spi.c | 41 +- + drivers/media/rc/lirc_dev.c | 18 +- + drivers/media/spi/cxd2880-spi.c | 2 +- + drivers/media/spi/gs1662.c | 27 +- + drivers/media/test-drivers/vicodec/vicodec-core.c | 1 + + drivers/media/test-drivers/vimc/vimc-capture.c | 3 +- + drivers/media/test-drivers/visl/visl-video.c | 1 + + drivers/media/test-drivers/vivid/vivid-core.c | 9 +- + drivers/media/test-drivers/vivid/vivid-meta-out.c | 4 - + drivers/media/test-drivers/vivid/vivid-touch-cap.c | 4 - + drivers/media/tuners/xc5000.c | 39 +- + drivers/media/usb/dvb-usb-v2/anysee.c | 4 +- + drivers/media/usb/dvb-usb/dib0700_devices.c | 18 +- + drivers/media/usb/dvb-usb/dw2102.c | 462 +++++----- + drivers/media/usb/siano/smsusb.c | 20 +- + drivers/media/usb/stk1160/stk1160-video.c | 20 +- + drivers/media/usb/uvc/uvc_driver.c | 54 +- + drivers/media/usb/uvc/uvcvideo.h | 2 + + drivers/media/v4l2-core/v4l2-async.c | 22 +- + drivers/media/v4l2-core/v4l2-common.c | 2 + + drivers/media/v4l2-core/v4l2-ctrls-api.c | 33 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 6 + + drivers/media/v4l2-core/v4l2-dev.c | 6 + + drivers/media/v4l2-core/v4l2-device.c | 12 +- + drivers/media/v4l2-core/v4l2-i2c.c | 2 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 30 + + drivers/media/v4l2-core/v4l2-mem2mem.c | 15 + + drivers/media/v4l2-core/v4l2-spi.c | 2 +- + drivers/media/v4l2-core/v4l2-subdev.c | 63 +- + drivers/staging/media/atomisp/Makefile | 1 - + drivers/staging/media/atomisp/i2c/Kconfig | 15 - + drivers/staging/media/atomisp/i2c/Makefile | 5 - + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 2 +- + drivers/staging/media/atomisp/i2c/atomisp-lm3554.c | 955 --------------------- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 2 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 14 +- + drivers/staging/media/atomisp/i2c/ov2722.h | 1 - + .../staging/media/atomisp/include/linux/atomisp.h | 81 -- + .../atomisp/include/linux/atomisp_gmin_platform.h | 6 +- + .../media/atomisp/include/linux/atomisp_platform.h | 41 +- + .../staging/media/atomisp/include/media/lm3554.h | 132 --- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 283 +++--- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 13 +- + .../media/atomisp/pci/atomisp_compat_css20.c | 31 +- + drivers/staging/media/atomisp/pci/atomisp_csi2.c | 26 +- + drivers/staging/media/atomisp/pci/atomisp_fops.c | 49 +- + .../media/atomisp/pci/atomisp_gmin_platform.c | 123 +-- + .../staging/media/atomisp/pci/atomisp_internal.h | 19 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 497 +---------- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 102 +-- + drivers/staging/media/atomisp/pci/atomisp_subdev.h | 17 +- + drivers/staging/media/atomisp/pci/atomisp_tpg.c | 164 ---- + drivers/staging/media/atomisp/pci/atomisp_tpg.h | 39 - + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 185 ++-- + drivers/staging/media/atomisp/pci/bits.h | 4 +- + drivers/staging/media/atomisp/pci/defs.h | 37 - + .../pci/hive_isp_css_common/host/dma_local.h | 1 - + .../pci/hive_isp_css_common/host/input_system.c | 38 - + drivers/staging/media/atomisp/pci/hive_types.h | 19 - + drivers/staging/media/atomisp/pci/ia_css.h | 1 - + .../media/atomisp/pci/ia_css_frame_public.h | 8 - + .../media/atomisp/pci/ia_css_stream_public.h | 17 - + drivers/staging/media/atomisp/pci/ia_css_tpg.h | 79 -- + .../atomisp/pci/isp2400_input_system_global.h | 1 - + .../atomisp/pci/isp2400_input_system_public.h | 15 - + .../atomisp/pci/isp2401_input_system_global.h | 1 - + .../atomisp/pci/runtime/debug/src/ia_css_debug.c | 20 +- + .../media/atomisp/pci/runtime/ifmtr/src/ifmtr.c | 11 - + .../atomisp/pci/runtime/isys/src/virtual_isys.c | 28 +- + drivers/staging/media/atomisp/pci/sh_css.c | 138 +-- + .../staging/media/atomisp/pci/sh_css_internal.h | 1 - + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 2 +- + drivers/staging/media/atomisp/pci/sh_css_sp.c | 127 ++- + drivers/staging/media/atomisp/pci/sh_css_sp.h | 7 - + drivers/staging/media/atomisp/pci/system_global.h | 12 - + drivers/staging/media/imx/Kconfig | 1 - + drivers/staging/media/ipu3/ipu3-css-fw.c | 4 +- + drivers/staging/media/ipu3/ipu3-css-fw.h | 2 + + drivers/staging/media/ipu3/ipu3-css.c | 1 - + drivers/staging/media/ipu3/ipu3.c | 6 +- + drivers/staging/media/starfive/camss/stf-camss.c | 12 +- + drivers/staging/media/tegra-video/tegra20.c | 1 + + drivers/staging/media/tegra-video/vi.c | 12 +- + include/media/media-device.h | 6 + + include/media/v4l2-async.h | 4 +- + include/media/v4l2-device.h | 7 +- + include/media/v4l2-ioctl.h | 4 + + include/media/v4l2-mem2mem.h | 2 + + include/media/v4l2-subdev.h | 28 +- + include/media/videobuf2-core.h | 52 +- + include/media/videobuf2-v4l2.h | 2 + + include/uapi/linux/dvb/frontend.h | 2 +- + include/uapi/linux/videodev2.h | 19 +- + 204 files changed, 4421 insertions(+), 5196 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/qcom,sc8280xp-camss.yaml + create mode 100644 Documentation/userspace-api/media/v4l/vidioc-remove-bufs.rst + rename drivers/media/platform/qcom/camss/{camss-vfe-170.c => camss-vfe-17x.c} (100%) + delete mode 100644 drivers/staging/media/atomisp/i2c/atomisp-lm3554.c + delete mode 100644 drivers/staging/media/atomisp/include/media/lm3554.h + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_tpg.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_tpg.h + delete mode 100644 drivers/staging/media/atomisp/pci/defs.h + delete mode 100644 drivers/staging/media/atomisp/pci/ia_css_tpg.h +Merging v4l-dvb-next/master (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK) +$ 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/dvb-frontends/lgdt3306a.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/ipu6-isys.rst | 161 ++ + .../admin-guide/media/ipu6_isys_graph.svg | 548 ++++ + Documentation/admin-guide/media/v4l-drivers.rst | 1 + + .../bindings/media/brcm,bcm2835-unicam.yaml | 127 + + .../media/i2c/{ov8856.yaml => ovti,ov8856.yaml} | 2 +- + Documentation/driver-api/media/drivers/index.rst | 1 + + Documentation/driver-api/media/drivers/ipu6.rst | 205 ++ + Documentation/userspace-api/media/glossary.rst | 12 + + Documentation/userspace-api/media/v4l/dev-meta.rst | 21 + + .../userspace-api/media/v4l/dev-subdev.rst | 31 +- + .../userspace-api/media/v4l/meta-formats.rst | 3 +- + .../userspace-api/media/v4l/metafmt-generic.rst | 340 +++ + .../userspace-api/media/v4l/pixfmt-yuv-luma.rst | 48 + + .../userspace-api/media/v4l/subdev-formats.rst | 269 +- + .../userspace-api/media/v4l/vidioc-enum-fmt.rst | 7 + + .../media/v4l/vidioc-subdev-g-crop.rst | 6 +- + .../media/v4l/vidioc-subdev-g-routing.rst | 49 +- + .../userspace-api/media/videodev2.h.rst.exceptions | 1 + + MAINTAINERS | 19 +- + drivers/media/cec/core/cec-adap.c | 24 +- + drivers/media/cec/core/cec-api.c | 5 +- + drivers/media/common/saa7146/saa7146_hlp.c | 8 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 9 +- + drivers/media/dvb-frontends/lgdt3306a.c | 5 + + drivers/media/dvb-frontends/mxl5xx.c | 22 +- + drivers/media/dvb-frontends/si2165.c | 6 +- + drivers/media/dvb-frontends/stb0899_drv.c | 2 +- + drivers/media/dvb-frontends/tda10048.c | 9 +- + drivers/media/dvb-frontends/tda18271c2dd.c | 4 +- + drivers/media/i2c/imx214.c | 1 + + drivers/media/i2c/ov2740.c | 9 +- + drivers/media/i2c/st-mipid02.c | 2 +- + drivers/media/i2c/tc358746.c | 3 +- + drivers/media/pci/intel/Kconfig | 4 +- + drivers/media/pci/intel/Makefile | 1 + + drivers/media/pci/intel/ipu-bridge.c | 66 +- + drivers/media/pci/intel/ipu6/Kconfig | 18 + + drivers/media/pci/intel/ipu6/Makefile | 23 + + drivers/media/pci/intel/ipu6/ipu6-bus.c | 165 ++ + drivers/media/pci/intel/ipu6/ipu6-bus.h | 58 + + drivers/media/pci/intel/ipu6/ipu6-buttress.c | 917 +++++++ + drivers/media/pci/intel/ipu6/ipu6-buttress.h | 92 + + drivers/media/pci/intel/ipu6/ipu6-cpd.c | 362 +++ + drivers/media/pci/intel/ipu6/ipu6-cpd.h | 105 + + drivers/media/pci/intel/ipu6/ipu6-dma.c | 502 ++++ + drivers/media/pci/intel/ipu6/ipu6-dma.h | 19 + + drivers/media/pci/intel/ipu6/ipu6-fw-com.c | 413 +++ + drivers/media/pci/intel/ipu6/ipu6-fw-com.h | 47 + + drivers/media/pci/intel/ipu6/ipu6-fw-isys.c | 487 ++++ + drivers/media/pci/intel/ipu6/ipu6-fw-isys.h | 596 +++++ + drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 663 +++++ + drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h | 82 + + drivers/media/pci/intel/ipu6/ipu6-isys-dwc-phy.c | 536 ++++ + drivers/media/pci/intel/ipu6/ipu6-isys-jsl-phy.c | 242 ++ + drivers/media/pci/intel/ipu6/ipu6-isys-mcd-phy.c | 720 +++++ + drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 810 ++++++ + drivers/media/pci/intel/ipu6/ipu6-isys-queue.h | 78 + + drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c | 403 +++ + drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h | 59 + + drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 1420 ++++++++++ + drivers/media/pci/intel/ipu6/ipu6-isys-video.h | 141 + + drivers/media/pci/intel/ipu6/ipu6-isys.c | 1367 ++++++++++ + drivers/media/pci/intel/ipu6/ipu6-isys.h | 206 ++ + drivers/media/pci/intel/ipu6/ipu6-mmu.c | 846 ++++++ + drivers/media/pci/intel/ipu6/ipu6-mmu.h | 73 + + .../pci/intel/ipu6/ipu6-platform-buttress-regs.h | 226 ++ + .../pci/intel/ipu6/ipu6-platform-isys-csi2-reg.h | 172 ++ + drivers/media/pci/intel/ipu6/ipu6-platform-regs.h | 179 ++ + drivers/media/pci/intel/ipu6/ipu6.c | 856 ++++++ + drivers/media/pci/intel/ipu6/ipu6.h | 342 +++ + drivers/media/pci/intel/ivsc/mei_csi.c | 20 +- + drivers/media/pci/mgb4/mgb4_core.c | 4 +- + drivers/media/pci/mgb4/mgb4_regs.c | 2 +- + drivers/media/pci/netup_unidvb/netup_unidvb_i2c.c | 2 +- + drivers/media/platform/Kconfig | 1 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/broadcom/Kconfig | 23 + + drivers/media/platform/broadcom/Makefile | 3 + + .../media/platform/broadcom/bcm2835-unicam-regs.h | 246 ++ + drivers/media/platform/broadcom/bcm2835-unicam.c | 2739 ++++++++++++++++++++ + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 10 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 6 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.h | 2 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-m2m.c | 6 +- + .../mediatek/vcodec/common/mtk_vcodec_fw_scp.c | 2 + + drivers/media/platform/nvidia/tegra-vde/h264.c | 6 +- + .../platform/st/stm32/stm32-dcmipp/dcmipp-core.c | 7 +- + .../platform/sunxi/sun8i-a83t-mipi-csi2/Kconfig | 1 + + .../media/platform/verisilicon/hantro_h1_regs.h | 4 +- + drivers/media/usb/as102/as102_usb_drv.c | 2 +- + drivers/media/usb/au0828/au0828-video.c | 5 +- + drivers/media/usb/b2c2/flexcop-usb.c | 17 +- + drivers/media/usb/dvb-usb-v2/af9035.c | 10 +- + drivers/media/usb/dvb-usb/dw2102.c | 2 +- + drivers/media/usb/go7007/go7007-fw.c | 4 +- + drivers/media/usb/gspca/cpia1.c | 6 +- + drivers/media/usb/s2255/s2255drv.c | 20 +- + drivers/media/usb/stk1160/stk1160-video.c | 10 +- + drivers/media/usb/uvc/uvc_ctrl.c | 26 +- + drivers/media/v4l2-core/v4l2-async.c | 8 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 18 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 43 +- + drivers/media/v4l2-core/v4l2-subdev.c | 50 +- + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 2 +- + drivers/staging/media/ipu3/ipu3.c | 4 + + drivers/staging/media/max96712/max96712.c | 2 +- + drivers/staging/media/starfive/camss/stf-isp.c | 10 +- + drivers/staging/media/sunxi/sun6i-isp/sun6i_isp.c | 3 +- + drivers/staging/media/tegra-video/tegra20.c | 9 +- + include/media/cec.h | 4 +- + include/media/ipu6-pci-table.h | 28 + + include/media/v4l2-subdev.h | 42 + + include/uapi/linux/media-bus-format.h | 9 + + include/uapi/linux/v4l2-mediabus.h | 18 +- + include/uapi/linux/v4l2-subdev.h | 14 +- + include/uapi/linux/videodev2.h | 26 + + 116 files changed, 18494 insertions(+), 239 deletions(-) + create mode 100644 Documentation/admin-guide/media/ipu6-isys.rst + create mode 100644 Documentation/admin-guide/media/ipu6_isys_graph.svg + create mode 100644 Documentation/devicetree/bindings/media/brcm,bcm2835-unicam.yaml + rename Documentation/devicetree/bindings/media/i2c/{ov8856.yaml => ovti,ov8856.yaml} (98%) + create mode 100644 Documentation/driver-api/media/drivers/ipu6.rst + create mode 100644 Documentation/userspace-api/media/v4l/metafmt-generic.rst + create mode 100644 drivers/media/pci/intel/ipu6/Kconfig + create mode 100644 drivers/media/pci/intel/ipu6/Makefile + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-bus.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-bus.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-buttress.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-buttress.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-cpd.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-cpd.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-dma.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-dma.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-fw-com.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-fw-com.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-fw-isys.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-fw-isys.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys-dwc-phy.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys-jsl-phy.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys-mcd-phy.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys-queue.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys-queue.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys-video.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys-video.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-isys.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-mmu.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-mmu.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-platform-buttress-regs.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-platform-isys-csi2-reg.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-platform-regs.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu6.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6.h + create mode 100644 drivers/media/platform/broadcom/Kconfig + create mode 100644 drivers/media/platform/broadcom/Makefile + create mode 100644 drivers/media/platform/broadcom/bcm2835-unicam-regs.h + create mode 100644 drivers/media/platform/broadcom/bcm2835-unicam.c + create mode 100644 include/media/ipu6-pci-table.h +Merging pm/linux-next (9b0087147da0 Merge branch 'pm-cpufreq' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (fde234239d16 dt-bindings: cpufreq: cpufreq-qcom-hw: Add SM4450 compatibles) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (55f9f60852ef tools/power/cpupower: Fix Pstate frequency reporting on AMD Family 1Ah CPUs) +$ 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/utils/helpers/amd.c | 26 +++++++++++++++++++++++--- + 1 file changed, 23 insertions(+), 3 deletions(-) +Merging devfreq/devfreq-next (ccad360a2d41 PM / devfreq: exynos: Use DEFINE_SIMPLE_DEV_PM_OPS for PM functions) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging pmdomain/next (d88ea3034096 pmdomain: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + drivers/cpuidle/cpuidle-psci-domain.c | 3 +- + drivers/cpuidle/cpuidle-psci.c | 5 +- + drivers/cpuidle/cpuidle-psci.h | 20 ------- + drivers/pmdomain/core.c | 11 ++-- + drivers/pmdomain/mediatek/mt8188-pm-domains.h | 14 ++++- + drivers/pmdomain/mediatek/mtk-scpsys.c | 1 - + drivers/pmdomain/renesas/Makefile | 4 +- + drivers/pmdomain/renesas/r8a77960-sysc.c | 49 +++++++++++++++ + .../renesas/{r8a7796-sysc.c => r8a77961-sysc.c} | 28 ++------- + drivers/pmdomain/renesas/rcar-sysc.c | 70 +++++++++------------- + drivers/pmdomain/renesas/rcar-sysc.h | 9 +-- + 12 files changed, 108 insertions(+), 108 deletions(-) + create mode 100644 drivers/pmdomain/renesas/r8a77960-sysc.c + rename drivers/pmdomain/renesas/{r8a7796-sysc.c => r8a77961-sysc.c} (69%) +Merging opp/opp/linux-next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (69b08420b697 thermal: renesas: rcar: Add dependency on OF) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 ++-- + drivers/thermal/Kconfig | 28 ++--------------------- + drivers/thermal/Makefile | 4 +--- + drivers/thermal/mediatek/lvts_thermal.c | 15 +++++++----- + 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 +- + 9 files changed, 50 insertions(+), 40 deletions(-) + 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 dlm/next (7b72ab2c6a46 dlm: return -ENOMEM if ls_recover_buf fails) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'ort' strategy. + fs/dlm/ast.c | 216 ++++----- + fs/dlm/ast.h | 13 +- + fs/dlm/config.c | 8 + + fs/dlm/config.h | 2 + + fs/dlm/debug_fs.c | 323 +++----------- + fs/dlm/dir.c | 157 +++++-- + fs/dlm/dir.h | 3 +- + fs/dlm/dlm_internal.h | 129 +++--- + fs/dlm/lock.c | 1068 +++++++++++++++++++++++++------------------- + fs/dlm/lock.h | 12 +- + fs/dlm/lockspace.c | 212 +++------ + fs/dlm/lowcomms.c | 62 +-- + fs/dlm/lowcomms.h | 5 +- + fs/dlm/member.c | 25 +- + fs/dlm/memory.c | 18 +- + fs/dlm/memory.h | 4 +- + fs/dlm/midcomms.c | 67 ++- + fs/dlm/midcomms.h | 3 +- + fs/dlm/rcom.c | 33 +- + fs/dlm/recover.c | 149 ++---- + fs/dlm/recover.h | 10 +- + fs/dlm/recoverd.c | 142 ++++-- + fs/dlm/requestqueue.c | 43 +- + fs/dlm/user.c | 135 ++---- + include/trace/events/dlm.h | 46 +- + 25 files changed, 1379 insertions(+), 1506 deletions(-) +Merging rdma/for-next (49ca2b2ef3d0 RDMA/IPoIB: Fix format truncation compilation errors) +$ 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 arch/x86/include/asm/io.h +Auto-merging drivers/net/ethernet/microsoft/mana/mana_en.c +Auto-merging include/linux/io.h +Auto-merging include/net/mana/mana.h +Merge made by the 'ort' strategy. + arch/arm64/include/asm/io.h | 132 ++++++++++ + arch/arm64/kernel/io.c | 42 +++ + arch/s390/include/asm/io.h | 15 ++ + arch/s390/pci/pci.c | 6 - + arch/x86/include/asm/io.h | 17 ++ + arch/x86/lib/Makefile | 1 - + arch/x86/lib/iomap_copy_64.S | 15 -- + drivers/infiniband/core/device.c | 10 +- + drivers/infiniband/core/lag.c | 3 +- + drivers/infiniband/core/nldev.c | 23 +- + drivers/infiniband/core/restrack.c | 63 +---- + drivers/infiniband/core/roce_gid_mgmt.c | 3 +- + drivers/infiniband/core/user_mad.c | 21 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 3 +- + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 11 +- + drivers/infiniband/hw/efa/efa_com_cmd.c | 3 + + drivers/infiniband/hw/efa/efa_com_cmd.h | 1 + + drivers/infiniband/hw/efa/efa_main.c | 11 + + drivers/infiniband/hw/efa/efa_verbs.c | 19 +- + drivers/infiniband/hw/erdma/erdma.h | 13 +- + drivers/infiniband/hw/erdma/erdma_cmdq.c | 99 +++---- + drivers/infiniband/hw/erdma/erdma_cq.c | 2 +- + drivers/infiniband/hw/erdma/erdma_eq.c | 54 ++-- + drivers/infiniband/hw/erdma/erdma_hw.h | 6 +- + drivers/infiniband/hw/erdma/erdma_main.c | 15 +- + drivers/infiniband/hw/erdma/erdma_qp.c | 4 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 105 ++++---- + drivers/infiniband/hw/erdma/erdma_verbs.h | 16 +- + drivers/infiniband/hw/hfi1/ipoib_main.c | 20 +- + drivers/infiniband/hw/hfi1/pcie.c | 30 +-- + drivers/infiniband/hw/hns/hns_roce_ah.c | 31 ++- + drivers/infiniband/hw/hns/hns_roce_alloc.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 25 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 14 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 17 +- + drivers/infiniband/hw/hns/hns_roce_hem.h | 12 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 154 +++++++---- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 15 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 32 ++- + drivers/infiniband/hw/hns/hns_roce_mr.c | 19 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 29 ++- + drivers/infiniband/hw/hns/hns_roce_srq.c | 12 +- + drivers/infiniband/hw/mana/cq.c | 113 ++++---- + drivers/infiniband/hw/mana/device.c | 51 +++- + drivers/infiniband/hw/mana/main.c | 328 +++++++++++++++++++++++- + drivers/infiniband/hw/mana/mana_ib.h | 147 ++++++++++- + drivers/infiniband/hw/mana/mr.c | 2 +- + drivers/infiniband/hw/mana/qp.c | 126 +++------ + drivers/infiniband/hw/mana/wq.c | 31 +-- + drivers/infiniband/hw/mlx5/main.c | 3 +- + drivers/infiniband/hw/mlx5/mem.c | 8 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 3 +- + drivers/infiniband/hw/mlx5/mr.c | 35 ++- + drivers/infiniband/hw/mlx5/qp.c | 3 +- + drivers/infiniband/hw/mlx5/restrack.c | 29 +++ + drivers/infiniband/sw/rxe/rxe_comp.c | 32 +-- + drivers/infiniband/sw/rxe/rxe_hw_counters.c | 2 +- + drivers/infiniband/sw/rxe/rxe_hw_counters.h | 2 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 3 +- + drivers/infiniband/sw/rxe/rxe_net.c | 69 ++--- + drivers/infiniband/sw/rxe/rxe_pool.c | 4 +- + drivers/infiniband/sw/rxe/rxe_qp.c | 46 ++-- + drivers/infiniband/sw/rxe/rxe_req.c | 82 ++---- + drivers/infiniband/sw/rxe/rxe_resp.c | 14 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 17 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 7 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 8 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 4 - + drivers/net/ethernet/microsoft/mana/mana_en.c | 14 +- + include/linux/io.h | 8 +- + include/net/mana/mana.h | 1 + + include/rdma/restrack.h | 7 +- + include/uapi/rdma/efa-abi.h | 7 + + include/uapi/rdma/hns-abi.h | 9 +- + include/uapi/rdma/mana-abi.h | 12 + + include/uapi/rdma/rdma_netlink.h | 6 + + lib/iomap_copy.c | 13 +- + 78 files changed, 1593 insertions(+), 782 deletions(-) + delete mode 100644 arch/x86/lib/iomap_copy_64.S +Merging net-next/main (654de42f3fc6 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging Documentation/devicetree/bindings/net/stm32-dwmac.yaml +Auto-merging MAINTAINERS +Auto-merging crypto/Makefile +Auto-merging drivers/infiniband/ulp/ipoib/ipoib_main.c +Auto-merging drivers/net/ethernet/atheros/alx/main.c +Auto-merging drivers/net/ethernet/hisilicon/hns3/hns3_enet.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_xsk.c +Auto-merging drivers/net/ethernet/intel/ice/ice_xsk.c +Auto-merging drivers/net/ethernet/intel/igc/igc_main.c +Auto-merging drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging drivers/net/ethernet/stmicro/stmmac/stmmac_main.c +Auto-merging drivers/net/fjes/fjes_main.c +Auto-merging drivers/net/wireless/ath/ath10k/pci.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/Makefile +CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/Makefile +Auto-merging drivers/net/wireless/realtek/rtw88/pci.c +Auto-merging drivers/net/wireless/realtek/rtw89/pci.c +Auto-merging drivers/of/property.c +CONFLICT (content): Merge conflict in drivers/of/property.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/super.c +Auto-merging include/linux/bitops.h +Auto-merging include/linux/bpf.h +Auto-merging include/linux/compiler_types.h +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/skmsg.h +Auto-merging include/linux/slab.h +CONFLICT (content): Merge conflict in include/linux/slab.h +Auto-merging include/net/netlink.h +Auto-merging include/net/page_pool/types.h +Auto-merging include/net/request_sock.h +Auto-merging ipc/ipc_sysctl.c +Auto-merging ipc/mq_sysctl.c +Auto-merging kernel/bpf/arena.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/trampoline.c +Auto-merging net/core/page_pool.c +CONFLICT (content): Merge conflict in net/core/page_pool.c +Auto-merging net/iucv/iucv.c +Auto-merging samples/bpf/Makefile +Auto-merging scripts/kernel-doc +Auto-merging tools/include/linux/bitops.h +Auto-merging tools/testing/selftests/Makefile +Auto-merging tools/testing/selftests/lib.mk +Resolved 'drivers/net/wireless/intel/iwlwifi/mvm/Makefile' using previous resolution. +Resolved 'drivers/of/property.c' using previous resolution. +Resolved 'include/linux/slab.h' using previous resolution. +Resolved 'net/core/page_pool.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 489926c2afa0] Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/sysctl/net.rst | 1 + + .../bpf/standardization/instruction-set.rst | 109 +- + Documentation/conf.py | 2 + + .../devicetree/bindings/net/airoha,en8811h.yaml | 56 + + .../net/bluetooth/mediatek,mt7921s-bluetooth.yaml | 55 + + .../bindings/net/broadcom-bluetooth.yaml | 33 +- + .../devicetree/bindings/net/nxp,dwmac-imx.yaml | 4 + + .../bindings/net/pse-pd/microchip,pd692x0.yaml | 169 ++ + .../bindings/net/pse-pd/pse-controller.yaml | 101 +- + .../bindings/net/pse-pd/ti,tps23881.yaml | 95 + + .../devicetree/bindings/net/qcom,ipq4019-mdio.yaml | 2 + + .../devicetree/bindings/net/renesas,etheravb.yaml | 12 +- + .../devicetree/bindings/net/renesas,ethertsn.yaml | 33 +- + .../devicetree/bindings/net/renesas,rzn1-gmac.yaml | 66 + + .../devicetree/bindings/net/rockchip-dwmac.yaml | 4 +- + .../devicetree/bindings/net/snps,dwmac.yaml | 20 +- + .../bindings/net/starfive,jh7110-dwmac.yaml | 26 +- + .../devicetree/bindings/net/stm32-dwmac.yaml | 7 + + .../devicetree/bindings/net/ti,icssg-prueth.yaml | 35 +- + .../bindings/net/wireless/brcm,bcm4329-fmac.yaml | 1 + + .../bindings/net/wireless/qcom,ath10k.yaml | 6 + + .../bindings/net/wireless/qcom,ath11k.yaml | 3 + + Documentation/mm/page_frags.rst | 2 +- + Documentation/netlink/genetlink-c.yaml | 2 +- + Documentation/netlink/genetlink-legacy.yaml | 2 +- + Documentation/netlink/genetlink.yaml | 2 +- + Documentation/netlink/netlink-raw.yaml | 2 +- + Documentation/netlink/specs/ethtool.yaml | 55 +- + Documentation/netlink/specs/netdev.yaml | 119 + + Documentation/netlink/specs/nftables.yaml | 1264 ++++++++ + Documentation/netlink/specs/nlctrl.yaml | 6 +- + Documentation/netlink/specs/rt_link.yaml | 483 +++- + Documentation/netlink/specs/tc.yaml | 72 +- + Documentation/netlink/specs/team.yaml | 204 ++ + .../ethernet/mellanox/mlx5/counters.rst | 11 + + Documentation/networking/devlink/devlink-info.rst | 5 + + Documentation/networking/devlink/devlink-port.rst | 33 + + Documentation/networking/devlink/hns3.rst | 5 + + Documentation/networking/devlink/ice.rst | 47 + + Documentation/networking/devlink/nfp.rst | 5 +- + Documentation/networking/dns_resolver.rst | 4 +- + Documentation/networking/ethtool-netlink.rst | 29 + + Documentation/networking/filter.rst | 4 +- + Documentation/networking/index.rst | 1 + + Documentation/networking/nf_conntrack-sysctl.rst | 4 +- + Documentation/networking/pse-pd/index.rst | 10 + + Documentation/networking/pse-pd/introduction.rst | 73 + + Documentation/networking/pse-pd/pse-pi.rst | 301 ++ + Documentation/networking/xfrm_proc.rst | 6 + + Documentation/translations/zh_CN/mm/page_frags.rst | 2 +- + .../userspace-api/netlink/genetlink-legacy.rst | 22 +- + MAINTAINERS | 52 + + arch/arc/Kbuild | 1 + + arch/arc/Kconfig | 1 + + arch/arc/net/Makefile | 6 + + arch/arc/net/bpf_jit.h | 164 ++ + arch/arc/net/bpf_jit_arcv2.c | 3005 ++++++++++++++++++++ + arch/arc/net/bpf_jit_core.c | 1425 ++++++++++ + arch/arm/net/bpf_jit_32.c | 25 +- + arch/arm64/include/asm/insn.h | 8 + + arch/arm64/lib/insn.c | 11 + + arch/arm64/net/bpf_jit.h | 8 + + arch/arm64/net/bpf_jit_comp.c | 178 +- + arch/loongarch/net/bpf_jit.c | 22 +- + arch/mips/net/bpf_jit_comp.c | 3 +- + arch/parisc/net/bpf_jit_core.c | 8 +- + arch/riscv/net/bpf_jit.h | 6 +- + arch/riscv/net/bpf_jit_comp64.c | 273 +- + arch/riscv/net/bpf_jit_core.c | 2 + + arch/s390/net/bpf_jit_comp.c | 14 +- + arch/sparc/net/bpf_jit_comp_64.c | 6 +- + arch/x86/net/bpf_jit_comp.c | 102 +- + arch/x86/net/bpf_jit_comp32.c | 3 +- + crypto/Makefile | 3 + + crypto/af_alg.c | 4 +- + crypto/bpf_crypto_skcipher.c | 82 + + drivers/atm/fore200e.c | 3 - + drivers/atm/fore200e.h | 1 - + drivers/bcma/host_soc.c | 6 +- + drivers/bluetooth/Kconfig | 11 + + drivers/bluetooth/Makefile | 1 + + drivers/bluetooth/ath3k.c | 25 +- + drivers/bluetooth/btintel.c | 88 +- + drivers/bluetooth/btintel.h | 51 +- + drivers/bluetooth/btintel_pcie.c | 1357 +++++++++ + drivers/bluetooth/btintel_pcie.h | 430 +++ + drivers/bluetooth/btmrvl_main.c | 9 - + drivers/bluetooth/btqca.c | 47 +- + drivers/bluetooth/btqca.h | 58 +- + drivers/bluetooth/btqcomsmd.c | 6 +- + drivers/bluetooth/btrsi.c | 1 - + drivers/bluetooth/btrtl.c | 7 + + drivers/bluetooth/btsdio.c | 8 - + drivers/bluetooth/btusb.c | 55 +- + drivers/bluetooth/hci_bcm.c | 8 +- + drivers/bluetooth/hci_bcm4377.c | 1 - + drivers/bluetooth/hci_intel.c | 25 +- + drivers/bluetooth/hci_ldisc.c | 6 - + drivers/bluetooth/hci_serdev.c | 5 - + drivers/bluetooth/hci_uart.h | 1 - + drivers/bluetooth/hci_vhci.c | 10 +- + drivers/bluetooth/virtio_bt.c | 2 - + drivers/bus/mhi/host/internal.h | 4 +- + drivers/bus/mhi/host/pm.c | 42 +- + .../crypto/marvell/octeontx2/otx2_cpt_devlink.c | 9 +- + drivers/infiniband/core/addr.c | 12 +- + drivers/infiniband/hw/hfi1/netdev.h | 2 +- + drivers/infiniband/hw/hfi1/netdev_rx.c | 9 +- + drivers/infiniband/hw/irdma/cm.c | 3 +- + drivers/infiniband/hw/qedr/qedr_iw_cm.c | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 4 +- + drivers/isdn/capi/Makefile | 3 +- + drivers/isdn/capi/kcapi.c | 7 +- + drivers/md/dm-clone-metadata.c | 5 - + drivers/net/Kconfig | 16 +- + drivers/net/Makefile | 1 + + drivers/net/arcnet/Kconfig | 2 +- + drivers/net/arcnet/arcdevice.h | 3 +- + drivers/net/arcnet/arcnet.c | 11 +- + drivers/net/bareudp.c | 19 +- + drivers/net/bonding/bond_main.c | 12 +- + drivers/net/bonding/bond_netlink.c | 3 +- + drivers/net/bonding/bond_options.c | 2 +- + drivers/net/bonding/bond_procfs.c | 2 +- + drivers/net/bonding/bond_sysfs.c | 25 +- + drivers/net/bonding/bond_sysfs_slave.c | 2 +- + drivers/net/can/cc770/Kconfig | 1 + + drivers/net/can/dev/dev.c | 2 +- + drivers/net/can/sja1000/Kconfig | 1 + + drivers/net/can/vcan.c | 2 +- + drivers/net/can/vxcan.c | 2 +- + drivers/net/dsa/b53/b53_common.c | 212 +- + drivers/net/dsa/b53/b53_priv.h | 12 - + drivers/net/dsa/bcm_sf2.c | 49 +- + drivers/net/dsa/hirschmann/hellcreek_ptp.c | 25 +- + drivers/net/dsa/lan9303-core.c | 38 +- + drivers/net/dsa/lantiq_gswip.c | 39 +- + drivers/net/dsa/microchip/Kconfig | 2 + + drivers/net/dsa/microchip/Makefile | 2 +- + drivers/net/dsa/microchip/ksz8.h | 9 +- + drivers/net/dsa/microchip/ksz8795.c | 249 +- + drivers/net/dsa/microchip/ksz8795_reg.h | 10 +- + drivers/net/dsa/microchip/ksz9477.c | 6 - + drivers/net/dsa/microchip/ksz9477_tc_flower.c | 3 + + drivers/net/dsa/microchip/ksz_common.c | 224 +- + drivers/net/dsa/microchip/ksz_common.h | 16 +- + drivers/net/dsa/microchip/ksz_dcb.c | 809 ++++++ + drivers/net/dsa/microchip/ksz_dcb.h | 23 + + drivers/net/dsa/microchip/ksz_spi.c | 8 - + drivers/net/dsa/mt7530-mdio.c | 28 +- + drivers/net/dsa/mt7530.c | 479 ++-- + drivers/net/dsa/mt7530.h | 279 +- + drivers/net/dsa/mv88e6xxx/chip.c | 117 +- + drivers/net/dsa/mv88e6xxx/chip.h | 6 + + drivers/net/dsa/mv88e6xxx/global1.c | 89 + + drivers/net/dsa/mv88e6xxx/global1.h | 2 + + drivers/net/dsa/ocelot/felix_vsc9959.c | 3 + + drivers/net/dsa/qca/ar9331.c | 37 +- + drivers/net/dsa/qca/qca8k-8xxx.c | 49 +- + drivers/net/dsa/realtek/realtek.h | 2 + + drivers/net/dsa/realtek/rtl8365mb.c | 32 +- + drivers/net/dsa/realtek/rtl8366rb.c | 392 ++- + drivers/net/dsa/realtek/rtl83xx.c | 8 +- + drivers/net/dsa/rzn1_a5psw.c | 47 +- + drivers/net/dsa/sja1105/sja1105_flower.c | 3 + + drivers/net/dsa/sja1105/sja1105_main.c | 39 +- + drivers/net/dsa/vitesse-vsc73xx-core.c | 263 +- + drivers/net/dsa/vitesse-vsc73xx.h | 27 +- + drivers/net/dsa/xrs700x/xrs700x.c | 26 +- + drivers/net/ethernet/3com/3c515.c | 3 - + drivers/net/ethernet/3com/3c589_cs.c | 2 +- + drivers/net/ethernet/3com/Kconfig | 4 +- + drivers/net/ethernet/8390/Kconfig | 6 +- + drivers/net/ethernet/8390/etherh.c | 2 +- + drivers/net/ethernet/8390/pcnet_cs.c | 2 +- + drivers/net/ethernet/adi/adin1110.c | 2 +- + drivers/net/ethernet/agere/et131x.c | 2 +- + drivers/net/ethernet/alteon/acenic.c | 2 +- + drivers/net/ethernet/altera/altera_tse_main.c | 2 +- + drivers/net/ethernet/amazon/ena/ena_com.h | 6 +- + drivers/net/ethernet/amazon/ena/ena_eth_com.c | 37 +- + drivers/net/ethernet/amazon/ena/ena_eth_com.h | 2 +- + drivers/net/ethernet/amazon/ena/ena_ethtool.c | 15 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 39 +- + drivers/net/ethernet/amazon/ena/ena_netdev.h | 1 + + drivers/net/ethernet/amazon/ena/ena_regs_defs.h | 1 + + drivers/net/ethernet/amd/Kconfig | 4 +- + drivers/net/ethernet/amd/amd8111e.c | 7 +- + drivers/net/ethernet/amd/amd8111e.h | 1 - + drivers/net/ethernet/amd/nmclan_cs.c | 2 +- + drivers/net/ethernet/amd/pds_core/core.h | 3 +- + drivers/net/ethernet/amd/pds_core/devlink.c | 3 +- + drivers/net/ethernet/amd/xgbe/xgbe-drv.c | 2 +- + drivers/net/ethernet/amd/xgbe/xgbe-platform.c | 8 - + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 2 +- + drivers/net/ethernet/aquantia/atlantic/aq_main.c | 2 +- + drivers/net/ethernet/atheros/ag71xx.c | 2 +- + drivers/net/ethernet/atheros/alx/main.c | 2 +- + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 2 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 2 +- + drivers/net/ethernet/broadcom/b44.c | 4 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- + drivers/net/ethernet/broadcom/bnx2.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_cmn.c | 2 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 704 +++-- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 45 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_devlink.c | 13 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ethtool.c | 241 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 184 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.c | 30 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ptp.h | 5 + + drivers/net/ethernet/broadcom/bnxt/bnxt_tc.c | 4 + + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.c | 169 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_ulp.h | 17 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.c | 30 +- + drivers/net/ethernet/broadcom/bnxt/bnxt_xdp.h | 2 +- + drivers/net/ethernet/broadcom/cnic.c | 3 +- + drivers/net/ethernet/broadcom/tg3.c | 32 +- + drivers/net/ethernet/brocade/bna/bnad.c | 2 +- + drivers/net/ethernet/cadence/macb_main.c | 2 +- + drivers/net/ethernet/calxeda/xgmac.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_core.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 2 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 2 +- + drivers/net/ethernet/cavium/thunder/nicvf_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb/cxgb2.c | 2 +- + drivers/net/ethernet/chelsio/cxgb3/cxgb3_main.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 2 +- + .../net/ethernet/chelsio/cxgb4/cxgb4_tc_flower.c | 67 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_uld.c | 2 +- + .../net/ethernet/chelsio/cxgb4vf/cxgb4vf_main.c | 2 +- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 1 + + drivers/net/ethernet/cisco/enic/enic_main.c | 2 +- + drivers/net/ethernet/cisco/enic/vnic_dev.c | 20 +- + drivers/net/ethernet/cisco/enic/vnic_dev.h | 5 + + drivers/net/ethernet/cortina/gemini.c | 2 +- + drivers/net/ethernet/dlink/sundance.c | 2 +- + drivers/net/ethernet/emulex/benet/be_main.c | 5 +- + drivers/net/ethernet/faraday/ftmac100.c | 2 +- + drivers/net/ethernet/freescale/dpaa/dpaa_eth.c | 2 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 16 +- + .../ethernet/freescale/dpaa2/dpaa2-switch-flower.c | 6 + + .../net/ethernet/freescale/dpaa2/dpaa2-switch.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- + drivers/net/ethernet/freescale/fman/fman_memac.c | 1 - + drivers/net/ethernet/freescale/fman/fman_muram.c | 1 - + drivers/net/ethernet/freescale/gianfar.c | 2 +- + drivers/net/ethernet/fujitsu/Kconfig | 2 +- + drivers/net/ethernet/fungible/funeth/funeth_main.c | 2 +- + drivers/net/ethernet/google/gve/gve.h | 97 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 229 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 50 +- + drivers/net/ethernet/google/gve/gve_dqo.h | 6 + + drivers/net/ethernet/google/gve/gve_ethtool.c | 160 +- + drivers/net/ethernet/google/gve/gve_main.c | 621 ++-- + drivers/net/ethernet/google/gve/gve_rx.c | 138 +- + drivers/net/ethernet/google/gve/gve_rx_dqo.c | 140 +- + drivers/net/ethernet/google/gve/gve_tx.c | 31 +- + drivers/net/ethernet/google/gve/gve_tx_dqo.c | 22 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 2 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 13 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 19 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 24 +- + drivers/net/ethernet/hisilicon/hns3/hns3_enet.c | 2 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.c | 646 ++++- + .../ethernet/hisilicon/hns3/hns3pf/hclge_debugfs.h | 643 +---- + .../ethernet/hisilicon/hns3/hns3pf/hclge_devlink.c | 44 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_devlink.h | 2 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 433 ++- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 36 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 81 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 1 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_trace.h | 94 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 40 + + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_trace.h | 50 + + drivers/net/ethernet/huawei/hinic/hinic_main.c | 2 +- + drivers/net/ethernet/ibm/emac/core.c | 4 +- + drivers/net/ethernet/ibm/emac/mal.c | 14 +- + drivers/net/ethernet/ibm/emac/mal.h | 2 +- + drivers/net/ethernet/ibm/ibmveth.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 10 +- + drivers/net/ethernet/intel/Kconfig | 9 +- + drivers/net/ethernet/intel/Makefile | 3 + + drivers/net/ethernet/intel/e100.c | 8 +- + drivers/net/ethernet/intel/e1000/e1000_main.c | 16 +- + drivers/net/ethernet/intel/e1000e/defines.h | 2 - + drivers/net/ethernet/intel/e1000e/ethtool.c | 62 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 24 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 10 +- + drivers/net/ethernet/intel/i40e/i40e.h | 29 +- + drivers/net/ethernet/intel/i40e/i40e_client.c | 28 +- + drivers/net/ethernet/intel/i40e/i40e_common.c | 253 -- + drivers/net/ethernet/intel/i40e/i40e_ddp.c | 3 +- + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 36 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 29 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 225 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 1160 ++++---- + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 7 - + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 6 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 92 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 2 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 88 - + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 14 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 3 +- + drivers/net/ethernet/intel/iavf/iavf.h | 2 +- + drivers/net/ethernet/intel/iavf/iavf_common.c | 253 -- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 140 - + drivers/net/ethernet/intel/iavf/iavf_main.c | 54 +- + drivers/net/ethernet/intel/iavf/iavf_prototype.h | 7 - + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 551 +--- + drivers/net/ethernet/intel/iavf/iavf_txrx.h | 146 +- + drivers/net/ethernet/intel/iavf/iavf_type.h | 90 - + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 17 +- + drivers/net/ethernet/intel/ice/Makefile | 7 +- + .../intel/ice/{ice_devlink.c => devlink/devlink.c} | 575 ++-- + .../intel/ice/{ice_devlink.h => devlink/devlink.h} | 0 + .../net/ethernet/intel/ice/devlink/devlink_port.c | 430 +++ + .../net/ethernet/intel/ice/devlink/devlink_port.h | 12 + + drivers/net/ethernet/intel/ice/ice.h | 26 +- + drivers/net/ethernet/intel/ice/ice_adapter.c | 116 + + drivers/net/ethernet/intel/ice/ice_adapter.h | 28 + + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 34 + + drivers/net/ethernet/intel/ice/ice_base.c | 47 +- + drivers/net/ethernet/intel/ice/ice_common.c | 21 +- + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 6 +- + drivers/net/ethernet/intel/ice/ice_ddp.c | 218 ++ + drivers/net/ethernet/intel/ice/ice_ddp.h | 2 + + drivers/net/ethernet/intel/ice/ice_devids.h | 22 +- + drivers/net/ethernet/intel/ice/ice_eswitch.c | 369 +-- + drivers/net/ethernet/intel/ice/ice_eswitch.h | 13 +- + drivers/net/ethernet/intel/ice/ice_ethtool_fdir.c | 140 +- + drivers/net/ethernet/intel/ice/ice_fdir.c | 111 +- + drivers/net/ethernet/intel/ice/ice_fdir.h | 5 + + drivers/net/ethernet/intel/ice/ice_flex_type.h | 4 +- + drivers/net/ethernet/intel/ice/ice_fw_update.c | 7 +- + drivers/net/ethernet/intel/ice/ice_fw_update.h | 3 + + drivers/net/ethernet/intel/ice/ice_lag.c | 53 +- + drivers/net/ethernet/intel/ice/ice_lag.h | 3 +- + drivers/net/ethernet/intel/ice/ice_lan_tx_rx.h | 320 --- + drivers/net/ethernet/intel/ice/ice_lib.c | 83 +- + drivers/net/ethernet/intel/ice/ice_lib.h | 39 +- + drivers/net/ethernet/intel/ice/ice_main.c | 239 +- + drivers/net/ethernet/intel/ice/ice_nvm.c | 7 +- + drivers/net/ethernet/intel/ice/ice_nvm.h | 3 + + drivers/net/ethernet/intel/ice/ice_protocol_type.h | 12 + + drivers/net/ethernet/intel/ice/ice_ptp.c | 33 +- + drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 3 + + drivers/net/ethernet/intel/ice/ice_repr.c | 135 +- + drivers/net/ethernet/intel/ice/ice_repr.h | 24 +- + drivers/net/ethernet/intel/ice/ice_sched.c | 37 +- + drivers/net/ethernet/intel/ice/ice_sched.h | 11 + + drivers/net/ethernet/intel/ice/ice_sriov.c | 42 +- + drivers/net/ethernet/intel/ice/ice_sriov.h | 7 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 276 +- + drivers/net/ethernet/intel/ice/ice_switch.h | 8 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 128 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.h | 8 +- + drivers/net/ethernet/intel/ice/ice_txrx.c | 3 +- + drivers/net/ethernet/intel/ice/ice_txrx.h | 1 + + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 122 +- + drivers/net/ethernet/intel/ice/ice_type.h | 5 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.c | 13 +- + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 14 +- + drivers/net/ethernet/intel/ice/ice_vsi_vlan_ops.c | 1 - + drivers/net/ethernet/intel/ice/ice_xsk.c | 3 +- + drivers/net/ethernet/intel/idpf/idpf_lib.c | 2 +- + drivers/net/ethernet/intel/idpf/idpf_txrx.c | 5 +- + drivers/net/ethernet/intel/idpf/idpf_txrx.h | 2 + + drivers/net/ethernet/intel/idpf/virtchnl2.h | 24 +- + drivers/net/ethernet/intel/igb/igb_ethtool.c | 15 - + drivers/net/ethernet/intel/igb/igb_main.c | 64 +- + drivers/net/ethernet/intel/igbvf/netdev.c | 8 +- + drivers/net/ethernet/intel/igc/igc.h | 71 +- + drivers/net/ethernet/intel/igc/igc_ethtool.c | 17 - + drivers/net/ethernet/intel/igc/igc_main.c | 179 +- + drivers/net/ethernet/intel/igc/igc_ptp.c | 51 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 21 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_type.h | 1 - + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 3 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 10 +- + drivers/net/ethernet/intel/libeth/Kconfig | 9 + + drivers/net/ethernet/intel/libeth/Makefile | 6 + + drivers/net/ethernet/intel/libeth/rx.c | 150 + + drivers/net/ethernet/intel/libie/Kconfig | 10 + + drivers/net/ethernet/intel/libie/Makefile | 6 + + drivers/net/ethernet/intel/libie/rx.c | 124 + + drivers/net/ethernet/jme.c | 2 +- + drivers/net/ethernet/lantiq_etop.c | 2 +- + drivers/net/ethernet/lantiq_xrx200.c | 4 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 2 +- + drivers/net/ethernet/marvell/mvneta.c | 5 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 11 +- + .../net/ethernet/marvell/octeon_ep/octep_main.c | 2 +- + .../ethernet/marvell/octeon_ep_vf/octep_vf_main.c | 2 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 27 + + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 1 + + .../ethernet/marvell/octeontx2/af/lmac_common.h | 1 + + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 7 +- + drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 17 + + drivers/net/ethernet/marvell/octeontx2/af/rpm.h | 3 + + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 29 + + .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 12 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 2 + + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 3 + + .../ethernet/marvell/octeontx2/nic/otx2_devlink.c | 3 +- + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 1 + + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 42 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 21 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 3 + + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.h | 3 + + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 +- + drivers/net/ethernet/marvell/octeontx2/nic/qos.c | 80 +- + .../ethernet/marvell/prestera/prestera_flower.c | 4 + + .../net/ethernet/marvell/prestera/prestera_hw.c | 83 +- + .../net/ethernet/marvell/prestera/prestera_main.c | 6 +- + .../net/ethernet/marvell/prestera/prestera_rxtx.c | 15 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/marvell/skge.c | 4 +- + drivers/net/ethernet/marvell/sky2.c | 5 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 19 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 2 +- + drivers/net/ethernet/mediatek/mtk_ppe.c | 2 +- + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 4 + + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 1 + + drivers/net/ethernet/mellanox/mlx4/main.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/debugfs.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en.h | 45 +- + .../net/ethernet/mellanox/mlx5/core/en/channels.c | 83 + + .../net/ethernet/mellanox/mlx5/core/en/channels.h | 4 + + drivers/net/ethernet/mellanox/mlx5/core/en/dim.h | 45 + + .../net/ethernet/mellanox/mlx5/core/en/params.c | 72 +- + .../net/ethernet/mellanox/mlx5/core/en/params.h | 5 - + drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 50 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 1 + + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.h | 2 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 6 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_geneve.c | 12 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_gre.c | 8 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 6 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 2 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.h | 4 +- + .../mellanox/mlx5/core/en_accel/ipsec_stats.c | 28 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 14 +- + .../mellanox/mlx5/core/en_accel/ktls_stats.c | 26 +- + .../mellanox/mlx5/core/en_accel/macsec_stats.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en_dim.c | 95 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 345 ++- + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 310 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 82 +- + .../net/ethernet/mellanox/mlx5/core/en_selftest.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 539 ++-- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 16 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 29 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_txrx.c | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 9 +- + .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 2 +- + .../ethernet/mellanox/mlx5/core/esw/devlink_port.c | 4 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 7 + + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 100 +- + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/fw.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 2 +- + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 3 - + .../net/ethernet/mellanox/mlx5/core/lag/port_sel.c | 8 +- + .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.c | 252 +- + .../net/ethernet/mellanox/mlx5/core/lib/fs_ttc.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/pagealloc.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/pci_irq.c | 52 - + .../mellanox/mlx5/core/steering/dr_ste_v0.c | 2 +- + .../mellanox/mlx5/core/steering/dr_ste_v1.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 530 ++-- + drivers/net/ethernet/mellanox/mlxsw/pci_hw.h | 4 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 3 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 2 +- + .../ethernet/mellanox/mlxsw/spectrum_acl_tcam.c | 3 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 60 + + .../net/ethernet/mellanox/mlxsw/spectrum_flower.c | 4 + + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.c | 56 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ipip.h | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 12 +- + drivers/net/ethernet/micrel/ksz884x.c | 2 +- + drivers/net/ethernet/microchip/encx24j600-regmap.c | 4 +- + drivers/net/ethernet/microchip/encx24j600.c | 7 +- + drivers/net/ethernet/microchip/encx24j600_hw.h | 2 +- + drivers/net/ethernet/microchip/lan743x_ethtool.c | 21 - + drivers/net/ethernet/microchip/lan743x_main.c | 13 +- + drivers/net/ethernet/microchip/lan743x_ptp.c | 4 +- + drivers/net/ethernet/microchip/lan743x_ptp.h | 1 + + .../net/ethernet/microchip/lan966x/lan966x_ifh.h | 2 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 6 +- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 2 +- + .../net/ethernet/microchip/lan966x/lan966x_port.c | 2 +- + .../ethernet/microchip/lan966x/lan966x_tc_flower.c | 14 +- + .../net/ethernet/microchip/lan966x/lan966x_vlan.c | 2 +- + drivers/net/ethernet/microchip/sparx5/Makefile | 3 +- + .../net/ethernet/microchip/sparx5/sparx5_fdma.c | 2 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 3 + + .../net/ethernet/microchip/sparx5/sparx5_main.h | 25 + + .../ethernet/microchip/sparx5/sparx5_main_regs.h | 68 + + .../net/ethernet/microchip/sparx5/sparx5_mirror.c | 235 ++ + .../net/ethernet/microchip/sparx5/sparx5_packet.c | 2 +- + .../net/ethernet/microchip/sparx5/sparx5_port.c | 2 +- + .../ethernet/microchip/sparx5/sparx5_switchdev.c | 2 +- + .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 88 +- + .../ethernet/microchip/sparx5/sparx5_tc_matchall.c | 125 +- + drivers/net/ethernet/microchip/vcap/vcap_ag_api.h | 2 +- + drivers/net/ethernet/microchip/vcap/vcap_api.c | 16 +- + .../net/ethernet/microchip/vcap/vcap_api_client.h | 4 +- + .../net/ethernet/microchip/vcap/vcap_api_private.h | 2 +- + drivers/net/ethernet/microsoft/Kconfig | 3 +- + drivers/net/ethernet/microsoft/mana/mana_en.c | 4 +- + drivers/net/ethernet/mscc/ocelot_flower.c | 7 +- + drivers/net/ethernet/myricom/myri10ge/myri10ge.c | 8 +- + drivers/net/ethernet/natsemi/natsemi.c | 2 +- + drivers/net/ethernet/neterion/s2io.c | 2 +- + drivers/net/ethernet/netronome/nfp/devlink_param.c | 3 +- + drivers/net/ethernet/netronome/nfp/flower/action.c | 27 +- + .../net/ethernet/netronome/nfp/flower/offload.c | 6 +- + drivers/net/ethernet/netronome/nfp/nfp_devlink.c | 1 + + .../net/ethernet/netronome/nfp/nfp_net_common.c | 7 +- + .../net/ethernet/netronome/nfp/nfp_net_debugdump.c | 41 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.c | 2 +- + drivers/net/ethernet/ni/nixge.c | 2 +- + drivers/net/ethernet/nvidia/forcedeth.c | 2 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 2 +- + drivers/net/ethernet/pasemi/pasemi_mac.c | 2 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 4 +- + drivers/net/ethernet/qlogic/netxen/netxen_nic_hw.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed.h | 2 - + drivers/net/ethernet/qlogic/qed/qed_devlink.c | 3 +- + drivers/net/ethernet/qlogic/qed/qed_main.c | 12 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 2 +- + drivers/net/ethernet/qlogic/qede/qede_filter.c | 138 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_hw.c | 2 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 2 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 2 +- + drivers/net/ethernet/realtek/8139cp.c | 4 +- + drivers/net/ethernet/realtek/r8169_main.c | 4 +- + drivers/net/ethernet/renesas/ravb_main.c | 11 +- + drivers/net/ethernet/renesas/sh_eth.c | 2 +- + drivers/net/ethernet/rocker/rocker_main.c | 2 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_main.c | 2 +- + drivers/net/ethernet/sfc/efx_common.c | 2 +- + drivers/net/ethernet/sfc/falcon/efx.c | 2 +- + drivers/net/ethernet/sfc/siena/efx_common.c | 2 +- + drivers/net/ethernet/sfc/tc.c | 7 +- + drivers/net/ethernet/sis/Kconfig | 4 +- + drivers/net/ethernet/sis/sis900.c | 6 +- + drivers/net/ethernet/smsc/Kconfig | 2 +- + drivers/net/ethernet/smsc/smc91c92_cs.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 12 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/common.h | 2 +- + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 12 + + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 2 - + drivers/net/ethernet/stmicro/stmmac/dwmac-rzn1.c | 86 + + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 107 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 8 +- + drivers/net/ethernet/stmicro/stmmac/hwif.h | 8 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 20 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 90 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 50 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 30 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 58 +- + drivers/net/ethernet/sun/cassini.c | 3 +- + drivers/net/ethernet/sun/niu.c | 2 +- + drivers/net/ethernet/sun/sungem.c | 2 +- + drivers/net/ethernet/synopsys/dwc-xlgmac-net.c | 2 +- + drivers/net/ethernet/tehuti/tehuti.c | 2 +- + drivers/net/ethernet/ti/Kconfig | 17 +- + drivers/net/ethernet/ti/Makefile | 9 + + drivers/net/ethernet/ti/am65-cpsw-ethtool.c | 13 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 702 ++++- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 13 + + drivers/net/ethernet/ti/am65-cpsw-qos.c | 19 +- + drivers/net/ethernet/ti/am65-cpts.c | 107 +- + drivers/net/ethernet/ti/am65-cpts.h | 11 +- + drivers/net/ethernet/ti/cpsw_new.c | 6 +- + drivers/net/ethernet/ti/cpsw_priv.c | 3 + + drivers/net/ethernet/ti/icssg/icssg_classifier.c | 113 +- + drivers/net/ethernet/ti/icssg/icssg_common.c | 1252 ++++++++ + drivers/net/ethernet/ti/icssg/icssg_config.c | 14 +- + drivers/net/ethernet/ti/icssg/icssg_config.h | 56 + + drivers/net/ethernet/ti/icssg/icssg_ethtool.c | 105 + + drivers/net/ethernet/ti/icssg/icssg_prueth.c | 1199 +------- + drivers/net/ethernet/ti/icssg/icssg_prueth.h | 88 +- + drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c | 1181 ++++++++ + drivers/net/ethernet/ti/k3-cppi-desc-pool.c | 46 +- + drivers/net/ethernet/ti/k3-cppi-desc-pool.h | 6 + + drivers/net/ethernet/via/Kconfig | 1 + + drivers/net/ethernet/via/via-velocity.c | 4 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 2 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_axienet.h | 4 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 2 +- + drivers/net/ethernet/xilinx/xilinx_axienet_mdio.c | 23 +- + drivers/net/ethernet/xircom/Kconfig | 2 +- + drivers/net/ethernet/xircom/xirc2ps_cs.c | 4 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 2 +- + drivers/net/fddi/defxx.c | 2 +- + drivers/net/fjes/fjes_main.c | 2 +- + drivers/net/geneve.c | 46 +- + drivers/net/gtp.c | 867 +++++- + drivers/net/hamradio/Kconfig | 6 +- + drivers/net/hyperv/netvsc_drv.c | 4 +- + drivers/net/ipa/data/ipa_data-v3.1.c | 5 +- + drivers/net/ipa/data/ipa_data-v3.5.1.c | 5 +- + drivers/net/ipa/data/ipa_data-v4.11.c | 5 +- + drivers/net/ipa/data/ipa_data-v4.2.c | 5 +- + drivers/net/ipa/data/ipa_data-v4.5.c | 5 +- + drivers/net/ipa/data/ipa_data-v4.7.c | 5 +- + drivers/net/ipa/data/ipa_data-v4.9.c | 5 +- + drivers/net/ipa/data/ipa_data-v5.0.c | 5 +- + drivers/net/ipa/data/ipa_data-v5.5.c | 5 +- + drivers/net/ipa/gsi.c | 30 +- + drivers/net/ipa/gsi.h | 12 +- + drivers/net/ipa/gsi_private.h | 7 +- + drivers/net/ipa/gsi_reg.c | 6 +- + drivers/net/ipa/gsi_trans.c | 12 +- + drivers/net/ipa/gsi_trans.h | 9 +- + drivers/net/ipa/ipa.h | 15 +- + drivers/net/ipa/ipa_cmd.c | 13 +- + drivers/net/ipa/ipa_cmd.h | 18 +- + drivers/net/ipa/ipa_data.h | 4 +- + drivers/net/ipa/ipa_endpoint.c | 19 +- + drivers/net/ipa/ipa_endpoint.h | 10 +- + drivers/net/ipa/ipa_gsi.c | 7 +- + drivers/net/ipa/ipa_interrupt.c | 56 +- + drivers/net/ipa/ipa_interrupt.h | 6 +- + drivers/net/ipa/ipa_main.c | 45 +- + drivers/net/ipa/ipa_mem.c | 21 +- + drivers/net/ipa/ipa_mem.h | 4 +- + drivers/net/ipa/ipa_modem.c | 18 +- + drivers/net/ipa/ipa_modem.h | 5 +- + drivers/net/ipa/ipa_power.c | 29 +- + drivers/net/ipa/ipa_power.h | 19 +- + drivers/net/ipa/ipa_qmi.c | 10 +- + drivers/net/ipa/ipa_qmi.h | 4 +- + drivers/net/ipa/ipa_qmi_msg.c | 3 +- + drivers/net/ipa/ipa_qmi_msg.h | 3 +- + drivers/net/ipa/ipa_reg.c | 4 +- + drivers/net/ipa/ipa_reg.h | 6 +- + drivers/net/ipa/ipa_resource.c | 3 +- + drivers/net/ipa/ipa_smp2p.c | 10 +- + drivers/net/ipa/ipa_sysfs.c | 7 +- + drivers/net/ipa/ipa_sysfs.h | 4 +- + drivers/net/ipa/ipa_table.c | 29 +- + drivers/net/ipa/ipa_table.h | 7 +- + drivers/net/ipa/ipa_uc.c | 10 +- + drivers/net/ipa/ipa_uc.h | 3 +- + drivers/net/ipa/ipa_version.h | 22 +- + drivers/net/ipa/reg.h | 8 +- + drivers/net/ipa/reg/gsi_reg-v3.1.c | 8 +- + drivers/net/ipa/reg/gsi_reg-v3.5.1.c | 8 +- + drivers/net/ipa/reg/gsi_reg-v4.0.c | 8 +- + drivers/net/ipa/reg/gsi_reg-v4.11.c | 8 +- + drivers/net/ipa/reg/gsi_reg-v4.5.c | 8 +- + drivers/net/ipa/reg/gsi_reg-v4.9.c | 8 +- + drivers/net/ipa/reg/gsi_reg-v5.0.c | 8 +- + drivers/net/ipa/reg/ipa_reg-v3.1.c | 20 +- + drivers/net/ipa/reg/ipa_reg-v3.5.1.c | 20 +- + drivers/net/ipa/reg/ipa_reg-v4.11.c | 20 +- + drivers/net/ipa/reg/ipa_reg-v4.2.c | 6 +- + drivers/net/ipa/reg/ipa_reg-v4.5.c | 20 +- + drivers/net/ipa/reg/ipa_reg-v4.7.c | 20 +- + drivers/net/ipa/reg/ipa_reg-v4.9.c | 20 +- + drivers/net/ipa/reg/ipa_reg-v5.0.c | 6 +- + drivers/net/ipa/reg/ipa_reg-v5.5.c | 6 +- + drivers/net/ipvlan/ipvlan_main.c | 1 + + drivers/net/loopback.c | 5 +- + drivers/net/macsec.c | 2 +- + drivers/net/macvlan.c | 2 +- + drivers/net/mdio/mdio-gpio.c | 3 +- + drivers/net/net_failover.c | 2 +- + drivers/net/netdevsim/ethtool.c | 11 + + drivers/net/netdevsim/netdev.c | 335 ++- + drivers/net/netdevsim/netdevsim.h | 10 + + drivers/net/ntb_netdev.c | 4 +- + drivers/net/pcs/pcs-lynx.c | 5 +- + drivers/net/pcs/pcs-rzn1-miic.c | 28 + + drivers/net/pfcp.c | 301 ++ + drivers/net/phy/Kconfig | 5 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/air_en8811h.c | 1090 +++++++ + drivers/net/phy/aquantia/aquantia_main.c | 21 + + drivers/net/phy/dp83822.c | 37 +- + drivers/net/phy/marvell.c | 397 ++- + drivers/net/phy/mediatek-ge.c | 3 - + drivers/net/phy/micrel.c | 563 +++- + drivers/net/phy/phylink.c | 28 +- + drivers/net/phy/qcom/at803x.c | 3 +- + drivers/net/phy/realtek.c | 324 ++- + drivers/net/phy/sfp-bus.c | 5 +- + drivers/net/phy/sfp.c | 27 +- + drivers/net/ppp/ppp_generic.c | 2 +- + drivers/net/pse-pd/Kconfig | 22 +- + drivers/net/pse-pd/Makefile | 2 + + drivers/net/pse-pd/pd692x0.c | 1223 ++++++++ + drivers/net/pse-pd/pse_core.c | 529 +++- + drivers/net/pse-pd/pse_regulator.c | 51 +- + drivers/net/pse-pd/tps23881.c | 820 ++++++ + drivers/net/slip/slip.c | 2 +- + drivers/net/team/Makefile | 1 + + drivers/net/team/{team.c => team_core.c} | 65 +- + drivers/net/team/team_nl.c | 59 + + drivers/net/team/team_nl.h | 29 + + drivers/net/usb/aqc111.c | 10 +- + drivers/net/usb/asix_devices.c | 2 +- + drivers/net/usb/ax88179_178a.c | 8 +- + drivers/net/usb/cdc_ncm.c | 2 +- + drivers/net/usb/lan78xx.c | 44 +- + drivers/net/usb/qmi_wwan.c | 12 +- + drivers/net/usb/r8152.c | 6 +- + drivers/net/usb/smsc75xx.c | 12 +- + drivers/net/usb/smsc95xx.c | 15 +- + drivers/net/usb/sr9700.c | 10 +- + drivers/net/usb/usbnet.c | 3 +- + drivers/net/veth.c | 1 + + drivers/net/virtio_net.c | 1456 ++++++++-- + drivers/net/vmxnet3/vmxnet3_drv.c | 2 +- + drivers/net/vrf.c | 6 +- + drivers/net/vsockmon.c | 2 +- + drivers/net/vxlan/vxlan_core.c | 20 +- + drivers/net/wan/Kconfig | 2 +- + drivers/net/wan/fsl_qmc_hdlc.c | 6 +- + drivers/net/wireguard/main.c | 2 +- + drivers/net/wireless/ath/ar5523/ar5523.c | 14 + + drivers/net/wireless/ath/ath.h | 6 +- + drivers/net/wireless/ath/ath10k/core.c | 52 +- + drivers/net/wireless/ath/ath10k/core.h | 4 +- + drivers/net/wireless/ath/ath10k/debugfs_sta.c | 2 +- + drivers/net/wireless/ath/ath10k/hw.h | 14 +- + drivers/net/wireless/ath/ath10k/pci.c | 12 +- + drivers/net/wireless/ath/ath10k/sdio.c | 2 +- + drivers/net/wireless/ath/ath10k/snoc.c | 7 +- + drivers/net/wireless/ath/ath10k/targaddrs.h | 3 + + drivers/net/wireless/ath/ath10k/thermal.c | 2 +- + drivers/net/wireless/ath/ath10k/usb.c | 2 +- + drivers/net/wireless/ath/ath10k/wmi.c | 26 +- + drivers/net/wireless/ath/ath11k/Makefile | 3 +- + drivers/net/wireless/ath/ath11k/ahb.c | 15 +- + drivers/net/wireless/ath/ath11k/core.c | 133 +- + drivers/net/wireless/ath/ath11k/core.h | 8 +- + drivers/net/wireless/ath/ath11k/debugfs.c | 4 +- + drivers/net/wireless/ath/ath11k/hal.h | 2 +- + drivers/net/wireless/ath/ath11k/hif.h | 14 +- + drivers/net/wireless/ath/ath11k/mac.c | 178 +- + drivers/net/wireless/ath/ath11k/mhi.c | 29 +- + drivers/net/wireless/ath/ath11k/mhi.h | 5 +- + drivers/net/wireless/ath/ath11k/p2p.c | 149 + + drivers/net/wireless/ath/ath11k/p2p.h | 22 + + drivers/net/wireless/ath/ath11k/pci.c | 44 +- + drivers/net/wireless/ath/ath11k/pci.h | 1 + + drivers/net/wireless/ath/ath11k/pcic.c | 21 +- + drivers/net/wireless/ath/ath11k/qmi.c | 2 +- + drivers/net/wireless/ath/ath11k/thermal.c | 2 +- + drivers/net/wireless/ath/ath11k/wmi.c | 104 +- + drivers/net/wireless/ath/ath11k/wmi.h | 78 +- + drivers/net/wireless/ath/ath12k/Kconfig | 9 + + drivers/net/wireless/ath/ath12k/Makefile | 2 + + drivers/net/wireless/ath/ath12k/acpi.c | 394 +++ + drivers/net/wireless/ath/ath12k/acpi.h | 76 + + drivers/net/wireless/ath/ath12k/core.c | 123 +- + drivers/net/wireless/ath/ath12k/core.h | 95 +- + drivers/net/wireless/ath/ath12k/debugfs.c | 90 + + drivers/net/wireless/ath/ath12k/debugfs.h | 30 + + drivers/net/wireless/ath/ath12k/dp.c | 121 +- + drivers/net/wireless/ath/ath12k/dp.h | 12 +- + drivers/net/wireless/ath/ath12k/dp_mon.c | 6 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 236 +- + drivers/net/wireless/ath/ath12k/dp_rx.h | 5 +- + drivers/net/wireless/ath/ath12k/dp_tx.c | 2 +- + drivers/net/wireless/ath/ath12k/hal.h | 2 +- + drivers/net/wireless/ath/ath12k/hif.h | 14 +- + drivers/net/wireless/ath/ath12k/htc.c | 4 +- + drivers/net/wireless/ath/ath12k/hw.c | 12 +- + drivers/net/wireless/ath/ath12k/hw.h | 4 + + drivers/net/wireless/ath/ath12k/mac.c | 1147 ++++++-- + drivers/net/wireless/ath/ath12k/mac.h | 4 + + drivers/net/wireless/ath/ath12k/mhi.c | 92 +- + drivers/net/wireless/ath/ath12k/mhi.h | 5 +- + drivers/net/wireless/ath/ath12k/p2p.c | 3 +- + drivers/net/wireless/ath/ath12k/p2p.h | 1 + + drivers/net/wireless/ath/ath12k/pci.c | 43 +- + drivers/net/wireless/ath/ath12k/pci.h | 2 +- + drivers/net/wireless/ath/ath12k/qmi.c | 109 +- + drivers/net/wireless/ath/ath12k/qmi.h | 4 + + drivers/net/wireless/ath/ath12k/reg.c | 55 +- + drivers/net/wireless/ath/ath12k/wmi.c | 197 +- + drivers/net/wireless/ath/ath12k/wmi.h | 101 +- + drivers/net/wireless/ath/ath6kl/htc_mbox.c | 3 +- + drivers/net/wireless/ath/ath6kl/htc_pipe.c | 3 +- + drivers/net/wireless/ath/ath6kl/sdio.c | 20 +- + drivers/net/wireless/ath/ath9k/ath9k.h | 1 + + drivers/net/wireless/ath/ath9k/eeprom_4k.c | 2 +- + drivers/net/wireless/ath/ath9k/eeprom_9287.c | 4 +- + drivers/net/wireless/ath/ath9k/eeprom_def.c | 6 +- + drivers/net/wireless/ath/ath9k/main.c | 3 +- + drivers/net/wireless/ath/ath9k/pci.c | 2 - + drivers/net/wireless/ath/ath9k/xmit.c | 10 +- + drivers/net/wireless/ath/carl9170/tx.c | 3 +- + drivers/net/wireless/ath/carl9170/usb.c | 32 + + drivers/net/wireless/ath/wcn36xx/main.c | 4 +- + drivers/net/wireless/ath/wcn36xx/txrx.c | 4 +- + drivers/net/wireless/ath/wcn36xx/wcn36xx.h | 7 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 25 +- + drivers/net/wireless/ath/wil6210/fw.h | 1 - + drivers/net/wireless/ath/wil6210/fw_inc.c | 4 +- + drivers/net/wireless/ath/wil6210/wmi.c | 19 +- + drivers/net/wireless/ath/wil6210/wmi.h | 4 +- + drivers/net/wireless/broadcom/b43/sysfs.c | 13 +- + drivers/net/wireless/broadcom/b43legacy/sysfs.c | 16 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 6 +- + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 15 +- + .../net/wireless/broadcom/brcm80211/brcmfmac/usb.c | 7 - + .../wireless/broadcom/brcm80211/brcmsmac/ampdu.c | 6 - + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 4 +- + drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 36 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 16 + + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 57 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 7 + + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 23 +- + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 61 +- + .../net/wireless/intel/iwlwifi/fw/api/offload.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/api/phy.h | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 74 +- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 33 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 13 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 10 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 3 + + drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 127 +- + drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 26 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 23 + + drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 24 +- + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 7 +- + .../wireless/intel/iwlwifi/iwl-context-info-gen3.h | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 6 - + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 28 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/Makefile | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/coex.c | 112 +- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 243 +- + .../net/wireless/intel/iwlwifi/mvm/debugfs-vif.c | 98 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 17 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 103 +- + drivers/net/wireless/intel/iwlwifi/mvm/link.c | 800 ++++++ + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 28 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 350 ++- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 431 ++- + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 44 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 242 +- + .../net/wireless/intel/iwlwifi/mvm/offloading.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 62 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 16 +- + drivers/net/wireless/intel/iwlwifi/mvm/rs-fw.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 152 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 36 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 614 +++- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 86 + + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 24 + + .../net/wireless/intel/iwlwifi/mvm/tests/Makefile | 3 + + .../net/wireless/intel/iwlwifi/mvm/tests/links.c | 435 +++ + .../net/wireless/intel/iwlwifi/mvm/tests/module.c | 10 + + .../net/wireless/intel/iwlwifi/mvm/tests/scan.c | 110 + + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 19 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 29 +- + .../wireless/intel/iwlwifi/pcie/ctxt-info-gen3.c | 31 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 54 +- + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 2 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 11 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 27 +- + drivers/net/wireless/intel/iwlwifi/tests/devinfo.c | 26 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 3 +- + drivers/net/wireless/marvell/mwl8k.c | 94 +- + drivers/net/wireless/mediatek/mt76/dma.c | 5 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76.h | 4 +- + drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 46 +- + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 1 + + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 10 +- + .../net/wireless/mediatek/mt76/mt76_connac3_mac.c | 85 + + .../net/wireless/mediatek/mt76/mt76_connac3_mac.h | 22 + + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 22 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 15 + + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 29 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.h | 47 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 10 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 15 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 10 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 160 +- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 4 + + drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 1 - + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 2 + + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 32 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 79 +- + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 6 + + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 19 +- + .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 2 - + .../net/wireless/mediatek/mt76/mt7921/sdio_mac.c | 2 - + drivers/net/wireless/mediatek/mt76/mt7925/mac.c | 15 +- + drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7925/mcu.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt792x.h | 7 + + .../net/wireless/mediatek/mt76/mt7996/debugfs.c | 5 + + drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 8 +- + drivers/net/wireless/mediatek/mt76/mt7996/main.c | 34 +- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 71 +- + drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 4 +- + drivers/net/wireless/mediatek/mt76/sdio.c | 17 +- + drivers/net/wireless/mediatek/mt76/testmode.c | 2 +- + drivers/net/wireless/mediatek/mt76/tx.c | 2 +- + drivers/net/wireless/mediatek/mt76/usb.c | 3 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 41 +- + drivers/net/wireless/microchip/wilc1000/hif.c | 17 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 43 +- + drivers/net/wireless/microchip/wilc1000/netdev.h | 5 +- + drivers/net/wireless/microchip/wilc1000/sdio.c | 5 +- + drivers/net/wireless/microchip/wilc1000/wlan.c | 5 +- + drivers/net/wireless/quantenna/qtnfmac/bus.h | 2 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 16 +- + drivers/net/wireless/quantenna/qtnfmac/pcie/pcie.c | 12 +- + .../wireless/quantenna/qtnfmac/pcie/pearl_pcie.c | 6 +- + .../wireless/quantenna/qtnfmac/pcie/topaz_pcie.c | 6 +- + .../realtek/rtl8xxxu/{rtl8xxxu_8188e.c => 8188e.c} | 18 +- + .../realtek/rtl8xxxu/{rtl8xxxu_8188f.c => 8188f.c} | 18 +- + .../realtek/rtl8xxxu/{rtl8xxxu_8192c.c => 8192c.c} | 67 +- + .../realtek/rtl8xxxu/{rtl8xxxu_8192e.c => 8192e.c} | 18 +- + .../realtek/rtl8xxxu/{rtl8xxxu_8192f.c => 8192f.c} | 18 +- + .../realtek/rtl8xxxu/{rtl8xxxu_8710b.c => 8710b.c} | 18 +- + .../realtek/rtl8xxxu/{rtl8xxxu_8723a.c => 8723a.c} | 45 +- + .../realtek/rtl8xxxu/{rtl8xxxu_8723b.c => 8723b.c} | 41 +- + drivers/net/wireless/realtek/rtl8xxxu/Makefile | 6 +- + .../realtek/rtl8xxxu/{rtl8xxxu_core.c => core.c} | 76 +- + .../realtek/rtl8xxxu/{rtl8xxxu_regs.h => regs.h} | 0 + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 13 +- + drivers/net/wireless/realtek/rtlwifi/Kconfig | 4 + + drivers/net/wireless/realtek/rtlwifi/Makefile | 1 + + drivers/net/wireless/realtek/rtlwifi/cam.c | 5 +- + drivers/net/wireless/realtek/rtlwifi/cam.h | 6 +- + drivers/net/wireless/realtek/rtlwifi/efuse.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/efuse.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 193 +- + .../net/wireless/realtek/rtlwifi/rtl8192d/Makefile | 11 + + .../realtek/rtlwifi/{rtl8192de => rtl8192d}/def.h | 0 + .../wireless/realtek/rtlwifi/rtl8192d/dm_common.c | 1061 +++++++ + .../wireless/realtek/rtlwifi/rtl8192d/dm_common.h | 79 + + .../wireless/realtek/rtlwifi/rtl8192d/fw_common.c | 370 +++ + .../wireless/realtek/rtlwifi/rtl8192d/fw_common.h | 49 + + .../wireless/realtek/rtlwifi/rtl8192d/hw_common.c | 1225 ++++++++ + .../wireless/realtek/rtlwifi/rtl8192d/hw_common.h | 24 + + .../net/wireless/realtek/rtlwifi/rtl8192d/main.c | 9 + + .../wireless/realtek/rtlwifi/rtl8192d/phy_common.c | 856 ++++++ + .../wireless/realtek/rtlwifi/rtl8192d/phy_common.h | 111 + + .../realtek/rtlwifi/{rtl8192de => rtl8192d}/reg.h | 162 +- + .../wireless/realtek/rtlwifi/rtl8192d/rf_common.c | 359 +++ + .../wireless/realtek/rtlwifi/rtl8192d/rf_common.h | 13 + + .../wireless/realtek/rtlwifi/rtl8192d/trx_common.c | 516 ++++ + .../wireless/realtek/rtlwifi/rtl8192d/trx_common.h | 405 +++ + .../net/wireless/realtek/rtlwifi/rtl8192de/dm.c | 1072 +------ + .../net/wireless/realtek/rtlwifi/rtl8192de/dm.h | 91 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 375 +-- + .../net/wireless/realtek/rtlwifi/rtl8192de/fw.h | 37 - + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 1168 +------- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.h | 11 - + .../net/wireless/realtek/rtlwifi/rtl8192de/led.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/phy.c | 916 +----- + .../net/wireless/realtek/rtlwifi/rtl8192de/phy.h | 59 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/rf.c | 375 +-- + .../net/wireless/realtek/rtlwifi/rtl8192de/rf.h | 5 - + .../net/wireless/realtek/rtlwifi/rtl8192de/sw.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 515 +--- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 433 --- + .../net/wireless/realtek/rtlwifi/rtl8723be/phy.c | 45 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 3 + + drivers/net/wireless/realtek/rtlwifi/wifi.h | 33 +- + drivers/net/wireless/realtek/rtw88/Kconfig | 22 + + drivers/net/wireless/realtek/rtw88/Makefile | 9 + + drivers/net/wireless/realtek/rtw88/coex.c | 4 +- + drivers/net/wireless/realtek/rtw88/debug.h | 1 + + drivers/net/wireless/realtek/rtw88/fw.c | 14 +- + drivers/net/wireless/realtek/rtw88/fw.h | 2 + + drivers/net/wireless/realtek/rtw88/mac.c | 11 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 2 + + drivers/net/wireless/realtek/rtw88/main.c | 18 +- + drivers/net/wireless/realtek/rtw88/main.h | 3 + + drivers/net/wireless/realtek/rtw88/pci.c | 3 +- + drivers/net/wireless/realtek/rtw88/rtw8703b.c | 2109 ++++++++++++++ + drivers/net/wireless/realtek/rtw88/rtw8703b.h | 102 + + .../net/wireless/realtek/rtw88/rtw8703b_tables.c | 902 ++++++ + .../net/wireless/realtek/rtw88/rtw8703b_tables.h | 14 + + drivers/net/wireless/realtek/rtw88/rtw8723cs.c | 34 + + drivers/net/wireless/realtek/rtw88/rtw8723d.c | 673 +---- + drivers/net/wireless/realtek/rtw88/rtw8723d.h | 269 +- + drivers/net/wireless/realtek/rtw88/rtw8723x.c | 721 +++++ + drivers/net/wireless/realtek/rtw88/rtw8723x.h | 518 ++++ + drivers/net/wireless/realtek/rtw88/rx.h | 2 + + drivers/net/wireless/realtek/rtw89/Kconfig | 15 + + drivers/net/wireless/realtek/rtw89/Makefile | 12 +- + drivers/net/wireless/realtek/rtw89/acpi.c | 47 + + drivers/net/wireless/realtek/rtw89/acpi.h | 21 +- + drivers/net/wireless/realtek/rtw89/cam.c | 116 +- + drivers/net/wireless/realtek/rtw89/cam.h | 71 +- + drivers/net/wireless/realtek/rtw89/coex.c | 1964 +++++++++++-- + drivers/net/wireless/realtek/rtw89/coex.h | 108 + + drivers/net/wireless/realtek/rtw89/core.c | 35 +- + drivers/net/wireless/realtek/rtw89/core.h | 361 ++- + drivers/net/wireless/realtek/rtw89/fw.c | 436 ++- + drivers/net/wireless/realtek/rtw89/fw.h | 497 +--- + drivers/net/wireless/realtek/rtw89/mac.c | 50 +- + drivers/net/wireless/realtek/rtw89/mac.h | 7 + + drivers/net/wireless/realtek/rtw89/mac80211.c | 28 +- + drivers/net/wireless/realtek/rtw89/mac_be.c | 5 + + drivers/net/wireless/realtek/rtw89/pci.c | 94 +- + drivers/net/wireless/realtek/rtw89/pci.h | 13 + + drivers/net/wireless/realtek/rtw89/phy.c | 19 +- + drivers/net/wireless/realtek/rtw89/phy_be.c | 18 + + drivers/net/wireless/realtek/rtw89/ps.c | 3 +- + drivers/net/wireless/realtek/rtw89/reg.h | 7 +- + drivers/net/wireless/realtek/rtw89/regd.c | 174 +- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 2 + + drivers/net/wireless/realtek/rtw89/rtw8851be.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 15 + + drivers/net/wireless/realtek/rtw89/rtw8852be.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 13 +- + .../net/wireless/realtek/rtw89/rtw8852c_table.c | 2706 +----------------- + drivers/net/wireless/realtek/rtw89/rtw8852ce.c | 23 + + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 157 +- + drivers/net/wireless/realtek/rtw89/rtw8922ae.c | 1 + + drivers/net/wireless/realtek/rtw89/sar.h | 4 +- + drivers/net/wireless/realtek/rtw89/wow.c | 716 ++++- + drivers/net/wireless/realtek/rtw89/wow.h | 57 + + drivers/net/wireless/rsi/rsi_91x_sdio.c | 31 +- + drivers/net/wireless/ti/wl1251/cmd.h | 2 - + drivers/net/wireless/ti/wl1251/sdio.c | 20 +- + drivers/net/wireless/ti/wl1251/wl12xx_80211.h | 1 - + drivers/net/wireless/ti/wlcore/cmd.h | 2 - + drivers/net/wireless/ti/wlcore/sysfs.c | 11 +- + drivers/net/wireless/ti/wlcore/wl12xx_80211.h | 1 - + drivers/net/wireless/virtual/mac80211_hwsim.c | 52 +- + drivers/net/wwan/iosm/iosm_ipc_devlink.c | 3 +- + drivers/net/wwan/mhi_wwan_mbim.c | 1 - + drivers/net/wwan/t7xx/t7xx_netdev.c | 20 +- + drivers/net/wwan/t7xx/t7xx_netdev.h | 2 +- + drivers/net/xen-netback/interface.c | 2 +- + drivers/net/xen-netback/netback.c | 1 + + drivers/net/xen-netfront.c | 2 +- + drivers/nfc/nfcmrvl/spi.c | 1 - + drivers/nfc/st95hf/core.c | 28 +- + drivers/of/property.c | 2 + + drivers/ptp/ptp_clockmatrix.c | 6 +- + drivers/ptp/ptp_dte.c | 6 +- + drivers/ptp/ptp_idt82p33.c | 6 +- + drivers/ptp/ptp_ines.c | 5 +- + drivers/ptp/ptp_qoriq.c | 5 +- + drivers/s390/cio/idset.c | 12 +- + drivers/s390/net/ctcm_main.c | 2 +- + drivers/s390/net/ism_drv.c | 2 +- + drivers/s390/net/qeth_core.h | 9 +- + drivers/ssb/main.c | 6 +- + drivers/virtio/Kconfig | 10 + + drivers/virtio/Makefile | 1 + + drivers/virtio/virtio.c | 8 + + drivers/virtio/virtio_debug.c | 114 + + drivers/virtio/virtio_ring.c | 7 +- + fs/btrfs/free-space-cache.c | 8 +- + fs/ntfs3/bitmap.c | 4 +- + fs/ntfs3/fsntfs.c | 2 +- + fs/ntfs3/index.c | 11 +- + fs/ntfs3/ntfs_fs.h | 4 +- + fs/ntfs3/super.c | 2 +- + include/linux/bitmap.h | 91 +- + include/linux/bitops.h | 23 +- + include/linux/bpf.h | 31 +- + include/linux/bpf_crypto.h | 24 + + include/linux/bpf_verifier.h | 11 +- + include/linux/btf_ids.h | 2 + + include/linux/compiler_types.h | 11 + + include/linux/cpumask.h | 2 +- + include/linux/dynamic_queue_limits.h | 50 +- + include/linux/etherdevice.h | 12 +- + include/linux/ethtool.h | 27 +- + include/linux/filter.h | 51 +- + include/linux/genetlink.h | 19 - + include/linux/genl_magic_struct.h | 2 +- + include/linux/ieee80211.h | 30 +- + include/linux/linkmode.h | 27 +- + include/linux/marvell_phy.h | 3 + + include/linux/mhi.h | 18 +- + include/linux/mlx5/cq.h | 7 +- + include/linux/mlx5/device.h | 8 +- + include/linux/mlx5/driver.h | 9 +- + include/linux/mlx5/mlx5_ifc.h | 63 +- + include/linux/mmc/sdio_ids.h | 1 + + include/linux/net/intel/libie/rx.h | 50 + + include/linux/netdevice.h | 55 +- + include/linux/phy.h | 1 + + include/linux/phylink.h | 42 + + include/linux/pse-pd/pse.h | 83 +- + include/linux/rhashtable.h | 10 +- + include/linux/rtnetlink.h | 3 + + include/linux/sfp.h | 4 +- + include/linux/skbuff.h | 115 +- + include/linux/skbuff_ref.h | 75 + + include/linux/skmsg.h | 4 + + include/linux/slab.h | 22 +- + include/linux/ssb/ssb.h | 8 - + include/linux/stmmac.h | 18 +- + include/linux/sysctl.h | 2 +- + include/linux/tcp.h | 6 +- + include/linux/trace_events.h | 36 +- + include/linux/virtio.h | 35 + + include/net/af_unix.h | 33 +- + include/net/ax25.h | 2 + + include/net/bluetooth/bluetooth.h | 2 +- + include/net/bluetooth/hci.h | 136 +- + include/net/bluetooth/hci_core.h | 69 +- + include/net/bluetooth/l2cap.h | 33 +- + include/net/cfg80211.h | 140 +- + include/net/devlink.h | 21 +- + include/net/dsa.h | 38 +- + include/net/dscp.h | 76 + + include/net/dst_cache.h | 2 +- + include/net/dst_metadata.h | 10 +- + include/net/espintcp.h | 2 +- + include/net/flow_dissector.h | 2 +- + include/net/flow_offload.h | 57 +- + include/net/genetlink.h | 10 +- + include/net/gre.h | 66 +- + include/net/gro.h | 82 +- + include/net/gtp.h | 5 + + include/net/hotdata.h | 3 + + include/net/ieee8021q.h | 57 + + include/net/inet_connection_sock.h | 7 +- + include/net/inet_timewait_sock.h | 2 +- + include/net/ip.h | 4 +- + include/net/ip6_fib.h | 8 +- + include/net/ip6_route.h | 11 +- + include/net/ip6_tunnel.h | 4 +- + include/net/ip_tunnels.h | 139 +- + include/net/libeth/rx.h | 242 ++ + include/net/mac80211.h | 82 +- + include/net/mptcp.h | 3 + + include/net/netdev_queues.h | 61 + + include/net/netfilter/nf_tables.h | 4 +- + include/net/netlink.h | 41 +- + include/net/nexthop.h | 2 +- + include/net/page_pool/helpers.h | 34 +- + include/net/page_pool/types.h | 4 +- + include/net/pfcp.h | 90 + + include/net/pkt_cls.h | 9 + + include/net/proto_memory.h | 83 + + include/net/red.h | 12 +- + include/net/request_sock.h | 4 +- + include/net/route.h | 22 +- + include/net/rps.h | 28 + + include/net/rstreason.h | 182 ++ + include/net/sch_generic.h | 5 + + include/net/scm.h | 10 + + include/net/smc.h | 24 +- + include/net/sock.h | 88 +- + include/net/tcp.h | 68 +- + include/net/timewait_sock.h | 9 - + include/net/tls.h | 2 +- + include/net/udp_tunnel.h | 4 +- + include/net/xfrm.h | 1 + + include/trace/bpf_probe.h | 3 +- + include/trace/events/bpf_test_run.h | 17 + + include/trace/events/icmp.h | 67 + + include/trace/events/mdio.h | 2 +- + include/trace/events/net_probe_common.h | 71 + + include/trace/events/sock.h | 37 +- + include/trace/events/tcp.h | 134 +- + include/trace/events/udp.h | 29 +- + include/uapi/linux/bpf.h | 44 +- + include/uapi/linux/devlink.h | 1 + + include/uapi/linux/ethtool.h | 55 + + include/uapi/linux/ethtool_netlink.h | 32 +- + include/uapi/linux/gtp.h | 3 + + include/uapi/linux/icmpv6.h | 1 + + include/uapi/linux/if_link.h | 3 + + include/uapi/linux/if_team.h | 158 +- + include/uapi/linux/if_tunnel.h | 36 + + include/uapi/linux/mptcp.h | 4 + + include/uapi/linux/netdev.h | 21 + + include/uapi/linux/nl80211.h | 236 +- + include/uapi/linux/pkt_cls.h | 14 + + include/uapi/linux/snmp.h | 2 + + include/uapi/linux/tcp.h | 2 + + include/uapi/linux/udp.h | 2 +- + include/uapi/linux/virtio_bt.h | 1 - + include/uapi/linux/virtio_net.h | 143 + + include/uapi/linux/xfrm.h | 6 + + ipc/ipc_sysctl.c | 2 +- + ipc/mq_sysctl.c | 2 +- + kernel/bpf/Makefile | 3 + + kernel/bpf/arena.c | 4 +- + kernel/bpf/arraymap.c | 54 +- + kernel/bpf/bpf_local_storage.c | 2 +- + kernel/bpf/bpf_struct_ops.c | 10 +- + kernel/bpf/btf.c | 27 +- + kernel/bpf/cgroup.c | 2 - + kernel/bpf/core.c | 77 +- + kernel/bpf/cpumask.c | 1 + + kernel/bpf/crypto.c | 385 +++ + kernel/bpf/disasm.c | 14 + + kernel/bpf/hashtab.c | 64 +- + kernel/bpf/helpers.c | 366 ++- + kernel/bpf/log.c | 4 +- + kernel/bpf/lpm_trie.c | 31 +- + kernel/bpf/syscall.c | 48 +- + kernel/bpf/sysfs_btf.c | 6 +- + kernel/bpf/trampoline.c | 18 +- + kernel/bpf/verifier.c | 656 +++-- + kernel/trace/bpf_trace.c | 162 +- + kernel/trace/trace_probe.c | 2 - + kernel/ucount.c | 2 +- + lib/Kconfig | 2 +- + lib/dim/Makefile | 4 +- + lib/dim/dim.c | 3 + + lib/dynamic_queue_limits.c | 13 +- + lib/math/prime_numbers.c | 2 - + lib/test_bitmap.c | 203 +- + lib/test_bpf.c | 2 +- + net/8021q/vlan_dev.c | 2 +- + net/8021q/vlan_netlink.c | 10 +- + net/Kconfig | 6 + + net/appletalk/sysctl_net_atalk.c | 1 - + net/atm/clip.c | 4 +- + net/atm/common.c | 2 +- + net/ax25/Kconfig | 2 +- + net/ax25/ax25_dev.c | 3 + + net/ax25/sysctl_net_ax25.c | 5 +- + net/batman-adv/main.c | 2 +- + net/batman-adv/main.h | 2 +- + net/batman-adv/netlink.c | 1 - + net/batman-adv/originator.c | 2 + + net/batman-adv/soft-interface.c | 2 +- + net/batman-adv/translation-table.c | 47 +- + net/bluetooth/6lowpan.c | 2 +- + net/bluetooth/hci_conn.c | 150 +- + net/bluetooth/hci_core.c | 170 +- + net/bluetooth/hci_event.c | 242 +- + net/bluetooth/hci_request.h | 4 - + net/bluetooth/hci_sock.c | 5 +- + net/bluetooth/hci_sync.c | 207 +- + net/bluetooth/iso.c | 151 +- + net/bluetooth/l2cap_core.c | 140 +- + net/bluetooth/l2cap_sock.c | 91 +- + net/bluetooth/mgmt.c | 84 +- + net/bluetooth/sco.c | 6 +- + net/bpf/bpf_dummy_struct_ops.c | 59 +- + net/bpf/test_run.c | 8 + + net/bridge/br_device.c | 4 +- + net/bridge/br_netfilter_hooks.c | 6 +- + net/bridge/br_vlan_tunnel.c | 9 +- + net/caif/cfctrl.c | 8 +- + net/core/Makefile | 3 +- + net/core/bpf_sk_storage.c | 23 +- + net/core/datagram.c | 19 - + net/core/dev.c | 472 ++- + net/core/dev.h | 24 +- + net/core/dev_addr_lists_test.c | 14 +- + net/core/drop_monitor.c | 20 +- + net/core/dst_cache.c | 11 +- + net/core/fib_rules.c | 17 +- + net/core/filter.c | 48 +- + net/core/flow_dissector.c | 20 +- + net/core/gro.c | 31 +- + net/core/hotdata.c | 7 +- + net/core/ieee8021q_helpers.c | 242 ++ + net/core/neighbour.c | 79 +- + net/core/net-procfs.c | 3 +- + net/core/net-sysfs.c | 16 +- + net/core/net_namespace.c | 5 +- + net/core/{gso_test.c => net_test.c} | 129 +- + net/core/netdev-genl-gen.c | 1 + + net/core/netdev-genl.c | 77 +- + net/core/netpoll.c | 2 +- + net/core/page_pool.c | 50 +- + net/core/rtnetlink.c | 166 +- + net/core/scm.c | 12 + + net/core/skbuff.c | 130 +- + net/core/sock.c | 15 +- + net/core/sock_map.c | 263 +- + net/core/sysctl_net_core.c | 22 +- + net/dccp/ccids/ccid2.c | 1 + + net/dccp/ipv4.c | 12 +- + net/dccp/ipv6.c | 16 +- + net/dccp/minisocks.c | 3 +- + net/dccp/output.c | 2 +- + net/dccp/sysctl.c | 2 - + net/devlink/core.c | 6 +- + net/devlink/dev.c | 14 +- + net/devlink/param.c | 7 +- + net/devlink/port.c | 53 + + net/dsa/devlink.c | 3 +- + net/dsa/dsa.c | 10 + + net/dsa/port.c | 175 +- + net/dsa/user.c | 107 +- + net/ethtool/pse-pd.c | 60 +- + net/ethtool/tsinfo.c | 52 +- + net/handshake/tlshd.c | 1 - + net/hsr/hsr_device.c | 38 +- + net/hsr/hsr_device.h | 4 +- + net/hsr/hsr_forward.c | 85 +- + net/hsr/hsr_framereg.c | 52 + + net/hsr/hsr_framereg.h | 4 + + net/hsr/hsr_main.c | 2 +- + net/hsr/hsr_main.h | 7 + + net/hsr/hsr_netlink.c | 30 +- + net/hsr/hsr_slave.c | 1 + + net/ieee802154/6lowpan/reassembly.c | 8 +- + net/ipv4/af_inet.c | 48 +- + net/ipv4/arp.c | 204 +- + net/ipv4/bpf_tcp_ca.c | 6 +- + net/ipv4/devinet.c | 14 +- + net/ipv4/esp4.c | 15 +- + net/ipv4/fib_semantics.c | 2 +- + net/ipv4/fou_bpf.c | 2 +- + net/ipv4/gre_demux.c | 2 +- + net/ipv4/icmp.c | 30 +- + net/ipv4/igmp.c | 3 +- + net/ipv4/inet_fragment.c | 4 +- + net/ipv4/inet_hashtables.c | 3 +- + net/ipv4/inet_timewait_sock.c | 16 +- + net/ipv4/ip_fragment.c | 4 +- + net/ipv4/ip_gre.c | 146 +- + net/ipv4/ip_input.c | 2 +- + net/ipv4/ip_output.c | 8 +- + net/ipv4/ip_tunnel.c | 119 +- + net/ipv4/ip_tunnel_core.c | 82 +- + net/ipv4/ip_vti.c | 41 +- + net/ipv4/ipip.c | 33 +- + net/ipv4/ipmr.c | 2 +- + net/ipv4/netfilter/iptable_filter.c | 2 +- + net/ipv4/proc.c | 1 + + net/ipv4/route.c | 48 +- + net/ipv4/syncookies.c | 3 +- + net/ipv4/sysctl_net_ipv4.c | 9 +- + net/ipv4/tcp.c | 71 +- + net/ipv4/tcp_bbr.c | 6 +- + net/ipv4/tcp_cubic.c | 4 - + net/ipv4/tcp_dctcp.c | 4 - + net/ipv4/tcp_input.c | 78 +- + net/ipv4/tcp_ipv4.c | 52 +- + net/ipv4/tcp_metrics.c | 7 +- + net/ipv4/tcp_minisocks.c | 14 +- + net/ipv4/tcp_offload.c | 256 +- + net/ipv4/tcp_output.c | 139 +- + net/ipv4/tcp_timer.c | 13 +- + net/ipv4/udp.c | 59 +- + net/ipv4/udp_offload.c | 36 +- + net/ipv4/udp_tunnel_core.c | 5 +- + net/ipv4/xfrm4_input.c | 13 - + net/ipv4/xfrm4_policy.c | 5 +- + net/ipv6/addrconf.c | 13 +- + net/ipv6/addrlabel.c | 18 +- + net/ipv6/anycast.c | 5 +- + net/ipv6/esp6.c | 15 +- + net/ipv6/icmp.c | 9 +- + net/ipv6/ila/ila_lwt.c | 4 +- + net/ipv6/inet6_hashtables.c | 4 +- + net/ipv6/ip6_fib.c | 51 +- + net/ipv6/ip6_gre.c | 110 +- + net/ipv6/ip6_offload.c | 16 +- + net/ipv6/ip6_output.c | 18 +- + net/ipv6/ip6_tunnel.c | 18 +- + net/ipv6/ip6_vti.c | 14 +- + net/ipv6/ip6mr.c | 2 +- + net/ipv6/ndisc.c | 2 +- + net/ipv6/netfilter/ip6table_filter.c | 2 +- + net/ipv6/netfilter/nf_conntrack_reasm.c | 3 +- + net/ipv6/ping.c | 2 +- + net/ipv6/raw.c | 4 +- + net/ipv6/reassembly.c | 6 +- + net/ipv6/route.c | 33 +- + net/ipv6/sit.c | 38 +- + net/ipv6/syncookies.c | 2 +- + net/ipv6/sysctl_net_ipv6.c | 14 +- + net/ipv6/tcp_ipv6.c | 49 +- + net/ipv6/tcpv6_offload.c | 123 +- + net/ipv6/udp.c | 34 +- + net/ipv6/xfrm6_input.c | 20 +- + net/ipv6/xfrm6_policy.c | 5 +- + net/iucv/af_iucv.c | 2 +- + net/iucv/iucv.c | 26 +- + net/l2tp/l2tp_core.c | 37 +- + net/l2tp/l2tp_ip.c | 2 +- + net/l2tp/l2tp_ip6.c | 2 +- + net/llc/sysctl_net_llc.c | 8 +- + net/mac80211/cfg.c | 166 +- + net/mac80211/chan.c | 113 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/drop.h | 3 +- + net/mac80211/ht.c | 2 +- + net/mac80211/ieee80211_i.h | 25 +- + net/mac80211/iface.c | 9 +- + net/mac80211/link.c | 28 +- + net/mac80211/mlme.c | 135 +- + net/mac80211/offchannel.c | 12 +- + net/mac80211/rx.c | 11 +- + net/mac80211/scan.c | 16 +- + net/mac80211/spectmgmt.c | 18 +- + net/mac80211/sta_info.h | 4 +- + net/mac80211/status.c | 22 +- + net/mac80211/tx.c | 6 +- + net/mac80211/util.c | 21 +- + net/mac80211/wpa.c | 12 +- + net/mpls/af_mpls.c | 78 +- + net/mpls/mpls_iptunnel.c | 4 +- + net/mptcp/ctrl.c | 32 +- + net/mptcp/mib.h | 2 + + net/mptcp/options.c | 1 + + net/mptcp/pm_netlink.c | 1 + + net/mptcp/pm_userspace.c | 1 + + net/mptcp/protocol.c | 19 +- + net/mptcp/protocol.h | 49 +- + net/mptcp/sched.c | 22 + + net/mptcp/sockopt.c | 86 +- + net/mptcp/subflow.c | 91 +- + net/netfilter/ipvs/ip_vs_core.c | 6 +- + net/netfilter/ipvs/ip_vs_ctl.c | 36 +- + net/netfilter/ipvs/ip_vs_lblc.c | 5 +- + net/netfilter/ipvs/ip_vs_lblcr.c | 5 +- + net/netfilter/ipvs/ip_vs_xmit.c | 36 +- + net/netfilter/nf_conntrack_core.c | 4 +- + net/netfilter/nf_conntrack_proto_dccp.c | 4 +- + net/netfilter/nf_conntrack_proto_icmpv6.c | 4 +- + net/netfilter/nf_conntrack_standalone.c | 8 +- + net/netfilter/nf_flow_table_core.c | 8 +- + net/netfilter/nf_flow_table_ip.c | 8 +- + net/netfilter/nf_log.c | 5 +- + net/netfilter/nf_tables_api.c | 16 +- + net/netfilter/nfnetlink.c | 5 + + net/netfilter/nft_chain_filter.c | 6 +- + net/netfilter/nft_connlimit.c | 4 +- + net/netfilter/nft_counter.c | 4 +- + net/netfilter/nft_dynset.c | 2 +- + net/netfilter/nft_last.c | 4 +- + net/netfilter/nft_limit.c | 14 +- + net/netfilter/nft_quota.c | 4 +- + net/netfilter/nft_rt.c | 4 +- + net/netfilter/nft_set_pipapo.c | 262 +- + net/netfilter/nft_set_pipapo.h | 2 - + net/netfilter/nft_tunnel.c | 44 +- + net/netlink/af_netlink.c | 137 +- + net/netlink/genetlink.c | 2 + + net/netlink/genetlink.h | 11 + + net/netrom/sysctl_net_netrom.c | 1 - + net/nfc/netlink.c | 6 +- + net/openvswitch/datapath.c | 1 - + net/openvswitch/flow_netlink.c | 61 +- + net/openvswitch/meter.h | 1 - + net/openvswitch/vport-netdev.c | 7 + + net/packet/af_packet.c | 26 +- + net/phonet/pn_netlink.c | 17 +- + net/phonet/sysctl.c | 1 - + net/psample/psample.c | 26 +- + net/qrtr/mhi.c | 46 + + net/rds/ib_sysctl.c | 1 - + net/rds/sysctl.c | 1 - + net/rds/tcp.c | 1 - + net/rfkill/rfkill-gpio.c | 6 +- + net/rose/sysctl_net_rose.c | 1 - + net/rxrpc/af_rxrpc.c | 2 +- + net/rxrpc/sysctl.c | 1 - + net/sched/act_tunnel_key.c | 36 +- + net/sched/cls_api.c | 41 + + net/sched/cls_flower.c | 134 +- + net/sched/sch_api.c | 3 +- + net/sched/sch_cake.c | 112 +- + net/sched/sch_cbs.c | 20 +- + net/sched/sch_choke.c | 21 +- + net/sched/sch_codel.c | 29 +- + net/sched/sch_etf.c | 10 +- + net/sched/sch_ets.c | 25 +- + net/sched/sch_fifo.c | 13 +- + net/sched/sch_fq.c | 108 +- + net/sched/sch_fq_codel.c | 57 +- + net/sched/sch_fq_pie.c | 61 +- + net/sched/sch_generic.c | 15 +- + net/sched/sch_hfsc.c | 9 +- + net/sched/sch_hhf.c | 35 +- + net/sched/sch_htb.c | 22 +- + net/sched/sch_mqprio.c | 6 +- + net/sched/sch_pie.c | 39 +- + net/sched/sch_sfq.c | 13 +- + net/sched/sch_skbprio.c | 8 +- + net/sched/sch_taprio.c | 5 +- + net/sched/sch_teql.c | 4 +- + net/sctp/ipv6.c | 2 +- + net/sctp/protocol.c | 4 +- + net/sctp/sm_statefuns.c | 1 + + net/sctp/socket.c | 9 +- + net/sctp/sysctl.c | 12 +- + net/smc/Kconfig | 13 + + net/smc/Makefile | 1 + + net/smc/af_smc.c | 34 +- + net/smc/smc_cdc.c | 36 +- + net/smc/smc_clc.c | 6 +- + net/smc/smc_clc.h | 26 +- + net/smc/smc_core.c | 61 +- + net/smc/smc_core.h | 1 + + net/smc/smc_ism.c | 88 +- + net/smc/smc_ism.h | 10 + + net/smc/smc_loopback.c | 427 +++ + net/smc/smc_loopback.h | 61 + + net/smc/smc_rx.c | 4 +- + net/smc/smc_sysctl.c | 8 +- + net/sunrpc/sysctl.c | 1 - + net/sunrpc/xprtrdma/svc_rdma.c | 1 - + net/sunrpc/xprtrdma/transport.c | 1 - + net/sunrpc/xprtsock.c | 1 - + net/switchdev/switchdev.c | 99 +- + net/tipc/socket.c | 5 +- + net/tipc/sysctl.c | 1 - + net/tipc/udp_media.c | 2 +- + net/tls/Kconfig | 1 + + net/tls/tls_device.c | 1 + + net/tls/tls_device_fallback.c | 1 + + net/tls/tls_strp.c | 1 + + net/tls/tls_sw.c | 1 - + net/unix/af_unix.c | 80 +- + net/unix/garbage.c | 718 +++-- + net/unix/sysctl_net_unix.c | 3 +- + net/wireless/nl80211.c | 13 +- + net/wireless/reg.c | 18 +- + net/wireless/reg.h | 13 +- + net/wireless/scan.c | 54 +- + net/wireless/sme.c | 1 + + net/wireless/trace.h | 6 +- + net/x25/sysctl_net_x25.c | 1 - + net/xfrm/xfrm_compat.c | 7 +- + net/xfrm/xfrm_device.c | 6 + + net/xfrm/xfrm_input.c | 11 + + net/xfrm/xfrm_interface_core.c | 2 +- + net/xfrm/xfrm_policy.c | 9 +- + net/xfrm/xfrm_proc.c | 2 + + net/xfrm/xfrm_replay.c | 3 +- + net/xfrm/xfrm_state.c | 8 + + net/xfrm/xfrm_sysctl.c | 7 +- + net/xfrm/xfrm_user.c | 162 +- + samples/bpf/Makefile | 2 +- + scripts/Makefile.btf | 15 +- + scripts/kernel-doc | 1 + + tools/bpf/bpftool/Documentation/Makefile | 6 +- + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 100 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 193 +- + .../bpf/bpftool/Documentation/bpftool-feature.rst | 99 +- + tools/bpf/bpftool/Documentation/bpftool-gen.rst | 284 +- + tools/bpf/bpftool/Documentation/bpftool-iter.rst | 52 +- + tools/bpf/bpftool/Documentation/bpftool-link.rst | 73 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 232 +- + tools/bpf/bpftool/Documentation/bpftool-net.rst | 98 +- + tools/bpf/bpftool/Documentation/bpftool-perf.rst | 34 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 374 ++- + .../bpftool/Documentation/bpftool-struct_ops.rst | 71 +- + tools/bpf/bpftool/Documentation/bpftool.rst | 60 +- + tools/bpf/bpftool/Documentation/common_options.rst | 26 +- + tools/bpf/bpftool/Makefile | 16 +- + tools/bpf/bpftool/bash-completion/bpftool | 61 +- + tools/bpf/bpftool/common.c | 96 +- + tools/bpf/bpftool/feature.c | 3 +- + tools/bpf/bpftool/gen.c | 5 +- + tools/bpf/bpftool/iter.c | 2 +- + tools/bpf/bpftool/link.c | 9 + + tools/bpf/bpftool/main.h | 3 +- + tools/bpf/bpftool/pids.c | 19 +- + tools/bpf/bpftool/prog.c | 7 +- + tools/bpf/bpftool/skeleton/pid_iter.bpf.c | 4 +- + tools/bpf/bpftool/struct_ops.c | 2 +- + tools/include/linux/align.h | 12 + + tools/include/linux/bitmap.h | 9 +- + tools/include/linux/bitops.h | 2 + + tools/include/linux/compiler.h | 4 + + tools/include/linux/filter.h | 18 + + tools/include/linux/mm.h | 5 +- + tools/include/uapi/linux/bpf.h | 44 +- + tools/include/uapi/linux/ethtool.h | 104 - + tools/include/uapi/linux/netdev.h | 21 + + tools/lib/bpf/bpf.c | 17 +- + tools/lib/bpf/bpf.h | 9 + + tools/lib/bpf/bpf_core_read.h | 3 +- + tools/lib/bpf/bpf_helpers.h | 21 +- + tools/lib/bpf/bpf_tracing.h | 70 +- + tools/lib/bpf/btf_dump.c | 5 + + tools/lib/bpf/libbpf.c | 261 +- + tools/lib/bpf/libbpf.h | 29 +- + tools/lib/bpf/libbpf.map | 9 + + tools/lib/bpf/libbpf_internal.h | 5 - + tools/lib/bpf/libbpf_probes.c | 6 +- + tools/lib/bpf/libbpf_version.h | 2 +- + tools/lib/bpf/ringbuf.c | 53 +- + tools/lib/bpf/str_error.c | 16 +- + tools/lib/bpf/usdt.bpf.h | 24 +- + tools/net/ynl/cli.py | 34 +- + tools/net/ynl/ethtool.py | 19 +- + tools/net/ynl/lib/nlspec.py | 2 + + tools/net/ynl/lib/ynl.h | 12 + + tools/net/ynl/lib/ynl.py | 162 +- + tools/net/ynl/samples/netdev.c | 2 + + tools/net/ynl/ynl-gen-c.py | 22 +- + tools/net/ynl/ynl-gen-rst.py | 62 +- + tools/perf/util/probe-finder.c | 4 +- + tools/testing/selftests/Makefile | 13 +- + tools/testing/selftests/bpf/.gitignore | 1 - + tools/testing/selftests/bpf/DENYLIST.aarch64 | 2 - + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + tools/testing/selftests/bpf/Makefile | 65 +- + tools/testing/selftests/bpf/bench.c | 39 +- + .../selftests/bpf/benchs/bench_bpf_crypto.c | 185 ++ + .../bpf/benchs/bench_local_storage_create.c | 2 +- + tools/testing/selftests/bpf/benchs/bench_trigger.c | 431 +-- + .../selftests/bpf/benchs/run_bench_trigger.sh | 22 +- + .../selftests/bpf/benchs/run_bench_uprobes.sh | 2 +- + tools/testing/selftests/bpf/bpf_arena_list.h | 4 +- + tools/testing/selftests/bpf/bpf_experimental.h | 71 +- + tools/testing/selftests/bpf/bpf_kfuncs.h | 3 + + tools/testing/selftests/bpf/bpf_tcp_helpers.h | 241 -- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 260 ++ + .../selftests/bpf/bpf_testmod/bpf_testmod_kfunc.h | 28 + + tools/testing/selftests/bpf/cgroup_helpers.c | 5 +- + tools/testing/selftests/bpf/config | 7 + + tools/testing/selftests/bpf/network_helpers.c | 243 +- + tools/testing/selftests/bpf/network_helpers.h | 17 +- + .../selftests/bpf/prog_tests/arena_atomics.c | 186 ++ + .../testing/selftests/bpf/prog_tests/bpf_cookie.c | 114 +- + .../testing/selftests/bpf/prog_tests/bpf_tcp_ca.c | 133 +- + .../selftests/bpf/prog_tests/btf_map_in_map.c | 26 +- + .../selftests/bpf/prog_tests/cgroup1_hierarchy.c | 7 +- + .../selftests/bpf/prog_tests/cls_redirect.c | 38 +- + .../selftests/bpf/prog_tests/crypto_sanity.c | 197 ++ + .../selftests/bpf/prog_tests/dummy_st_ops.c | 34 +- + tools/testing/selftests/bpf/prog_tests/empty_skb.c | 2 + + .../testing/selftests/bpf/prog_tests/fib_lookup.c | 132 +- + .../selftests/bpf/prog_tests/flow_dissector.c | 1 - + tools/testing/selftests/bpf/prog_tests/for_each.c | 62 + + .../selftests/bpf/prog_tests/ip_check_defrag.c | 2 + + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 334 ++- + tools/testing/selftests/bpf/prog_tests/ksyms.c | 30 +- + .../selftests/bpf/prog_tests/module_attach.c | 6 + + tools/testing/selftests/bpf/prog_tests/mptcp.c | 18 + + .../selftests/bpf/prog_tests/ns_current_pid_tgid.c | 216 +- + .../selftests/bpf/prog_tests/preempt_lock.c | 9 + + tools/testing/selftests/bpf/prog_tests/ringbuf.c | 65 + + .../testing/selftests/bpf/prog_tests/send_signal.c | 2 +- + tools/testing/selftests/bpf/prog_tests/sk_assign.c | 55 +- + tools/testing/selftests/bpf/prog_tests/sock_addr.c | 2401 ++++++++++++++-- + .../selftests/bpf/prog_tests/sockmap_basic.c | 171 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 38 + + .../selftests/bpf/prog_tests/sockopt_inherit.c | 64 +- + .../bpf/prog_tests/stacktrace_build_id_nmi.c | 2 +- + .../testing/selftests/bpf/prog_tests/tc_redirect.c | 2 +- + tools/testing/selftests/bpf/prog_tests/tcp_rtt.c | 14 + + .../bpf/prog_tests/test_struct_ops_module.c | 163 +- + .../testing/selftests/bpf/prog_tests/test_tunnel.c | 4 + + .../selftests/bpf/prog_tests/trace_printk.c | 36 +- + .../selftests/bpf/prog_tests/trace_vprintk.c | 36 +- + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + .../bpf/prog_tests/verifier_kfunc_prog_types.c | 11 + + tools/testing/selftests/bpf/prog_tests/wq.c | 40 + + .../selftests/bpf/prog_tests/xdp_do_redirect.c | 4 +- + .../selftests/bpf/prog_tests/xdp_metadata.c | 16 + + tools/testing/selftests/bpf/progs/arena_atomics.c | 178 ++ + tools/testing/selftests/bpf/progs/arena_list.c | 2 +- + .../bpf/progs/bench_local_storage_create.c | 5 +- + tools/testing/selftests/bpf/progs/bind4_prog.c | 24 +- + tools/testing/selftests/bpf/progs/bind6_prog.c | 24 +- + tools/testing/selftests/bpf/progs/bind_prog.h | 19 + + tools/testing/selftests/bpf/progs/bpf_cc_cubic.c | 189 ++ + tools/testing/selftests/bpf/progs/bpf_cubic.c | 74 +- + tools/testing/selftests/bpf/progs/bpf_dctcp.c | 62 +- + .../selftests/bpf/progs/bpf_dctcp_release.c | 10 +- + tools/testing/selftests/bpf/progs/bpf_tcp_nogpl.c | 8 +- + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 52 + + .../selftests/bpf/progs/cgrp_kfunc_common.h | 2 +- + tools/testing/selftests/bpf/progs/connect4_prog.c | 12 +- + tools/testing/selftests/bpf/progs/connect6_prog.c | 6 + + .../selftests/bpf/progs/connect_unix_prog.c | 6 + + tools/testing/selftests/bpf/progs/cpumask_common.h | 2 +- + .../testing/selftests/bpf/progs/cpumask_failure.c | 3 - + tools/testing/selftests/bpf/progs/crypto_basic.c | 68 + + tools/testing/selftests/bpf/progs/crypto_bench.c | 109 + + tools/testing/selftests/bpf/progs/crypto_common.h | 66 + + tools/testing/selftests/bpf/progs/crypto_sanity.c | 169 ++ + .../selftests/bpf/progs/dummy_st_ops_success.c | 15 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 12 +- + tools/testing/selftests/bpf/progs/fib_lookup.c | 2 +- + .../selftests/bpf/progs/for_each_multi_maps.c | 49 + + .../selftests/bpf/progs/getpeername4_prog.c | 24 + + .../selftests/bpf/progs/getpeername6_prog.c | 31 + + .../selftests/bpf/progs/getsockname4_prog.c | 24 + + .../selftests/bpf/progs/getsockname6_prog.c | 31 + + tools/testing/selftests/bpf/progs/iters.c | 2 +- + .../selftests/bpf/progs/jeq_infer_not_null_fail.c | 4 + + .../selftests/bpf/progs/kprobe_multi_session.c | 79 + + .../bpf/progs/kprobe_multi_session_cookie.c | 58 + + tools/testing/selftests/bpf/progs/local_storage.c | 20 +- + tools/testing/selftests/bpf/progs/lsm_cgroup.c | 8 +- + tools/testing/selftests/bpf/progs/mptcp_sock.c | 4 +- + tools/testing/selftests/bpf/progs/mptcpify.c | 4 + + tools/testing/selftests/bpf/progs/preempt_lock.c | 132 + + tools/testing/selftests/bpf/progs/sendmsg4_prog.c | 6 + + tools/testing/selftests/bpf/progs/sendmsg6_prog.c | 57 + + .../selftests/bpf/progs/sendmsg_unix_prog.c | 6 + + tools/testing/selftests/bpf/progs/skb_pkt_end.c | 2 + + tools/testing/selftests/bpf/progs/sock_addr_kern.c | 65 + + .../selftests/bpf/progs/sockopt_qos_to_cc.c | 16 +- + .../selftests/bpf/progs/struct_ops_forgotten_cb.c | 19 + + .../selftests/bpf/progs/struct_ops_module.c | 36 +- + .../selftests/bpf/progs/struct_ops_nulled_out_cb.c | 22 + + .../selftests/bpf/progs/task_kfunc_common.h | 2 +- + .../selftests/bpf/progs/tcp_ca_incompl_cong_ops.c | 12 +- + tools/testing/selftests/bpf/progs/tcp_ca_kfunc.c | 121 + + .../selftests/bpf/progs/tcp_ca_unsupp_cong_op.c | 2 +- + tools/testing/selftests/bpf/progs/tcp_ca_update.c | 18 +- + .../selftests/bpf/progs/tcp_ca_write_sk_pacing.c | 20 +- + tools/testing/selftests/bpf/progs/tcp_rtt.c | 6 + + .../testing/selftests/bpf/progs/test_bpf_cookie.c | 16 + + .../selftests/bpf/progs/test_btf_skc_cls_ingress.c | 16 +- + .../selftests/bpf/progs/test_global_func10.c | 4 + + .../selftests/bpf/progs/test_lwt_redirect.c | 2 +- + .../selftests/bpf/progs/test_module_attach.c | 23 + + .../selftests/bpf/progs/test_ns_current_pid_tgid.c | 31 +- + tools/testing/selftests/bpf/progs/test_ringbuf_n.c | 47 + + .../selftests/bpf/progs/test_skmsg_load_helpers.c | 27 +- + .../testing/selftests/bpf/progs/test_sock_fields.c | 5 +- + .../selftests/bpf/progs/test_sockmap_pass_prog.c | 17 +- + .../bpf/progs/test_sockmap_skb_verdict_attach.c | 2 +- + .../testing/selftests/bpf/progs/test_tcpbpf_kern.c | 13 +- + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 47 +- + .../selftests/bpf/progs/test_xdp_noinline.c | 27 +- + tools/testing/selftests/bpf/progs/test_xdp_vlan.c | 2 +- + tools/testing/selftests/bpf/progs/timer.c | 3 +- + tools/testing/selftests/bpf/progs/timer_failure.c | 2 +- + tools/testing/selftests/bpf/progs/timer_mim.c | 2 +- + .../testing/selftests/bpf/progs/timer_mim_reject.c | 2 +- + tools/testing/selftests/bpf/progs/trigger_bench.c | 109 +- + .../testing/selftests/bpf/progs/verifier_bounds.c | 63 + + .../selftests/bpf/progs/verifier_global_subprogs.c | 7 + + .../bpf/progs/verifier_helper_restricted.c | 8 +- + .../bpf/progs/verifier_iterating_callbacks.c | 9 +- + .../bpf/progs/verifier_kfunc_prog_types.c | 122 + + .../selftests/bpf/progs/verifier_sock_addr.c | 331 +++ + .../bpf/progs/verifier_subprog_precision.c | 89 + + tools/testing/selftests/bpf/progs/wq.c | 180 ++ + tools/testing/selftests/bpf/progs/wq_failures.c | 144 + + tools/testing/selftests/bpf/test_cpp.cpp | 5 + + tools/testing/selftests/bpf/test_sock_addr.c | 1434 ---------- + tools/testing/selftests/bpf/test_sock_addr.sh | 58 - + tools/testing/selftests/bpf/test_sockmap.c | 12 +- + tools/testing/selftests/bpf/test_tc_tunnel.sh | 13 +- + .../selftests/bpf/test_tcp_check_syncookie_user.c | 117 +- + tools/testing/selftests/bpf/testing_helpers.c | 16 +- + tools/testing/selftests/bpf/trace_helpers.c | 109 +- + tools/testing/selftests/bpf/trace_helpers.h | 9 + + tools/testing/selftests/bpf/uprobe_multi.c | 2 +- + tools/testing/selftests/bpf/veristat.c | 5 +- + tools/testing/selftests/bpf/xdp_hw_metadata.c | 16 +- + tools/testing/selftests/bpf/xskxceiver.c | 123 +- + tools/testing/selftests/bpf/xskxceiver.h | 12 +- + tools/testing/selftests/drivers/net/Makefile | 11 + + tools/testing/selftests/drivers/net/README.rst | 136 + + tools/testing/selftests/drivers/net/config | 2 + + tools/testing/selftests/drivers/net/hw/Makefile | 28 + + tools/testing/selftests/drivers/net/hw/csum.py | 122 + + .../{net => drivers/net/hw}/devlink_port_split.py | 0 + .../{net/forwarding => drivers/net/hw}/ethtool.sh | 20 +- + .../net/hw}/ethtool_extended_state.sh | 5 +- + .../forwarding => drivers/net/hw}/ethtool_lib.sh | 0 + .../forwarding => drivers/net/hw}/ethtool_mm.sh | 3 +- + .../forwarding => drivers/net/hw}/ethtool_rmon.sh | 8 +- + .../forwarding => drivers/net/hw}/hw_stats_l3.sh | 20 +- + .../net/hw}/hw_stats_l3_gre.sh | 8 +- + .../selftests/drivers/net/hw/lib/py/__init__.py | 16 + + .../{net/forwarding => drivers/net/hw}/loopback.sh | 5 +- + .../selftests/drivers/net/hw/pp_alloc_fail.py | 129 + + tools/testing/selftests/drivers/net/hw/settings | 1 + + .../selftests/drivers/net/lib/py/__init__.py | 19 + + tools/testing/selftests/drivers/net/lib/py/env.py | 224 ++ + tools/testing/selftests/drivers/net/lib/py/load.py | 41 + + .../testing/selftests/drivers/net/lib/py/remote.py | 15 + + .../selftests/drivers/net/lib/py/remote_netns.py | 21 + + .../selftests/drivers/net/lib/py/remote_ssh.py | 39 + + .../selftests/drivers/net/microchip/ksz9477_qos.sh | 668 +++++ + .../selftests/drivers/net/mlxsw/ethtool_lanes.sh | 14 +- + .../selftests/drivers/net/mlxsw/mlxsw_lib.sh | 2 +- + .../drivers/net/mlxsw/spectrum-2/resource_scale.sh | 1 - + .../drivers/net/mlxsw/spectrum/resource_scale.sh | 1 - + tools/testing/selftests/drivers/net/ping.py | 51 + + tools/testing/selftests/drivers/net/queues.py | 66 + + tools/testing/selftests/drivers/net/stats.py | 144 + + .../selftests/drivers/net/virtio_net/Makefile | 15 + + .../drivers/net/virtio_net/basic_features.sh | 131 + + .../selftests/drivers/net/virtio_net/config | 2 + + .../drivers/net/virtio_net/virtio_net_common.sh | 99 + + tools/testing/selftests/lib.mk | 17 +- + tools/testing/selftests/net/.gitignore | 3 +- + tools/testing/selftests/net/Makefile | 58 +- + tools/testing/selftests/net/af_unix/Makefile | 2 +- + tools/testing/selftests/net/af_unix/scm_rights.c | 286 ++ + tools/testing/selftests/net/bpf.mk | 53 + + .../{bpf/test_offload.py => net/bpf_offload.py} | 138 +- + tools/testing/selftests/net/cmsg_sender.c | 52 +- + tools/testing/selftests/net/cmsg_time.sh | 7 +- + tools/testing/selftests/net/epoll_busy_poll.c | 320 +++ + tools/testing/selftests/net/fib_rule_tests.sh | 46 +- + tools/testing/selftests/net/forwarding/Makefile | 9 +- + tools/testing/selftests/net/forwarding/README | 33 + + .../net/forwarding/forwarding.config.sample | 53 +- + tools/testing/selftests/net/forwarding/ipip_lib.sh | 1 - + tools/testing/selftests/net/forwarding/lib.sh | 385 ++- + .../selftests/net/forwarding/lib_sh_test.sh | 208 ++ + .../selftests/net/forwarding/router_mpath_nh.sh | 35 + + .../net/forwarding/router_mpath_nh_lib.sh | 12 +- + .../net/forwarding/router_mpath_nh_res.sh | 35 + + .../testing/selftests/net/forwarding/router_nh.sh | 14 + + .../selftests/net/forwarding/sch_ets_tests.sh | 19 +- + tools/testing/selftests/net/forwarding/sch_red.sh | 10 +- + .../selftests/net/forwarding/sch_tbf_core.sh | 2 +- + .../testing/selftests/net/forwarding/tc_common.sh | 2 +- + .../selftests/net/forwarding/tc_tunnel_key.sh | 2 - + tools/testing/selftests/net/gro.c | 141 + + tools/testing/selftests/net/hsr/Makefile | 3 +- + tools/testing/selftests/net/hsr/hsr_common.sh | 84 + + tools/testing/selftests/net/hsr/hsr_ping.sh | 106 +- + tools/testing/selftests/net/hsr/hsr_redbox.sh | 121 + + tools/testing/selftests/net/ip_local_port_range.c | 2 +- + tools/testing/selftests/net/lib.sh | 64 +- + tools/testing/selftests/net/lib/.gitignore | 2 + + tools/testing/selftests/net/lib/Makefile | 15 + + tools/testing/selftests/net/{ => lib}/csum.c | 18 +- + tools/testing/selftests/net/lib/py/__init__.py | 8 + + tools/testing/selftests/net/lib/py/consts.py | 9 + + tools/testing/selftests/net/lib/py/ksft.py | 159 ++ + tools/testing/selftests/net/lib/py/netns.py | 31 + + tools/testing/selftests/net/lib/py/nsim.py | 134 + + tools/testing/selftests/net/lib/py/utils.py | 102 + + tools/testing/selftests/net/lib/py/ynl.py | 49 + + tools/testing/selftests/net/mptcp/diag.sh | 53 + + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 155 +- + tools/testing/selftests/net/mptcp/mptcp_lib.sh | 135 + + tools/testing/selftests/net/mptcp/mptcp_sockopt.sh | 34 +- + tools/testing/selftests/net/mptcp/pm_netlink.sh | 281 +- + tools/testing/selftests/net/mptcp/pm_nl_ctl.c | 2 +- + tools/testing/selftests/net/mptcp/simult_flows.sh | 20 +- + .../selftests/net/{nat6to4.c => nat6to4.bpf.c} | 0 + .../selftests/{ => net}/netfilter/.gitignore | 4 +- + tools/testing/selftests/net/netfilter/Makefile | 52 + + .../selftests/{ => net}/netfilter/audit_logread.c | 0 + .../selftests/net/netfilter/br_netfilter.sh | 171 ++ + .../selftests/net/netfilter/bridge_brouter.sh | 122 + + tools/testing/selftests/net/netfilter/config | 89 + + .../selftests/{ => net}/netfilter/connect_close.c | 0 + .../{ => net}/netfilter/conntrack_dump_flush.c | 10 +- + .../{ => net}/netfilter/conntrack_icmp_related.sh | 179 +- + .../netfilter/conntrack_ipip_mtu.sh} | 118 +- + .../net/netfilter/conntrack_sctp_collision.sh | 87 + + .../net/netfilter/conntrack_tcp_unreplied.sh | 164 ++ + .../selftests/{ => net}/netfilter/conntrack_vrf.sh | 121 +- + tools/testing/selftests/net/netfilter/ipvs.sh | 211 ++ + tools/testing/selftests/net/netfilter/lib.sh | 10 + + .../net/netfilter/nf_conntrack_packetdrill.sh | 71 + + .../selftests/net/netfilter/nf_nat_edemux.sh | 97 + + .../nf-queue.c => net/netfilter/nf_queue.c} | 0 + .../selftests/{ => net}/netfilter/nft_audit.sh | 31 +- + .../{ => net}/netfilter/nft_concat_range.sh | 213 +- + .../net/netfilter/nft_concat_range_perf.sh | 9 + + .../net/netfilter/nft_conntrack_helper.sh | 171 ++ + tools/testing/selftests/net/netfilter/nft_fib.sh | 234 ++ + .../selftests/{ => net}/netfilter/nft_flowtable.sh | 365 ++- + .../selftests/{ => net}/netfilter/nft_meta.sh | 4 +- + .../selftests/{ => net}/netfilter/nft_nat.sh | 476 ++-- + .../selftests/{ => net}/netfilter/nft_nat_zones.sh | 194 +- + tools/testing/selftests/net/netfilter/nft_queue.sh | 417 +++ + .../selftests/net/netfilter/nft_synproxy.sh | 96 + + .../{ => net}/netfilter/nft_zones_many.sh | 95 +- + .../selftests/net/netfilter/packetdrill/common.sh | 33 + + .../packetdrill/conntrack_ack_loss_stall.pkt | 118 + + .../packetdrill/conntrack_inexact_rst.pkt | 62 + + .../packetdrill/conntrack_rst_invalid.pkt | 59 + + .../packetdrill/conntrack_syn_challenge_ack.pkt | 44 + + .../netfilter/packetdrill/conntrack_synack_old.pkt | 51 + + .../packetdrill/conntrack_synack_reuse.pkt | 34 + + .../testing/selftests/{ => net}/netfilter/rpath.sh | 10 +- + .../selftests/{ => net}/netfilter/sctp_collision.c | 0 + tools/testing/selftests/net/netfilter/settings | 1 + + .../selftests/{ => net}/netfilter/xt_string.sh | 87 +- + tools/testing/selftests/net/nl_netdev.py | 98 + + .../testing/selftests/net/openvswitch/ovs-dpctl.py | 16 +- + .../sample_map_ret0.bpf.c} | 2 +- + .../progs/sample_ret0.c => net/sample_ret0.bpf.c} | 3 + + tools/testing/selftests/net/udpgro.sh | 2 +- + tools/testing/selftests/net/udpgro_bench.sh | 2 +- + tools/testing/selftests/net/udpgro_frglist.sh | 8 +- + tools/testing/selftests/net/udpgro_fwd.sh | 2 +- + tools/testing/selftests/net/veth.sh | 2 +- + .../selftests/net/{xdp_dummy.c => xdp_dummy.bpf.c} | 0 + tools/testing/selftests/netfilter/Makefile | 21 - + .../testing/selftests/netfilter/bridge_brouter.sh | 146 - + .../selftests/netfilter/bridge_netfilter.sh | 188 -- + tools/testing/selftests/netfilter/config | 9 - + .../netfilter/conntrack_sctp_collision.sh | 89 - + .../selftests/netfilter/conntrack_tcp_unreplied.sh | 167 -- + tools/testing/selftests/netfilter/ipvs.sh | 228 -- + tools/testing/selftests/netfilter/nf_nat_edemux.sh | 127 - + .../selftests/netfilter/nft_conntrack_helper.sh | 197 -- + tools/testing/selftests/netfilter/nft_fib.sh | 273 -- + tools/testing/selftests/netfilter/nft_queue.sh | 449 --- + tools/testing/selftests/netfilter/nft_synproxy.sh | 117 - + .../selftests/netfilter/nft_trans_stress.sh | 151 - + tools/testing/selftests/netfilter/settings | 1 - + 1932 files changed, 89559 insertions(+), 37526 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/airoha,en8811h.yaml + create mode 100644 Documentation/devicetree/bindings/net/bluetooth/mediatek,mt7921s-bluetooth.yaml + create mode 100644 Documentation/devicetree/bindings/net/pse-pd/microchip,pd692x0.yaml + create mode 100644 Documentation/devicetree/bindings/net/pse-pd/ti,tps23881.yaml + create mode 100644 Documentation/devicetree/bindings/net/renesas,rzn1-gmac.yaml + create mode 100644 Documentation/netlink/specs/nftables.yaml + create mode 100644 Documentation/netlink/specs/team.yaml + create mode 100644 Documentation/networking/pse-pd/index.rst + create mode 100644 Documentation/networking/pse-pd/introduction.rst + create mode 100644 Documentation/networking/pse-pd/pse-pi.rst + create mode 100644 arch/arc/net/Makefile + create mode 100644 arch/arc/net/bpf_jit.h + create mode 100644 arch/arc/net/bpf_jit_arcv2.c + create mode 100644 arch/arc/net/bpf_jit_core.c + create mode 100644 crypto/bpf_crypto_skcipher.c + create mode 100644 drivers/bluetooth/btintel_pcie.c + create mode 100644 drivers/bluetooth/btintel_pcie.h + create mode 100644 drivers/net/dsa/microchip/ksz_dcb.c + create mode 100644 drivers/net/dsa/microchip/ksz_dcb.h + rename drivers/net/ethernet/intel/ice/{ice_devlink.c => devlink/devlink.c} (77%) + rename drivers/net/ethernet/intel/ice/{ice_devlink.h => devlink/devlink.h} (100%) + create mode 100644 drivers/net/ethernet/intel/ice/devlink/devlink_port.c + create mode 100644 drivers/net/ethernet/intel/ice/devlink/devlink_port.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_adapter.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_adapter.h + create mode 100644 drivers/net/ethernet/intel/libeth/Kconfig + create mode 100644 drivers/net/ethernet/intel/libeth/Makefile + create mode 100644 drivers/net/ethernet/intel/libeth/rx.c + create mode 100644 drivers/net/ethernet/intel/libie/Kconfig + create mode 100644 drivers/net/ethernet/intel/libie/Makefile + create mode 100644 drivers/net/ethernet/intel/libie/rx.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/en/dim.h + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_mirror.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-rzn1.c + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_common.c + create mode 100644 drivers/net/ethernet/ti/icssg/icssg_prueth_sr1.c + create mode 100644 drivers/net/pfcp.c + create mode 100644 drivers/net/phy/air_en8811h.c + create mode 100644 drivers/net/pse-pd/pd692x0.c + create mode 100644 drivers/net/pse-pd/tps23881.c + rename drivers/net/team/{team.c => team_core.c} (97%) + create mode 100644 drivers/net/team/team_nl.c + create mode 100644 drivers/net/team/team_nl.h + create mode 100644 drivers/net/wireless/ath/ath11k/p2p.c + create mode 100644 drivers/net/wireless/ath/ath11k/p2p.h + create mode 100644 drivers/net/wireless/ath/ath12k/acpi.c + create mode 100644 drivers/net/wireless/ath/ath12k/acpi.h + create mode 100644 drivers/net/wireless/ath/ath12k/debugfs.c + create mode 100644 drivers/net/wireless/ath/ath12k/debugfs.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/tests/Makefile + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/tests/links.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/tests/module.c + create mode 100644 drivers/net/wireless/intel/iwlwifi/mvm/tests/scan.c + rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8188e.c => 8188e.c} (99%) + rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8188f.c => 8188f.c} (99%) + rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8192c.c => 8192c.c} (90%) + rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8192e.c => 8192e.c} (99%) + rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8192f.c => 8192f.c} (99%) + rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8710b.c => 8710b.c} (99%) + rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8723a.c => 8723a.c} (90%) + rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_8723b.c => 8723b.c} (98%) + rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_core.c => core.c} (99%) + rename drivers/net/wireless/realtek/rtl8xxxu/{rtl8xxxu_regs.h => regs.h} (100%) + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192d/Makefile + rename drivers/net/wireless/realtek/rtlwifi/{rtl8192de => rtl8192d}/def.h (100%) + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192d/dm_common.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192d/dm_common.h + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192d/fw_common.h + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192d/hw_common.h + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192d/main.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192d/phy_common.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192d/phy_common.h + rename drivers/net/wireless/realtek/rtlwifi/{rtl8192de => rtl8192d}/reg.h (90%) + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192d/rf_common.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192d/rf_common.h + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192d/trx_common.c + create mode 100644 drivers/net/wireless/realtek/rtlwifi/rtl8192d/trx_common.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b_tables.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8703b_tables.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723cs.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723x.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723x.h + create mode 100644 drivers/virtio/virtio_debug.c + create mode 100644 include/linux/bpf_crypto.h + delete mode 100644 include/linux/genetlink.h + create mode 100644 include/linux/net/intel/libie/rx.h + create mode 100644 include/linux/skbuff_ref.h + create mode 100644 include/net/dscp.h + create mode 100644 include/net/ieee8021q.h + create mode 100644 include/net/libeth/rx.h + create mode 100644 include/net/pfcp.h + create mode 100644 include/net/proto_memory.h + create mode 100644 include/net/rstreason.h + create mode 100644 include/trace/events/icmp.h + create mode 100644 kernel/bpf/crypto.c + create mode 100644 net/core/ieee8021q_helpers.c + rename net/core/{gso_test.c => net_test.c} (67%) + create mode 100644 net/netlink/genetlink.h + create mode 100644 net/smc/smc_loopback.c + create mode 100644 net/smc/smc_loopback.h + create mode 100644 tools/include/linux/align.h + delete mode 100644 tools/include/uapi/linux/ethtool.h + create mode 100644 tools/testing/selftests/bpf/benchs/bench_bpf_crypto.c + delete mode 100644 tools/testing/selftests/bpf/bpf_tcp_helpers.h + create mode 100644 tools/testing/selftests/bpf/prog_tests/arena_atomics.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/crypto_sanity.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/preempt_lock.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/verifier_kfunc_prog_types.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/wq.c + create mode 100644 tools/testing/selftests/bpf/progs/arena_atomics.c + create mode 100644 tools/testing/selftests/bpf/progs/bind_prog.h + create mode 100644 tools/testing/selftests/bpf/progs/bpf_cc_cubic.c + create mode 100644 tools/testing/selftests/bpf/progs/crypto_basic.c + create mode 100644 tools/testing/selftests/bpf/progs/crypto_bench.c + create mode 100644 tools/testing/selftests/bpf/progs/crypto_common.h + create mode 100644 tools/testing/selftests/bpf/progs/crypto_sanity.c + create mode 100644 tools/testing/selftests/bpf/progs/for_each_multi_maps.c + create mode 100644 tools/testing/selftests/bpf/progs/getpeername4_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/getpeername6_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/getsockname4_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/getsockname6_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/kprobe_multi_session.c + create mode 100644 tools/testing/selftests/bpf/progs/kprobe_multi_session_cookie.c + create mode 100644 tools/testing/selftests/bpf/progs/preempt_lock.c + create mode 100644 tools/testing/selftests/bpf/progs/sock_addr_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_forgotten_cb.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_nulled_out_cb.c + create mode 100644 tools/testing/selftests/bpf/progs/tcp_ca_kfunc.c + create mode 100644 tools/testing/selftests/bpf/progs/test_ringbuf_n.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_kfunc_prog_types.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_sock_addr.c + create mode 100644 tools/testing/selftests/bpf/progs/wq.c + create mode 100644 tools/testing/selftests/bpf/progs/wq_failures.c + delete mode 100644 tools/testing/selftests/bpf/test_sock_addr.c + delete mode 100755 tools/testing/selftests/bpf/test_sock_addr.sh + create mode 100644 tools/testing/selftests/drivers/net/Makefile + create mode 100644 tools/testing/selftests/drivers/net/README.rst + create mode 100644 tools/testing/selftests/drivers/net/config + create mode 100644 tools/testing/selftests/drivers/net/hw/Makefile + create mode 100755 tools/testing/selftests/drivers/net/hw/csum.py + rename tools/testing/selftests/{net => drivers/net/hw}/devlink_port_split.py (100%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool.sh (92%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_extended_state.sh (96%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_lib.sh (100%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_mm.sh (99%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/ethtool_rmon.sh (91%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/hw_stats_l3.sh (96%) + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/hw_stats_l3_gre.sh (90%) + create mode 100644 tools/testing/selftests/drivers/net/hw/lib/py/__init__.py + rename tools/testing/selftests/{net/forwarding => drivers/net/hw}/loopback.sh (92%) + create mode 100755 tools/testing/selftests/drivers/net/hw/pp_alloc_fail.py + create mode 100644 tools/testing/selftests/drivers/net/hw/settings + create mode 100644 tools/testing/selftests/drivers/net/lib/py/__init__.py + create mode 100644 tools/testing/selftests/drivers/net/lib/py/env.py + create mode 100644 tools/testing/selftests/drivers/net/lib/py/load.py + create mode 100644 tools/testing/selftests/drivers/net/lib/py/remote.py + create mode 100644 tools/testing/selftests/drivers/net/lib/py/remote_netns.py + create mode 100644 tools/testing/selftests/drivers/net/lib/py/remote_ssh.py + create mode 100755 tools/testing/selftests/drivers/net/microchip/ksz9477_qos.sh + create mode 100755 tools/testing/selftests/drivers/net/ping.py + create mode 100755 tools/testing/selftests/drivers/net/queues.py + create mode 100755 tools/testing/selftests/drivers/net/stats.py + create mode 100644 tools/testing/selftests/drivers/net/virtio_net/Makefile + create mode 100755 tools/testing/selftests/drivers/net/virtio_net/basic_features.sh + create mode 100644 tools/testing/selftests/drivers/net/virtio_net/config + create mode 100644 tools/testing/selftests/drivers/net/virtio_net/virtio_net_common.sh + create mode 100644 tools/testing/selftests/net/af_unix/scm_rights.c + create mode 100644 tools/testing/selftests/net/bpf.mk + rename tools/testing/selftests/{bpf/test_offload.py => net/bpf_offload.py} (93%) + create mode 100644 tools/testing/selftests/net/epoll_busy_poll.c + create mode 100755 tools/testing/selftests/net/forwarding/lib_sh_test.sh + create mode 100644 tools/testing/selftests/net/hsr/hsr_common.sh + create mode 100755 tools/testing/selftests/net/hsr/hsr_redbox.sh + create mode 100644 tools/testing/selftests/net/lib/.gitignore + create mode 100644 tools/testing/selftests/net/lib/Makefile + rename tools/testing/selftests/net/{ => lib}/csum.c (97%) + create mode 100644 tools/testing/selftests/net/lib/py/__init__.py + create mode 100644 tools/testing/selftests/net/lib/py/consts.py + create mode 100644 tools/testing/selftests/net/lib/py/ksft.py + create mode 100644 tools/testing/selftests/net/lib/py/netns.py + create mode 100644 tools/testing/selftests/net/lib/py/nsim.py + create mode 100644 tools/testing/selftests/net/lib/py/utils.py + create mode 100644 tools/testing/selftests/net/lib/py/ynl.py + rename tools/testing/selftests/net/{nat6to4.c => nat6to4.bpf.c} (100%) + rename tools/testing/selftests/{ => net}/netfilter/.gitignore (92%) + create mode 100644 tools/testing/selftests/net/netfilter/Makefile + rename tools/testing/selftests/{ => net}/netfilter/audit_logread.c (100%) + create mode 100755 tools/testing/selftests/net/netfilter/br_netfilter.sh + create mode 100755 tools/testing/selftests/net/netfilter/bridge_brouter.sh + create mode 100644 tools/testing/selftests/net/netfilter/config + rename tools/testing/selftests/{ => net}/netfilter/connect_close.c (100%) + rename tools/testing/selftests/{ => net}/netfilter/conntrack_dump_flush.c (98%) + rename tools/testing/selftests/{ => net}/netfilter/conntrack_icmp_related.sh (52%) + rename tools/testing/selftests/{netfilter/ipip-conntrack-mtu.sh => net/netfilter/conntrack_ipip_mtu.sh} (58%) + create mode 100755 tools/testing/selftests/net/netfilter/conntrack_sctp_collision.sh + create mode 100755 tools/testing/selftests/net/netfilter/conntrack_tcp_unreplied.sh + rename tools/testing/selftests/{ => net}/netfilter/conntrack_vrf.sh (60%) + create mode 100755 tools/testing/selftests/net/netfilter/ipvs.sh + create mode 100644 tools/testing/selftests/net/netfilter/lib.sh + create mode 100755 tools/testing/selftests/net/netfilter/nf_conntrack_packetdrill.sh + create mode 100755 tools/testing/selftests/net/netfilter/nf_nat_edemux.sh + rename tools/testing/selftests/{netfilter/nf-queue.c => net/netfilter/nf_queue.c} (100%) + rename tools/testing/selftests/{ => net}/netfilter/nft_audit.sh (92%) + rename tools/testing/selftests/{ => net}/netfilter/nft_concat_range.sh (90%) + create mode 100755 tools/testing/selftests/net/netfilter/nft_concat_range_perf.sh + create mode 100755 tools/testing/selftests/net/netfilter/nft_conntrack_helper.sh + create mode 100755 tools/testing/selftests/net/netfilter/nft_fib.sh + rename tools/testing/selftests/{ => net}/netfilter/nft_flowtable.sh (54%) + rename tools/testing/selftests/{ => net}/netfilter/nft_meta.sh (95%) + rename tools/testing/selftests/{ => net}/netfilter/nft_nat.sh (62%) + rename tools/testing/selftests/{ => net}/netfilter/nft_nat_zones.sh (53%) + create mode 100755 tools/testing/selftests/net/netfilter/nft_queue.sh + create mode 100755 tools/testing/selftests/net/netfilter/nft_synproxy.sh + rename tools/testing/selftests/{ => net}/netfilter/nft_zones_many.sh (59%) + create mode 100755 tools/testing/selftests/net/netfilter/packetdrill/common.sh + create mode 100644 tools/testing/selftests/net/netfilter/packetdrill/conntrack_ack_loss_stall.pkt + create mode 100644 tools/testing/selftests/net/netfilter/packetdrill/conntrack_inexact_rst.pkt + create mode 100644 tools/testing/selftests/net/netfilter/packetdrill/conntrack_rst_invalid.pkt + create mode 100644 tools/testing/selftests/net/netfilter/packetdrill/conntrack_syn_challenge_ack.pkt + create mode 100644 tools/testing/selftests/net/netfilter/packetdrill/conntrack_synack_old.pkt + create mode 100644 tools/testing/selftests/net/netfilter/packetdrill/conntrack_synack_reuse.pkt + rename tools/testing/selftests/{ => net}/netfilter/rpath.sh (95%) + rename tools/testing/selftests/{ => net}/netfilter/sctp_collision.c (100%) + create mode 100644 tools/testing/selftests/net/netfilter/settings + rename tools/testing/selftests/{ => net}/netfilter/xt_string.sh (50%) + create mode 100755 tools/testing/selftests/net/nl_netdev.py + rename tools/testing/selftests/{bpf/progs/sample_map_ret0.c => net/sample_map_ret0.bpf.c} (96%) + rename tools/testing/selftests/{bpf/progs/sample_ret0.c => net/sample_ret0.bpf.c} (70%) + rename tools/testing/selftests/net/{xdp_dummy.c => xdp_dummy.bpf.c} (100%) + delete mode 100644 tools/testing/selftests/netfilter/Makefile + delete mode 100755 tools/testing/selftests/netfilter/bridge_brouter.sh + delete mode 100644 tools/testing/selftests/netfilter/bridge_netfilter.sh + delete mode 100644 tools/testing/selftests/netfilter/config + delete mode 100755 tools/testing/selftests/netfilter/conntrack_sctp_collision.sh + delete mode 100755 tools/testing/selftests/netfilter/conntrack_tcp_unreplied.sh + delete mode 100755 tools/testing/selftests/netfilter/ipvs.sh + delete mode 100755 tools/testing/selftests/netfilter/nf_nat_edemux.sh + delete mode 100755 tools/testing/selftests/netfilter/nft_conntrack_helper.sh + delete mode 100755 tools/testing/selftests/netfilter/nft_fib.sh + delete mode 100755 tools/testing/selftests/netfilter/nft_queue.sh + delete mode 100755 tools/testing/selftests/netfilter/nft_synproxy.sh + delete mode 100755 tools/testing/selftests/netfilter/nft_trans_stress.sh + delete mode 100644 tools/testing/selftests/netfilter/settings +Merging bpf-next/for-next (5c1672705a1a net: revert partially applied PHY topology series) +$ 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 +Already up to date. +Merging ipsec-next/master (dcf280ea0aad Merge remote branch 'xfrm: Introduce direction attribute for SA') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (d727d27db536 RDMA/mlx5: Expose register c0 for RDMA device) +$ 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 (5c1672705a1a net: revert partially applied PHY topology series) +$ 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 (fa23e0d4b756 netfilter: nf_tables: allow clone callbacks to sleep) +$ 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 (6a486c1361ea Bluetooth: btintel_pcie: Refactor and code cleanup) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Already up to date. +Merging wireless-next/for-next (1d60eabb8269 wifi: mwl8k: initialize cmd->addr[] properly) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging 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 (6277967d872e mtd: mchp23k256: drop unneeded MODULE_ALIAS) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Auto-merging MAINTAINERS +Auto-merging drivers/mtd/mtdcore.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/mtd/partitions/binman.yaml | 53 ++++++++++++++++ + .../bindings/mtd/partitions/partition.yaml | 72 ++++++++++++++++++++++ + .../bindings/mtd/samsung,s5pv210-onenand.yaml | 65 +++++++++++++++++++ + MAINTAINERS | 5 ++ + drivers/mtd/devices/mchp23k256.c | 1 - + drivers/mtd/maps/sa1100-flash.c | 6 +- + drivers/mtd/mtdcore.c | 9 ++- + drivers/mtd/parsers/redboot.c | 2 +- + 8 files changed, 205 insertions(+), 8 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mtd/partitions/binman.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/samsung,s5pv210-onenand.yaml +Merging nand/nand/next (6819db94e1cd mtd: rawnand: hynix: fixed typo) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/davinci_nand.c | 5 ++++- + drivers/mtd/nand/raw/nand_hynix.c | 2 +- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging spi-nor/spi-nor/next (c84b3925c7d6 mtd: spi-nor: replace unnecessary div64_u64() with div_u64()) +$ 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/core.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging crypto/master (13909a0c8897 crypto: atmel-sha204a - provide the otp content) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (275654c02f0b Merge tag 'drm-xe-next-fixes-2024-05-09-1' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging Documentation/devicetree/bindings/display/panel/panel-simple.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/amd/amdgpu/Makefile +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hpo_dp_link_encoder.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml2/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_dpia_bw.c +Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +Auto-merging drivers/gpu/drm/i915/Makefile +Auto-merging drivers/gpu/drm/i915/display/intel_bios.c +Auto-merging drivers/gpu/drm/i915/display/intel_vbt_defs.h +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gvt/handlers.c +Auto-merging drivers/gpu/drm/i915/gvt/mmio.c +Auto-merging drivers/gpu/drm/imagination/pvr_vm_mips.c +Auto-merging drivers/gpu/drm/mediatek/mtk_gem.c +Auto-merging drivers/gpu/drm/msm/Makefile +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/Makefile +Auto-merging drivers/gpu/drm/nouveau/nouveau_abi16.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/panel/Kconfig +Auto-merging drivers/gpu/drm/ttm/ttm_tt.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.c +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h +Auto-merging drivers/gpu/drm/xe/xe_guc_ads.c +Auto-merging drivers/gpu/drm/xe/xe_guc_ct.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_guc_ct.c +Auto-merging drivers/gpu/drm/xe/xe_vm.c +Auto-merging include/linux/fb.h +Auto-merging include/uapi/drm/nouveau_drm.h +Resolved 'drivers/gpu/drm/msm/Makefile' using previous resolution. +Resolved 'drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_guc_ct.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9c6125683587] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-driver-intel-xe-hwmon | 114 +- + .../ABI/testing/sysfs-driver-panfrost-profiling | 10 + + .../bindings/display/bridge/ite,it6505.yaml | 8 +- + .../bindings/display/bridge/lvds-codec.yaml | 1 + + .../display/bridge/microchip,sam9x75-lvds.yaml | 55 + + .../bindings/display/bridge/toshiba,tc358775.yaml | 39 +- + .../bindings/display/mediatek/mediatek,gamma.yaml | 5 + + .../bindings/display/msm/dp-controller.yaml | 1 + + .../bindings/display/msm/qcom,sm6350-mdss.yaml | 9 + + .../bindings/display/panel/ilitek,ili9881c.yaml | 1 + + .../bindings/display/panel/lg,sw43408.yaml | 62 + + .../bindings/display/panel/novatek,nt35950.yaml | 3 +- + .../bindings/display/panel/novatek,nt36523.yaml | 25 +- + .../bindings/display/panel/panel-common-dual.yaml | 47 + + .../bindings/display/panel/panel-simple-dsi.yaml | 4 + + .../bindings/display/panel/panel-simple.yaml | 6 + + .../bindings/display/panel/raydium,rm69380.yaml | 89 + + .../display/panel/rocktech,jh057n00900.yaml | 2 + + .../bindings/display/panel/sony,td4353-jdi.yaml | 2 + + .../display/rockchip/rockchip,dw-hdmi.yaml | 5 + + .../display/rockchip/rockchip,inno-hdmi.yaml | 5 + + .../display/rockchip/rockchip,rk3066-hdmi.yaml | 7 + + .../bindings/gpu/arm,mali-valhall-csf.yaml | 147 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/driver-api/dma-buf.rst | 2 +- + Documentation/gpu/amdgpu/debugging.rst | 80 + + .../gpu/amdgpu/display/display-contributing.rst | 2 +- + Documentation/gpu/amdgpu/index.rst | 1 + + Documentation/gpu/driver-uapi.rst | 5 + + Documentation/gpu/drm-kms.rst | 22 + + Documentation/gpu/i915.rst | 9 + + Documentation/gpu/panfrost.rst | 9 + + Documentation/gpu/rfc/i915_vm_bind.h | 11 +- + MAINTAINERS | 220 +- + arch/m68k/include/asm/pgtable.h | 2 + + arch/parisc/configs/generic-32bit_defconfig | 2 +- + drivers/accel/ivpu/ivpu_debugfs.c | 2 + + drivers/accel/qaic/Makefile | 5 +- + drivers/accel/qaic/qaic.h | 9 + + drivers/accel/qaic/qaic_data.c | 9 + + drivers/accel/qaic/qaic_debugfs.c | 338 + + drivers/accel/qaic/qaic_debugfs.h | 20 + + drivers/accel/qaic/qaic_drv.c | 26 +- + drivers/accel/qaic/sahara.c | 449 + + drivers/accel/qaic/sahara.h | 10 + + drivers/base/devcoredump.c | 23 + + drivers/dma-buf/dma-buf.c | 56 +- + drivers/gpu/drm/Kconfig | 59 +- + drivers/gpu/drm/Makefile | 30 + + drivers/gpu/drm/amd/amdgpu/Makefile | 8 +- + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 169 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_benchmark.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 360 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.h | 47 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 159 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfxhub.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 47 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 24 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 506 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 77 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 25 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 105 - + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 88 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 133 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 41 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c | 112 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 10 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 13 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 6 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 1 + + drivers/gpu/drm/amd/amdgpu/cik.c | 6 +- + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 6 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 151 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 12 - + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 66 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 17 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 15 + + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 28 +- + drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 4 + + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 2 + + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 2 + + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 146 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 55 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 2 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 3 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/nv.c | 8 +- + drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 8 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 46 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 9 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/si.c | 6 +- + drivers/gpu/drm/amd/amdgpu/si_dma.c | 6 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 2 +- + drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.c | 62 + + drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 16 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 2 + + drivers/gpu/drm/amd/amdgpu/soc21.c | 6 +- + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 2 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 426 +- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 75 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 6 - + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 2 + + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 2 + + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 4 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 3 + + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/vi.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 5 + + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 4 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 32 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 53 +- + drivers/gpu/drm/amd/amdkfd/kfd_interrupt.c | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 18 + + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.h | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_cik.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v10.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v9.c | 25 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_vi.c | 6 +- + drivers/gpu/drm/amd/display/Makefile | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 58 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 42 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 4 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 66 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 3 - + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 8 + + drivers/gpu/drm/amd/display/dc/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 3 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 2 - + .../gpu/drm/amd/display/dc/bios/command_table.c | 2 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 2 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 17 +- + .../amd/display/dc/clk_mgr/dce100/dce_clk_mgr.c | 4 +- + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 1 - + .../dc/clk_mgr/dcn10/rv1_clk_mgr_vbios_smu.c | 1 - + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 11 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 5 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 10 +- + .../dc/clk_mgr/dcn30/dcn30_clk_mgr_smu_msg.c | 6 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 3 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 3 +- + .../drm/amd/display/dc/clk_mgr/dcn31/dcn31_smu.c | 1 - + .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.h | 42 +- + .../drm/amd/display/dc/clk_mgr/dcn315/dcn315_smu.c | 2 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 3 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 12 +- + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c | 9 + + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.h | 3 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 41 +- + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 21 - + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h | 2 - + drivers/gpu/drm/amd/display/dc/core/dc.c | 1016 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 214 +- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 62 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 22 +- + drivers/gpu/drm/amd/display/dc/core/dc_surface.c | 65 +- + drivers/gpu/drm/amd/display/dc/dc.h | 225 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 179 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 3 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 18 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 8 + + drivers/gpu/drm/amd/display/dc/dc_plane.h | 2 +- + drivers/gpu/drm/amd/display/dc/dc_plane_priv.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_state.h | 8 +- + drivers/gpu/drm/amd/display/dc/dc_state_priv.h | 12 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 10 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 20 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 6 - + drivers/gpu/drm/amd/display/dc/dce/dce_mem_input.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_opp.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_transform.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_abm_lcd.c | 4 - + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 4 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_cm_common.c | 7 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 10 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 10 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_hubp.h | 1 + + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 2 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 1 - + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 6 - + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_opp.h | 2 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 10 +- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dwb.c | 11 + + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 2 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.h | 2 +- + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 5 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_mpc.c | 10 +- + drivers/gpu/drm/amd/display/dc/dcn201/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_hubbub.c | 4 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_hubp.c | 5 + + .../amd/display/dc/dcn201/dcn201_link_encoder.h | 14 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 8 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.h | 8 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 2 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dccg.h | 21 +- + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 2 - + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.h | 3 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 3 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h | 14 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.c | 2 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_hubbub.h | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_vpg.h | 23 +- + .../gpu/drm/amd/display/dc/dcn301/dcn301_dccg.h | 6 - + .../gpu/drm/amd/display/dc/dcn301/dcn301_hubbub.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_dccg.h | 6 + + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 2 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.h | 4 + + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 2 +- + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 4 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 8 +- + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.c | 7 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_vpg.h | 1 + + drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 2 +- + .../amd/display/dc/dcn32/dcn32_dio_link_encoder.c | 6 +- + .../amd/display/dc/dcn32/dcn32_dio_link_encoder.h | 10 +- + .../display/dc/dcn32/dcn32_dio_stream_encoder.h | 5 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 10 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 8 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 25 +- + .../display/dc/dcn321/dcn321_dio_link_encoder.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn35/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c | 207 +- + .../amd/display/dc/dcn35/dcn35_dio_link_encoder.c | 3 +- + .../amd/display/dc/dcn35/dcn35_dio_link_encoder.h | 12 +- + .../display/dc/dcn35/dcn35_dio_stream_encoder.h | 1 - + .../gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c | 4 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 3 +- + drivers/gpu/drm/amd/display/dc/dm_services.h | 10 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 11 +- + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 2 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 1 - + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c | 10 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 1 + + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 1 - + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 2 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 1 - + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 269 +- + .../dc/dml/dcn32/display_mode_vba_util_32.c | 18 +- + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 8 +- + .../gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c | 3 +- + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 1 + + .../drm/amd/display/dc/dml2/display_mode_core.c | 19 +- + .../drm/amd/display/dc/dml2/display_mode_core.h | 1 + + .../amd/display/dc/dml2/display_mode_lib_defines.h | 2 + + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 169 +- + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.h | 2 + + .../drm/amd/display/dc/dml2/dml2_internal_types.h | 11 + + .../amd/display/dc/dml2/dml2_translation_helper.c | 62 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c | 78 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.h | 5 + + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 16 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 34 +- + drivers/gpu/drm/amd/display/dc/dpp/Makefile | 77 + + .../drm/amd/display/dc/dpp/dcn10/CMakeLists.txt | 6 + + .../drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.c | 2 +- + .../drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.h | 3 +- + .../amd/display/dc/{ => dpp}/dcn10/dcn10_dpp_cm.c | 6 +- + .../display/dc/{ => dpp}/dcn10/dcn10_dpp_dscl.c | 2 +- + .../drm/amd/display/dc/dpp/dcn20/CMakeLists.txt | 5 + + .../drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.c | 2 +- + .../drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.h | 2 +- + .../amd/display/dc/{ => dpp}/dcn20/dcn20_dpp_cm.c | 14 +- + .../drm/amd/display/dc/dpp/dcn201/CMakeLists.txt | 4 + + .../amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.c | 2 +- + .../amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.h | 0 + .../drm/amd/display/dc/dpp/dcn30/CMakeLists.txt | 5 + + .../drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.c | 18 +- + .../drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.h | 4 + + .../amd/display/dc/{ => dpp}/dcn30/dcn30_dpp_cm.c | 6 +- + .../drm/amd/display/dc/dpp/dcn32/CMakeLists.txt | 4 + + .../drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.c | 2 +- + .../drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.h | 0 + .../drm/amd/display/dc/dpp/dcn35/CMakeLists.txt | 4 + + .../gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.c | 112 + + .../drm/amd/display/dc/{ => dpp}/dcn35/dcn35_dpp.h | 9 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 15 +- + drivers/gpu/drm/amd/display/dc/dsc/rc_calc_dpi.c | 7 +- + .../amd/display/dc/gpio/dcn21/hw_translate_dcn21.c | 13 - + drivers/gpu/drm/amd/display/dc/gpio/gpio_service.c | 6 +- + drivers/gpu/drm/amd/display/dc/hwss/Makefile | 2 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 54 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 48 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 122 +- + .../gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn21/dcn21_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 72 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h | 5 +- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 4 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 2 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 89 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 109 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 8 +- + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 4 +- + .../gpu/drm/amd/display/dc/hwss/dcn351/Makefile | 25 +- + .../drm/amd/display/dc/hwss/dcn351/dcn351_hwseq.c | 182 + + .../dcn35_dpp.c => hwss/dcn351/dcn351_hwseq.h} | 38 +- + .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 4 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 13 +- + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 30 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 2 - + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 5 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 30 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 3 +- + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mem_input.h | 12 +- + drivers/gpu/drm/amd/display/dc/inc/hw/optc.h | 2 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 4 - + .../drm/amd/display/dc/inc/hw/timing_generator.h | 7 + + drivers/gpu/drm/amd/display/dc/inc/hw/vpg.h | 53 + + drivers/gpu/drm/amd/display/dc/inc/link.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 24 +- + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 8 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 2 +- + .../display/dc/link/accessories/link_dp_trace.c | 1 - + .../gpu/drm/amd/display/dc/link/link_detection.c | 4 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 16 +- + .../display/dc/link/protocols/link_dp_capability.c | 16 +- + .../display/dc/link/protocols/link_dp_dpia_bw.c | 4 +- + .../dc/link/protocols/link_dp_irq_handler.c | 10 +- + .../display/dc/link/protocols/link_dp_training.c | 18 +- + .../dc/link/protocols/link_dp_training_dpia.c | 4 +- + .../drm/amd/display/dc/link/protocols/link_dpcd.c | 2 +- + .../dc/link/protocols/link_edp_panel_control.c | 75 +- + .../dc/link/protocols/link_edp_panel_control.h | 4 +- + .../drm/amd/display/dc/link/protocols/link_hpd.c | 2 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c | 18 +- + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.h | 9 +- + .../gpu/drm/amd/display/dc/optc/dcn20/dcn20_optc.c | 10 - + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 165 +- + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.h | 6 +- + drivers/gpu/drm/amd/display/dc/resource/Makefile | 6 - + .../display/dc/resource/dce112/dce112_resource.c | 2 - + .../display/dc/resource/dce120/dce120_resource.c | 2 +- + .../amd/display/dc/resource/dce80/dce80_resource.c | 1 - + .../amd/display/dc/resource/dcn10/dcn10_resource.c | 4 +- + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 18 +- + .../display/dc/resource/dcn201/dcn201_resource.c | 6 +- + .../amd/display/dc/resource/dcn21/dcn21_resource.c | 33 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 5 +- + .../display/dc/resource/dcn303/dcn303_resource.c | 2 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 12 +- + .../display/dc/resource/dcn314/dcn314_resource.c | 26 +- + .../display/dc/resource/dcn315/dcn315_resource.c | 2 + + .../display/dc/resource/dcn316/dcn316_resource.c | 5 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 125 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.h | 12 +- + .../display/dc/resource/dcn321/dcn321_resource.c | 43 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 24 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.h | 2 + + .../display/dc/resource/dcn351/dcn351_resource.c | 26 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 18 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 221 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 2 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 2 + + drivers/gpu/drm/amd/display/include/dal_types.h | 1 - + .../gpu/drm/amd/display/include/grph_object_id.h | 4 +- + .../drm/amd/display/include/link_service_types.h | 1 - + drivers/gpu/drm/amd/display/include/logger_types.h | 1 + + drivers/gpu/drm/amd/display/include/signal_types.h | 13 + + .../drm/amd/display/modules/color/color_gamma.c | 2 +- + .../drm/amd/display/modules/freesync/freesync.c | 8 +- + .../drm/amd/display/modules/hdcp/hdcp2_execution.c | 2 +- + .../gpu/drm/amd/display/modules/hdcp/hdcp_ddc.c | 8 + + .../amd/display/modules/info_packet/info_packet.c | 2 - + drivers/gpu/drm/amd/include/amd_shared.h | 3 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 28 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 14 + + .../amd/include/asic_reg/dcn/dcn_3_0_2_offset.h | 20 + + .../amd/include/asic_reg/dcn/dcn_3_0_2_sh_mask.h | 8 + + .../amd/include/asic_reg/dcn/dcn_3_0_3_offset.h | 28 + + .../amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h | 18 + + .../amd/include/asic_reg/dcn/dcn_3_1_2_offset.h | 4 + + .../amd/include/asic_reg/dcn/dcn_3_1_2_sh_mask.h | 19 + + .../amd/include/asic_reg/dcn/dcn_3_1_5_offset.h | 4 + + .../amd/include/asic_reg/dcn/dcn_3_1_5_sh_mask.h | 10 + + .../amd/include/asic_reg/dcn/dcn_3_2_0_offset.h | 60 + + .../amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h | 27 + + .../amd/include/asic_reg/dcn/dcn_3_2_1_offset.h | 37 +- + .../amd/include/asic_reg/dcn/dcn_3_2_1_sh_mask.h | 16 + + .../amd/include/asic_reg/dpcs/dpcs_3_0_0_offset.h | 24 + + .../amd/include/asic_reg/dpcs/dpcs_3_0_0_sh_mask.h | 4 +- + .../amd/include/asic_reg/dpcs/dpcs_3_0_3_sh_mask.h | 4 +- + .../amd/include/asic_reg/dpcs/dpcs_4_2_0_offset.h | 10 + + .../drm/amd/include/asic_reg/gc/gc_10_1_0_offset.h | 12 + + .../drm/amd/include/asic_reg/gc/gc_9_0_sh_mask.h | 4 + + .../amd/include/asic_reg/oss/osssys_6_0_0_offset.h | 4 + + .../include/asic_reg/oss/osssys_6_0_0_sh_mask.h | 10 + + .../include/asic_reg/smuio/smuio_14_0_2_offset.h | 511 + + .../include/asic_reg/smuio/smuio_14_0_2_sh_mask.h | 1106 ++ + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 3 +- + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 38 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 8 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 226 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 6 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 41 + + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 2 + + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 2 + + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 8 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_baco.c | 6 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_baco.h | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 2 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu9_baco.c | 8 +- + drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu9_baco.h | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_baco.c | 8 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_baco.h | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 2 +- + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 12 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 13 +- + .../pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0.h | 1836 +++ + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h | 6 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v14_0_2_ppsmc.h | 140 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 7 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v11_0.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 7 +- + .../gpu/drm/amd/pm/swsmu/inc/smu_v14_0_2_pptable.h | 164 + + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 2 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 18 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 22 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 21 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 8 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 8 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 96 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/Makefile | 2 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 133 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 6 + + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 1796 +++ + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.h | 28 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 67 +- + .../gpu/drm/arm/display/komeda/d71/d71_component.c | 2 + + .../gpu/drm/arm/display/komeda/komeda_pipeline.c | 1 + + drivers/gpu/drm/arm/malidp_mw.c | 5 +- + drivers/gpu/drm/armada/armada_debugfs.c | 1 + + drivers/gpu/drm/ast/Makefile | 10 +- + drivers/gpu/drm/ast/{ast_i2c.c => ast_ddc.c} | 126 +- + drivers/gpu/drm/ast/ast_ddc.h | 11 + + drivers/gpu/drm/ast/ast_drv.c | 1 + + drivers/gpu/drm/ast/ast_drv.h | 39 +- + drivers/gpu/drm/ast/ast_main.c | 1 + + drivers/gpu/drm/ast/ast_mode.c | 165 +- + drivers/gpu/drm/bridge/Kconfig | 14 +- + drivers/gpu/drm/bridge/Makefile | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511.h | 1 + + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 20 +- + drivers/gpu/drm/bridge/analogix/Kconfig | 2 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 15 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 3 + + drivers/gpu/drm/bridge/chipone-icn6211.c | 7 +- + drivers/gpu/drm/bridge/imx/Kconfig | 4 +- + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c | 6 +- + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-tx.c | 6 +- + drivers/gpu/drm/bridge/ite-it6505.c | 1 + + drivers/gpu/drm/bridge/ite-it66121.c | 23 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 6 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 6 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 6 +- + drivers/gpu/drm/bridge/microchip-lvds.c | 229 + + drivers/gpu/drm/bridge/panel.c | 2 + + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 31 +- + drivers/gpu/drm/bridge/tc358764.c | 1 - + drivers/gpu/drm/bridge/tc358775.c | 104 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 21 +- + drivers/gpu/drm/bridge/ti-dlpc3433.c | 17 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 1 - + drivers/gpu/drm/ci/test.yml | 6 +- + drivers/gpu/drm/display/Kconfig | 54 +- + drivers/gpu/drm/display/Makefile | 6 +- + drivers/gpu/drm/display/drm_dp_helper.c | 41 +- + drivers/gpu/drm/display/drm_dp_helper_internal.h | 2 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 42 +- + .../gpu/drm/display/drm_dp_mst_topology_internal.h | 4 +- + drivers/gpu/drm/display/drm_dp_tunnel.c | 17 +- + drivers/gpu/drm/drm_atomic_helper.c | 4 + + drivers/gpu/drm/drm_atomic_uapi.c | 6 +- + drivers/gpu/drm/drm_bridge.c | 24 +- + drivers/gpu/drm/drm_buddy.c | 431 +- + drivers/gpu/drm/drm_client.c | 105 +- + drivers/gpu/drm/drm_client_modeset.c | 129 +- + drivers/gpu/drm/drm_crtc.c | 38 +- + drivers/gpu/drm/drm_crtc_helper.c | 100 +- + drivers/gpu/drm/drm_crtc_helper_internal.h | 15 +- + drivers/gpu/drm/drm_crtc_internal.h | 13 + + drivers/gpu/drm/drm_displayid.c | 7 +- + .../gpu/drm/drm_displayid_internal.h | 6 +- + drivers/gpu/drm/drm_drv.c | 5 + + drivers/gpu/drm/drm_edid.c | 266 +- + drivers/gpu/drm/drm_eld.c | 4 +- + drivers/gpu/drm/drm_fb_dma_helper.c | 45 + + drivers/gpu/drm/drm_fbdev_generic.c | 5 +- + drivers/gpu/drm/drm_gem.c | 34 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 7 +- + drivers/gpu/drm/drm_gem_vram_helper.c | 105 +- + drivers/gpu/drm/drm_internal.h | 10 +- + drivers/gpu/drm/drm_mipi_dsi.c | 55 +- + drivers/gpu/drm/drm_mode_config.c | 7 + + drivers/gpu/drm/drm_modes.c | 40 +- + drivers/gpu/drm/drm_panic.c | 585 + + drivers/gpu/drm/drm_plane.c | 56 + + drivers/gpu/drm/drm_print.c | 6 +- + drivers/gpu/drm/drm_probe_helper.c | 95 +- + drivers/gpu/drm/drm_sysfs.c | 20 +- + drivers/gpu/drm/drm_vblank.c | 58 +- + drivers/gpu/drm/drm_vblank_work.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_gsc.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_mic.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 1 - + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 1 - + drivers/gpu/drm/exynos/exynos_hdmi.c | 16 +- + drivers/gpu/drm/exynos/exynos_mixer.c | 1 - + drivers/gpu/drm/gma500/oaktrail_lvds.c | 2 - + drivers/gpu/drm/gud/gud_connector.c | 12 +- + drivers/gpu/drm/i915/Kconfig.debug | 4 +- + drivers/gpu/drm/i915/Makefile | 6 +- + drivers/gpu/drm/i915/display/bxt_dpio_phy_regs.h | 273 + + drivers/gpu/drm/i915/display/icl_dsi.c | 3 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 2 +- + drivers/gpu/drm/i915/display/intel_audio_regs.h | 16 + + drivers/gpu/drm/i915/display/intel_backlight.c | 50 +- + drivers/gpu/drm/i915/display/intel_bios.c | 247 +- + drivers/gpu/drm/i915/display/intel_bw.c | 160 +- + drivers/gpu/drm/i915/display/intel_bw.h | 9 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 204 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 12 +- + drivers/gpu/drm/i915/display/intel_color.c | 53 +- + drivers/gpu/drm/i915/display/intel_color_regs.h | 42 +- + .../gpu/drm/i915/display/intel_combo_phy_regs.h | 117 +- + drivers/gpu/drm/i915/display/intel_crt.c | 5 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 333 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 48 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 387 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 3 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 264 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 18 +- + drivers/gpu/drm/i915/display/intel_de.h | 188 +- + drivers/gpu/drm/i915/display/intel_display.c | 712 +- + drivers/gpu/drm/i915/display/intel_display.h | 22 + + .../drm/i915/display/intel_display_conversion.h | 22 + + drivers/gpu/drm/i915/display/intel_display_core.h | 17 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 126 +- + .../gpu/drm/i915/display/intel_display_device.c | 8 + + .../gpu/drm/i915/display/intel_display_device.h | 6 +- + .../gpu/drm/i915/display/intel_display_driver.c | 28 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 57 +- + .../gpu/drm/i915/display/intel_display_params.c | 9 + + .../gpu/drm/i915/display/intel_display_params.h | 2 + + drivers/gpu/drm/i915/display/intel_display_power.c | 8 +- + .../drm/i915/display/intel_display_power_well.c | 107 +- + .../gpu/drm/i915/display/intel_display_reg_defs.h | 22 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 99 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 8 - + drivers/gpu/drm/i915/display/intel_dmc.c | 185 +- + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 6 + + drivers/gpu/drm/i915/display/intel_dmc_wl.c | 264 + + drivers/gpu/drm/i915/display/intel_dmc_wl.h | 31 + + drivers/gpu/drm/i915/display/intel_dp.c | 321 +- + drivers/gpu/drm/i915/display/intel_dp.h | 5 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 15 +- + drivers/gpu/drm/i915/display/intel_dp_aux.h | 1 + + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 17 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 244 +- + drivers/gpu/drm/i915/display/intel_dp_tunnel.c | 2 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 356 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.h | 48 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 602 +- + drivers/gpu/drm/i915/display/intel_dpll.h | 12 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 607 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 82 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 5 +- + drivers/gpu/drm/i915/display/intel_dsi.c | 5 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 5 +- + drivers/gpu/drm/i915/display/intel_fb.c | 6 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 33 +- + drivers/gpu/drm/i915/display/intel_fbc_regs.h | 120 + + drivers/gpu/drm/i915/display/intel_fbdev.c | 270 +- + drivers/gpu/drm/i915/display/intel_fbdev.h | 29 +- + .../i915/{i915_fixed.h => display/intel_fixed.h} | 0 + drivers/gpu/drm/i915/display/intel_gmbus.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 6 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 6 + + drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 7 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 96 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 2 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 5 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 58 +- + drivers/gpu/drm/i915/display/intel_opregion.h | 6 + + drivers/gpu/drm/i915/display/intel_overlay.c | 7 +- + drivers/gpu/drm/i915/display/intel_panel.c | 10 +- + drivers/gpu/drm/i915/display/intel_pch_display.c | 4 +- + drivers/gpu/drm/i915/display/intel_pmdemand.c | 14 +- + drivers/gpu/drm/i915/display/intel_pmdemand.h | 5 +- + drivers/gpu/drm/i915/display/intel_pps.c | 40 +- + drivers/gpu/drm/i915/display/intel_pps.h | 2 + + drivers/gpu/drm/i915/display/intel_psr.c | 454 +- + drivers/gpu/drm/i915/display/intel_psr.h | 5 + + drivers/gpu/drm/i915/display/intel_psr_regs.h | 50 +- + drivers/gpu/drm/i915/display/intel_quirks.c | 56 +- + drivers/gpu/drm/i915/display/intel_quirks.h | 6 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 9 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 22 +- + drivers/gpu/drm/i915/display/intel_snps_phy.h | 4 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 1 + + drivers/gpu/drm/i915/display/intel_sprite_regs.h | 348 + + drivers/gpu/drm/i915/display/intel_tc.c | 33 +- + drivers/gpu/drm/i915/display/intel_tv.c | 8 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 36 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 33 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 7 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 322 +- + drivers/gpu/drm/i915/display/skl_watermark.h | 14 +- + drivers/gpu/drm/i915/display/skl_watermark_regs.h | 18 +- + drivers/gpu/drm/i915/display/vlv_dpio_phy_regs.h | 309 + + drivers/gpu/drm/i915/display/vlv_dsi.c | 470 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 22 +- + drivers/gpu/drm/i915/display/vlv_dsi_regs.h | 325 +- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 16 +- + drivers/gpu/drm/i915/gem/i915_gem_context_types.h | 1 + + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 22 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_stolen.h | 8 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 18 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 6 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 18 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 8 +- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 5 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 27 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 40 +- + drivers/gpu/drm/i915/gt/intel_context_types.h | 1 + + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 49 +- + drivers/gpu/drm/i915/gt/intel_engine_types.h | 8 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 12 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 9 +- + drivers/gpu/drm/i915/gt/intel_gsc.c | 15 - + drivers/gpu/drm/i915/gt/intel_gt.c | 6 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 5 + + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 6 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 52 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.h | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 6 +- + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 60 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 27 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 2 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 51 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 22 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 52 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 4 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 51 +- + drivers/gpu/drm/i915/gt/intel_reset.h | 3 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 12 +- + drivers/gpu/drm/i915/gt/intel_sseu.c | 13 +- + drivers/gpu/drm/i915/gt/intel_tlb.c | 2 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 194 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_slpc.c | 6 +- + .../gpu/drm/i915/gt/uc/abi/guc_actions_slpc_abi.h | 21 + + drivers/gpu/drm/i915/gt/uc/abi/guc_errors_abi.h | 1 + + drivers/gpu/drm/i915/gt/uc/abi/guc_klvs_abi.h | 7 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_gsc_proxy.c | 3 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 22 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ads.c | 95 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_capture.c | 12 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fw.c | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_fwif.h | 8 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_hwconfig.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 17 + + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 1 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 57 +- + drivers/gpu/drm/i915/gt/uc/intel_huc.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 4 - + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 4 +- + drivers/gpu/drm/i915/gt/uc/selftest_guc.c | 2 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + + drivers/gpu/drm/i915/gvt/display.c | 2 + + drivers/gpu/drm/i915/gvt/fb_decoder.c | 5 +- + drivers/gpu/drm/i915/gvt/handlers.c | 8 +- + drivers/gpu/drm/i915/gvt/mmio.c | 1 + + drivers/gpu/drm/i915/i915_debugfs.c | 13 +- + drivers/gpu/drm/i915/i915_debugfs_params.c | 1 + + drivers/gpu/drm/i915/i915_driver.c | 24 +- + drivers/gpu/drm/i915/i915_drv.h | 26 +- + drivers/gpu/drm/i915/i915_getparam.c | 10 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 6 +- + drivers/gpu/drm/i915/i915_hwmon.c | 52 +- + drivers/gpu/drm/i915/i915_irq.c | 8 +- + drivers/gpu/drm/i915/i915_params.c | 3 - + drivers/gpu/drm/i915/i915_params.h | 1 - + drivers/gpu/drm/i915/i915_pci.c | 66 +- + drivers/gpu/drm/i915/i915_perf.c | 19 +- + drivers/gpu/drm/i915/i915_query.c | 2 +- + drivers/gpu/drm/i915/i915_reg.h | 1401 +-- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 6 +- + drivers/gpu/drm/i915/i915_utils.h | 14 - + drivers/gpu/drm/i915/i915_vma.c | 2 - + drivers/gpu/drm/i915/intel_clock_gating.c | 60 +- + drivers/gpu/drm/i915/intel_device_info.c | 2 - + drivers/gpu/drm/i915/intel_device_info.h | 2 - + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 21 +- + drivers/gpu/drm/i915/intel_runtime_pm.c | 14 +- + drivers/gpu/drm/i915/intel_step.c | 80 +- + drivers/gpu/drm/i915/intel_uncore.c | 380 +- + drivers/gpu/drm/i915/selftests/i915_selftest.c | 36 +- + drivers/gpu/drm/i915/selftests/intel_uncore.c | 3 - + drivers/gpu/drm/i915/soc/intel_dram.c | 2 + + drivers/gpu/drm/i915/vlv_sideband.c | 1 - + drivers/gpu/drm/imagination/pvr_fw_trace.c | 1 + + drivers/gpu/drm/imagination/pvr_vm_mips.c | 4 +- + drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c | 12 +- + drivers/gpu/drm/lima/lima_bcast.c | 12 + + drivers/gpu/drm/lima/lima_bcast.h | 3 + + drivers/gpu/drm/lima/lima_drv.c | 21 +- + drivers/gpu/drm/lima/lima_drv.h | 5 + + drivers/gpu/drm/lima/lima_gp.c | 10 + + drivers/gpu/drm/lima/lima_mmu.c | 5 + + drivers/gpu/drm/lima/lima_pp.c | 22 + + drivers/gpu/drm/lima/lima_sched.c | 9 + + drivers/gpu/drm/lima/lima_sched.h | 1 + + drivers/gpu/drm/loongson/lsdc_crtc.c | 1 + + drivers/gpu/drm/loongson/lsdc_gem.c | 13 +- + drivers/gpu/drm/mediatek/Kconfig | 2 +- + drivers/gpu/drm/mediatek/Makefile | 12 +- + .../drm/mediatek/{mtk_drm_crtc.c => mtk_crtc.c} | 218 +- + drivers/gpu/drm/mediatek/mtk_crtc.h | 28 + + .../{mtk_drm_ddp_comp.c => mtk_ddp_comp.c} | 51 +- + .../{mtk_drm_ddp_comp.h => mtk_ddp_comp.h} | 9 +- + drivers/gpu/drm/mediatek/mtk_disp_aal.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_ccorr.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_color.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_drv.h | 2 +- + drivers/gpu/drm/mediatek/mtk_disp_gamma.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_merge.c | 3 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_ovl_adaptor.c | 5 +- + drivers/gpu/drm/mediatek/mtk_disp_rdma.c | 5 +- + drivers/gpu/drm/mediatek/mtk_dp.c | 2 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_crtc.h | 30 - + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 34 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.h | 4 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 33 +- + drivers/gpu/drm/mediatek/mtk_ethdr.c | 5 +- + .../gpu/drm/mediatek/{mtk_drm_gem.c => mtk_gem.c} | 68 +- + .../gpu/drm/mediatek/{mtk_drm_gem.h => mtk_gem.h} | 23 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 14 +- + drivers/gpu/drm/mediatek/mtk_hdmi_ddc.c | 3 +- + drivers/gpu/drm/mediatek/mtk_mdp_rdma.c | 1 - + drivers/gpu/drm/mediatek/mtk_padding.c | 5 +- + .../drm/mediatek/{mtk_drm_plane.c => mtk_plane.c} | 26 +- + .../drm/mediatek/{mtk_drm_plane.h => mtk_plane.h} | 4 +- + drivers/gpu/drm/meson/meson_dw_mipi_dsi.c | 7 + + drivers/gpu/drm/meson/meson_vclk.c | 6 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 7 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 18 + + drivers/gpu/drm/msm/.gitignore | 1 + + drivers/gpu/drm/msm/Kconfig | 10 +- + drivers/gpu/drm/msm/Makefile | 106 +- + drivers/gpu/drm/msm/adreno/a2xx.xml.h | 3251 ----- + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 4 +- + drivers/gpu/drm/msm/adreno/a2xx_gpu.h | 4 + + .../drm/msm/{msm_gpummu.c => adreno/a2xx_gpummu.c} | 45 +- + drivers/gpu/drm/msm/adreno/a3xx.xml.h | 3268 ----- + drivers/gpu/drm/msm/adreno/a4xx.xml.h | 4379 ------- + drivers/gpu/drm/msm/adreno/a5xx.xml.h | 5572 --------- + drivers/gpu/drm/msm/adreno/a6xx.xml.h | 11858 ------------------- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 12 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 422 - + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 15 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 4 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 83 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 14 +- + drivers/gpu/drm/msm/adreno/adreno_common.xml.h | 539 - + .../gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h | 1446 +++ + drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h | 2803 ----- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 24 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 2 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 3 - + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 8 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 12 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 660 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h | 25 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.c | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_cdm.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 9 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 30 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 124 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 42 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.c | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_util.h | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 22 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 13 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 91 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 56 + + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 8 + + drivers/gpu/drm/msm/disp/mdp4/mdp4.xml.h | 1181 -- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 4 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 1 - + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h | 4 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 129 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h | 1979 ---- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.h | 11 + + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 7 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 1 - + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.h | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 125 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 4 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.h | 2 +- + drivers/gpu/drm/msm/disp/mdp_common.xml.h | 111 - + drivers/gpu/drm/msm/disp/mdp_format.c | 630 +- + drivers/gpu/drm/msm/disp/mdp_format.h | 77 + + drivers/gpu/drm/msm/disp/mdp_kms.h | 18 +- + drivers/gpu/drm/msm/dp/dp_audio.c | 25 +- + drivers/gpu/drm/msm/dp/dp_aux.c | 39 +- + drivers/gpu/drm/msm/dp/dp_aux.h | 1 + + drivers/gpu/drm/msm/dp/dp_catalog.c | 71 +- + drivers/gpu/drm/msm/dp/dp_catalog.h | 52 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 23 +- + drivers/gpu/drm/msm/dp/dp_ctrl.h | 1 - + drivers/gpu/drm/msm/dp/dp_debug.c | 61 +- + drivers/gpu/drm/msm/dp/dp_debug.h | 38 +- + drivers/gpu/drm/msm/dp/dp_display.c | 105 +- + drivers/gpu/drm/msm/dp/dp_display.h | 3 - + drivers/gpu/drm/msm/dp/dp_drm.c | 2 - + drivers/gpu/drm/msm/dp/dp_link.c | 26 +- + drivers/gpu/drm/msm/dp/dp_link.h | 15 +- + drivers/gpu/drm/msm/dp/dp_panel.c | 14 +- + drivers/gpu/drm/msm/dp/dp_panel.h | 3 - + drivers/gpu/drm/msm/dsi/dsi.c | 26 +- + drivers/gpu/drm/msm/dsi/dsi.h | 7 +- + drivers/gpu/drm/msm/dsi/dsi.xml.h | 790 -- + drivers/gpu/drm/msm/dsi/dsi_host.c | 20 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 79 +- + drivers/gpu/drm/msm/dsi/dsi_phy_10nm.xml.h | 227 - + drivers/gpu/drm/msm/dsi/dsi_phy_14nm.xml.h | 309 - + drivers/gpu/drm/msm/dsi/dsi_phy_20nm.xml.h | 237 - + drivers/gpu/drm/msm/dsi/dsi_phy_28nm.xml.h | 384 - + drivers/gpu/drm/msm/dsi/dsi_phy_28nm_8960.xml.h | 286 - + drivers/gpu/drm/msm/dsi/dsi_phy_7nm.xml.h | 483 - + drivers/gpu/drm/msm/dsi/mmss_cc.xml.h | 131 - + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 8 +- + drivers/gpu/drm/msm/dsi/sfpb.xml.h | 70 - + drivers/gpu/drm/msm/hdmi/hdmi.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 10 +- + drivers/gpu/drm/msm/hdmi/hdmi.xml.h | 1399 --- + drivers/gpu/drm/msm/hdmi/hdmi_phy_8996.c | 6 +- + drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 4 +- + drivers/gpu/drm/msm/hdmi/qfprom.xml.h | 61 - + drivers/gpu/drm/msm/msm_drv.c | 3 +- + drivers/gpu/drm/msm/msm_drv.h | 11 +- + drivers/gpu/drm/msm/msm_fb.c | 12 +- + drivers/gpu/drm/msm/msm_gem.c | 20 +- + drivers/gpu/drm/msm/msm_gem.h | 4 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 20 +- + drivers/gpu/drm/msm/msm_gpu.c | 2 +- + drivers/gpu/drm/msm/msm_gpu.h | 12 +- + drivers/gpu/drm/msm/msm_kms.h | 4 - + drivers/gpu/drm/msm/msm_mmu.h | 5 - + drivers/gpu/drm/msm/registers/.gitignore | 4 + + drivers/gpu/drm/msm/registers/adreno/a2xx.xml | 1865 +++ + drivers/gpu/drm/msm/registers/adreno/a3xx.xml | 1751 +++ + drivers/gpu/drm/msm/registers/adreno/a4xx.xml | 2409 ++++ + drivers/gpu/drm/msm/registers/adreno/a5xx.xml | 3039 +++++ + drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 5011 ++++++++ + drivers/gpu/drm/msm/registers/adreno/a6xx_gmu.xml | 228 + + .../gpu/drm/msm/registers/adreno/adreno_common.xml | 400 + + .../gpu/drm/msm/registers/adreno/adreno_pm4.xml | 2268 ++++ + drivers/gpu/drm/msm/registers/display/dsi.xml | 390 + + .../gpu/drm/msm/registers/display/dsi_phy_10nm.xml | 102 + + .../gpu/drm/msm/registers/display/dsi_phy_14nm.xml | 135 + + .../gpu/drm/msm/registers/display/dsi_phy_20nm.xml | 100 + + .../gpu/drm/msm/registers/display/dsi_phy_28nm.xml | 180 + + .../msm/registers/display/dsi_phy_28nm_8960.xml | 134 + + .../gpu/drm/msm/registers/display/dsi_phy_7nm.xml | 230 + + drivers/gpu/drm/msm/registers/display/edp.xml | 239 + + drivers/gpu/drm/msm/registers/display/hdmi.xml | 1015 ++ + drivers/gpu/drm/msm/registers/display/mdp4.xml | 504 + + drivers/gpu/drm/msm/registers/display/mdp5.xml | 806 ++ + .../gpu/drm/msm/registers/display/mdp_common.xml | 90 + + drivers/gpu/drm/msm/registers/display/msm.xml | 32 + + drivers/gpu/drm/msm/registers/display/sfpb.xml | 17 + + .../gpu/drm/msm/registers/freedreno_copyright.xml | 40 + + drivers/gpu/drm/msm/registers/gen_header.py | 970 ++ + drivers/gpu/drm/msm/registers/rules-fd.xsd | 404 + + drivers/gpu/drm/mxsfb/lcdif_drv.c | 6 +- + drivers/gpu/drm/nouveau/dispnv50/crc.c | 2 + + drivers/gpu/drm/nouveau/nouveau_abi16.c | 20 +- + drivers/gpu/drm/nouveau/nouveau_abi16.h | 12 - + drivers/gpu/drm/nouveau/nouveau_bo.c | 43 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 2 + + drivers/gpu/drm/nouveau/nouveau_display.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/r535.c | 2 +- + drivers/gpu/drm/omapdrm/Kconfig | 2 +- + drivers/gpu/drm/omapdrm/omap_dmm_tiler.c | 1 - + drivers/gpu/drm/omapdrm/omap_fb.c | 1 + + drivers/gpu/drm/omapdrm/omap_fbdev.c | 40 +- + drivers/gpu/drm/panel/Kconfig | 36 +- + drivers/gpu/drm/panel/Makefile | 3 + + drivers/gpu/drm/panel/panel-edp.c | 164 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 228 +- + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 1 + + drivers/gpu/drm/panel/panel-khadas-ts050.c | 1112 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 5 +- + drivers/gpu/drm/panel/panel-lg-sw43408.c | 320 + + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 6 +- + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 11 +- + drivers/gpu/drm/panel/panel-novatek-nt36672e.c | 33 +- + drivers/gpu/drm/panel/panel-raydium-rm69380.c | 344 + + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 44 +- + drivers/gpu/drm/panel/panel-samsung-s6e3fa7.c | 285 + + drivers/gpu/drm/panel/panel-simple.c | 123 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 87 + + drivers/gpu/drm/panel/panel-truly-nt35597.c | 6 +- + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 16 +- + drivers/gpu/drm/panfrost/Makefile | 2 - + drivers/gpu/drm/panfrost/panfrost_debugfs.c | 21 - + drivers/gpu/drm/panfrost/panfrost_debugfs.h | 14 - + drivers/gpu/drm/panfrost/panfrost_device.h | 2 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 50 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 2 +- + drivers/gpu/drm/panthor/Kconfig | 23 + + drivers/gpu/drm/panthor/Makefile | 14 + + drivers/gpu/drm/panthor/panthor_devfreq.c | 283 + + drivers/gpu/drm/panthor/panthor_devfreq.h | 21 + + drivers/gpu/drm/panthor/panthor_device.c | 561 + + drivers/gpu/drm/panthor/panthor_device.h | 357 + + drivers/gpu/drm/panthor/panthor_drv.c | 1488 +++ + drivers/gpu/drm/panthor/panthor_fw.c | 1363 +++ + drivers/gpu/drm/panthor/panthor_fw.h | 503 + + drivers/gpu/drm/panthor/panthor_gem.c | 230 + + drivers/gpu/drm/panthor/panthor_gem.h | 142 + + drivers/gpu/drm/panthor/panthor_gpu.c | 482 + + drivers/gpu/drm/panthor/panthor_gpu.h | 52 + + drivers/gpu/drm/panthor/panthor_heap.c | 597 + + drivers/gpu/drm/panthor/panthor_heap.h | 39 + + drivers/gpu/drm/panthor/panthor_mmu.c | 2774 +++++ + drivers/gpu/drm/panthor/panthor_mmu.h | 102 + + drivers/gpu/drm/panthor/panthor_regs.h | 239 + + drivers/gpu/drm/panthor/panthor_sched.c | 3528 ++++++ + drivers/gpu/drm/panthor/panthor_sched.h | 50 + + drivers/gpu/drm/qxl/qxl_object.c | 26 +- + drivers/gpu/drm/qxl/qxl_object.h | 2 + + drivers/gpu/drm/qxl/qxl_prime.c | 4 +- + drivers/gpu/drm/radeon/r100.c | 1 + + drivers/gpu/drm/radeon/r300.c | 1 + + drivers/gpu/drm/radeon/r420.c | 1 + + drivers/gpu/drm/radeon/r600.c | 3 +- + drivers/gpu/drm/radeon/radeon.h | 1 - + drivers/gpu/drm/radeon/radeon_display.c | 8 +- + drivers/gpu/drm/radeon/radeon_fence.c | 1 + + drivers/gpu/drm/radeon/radeon_gem.c | 1 + + drivers/gpu/drm/radeon/radeon_ib.c | 2 + + drivers/gpu/drm/radeon/radeon_pm.c | 1 + + drivers/gpu/drm/radeon/radeon_prime.c | 11 - + drivers/gpu/drm/radeon/radeon_ring.c | 2 + + drivers/gpu/drm/radeon/radeon_ttm.c | 1 + + drivers/gpu/drm/radeon/rs400.c | 1 + + drivers/gpu/drm/radeon/rv515.c | 1 + + drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 3 - + drivers/gpu/drm/rockchip/cdn-dp-core.c | 34 +- + drivers/gpu/drm/rockchip/cdn-dp-core.h | 2 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 12 +- + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 12 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 22 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 1 - + drivers/gpu/drm/sti/sti_drv.c | 1 + + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 18 +- + drivers/gpu/drm/tegra/Kconfig | 2 +- + drivers/gpu/drm/tests/drm_buddy_test.c | 171 +- + drivers/gpu/drm/tidss/tidss_kms.c | 3 +- + drivers/gpu/drm/tilcdc/tilcdc_panel.c | 6 - + drivers/gpu/drm/tiny/simpledrm.c | 16 + + drivers/gpu/drm/ttm/ttm_bo.c | 239 +- + drivers/gpu/drm/ttm/ttm_device.c | 1 + + drivers/gpu/drm/ttm/ttm_resource.c | 20 +- + drivers/gpu/drm/ttm/ttm_tt.c | 5 +- + drivers/gpu/drm/v3d/v3d_drv.c | 33 +- + drivers/gpu/drm/v3d/v3d_drv.h | 30 +- + drivers/gpu/drm/v3d/v3d_gem.c | 9 +- + drivers/gpu/drm/v3d/v3d_irq.c | 48 +- + drivers/gpu/drm/v3d/v3d_sched.c | 94 +- + drivers/gpu/drm/v3d/v3d_sysfs.c | 13 +- + drivers/gpu/drm/vc4/vc4_drv.h | 1 + + drivers/gpu/drm/vc4/vc4_hdmi.c | 48 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 7 +- + drivers/gpu/drm/vmwgfx/Makefile | 2 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 4 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 4 + + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 31 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 31 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 52 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 36 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 39 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 32 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 31 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 42 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 110 - + drivers/gpu/drm/vmwgfx/vmwgfx_validation.c | 19 +- + drivers/gpu/drm/vmwgfx/vmwgfx_validation.h | 7 - + drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c | 632 + + drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h | 75 + + drivers/gpu/drm/xe/Kconfig | 2 + + drivers/gpu/drm/xe/Makefile | 17 +- + drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 200 +- + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 10 + + drivers/gpu/drm/xe/compat-i915-headers/i915_drv.h | 57 +- + .../gpu/drm/xe/compat-i915-headers/i915_fixed.h | 6 - + drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h | 9 - + .../drm/xe/compat-i915-headers/i915_gem_stolen.h | 9 +- + drivers/gpu/drm/xe/compat-i915-headers/i915_vgpu.h | 26 - + .../gpu/drm/xe/compat-i915-headers/intel_uc_fw.h | 11 - + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 6 +- + drivers/gpu/drm/xe/display/intel_fb_bo.c | 8 +- + drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 16 +- + drivers/gpu/drm/xe/display/xe_display.c | 19 +- + drivers/gpu/drm/xe/display/xe_dsb_buffer.c | 4 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 39 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 240 +- + drivers/gpu/drm/xe/display/xe_plane_initial.c | 7 +- + .../drm/xe/instructions/xe_gfx_state_commands.h | 18 + + .../gpu/drm/xe/instructions/xe_gfxpipe_commands.h | 3 + + drivers/gpu/drm/xe/instructions/xe_instr_defs.h | 1 + + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 3 - + drivers/gpu/drm/xe/regs/xe_gsc_regs.h | 7 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 65 +- + drivers/gpu/drm/xe/regs/xe_gtt_defs.h | 37 + + drivers/gpu/drm/xe/regs/xe_guc_regs.h | 15 +- + drivers/gpu/drm/xe/regs/xe_reg_defs.h | 19 + + drivers/gpu/drm/xe/regs/xe_regs.h | 2 +- + drivers/gpu/drm/xe/regs/xe_sriov_regs.h | 3 + + drivers/gpu/drm/xe/tests/Makefile | 3 +- + drivers/gpu/drm/xe/tests/xe_bo.c | 12 +- + drivers/gpu/drm/xe/tests/xe_bo_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_dma_buf.c | 57 +- + drivers/gpu/drm/xe/tests/xe_dma_buf_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_guc_id_mgr_test.c | 136 + + drivers/gpu/drm/xe/tests/xe_live_test_mod.c | 10 + + drivers/gpu/drm/xe/tests/xe_migrate.c | 27 +- + drivers/gpu/drm/xe/tests/xe_migrate_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_mocs.c | 96 +- + drivers/gpu/drm/xe/tests/xe_mocs_test.c | 5 - + drivers/gpu/drm/xe/tests/xe_wa_test.c | 1 + + drivers/gpu/drm/xe/xe_bb.c | 6 +- + drivers/gpu/drm/xe/xe_bo.c | 137 +- + drivers/gpu/drm/xe/xe_bo.h | 74 +- + drivers/gpu/drm/xe/xe_bo_evict.c | 4 +- + drivers/gpu/drm/xe/xe_debugfs.c | 24 +- + drivers/gpu/drm/xe/xe_devcoredump.c | 47 +- + drivers/gpu/drm/xe/xe_devcoredump.h | 6 + + drivers/gpu/drm/xe/xe_device.c | 226 +- + drivers/gpu/drm/xe/xe_device.h | 9 - + drivers/gpu/drm/xe/xe_device_sysfs.c | 16 +- + drivers/gpu/drm/xe/xe_device_sysfs.h | 2 +- + drivers/gpu/drm/xe/xe_device_types.h | 26 +- + drivers/gpu/drm/xe/xe_dma_buf.c | 7 +- + drivers/gpu/drm/xe/xe_drm_client.c | 8 +- + drivers/gpu/drm/xe/xe_exec.c | 14 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 74 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 8 +- + drivers/gpu/drm/xe/xe_ggtt.c | 138 +- + drivers/gpu/drm/xe/xe_ggtt.h | 8 +- + drivers/gpu/drm/xe/xe_gsc.c | 100 +- + drivers/gpu/drm/xe/xe_gsc.h | 2 + + drivers/gpu/drm/xe/xe_gsc_proxy.c | 15 +- + drivers/gpu/drm/xe/xe_gsc_proxy.h | 1 + + drivers/gpu/drm/xe/xe_gsc_submit.c | 15 + + drivers/gpu/drm/xe/xe_gsc_submit.h | 1 + + drivers/gpu/drm/xe/xe_gsc_types.h | 1 + + drivers/gpu/drm/xe/xe_gt.c | 59 +- + drivers/gpu/drm/xe/xe_gt_clock.c | 5 - + drivers/gpu/drm/xe/xe_gt_clock.h | 2 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 242 +- + drivers/gpu/drm/xe/xe_gt_debugfs.h | 2 + + drivers/gpu/drm/xe/xe_gt_freq.c | 63 +- + drivers/gpu/drm/xe/xe_gt_freq.h | 2 +- + drivers/gpu/drm/xe/xe_gt_idle.c | 43 +- + drivers/gpu/drm/xe/xe_gt_idle.h | 2 +- + drivers/gpu/drm/xe/xe_gt_mcr.c | 39 +- + drivers/gpu/drm/xe/xe_gt_mcr.h | 14 + + drivers/gpu/drm/xe/xe_gt_sriov_pf.c | 52 + + drivers/gpu/drm/xe/xe_gt_sriov_pf.h | 20 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 1977 ++++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 56 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config_types.h | 54 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c | 257 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.h | 27 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_helpers.h | 35 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c | 418 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.h | 25 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_policy_types.h | 31 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 34 + + drivers/gpu/drm/xe/xe_gt_sysfs.c | 14 +- + drivers/gpu/drm/xe/xe_gt_sysfs.h | 2 +- + drivers/gpu/drm/xe/xe_gt_throttle_sysfs.c | 16 +- + drivers/gpu/drm/xe/xe_gt_throttle_sysfs.h | 2 +- + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 43 +- + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h | 2 +- + drivers/gpu/drm/xe/xe_gt_topology.c | 115 +- + drivers/gpu/drm/xe/xe_gt_topology.h | 11 + + drivers/gpu/drm/xe/xe_gt_types.h | 22 +- + drivers/gpu/drm/xe/xe_guc.c | 122 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 137 +- + drivers/gpu/drm/xe/xe_guc_ads_types.h | 2 + + drivers/gpu/drm/xe/xe_guc_ct.c | 126 +- + drivers/gpu/drm/xe/xe_guc_debugfs.c | 9 +- + drivers/gpu/drm/xe/xe_guc_fwif.h | 7 +- + drivers/gpu/drm/xe/xe_guc_hwconfig.c | 7 +- + drivers/gpu/drm/xe/xe_guc_id_mgr.c | 279 + + drivers/gpu/drm/xe/xe_guc_id_mgr.h | 22 + + drivers/gpu/drm/xe/xe_guc_klv_helpers.c | 134 + + drivers/gpu/drm/xe/xe_guc_klv_helpers.h | 51 + + drivers/gpu/drm/xe/xe_guc_log.c | 5 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 116 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 230 +- + drivers/gpu/drm/xe/xe_guc_submit.h | 6 +- + drivers/gpu/drm/xe/xe_guc_submit_types.h | 13 +- + drivers/gpu/drm/xe/xe_guc_types.h | 21 +- + drivers/gpu/drm/xe/xe_hmm.c | 253 + + drivers/gpu/drm/xe/xe_hmm.h | 11 + + drivers/gpu/drm/xe/xe_huc.c | 4 +- + drivers/gpu/drm/xe/xe_huc_debugfs.c | 5 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 46 +- + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 155 +- + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.h | 7 + + drivers/gpu/drm/xe/xe_hw_fence.c | 2 +- + drivers/gpu/drm/xe/xe_hwmon.c | 266 +- + drivers/gpu/drm/xe/xe_irq.c | 3 +- + drivers/gpu/drm/xe/xe_lmtt.c | 6 +- + drivers/gpu/drm/xe/xe_lrc.c | 169 +- + drivers/gpu/drm/xe/xe_lrc.h | 5 + + drivers/gpu/drm/xe/xe_lrc_types.h | 2 + + drivers/gpu/drm/xe/xe_memirq.c | 9 +- + drivers/gpu/drm/xe/xe_migrate.c | 8 +- + drivers/gpu/drm/xe/xe_mmio.c | 148 +- + drivers/gpu/drm/xe/xe_mmio.h | 82 +- + drivers/gpu/drm/xe/xe_mocs.c | 66 +- + drivers/gpu/drm/xe/xe_module.c | 7 + + drivers/gpu/drm/xe/xe_module.h | 3 + + drivers/gpu/drm/xe/xe_pat.c | 23 +- + drivers/gpu/drm/xe/xe_pci.c | 44 +- + drivers/gpu/drm/xe/xe_pcode.c | 119 +- + drivers/gpu/drm/xe/xe_pcode.h | 6 +- + drivers/gpu/drm/xe/xe_platform_types.h | 1 + + drivers/gpu/drm/xe/xe_pm.c | 331 +- + drivers/gpu/drm/xe/xe_pm.h | 13 +- + drivers/gpu/drm/xe/xe_pt.c | 13 +- + drivers/gpu/drm/xe/xe_query.c | 53 +- + drivers/gpu/drm/xe/xe_ring_ops.c | 11 +- + drivers/gpu/drm/xe/xe_sa.c | 5 +- + drivers/gpu/drm/xe/xe_sched_job.c | 23 +- + drivers/gpu/drm/xe/xe_sched_job.h | 3 + + drivers/gpu/drm/xe/xe_sriov.c | 62 +- + drivers/gpu/drm/xe/xe_sriov.h | 8 +- + drivers/gpu/drm/xe/xe_sriov_pf.c | 104 + + drivers/gpu/drm/xe/xe_sriov_pf.h | 30 + + drivers/gpu/drm/xe/xe_sriov_pf_helpers.h | 46 + + drivers/gpu/drm/xe/xe_sriov_types.h | 19 + + drivers/gpu/drm/xe/xe_sync.c | 7 +- + drivers/gpu/drm/xe/xe_sync.h | 1 - + drivers/gpu/drm/xe/xe_tile.c | 17 +- + drivers/gpu/drm/xe/xe_tile_sysfs.c | 17 +- + drivers/gpu/drm/xe/xe_tile_sysfs.h | 2 +- + drivers/gpu/drm/xe/xe_trace.h | 6 +- + drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 15 +- + drivers/gpu/drm/xe/xe_ttm_sys_mgr.c | 5 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 18 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.h | 1 + + drivers/gpu/drm/xe/xe_tuning.c | 10 +- + drivers/gpu/drm/xe/xe_uc.c | 11 - + drivers/gpu/drm/xe/xe_uc_debugfs.c | 2 + + drivers/gpu/drm/xe/xe_uc_fw.c | 51 +- + drivers/gpu/drm/xe/xe_uc_fw.h | 8 +- + drivers/gpu/drm/xe/xe_uc_fw_types.h | 3 +- + drivers/gpu/drm/xe/xe_vm.c | 213 +- + drivers/gpu/drm/xe/xe_vm_types.h | 11 +- + drivers/gpu/drm/xe/xe_vram_freq.c | 20 +- + drivers/gpu/drm/xe/xe_vram_freq.h | 2 +- + drivers/gpu/drm/xe/xe_wa.c | 134 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 11 +- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 229 +- + drivers/gpu/drm/xlnx/zynqmp_disp.h | 17 +- + drivers/gpu/drm/xlnx/zynqmp_disp_regs.h | 8 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 85 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 7 +- + drivers/gpu/drm/xlnx/zynqmp_kms.c | 2 +- + drivers/phy/qualcomm/phy-qcom-edp.c | 76 +- + drivers/video/fbdev/core/Kconfig | 6 + + include/drm/amd_asic_type.h | 3 + + include/drm/bridge/samsung-dsim.h | 4 +- + include/drm/display/drm_dp.h | 11 + + include/drm/display/drm_dp_helper.h | 51 +- + include/drm/display/drm_dp_mst_helper.h | 31 +- + include/drm/display/drm_dsc.h | 3 - + include/drm/drm_buddy.h | 16 +- + include/drm/drm_client.h | 10 + + include/drm/drm_debugfs_crc.h | 8 +- + include/drm/drm_edid.h | 45 +- + include/drm/drm_encoder_slave.h | 91 +- + include/drm/drm_fb_dma_helper.h | 5 + + include/drm/drm_format_helper.h | 1 + + include/drm/drm_gem.h | 3 + + include/drm/drm_gem_shmem_helper.h | 7 +- + include/drm/drm_gem_vram_helper.h | 1 - + include/drm/drm_kunit_helpers.h | 2 +- + include/drm/drm_lease.h | 2 + + include/drm/drm_mipi_dsi.h | 15 +- + include/drm/drm_mode_config.h | 15 + + include/drm/drm_modeset_helper_vtables.h | 39 + + include/drm/drm_of.h | 1 + + include/drm/drm_panic.h | 152 + + include/drm/drm_plane.h | 10 + + include/drm/drm_print.h | 4 +- + include/drm/drm_probe_helper.h | 6 + + include/drm/drm_suballoc.h | 2 +- + include/drm/drm_vblank.h | 1 + + include/drm/gma_drm.h | 13 - + include/drm/i2c/ch7006.h | 1 + + include/drm/i2c/sil164.h | 1 + + include/drm/i915_component.h | 2 +- + include/drm/i915_gsc_proxy_mei_interface.h | 4 +- + include/drm/i915_hdcp_interface.h | 18 +- + include/drm/i915_pciids.h | 4 +- + include/drm/i915_pxp_tee_interface.h | 27 +- + include/drm/ttm/ttm_bo.h | 17 +- + include/drm/ttm/ttm_caching.h | 2 + + include/drm/ttm/ttm_execbuf_util.h | 7 +- + include/drm/ttm/ttm_kmap_iter.h | 4 +- + include/drm/ttm/ttm_pool.h | 5 +- + include/drm/ttm/ttm_resource.h | 6 +- + include/drm/xe_pciids.h | 7 +- + include/linux/devcoredump.h | 5 + + include/linux/dma-buf.h | 2 + + include/linux/fb.h | 4 + + include/linux/phy/phy-dp.h | 3 + + include/uapi/drm/drm_mode.h | 11 + + include/uapi/drm/i915_drm.h | 31 +- + include/uapi/drm/nouveau_drm.h | 22 + + include/uapi/drm/panthor_drm.h | 945 ++ + include/uapi/drm/xe_drm.h | 25 +- + 1373 files changed, 77527 insertions(+), 55665 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-panfrost-profiling + create mode 100644 Documentation/devicetree/bindings/display/bridge/microchip,sam9x75-lvds.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/lg,sw43408.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-common-dual.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm69380.yaml + create mode 100644 Documentation/devicetree/bindings/gpu/arm,mali-valhall-csf.yaml + create mode 100644 Documentation/gpu/amdgpu/debugging.rst + create mode 100644 drivers/accel/qaic/qaic_debugfs.c + create mode 100644 drivers/accel/qaic/qaic_debugfs.h + create mode 100644 drivers/accel/qaic/sahara.c + create mode 100644 drivers/accel/qaic/sahara.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v14_0_2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn10/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp.h (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp_cm.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn10/dcn10_dpp_dscl.c (99%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn20/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp.h (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn20/dcn20_dpp_cm.c (99%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn201/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn201/dcn201_dpp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn30/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp.h (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn30/dcn30_dpp_cm.c (99%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn32/CMakeLists.txt + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn32/dcn32_dpp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn35/CMakeLists.txt + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn35/dcn35_dpp.c + rename drivers/gpu/drm/amd/display/dc/{ => dpp}/dcn35/dcn35_dpp.h (87%) + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn351/dcn351_hwseq.c + rename drivers/gpu/drm/amd/display/dc/{dcn35/dcn35_dpp.c => hwss/dcn351/dcn351_hwseq.h} (56%) + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/vpg.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_14_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_14_0_2_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v14_0_2_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0_2_pptable.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.h + rename drivers/gpu/drm/ast/{ast_i2c.c => ast_ddc.c} (52%) + create mode 100644 drivers/gpu/drm/ast/ast_ddc.h + create mode 100644 drivers/gpu/drm/bridge/microchip-lvds.c + rename include/drm/drm_displayid.h => drivers/gpu/drm/drm_displayid_internal.h (98%) + create mode 100644 drivers/gpu/drm/drm_panic.c + create mode 100644 drivers/gpu/drm/i915/display/bxt_dpio_phy_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_conversion.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dmc_wl.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dmc_wl.h + create mode 100644 drivers/gpu/drm/i915/display/intel_fbc_regs.h + rename drivers/gpu/drm/i915/{i915_fixed.h => display/intel_fixed.h} (100%) + create mode 100644 drivers/gpu/drm/i915/display/intel_sprite_regs.h + create mode 100644 drivers/gpu/drm/i915/display/vlv_dpio_phy_regs.h + rename drivers/gpu/drm/mediatek/{mtk_drm_crtc.c => mtk_crtc.c} (82%) + create mode 100644 drivers/gpu/drm/mediatek/mtk_crtc.h + rename drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.c => mtk_ddp_comp.c} (94%) + rename drivers/gpu/drm/mediatek/{mtk_drm_ddp_comp.h => mtk_ddp_comp.h} (98%) + delete mode 100644 drivers/gpu/drm/mediatek/mtk_drm_crtc.h + rename drivers/gpu/drm/mediatek/{mtk_drm_gem.c => mtk_gem.c} (76%) + rename drivers/gpu/drm/mediatek/{mtk_drm_gem.h => mtk_gem.h} (62%) + rename drivers/gpu/drm/mediatek/{mtk_drm_plane.c => mtk_plane.c} (94%) + rename drivers/gpu/drm/mediatek/{mtk_drm_plane.h => mtk_plane.h} (95%) + create mode 100644 drivers/gpu/drm/msm/.gitignore + delete mode 100644 drivers/gpu/drm/msm/adreno/a2xx.xml.h + rename drivers/gpu/drm/msm/{msm_gpummu.c => adreno/a2xx_gpummu.c} (67%) + delete mode 100644 drivers/gpu/drm/msm/adreno/a3xx.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/a4xx.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/a5xx.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/a6xx.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h + delete mode 100644 drivers/gpu/drm/msm/adreno/adreno_common.xml.h + create mode 100644 drivers/gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h + delete mode 100644 drivers/gpu/drm/msm/adreno/adreno_pm4.xml.h + delete mode 100644 drivers/gpu/drm/msm/disp/mdp4/mdp4.xml.h + delete mode 100644 drivers/gpu/drm/msm/disp/mdp5/mdp5.xml.h + delete mode 100644 drivers/gpu/drm/msm/disp/mdp_common.xml.h + create mode 100644 drivers/gpu/drm/msm/disp/mdp_format.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_10nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_14nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_20nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_28nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_28nm_8960.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/dsi_phy_7nm.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/mmss_cc.xml.h + delete mode 100644 drivers/gpu/drm/msm/dsi/sfpb.xml.h + delete mode 100644 drivers/gpu/drm/msm/hdmi/hdmi.xml.h + delete mode 100644 drivers/gpu/drm/msm/hdmi/qfprom.xml.h + create mode 100644 drivers/gpu/drm/msm/registers/.gitignore + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a2xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a3xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a4xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a5xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a6xx.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a6xx_gmu.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/adreno_common.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/adreno_pm4.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_10nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_14nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_20nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_28nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_28nm_8960.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/dsi_phy_7nm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/edp.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/hdmi.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/mdp4.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/mdp5.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/mdp_common.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/msm.xml + create mode 100644 drivers/gpu/drm/msm/registers/display/sfpb.xml + create mode 100644 drivers/gpu/drm/msm/registers/freedreno_copyright.xml + create mode 100644 drivers/gpu/drm/msm/registers/gen_header.py + create mode 100644 drivers/gpu/drm/msm/registers/rules-fd.xsd + create mode 100644 drivers/gpu/drm/panel/panel-lg-sw43408.c + create mode 100644 drivers/gpu/drm/panel/panel-raydium-rm69380.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-s6e3fa7.c + delete mode 100644 drivers/gpu/drm/panfrost/panfrost_debugfs.c + delete mode 100644 drivers/gpu/drm/panfrost/panfrost_debugfs.h + create mode 100644 drivers/gpu/drm/panthor/Kconfig + create mode 100644 drivers/gpu/drm/panthor/Makefile + create mode 100644 drivers/gpu/drm/panthor/panthor_devfreq.c + create mode 100644 drivers/gpu/drm/panthor/panthor_devfreq.h + create mode 100644 drivers/gpu/drm/panthor/panthor_device.c + create mode 100644 drivers/gpu/drm/panthor/panthor_device.h + create mode 100644 drivers/gpu/drm/panthor/panthor_drv.c + create mode 100644 drivers/gpu/drm/panthor/panthor_fw.c + create mode 100644 drivers/gpu/drm/panthor/panthor_fw.h + create mode 100644 drivers/gpu/drm/panthor/panthor_gem.c + create mode 100644 drivers/gpu/drm/panthor/panthor_gem.h + create mode 100644 drivers/gpu/drm/panthor/panthor_gpu.c + create mode 100644 drivers/gpu/drm/panthor/panthor_gpu.h + create mode 100644 drivers/gpu/drm/panthor/panthor_heap.c + create mode 100644 drivers/gpu/drm/panthor/panthor_heap.h + create mode 100644 drivers/gpu/drm/panthor/panthor_mmu.c + create mode 100644 drivers/gpu/drm/panthor/panthor_mmu.h + create mode 100644 drivers/gpu/drm/panthor/panthor_regs.h + create mode 100644 drivers/gpu/drm/panthor/panthor_sched.c + create mode 100644 drivers/gpu/drm/panthor/panthor_sched.h + delete mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.c + create mode 100644 drivers/gpu/drm/vmwgfx/vmwgfx_vkms.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_fixed.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gem.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/intel_uc_fw.h + create mode 100644 drivers/gpu/drm/xe/instructions/xe_gfx_state_commands.h + create mode 100644 drivers/gpu/drm/xe/regs/xe_gtt_defs.h + create mode 100644 drivers/gpu/drm/xe/tests/xe_guc_id_mgr_test.c + create mode 100644 drivers/gpu/drm/xe/tests/xe_live_test_mod.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_config_types.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_control.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_helpers.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_policy.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_policy_types.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h + create mode 100644 drivers/gpu/drm/xe/xe_guc_id_mgr.c + create mode 100644 drivers/gpu/drm/xe/xe_guc_id_mgr.h + create mode 100644 drivers/gpu/drm/xe/xe_guc_klv_helpers.c + create mode 100644 drivers/gpu/drm/xe/xe_guc_klv_helpers.h + create mode 100644 drivers/gpu/drm/xe/xe_hmm.c + create mode 100644 drivers/gpu/drm/xe/xe_hmm.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf.c + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_helpers.h + create mode 100644 include/drm/drm_panic.h + delete mode 100644 include/drm/gma_drm.h + create mode 100644 include/uapi/drm/panthor_drm.h +Merging drm-exynos/for-linux-next (7a5bdb7ca1b4 drm/exynos: hdmi: report safe 640x480 mode as a fallback when no EDID found) +$ 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_hdmi.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging drm-misc/for-linux-next (959314c438ca drm/nouveau: use tile_mode and pte_kind for VM_BIND bo allocations) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/panthor/panthor_device.c | 8 ++---- + drivers/gpu/drm/panthor/panthor_device.h | 1 + + drivers/gpu/drm/panthor/panthor_fw.c | 5 ++-- + drivers/gpu/drm/panthor/panthor_gem.c | 8 ++++-- + drivers/gpu/drm/panthor/panthor_gem.h | 8 ++++-- + drivers/gpu/drm/panthor/panthor_heap.c | 36 ++++++++++++++---------- + drivers/gpu/drm/panthor/panthor_sched.c | 48 +++++++++++++++++++++++--------- + drivers/gpu/drm/panthor/panthor_sched.h | 2 +- + drivers/gpu/drm/xlnx/zynqmp_disp.c | 6 ++-- + include/uapi/drm/panthor_drm.h | 20 ++++++++++--- + 10 files changed, 94 insertions(+), 48 deletions(-) +Merging amdgpu/drm-next (a83048bfa402 drm/amd/amdgpu: Add ISP support to amdgpu_discovery) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/Makefile +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_topology.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/amdgpu_dm/amdgpu_dm_debugfs.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml2/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/resource/dcn20/dcn20_resource.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_afmt.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12.c | 377 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 103 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 59 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 37 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 18 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 66 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 420 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 49 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 1 + + 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 | 25 +- + 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 | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 37 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 10 + + 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 | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 19 + + 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 | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 3 + + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 6 + + drivers/gpu/drm/amd/amdgpu/clearstate_gfx12.h | 121 + + drivers/gpu/drm/amd/amdgpu/df_v1_7.c | 2 + + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 5003 + + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 2 - + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 6 + + 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_v12_0.c | 1011 + + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 36 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/imu_v12_0.c | 399 + + drivers/gpu/drm/amd/amdgpu/imu_v12_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 38 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 1530 + + drivers/gpu/drm/amd/amdgpu/mes_v12_0.h | 29 + + 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/mxgpu_ai.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 5 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_vi.c | 3 +- + drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c | 16 + + 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 | 22 +- + 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 | 6 +- + 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_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 9 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 1642 + + 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 | 588 + + 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 | 6 + + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 26 +- + 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 | 478 + + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx10.asm | 366 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 3 + + 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 | 49 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 4 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 2 + + .../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_migrate.c | 2 +- + 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 | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 3 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 32 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 32 +- + 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 | 3 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 379 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 9 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 59 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 74 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 6 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 12 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 25 +- + .../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 | 11 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 4 +- + 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 | 9 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 15 + + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 3 +- + .../dc/clk_mgr/dcn30/dcn30_smu11_driver_if.h | 2 +- + .../dc/clk_mgr/dcn32/dcn32_smu13_driver_if.h | 2 +- + .../gpu/drm/amd/display/dc/clk_mgr/dcn401/dalsmc.h | 52 + + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 1553 + + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h | 116 + + .../dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.c | 198 + + .../dc/clk_mgr/dcn401/dcn401_clk_mgr_smu_msg.h | 31 + + .../dc/clk_mgr/dcn401/dcn401_smu14_driver_if.h | 66 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 270 +- + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 43 + + .../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 | 219 +- + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 26 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 383 +- + drivers/gpu/drm/amd/display/dc/core/dc_vm_helper.c | 1 + + drivers/gpu/drm/amd/display/dc/dc.h | 64 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 208 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 29 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 3 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 47 +- + drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 170 + + 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 | 34 + + drivers/gpu/drm/amd/display/dc/dc_stream_priv.h | 38 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 80 +- + 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 | 0 + .../amd/display/dc/{ => dccg}/dcn314/dcn314_dccg.c | 0 + .../amd/display/dc/{ => dccg}/dcn314/dcn314_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn32/dcn32_dccg.c | 1 - + .../amd/display/dc/{ => dccg}/dcn32/dcn32_dccg.h | 0 + .../amd/display/dc/{ => dccg}/dcn35/dcn35_dccg.c | 57 +- + .../amd/display/dc/{ => dccg}/dcn35/dcn35_dccg.h | 0 + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c | 835 + + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.h | 205 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 64 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 117 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 8 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 4 + + .../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 +- + 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 | 3 +- + .../amd/display/dc/dcn32/dcn32_dio_link_encoder.c | 3 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 3 + + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 15 +- + drivers/gpu/drm/amd/display/dc/dcn35/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn401/Makefile | 13 + + .../display/dc/dcn401/dcn401_dio_link_encoder.c | 322 + + .../display/dc/dcn401/dcn401_dio_link_encoder.h | 134 + + .../display/dc/dcn401/dcn401_dio_stream_encoder.c | 854 + + .../display/dc/dcn401/dcn401_dio_stream_encoder.h | 217 + + .../gpu/drm/amd/display/dc/dcn401/dcn401_hubbub.c | 933 + + .../gpu/drm/amd/display/dc/dcn401/dcn401_hubbub.h | 192 + + .../gpu/drm/amd/display/dc/dcn401/dcn401_hubp.c | 1027 + + .../gpu/drm/amd/display/dc/dcn401/dcn401_hubp.h | 331 + + drivers/gpu/drm/amd/display/dc/dcn401/dcn401_mpc.c | 653 + + drivers/gpu/drm/amd/display/dc/dcn401/dcn401_mpc.h | 239 + + 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 | 7 +- + .../gpu/drm/amd/display/dc/dml/dcn10/dcn10_fpu.h | 2 +- + .../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 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 3 - + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 30 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 2 +- + .../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 +- + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 80 + + .../drm/amd/display/dc/dml2/display_mode_core.c | 2 +- + .../display/dc/dml2/display_mode_core_structs.h | 1 + + .../dc/dml2/dml21/dml21_translation_helper.c | 1155 + + .../dc/dml2/dml21/dml21_translation_helper.h | 29 + + .../drm/amd/display/dc/dml2/dml21/dml21_utils.c | 534 + + .../drm/amd/display/dc/dml2/dml21/dml21_utils.h | 50 + + .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 425 + + .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.h | 67 + + .../dc/dml2/dml21/inc/bounding_boxes/dcn3_soc_bb.h | 401 + + .../dc/dml2/dml21/inc/bounding_boxes/dcn4_soc_bb.h | 352 + + .../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 | 502 + + .../dc/dml2/dml21/inc/dml_top_policy_types.h | 14 + + .../dml2/dml21/inc/dml_top_soc_parameter_types.h | 193 + + .../amd/display/dc/dml2/dml21/inc/dml_top_types.h | 718 + + .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.c | 628 + + .../dc/dml2/dml21/src/dml2_core/dml2_core_dcn4.h | 16 + + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 12269 ++ + .../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 | 12411 ++ + .../dc/dml2/dml21/src/dml2_core/dml2_core_shared.h | 38 + + .../dml21/src/dml2_core/dml2_core_shared_types.h | 1948 + + .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 644 + + .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.h | 17 + + .../dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 50 + + .../dml2/dml21/src/dml2_dpmm/dml2_dpmm_factory.h | 14 + + .../dc/dml2/dml21/src/dml2_mcg/dml2_mcg_dcn4.c | 156 + + .../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 | 688 + + .../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 | 2060 + + .../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 | 140 + + .../src/dml2_standalone_libraries/lib_float_math.h | 25 + + .../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 | 329 + + .../dc/dml2/dml21/src/dml2_top/dml_top_mcache.c | 545 + + .../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 | 981 + + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 81 +- + .../drm/amd/display/dc/dml2/dml2_internal_types.h | 20 + + .../amd/display/dc/dml2/dml2_translation_helper.c | 128 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 30 + + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 18 + + 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.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 | 432 + + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h | 725 + + .../drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 303 + + .../amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 937 + + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 11 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 132 +- + .../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/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_factory.c | 4 + + 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/hubbub/Makefile | 100 + + .../display/dc/{ => hubbub}/dcn10/dcn10_hubbub.c | 2 +- + .../display/dc/{ => hubbub}/dcn10/dcn10_hubbub.h | 47 +- + .../display/dc/{ => hubbub}/dcn20/dcn20_hubbub.c | 0 + .../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 + drivers/gpu/drm/amd/display/dc/hubp/Makefile | 92 + + .../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 + 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 | 5 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 13 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 144 +- + .../drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.c | 5 +- + .../gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 2 +- + .../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 +- + .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c | 1 + + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 23 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.h | 2 - + .../drm/amd/display/dc/hwss/dcn314/dcn314_init.c | 2 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 63 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.h | 4 +- + .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 3 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 36 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 2 + + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 4 +- + .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 11 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 1671 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 79 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 149 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.h | 12 + + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 22 + + .../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 | 21 +- + 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 | 3 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 15 + + 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/mem_input.h | 9 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 37 +- + 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 | 1 + + .../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/resource.h | 18 +- + drivers/gpu/drm/amd/display/dc/irq/Makefile | 9 + + .../amd/display/dc/irq/dcn401/irq_service_dcn401.c | 411 + + .../amd/display/dc/irq/dcn401/irq_service_dcn401.h | 13 + + drivers/gpu/drm/amd/display/dc/irq_types.h | 8 + + .../drm/amd/display/dc/link/hwss/link_hwss_dio.c | 5 + + .../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 | 35 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 2 +- + .../display/dc/link/protocols/link_dp_capability.c | 27 +- + .../dc/link/protocols/link_dp_irq_handler.c | 25 +- + .../amd/display/dc/link/protocols/link_dp_phy.c | 53 +- + .../display/dc/link/protocols/link_dp_training.c | 4 +- + .../drm/amd/display/dc/link/protocols/link_dpcd.c | 1 + + drivers/gpu/drm/amd/display/dc/optc/Makefile | 6 + + .../gpu/drm/amd/display/dc/optc/dcn10/dcn10_optc.c | 46 +- + .../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 | 9 +- + .../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 | 8 +- + .../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/resource/Makefile | 8 + + .../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 | 12 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 4 +- + .../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 | 1 + + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 1 + + .../display/dc/resource/dcn351/dcn351_resource.c | 5 +- + .../display/dc/resource/dcn401/dcn401_resource.c | 2136 + + .../display/dc/resource/dcn401/dcn401_resource.h | 581 + + drivers/gpu/drm/amd/display/dc/spl/Makefile | 33 + + drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 1354 + + 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 | 458 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 45 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 397 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 5 +- + 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 + + 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/modules/hdcp/hdcp_ddc.c | 28 +- + .../drm/amd/display/modules/power/power_helpers.c | 8 +- + drivers/gpu/drm/amd/include/amd_shared.h | 3 + + .../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 | 16569 ++ + .../amd/include/asic_reg/dcn/dcn_4_1_0_sh_mask.h | 145742 ++++++++++++++++++ + .../drm/amd/include/asic_reg/gc/gc_12_0_0_offset.h | 11053 ++ + .../amd/include/asic_reg/gc/gc_12_0_0_sh_mask.h | 40452 +++++ + .../include/asic_reg/mmhub/mmhub_4_1_0_offset.h | 1341 + + .../include/asic_reg/mmhub/mmhub_4_1_0_sh_mask.h | 6943 + + drivers/gpu/drm/amd/include/mes_v12_api_def.h | 797 + + drivers/gpu/drm/amd/include/soc24_enum.h | 21073 +++ + drivers/gpu/drm/amd/include/v12_structs.h | 1189 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 33 +- + drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 9 - + 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 +- + .../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 | 23 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 15 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 79 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 20 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 31 +- + .../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 | 20 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 4 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 5 + + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 35 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 8 +- + 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 | 3 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 58 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 9 +- + .../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 | 59 +- + .../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 | 1 + + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 70 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 4 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 10 + + include/uapi/drm/amdgpu_drm.h | 14 +- + include/uapi/drm/drm_fourcc.h | 19 + + include/uapi/linux/kfd_ioctl.h | 5 +- + include/uapi/linux/kfd_sysfs.h | 19 +- + 550 files changed, 327661 insertions(+), 1884 deletions(-) + 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 + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v12_0.h + 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 + 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 + 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 (100%) + rename drivers/gpu/drm/amd/display/dc/{ => dccg}/dcn314/dcn314_dccg.c (100%) + 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 (99%) + 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 (93%) + 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 + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_dio_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_dio_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_mpc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn401/dcn401_mpc.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/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/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 (100%) + 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/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/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/optc/dcn401/dcn401_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/optc/dcn401/dcn401_optc.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/resource/dce80/CMakeLists.txt + 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/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 +Merging drm-intel/for-linux-next (ce698dcf10d5 Documentation/i915: remove kernel-doc for DMC wakelocks) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/display/intel_audio.c +Auto-merging drivers/gpu/drm/i915/display/intel_bios.c +Auto-merging drivers/gpu/drm/i915/display/intel_vbt_defs.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/display/intel_vbt_defs.h +Auto-merging drivers/gpu/drm/xe/Makefile +Resolved 'drivers/gpu/drm/i915/display/intel_vbt_defs.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 487ac387f581] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/i915.rst | 3 - + drivers/gpu/drm/i915/display/i9xx_plane.c | 41 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 31 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.h | 1 + + drivers/gpu/drm/i915/display/intel_audio.c | 15 + + drivers/gpu/drm/i915/display/intel_audio_regs.h | 3 + + drivers/gpu/drm/i915/display/intel_bios.c | 226 ++++--- + drivers/gpu/drm/i915/display/intel_bw.c | 65 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 11 + + drivers/gpu/drm/i915/display/intel_crtc.c | 3 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 2 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 288 +++++++-- + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 48 +- + drivers/gpu/drm/i915/display/intel_display.c | 19 +- + .../gpu/drm/i915/display/intel_display_device.c | 7 + + drivers/gpu/drm/i915/display/intel_display_irq.c | 38 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 4 + + drivers/gpu/drm/i915/display/intel_display_types.h | 11 +- + drivers/gpu/drm/i915/display/intel_dp.c | 9 +- + drivers/gpu/drm/i915/display/intel_dp.h | 1 + + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 149 ++++- + drivers/gpu/drm/i915/display/intel_dpt.c | 9 +- + drivers/gpu/drm/i915/display/intel_dpt.h | 5 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 2 +- + drivers/gpu/drm/i915/display/intel_fb.c | 44 +- + 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_fbdev.c | 39 +- + 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_frontbuffer.c | 2 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 23 + + drivers/gpu/drm/i915/display/intel_panel.c | 2 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 20 +- + drivers/gpu/drm/i915/display/intel_psr.c | 92 +-- + drivers/gpu/drm/i915/display/intel_psr_regs.h | 40 +- + drivers/gpu/drm/i915/display/intel_tdf.h | 25 + + drivers/gpu/drm/i915/display/intel_vblank.c | 16 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 710 ++++++++++++++++++--- + drivers/gpu/drm/i915/display/intel_vrr.c | 52 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 108 ++-- + drivers/gpu/drm/i915/display/skl_watermark.c | 14 +- + drivers/gpu/drm/i915/i915_drv.h | 11 +- + drivers/gpu/drm/i915/i915_reg.h | 47 +- + drivers/gpu/drm/i915/soc/intel_dram.c | 4 + + drivers/gpu/drm/i915/soc/intel_pch.c | 4 +- + drivers/gpu/drm/xe/Makefile | 3 +- + drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 9 +- + drivers/gpu/drm/xe/display/intel_fbdev_fb.h | 21 - + drivers/gpu/drm/xe/display/xe_display.c | 3 - + drivers/gpu/drm/xe/display/xe_fb_pin.c | 18 +- + drivers/gpu/drm/xe/display/xe_plane_initial.c | 4 +- + drivers/gpu/drm/xe/display/xe_tdf.c | 13 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 3 + + drivers/gpu/drm/xe/xe_device.c | 49 ++ + drivers/gpu/drm/xe/xe_device.h | 2 + + drivers/gpu/drm/xe/xe_device_types.h | 6 +- + drivers/gpu/drm/xe/xe_gt_printk.h | 3 + + drivers/gpu/drm/xe/xe_pci.c | 1 + + 59 files changed, 1850 insertions(+), 624 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_tdf.h + delete mode 100644 drivers/gpu/drm/xe/display/intel_fbdev_fb.h + create mode 100644 drivers/gpu/drm/xe/display/xe_tdf.c +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 (b587f413ca47 drm/msm/gen_header: allow skipping the validation) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (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 (b31cfb47b27a drm/xe/xe_guc_submit: Declare reset if banned or killed or wedged) +$ 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/Makefile +Auto-merging drivers/gpu/drm/xe/regs/xe_gt_regs.h +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_device.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_device.h +Auto-merging drivers/gpu/drm/xe/xe_device_types.h +Auto-merging drivers/gpu/drm/xe/xe_guc_ads.c +Auto-merging drivers/gpu/drm/xe/xe_pci.c +Auto-merging drivers/gpu/drm/xe/xe_vm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_vm.c +Auto-merging drivers/gpu/drm/xe/xe_vm_types.h +Auto-merging drivers/gpu/drm/xe/xe_wa.c +Resolved 'drivers/gpu/drm/xe/xe_device.h' using previous resolution. +Resolved 'drivers/gpu/drm/xe/xe_vm.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8e292e892997] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/xe/Makefile | 2 + + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 26 +- + drivers/gpu/drm/xe/abi/guc_relay_actions_abi.h | 170 ++++- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 1 + + .../xe/{regs => instructions}/xe_gpu_commands.h | 0 + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 10 +- + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 55 +- + drivers/gpu/drm/xe/regs/xe_lrc_layout.h | 7 + + 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 | 86 --- + drivers/gpu/drm/xe/xe_args.h | 143 ++++ + drivers/gpu/drm/xe/xe_bb.c | 2 +- + drivers/gpu/drm/xe/xe_bo.c | 61 +- + drivers/gpu/drm/xe/xe_bo.h | 1 + + drivers/gpu/drm/xe/xe_debugfs.c | 58 ++ + drivers/gpu/drm/xe/xe_device.c | 62 +- + drivers/gpu/drm/xe/xe_device.h | 13 +- + drivers/gpu/drm/xe/xe_device_types.h | 12 + + drivers/gpu/drm/xe/xe_exec_queue.h | 9 + + drivers/gpu/drm/xe/xe_execlist.c | 1 - + drivers/gpu/drm/xe/xe_gsc.c | 1 + + drivers/gpu/drm/xe/xe_gsc_proxy.c | 1 + + drivers/gpu/drm/xe/xe_gsc_submit.c | 1 + + drivers/gpu/drm/xe/xe_gt.c | 44 +- + drivers/gpu/drm/xe/xe_gt.h | 7 + + drivers/gpu/drm/xe/xe_gt_ccs_mode.c | 4 +- + drivers/gpu/drm/xe/xe_gt_clock.c | 1 + + drivers/gpu/drm/xe/xe_gt_debugfs.c | 16 + + drivers/gpu/drm/xe/xe_gt_idle.c | 1 + + drivers/gpu/drm/xe/xe_gt_mcr.h | 24 + + drivers/gpu/drm/xe/xe_gt_pagefault.c | 16 +- + 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 | 18 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 348 +++++++++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.h | 18 + + 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 | 5 + + drivers/gpu/drm/xe/xe_gt_throttle_sysfs.h | 5 +- + 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 | 12 +- + drivers/gpu/drm/xe/xe_guc.c | 57 +- + drivers/gpu/drm/xe/xe_guc.h | 2 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 70 +- + drivers/gpu/drm/xe/xe_guc_ads.h | 3 +- + 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_pc.c | 4 + + drivers/gpu/drm/xe/xe_guc_relay.c | 8 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 170 +++-- + drivers/gpu/drm/xe/xe_guc_submit.h | 2 +- + drivers/gpu/drm/xe/xe_guc_types.h | 9 - + drivers/gpu/drm/xe/xe_hw_engine.c | 150 +++- + drivers/gpu/drm/xe/xe_hw_engine_types.h | 24 +- + drivers/gpu/drm/xe/xe_hwmon.c | 9 +- + drivers/gpu/drm/xe/xe_lrc.c | 192 ++++- + drivers/gpu/drm/xe/xe_lrc.h | 10 +- + drivers/gpu/drm/xe/xe_lrc_types.h | 4 + + drivers/gpu/drm/xe/xe_migrate.c | 18 +- + drivers/gpu/drm/xe/xe_mmio.c | 39 +- + drivers/gpu/drm/xe/xe_mmio.h | 7 + + drivers/gpu/drm/xe/xe_mocs.c | 300 ++++++-- + 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 | 17 +- + drivers/gpu/drm/xe/xe_pci_types.h | 4 + + drivers/gpu/drm/xe/xe_pcode.c | 8 +- + drivers/gpu/drm/xe/xe_pm.c | 2 +- + drivers/gpu/drm/xe/xe_preempt_fence.c | 14 +- + drivers/gpu/drm/xe/xe_pt.c | 62 +- + drivers/gpu/drm/xe/xe_query.c | 1 + + drivers/gpu/drm/xe/xe_reg_sr.h | 4 +- + drivers/gpu/drm/xe/xe_ring_ops.c | 2 +- + drivers/gpu/drm/xe/xe_rtp.h | 4 +- + drivers/gpu/drm/xe/xe_rtp_helpers.h | 26 +- + drivers/gpu/drm/xe/xe_sync.c | 15 + + drivers/gpu/drm/xe/xe_sync.h | 1 + + drivers/gpu/drm/xe/xe_uc.c | 23 +- + drivers/gpu/drm/xe/xe_uc.h | 2 +- + drivers/gpu/drm/xe/xe_vm.c | 794 +++++++++++++-------- + drivers/gpu/drm/xe/xe_vm.h | 3 + + drivers/gpu/drm/xe/xe_vm_doc.h | 24 +- + drivers/gpu/drm/xe/xe_vm_types.h | 29 +- + drivers/gpu/drm/xe/xe_wa.c | 18 + + 94 files changed, 3863 insertions(+), 845 deletions(-) + rename drivers/gpu/drm/xe/{regs => instructions}/xe_gpu_commands.h (100%) + 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_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 +Merging etnaviv/etnaviv/next (b735ee173f84 drm/etnaviv: Restore some id values) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (ce4a7ae84a58 fbdev: offb: replace of_node_put with __free(device_node)) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/Kconfig +Merge made by the 'ort' strategy. + drivers/video/fbdev/Kconfig | 26 +++++++++++++------------- + drivers/video/fbdev/au1200fb.c | 2 +- + drivers/video/fbdev/fsl-diu-fb.c | 2 +- + drivers/video/fbdev/offb.c | 3 +-- + drivers/video/fbdev/omap2/omapfb/dss/dsi.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 20 +------------------- + drivers/video/fbdev/omap2/omapfb/dss/hdmi4.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 3 ++- + drivers/video/fbdev/pxafb.c | 2 +- + drivers/video/fbdev/savage/savagefb_driver.c | 5 ++++- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 2 +- + drivers/video/fbdev/sis/init301.c | 3 +-- + drivers/video/fbdev/uvesafb.c | 2 +- + drivers/video/hdmi.c | 10 ++-------- + drivers/video/logo/pnmtologo.c | 2 -- + include/video/omapfb_dss.h | 3 --- + 17 files changed, 35 insertions(+), 59 deletions(-) +Merging regmap/for-next (9b1fe0510494 regmap: Reorder fields in 'struct regmap_config' to save some memory) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +Merging sound/for-next (d731b1ed1505 ALSA: hda/realtek: Drop doubly quirk entry for 103c:8a2e) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging ieee1394/for-next (21151fd8f0ea firewire: obsolete usage of *-objs in Makefile for KUnit test) +$ 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 | 16 + + drivers/firewire/Makefile | 6 +- + drivers/firewire/core-card.c | 7 + + drivers/firewire/core-cdev.c | 7 + + drivers/firewire/core-topology.c | 3 + + drivers/firewire/core-trace.c | 5 + + drivers/firewire/core-transaction.c | 253 ++++++------ + drivers/firewire/core.h | 21 +- + drivers/firewire/ohci.c | 131 +++--- + drivers/firewire/packet-header-definitions.h | 234 +++++++++++ + drivers/firewire/packet-serdes-test.c | 582 +++++++++++++++++++++++++++ + include/linux/firewire.h | 3 +- + include/trace/events/firewire.h | 348 ++++++++++++++++ + 14 files changed, 1421 insertions(+), 196 deletions(-) + create mode 100644 drivers/firewire/core-trace.c + create mode 100644 drivers/firewire/packet-header-definitions.h + create mode 100644 drivers/firewire/packet-serdes-test.c + create mode 100644 include/trace/events/firewire.h +Merging sound-asoc/for-next (c277ee8f90ab Merge remote-tracking branch 'asoc/for-6.9' into asoc-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (2c9e5d4a0082 bpf: remove CONFIG_BPF_JIT dependency on CONFIG_MODULES of) +$ 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 arch/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging arch/mips/include/asm/pgtable-64.h +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/powerpc/kernel/module.c +Auto-merging arch/powerpc/lib/code-patching.c +Auto-merging arch/powerpc/mm/mem.c +CONFLICT (content): Merge conflict in arch/powerpc/mm/mem.c +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/kernel/probes/kprobes.c +Auto-merging arch/riscv/mm/init.c +Auto-merging arch/riscv/net/bpf_jit_core.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/mm/init.c +Auto-merging kernel/bpf/core.c +Auto-merging kernel/module/main.c +CONFLICT (content): Merge conflict in kernel/module/main.c +Auto-merging mm/Kconfig +Auto-merging mm/Makefile +Auto-merging mm/mm_init.c +Auto-merging scripts/Makefile.modpost +Resolved 'arch/powerpc/mm/mem.c' using previous resolution. +Resolved 'kernel/module/main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ad75d54006b9] Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/Kconfig | 10 ++- + arch/arm/kernel/module.c | 34 --------- + arch/arm/mm/init.c | 45 +++++++++++ + arch/arm64/Kconfig | 1 + + arch/arm64/kernel/module.c | 126 ------------------------------ + arch/arm64/kernel/probes/kprobes.c | 7 -- + arch/arm64/mm/init.c | 140 ++++++++++++++++++++++++++++++++++ + arch/arm64/net/bpf_jit_comp.c | 11 --- + arch/loongarch/kernel/module.c | 6 -- + arch/loongarch/mm/init.c | 21 +++++ + arch/mips/include/asm/pgtable-64.h | 4 +- + arch/mips/kernel/module.c | 10 --- + arch/mips/mm/fault.c | 4 +- + arch/mips/mm/init.c | 23 ++++++ + arch/nios2/include/asm/pgtable.h | 5 +- + arch/nios2/kernel/module.c | 20 ----- + arch/nios2/mm/init.c | 21 +++++ + arch/parisc/kernel/module.c | 12 --- + arch/parisc/mm/init.c | 23 +++++- + arch/powerpc/Kconfig | 2 +- + arch/powerpc/include/asm/kasan.h | 2 +- + arch/powerpc/kernel/head_8xx.S | 4 +- + arch/powerpc/kernel/head_book3s_32.S | 6 +- + arch/powerpc/kernel/kprobes.c | 22 +----- + arch/powerpc/kernel/module.c | 38 ---------- + arch/powerpc/lib/code-patching.c | 2 +- + arch/powerpc/mm/book3s32/mmu.c | 2 +- + arch/powerpc/mm/mem.c | 64 ++++++++++++++++ + arch/riscv/include/asm/pgtable.h | 3 + + arch/riscv/kernel/module.c | 12 --- + arch/riscv/kernel/probes/kprobes.c | 10 --- + arch/riscv/mm/init.c | 35 +++++++++ + arch/riscv/net/bpf_jit_core.c | 13 ---- + arch/s390/kernel/ftrace.c | 4 +- + arch/s390/kernel/kprobes.c | 4 +- + arch/s390/kernel/module.c | 42 +--------- + arch/s390/mm/init.c | 30 ++++++++ + arch/sparc/include/asm/pgtable_32.h | 2 + + arch/sparc/kernel/module.c | 30 -------- + arch/sparc/mm/Makefile | 2 + + arch/sparc/mm/execmem.c | 21 +++++ + arch/sparc/net/bpf_jit_comp_32.c | 8 +- + arch/x86/Kconfig | 1 + + arch/x86/kernel/ftrace.c | 16 +--- + arch/x86/kernel/kprobes/core.c | 4 +- + arch/x86/kernel/module.c | 51 ------------- + arch/x86/mm/init.c | 29 +++++++ + include/linux/execmem.h | 132 ++++++++++++++++++++++++++++++++ + include/linux/module.h | 9 +++ + include/linux/moduleloader.h | 15 ---- + kernel/bpf/Kconfig | 2 +- + kernel/bpf/core.c | 6 +- + kernel/kprobes.c | 63 +++++++++------ + kernel/module/Kconfig | 3 +- + kernel/module/kallsyms.c | 2 +- + kernel/module/main.c | 108 ++++++++++++-------------- + kernel/trace/trace_kprobe.c | 20 ++++- + mm/Kconfig | 3 + + mm/Makefile | 1 + + mm/execmem.c | 143 +++++++++++++++++++++++++++++++++++ + mm/mm_init.c | 2 + + scripts/Makefile.modpost | 2 +- + 62 files changed, 907 insertions(+), 586 deletions(-) + create mode 100644 arch/sparc/mm/execmem.c + create mode 100644 include/linux/execmem.h + create mode 100644 mm/execmem.c +Merging input/next (5852f2afcdd9 Input: drop explicit initialization of struct i2c_device_id::driver_data to 0) +$ 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/misc/da7280.c +Auto-merging drivers/input/rmi4/rmi_smbus.c +Auto-merging drivers/input/touchscreen/atmel_mxt_ts.c +Auto-merging drivers/input/touchscreen/goodix.c +Auto-merging drivers/input/touchscreen/sur40.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/qcom,pm8xxx-vib.yaml | 16 +++- + drivers/input/ff-core.c | 7 +- + drivers/input/joystick/adafruit-seesaw.c | 21 ++++- + drivers/input/joystick/as5011.c | 2 +- + drivers/input/joystick/qwiic-joystick.c | 4 +- + drivers/input/keyboard/adp5588-keys.c | 4 +- + drivers/input/keyboard/cros_ec_keyb.c | 2 - + drivers/input/keyboard/cypress-sf.c | 2 +- + drivers/input/keyboard/dlink-dir685-touchkeys.c | 2 +- + drivers/input/keyboard/lm8323.c | 2 +- + drivers/input/keyboard/lm8333.c | 2 +- + drivers/input/keyboard/lpc32xx-keys.c | 3 +- + drivers/input/keyboard/matrix_keypad.c | 1 - + drivers/input/keyboard/max7359_keypad.c | 2 +- + drivers/input/keyboard/mpr121_touchkey.c | 2 +- + drivers/input/keyboard/qt1070.c | 4 +- + drivers/input/keyboard/qt2160.c | 2 +- + drivers/input/keyboard/stmpe-keypad.c | 1 - + drivers/input/keyboard/tca6416-keypad.c | 6 -- + drivers/input/keyboard/tm2-touchkey.c | 4 +- + drivers/input/misc/ad714x-i2c.c | 10 +-- + drivers/input/misc/adxl34x-i2c.c | 2 +- + drivers/input/misc/apanel.c | 2 +- + drivers/input/misc/atmel_captouch.c | 2 +- + drivers/input/misc/bma150.c | 6 +- + drivers/input/misc/cma3000_d0x_i2c.c | 4 +- + drivers/input/misc/da7280.c | 1 - + drivers/input/misc/drv260x.c | 2 +- + drivers/input/misc/drv2665.c | 2 +- + drivers/input/misc/drv2667.c | 2 +- + drivers/input/misc/ims-pcu.c | 4 +- + drivers/input/misc/kxtj9.c | 4 +- + drivers/input/misc/mma8450.c | 4 +- + drivers/input/misc/pcf8574_keypad.c | 2 +- + drivers/input/misc/pm8xxx-vibrator.c | 92 ++++++++++++++++------ + drivers/input/mouse/cyapa.c | 16 +++- + drivers/input/mouse/elan_i2c_core.c | 4 +- + drivers/input/mouse/synaptics_i2c.c | 4 +- + drivers/input/rmi4/rmi_i2c.c | 2 +- + drivers/input/rmi4/rmi_smbus.c | 2 +- + drivers/input/serio/ioc3kbd.c | 7 ++ + drivers/input/touchscreen/ad7879-i2c.c | 4 +- + drivers/input/touchscreen/ar1021_i2c.c | 4 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 10 +-- + drivers/input/touchscreen/auo-pixcir-ts.c | 2 +- + drivers/input/touchscreen/bu21013_ts.c | 2 +- + drivers/input/touchscreen/bu21029_ts.c | 2 +- + drivers/input/touchscreen/chipone_icn8505.c | 1 - + drivers/input/touchscreen/cy8ctma140.c | 2 +- + drivers/input/touchscreen/cyttsp4_i2c.c | 2 +- + drivers/input/touchscreen/cyttsp5.c | 2 +- + drivers/input/touchscreen/cyttsp_i2c.c | 2 +- + drivers/input/touchscreen/eeti_ts.c | 2 +- + drivers/input/touchscreen/egalax_ts.c | 2 +- + drivers/input/touchscreen/ektf2127.c | 4 +- + drivers/input/touchscreen/goodix.c | 2 +- + drivers/input/touchscreen/goodix_berlin_i2c.c | 2 +- + drivers/input/touchscreen/hideep.c | 2 +- + drivers/input/touchscreen/himax_hx83112b.c | 2 +- + drivers/input/touchscreen/ilitek_ts_i2c.c | 4 +- + drivers/input/touchscreen/max11801_ts.c | 2 +- + drivers/input/touchscreen/mcs5000_ts.c | 2 +- + drivers/input/touchscreen/melfas_mip4.c | 4 +- + drivers/input/touchscreen/migor_ts.c | 2 +- + drivers/input/touchscreen/mms114.c | 2 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 4 +- + drivers/input/touchscreen/rohm_bu21023.c | 2 +- + drivers/input/touchscreen/s6sy761.c | 4 +- + drivers/input/touchscreen/silead.c | 12 +-- + drivers/input/touchscreen/sis_i2c.c | 4 +- + drivers/input/touchscreen/stmfts.c | 4 +- + drivers/input/touchscreen/sur40.c | 2 +- + drivers/input/touchscreen/tsc2004.c | 2 +- + drivers/input/touchscreen/tsc2007_core.c | 2 +- + drivers/input/touchscreen/wacom_i2c.c | 4 +- + drivers/input/touchscreen/wdt87xx_i2c.c | 2 +- + drivers/input/touchscreen/zet6223.c | 4 +- + drivers/input/touchscreen/zforce_ts.c | 2 +- + 78 files changed, 223 insertions(+), 153 deletions(-) +Merging block/for-next (ba94750e4f90 Merge branch 'block-6.10' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging net/bluetooth/iso.c +Auto-merging net/bluetooth/l2cap_sock.c +Auto-merging net/bluetooth/sco.c +Auto-merging net/ipv4/af_inet.c +Auto-merging net/mptcp/protocol.c +Auto-merging net/unix/af_unix.c +Merge made by the 'ort' strategy. + crypto/af_alg.c | 11 ++++---- + crypto/algif_hash.c | 10 +++---- + drivers/block/brd.c | 26 +++++++++++++++++ + drivers/block/nbd.c | 41 ++++++++++++++------------- + drivers/block/null_blk/main.c | 2 +- + drivers/block/null_blk/trace.h | 7 ++++- + drivers/block/ublk_drv.c | 1 + + drivers/nvme/host/auth.c | 6 ++-- + drivers/nvme/host/core.c | 6 ++-- + drivers/nvme/host/fabrics.c | 51 +++++++++++++++++++++------------- + drivers/nvme/host/fabrics.h | 2 +- + drivers/nvme/host/fc.c | 4 +-- + drivers/nvme/host/nvme.h | 2 +- + drivers/nvme/host/rdma.c | 23 +++++++++------ + drivers/nvme/host/tcp.c | 30 ++++++++++++-------- + drivers/nvme/target/auth.c | 22 +++++++-------- + drivers/nvme/target/configfs.c | 22 +++++++++++---- + drivers/nvme/target/fabrics-cmd-auth.c | 49 ++++++++++++++++---------------- + drivers/nvme/target/fabrics-cmd.c | 11 ++++---- + drivers/nvme/target/nvmet.h | 8 +++--- + drivers/nvme/target/rdma.c | 16 ++++------- + drivers/xen/pvcalls-back.c | 6 +++- + fs/ocfs2/cluster/tcp.c | 5 +++- + include/crypto/if_alg.h | 3 +- + include/linux/net.h | 4 ++- + include/linux/socket.h | 3 +- + include/net/inet_common.h | 4 +-- + include/net/inet_connection_sock.h | 2 +- + include/net/sock.h | 13 +++++++-- + include/trace/events/nbd.h | 2 +- + io_uring/net.c | 26 +++++++++++++---- + net/atm/svc.c | 8 +++--- + net/ax25/af_ax25.c | 6 ++-- + net/bluetooth/iso.c | 4 +-- + net/bluetooth/l2cap_sock.c | 4 +-- + net/bluetooth/rfcomm/sock.c | 6 ++-- + net/bluetooth/sco.c | 4 +-- + net/core/sock.c | 4 +-- + net/ipv4/af_inet.c | 10 +++---- + net/ipv4/inet_connection_sock.c | 7 +++-- + net/iucv/af_iucv.c | 4 +-- + net/llc/af_llc.c | 7 ++--- + net/mptcp/protocol.c | 11 ++++---- + net/netrom/af_netrom.c | 6 ++-- + net/nfc/llcp_sock.c | 4 +-- + net/phonet/pep.c | 12 ++++---- + net/phonet/socket.c | 7 ++--- + net/rds/tcp_listen.c | 6 +++- + net/rose/af_rose.c | 6 ++-- + net/sctp/socket.c | 8 +++--- + net/smc/af_smc.c | 6 ++-- + net/socket.c | 15 ++++++---- + net/tipc/socket.c | 13 ++++----- + net/unix/af_unix.c | 21 +++++++------- + net/vmw_vsock/af_vsock.c | 6 ++-- + net/x25/af_x25.c | 4 +-- + 56 files changed, 354 insertions(+), 253 deletions(-) +Merging device-mapper/for-next (8b21ac87d550 dm-delay: remove timer_lock) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Auto-merging drivers/md/dm-table.c +Merge made by the 'ort' strategy. + .../admin-guide/device-mapper/dm-crypt.rst | 5 ++ + drivers/md/dm-crypt.c | 73 +++++++++++++++------- + drivers/md/dm-delay.c | 60 +++++++++--------- + drivers/md/dm-table.c | 27 ++++---- + 4 files changed, 97 insertions(+), 68 deletions(-) +Merging libata/for-next (d4a89339f17c ata: pata_legacy: make legacy_exit() work again) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Auto-merging drivers/ata/libata-core.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/ata/ahci-da850.txt | 18 ---- + .../devicetree/bindings/ata/fsl,imx-pata.yaml | 42 ++++++++ + Documentation/devicetree/bindings/ata/imx-pata.txt | 16 --- + .../devicetree/bindings/ata/ti,da850-ahci.yaml | 39 ++++++++ + drivers/ata/Kconfig | 28 +++--- + drivers/ata/libata-core.c | 108 ++++++--------------- + drivers/ata/libata-sff.c | 4 + + drivers/ata/libata.h | 8 +- + drivers/ata/pata_legacy.c | 8 +- + 9 files changed, 139 insertions(+), 132 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/ata/ahci-da850.txt + create mode 100644 Documentation/devicetree/bindings/ata/fsl,imx-pata.yaml + delete mode 100644 Documentation/devicetree/bindings/ata/imx-pata.txt + create mode 100644 Documentation/devicetree/bindings/ata/ti,da850-ahci.yaml +Merging pcmcia/pcmcia-next (ccae53aa8aa2 pcmcia: cs: make pcmcia_socket_class constant) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (35eea0defb6e mmc: renesas_sdhi: Add compatible string for RZ/G2L family, RZ/G3S, and RZ/V2M SoCs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/ath/ath10k/sdio.c +Auto-merging drivers/net/wireless/marvell/mwifiex/sdio.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 3 + + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 39 ++- + MAINTAINERS | 2 +- + drivers/bluetooth/btmrvl_sdio.c | 1 - + drivers/bluetooth/btmtksdio.c | 1 - + drivers/memstick/host/rtsx_pci_ms.c | 9 +- + drivers/memstick/host/rtsx_usb_ms.c | 6 +- + drivers/mmc/core/block.c | 8 +- + drivers/mmc/core/debugfs.c | 7 +- + drivers/mmc/core/host.c | 1 - + drivers/mmc/core/sd_ops.c | 83 ++++-- + drivers/mmc/core/sdio_bus.c | 9 +- + drivers/mmc/core/slot-gpio.c | 25 +- + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/atmel-mci.c | 309 +++++++++------------ + drivers/mmc/host/cqhci-core.c | 11 +- + drivers/mmc/host/cqhci.h | 4 + + drivers/mmc/host/davinci_mmc.c | 4 +- + drivers/mmc/host/dw_mmc-hi3798cv200.c | 1 - + drivers/mmc/host/dw_mmc-hi3798mv200.c | 1 - + drivers/mmc/host/mtk-sd.c | 1 - + drivers/mmc/host/renesas_sdhi_core.c | 3 + + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 9 +- + drivers/mmc/host/sdhci-acpi.c | 61 +++- + drivers/mmc/host/sdhci-esdhc-mcf.c | 2 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 305 +++++++++++++++++++- + drivers/mmc/host/sdhci-omap.c | 2 +- + drivers/mmc/host/sdhci-pci-gli.c | 46 ++- + drivers/mmc/host/sdhci-s3c.c | 35 +-- + drivers/mmc/host/sdhci-sprd.c | 3 +- + drivers/mmc/host/sdhci.c | 10 +- + drivers/mmc/host/sdhci.h | 3 +- + drivers/mmc/host/sdhci_am654.c | 182 +++++++++--- + drivers/net/wireless/ath/ath10k/sdio.c | 21 +- + .../wireless/broadcom/brcm80211/brcmfmac/bcmsdh.c | 1 - + drivers/net/wireless/marvell/mwifiex/sdio.c | 1 - + drivers/net/wireless/silabs/wfx/bus_sdio.c | 1 - + include/linux/mmc/sdio_func.h | 5 +- + include/linux/mmc/slot-gpio.h | 6 +- + 39 files changed, 826 insertions(+), 396 deletions(-) +Merging mfd/for-mfd-next (1482489b5196 dt-bindings: mfd: Use full path to other schemas) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Auto-merging drivers/mfd/intel-lpss-pci.c +CONFLICT (content): Merge conflict in drivers/mfd/intel-lpss-pci.c +Auto-merging drivers/regulator/Kconfig +Resolved 'drivers/mfd/intel-lpss-pci.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d4a7259e46f9] Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git +$ git diff -M --stat --summary HEAD^.. + .../arm/altera/socfpga-sdram-controller.txt | 12 - + Documentation/devicetree/bindings/arm/apm/scu.txt | 17 - + .../bindings/arm/marvell/armada-37xx.txt | 32 -- + .../bindings/input/twl4030-pwrbutton.txt | 21 -- + .../devicetree/bindings/mfd/actions,atc260x.yaml | 6 +- + .../bindings/mfd/allwinner,sun6i-a31-prcm.yaml | 14 +- + .../bindings/mfd/aspeed,ast2x00-scu.yaml | 16 +- + .../devicetree/bindings/mfd/brcm,cru.yaml | 8 +- + .../devicetree/bindings/mfd/brcm,iproc-cdru.txt | 16 - + .../devicetree/bindings/mfd/brcm,iproc-mhb.txt | 18 -- + .../devicetree/bindings/mfd/brcm,misc.yaml | 2 +- + .../bindings/mfd/canaan,k210-sysctl.yaml | 6 +- + .../devicetree/bindings/mfd/delta,tn48m-cpld.yaml | 4 +- + Documentation/devicetree/bindings/mfd/iqs62x.yaml | 4 +- + .../devicetree/bindings/mfd/kontron,sl28cpld.yaml | 10 +- + Documentation/devicetree/bindings/mfd/lp873x.txt | 67 ---- + .../devicetree/bindings/mfd/max77650.yaml | 8 +- + .../devicetree/bindings/mfd/maxim,max77686.yaml | 2 +- + .../devicetree/bindings/mfd/maxim,max77693.yaml | 2 +- + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 4 + + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + + .../devicetree/bindings/mfd/qcom-pm8xxx.yaml | 1 + + .../devicetree/bindings/mfd/richtek,rt4831.yaml | 4 +- + .../devicetree/bindings/mfd/ricoh,rn5t618.yaml | 6 +- + .../devicetree/bindings/mfd/rockchip,rk805.yaml | 2 +- + .../devicetree/bindings/mfd/rockchip,rk808.yaml | 2 +- + .../devicetree/bindings/mfd/rockchip,rk816.yaml | 274 ++++++++++++++++ + .../devicetree/bindings/mfd/rockchip,rk817.yaml | 2 +- + .../devicetree/bindings/mfd/rockchip,rk818.yaml | 2 +- + .../devicetree/bindings/mfd/rohm,bd71815-pmic.yaml | 2 +- + .../devicetree/bindings/mfd/rohm,bd71828-pmic.yaml | 13 +- + .../devicetree/bindings/mfd/rohm,bd71837-pmic.yaml | 2 +- + .../devicetree/bindings/mfd/rohm,bd9571mwv.yaml | 2 +- + .../devicetree/bindings/mfd/rohm,bd9576-pmic.yaml | 2 +- + .../devicetree/bindings/mfd/samsung,s2mpa01.yaml | 2 +- + .../devicetree/bindings/mfd/samsung,s2mps11.yaml | 12 +- + .../devicetree/bindings/mfd/samsung,s5m8767.yaml | 4 +- + .../devicetree/bindings/mfd/st,stmfx.yaml | 2 +- + .../devicetree/bindings/mfd/st,stpmic1.yaml | 4 +- + .../devicetree/bindings/mfd/stericsson,ab8500.yaml | 48 +-- + .../bindings/mfd/stericsson,db8500-prcmu.yaml | 40 +-- + Documentation/devicetree/bindings/mfd/syscon.yaml | 16 + + .../devicetree/bindings/mfd/ti,lp8732.yaml | 112 +++++++ + .../devicetree/bindings/mfd/ti,tps65086.yaml | 4 +- + .../devicetree/bindings/mfd/ti,tps6594.yaml | 1 + + Documentation/devicetree/bindings/mfd/ti,twl.yaml | 72 ++++- + Documentation/devicetree/bindings/rtc/twl-rtc.txt | 11 - + .../devicetree/bindings/watchdog/twl4030-wdt.txt | 10 - + drivers/fpga/intel-m10-bmc-sec-update.c | 3 +- + drivers/mfd/Kconfig | 16 +- + drivers/mfd/axp20x.c | 2 +- + drivers/mfd/cs42l43.c | 36 ++- + drivers/mfd/intel-lpss-pci.c | 2 +- + drivers/mfd/intel-m10-bmc-pmci.c | 1 + + drivers/mfd/intel-m10-bmc-spi.c | 1 + + drivers/mfd/kempld-core.c | 225 +++---------- + drivers/mfd/ocelot-spi.c | 5 +- + drivers/mfd/rk8xx-core.c | 104 ++++++ + drivers/mfd/rk8xx-i2c.c | 45 ++- + drivers/mfd/rohm-bd71828.c | 36 ++- + drivers/mfd/rsmu_i2c.c | 107 ++++++- + drivers/mfd/rsmu_spi.c | 8 +- + drivers/mfd/ssbi.c | 1 - + drivers/mfd/timberdale.c | 1 - + drivers/mfd/tps6594-core.c | 253 +++++++++++++-- + drivers/mfd/tps6594-i2c.c | 20 +- + drivers/mfd/tps6594-spi.c | 20 +- + drivers/misc/tps6594-pfsm.c | 48 ++- + drivers/pinctrl/pinctrl-rk805.c | 69 ++++ + drivers/pinctrl/pinctrl-tps6594.c | 275 +++++++++++++--- + drivers/regulator/Kconfig | 4 +- + drivers/regulator/rk808-regulator.c | 218 ++++++++++++- + drivers/regulator/tps6594-regulator.c | 340 +++++++++++++++----- + include/linux/mfd/intel-m10-bmc.h | 1 + + include/linux/mfd/rk808.h | 144 +++++++++ + include/linux/mfd/rohm-bd71828.h | 5 +- + include/linux/mfd/tps6594.h | 351 ++++++++++++++++++++- + 77 files changed, 2530 insertions(+), 733 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/altera/socfpga-sdram-controller.txt + delete mode 100644 Documentation/devicetree/bindings/arm/apm/scu.txt + delete mode 100644 Documentation/devicetree/bindings/arm/marvell/armada-37xx.txt + delete mode 100644 Documentation/devicetree/bindings/input/twl4030-pwrbutton.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/brcm,iproc-cdru.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/brcm,iproc-mhb.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/lp873x.txt + create mode 100644 Documentation/devicetree/bindings/mfd/rockchip,rk816.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ti,lp8732.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/twl-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/watchdog/twl4030-wdt.txt +Merging backlight/for-backlight-next (1fd949f653ee backlight: sky81452-backlight: Remove unnecessary call to of_node_get()) +$ 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 +Auto-merging drivers/hid/hid-picolcd_core.c +Auto-merging drivers/hid/hid-picolcd_fb.c +Auto-merging drivers/video/fbdev/sh_mobile_lcdcfb.c +Auto-merging include/linux/fb.h +Merge made by the 'ort' strategy. + drivers/auxdisplay/ht16k33.c | 15 +- + drivers/hid/hid-picolcd_backlight.c | 7 - + drivers/hid/hid-picolcd_core.c | 14 +- + drivers/hid/hid-picolcd_fb.c | 6 + + drivers/hid/hid-picolcd_lcd.c | 2 +- + drivers/staging/fbtft/fb_ssd1351.c | 4 +- + drivers/staging/fbtft/fbtft-core.c | 5 +- + drivers/video/backlight/aat2870_bl.c | 7 - + drivers/video/backlight/ams369fg06.c | 2 +- + drivers/video/backlight/backlight.c | 39 +++--- + drivers/video/backlight/bd6107.c | 12 +- + drivers/video/backlight/corgi_lcd.c | 2 +- + drivers/video/backlight/gpio_backlight.c | 12 +- + drivers/video/backlight/hx8357.c | 2 +- + drivers/video/backlight/ili922x.c | 2 +- + drivers/video/backlight/ili9320.c | 2 +- + drivers/video/backlight/jornada720_lcd.c | 2 +- + drivers/video/backlight/l4f00242t03.c | 2 +- + drivers/video/backlight/lcd.c | 27 ++-- + drivers/video/backlight/lms283gf05.c | 2 +- + drivers/video/backlight/lms501kf03.c | 2 +- + drivers/video/backlight/lp8788_bl.c | 151 ++------------------- + drivers/video/backlight/ltv350qv.c | 2 +- + drivers/video/backlight/lv5207lp.c | 12 +- + drivers/video/backlight/mp3309c.c | 9 +- + drivers/video/backlight/omap1_bl.c | 47 +++---- + drivers/video/backlight/otm3225a.c | 3 +- + drivers/video/backlight/platform_lcd.c | 2 +- + drivers/video/backlight/pwm_bl.c | 12 -- + drivers/video/backlight/sky81452-backlight.c | 8 +- + drivers/video/backlight/tdo24m.c | 2 +- + drivers/video/fbdev/atmel_lcdfb.c | 1 - + drivers/video/fbdev/clps711x-fb.c | 2 +- + drivers/video/fbdev/core/fb_backlight.c | 6 + + drivers/video/fbdev/imxfb.c | 2 +- + drivers/video/fbdev/omap/lcd_ams_delta.c | 2 +- + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 7 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 10 +- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 7 - + drivers/video/fbdev/ssd1307fb.c | 31 ++--- + include/linux/backlight.h | 41 ++---- + include/linux/fb.h | 9 ++ + include/linux/lcd.h | 6 +- + include/linux/mfd/lp8788.h | 36 ----- + include/linux/platform_data/omap1_bl.h | 1 - + include/linux/pwm_backlight.h | 1 - + scripts/const_structs.checkpatch | 1 + + 47 files changed, 161 insertions(+), 418 deletions(-) +Merging battery/for-next (50f0ff7c8cc4 power: supply: bq27xxx: Move health reading out of update loop) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Merge made by the 'ort' strategy. + drivers/power/supply/bq27xxx_battery.c | 116 ++++++++++++++----------- + drivers/power/supply/cros_peripheral_charger.c | 11 ++- + drivers/power/supply/cros_usbpd-charger.c | 11 ++- + drivers/power/supply/power_supply_sysfs.c | 20 +---- + drivers/power/supply/test_power.c | 36 ++++++++ + include/linux/power/bq27xxx_battery.h | 8 -- + 6 files changed, 120 insertions(+), 82 deletions(-) +Merging regulator/for-next (00d1d63ef2da Merge remote-tracking branch 'regulator/for-6.10' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. +Merging security/next (dd80c7465029 MAINTAINERS: repair file entry in SECURITY SUBSYSTEM) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 ++++ + security/apparmor/lsm.c | 1 - + security/keys/sysctl.c | 1 - + security/loadpin/loadpin.c | 1 - + security/yama/yama_lsm.c | 1 - + 5 files changed, 4 insertions(+), 4 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 (9fa8e7625008 ima: add crypto agility support for template-hash algorithm) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Auto-merging include/linux/fs.h +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + fs/overlayfs/copy_up.c | 2 +- + fs/overlayfs/super.c | 2 +- + include/linux/evm.h | 8 ++ + include/linux/fs.h | 2 +- + include/linux/integrity.h | 34 ++++++++ + include/linux/lsm_hook_defs.h | 3 +- + include/linux/security.h | 4 +- + security/integrity/evm/evm.h | 8 +- + security/integrity/evm/evm_crypto.c | 25 ++++-- + security/integrity/evm/evm_main.c | 92 +++++++++++++++----- + security/integrity/ima/ima.h | 12 ++- + security/integrity/ima/ima_api.c | 32 ++++--- + security/integrity/ima/ima_appraise.c | 4 +- + security/integrity/ima/ima_crypto.c | 7 +- + security/integrity/ima/ima_fs.c | 134 +++++++++++++++++++++++++++--- + security/integrity/ima/ima_iint.c | 2 +- + security/integrity/ima/ima_init.c | 6 +- + security/integrity/ima/ima_kexec.c | 1 + + security/integrity/ima/ima_main.c | 44 +++++++--- + security/integrity/ima/ima_template_lib.c | 27 ++++-- + security/integrity/integrity.h | 12 ++- + security/security.c | 5 +- + security/selinux/hooks.c | 2 +- + security/smack/smack_lsm.c | 2 +- + 24 files changed, 374 insertions(+), 96 deletions(-) +Merging selinux/next (4b60f3cd1134 Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + security/selinux/hooks.c | 58 ++++++++++++++++----------------------- + security/selinux/selinuxfs.c | 36 ++++++++++++++---------- + security/selinux/ss/conditional.c | 18 +++++++----- + security/selinux/ss/conditional.h | 2 +- + security/selinux/ss/ebitmap.c | 50 +++++++++++++++++++++------------ + security/selinux/ss/ebitmap.h | 38 ++++++++++++------------- + security/selinux/ss/hashtab.c | 10 ++++--- + security/selinux/ss/hashtab.h | 4 +-- + security/selinux/ss/policydb.c | 24 +++++++++++----- + security/selinux/ss/services.c | 3 +- + security/selinux/ss/symtab.c | 20 +++++++------- + security/selinux/xfrm.c | 7 ++--- + 12 files changed, 145 insertions(+), 125 deletions(-) +Merging smack/next (69b6d71052b5 Smack: use init_task_smack() in smack_cred_transfer()) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Already up to date. +Merging tpmdd/next (f4e8d8029285 Merge tag 'vfs-6.10.rw' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (c45b8cfc6d5c watchdog: LENOVO_SE10_WDT should depend on X86 && DMI) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Merge made by the 'ort' strategy. + drivers/watchdog/Kconfig | 69 +++++---- + drivers/watchdog/Makefile | 1 + + drivers/watchdog/bd9576_wdt.c | 12 +- + drivers/watchdog/cpu5wdt.c | 2 +- + drivers/watchdog/lenovo_se10_wdt.c | 308 +++++++++++++++++++++++++++++++++++++ + drivers/watchdog/mtx-1_wdt.c | 1 - + drivers/watchdog/octeon-wdt-main.c | 6 +- + drivers/watchdog/rti_wdt.c | 34 ++-- + drivers/watchdog/sa1100_wdt.c | 5 +- + 9 files changed, 370 insertions(+), 68 deletions(-) + create mode 100644 drivers/watchdog/lenovo_se10_wdt.c +Merging iommu/next (2bd5059c6cc0 Merge branches 'arm/renesas', 'arm/smmu', 'x86/amd', 'core' and 'x86/vt-d' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging Documentation/filesystems/proc.rst +Auto-merging arch/arm64/Kconfig +Auto-merging drivers/acpi/scan.c +CONFLICT (content): Merge conflict in drivers/acpi/scan.c +Auto-merging drivers/iommu/amd/amd_iommu.h +CONFLICT (content): Merge conflict in drivers/iommu/amd/amd_iommu.h +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/iommu/intel/irq_remapping.c +Auto-merging drivers/iommu/irq_remapping.c +Auto-merging include/linux/dma-map-ops.h +Resolved 'drivers/acpi/scan.c' using previous resolution. +Resolved 'drivers/iommu/amd/amd_iommu.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 40b843c06370] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 2 +- + .../devicetree/bindings/iommu/qcom,tbu.yaml | 69 +++ + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 + + Documentation/filesystems/proc.rst | 4 +- + arch/arc/mm/dma.c | 3 +- + arch/arm/mm/dma-mapping-nommu.c | 3 +- + arch/arm/mm/dma-mapping.c | 16 +- + arch/arm64/Kconfig | 1 - + arch/arm64/mm/dma-mapping.c | 13 +- + arch/loongarch/kernel/dma.c | 9 +- + arch/mips/mm/dma-noncoherent.c | 3 +- + arch/riscv/mm/dma-noncoherent.c | 3 +- + drivers/acpi/arm64/dma.c | 17 +- + drivers/acpi/arm64/iort.c | 20 +- + drivers/acpi/scan.c | 7 +- + drivers/hv/hv_common.c | 6 +- + drivers/iommu/Kconfig | 25 +- + drivers/iommu/amd/Kconfig | 3 + + drivers/iommu/amd/Makefile | 2 +- + drivers/iommu/amd/amd_iommu.h | 59 ++- + drivers/iommu/amd/amd_iommu_types.h | 33 ++ + drivers/iommu/amd/init.c | 177 +++---- + drivers/iommu/amd/io_pgtable.c | 13 +- + drivers/iommu/amd/io_pgtable_v2.c | 18 +- + drivers/iommu/amd/iommu.c | 302 +++++++---- + drivers/iommu/amd/pasid.c | 198 +++++++ + drivers/iommu/amd/ppr.c | 288 +++++++++++ + drivers/iommu/arm/arm-smmu-v3/Makefile | 2 + + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 168 ++++-- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c | 468 +++++++++++++++++ + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 576 +++++++++++---------- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 60 ++- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c | 496 ++++++++++++++++++ + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 8 + + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h | 2 + + drivers/iommu/arm/arm-smmu/arm-smmu.c | 20 +- + drivers/iommu/arm/arm-smmu/arm-smmu.h | 3 + + drivers/iommu/dma-iommu.c | 46 +- + drivers/iommu/dma-iommu.h | 14 +- + drivers/iommu/exynos-iommu.c | 14 +- + drivers/iommu/intel/Makefile | 2 +- + drivers/iommu/intel/cache.c | 419 +++++++++++++++ + drivers/iommu/intel/debugfs.c | 7 - + drivers/iommu/intel/dmar.c | 26 +- + drivers/iommu/intel/iommu.c | 383 +++----------- + drivers/iommu/intel/iommu.h | 88 +++- + drivers/iommu/intel/irq_remapping.c | 16 +- + drivers/iommu/intel/nested.c | 69 +-- + drivers/iommu/intel/pasid.c | 18 +- + drivers/iommu/intel/perf.h | 1 - + drivers/iommu/intel/svm.c | 383 +++----------- + drivers/iommu/intel/trace.h | 97 ++++ + drivers/iommu/io-pgtable-arm.c | 15 +- + drivers/iommu/io-pgtable-dart.c | 37 +- + drivers/iommu/iommu-pages.h | 186 +++++++ + drivers/iommu/iommu-sva.c | 16 +- + drivers/iommu/iommu.c | 48 +- + drivers/iommu/irq_remapping.c | 5 +- + drivers/iommu/irq_remapping.h | 2 +- + drivers/iommu/rockchip-iommu.c | 14 +- + drivers/iommu/s390-iommu.c | 6 - + drivers/iommu/sun50i-iommu.c | 7 +- + drivers/iommu/tegra-smmu.c | 18 +- + drivers/iommu/virtio-iommu.c | 10 - + drivers/of/device.c | 42 +- + include/linux/acpi_iort.h | 4 +- + include/linux/dma-direct.h | 18 + + include/linux/dma-map-ops.h | 6 +- + include/linux/dmar.h | 2 +- + include/linux/iommu.h | 16 +- + include/linux/mmzone.h | 5 +- + mm/vmstat.c | 3 + + 72 files changed, 3539 insertions(+), 1602 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/qcom,tbu.yaml + create mode 100644 drivers/iommu/amd/pasid.c + create mode 100644 drivers/iommu/amd/ppr.c + create mode 100644 drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c + create mode 100644 drivers/iommu/intel/cache.c + create mode 100644 drivers/iommu/iommu-pages.h +Merging audit/next (4cece7649650 Linux 6.9-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 (d976c6f4b32c of: property: Add fw_devlink support for interrupt-map property) + 15be4f7ce5de ("dt-bindings: Drop unnecessary quotes on keys") + 28081ebd17fb ("dt-bindings: PCI: qcom,pcie-sm8350: Drop redundant 'oneOf' sub-schema") + 649bad67d4b1 ("dt-bindings: PCI: microchip: increase number of items in ranges property") +$ 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/display/panel/ilitek,ili9881c.yaml +Auto-merging Documentation/devicetree/bindings/display/panel/novatek,nt35950.yaml +Auto-merging Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml +Auto-merging Documentation/devicetree/bindings/display/panel/sony,td4353-jdi.yaml +Auto-merging Documentation/devicetree/bindings/pci/microchip,pcie-host.yaml +Auto-merging Documentation/devicetree/bindings/pci/xilinx-versal-cpm.yaml +Auto-merging Documentation/devicetree/bindings/pci/xlnx,nwl-pcie.yaml +Auto-merging drivers/of/dynamic.c +CONFLICT (content): Merge conflict in drivers/of/dynamic.c +Auto-merging drivers/of/module.c +Auto-merging drivers/of/property.c +CONFLICT (content): Merge conflict in drivers/of/property.c +Auto-merging drivers/of/unittest.c +Resolved 'Documentation/devicetree/bindings/display/panel/novatek,nt36523.yaml' using previous resolution. +Resolved 'drivers/of/dynamic.c' using previous resolution. +Resolved 'drivers/of/property.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cf24ae7d9777] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/atmel,lcdc-display.yaml | 103 +++++++++++++ + .../devicetree/bindings/display/atmel,lcdc.txt | 87 ----------- + .../devicetree/bindings/display/atmel,lcdc.yaml | 70 +++++++++ + .../bindings/display/exynos/exynos_dp.txt | 112 -------------- + .../bindings/display/panel/abt,y030xx067a.yaml | 4 +- + .../display/panel/asus,z00t-tm5p5-nt35596.yaml | 5 +- + .../bindings/display/panel/boe,bf060y8m-aj0.yaml | 4 +- + .../bindings/display/panel/boe,himax8279d.yaml | 4 +- + .../display/panel/boe,th101mb31ig002-28a.yaml | 4 +- + .../bindings/display/panel/boe,tv101wum-nl6.yaml | 2 +- + .../bindings/display/panel/elida,kd35t133.yaml | 5 +- + .../display/panel/fascontek,fs035vg158.yaml | 3 + + .../display/panel/feixin,k101-im2ba02.yaml | 5 +- + .../bindings/display/panel/himax,hx83112a.yaml | 4 +- + .../bindings/display/panel/himax,hx8394.yaml | 3 +- + .../bindings/display/panel/ilitek,ili9163.yaml | 4 +- + .../bindings/display/panel/ilitek,ili9322.yaml | 3 + + .../bindings/display/panel/ilitek,ili9341.yaml | 3 +- + .../bindings/display/panel/ilitek,ili9805.yaml | 4 +- + .../bindings/display/panel/ilitek,ili9881c.yaml | 4 +- + .../bindings/display/panel/innolux,ej030na.yaml | 4 +- + .../bindings/display/panel/innolux,p097pfg.yaml | 4 +- + .../bindings/display/panel/jadard,jd9365da-h3.yaml | 3 +- + .../bindings/display/panel/jdi,lpm102a188a.yaml | 4 +- + .../bindings/display/panel/jdi,lt070me05000.yaml | 4 +- + .../display/panel/kingdisplay,kd035g6-54nt.yaml | 4 +- + .../display/panel/leadtek,ltk035c5444t.yaml | 3 + + .../display/panel/leadtek,ltk050h3146w.yaml | 5 +- + .../display/panel/leadtek,ltk500hd1829.yaml | 5 +- + .../bindings/display/panel/lg,lg4573.yaml | 3 +- + .../bindings/display/panel/lgphilips,lb035q02.yaml | 3 + + .../bindings/display/panel/nec,nl8048hl11.yaml | 4 +- + .../bindings/display/panel/newvision,nv3051d.yaml | 4 +- + .../bindings/display/panel/novatek,nt35510.yaml | 5 +- + .../bindings/display/panel/novatek,nt35950.yaml | 4 +- + .../bindings/display/panel/novatek,nt36523.yaml | 4 +- + .../bindings/display/panel/novatek,nt36672a.yaml | 4 +- + .../display/panel/olimex,lcd-olinuxino.yaml | 4 +- + .../bindings/display/panel/panel-mipi-dbi-spi.yaml | 3 + + .../bindings/display/panel/raydium,rm67191.yaml | 4 +- + .../bindings/display/panel/raydium,rm692e5.yaml | 4 +- + .../bindings/display/panel/ronbo,rb070d30.yaml | 2 +- + .../display/panel/samsung,amoled-mipi-dsi.yaml | 4 +- + .../bindings/display/panel/samsung,ams495qa01.yaml | 5 +- + .../bindings/display/panel/samsung,ld9040.yaml | 4 +- + .../bindings/display/panel/samsung,lms380kf01.yaml | 3 +- + .../bindings/display/panel/samsung,lms397kf04.yaml | 3 +- + .../bindings/display/panel/samsung,s6d16d0.yaml | 4 +- + .../bindings/display/panel/samsung,s6d27a1.yaml | 3 +- + .../bindings/display/panel/samsung,s6d7aa0.yaml | 3 +- + .../bindings/display/panel/samsung,s6e63m0.yaml | 4 +- + .../display/panel/samsung,s6e88a0-ams452ef01.yaml | 5 +- + .../bindings/display/panel/samsung,s6e8aa0.yaml | 4 +- + .../bindings/display/panel/sharp,lq101r1sx01.yaml | 4 +- + .../bindings/display/panel/sharp,ls043t1le01.yaml | 4 +- + .../bindings/display/panel/sharp,ls060t1sx01.yaml | 4 +- + .../bindings/display/panel/sitronix,st7789v.yaml | 4 +- + .../bindings/display/panel/sony,acx424akp.yaml | 5 +- + .../bindings/display/panel/sony,acx565akm.yaml | 3 + + .../bindings/display/panel/sony,td4353-jdi.yaml | 3 +- + .../display/panel/sony,tulip-truly-nt35521.yaml | 3 +- + .../bindings/display/panel/synaptics,r63353.yaml | 6 +- + .../devicetree/bindings/display/panel/tpo,td.yaml | 4 +- + .../bindings/display/panel/tpo,tpg110.yaml | 3 +- + .../bindings/display/panel/visionox,rm69299.yaml | 3 +- + .../bindings/display/panel/xinpeng,xpp055c272.yaml | 5 +- + .../display/samsung/samsung,exynos5-dp.yaml | 163 +++++++++++++++++++++ + .../devicetree/bindings/input/azoteq,iqs7222.yaml | 2 +- + .../allwinner,sun7i-a20-sc-nmi.yaml | 8 +- + .../mediatek,mt6577-sysirq.yaml | 2 +- + .../interrupt-controller/renesas,irqc.yaml | 1 + + .../devicetree/bindings/media/amphion,vpu.yaml | 2 +- + Documentation/devicetree/bindings/mtd/mtd.yaml | 4 +- + .../bindings/serial/fsl,s32-linflexuart.yaml | 4 +- + .../devicetree/bindings/timer/renesas,cmt.yaml | 2 + + .../devicetree/bindings/timer/renesas,tmu.yaml | 1 + + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 1 + + .../bindings/watchdog/aspeed,ast2400-wdt.yaml | 142 ++++++++++++++++++ + .../devicetree/bindings/watchdog/aspeed-wdt.txt | 73 --------- + drivers/of/address.c | 113 +++++--------- + drivers/of/base.c | 34 +---- + drivers/of/dynamic.c | 37 ++--- + drivers/of/module.c | 7 +- + drivers/of/of_private.h | 1 + + drivers/of/of_reserved_mem.c | 22 +-- + drivers/of/overlay.c | 11 +- + drivers/of/property.c | 87 ++++++++--- + drivers/of/resolver.c | 35 ++--- + drivers/of/unittest.c | 12 +- + include/linux/of_reserved_mem.h | 1 - + 90 files changed, 829 insertions(+), 546 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/atmel,lcdc-display.yaml + delete mode 100644 Documentation/devicetree/bindings/display/atmel,lcdc.txt + create mode 100644 Documentation/devicetree/bindings/display/atmel,lcdc.yaml + delete mode 100644 Documentation/devicetree/bindings/display/exynos/exynos_dp.txt + create mode 100644 Documentation/devicetree/bindings/display/samsung/samsung,exynos5-dp.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/aspeed,ast2400-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/aspeed-wdt.txt +Merging dt-krzk/for-next (3d679a406f3a Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. +Merging mailbox/for-next (0ac39d85a741 mailbox: zynqmp: Enable Bufferless IPI usage on Versal-based SOC's) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Merge made by the 'ort' strategy. + drivers/mailbox/zynqmp-ipi-mailbox.c | 257 +++++++++++++++++++++++++++++------ + 1 file changed, 212 insertions(+), 45 deletions(-) +Merging spi/for-next (e958cffa42df Merge remote-tracking branch 'spi/for-6.10' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. +Merging tip/master (346ec194187e Merge branch into tip/master: 'x86/timers') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/arm64/boot/dts/st/stm32mp251.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/st/stm32mp251.dtsi +Recorded preimage for 'arch/arm64/boot/dts/st/stm32mp251.dtsi' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/arm64/boot/dts/st/stm32mp251.dtsi'. +[master 8cf69b4dc5ad] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + arch/arm64/boot/dts/st/stm32mp251.dtsi | 176 ++++++++++++++++ + arch/x86/events/intel/cstate.c | 6 - + arch/x86/events/rapl.c | 16 +- + arch/x86/include/asm/inat.h | 17 +- + arch/x86/include/asm/insn.h | 32 ++- + arch/x86/lib/insn.c | 29 +++ + arch/x86/lib/x86-opcode-map.txt | 315 ++++++++++++++++++++--------- + arch/x86/tools/gen-insn-attr-x86.awk | 15 +- + tools/arch/x86/include/asm/inat.h | 17 +- + tools/arch/x86/include/asm/insn.h | 32 ++- + tools/arch/x86/lib/insn.c | 29 +++ + tools/arch/x86/lib/x86-opcode-map.txt | 315 ++++++++++++++++++++--------- + tools/arch/x86/tools/gen-insn-attr-x86.awk | 15 +- + 13 files changed, 806 insertions(+), 208 deletions(-) +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 (ab80b31cd7b2 Merge ras/edac-urgent into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. +Merging ftrace/for-next (ced352104e68 Merge user-events/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging Documentation/trace/kprobetrace.rst +Auto-merging init/main.c +CONFLICT (content): Merge conflict in init/main.c +Auto-merging kernel/trace/Kconfig +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging kernel/trace/trace_probe.c +Recorded preimage for 'init/main.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'init/main.c'. +[master 22bf4bd95b40] 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/trace/index.rst | 1 + + Documentation/trace/kprobetrace.rst | 8 +- + Documentation/trace/ring-buffer-map.rst | 106 +++++ + fs/tracefs/event_inode.c | 7 +- + include/linux/fprobe.h | 18 +- + include/linux/ftrace.h | 3 - + include/linux/objpool.h | 105 ++++- + include/linux/ring_buffer.h | 6 + + include/linux/trace_recursion.h | 2 +- + include/uapi/linux/trace_mmap.h | 48 +++ + init/main.c | 10 +- + kernel/events/uprobes.c | 22 +- + kernel/trace/Kconfig | 13 + + kernel/trace/fgraph.c | 11 - + kernel/trace/ftrace.c | 68 +-- + kernel/trace/rethook.c | 4 +- + kernel/trace/ring_buffer.c | 471 ++++++++++++++++++++- + kernel/trace/trace.c | 106 ++++- + kernel/trace/trace.h | 1 + + kernel/trace/trace_benchmark.c | 2 +- + kernel/trace/trace_events_user.c | 76 +++- + kernel/trace/trace_fprobe.c | 6 + + kernel/trace/trace_kprobe.c | 6 + + kernel/trace/trace_probe.c | 63 +++ + kernel/trace/trace_probe.h | 2 + + kernel/trace/trace_uprobe.c | 103 +++-- + lib/objpool.c | 112 +---- + .../ftrace/test.d/dynevent/fprobe_args_vfs.tc | 41 ++ + .../ftrace/test.d/kprobe/kprobe_args_vfs.tc | 40 ++ + tools/testing/selftests/ring-buffer/.gitignore | 1 + + tools/testing/selftests/ring-buffer/Makefile | 8 + + tools/testing/selftests/ring-buffer/config | 2 + + tools/testing/selftests/ring-buffer/map_test.c | 294 +++++++++++++ + tools/testing/selftests/user_events/ftrace_test.c | 8 + + 34 files changed, 1525 insertions(+), 249 deletions(-) + create mode 100644 Documentation/trace/ring-buffer-map.rst + create mode 100644 include/uapi/linux/trace_mmap.h + create mode 100644 tools/testing/selftests/ftrace/test.d/dynevent/fprobe_args_vfs.tc + create mode 100644 tools/testing/selftests/ftrace/test.d/kprobe/kprobe_args_vfs.tc + create mode 100644 tools/testing/selftests/ring-buffer/.gitignore + create mode 100644 tools/testing/selftests/ring-buffer/Makefile + create mode 100644 tools/testing/selftests/ring-buffer/config + create mode 100644 tools/testing/selftests/ring-buffer/map_test.c +$ git reset --hard HEAD^ +HEAD is now at 984caff77fd0 Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git +Merging next-20240514 version of ftrace +$ git merge -m next-20240514/ftrace 7604256cecef34a82333d9f78262d3180f4eb525 +Already up to date. +Merging rcu/rcu/next (0e9b1d2b0560 Merge branches 'cmpxchg.2024.05.11a', 'kcsan.2024.05.07a', 'lkmm.2024.05.06a', 'rcu-merge.2024.05.01a' and 'tsc.2024.04.09c' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging arch/x86/kernel/tsc.c +Merge made by the 'ort' strategy. + arch/x86/kernel/tsc.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging kvm/next (4aad0b1893a1 Merge branch 'kvm-queue-snp' into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging arch/arm64/kernel/pi/idreg-override.c +Auto-merging arch/arm64/kvm/Makefile +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/loongarch/include/asm/smp.h +Auto-merging arch/loongarch/kernel/irq.c +CONFLICT (content): Merge conflict in arch/loongarch/kernel/irq.c +Auto-merging arch/powerpc/kvm/book3s.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/riscv/include/asm/sbi.h +Auto-merging arch/x86/include/asm/sev.h +Auto-merging arch/x86/kernel/fpu/xstate.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/vmx/vmx.h +Auto-merging drivers/perf/riscv_pmu_sbi.c +Auto-merging include/linux/pagemap.h +Auto-merging include/uapi/linux/kvm.h +Auto-merging mm/ksm.c +Auto-merging mm/memory.c +Auto-merging mm/migrate_device.c +Auto-merging mm/truncate.c +Auto-merging virt/kvm/kvm_main.c +Resolved 'arch/loongarch/kernel/irq.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a9a25a52b6a9] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/coco/sev-guest.rst | 19 + + Documentation/virt/kvm/api.rst | 98 +- + Documentation/virt/kvm/arm/fw-pseudo-registers.rst | 138 ++ + Documentation/virt/kvm/arm/hypercalls.rst | 164 +- + Documentation/virt/kvm/arm/index.rst | 1 + + Documentation/virt/kvm/arm/ptp_kvm.rst | 38 +- + .../virt/kvm/x86/amd-memory-encryption.rst | 169 +- + arch/arm64/include/asm/esr.h | 12 + + arch/arm64/include/asm/kvm_asm.h | 8 +- + arch/arm64/include/asm/kvm_emulate.h | 16 +- + arch/arm64/include/asm/kvm_host.h | 156 +- + arch/arm64/include/asm/kvm_hyp.h | 4 +- + arch/arm64/include/asm/kvm_nested.h | 13 + + arch/arm64/include/asm/kvm_ptrauth.h | 21 + + arch/arm64/include/asm/pgtable-hwdef.h | 1 + + arch/arm64/include/asm/virt.h | 12 +- + arch/arm64/kernel/pi/idreg-override.c | 4 +- + arch/arm64/kvm/Makefile | 1 + + arch/arm64/kvm/arm.c | 211 ++- + arch/arm64/kvm/emulate-nested.c | 66 +- + arch/arm64/kvm/fpsimd.c | 69 +- + arch/arm64/kvm/handle_exit.c | 36 +- + arch/arm64/kvm/hyp/include/hyp/debug-sr.h | 8 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 86 +- + arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 6 + + arch/arm64/kvm/hyp/nvhe/debug-sr.c | 8 +- + arch/arm64/kvm/hyp/nvhe/ffa.c | 1 - + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 27 +- + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 8 +- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 14 +- + arch/arm64/kvm/hyp/nvhe/psci-relay.c | 2 +- + arch/arm64/kvm/hyp/nvhe/setup.c | 4 +- + arch/arm64/kvm/hyp/nvhe/switch.c | 18 +- + arch/arm64/kvm/hyp/nvhe/tlb.c | 115 +- + arch/arm64/kvm/hyp/pgtable.c | 21 +- + arch/arm64/kvm/hyp/vgic-v3-sr.c | 27 +- + arch/arm64/kvm/hyp/vhe/switch.c | 109 +- + arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 4 +- + arch/arm64/kvm/hyp/vhe/tlb.c | 26 +- + arch/arm64/kvm/mmio.c | 12 +- + arch/arm64/kvm/mmu.c | 42 +- + arch/arm64/kvm/nested.c | 8 +- + arch/arm64/kvm/pauth.c | 206 +++ + arch/arm64/kvm/pkvm.c | 2 +- + arch/arm64/kvm/pmu.c | 2 +- + arch/arm64/kvm/reset.c | 1 - + arch/arm64/kvm/sys_regs.c | 69 +- + arch/arm64/kvm/vgic/vgic-debug.c | 82 +- + arch/arm64/kvm/vgic/vgic-init.c | 90 +- + arch/arm64/kvm/vgic/vgic-its.c | 356 ++-- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 2 +- + arch/arm64/kvm/vgic/vgic-v2.c | 9 +- + arch/arm64/kvm/vgic/vgic-v3.c | 23 +- + arch/arm64/kvm/vgic/vgic.c | 17 +- + arch/arm64/kvm/vgic/vgic.h | 8 +- + arch/loongarch/Kconfig | 9 + + arch/loongarch/include/asm/Kbuild | 1 - + arch/loongarch/include/asm/hardirq.h | 6 + + arch/loongarch/include/asm/inst.h | 2 + + arch/loongarch/include/asm/irq.h | 11 +- + arch/loongarch/include/asm/kvm_host.h | 34 +- + arch/loongarch/include/asm/kvm_para.h | 161 ++ + arch/loongarch/include/asm/kvm_vcpu.h | 11 + + arch/loongarch/include/asm/loongarch.h | 12 + + arch/loongarch/include/asm/paravirt.h | 30 + + arch/loongarch/include/asm/paravirt_api_clock.h | 1 + + arch/loongarch/include/asm/smp.h | 22 +- + arch/loongarch/include/uapi/asm/kvm.h | 4 + + arch/loongarch/kernel/Makefile | 1 + + arch/loongarch/kernel/irq.c | 26 +- + arch/loongarch/kernel/paravirt.c | 151 ++ + arch/loongarch/kernel/perf_event.c | 14 +- + arch/loongarch/kernel/smp.c | 52 +- + arch/loongarch/kernel/time.c | 12 +- + arch/loongarch/kvm/exit.c | 151 +- + arch/loongarch/kvm/mmu.c | 32 - + arch/loongarch/kvm/trace.h | 20 +- + arch/loongarch/kvm/vcpu.c | 105 +- + arch/loongarch/kvm/vm.c | 11 + + arch/mips/kvm/mmu.c | 30 - + arch/powerpc/include/asm/kvm_ppc.h | 1 - + arch/powerpc/kvm/book3s.c | 5 - + arch/powerpc/kvm/book3s.h | 1 - + arch/powerpc/kvm/book3s_64_mmu_hv.c | 12 - + arch/powerpc/kvm/book3s_hv.c | 1 - + arch/powerpc/kvm/book3s_pr.c | 7 - + arch/powerpc/kvm/e500_mmu_host.c | 6 - + arch/riscv/include/asm/csr.h | 5 +- + arch/riscv/include/asm/kvm_host.h | 21 +- + arch/riscv/include/asm/kvm_vcpu_pmu.h | 16 +- + arch/riscv/include/asm/sbi.h | 38 +- + arch/riscv/include/uapi/asm/kvm.h | 1 + + arch/riscv/kernel/paravirt.c | 6 +- + arch/riscv/kvm/aia.c | 5 + + arch/riscv/kvm/main.c | 18 +- + arch/riscv/kvm/mmu.c | 20 - + arch/riscv/kvm/vcpu.c | 85 +- + arch/riscv/kvm/vcpu_exit.c | 4 + + arch/riscv/kvm/vcpu_onereg.c | 6 + + arch/riscv/kvm/vcpu_pmu.c | 260 ++- + arch/riscv/kvm/vcpu_sbi.c | 7 +- + arch/riscv/kvm/vcpu_sbi_hsm.c | 42 +- + arch/riscv/kvm/vcpu_sbi_pmu.c | 17 +- + arch/riscv/kvm/vcpu_sbi_sta.c | 4 +- + arch/riscv/kvm/vm.c | 1 + + arch/x86/include/asm/fpu/api.h | 3 + + arch/x86/include/asm/kvm-x86-ops.h | 4 + + arch/x86/include/asm/kvm_host.h | 68 +- + arch/x86/include/asm/sev-common.h | 33 +- + arch/x86/include/asm/sev.h | 3 + + arch/x86/include/asm/svm.h | 9 +- + arch/x86/include/asm/vmx.h | 13 + + arch/x86/include/uapi/asm/kvm.h | 70 +- + arch/x86/kernel/fpu/xstate.c | 1 + + arch/x86/kernel/fpu/xstate.h | 2 - + arch/x86/kvm/Kconfig | 16 + + arch/x86/kvm/Makefile | 9 +- + arch/x86/kvm/cpuid.c | 43 +- + arch/x86/kvm/kvm_emulate.h | 1 + + arch/x86/kvm/mmu.h | 9 +- + arch/x86/kvm/mmu/mmu.c | 337 ++-- + arch/x86/kvm/mmu/mmu_internal.h | 28 +- + arch/x86/kvm/mmu/mmutrace.h | 2 +- + arch/x86/kvm/mmu/page_track.c | 2 +- + arch/x86/kvm/mmu/paging_tmpl.h | 28 +- + arch/x86/kvm/mmu/spte.c | 40 +- + arch/x86/kvm/mmu/spte.h | 26 +- + arch/x86/kvm/mmu/tdp_mmu.c | 139 +- + arch/x86/kvm/mmu/tdp_mmu.h | 1 - + arch/x86/kvm/svm/sev.c | 1875 +++++++++++++++++++- + arch/x86/kvm/svm/svm.c | 71 +- + arch/x86/kvm/svm/svm.h | 108 +- + arch/x86/kvm/trace.h | 35 +- + arch/x86/kvm/vmx/main.c | 166 ++ + arch/x86/kvm/vmx/nested.c | 30 +- + arch/x86/kvm/vmx/vmcs.h | 5 + + arch/x86/kvm/vmx/vmx.c | 440 ++--- + arch/x86/kvm/vmx/vmx.h | 6 +- + arch/x86/kvm/vmx/x86_ops.h | 124 ++ + arch/x86/kvm/x86.c | 292 ++- + arch/x86/kvm/x86.h | 2 + + drivers/crypto/ccp/sev-dev.c | 36 + + drivers/perf/riscv_pmu.c | 3 +- + drivers/perf/riscv_pmu_sbi.c | 316 +++- + include/kvm/arm_vgic.h | 16 +- + include/linux/kvm_host.h | 40 +- + include/linux/kvm_types.h | 1 + + include/linux/mmu_notifier.h | 44 - + include/linux/pagemap.h | 1 + + include/linux/perf/riscv_pmu.h | 8 + + include/linux/psp-sev.h | 4 +- + include/trace/events/kvm.h | 15 - + include/uapi/linux/kvm.h | 23 + + include/uapi/linux/psp-sev.h | 27 + + include/uapi/linux/sev-guest.h | 9 + + kernel/events/uprobes.c | 6 +- + mm/ksm.c | 4 +- + mm/memory.c | 7 +- + mm/migrate_device.c | 8 +- + mm/mmu_notifier.c | 17 - + mm/truncate.c | 3 +- + tools/testing/selftests/kvm/Makefile | 9 +- + tools/testing/selftests/kvm/aarch64/arch_timer.c | 11 +- + .../selftests/kvm/aarch64/page_fault_test.c | 5 +- + tools/testing/selftests/kvm/aarch64/psci_test.c | 4 +- + tools/testing/selftests/kvm/aarch64/set_id_regs.c | 123 +- + tools/testing/selftests/kvm/aarch64/vgic_init.c | 1 - + tools/testing/selftests/kvm/aarch64/vgic_irq.c | 15 +- + .../selftests/kvm/aarch64/vgic_lpi_stress.c | 410 +++++ + .../selftests/kvm/aarch64/vpmu_counter_access.c | 6 +- + tools/testing/selftests/kvm/arch_timer.c | 4 +- + tools/testing/selftests/kvm/demand_paging_test.c | 94 +- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 15 +- + tools/testing/selftests/kvm/dirty_log_test.c | 26 +- + tools/testing/selftests/kvm/guest_memfd_test.c | 4 +- + tools/testing/selftests/kvm/guest_print_test.c | 1 + + .../testing/selftests/kvm/hardware_disable_test.c | 3 - + tools/testing/selftests/kvm/include/aarch64/gic.h | 21 +- + .../testing/selftests/kvm/include/aarch64/gic_v3.h | 588 +++++- + .../selftests/kvm/include/aarch64/gic_v3_its.h | 19 + + .../selftests/kvm/include/aarch64/processor.h | 21 +- + .../testing/selftests/kvm/include/aarch64/ucall.h | 2 +- + tools/testing/selftests/kvm/include/aarch64/vgic.h | 5 +- + tools/testing/selftests/kvm/include/kvm_util.h | 1111 +++++++++++- + .../testing/selftests/kvm/include/kvm_util_base.h | 26 +- + .../testing/selftests/kvm/include/kvm_util_types.h | 20 + + tools/testing/selftests/kvm/include/memstress.h | 1 - + .../selftests/kvm/include/riscv/processor.h | 49 +- + tools/testing/selftests/kvm/include/riscv/sbi.h | 141 ++ + tools/testing/selftests/kvm/include/riscv/ucall.h | 1 + + tools/testing/selftests/kvm/include/s390x/ucall.h | 2 +- + tools/testing/selftests/kvm/include/test_util.h | 19 + + .../selftests/kvm/include/userfaultfd_util.h | 19 +- + .../selftests/kvm/include/x86_64/kvm_util_arch.h | 28 + + .../selftests/kvm/include/x86_64/processor.h | 11 +- + tools/testing/selftests/kvm/include/x86_64/sev.h | 19 +- + tools/testing/selftests/kvm/include/x86_64/ucall.h | 2 +- + .../testing/selftests/kvm/kvm_binary_stats_test.c | 2 - + tools/testing/selftests/kvm/kvm_create_max_vcpus.c | 2 - + tools/testing/selftests/kvm/kvm_page_table_test.c | 4 +- + tools/testing/selftests/kvm/lib/aarch64/gic.c | 18 +- + .../selftests/kvm/lib/aarch64/gic_private.h | 4 +- + tools/testing/selftests/kvm/lib/aarch64/gic_v3.c | 99 +- + .../testing/selftests/kvm/lib/aarch64/gic_v3_its.c | 248 +++ + .../testing/selftests/kvm/lib/aarch64/processor.c | 2 + + tools/testing/selftests/kvm/lib/aarch64/vgic.c | 38 +- + tools/testing/selftests/kvm/lib/assert.c | 3 - + tools/testing/selftests/kvm/lib/kvm_util.c | 21 +- + tools/testing/selftests/kvm/lib/memstress.c | 13 +- + tools/testing/selftests/kvm/lib/riscv/processor.c | 13 + + tools/testing/selftests/kvm/lib/test_util.c | 2 - + tools/testing/selftests/kvm/lib/ucall_common.c | 5 +- + tools/testing/selftests/kvm/lib/userfaultfd_util.c | 156 +- + tools/testing/selftests/kvm/lib/x86_64/processor.c | 318 ++-- + tools/testing/selftests/kvm/lib/x86_64/sev.c | 45 +- + .../testing/selftests/kvm/max_guest_memory_test.c | 2 - + .../kvm/memslot_modification_stress_test.c | 3 - + tools/testing/selftests/kvm/riscv/arch_timer.c | 6 +- + tools/testing/selftests/kvm/riscv/ebreak_test.c | 82 + + tools/testing/selftests/kvm/riscv/get-reg-list.c | 4 + + tools/testing/selftests/kvm/riscv/sbi_pmu_test.c | 681 +++++++ + tools/testing/selftests/kvm/rseq_test.c | 48 +- + tools/testing/selftests/kvm/s390x/cmma_test.c | 3 +- + tools/testing/selftests/kvm/s390x/memop.c | 1 + + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 2 - + tools/testing/selftests/kvm/s390x/tprot.c | 1 + + .../testing/selftests/kvm/set_memory_region_test.c | 21 +- + tools/testing/selftests/kvm/steal_time.c | 53 +- + tools/testing/selftests/kvm/x86_64/amx_test.c | 4 - + .../kvm/x86_64/dirty_log_page_splitting_test.c | 1 + + .../kvm/x86_64/exit_on_emulation_failure_test.c | 5 +- + .../selftests/kvm/x86_64/fix_hypercall_test.c | 2 - + tools/testing/selftests/kvm/x86_64/hwcr_msr_test.c | 2 - + tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 2 - + tools/testing/selftests/kvm/x86_64/hyperv_evmcs.c | 3 - + .../testing/selftests/kvm/x86_64/hyperv_features.c | 6 - + tools/testing/selftests/kvm/x86_64/hyperv_ipi.c | 5 - + .../testing/selftests/kvm/x86_64/hyperv_svm_test.c | 1 - + .../selftests/kvm/x86_64/hyperv_tlb_flush.c | 2 - + tools/testing/selftests/kvm/x86_64/kvm_pv_test.c | 3 - + .../selftests/kvm/x86_64/monitor_mwait_test.c | 4 +- + .../selftests/kvm/x86_64/nested_exceptions_test.c | 2 - + .../selftests/kvm/x86_64/nx_huge_pages_test.c | 3 - + .../selftests/kvm/x86_64/nx_huge_pages_test.sh | 13 +- + .../selftests/kvm/x86_64/platform_info_test.c | 61 +- + .../selftests/kvm/x86_64/pmu_counters_test.c | 8 - + .../selftests/kvm/x86_64/pmu_event_filter_test.c | 9 - + .../kvm/x86_64/private_mem_conversions_test.c | 1 - + .../testing/selftests/kvm/x86_64/set_boot_cpu_id.c | 1 - + .../testing/selftests/kvm/x86_64/set_sregs_test.c | 1 - + .../testing/selftests/kvm/x86_64/sev_init2_tests.c | 152 ++ + .../testing/selftests/kvm/x86_64/sev_smoke_test.c | 96 +- + .../kvm/x86_64/smaller_maxphyaddr_emulation_test.c | 6 - + tools/testing/selftests/kvm/x86_64/smm_test.c | 1 - + tools/testing/selftests/kvm/x86_64/state_test.c | 1 - + .../selftests/kvm/x86_64/svm_int_ctl_test.c | 3 - + .../kvm/x86_64/svm_nested_shutdown_test.c | 5 +- + .../kvm/x86_64/svm_nested_soft_inject_test.c | 5 +- + .../testing/selftests/kvm/x86_64/sync_regs_test.c | 2 - + .../selftests/kvm/x86_64/ucna_injection_test.c | 7 - + .../selftests/kvm/x86_64/userspace_msr_exit_test.c | 15 +- + .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 3 - + .../vmx_exception_with_invalid_guest_state.c | 3 - + .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 4 - + .../kvm/x86_64/vmx_preemption_timer_test.c | 1 - + .../testing/selftests/kvm/x86_64/xapic_ipi_test.c | 4 - + .../selftests/kvm/x86_64/xapic_state_test.c | 1 - + .../testing/selftests/kvm/x86_64/xcr0_cpuid_test.c | 3 - + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 59 +- + tools/testing/selftests/kvm/x86_64/xss_msr_test.c | 2 - + virt/kvm/Kconfig | 8 + + virt/kvm/guest_memfd.c | 167 +- + virt/kvm/kvm_main.c | 109 +- + virt/kvm/vfio.c | 2 + + 274 files changed, 11204 insertions(+), 3127 deletions(-) + create mode 100644 Documentation/virt/kvm/arm/fw-pseudo-registers.rst + create mode 100644 arch/arm64/kvm/pauth.c + create mode 100644 arch/loongarch/include/asm/kvm_para.h + create mode 100644 arch/loongarch/include/asm/paravirt.h + create mode 100644 arch/loongarch/include/asm/paravirt_api_clock.h + create mode 100644 arch/loongarch/kernel/paravirt.c + create mode 100644 arch/x86/kvm/vmx/main.c + create mode 100644 arch/x86/kvm/vmx/x86_ops.h + create mode 100644 tools/testing/selftests/kvm/aarch64/vgic_lpi_stress.c + create mode 100644 tools/testing/selftests/kvm/include/aarch64/gic_v3_its.h + create mode 100644 tools/testing/selftests/kvm/include/kvm_util_types.h + create mode 100644 tools/testing/selftests/kvm/include/riscv/sbi.h + create mode 100644 tools/testing/selftests/kvm/lib/aarch64/gic_v3_its.c + create mode 100644 tools/testing/selftests/kvm/riscv/ebreak_test.c + create mode 100644 tools/testing/selftests/kvm/riscv/sbi_pmu_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/sev_init2_tests.c +$ git am -3 ../patches/0001-fixup-for-KVM-VMX-Move-posted-interrupt-descriptor-o.patch +Applying: fixup for "KVM: VMX: Move posted interrupt descriptor out of VMX code" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/kvm/vmx/main.c +$ git add -A . +$ git commit -v -a --amend +[master df758c986b65] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git + Date: Wed May 15 15:28:56 2024 +1000 +Merging kvm-arm/next (eaa46a28d596 Merge branch kvm-arm64/mpidr-reset into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (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 (b52e8cd3f835 KVM: PPC: Book3S HV nestedv2: Fix an error handling path in gs_msg_ops_kvmhv_nestedv2_config_fill_info()) +$ git merge -m Merge branch 'topic/ppc-kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (5ef2f3d4e747 KVM: riscv: selftests: Add commandline option for SBI PMU test) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Already up to date. +Merging kvm-x86/next (d91a9cc16417 Merge branches 'fixes', 'generic', 'misc', 'mmu', 'selftests', 'selftests_utils' and 'vmx') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Merge made by the 'ort' strategy. +Merging xen-tip/linux-next (d4c16b4755de xen/xenbus: Use *-y instead of *-objs in Makefile) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging arch/x86/xen/enlighten.c +Merge made by the 'ort' strategy. + arch/x86/xen/enlighten.c | 33 +++++++++++++++++++++++++++++++++ + arch/x86/xen/p2m.c | 11 +++++------ + drivers/xen/pci.c | 12 ++++++++++++ + drivers/xen/xen-pciback/pci_stub.c | 18 +++++++++++++++--- + drivers/xen/xenbus/Makefile | 18 ++++++++---------- + include/xen/interface/physdev.h | 7 +++++++ + include/xen/pci.h | 6 ++++++ + 7 files changed, 86 insertions(+), 19 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 (24283babc61f Merge branch 'for-6.9-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 54 ++++- + include/trace/events/workqueue.h | 4 +- + kernel/workqueue.c | 467 +++++++++++++++++++++++---------------- + tools/workqueue/wq_monitor.py | 9 +- + 4 files changed, 334 insertions(+), 200 deletions(-) +Merging drivers-x86/for-next (d41393f6c605 platform/x86: Add new MeeGoPad ANX7428 Type-C Cross Switch driver) +$ 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 +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/platform/x86/amd/pmf/core.c +Auto-merging drivers/platform/x86/asus-laptop.c +Auto-merging drivers/platform/x86/classmate-laptop.c +Auto-merging drivers/platform/x86/intel/speed_select_if/isst_if_common.c +Auto-merging drivers/platform/x86/intel/uncore-frequency/uncore-frequency-tpmi.c +Auto-merging drivers/platform/x86/intel/vbtn.c +Auto-merging drivers/platform/x86/toshiba_acpi.c +Auto-merging drivers/platform/x86/uv_sysfs.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 90c76f096a3c] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/debugfs-msi-wmi-platform | 14 + + Documentation/ABI/testing/sysfs-platform-asus-wmi | 26 + + .../bindings/platform/acer,aspire1-ec.yaml | 60 ++ + Documentation/wmi/devices/msi-wmi-platform.rst | 194 +++++ + Documentation/wmi/driver-development-guide.rst | 178 +++++ + Documentation/wmi/index.rst | 1 + + MAINTAINERS | 31 +- + arch/arm64/boot/dts/qcom/sc7180-acer-aspire1.dts | 40 +- + drivers/acpi/platform_profile.c | 39 + + drivers/platform/Kconfig | 2 + + drivers/platform/Makefile | 1 + + drivers/platform/arm64/Kconfig | 35 + + drivers/platform/arm64/Makefile | 8 + + drivers/platform/arm64/acer-aspire1-ec.c | 562 +++++++++++++ + drivers/platform/surface/aggregator/core.c | 42 +- + .../platform/surface/surface_aggregator_registry.c | 43 +- + .../platform/surface/surface_platform_profile.c | 88 ++- + drivers/platform/x86/Kconfig | 58 ++ + drivers/platform/x86/Makefile | 9 + + drivers/platform/x86/amd/hsmp.c | 2 +- + drivers/platform/x86/amd/pmc/Kconfig | 15 + + drivers/platform/x86/amd/pmc/Makefile | 1 + + drivers/platform/x86/amd/pmc/mp2_stb.c | 280 +++++++ + drivers/platform/x86/amd/pmc/pmc.c | 5 + + drivers/platform/x86/amd/pmc/pmc.h | 15 + + drivers/platform/x86/amd/pmf/core.c | 1 + + drivers/platform/x86/asus-laptop.c | 44 +- + drivers/platform/x86/asus-wmi.c | 417 +++++++--- + drivers/platform/x86/classmate-laptop.c | 4 +- + drivers/platform/x86/dell/Kconfig | 15 + + drivers/platform/x86/dell/Makefile | 1 + + drivers/platform/x86/dell/dell-uart-backlight.c | 398 ++++++++++ + drivers/platform/x86/fujitsu-laptop.c | 18 +- + drivers/platform/x86/hp/hp-wmi.c | 12 +- + drivers/platform/x86/huawei-wmi.c | 8 +- + drivers/platform/x86/ideapad-laptop.c | 140 +++- + drivers/platform/x86/inspur_platform_profile.c | 1 + + drivers/platform/x86/intel/ifs/load.c | 2 + + drivers/platform/x86/intel/ifs/runtest.c | 27 +- + drivers/platform/x86/intel/pmc/arl.c | 2 +- + drivers/platform/x86/intel/pmc/core.c | 38 + + drivers/platform/x86/intel/pmc/core.h | 9 + + drivers/platform/x86/intel/pmc/lnl.c | 477 ++++++----- + drivers/platform/x86/intel/sdsi.c | 118 ++- + .../x86/intel/speed_select_if/isst_if_common.c | 1 + + .../x86/intel/speed_select_if/isst_tpmi_core.c | 387 +++++++-- + drivers/platform/x86/intel/tpmi.c | 39 +- + .../intel/uncore-frequency/uncore-frequency-tpmi.c | 7 + + drivers/platform/x86/intel/vbtn.c | 3 +- + drivers/platform/x86/lenovo-wmi-camera.c | 127 +++ + .../x86/lenovo-yoga-tab2-pro-1380-fastcharger.c | 338 ++++++++ + drivers/platform/x86/meegopad_anx7428.c | 148 ++++ + drivers/platform/x86/msi-laptop.c | 20 +- + drivers/platform/x86/msi-wmi-platform.c | 428 ++++++++++ + drivers/platform/x86/p2sb.c | 44 +- + drivers/platform/x86/quickstart.c | 246 ++++++ + drivers/platform/x86/samsung-laptop.c | 10 +- + drivers/platform/x86/think-lmi.c | 13 +- + drivers/platform/x86/thinkpad_acpi.c | 875 +++++++++------------ + drivers/platform/x86/toshiba_acpi.c | 36 +- + drivers/platform/x86/uv_sysfs.c | 20 +- + drivers/platform/x86/wmi.c | 60 +- + drivers/platform/x86/x86-android-tablets/core.c | 16 +- + drivers/platform/x86/x86-android-tablets/dmi.c | 18 + + drivers/platform/x86/x86-android-tablets/lenovo.c | 224 +++++- + drivers/platform/x86/x86-android-tablets/other.c | 133 +++- + .../x86/x86-android-tablets/x86-android-tablets.h | 3 +- + drivers/platform/x86/xiaomi-wmi.c | 30 +- + include/dt-bindings/leds/common.h | 1 + + include/linux/devm-helpers.h | 4 +- + include/linux/intel_tpmi.h | 12 +- + include/linux/platform_data/x86/asus-wmi.h | 6 + + include/linux/platform_profile.h | 1 + + include/trace/events/intel_ifs.h | 2 +- + .../x86/dell-uart-backlight-emulator/.gitignore | 1 + + .../arch/x86/dell-uart-backlight-emulator/Makefile | 19 + + tools/arch/x86/dell-uart-backlight-emulator/README | 46 ++ + .../dell-uart-backlight-emulator.c | 163 ++++ + tools/arch/x86/intel_sdsi/intel_sdsi.c | 108 ++- + tools/power/x86/intel-speed-select/isst-config.c | 25 +- + .../power/x86/intel-speed-select/isst-core-mbox.c | 3 +- + .../power/x86/intel-speed-select/isst-core-tpmi.c | 10 +- + tools/power/x86/intel-speed-select/isst-core.c | 1 + + tools/power/x86/intel-speed-select/isst-display.c | 30 +- + tools/power/x86/intel-speed-select/isst.h | 2 +- + 85 files changed, 5940 insertions(+), 1201 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-msi-wmi-platform + create mode 100644 Documentation/devicetree/bindings/platform/acer,aspire1-ec.yaml + create mode 100644 Documentation/wmi/devices/msi-wmi-platform.rst + create mode 100644 Documentation/wmi/driver-development-guide.rst + create mode 100644 drivers/platform/arm64/Kconfig + create mode 100644 drivers/platform/arm64/Makefile + create mode 100644 drivers/platform/arm64/acer-aspire1-ec.c + create mode 100644 drivers/platform/x86/amd/pmc/mp2_stb.c + create mode 100644 drivers/platform/x86/dell/dell-uart-backlight.c + create mode 100644 drivers/platform/x86/lenovo-wmi-camera.c + create mode 100644 drivers/platform/x86/lenovo-yoga-tab2-pro-1380-fastcharger.c + create mode 100644 drivers/platform/x86/meegopad_anx7428.c + create mode 100644 drivers/platform/x86/msi-wmi-platform.c + create mode 100644 drivers/platform/x86/quickstart.c + create mode 100644 tools/arch/x86/dell-uart-backlight-emulator/.gitignore + create mode 100644 tools/arch/x86/dell-uart-backlight-emulator/Makefile + create mode 100644 tools/arch/x86/dell-uart-backlight-emulator/README + create mode 100644 tools/arch/x86/dell-uart-backlight-emulator/dell-uart-backlight-emulator.c +Merging chrome-platform/for-next (2fbe479c0024 platform/chrome: cros_ec: Handle events during suspend after resume completion) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Already up to date. +Merging chrome-platform-firmware/for-firmware-next (7f20f21c22aa firmware: google: cbmem: drop driver owner initialization) +$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (c076486b6a28 HSI: omap_ssi_port: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/controllers/omap_ssi_core.c | 6 ++---- + drivers/hsi/controllers/omap_ssi_port.c | 6 ++---- + 2 files changed, 4 insertions(+), 8 deletions(-) +Merging leds-lj/for-leds-next (f2994f5341e0 leds: mt6370: Remove unused field 'reg_cfgs' from 'struct mt6370_priv') +$ 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 include/dt-bindings/leds/common.h +Auto-merging sound/core/control_led.c +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-class-led-trigger-pattern | 10 ++ + .../devicetree/bindings/leds/leds-qcom-lpg.yaml | 8 +- + .../devicetree/bindings/leds/nxp,pca963x.yaml | 140 +++++++++++++++++++++ + Documentation/devicetree/bindings/leds/pca963x.txt | 52 -------- + arch/mips/configs/ci20_defconfig | 1 - + drivers/leds/flash/leds-aat1290.c | 2 - + drivers/leds/flash/leds-mt6360.c | 12 +- + drivers/leds/led-triggers.c | 6 +- + drivers/leds/leds-an30259a.c | 14 +-- + drivers/leds/leds-apu.c | 3 +- + drivers/leds/leds-aw200xx.c | 32 +++-- + drivers/leds/leds-aw2013.c | 25 ++-- + drivers/leds/leds-lm3532.c | 29 +++-- + drivers/leds/leds-lp3952.c | 21 ++-- + drivers/leds/leds-lp50xx.c | 5 - + drivers/leds/leds-mlxreg.c | 14 +-- + drivers/leds/leds-nic78bx.c | 23 ++-- + drivers/leds/leds-pwm.c | 8 +- + drivers/leds/leds-sun50i-a100.c | 14 +-- + drivers/leds/rgb/leds-mt6370-rgb.c | 1 - + drivers/leds/rgb/leds-qcom-lpg.c | 8 ++ + drivers/leds/simple/simatic-ipc-leds-gpio-core.c | 1 + + drivers/leds/simple/simatic-ipc-leds-gpio-f7188x.c | 52 +++++++- + drivers/leds/trigger/Kconfig | 7 -- + drivers/leds/trigger/Makefile | 1 - + drivers/leds/trigger/ledtrig-audio.c | 67 ---------- + drivers/leds/trigger/ledtrig-netdev.c | 2 - + drivers/leds/trigger/ledtrig-pattern.c | 126 +++++++++++++++---- + include/dt-bindings/leds/common.h | 3 + + include/linux/leds.h | 29 ++--- + include/linux/mutex.h | 27 ++++ + kernel/locking/mutex-debug.c | 12 ++ + sound/core/Kconfig | 1 - + sound/core/control_led.c | 20 ++- + 34 files changed, 501 insertions(+), 275 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/nxp,pca963x.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/pca963x.txt + delete mode 100644 drivers/leds/trigger/ledtrig-audio.c +Merging ipmi/for-next (999dff3c1393 ipmi: kcs_bmc_npcm7xx: Convert to platform remove callback returning void) +$ 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/Makefile | 11 ++++------- + drivers/char/ipmi/bt-bmc.c | 5 ++--- + drivers/char/ipmi/ipmi_msghandler.c | 29 ++++++++++++++--------------- + drivers/char/ipmi/ipmi_powernv.c | 6 ++---- + drivers/char/ipmi/ipmi_si_intf.c | 3 ++- + drivers/char/ipmi/ipmi_si_pci.c | 3 +++ + drivers/char/ipmi/ipmi_si_platform.c | 6 ++---- + drivers/char/ipmi/ipmi_ssif.c | 5 ++--- + drivers/char/ipmi/kcs_bmc_aspeed.c | 6 ++---- + drivers/char/ipmi/kcs_bmc_npcm7xx.c | 6 ++---- + 10 files changed, 35 insertions(+), 45 deletions(-) +Merging driver-core/driver-core-next (880a746fa3ea device property: Fix a typo in the description of device_get_child_node_count()) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging drivers/firmware/dmi_scan.c +Auto-merging drivers/gpu/drm/i915/gvt/firmware.c +Auto-merging drivers/perf/alibaba_uncore_drw_pmu.c +Auto-merging drivers/perf/arm-cci.c +Auto-merging drivers/perf/arm-ccn.c +Auto-merging drivers/perf/arm_cspmu/arm_cspmu.c +Auto-merging drivers/perf/arm_dsu_pmu.c +Auto-merging drivers/perf/cxl_pmu.c +Auto-merging drivers/perf/hisilicon/hisi_pcie_pmu.c +Auto-merging drivers/perf/hisilicon/hisi_uncore_pmu.c +Auto-merging drivers/perf/hisilicon/hns3_pmu.c +Auto-merging drivers/perf/qcom_l3_pmu.c +Auto-merging drivers/perf/xgene_pmu.c +Auto-merging drivers/platform/x86/asus-wmi.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Auto-merging drivers/platform/x86/toshiba_acpi.c +Auto-merging drivers/thermal/intel/int340x_thermal/int3400_thermal.c +Auto-merging include/linux/device.h +Merge made by the 'ort' strategy. + arch/powerpc/perf/hv-24x7.c | 10 ---- + arch/powerpc/platforms/powernv/opal.c | 10 +--- + arch/x86/events/intel/core.c | 13 ++--- + drivers/acpi/bgrt.c | 9 +--- + drivers/base/base.h | 9 ++-- + drivers/base/bus.c | 9 +++- + drivers/base/core.c | 17 +++--- + drivers/base/module.c | 42 +++++++++++---- + drivers/base/property.c | 2 +- + drivers/firmware/dmi_scan.c | 12 +---- + drivers/firmware/efi/rci2-table.c | 10 +--- + drivers/gpu/drm/i915/gvt/firmware.c | 26 +++------ + drivers/hwmon/i5k_amb.c | 15 ++---- + drivers/hwmon/ibmpex.c | 14 ++--- + drivers/infiniband/hw/qib/qib.h | 1 - + drivers/infiniband/hw/qib/qib_driver.c | 6 --- + drivers/infiniband/hw/qib/qib_sysfs.c | 10 +--- + drivers/perf/alibaba_uncore_drw_pmu.c | 12 +---- + drivers/perf/arm-cci.c | 12 +---- + drivers/perf/arm-ccn.c | 11 +--- + drivers/perf/arm_cspmu/arm_cspmu.c | 10 ---- + drivers/perf/arm_cspmu/arm_cspmu.h | 7 +-- + drivers/perf/arm_dsu_pmu.c | 11 +--- + drivers/perf/cxl_pmu.c | 13 +---- + drivers/perf/hisilicon/hisi_pcie_pmu.c | 13 +---- + drivers/perf/hisilicon/hisi_uncore_pmu.c | 14 ----- + drivers/perf/hisilicon/hisi_uncore_pmu.h | 4 +- + drivers/perf/hisilicon/hns3_pmu.c | 12 +---- + drivers/perf/qcom_l3_pmu.c | 11 +--- + drivers/perf/xgene_pmu.c | 11 +--- + drivers/platform/x86/asus-wmi.c | 62 ++++++---------------- + drivers/platform/x86/thinkpad_acpi.c | 10 +--- + drivers/platform/x86/toshiba_acpi.c | 9 +--- + drivers/scsi/bfa/bfad_attr.c | 28 +++------- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 11 +--- + drivers/scsi/mvsas/mv_init.c | 10 +--- + drivers/scsi/qla2xxx/qla_attr.c | 11 +--- + drivers/scsi/smartpqi/smartpqi_init.c | 11 ++-- + .../intel/int340x_thermal/int3400_thermal.c | 9 +--- + fs/kernfs/mount.c | 2 +- + fs/sysfs/file.c | 27 ++++++++++ + include/linux/device.h | 26 +++++---- + include/linux/sysfs.h | 15 ++++++ + init/initramfs.c | 10 +--- + kernel/module/sysfs.c | 13 +---- + 45 files changed, 188 insertions(+), 422 deletions(-) +Merging usb/usb-next (51474ab44abf drm/bridge: aux-hpd-bridge: correct devm_drm_dp_hpd_bridge_add() stub) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/devicetree/bindings/usb/dwc2.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/renesas/r9a07g043.dtsi +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/soc/qcom/pmic_glink.c +Merge made by the 'ort' strategy. + ...-usb-hub => sysfs-bus-platform-onboard-usb-dev} | 3 +- + .../devicetree/bindings/sound/xmos,xvf3500.yaml | 63 +++ + .../bindings/usb/chipidea,usb2-common.yaml | 200 ++++++++ + .../devicetree/bindings/usb/chipidea,usb2-imx.yaml | 287 +++++++++++ + .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 360 +------------- + .../devicetree/bindings/usb/cypress,hx3.yaml | 1 - + Documentation/devicetree/bindings/usb/dwc2.yaml | 1 + + .../devicetree/bindings/usb/microchip,usb2514.yaml | 63 +++ + .../devicetree/bindings/usb/qcom,dwc3.yaml | 41 +- + .../devicetree/bindings/usb/qcom,pmic-typec.yaml | 35 +- + .../devicetree/bindings/usb/renesas,usbhs.yaml | 6 +- + .../bindings/usb/samsung,exynos-dwc3.yaml | 18 + + .../devicetree/bindings/usb/snps,dwc3.yaml | 13 +- + Documentation/devicetree/bindings/usb/usb-uhci.txt | 18 - + .../devicetree/bindings/usb/usb-uhci.yaml | 75 +++ + MAINTAINERS | 6 +- + arch/arm/configs/multi_v7_defconfig | 2 +- + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r9a07g044.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r9a07g054.dtsi | 2 +- + arch/arm64/configs/defconfig | 2 +- + drivers/gpu/drm/ci/arm64.config | 4 +- + drivers/soc/qcom/pmic_glink.c | 5 - + drivers/thunderbolt/debugfs.c | 2 +- + drivers/thunderbolt/icm.c | 1 + + drivers/thunderbolt/retimer.c | 12 +- + drivers/thunderbolt/tb.c | 9 +- + drivers/thunderbolt/tb_msgs.h | 6 - + drivers/thunderbolt/trace.h | 13 +- + drivers/thunderbolt/tunnel.c | 39 +- + drivers/thunderbolt/usb4.c | 22 +- + drivers/thunderbolt/xdomain.c | 2 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 2 +- + drivers/usb/chipidea/ci_hdrc_npcm.c | 6 +- + drivers/usb/chipidea/core.c | 8 +- + drivers/usb/chipidea/ulpi.c | 5 - + drivers/usb/core/Makefile | 4 +- + drivers/usb/core/config.c | 8 +- + drivers/usb/core/hcd.c | 4 +- + drivers/usb/core/hub.c | 17 +- + drivers/usb/core/hub.h | 2 +- + drivers/usb/dwc2/core.c | 42 ++ + drivers/usb/dwc2/core.h | 8 + + drivers/usb/dwc2/core_intr.c | 26 +- + drivers/usb/dwc2/debugfs.c | 1 + + drivers/usb/dwc2/gadget.c | 28 +- + drivers/usb/dwc2/hcd.c | 10 + + drivers/usb/dwc2/hcd_queue.c | 52 +- + drivers/usb/dwc2/hw.h | 14 + + drivers/usb/dwc2/params.c | 43 ++ + drivers/usb/dwc3/core.c | 320 +++++++++--- + drivers/usb/dwc3/core.h | 20 +- + drivers/usb/dwc3/drd.c | 15 +- + drivers/usb/dwc3/dwc3-exynos.c | 22 +- + drivers/usb/dwc3/dwc3-pci.c | 8 +- + drivers/usb/dwc3/dwc3-qcom.c | 265 ++++++---- + drivers/usb/dwc3/gadget.c | 4 +- + drivers/usb/fotg210/Makefile | 10 +- + drivers/usb/fotg210/fotg210-core.c | 1 + + drivers/usb/gadget/function/f_fs.c | 20 +- + drivers/usb/gadget/function/f_hid.c | 6 +- + drivers/usb/gadget/function/f_printer.c | 6 +- + drivers/usb/gadget/function/rndis.c | 4 +- + drivers/usb/gadget/function/u_audio.c | 32 +- + drivers/usb/gadget/function/u_ether.c | 2 +- + drivers/usb/gadget/function/uvc_configfs.c | 14 +- + drivers/usb/gadget/function/uvc_v4l2.c | 24 +- + drivers/usb/gadget/udc/core.c | 9 + + drivers/usb/gadget/udc/dummy_hcd.c | 37 +- + drivers/usb/gadget/udc/mv_u3d_core.c | 4 +- + drivers/usb/gadget/udc/omap_udc.c | 10 +- + drivers/usb/host/ehci-dbg.c | 10 +- + drivers/usb/host/ehci-exynos.c | 27 +- + drivers/usb/host/ehci-q.c | 20 +- + drivers/usb/host/ehci.h | 8 +- + drivers/usb/host/ohci-exynos.c | 27 +- + drivers/usb/host/xhci-dbgcap.c | 2 +- + drivers/usb/host/xhci-mem.c | 48 +- + drivers/usb/host/xhci-pci.c | 49 +- + drivers/usb/host/xhci-rcar.c | 6 +- + drivers/usb/host/xhci-ring.c | 138 +++--- + drivers/usb/host/xhci.c | 38 +- + drivers/usb/host/xhci.h | 28 +- + drivers/usb/misc/Kconfig | 16 +- + drivers/usb/misc/Makefile | 2 +- + drivers/usb/misc/onboard_usb_dev.c | 550 +++++++++++++++++++++ + .../misc/{onboard_usb_hub.h => onboard_usb_dev.h} | 62 ++- + ...ard_usb_hub_pdevs.c => onboard_usb_dev_pdevs.c} | 47 +- + drivers/usb/misc/onboard_usb_hub.c | 507 ------------------- + drivers/usb/misc/uss720.c | 42 +- + drivers/usb/musb/musb_gadget.c | 9 - + drivers/usb/phy/phy-fsl-usb.c | 1 - + drivers/usb/phy/phy-generic.c | 1 + + drivers/usb/renesas_usbhs/common.c | 41 +- + drivers/usb/renesas_usbhs/rza.h | 1 + + drivers/usb/renesas_usbhs/rza2.c | 13 + + drivers/usb/typec/altmodes/displayport.c | 1 - + drivers/usb/typec/altmodes/nvidia.c | 1 - + drivers/usb/typec/mux/Kconfig | 2 +- + drivers/usb/typec/mux/gpio-sbu-mux.c | 8 +- + drivers/usb/typec/mux/ptn36502.c | 44 +- + drivers/usb/typec/stusb160x.c | 2 +- + drivers/usb/typec/tcpm/qcom/qcom_pmic_typec.c | 10 +- + drivers/usb/typec/tipd/core.c | 56 ++- + drivers/usb/typec/tipd/tps6598x.h | 11 + + drivers/usb/typec/ucsi/displayport.c | 4 - + drivers/usb/typec/ucsi/ucsi.c | 225 +++++---- + drivers/usb/typec/ucsi/ucsi.h | 8 +- + drivers/usb/typec/ucsi/ucsi_acpi.c | 56 +-- + drivers/usb/typec/ucsi/ucsi_glink.c | 92 ++-- + drivers/usb/typec/ucsi/ucsi_stm32g0.c | 1 + + include/drm/bridge/aux-bridge.h | 2 +- + include/linux/thunderbolt.h | 1 - + include/linux/usb.h | 7 +- + include/linux/usb/onboard_dev.h | 18 + + include/linux/usb/onboard_hub.h | 18 - + include/linux/usb/renesas_usbhs.h | 5 - + include/linux/usb/tegra_usb_phy.h | 3 +- + 118 files changed, 2755 insertions(+), 1941 deletions(-) + rename Documentation/ABI/testing/{sysfs-bus-platform-onboard-usb-hub => sysfs-bus-platform-onboard-usb-dev} (74%) + create mode 100644 Documentation/devicetree/bindings/sound/xmos,xvf3500.yaml + create mode 100644 Documentation/devicetree/bindings/usb/chipidea,usb2-common.yaml + create mode 100644 Documentation/devicetree/bindings/usb/chipidea,usb2-imx.yaml + create mode 100644 Documentation/devicetree/bindings/usb/microchip,usb2514.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/usb-uhci.txt + create mode 100644 Documentation/devicetree/bindings/usb/usb-uhci.yaml + create mode 100644 drivers/usb/misc/onboard_usb_dev.c + rename drivers/usb/misc/{onboard_usb_hub.h => onboard_usb_dev.h} (56%) + rename drivers/usb/misc/{onboard_usb_hub_pdevs.c => onboard_usb_dev_pdevs.c} (68%) + delete mode 100644 drivers/usb/misc/onboard_usb_hub.c + create mode 100644 include/linux/usb/onboard_dev.h + delete mode 100644 include/linux/usb/onboard_hub.h +Merging thunderbolt/next (a3dc6d82de9b thunderbolt: Correct trace output of firmware connection manager packets) +$ 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 (39cd87c4eb2b Linux 6.9-rc2) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (e21de1455a72 serial: Clear UPF_DEAD before calling tty_port_register_device_attr_serdev()) +$ 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/arm64/boot/dts/xilinx/zynqmp.dtsi +Auto-merging drivers/tty/n_gsm.c +Auto-merging drivers/tty/serial/8250/8250_bcm7271.c +Auto-merging drivers/tty/serial/8250/8250_core.c +Auto-merging drivers/tty/serial/8250/8250_mtk.c +Auto-merging drivers/tty/serial/sc16is7xx.c +Auto-merging include/linux/kfifo.h +CONFLICT (content): Merge conflict in include/linux/kfifo.h +Auto-merging include/linux/printk.h +Auto-merging kernel/printk/printk.c +Auto-merging lib/kfifo.c +CONFLICT (content): Merge conflict in lib/kfifo.c +Resolved 'include/linux/kfifo.h' using previous resolution. +Resolved 'lib/kfifo.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 637c6f62a16d] Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 19 + + Documentation/admin-guide/sysrq.rst | 9 + + .../bindings/serial/actions,owl-uart.txt | 16 - + .../bindings/serial/actions,owl-uart.yaml | 48 + + .../bindings/serial/brcm,bcm2835-aux-uart.txt | 18 - + .../bindings/serial/brcm,bcm2835-aux-uart.yaml | 46 + + .../devicetree/bindings/serial/cdns,uart.yaml | 3 + + .../devicetree/bindings/serial/renesas,scif.yaml | 1 + + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 2 + + drivers/tty/amiserial.c | 8 +- + drivers/tty/hvc/hvc_xen.c | 2 +- + drivers/tty/n_gsm.c | 2 +- + drivers/tty/serial/8250/8250_bcm7271.c | 14 +- + drivers/tty/serial/8250/8250_core.c | 8 +- + drivers/tty/serial/8250/8250_dma.c | 31 +- + drivers/tty/serial/8250/8250_dw.c | 45 +- + drivers/tty/serial/8250/8250_exar.c | 1059 ++++++++++++++++++-- + drivers/tty/serial/8250/8250_mtk.c | 2 +- + drivers/tty/serial/8250/8250_of.c | 37 + + drivers/tty/serial/8250/8250_omap.c | 49 +- + drivers/tty/serial/8250/8250_pci1xxxx.c | 50 +- + drivers/tty/serial/8250/8250_pnp.c | 65 +- + drivers/tty/serial/8250/8250_port.c | 29 +- + drivers/tty/serial/Kconfig | 54 +- + drivers/tty/serial/Makefile | 2 + + drivers/tty/serial/amba-pl011.c | 62 +- + drivers/tty/serial/ar933x_uart.c | 18 +- + drivers/tty/serial/arc_uart.c | 8 +- + drivers/tty/serial/atmel_serial.c | 146 ++- + drivers/tty/serial/clps711x.c | 12 +- + drivers/tty/serial/cpm_uart.c | 20 +- + drivers/tty/serial/digicolor-usart.c | 12 +- + drivers/tty/serial/dz.c | 13 +- + drivers/tty/serial/fsl_linflexuart.c | 17 +- + drivers/tty/serial/fsl_lpuart.c | 45 +- + drivers/tty/serial/icom.c | 25 +- + drivers/tty/serial/imx.c | 63 +- + drivers/tty/serial/ip22zilog.c | 26 +- + drivers/tty/serial/jsm/jsm_cls.c | 31 +- + drivers/tty/serial/jsm/jsm_neo.c | 38 +- + drivers/tty/serial/max3100.c | 340 +++---- + drivers/tty/serial/max310x.c | 37 +- + drivers/tty/serial/men_z135_uart.c | 26 +- + drivers/tty/serial/meson_uart.c | 12 +- + drivers/tty/serial/milbeaut_usio.c | 15 +- + drivers/tty/serial/msm_serial.c | 122 ++- + drivers/tty/serial/mvebu-uart.c | 8 +- + drivers/tty/serial/mxs-auart.c | 23 +- + drivers/tty/serial/omap-serial.c | 1 - + drivers/tty/serial/pch_uart.c | 21 +- + drivers/tty/serial/pic32_uart.c | 17 +- + drivers/tty/serial/pmac_zilog.c | 33 +- + drivers/tty/serial/qcom_geni_serial.c | 34 +- + drivers/tty/serial/rda-uart.c | 17 +- + drivers/tty/serial/samsung_tty.c | 54 +- + drivers/tty/serial/sb1250-duart.c | 13 +- + drivers/tty/serial/sc16is7xx.c | 303 ++---- + drivers/tty/serial/sc16is7xx.h | 41 + + drivers/tty/serial/sc16is7xx_i2c.c | 67 ++ + drivers/tty/serial/sc16is7xx_spi.c | 90 ++ + drivers/tty/serial/sccnxp.c | 16 +- + drivers/tty/serial/serial-tegra.c | 43 +- + drivers/tty/serial/serial_base.h | 30 + + drivers/tty/serial/serial_base_bus.c | 129 +++ + drivers/tty/serial/serial_core.c | 154 +-- + drivers/tty/serial/serial_port.c | 9 +- + drivers/tty/serial/sh-sci.c | 68 +- + drivers/tty/serial/sifive.c | 4 +- + drivers/tty/serial/sprd_serial.c | 20 +- + drivers/tty/serial/st-asc.c | 4 +- + drivers/tty/serial/stm32-usart.c | 52 +- + drivers/tty/serial/sunhv.c | 35 +- + drivers/tty/serial/sunplus-uart.c | 16 +- + drivers/tty/serial/sunsab.c | 30 +- + drivers/tty/serial/sunsu.c | 15 +- + drivers/tty/serial/sunzilog.c | 27 +- + drivers/tty/serial/tegra-tcu.c | 10 +- + drivers/tty/serial/timbuart.c | 17 +- + drivers/tty/serial/uartlite.c | 13 +- + drivers/tty/serial/ucc_uart.c | 20 +- + drivers/tty/serial/xilinx_uartps.c | 35 +- + drivers/tty/serial/zs.c | 13 +- + drivers/tty/sysrq.c | 13 +- + drivers/tty/tty_ldisc.c | 6 + + drivers/tty/vt/conmakehash.c | 15 +- + drivers/tty/vt/vt.c | 10 + + include/linux/kfifo.h | 143 ++- + include/linux/pnp.h | 4 + + include/linux/printk.h | 7 + + include/linux/serial_core.h | 49 +- + include/linux/serial_max3100.h | 48 - + include/linux/tty_driver.h | 8 + + include/uapi/linux/kd.h | 96 +- + kernel/printk/Makefile | 2 +- + kernel/printk/conopt.c | 146 +++ + kernel/printk/console_cmdline.h | 6 + + kernel/printk/printk.c | 100 +- + lib/kfifo.c | 107 +- + 98 files changed, 3141 insertions(+), 1808 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/serial/actions,owl-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/actions,owl-uart.yaml + delete mode 100644 Documentation/devicetree/bindings/serial/brcm,bcm2835-aux-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/brcm,bcm2835-aux-uart.yaml + create mode 100644 drivers/tty/serial/sc16is7xx.h + create mode 100644 drivers/tty/serial/sc16is7xx_i2c.c + create mode 100644 drivers/tty/serial/sc16is7xx_spi.c + delete mode 100644 include/linux/serial_max3100.h + create mode 100644 kernel/printk/conopt.c +Merging char-misc/char-misc-next (979987371739 spmi: pmic-arb: Add multi bus support) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging MAINTAINERS +Auto-merging drivers/base/property.c +Auto-merging drivers/char/mem.c +Auto-merging drivers/hwtracing/coresight/coresight-catu.c +Auto-merging drivers/hwtracing/coresight/coresight-etm4x-core.c +Auto-merging drivers/hwtracing/coresight/coresight-funnel.c +Auto-merging drivers/hwtracing/coresight/coresight-replicator.c +Auto-merging drivers/hwtracing/coresight/coresight-stm.c +Auto-merging drivers/hwtracing/coresight/coresight-tmc-core.c +Auto-merging drivers/hwtracing/coresight/coresight-tpiu.c +Auto-merging drivers/hwtracing/intel_th/core.c +Auto-merging drivers/iio/adc/ad9467.c +Auto-merging drivers/iio/pressure/bmp280-core.c +Auto-merging drivers/misc/vmw_vmci/vmci_guest.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-bus-mhi | 13 + + .../ABI/testing/sysfs-bus-coresight-devices-etm3x | 2 +- + .../ABI/testing/sysfs-bus-coresight-devices-tmc | 2 +- + .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 2 +- + ...ptt => sysfs-bus-event_source-devices-hisi_ptt} | 12 +- + Documentation/ABI/testing/sysfs-bus-iio | 3 +- + Documentation/ABI/testing/sysfs-bus-iio-ad9739a | 19 + + .../bindings/arm/qcom,coresight-tpda.yaml | 34 +- + .../bindings/fpga/xlnx,fpga-selectmap.yaml | 86 ++ + .../devicetree/bindings/iio/accel/adi,adxl345.yaml | 2 + + .../devicetree/bindings/iio/adc/adi,ad7173.yaml | 279 ++++ + .../devicetree/bindings/iio/adc/adi,ad7944.yaml | 213 +++ + .../devicetree/bindings/iio/adc/adi,axi-adc.yaml | 5 + + .../iio/adc/allwinner,sun20i-d1-gpadc.yaml | 9 +- + .../devicetree/bindings/iio/dac/adi,ad9739a.yaml | 95 ++ + .../devicetree/bindings/iio/dac/adi,axi-dac.yaml | 62 + + .../devicetree/bindings/iio/dac/ti,dac5571.yaml | 1 + + .../bindings/iio/health/maxim,max30102.yaml | 12 +- + .../bindings/iio/humidity/ti,hdc3020.yaml | 5 + + .../bindings/iio/imu/invensense,icm42600.yaml | 2 + + .../bindings/iio/imu/invensense,mpu6050.yaml | 17 +- + .../bindings/iio/light/avago,apds9300.yaml | 20 +- + .../bindings/iio/light/avago,apds9960.yaml | 44 - + .../bindings/iio/temperature/adi,ltc2983.yaml | 4 + + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 4 + + .../devicetree/bindings/nvmem/qcom,spmi-sdam.yaml | 2 +- + .../spmi/hisilicon,hisi-spmi-controller.yaml | 17 +- + .../bindings/spmi/qcom,spmi-pmic-arb.yaml | 1 + + .../bindings/spmi/qcom,x1e80100-spmi-pmic-arb.yaml | 136 ++ + Documentation/driver-api/fpga/fpga-bridge.rst | 7 +- + Documentation/driver-api/fpga/fpga-mgr.rst | 34 +- + Documentation/driver-api/fpga/fpga-region.rst | 13 +- + Documentation/iio/ad7944.rst | 156 +++ + Documentation/iio/adis16475.rst | 8 +- + Documentation/iio/index.rst | 1 + + Documentation/trace/hisi-ptt.rst | 4 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 2 + + MAINTAINERS | 60 +- + drivers/accessibility/speakup/devsynth.c | 57 +- + drivers/accessibility/speakup/speakup.h | 2 + + drivers/accessibility/speakup/synth.c | 92 +- + drivers/acpi/arm64/amba.c | 8 - + drivers/android/binder.c | 2 +- + drivers/android/binder_internal.h | 2 +- + drivers/base/property.c | 14 - + drivers/bus/mhi/host/init.c | 41 +- + drivers/bus/mhi/host/main.c | 16 + + drivers/bus/mhi/host/pci_generic.c | 45 + + drivers/cdx/controller/cdx_controller.c | 6 +- + drivers/char/mem.c | 6 +- + drivers/char/powernv-op-panel.c | 5 +- + drivers/char/ppdev.c | 15 +- + drivers/char/sonypi.c | 6 +- + drivers/comedi/drivers/cb_pcidas64.c | 5 - + drivers/counter/counter-core.c | 4 +- + drivers/counter/stm32-timer-cnt.c | 461 ++++++- + drivers/counter/ti-ecap-capture.c | 8 +- + drivers/counter/ti-eqep.c | 6 +- + drivers/extcon/Kconfig | 3 +- + drivers/extcon/extcon-adc-jack.c | 8 +- + drivers/extcon/extcon-intel-cht-wc.c | 6 +- + drivers/extcon/extcon-intel-mrfld.c | 26 +- + drivers/extcon/extcon-max3355.c | 6 +- + drivers/extcon/extcon-max77843.c | 6 +- + drivers/extcon/extcon-rtk-type-c.c | 1 - + drivers/extcon/extcon-usb-gpio.c | 6 +- + drivers/extcon/extcon-usbc-cros-ec.c | 6 +- + drivers/fpga/Kconfig | 12 + + drivers/fpga/Makefile | 2 + + drivers/fpga/altera-cvp.c | 1 - + drivers/fpga/altera-ps-spi.c | 1 - + drivers/fpga/dfl-afu-main.c | 2 - + drivers/fpga/dfl-afu.h | 3 - + drivers/fpga/dfl-fme-main.c | 2 - + drivers/fpga/dfl-fme.h | 2 - + drivers/fpga/dfl.h | 5 - + drivers/fpga/fpga-bridge.c | 57 +- + drivers/fpga/fpga-mgr.c | 82 +- + drivers/fpga/fpga-region.c | 24 +- + drivers/fpga/ice40-spi.c | 4 +- + drivers/fpga/tests/fpga-bridge-test.c | 33 +- + drivers/fpga/tests/fpga-mgr-test.c | 16 +- + drivers/fpga/tests/fpga-region-test.c | 41 +- + drivers/fpga/xilinx-core.c | 229 ++++ + drivers/fpga/xilinx-core.h | 27 + + drivers/fpga/xilinx-selectmap.c | 95 ++ + drivers/fpga/xilinx-spi.c | 224 +--- + drivers/greybus/interface.c | 1 + + drivers/hv/Makefile | 2 +- + drivers/hv/channel_mgmt.c | 15 +- + drivers/hv/hv_fcopy.c | 427 ------ + drivers/hv/hv_util.c | 12 - + drivers/hv/hyperv_vmbus.h | 5 + + drivers/hwtracing/coresight/coresight-catu.c | 137 +- + drivers/hwtracing/coresight/coresight-catu.h | 1 + + drivers/hwtracing/coresight/coresight-core.c | 29 + + drivers/hwtracing/coresight/coresight-cpu-debug.c | 137 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 29 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 31 +- + drivers/hwtracing/coresight/coresight-funnel.c | 87 +- + drivers/hwtracing/coresight/coresight-priv.h | 10 + + drivers/hwtracing/coresight/coresight-replicator.c | 82 +- + drivers/hwtracing/coresight/coresight-stm.c | 114 +- + drivers/hwtracing/coresight/coresight-tmc-core.c | 181 ++- + drivers/hwtracing/coresight/coresight-tmc.h | 2 + + drivers/hwtracing/coresight/coresight-tpiu.c | 120 +- + drivers/hwtracing/intel_th/acpi.c | 6 +- + drivers/hwtracing/intel_th/core.c | 8 +- + drivers/hwtracing/intel_th/gth.c | 8 +- + drivers/hwtracing/intel_th/msu.c | 12 +- + drivers/hwtracing/intel_th/pci.c | 30 + + drivers/hwtracing/intel_th/sth.c | 2 +- + drivers/hwtracing/ptt/hisi_ptt.c | 1 + + drivers/hwtracing/stm/console.c | 1 + + drivers/hwtracing/stm/core.c | 19 +- + drivers/hwtracing/stm/ftrace.c | 1 + + drivers/hwtracing/stm/heartbeat.c | 1 + + drivers/hwtracing/stm/p_basic.c | 3 +- + drivers/hwtracing/stm/p_sys-t.c | 93 +- + drivers/hwtracing/stm/stm.h | 2 +- + drivers/iio/Makefile | 1 + + drivers/iio/accel/adxl345.h | 36 +- + drivers/iio/accel/adxl345_core.c | 92 +- + drivers/iio/accel/adxl345_i2c.c | 2 +- + drivers/iio/accel/adxl345_spi.c | 10 +- + drivers/iio/accel/adxl367.c | 2 +- + drivers/iio/accel/bmc150-accel-core.c | 44 +- + drivers/iio/accel/fxls8962af-core.c | 10 +- + drivers/iio/accel/kxcjk-1013.c | 80 +- + drivers/iio/accel/mma8452.c | 6 +- + drivers/iio/accel/mxc4005.c | 22 + + drivers/iio/adc/Kconfig | 27 + + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/ab8500-gpadc.c | 8 +- + drivers/iio/adc/ad4130.c | 7 +- + drivers/iio/adc/ad7124.c | 55 +- + drivers/iio/adc/ad7173.c | 1180 +++++++++++++++++ + drivers/iio/adc/ad7192.c | 38 +- + drivers/iio/adc/ad7266.c | 1 - + drivers/iio/adc/ad7292.c | 13 +- + drivers/iio/adc/ad7944.c | 690 ++++++++++ + drivers/iio/adc/ad799x.c | 7 +- + drivers/iio/adc/ad9467.c | 374 +++++- + drivers/iio/adc/ad_sigma_delta.c | 29 +- + drivers/iio/adc/adi-axi-adc.c | 147 ++- + drivers/iio/adc/exynos_adc.c | 16 +- + drivers/iio/adc/fsl-imx25-gcq.c | 150 +-- + drivers/iio/adc/hx711.c | 5 +- + drivers/iio/adc/intel_mrfld_adc.c | 12 +- + drivers/iio/adc/max11410.c | 27 +- + drivers/iio/adc/mcp3564.c | 16 +- + drivers/iio/adc/mxs-lradc-adc.c | 1 - + drivers/iio/adc/pac1934.c | 86 +- + drivers/iio/adc/qcom-spmi-adc5.c | 7 +- + drivers/iio/adc/rcar-gyroadc.c | 21 +- + drivers/iio/adc/rtq6056.c | 34 +- + drivers/iio/adc/rzg2l_adc.c | 11 +- + drivers/iio/adc/spear_adc.c | 25 +- + drivers/iio/adc/stm32-adc.c | 71 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 12 +- + drivers/iio/adc/ti-ads1015.c | 5 +- + drivers/iio/adc/ti-ads131e08.c | 12 +- + drivers/iio/adc/twl4030-madc.c | 19 +- + drivers/iio/adc/twl6030-gpadc.c | 8 +- + drivers/iio/addac/ad74413r.c | 10 +- + drivers/iio/buffer/industrialio-buffer-dma.c | 100 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 86 +- + .../iio/common/inv_sensors/inv_sensors_timestamp.c | 33 +- + drivers/iio/dac/Kconfig | 37 + + drivers/iio/dac/Makefile | 2 + + drivers/iio/dac/ad3552r.c | 110 +- + drivers/iio/dac/ad5755.c | 24 +- + drivers/iio/dac/ad5770r.c | 19 +- + drivers/iio/dac/ad9739a.c | 464 +++++++ + drivers/iio/dac/adi-axi-dac.c | 635 +++++++++ + drivers/iio/dac/ltc2688.c | 28 +- + drivers/iio/dac/ti-dac5571.c | 3 + + drivers/iio/frequency/admfm2000.c | 24 +- + drivers/iio/health/max30102.c | 2 + + drivers/iio/humidity/hdc3020.c | 111 +- + drivers/iio/humidity/hts221_core.c | 2 +- + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 37 + + drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 75 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 31 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 26 + + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 84 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 6 + + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 6 + + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 542 +++++++- + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 36 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_ring.c | 19 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_trigger.c | 83 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 2 +- + drivers/iio/industrialio-acpi.c | 85 ++ + drivers/iio/industrialio-backend.c | 305 ++++- + drivers/iio/industrialio-buffer.c | 124 +- + drivers/iio/industrialio-core.c | 49 +- + drivers/iio/industrialio-trigger.c | 71 +- + drivers/iio/inkern.c | 263 ++-- + drivers/iio/light/Kconfig | 12 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/apds9306.c | 1361 ++++++++++++++++++++ + drivers/iio/light/st_uvis25_core.c | 2 +- + drivers/iio/light/stk3310.c | 1 - + drivers/iio/pressure/bmp280-core.c | 16 +- + drivers/iio/pressure/dps310.c | 138 +- + drivers/iio/pressure/hsc030pa_spi.c | 7 +- + drivers/iio/pressure/zpa2326.c | 10 +- + drivers/iio/temperature/ltc2983.c | 142 +- + drivers/iio/temperature/mcp9600.c | 3 +- + drivers/interconnect/qcom/qcm2290.c | 2 +- + drivers/interconnect/qcom/sm6115.c | 33 +- + drivers/mcb/mcb-lpc.c | 6 +- + drivers/misc/Kconfig | 30 +- + drivers/misc/Makefile | 1 + + drivers/misc/cardreader/rtsx_pcr.c | 12 +- + drivers/misc/ds1682.c | 37 + + drivers/misc/eeprom/at25.c | 1 - + drivers/misc/eeprom/eeprom_93xx46.c | 2 - + drivers/misc/mei/bus.c | 2 +- + drivers/misc/mei/hw.h | 2 - + drivers/misc/ntsync.c | 249 ++++ + drivers/misc/pvpanic/pvpanic.c | 43 +- + drivers/misc/ti-st/st_kim.c | 4 +- + drivers/misc/tifm_core.c | 2 +- + drivers/misc/vmw_vmci/vmci_event.c | 6 +- + drivers/misc/vmw_vmci/vmci_guest.c | 10 +- + drivers/nvmem/core.c | 2 +- + drivers/nvmem/layouts.c | 6 +- + drivers/nvmem/layouts/onie-tlv.c | 1 - + drivers/nvmem/layouts/sl28vpd.c | 1 - + drivers/nvmem/lpc18xx_eeprom.c | 6 +- + drivers/nvmem/meson-mx-efuse.c | 6 +- + drivers/nvmem/sc27xx-efuse.c | 1 + + drivers/nvmem/sprd-efuse.c | 1 + + drivers/parport/parport_mfc3.c | 3 +- + drivers/peci/core.c | 4 +- + drivers/peci/device.c | 2 +- + drivers/peci/internal.h | 6 +- + drivers/slimbus/qcom-ctrl.c | 6 +- + drivers/slimbus/qcom-ngd-ctrl.c | 14 +- + drivers/spmi/hisi-spmi-controller.c | 1 - + drivers/spmi/spmi-pmic-arb.c | 980 ++++++++------ + drivers/spmi/spmi.c | 2 +- + drivers/uio/Kconfig | 18 - + drivers/uio/Makefile | 1 - + drivers/uio/uio.c | 24 +- + drivers/uio/uio_fsl_elbc_gpcm.c | 6 +- + drivers/uio/uio_hv_generic.c | 19 +- + drivers/uio/uio_pdrv_genirq.c | 10 +- + drivers/uio/uio_pruss.c | 255 ---- + drivers/w1/masters/w1-gpio.c | 62 +- + include/linux/coresight.h | 6 + + include/linux/counter.h | 7 +- + include/linux/fpga/fpga-bridge.h | 10 +- + include/linux/fpga/fpga-mgr.h | 26 +- + include/linux/fpga/fpga-region.h | 13 +- + include/linux/hyperv.h | 2 + + include/linux/iio/adc/ad_sigma_delta.h | 3 + + include/linux/iio/backend.h | 107 +- + include/linux/iio/buffer-dma.h | 4 +- + include/linux/iio/buffer-dmaengine.h | 24 +- + include/linux/iio/common/inv_sensors_timestamp.h | 3 +- + include/linux/iio/iio.h | 13 + + include/linux/mfd/stm32-timers.h | 13 + + include/linux/mhi.h | 11 + + include/linux/nvmem-provider.h | 5 +- + include/linux/platform_data/uio_pruss.h | 18 - + include/linux/property.h | 22 +- + include/linux/stm.h | 12 + + include/uapi/linux/ntsync.h | 23 + + include/uapi/misc/pvpanic.h | 7 +- + samples/acrn/vm-sample.c | 4 +- + scripts/spdxcheck.py | 3 + + tools/hv/Build | 3 +- + tools/hv/Makefile | 14 +- + tools/hv/hv_fcopy_daemon.c | 266 ---- + tools/hv/hv_fcopy_uio_daemon.c | 490 +++++++ + tools/hv/vmbus_bufring.c | 318 +++++ + tools/hv/vmbus_bufring.h | 158 +++ + tools/testing/nvdimm/test/ndtest.c | 5 +- + 281 files changed, 12858 insertions(+), 3987 deletions(-) + rename Documentation/ABI/testing/{sysfs-devices-hisi_ptt => sysfs-bus-event_source-devices-hisi_ptt} (90%) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-ad9739a + create mode 100644 Documentation/devicetree/bindings/fpga/xlnx,fpga-selectmap.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7173.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7944.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad9739a.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,axi-dac.yaml + delete mode 100644 Documentation/devicetree/bindings/iio/light/avago,apds9960.yaml + create mode 100644 Documentation/devicetree/bindings/spmi/qcom,x1e80100-spmi-pmic-arb.yaml + create mode 100644 Documentation/iio/ad7944.rst + create mode 100644 drivers/fpga/xilinx-core.c + create mode 100644 drivers/fpga/xilinx-core.h + create mode 100644 drivers/fpga/xilinx-selectmap.c + delete mode 100644 drivers/hv/hv_fcopy.c + create mode 100644 drivers/iio/adc/ad7173.c + create mode 100644 drivers/iio/adc/ad7944.c + create mode 100644 drivers/iio/dac/ad9739a.c + create mode 100644 drivers/iio/dac/adi-axi-dac.c + create mode 100644 drivers/iio/industrialio-acpi.c + create mode 100644 drivers/iio/light/apds9306.c + create mode 100644 drivers/misc/ntsync.c + delete mode 100644 drivers/uio/uio_pruss.c + delete mode 100644 include/linux/platform_data/uio_pruss.h + create mode 100644 include/uapi/linux/ntsync.h + delete mode 100644 tools/hv/hv_fcopy_daemon.c + create mode 100644 tools/hv/hv_fcopy_uio_daemon.c + create mode 100644 tools/hv/vmbus_bufring.c + create mode 100644 tools/hv/vmbus_bufring.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 (9b47d9982d1d hwtracing: hisi_ptt: Assign parent for event_source device) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fastrpc/for-next (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (b7c0e1ecee40 fpga: region: add owner module and take its refcount) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (230d05b1179f interconnect: qcom: qcm2290: Fix mas_snoc_bimc QoS port assignment) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (827dca312970 iio: temperature: mcp9600: Fix temperature reading for negative values) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging phy-next/next (960b3f023d3b dt-bindings: phy: qcom,usb-snps-femto-v2: use correct fallback for sc8180x) +$ 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 drivers/phy/qualcomm/phy-qcom-qmp-combo.c +Auto-merging drivers/phy/rockchip/Kconfig +Merge made by the 'ort' strategy. + .../bindings/phy/fsl,imx8mp-hdmi-phy.yaml | 62 + + .../bindings/phy/mediatek,mt7988-xfi-tphy.yaml | 80 + + .../bindings/phy/phy-rockchip-usbdp.yaml | 148 ++ + .../devicetree/bindings/phy/qcom,edp-phy.yaml | 1 + + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 28 +- + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 19 +- + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 2 + + .../bindings/phy/qcom,snps-eusb2-repeater.yaml | 4 +- + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 5 +- + .../bindings/phy/rockchip,pcie3-phy.yaml | 10 + + .../devicetree/bindings/phy/samsung,ufs-phy.yaml | 1 + + MAINTAINERS | 2 + + drivers/phy/freescale/Kconfig | 6 + + drivers/phy/freescale/Makefile | 1 + + drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 718 +++++++++ + drivers/phy/mediatek/Kconfig | 11 + + drivers/phy/mediatek/Makefile | 1 + + drivers/phy/mediatek/phy-mtk-xfi-tphy.c | 451 ++++++ + drivers/phy/phy-core.c | 26 +- + drivers/phy/qualcomm/phy-qcom-edp.c | 369 ++++- + drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 17 + + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 56 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 109 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h | 4 + + .../qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h | 6 + + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 144 +- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 47 + + drivers/phy/rockchip/Kconfig | 12 + + drivers/phy/rockchip/Makefile | 1 + + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 4 +- + drivers/phy/rockchip/phy-rockchip-snps-pcie3.c | 49 +- + drivers/phy/rockchip/phy-rockchip-usbdp.c | 1608 ++++++++++++++++++++ + drivers/phy/samsung/Makefile | 1 + + drivers/phy/samsung/phy-exynos7-ufs.c | 1 + + drivers/phy/samsung/phy-exynosautov9-ufs.c | 1 + + drivers/phy/samsung/phy-fsd-ufs.c | 1 + + drivers/phy/samsung/phy-gs101-ufs.c | 182 +++ + drivers/phy/samsung/phy-samsung-ufs.c | 28 +- + drivers/phy/samsung/phy-samsung-ufs.h | 6 + + drivers/phy/xilinx/phy-zynqmp.c | 6 +- + include/dt-bindings/phy/phy-qcom-qmp.h | 4 + + 41 files changed, 4101 insertions(+), 131 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/fsl,imx8mp-hdmi-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,mt7988-xfi-tphy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/phy-rockchip-usbdp.yaml + create mode 100644 drivers/phy/freescale/phy-fsl-samsung-hdmi.c + create mode 100644 drivers/phy/mediatek/phy-mtk-xfi-tphy.c + create mode 100644 drivers/phy/rockchip/phy-rockchip-usbdp.c + create mode 100644 drivers/phy/samsung/phy-gs101-ufs.c +Merging soundwire/next (a0df7e04eab0 soundwire: intel_ace2.x: add support for DOAISE property) +$ 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/amd_manager.c +Auto-merging sound/soc/sof/intel/hda.c +Merge made by the 'ort' strategy. + drivers/soundwire/amd_init.c | 36 +++++----- + drivers/soundwire/amd_init.h | 8 +++ + drivers/soundwire/amd_manager.c | 13 ++-- + drivers/soundwire/bus.c | 14 ++-- + drivers/soundwire/bus_type.c | 5 +- + drivers/soundwire/cadence_master.c | 36 ++++------ + drivers/soundwire/intel.c | 68 ++++++++++++++++-- + drivers/soundwire/intel.h | 7 ++ + drivers/soundwire/intel_ace2x.c | 119 +++++++++++++++++++++++--------- + drivers/soundwire/intel_auxdevice.c | 41 +++++++++-- + drivers/soundwire/intel_auxdevice.h | 1 + + drivers/soundwire/intel_init.c | 14 ++++ + drivers/soundwire/qcom.c | 28 ++++++-- + drivers/soundwire/sysfs_local.h | 4 +- + drivers/soundwire/sysfs_slave.c | 66 +++++++++--------- + drivers/soundwire/sysfs_slave_dpn.c | 3 + + include/linux/soundwire/sdw.h | 19 ++--- + include/linux/soundwire/sdw_intel.h | 11 ++- + include/linux/soundwire/sdw_registers.h | 2 +- + sound/soc/sof/intel/hda.c | 4 +- + 20 files changed, 338 insertions(+), 161 deletions(-) +Merging extcon/extcon-next (3e8e45b65d9f extcon: adc-jack: Document missing struct members) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (0bbac3facb5d Linux 6.9-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 (dda057ad8c9c vfio: remove an extra semicolon) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging MAINTAINERS +Auto-merging include/linux/msi.h +Merge made by the 'ort' strategy. + Documentation/driver-api/vfio.rst | 2 +- + MAINTAINERS | 11 +- + drivers/vfio/cdx/Makefile | 2 +- + drivers/vfio/cdx/intr.c | 217 ++++++++++++ + drivers/vfio/cdx/main.c | 63 +++- + drivers/vfio/cdx/private.h | 18 + + drivers/vfio/pci/Kconfig | 2 + + drivers/vfio/pci/Makefile | 2 + + drivers/vfio/pci/qat/Kconfig | 12 + + drivers/vfio/pci/qat/Makefile | 3 + + drivers/vfio/pci/qat/main.c | 702 ++++++++++++++++++++++++++++++++++++++ + drivers/vfio/pci/vfio_pci_core.c | 78 +++-- + drivers/vfio/pci/vfio_pci_intrs.c | 61 ++-- + include/linux/msi.h | 6 + + kernel/irq/msi.c | 2 + + 15 files changed, 1113 insertions(+), 68 deletions(-) + create mode 100644 drivers/vfio/cdx/intr.c + create mode 100644 drivers/vfio/pci/qat/Kconfig + create mode 100644 drivers/vfio/pci/qat/Makefile + create mode 100644 drivers/vfio/pci/qat/main.c +Merging w1/for-next (cde37a5bdb0e w1: gpio: Don't use "proxy" headers) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging spmi/spmi-next (4cece7649650 Linux 6.9-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 (eb563dc752d3 staging: pi433: Remove unused driver) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/staging/Kconfig | 4 - + drivers/staging/Makefile | 2 - + drivers/staging/axis-fifo/axis-fifo.c | 10 +- + drivers/staging/fbtft/fb_seps525.c | 7 +- + drivers/staging/greybus/arche-apb-ctrl.c | 1 + + drivers/staging/greybus/arche-platform.c | 9 +- + drivers/staging/greybus/audio_manager_module.c | 2 +- + drivers/staging/greybus/camera.c | 58 +- + drivers/staging/greybus/fw-management.c | 12 +- + drivers/staging/greybus/light.c | 8 +- + drivers/staging/greybus/loopback.c | 1 + + drivers/staging/ks7010/ks7010_sdio.c | 2 +- + drivers/staging/nvec/TODO | 1 - + drivers/staging/nvec/nvec.c | 11 +- + drivers/staging/nvec/nvec_kbd.c | 9 +- + drivers/staging/nvec/nvec_ps2.c | 31 +- + .../Documentation/devicetree/pi433-overlay.dtso | 48 - + .../pi433/Documentation/devicetree/pi433.txt | 62 - + drivers/staging/pi433/Documentation/pi433.txt | 274 -- + drivers/staging/pi433/Kconfig | 17 - + drivers/staging/pi433/Makefile | 4 - + drivers/staging/pi433/TODO | 8 - + drivers/staging/pi433/pi433_if.c | 1438 -------- + drivers/staging/pi433/pi433_if.h | 148 - + drivers/staging/pi433/rf69.c | 832 ----- + drivers/staging/pi433/rf69.h | 66 - + drivers/staging/pi433/rf69_enum.h | 126 - + drivers/staging/pi433/rf69_registers.h | 478 --- + drivers/staging/rtl8192e/rtl8192e/r8192E_cmdpkt.c | 11 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 16 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 4 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 10 +- + drivers/staging/rtl8192e/rtl819x_HT.h | 36 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 104 +- + drivers/staging/rtl8192e/rtllib.h | 20 +- + drivers/staging/rtl8192e/rtllib_rx.c | 2 +- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 2 +- + drivers/staging/rtl8192e/rtllib_tx.c | 2 +- + drivers/staging/rtl8192e/rtllib_wx.c | 8 +- + drivers/staging/rtl8712/mlme_linux.c | 18 +- + drivers/staging/rtl8712/os_intfs.c | 3 +- + drivers/staging/rtl8712/rtl8712_led.c | 2 +- + drivers/staging/rtl8712/rtl8712_recv.c | 6 +- + drivers/staging/rtl8712/rtl8712_recv.h | 2 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 92 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 5 +- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 2 +- + drivers/staging/rts5208/rtsx_scsi.c | 10 +- + drivers/staging/vc04_services/Kconfig | 36 +- + drivers/staging/vc04_services/Makefile | 1 - + .../staging/vc04_services/bcm2835-audio/Kconfig | 2 +- + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 5 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 4 +- + .../include/linux/raspberrypi/vchiq.h | 4 +- + drivers/staging/vc04_services/interface/TODO | 15 - + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 265 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 41 +- + .../vc04_services/interface/vchiq_arm/vchiq_bus.c | 13 + + .../vc04_services/interface/vchiq_arm/vchiq_bus.h | 3 + + .../interface/vchiq_arm/vchiq_connected.c | 74 - + .../interface/vchiq_arm/vchiq_connected.h | 12 - + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 67 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 17 +- + .../interface/vchiq_arm/vchiq_debugfs.c | 5 +- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 39 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 14 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.h | 32 +- + drivers/staging/vt6655/rf.h | 4 - + drivers/staging/vt6655/srom.c | 1 - + drivers/staging/wlan-ng/Kconfig | 13 - + drivers/staging/wlan-ng/Makefile | 8 - + drivers/staging/wlan-ng/README | 8 - + drivers/staging/wlan-ng/TODO | 16 - + drivers/staging/wlan-ng/cfg80211.c | 718 ---- + drivers/staging/wlan-ng/hfa384x.h | 1236 ------- + drivers/staging/wlan-ng/hfa384x_usb.c | 3880 -------------------- + drivers/staging/wlan-ng/p80211conv.c | 643 ---- + drivers/staging/wlan-ng/p80211conv.h | 141 - + drivers/staging/wlan-ng/p80211hdr.h | 189 - + drivers/staging/wlan-ng/p80211ioctl.h | 69 - + drivers/staging/wlan-ng/p80211metadef.h | 227 -- + drivers/staging/wlan-ng/p80211metastruct.h | 236 -- + drivers/staging/wlan-ng/p80211mgmt.h | 199 - + drivers/staging/wlan-ng/p80211msg.h | 39 - + drivers/staging/wlan-ng/p80211netdev.c | 988 ----- + drivers/staging/wlan-ng/p80211netdev.h | 212 -- + drivers/staging/wlan-ng/p80211req.c | 223 -- + drivers/staging/wlan-ng/p80211req.h | 33 - + drivers/staging/wlan-ng/p80211types.h | 292 -- + drivers/staging/wlan-ng/p80211wep.c | 207 -- + drivers/staging/wlan-ng/prism2fw.c | 1213 ------ + drivers/staging/wlan-ng/prism2mgmt.c | 1315 ------- + drivers/staging/wlan-ng/prism2mgmt.h | 89 - + drivers/staging/wlan-ng/prism2mib.c | 742 ---- + drivers/staging/wlan-ng/prism2sta.c | 1945 ---------- + drivers/staging/wlan-ng/prism2usb.c | 299 -- + 98 files changed, 531 insertions(+), 19331 deletions(-) + delete mode 100644 drivers/staging/pi433/Documentation/devicetree/pi433-overlay.dtso + delete mode 100644 drivers/staging/pi433/Documentation/devicetree/pi433.txt + delete mode 100644 drivers/staging/pi433/Documentation/pi433.txt + delete mode 100644 drivers/staging/pi433/Kconfig + delete mode 100644 drivers/staging/pi433/Makefile + delete mode 100644 drivers/staging/pi433/TODO + delete mode 100644 drivers/staging/pi433/pi433_if.c + delete mode 100644 drivers/staging/pi433/pi433_if.h + delete mode 100644 drivers/staging/pi433/rf69.c + delete mode 100644 drivers/staging/pi433/rf69.h + delete mode 100644 drivers/staging/pi433/rf69_enum.h + delete mode 100644 drivers/staging/pi433/rf69_registers.h + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.c + delete mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_connected.h + delete mode 100644 drivers/staging/wlan-ng/Kconfig + delete mode 100644 drivers/staging/wlan-ng/Makefile + delete mode 100644 drivers/staging/wlan-ng/README + delete mode 100644 drivers/staging/wlan-ng/TODO + delete mode 100644 drivers/staging/wlan-ng/cfg80211.c + delete mode 100644 drivers/staging/wlan-ng/hfa384x.h + delete mode 100644 drivers/staging/wlan-ng/hfa384x_usb.c + delete mode 100644 drivers/staging/wlan-ng/p80211conv.c + delete mode 100644 drivers/staging/wlan-ng/p80211conv.h + delete mode 100644 drivers/staging/wlan-ng/p80211hdr.h + delete mode 100644 drivers/staging/wlan-ng/p80211ioctl.h + delete mode 100644 drivers/staging/wlan-ng/p80211metadef.h + delete mode 100644 drivers/staging/wlan-ng/p80211metastruct.h + delete mode 100644 drivers/staging/wlan-ng/p80211mgmt.h + delete mode 100644 drivers/staging/wlan-ng/p80211msg.h + delete mode 100644 drivers/staging/wlan-ng/p80211netdev.c + delete mode 100644 drivers/staging/wlan-ng/p80211netdev.h + delete mode 100644 drivers/staging/wlan-ng/p80211req.c + delete mode 100644 drivers/staging/wlan-ng/p80211req.h + delete mode 100644 drivers/staging/wlan-ng/p80211types.h + delete mode 100644 drivers/staging/wlan-ng/p80211wep.c + delete mode 100644 drivers/staging/wlan-ng/prism2fw.c + delete mode 100644 drivers/staging/wlan-ng/prism2mgmt.c + delete mode 100644 drivers/staging/wlan-ng/prism2mgmt.h + delete mode 100644 drivers/staging/wlan-ng/prism2mib.c + delete mode 100644 drivers/staging/wlan-ng/prism2sta.c + delete mode 100644 drivers/staging/wlan-ng/prism2usb.c +Merging counter-next/counter-next (89d5d9e95008 counter: Don't use "proxy" headers) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging 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 (28059ddbee0e MAINTAINERS: Update role for IDXD driver) +$ 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/idma64.c +Auto-merging drivers/dma/idxd/cdev.c +Auto-merging drivers/dma/xilinx/xdma.c +Auto-merging drivers/dma/xilinx/xilinx_dpdma.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/fsl,edma.yaml | 139 ++++++++++++++------- + .../devicetree/bindings/dma/fsl,imx-sdma.yaml | 1 + + .../devicetree/bindings/dma/qcom_hidma_mgmt.txt | 95 -------------- + .../bindings/dma/snps,dma-spear1340.yaml | 42 +++---- + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 1 + + MAINTAINERS | 3 +- + drivers/dma/Makefile | 6 +- + drivers/dma/amba-pl08x.c | 4 +- + drivers/dma/dma-axi-dmac.c | 78 +++++------- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 38 ++++-- + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 3 +- + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 14 +-- + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.h | 5 +- + drivers/dma/fsl-dpaa2-qdma/dpdmai.c | 113 +++++++---------- + drivers/dma/fsl-dpaa2-qdma/dpdmai.h | 61 +++++---- + drivers/dma/fsl-edma-common.c | 25 ++-- + drivers/dma/fsl-edma-common.h | 110 ++++++++-------- + drivers/dma/fsl-edma-main.c | 50 +++++--- + drivers/dma/fsl-edma-trace.c | 4 + + drivers/dma/fsl-edma-trace.h | 132 +++++++++++++++++++ + drivers/dma/idma64.c | 4 +- + drivers/dma/idxd/cdev.c | 18 +-- + drivers/dma/imx-sdma.c | 97 +++++++++++--- + drivers/dma/mcf-edma-main.c | 4 +- + drivers/dma/pch_dma.c | 5 - + drivers/dma/qcom/hidma.c | 11 -- + drivers/dma/qcom/hidma_mgmt.c | 109 +--------------- + drivers/dma/virt-dma.h | 10 ++ + drivers/dma/xilinx/xdma.c | 1 + + drivers/dma/xilinx/xilinx_dpdma.c | 10 +- + include/linux/dma/imx-dma.h | 1 + + 31 files changed, 620 insertions(+), 574 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt + create mode 100644 drivers/dma/fsl-edma-trace.c + create mode 100644 drivers/dma/fsl-edma-trace.h +Merging cgroup/for-next (8f6d24a5db2a selftests/cgroup: fix uninitialized variables in test_zswap.c) +$ 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 kernel/cpu.c +Auto-merging tools/testing/selftests/cgroup/test_zswap.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v1/cgroups.rst | 2 +- + Documentation/admin-guide/cgroup-v2.rst | 31 +++- + include/linux/cgroup.h | 2 +- + include/linux/cpuset.h | 3 - + include/trace/events/cgroup.h | 48 +++++++ + kernel/cgroup/cgroup-v1.c | 1 + + kernel/cgroup/cgroup.c | 3 +- + kernel/cgroup/cpuset.c | 156 ++++++++------------- + kernel/cgroup/legacy_freezer.c | 5 +- + kernel/cgroup/pids.c | 2 - + kernel/cgroup/rstat.c | 48 +++++-- + kernel/cpu.c | 48 ------- + kernel/power/process.c | 2 - + tools/testing/selftests/cgroup/Makefile | 2 +- + tools/testing/selftests/cgroup/cgroup_util.c | 8 +- + tools/testing/selftests/cgroup/cgroup_util.h | 4 +- + tools/testing/selftests/cgroup/test_core.c | 7 +- + tools/testing/selftests/cgroup/test_cpu.c | 6 +- + tools/testing/selftests/cgroup/test_cpuset.c | 2 +- + .../testing/selftests/cgroup/test_cpuset_v1_hp.sh | 46 ++++++ + tools/testing/selftests/cgroup/test_freezer.c | 2 +- + .../testing/selftests/cgroup/test_hugetlb_memcg.c | 2 +- + tools/testing/selftests/cgroup/test_kill.c | 2 +- + tools/testing/selftests/cgroup/test_kmem.c | 6 +- + tools/testing/selftests/cgroup/test_memcontrol.c | 6 +- + tools/testing/selftests/cgroup/test_zswap.c | 6 +- + 26 files changed, 255 insertions(+), 195 deletions(-) + create mode 100755 tools/testing/selftests/cgroup/test_cpuset_v1_hp.sh +Merging scsi/for-next (9ba1fbe2ed0c Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging Documentation/driver-api/scsi.rst +Auto-merging MAINTAINERS +Auto-merging block/blk-settings.c +CONFLICT (content): Merge conflict in block/blk-settings.c +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/ata/libata.h +Auto-merging drivers/ata/pata_macio.c +Auto-merging drivers/ata/sata_mv.c +Auto-merging drivers/message/fusion/mptsas.c +Auto-merging drivers/net/ethernet/qlogic/qed/qed_main.c +Auto-merging drivers/scsi/hpsa.c +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/mpi3mr/mpi3mr_transport.c +Auto-merging drivers/scsi/mpt3sas/mpt3sas_base.c +Auto-merging drivers/scsi/mvsas/mv_init.c +Auto-merging drivers/scsi/pmcraid.c +Auto-merging drivers/scsi/scsi_lib.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/scsi/smartpqi/smartpqi_init.c +Auto-merging drivers/usb/storage/uas.c +Auto-merging include/linux/blkdev.h +CONFLICT (content): Merge conflict in include/linux/blkdev.h +Resolved 'block/blk-settings.c' using previous resolution. +Resolved 'include/linux/blkdev.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8dd17b983bce] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/ufs/samsung,exynos-ufs.yaml | 38 ++- + Documentation/driver-api/scsi.rst | 15 +- + Documentation/scsi/scsi_mid_low_api.rst | 20 +- + MAINTAINERS | 3 +- + block/blk-settings.c | 245 -------------- + block/bsg-lib.c | 6 +- + drivers/ata/ahci.h | 2 +- + drivers/ata/libata-sata.c | 187 ++++++++--- + drivers/ata/libata-scsi.c | 19 +- + drivers/ata/libata.h | 3 +- + drivers/ata/pata_macio.c | 11 +- + drivers/ata/sata_mv.c | 2 +- + drivers/ata/sata_nv.c | 24 +- + drivers/ata/sata_sil24.c | 2 +- + drivers/firewire/sbp2.c | 13 +- + drivers/message/fusion/mptfc.c | 1 + + drivers/message/fusion/mptsas.c | 1 + + drivers/message/fusion/mptscsih.c | 2 - + drivers/message/fusion/mptspi.c | 1 + + drivers/net/ethernet/qlogic/qed/qed_main.c | 2 +- + drivers/s390/block/dasd_eckd.c | 6 +- + drivers/scsi/FlashPoint.c | 1 - + drivers/scsi/Kconfig | 4 +- + drivers/scsi/a3000.c | 8 +- + drivers/scsi/a4000t.c | 8 +- + drivers/scsi/aha152x.c | 8 +- + drivers/scsi/aic7xxx/Kconfig.aic79xx | 75 ++--- + drivers/scsi/aic7xxx/Kconfig.aic7xxx | 97 +++--- + drivers/scsi/aic94xx/aic94xx_init.c | 29 +- + drivers/scsi/atari_scsi.c | 8 +- + drivers/scsi/bfa/bfad_debugfs.c | 4 +- + drivers/scsi/bnx2fc/bnx2fc_tgt.c | 4 +- + drivers/scsi/csiostor/csio_init.c | 3 - + drivers/scsi/cxlflash/lunmgt.c | 6 +- + drivers/scsi/cxlflash/main.c | 18 +- + drivers/scsi/cxlflash/superpipe.c | 40 ++- + drivers/scsi/cxlflash/superpipe.h | 11 +- + drivers/scsi/cxlflash/vlun.c | 9 +- + drivers/scsi/hisi_sas/hisi_sas.h | 3 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 7 +- + drivers/scsi/hisi_sas/hisi_sas_v1_hw.c | 20 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 26 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 31 +- + drivers/scsi/hosts.c | 6 + + drivers/scsi/hpsa.c | 2 +- + drivers/scsi/hptiop.c | 8 +- + drivers/scsi/ibmvscsi/ibmvfc.c | 5 +- + drivers/scsi/imm.c | 12 +- + drivers/scsi/ipr.c | 10 +- + drivers/scsi/isci/init.c | 29 +- + drivers/scsi/iscsi_tcp.c | 2 +- + drivers/scsi/libsas/sas_ata.c | 84 +++++ + drivers/scsi/libsas/sas_expander.c | 38 ++- + drivers/scsi/libsas/sas_internal.h | 15 - + drivers/scsi/libsas/sas_scsi_host.c | 7 +- + drivers/scsi/lpfc/lpfc.h | 62 ++-- + drivers/scsi/lpfc/lpfc_attr.c | 31 +- + drivers/scsi/lpfc/lpfc_bsg.c | 3 +- + drivers/scsi/lpfc/lpfc_ct.c | 24 +- + drivers/scsi/lpfc/lpfc_els.c | 43 +-- + drivers/scsi/lpfc/lpfc_hbadisc.c | 137 ++++---- + drivers/scsi/lpfc/lpfc_hw4.h | 8 + + drivers/scsi/lpfc/lpfc_init.c | 119 +++---- + drivers/scsi/lpfc/lpfc_nportdisc.c | 63 ++-- + drivers/scsi/lpfc/lpfc_nvme.c | 27 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 9 +- + drivers/scsi/lpfc/lpfc_scsi.c | 73 ++-- + drivers/scsi/lpfc/lpfc_scsi.h | 32 +- + drivers/scsi/lpfc/lpfc_sli.c | 218 ++++++------ + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mac_scsi.c | 8 +- + drivers/scsi/megaraid/Kconfig.megaraid | 113 ++++--- + drivers/scsi/megaraid/megaraid_sas.h | 2 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 29 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 +- + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 3 + + drivers/scsi/mpi3mr/mpi/mpi30_image.h | 20 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 20 +- + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 2 +- + drivers/scsi/mpi3mr/mpi3mr.h | 15 +- + drivers/scsi/mpi3mr/mpi3mr_app.c | 33 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 42 ++- + drivers/scsi/mpi3mr/mpi3mr_os.c | 86 ++--- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 10 + + drivers/scsi/mpt3sas/mpt3sas_base.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 18 +- + drivers/scsi/mpt3sas/mpt3sas_transport.c | 18 +- + drivers/scsi/mvsas/mv_init.c | 26 +- + drivers/scsi/pm8001/pm8001_ctl.c | 5 + + drivers/scsi/pm8001/pm8001_init.c | 21 +- + drivers/scsi/pm8001/pm8001_sas.h | 1 + + drivers/scsi/pmcraid.c | 11 +- + drivers/scsi/ppa.c | 8 +- + drivers/scsi/qedf/qedf_debugfs.c | 2 +- + drivers/scsi/qedf/qedf_io.c | 6 +- + drivers/scsi/qedf/qedf_main.c | 2 +- + drivers/scsi/qedi/qedi_debugfs.c | 12 +- + drivers/scsi/qla2xxx/Kconfig | 42 +-- + drivers/scsi/qla2xxx/qla_dfs.c | 2 +- + drivers/scsi/qla2xxx/qla_os.c | 9 +- + drivers/scsi/qla4xxx/ql4_mbx.c | 17 +- + drivers/scsi/qla4xxx/ql4_os.c | 14 +- + drivers/scsi/scsi_debugfs.c | 56 ++-- + drivers/scsi/scsi_devinfo.c | 18 +- + drivers/scsi/scsi_lib.c | 42 +-- + drivers/scsi/scsi_scan.c | 74 +++-- + drivers/scsi/scsi_sysfs.c | 5 +- + drivers/scsi/scsi_transport_fc.c | 15 +- + drivers/scsi/scsi_transport_iscsi.c | 7 +- + drivers/scsi/scsi_transport_sas.c | 4 +- + drivers/scsi/sd.c | 1 - + drivers/scsi/ses.c | 1 - + drivers/scsi/smartpqi/smartpqi_init.c | 5 +- + drivers/scsi/snic/snic_attrs.c | 11 +- + drivers/scsi/sr.c | 1 - + drivers/scsi/st.c | 1 - + drivers/scsi/wd33c93.c | 4 +- + drivers/staging/rts5208/rtsx.c | 24 +- + drivers/target/target_core_device.c | 1 - + drivers/ufs/core/ufs-mcq.c | 3 +- + drivers/ufs/core/ufs_bsg.c | 3 +- + drivers/ufs/core/ufshcd.c | 370 +++++---------------- + drivers/ufs/host/cdns-pltfrm.c | 2 +- + drivers/ufs/host/ufs-exynos.c | 205 ++++++++++-- + drivers/ufs/host/ufs-exynos.h | 24 +- + drivers/ufs/host/ufs-mediatek-sip.h | 94 ++++++ + drivers/ufs/host/ufs-mediatek.c | 131 +++++++- + drivers/ufs/host/ufs-mediatek.h | 90 +---- + drivers/ufs/host/ufs-qcom.c | 25 +- + drivers/ufs/host/ufs-qcom.h | 12 +- + drivers/usb/image/microtek.c | 8 +- + drivers/usb/storage/scsiglue.c | 57 ++-- + drivers/usb/storage/uas.c | 29 +- + drivers/usb/storage/usb.c | 10 + + include/linux/blkdev.h | 27 +- + include/linux/bsg-lib.h | 3 +- + include/linux/libata.h | 16 +- + include/linux/mmc/host.h | 4 +- + include/scsi/iser.h | 2 +- + include/scsi/libfc.h | 18 +- + include/scsi/libfcoe.h | 25 +- + include/scsi/libsas.h | 32 +- + include/scsi/sas_ata.h | 6 + + include/scsi/scsi.h | 12 +- + include/scsi/scsi_cmnd.h | 2 + + include/scsi/scsi_driver.h | 4 +- + include/scsi/scsi_host.h | 9 + + include/scsi/scsi_transport.h | 2 +- + include/scsi/scsi_transport_fc.h | 6 +- + include/scsi/scsi_transport_srp.h | 4 +- + include/uapi/scsi/scsi_bsg_mpi3mr.h | 8 +- + include/uapi/scsi/scsi_bsg_ufs.h | 4 +- + include/ufs/ufshcd.h | 3 - + include/ufs/ufshci.h | 13 +- + 154 files changed, 2179 insertions(+), 2048 deletions(-) + create mode 100644 drivers/ufs/host/ufs-mediatek-sip.h +Merging scsi-mkp/for-next (3668651def2c scsi: mpi3mr: Sanitise num_phys) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (0b8dbbdcf2e4 Merge tag 'for_linus' into vhost) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/block/virtio_blk.c +Auto-merging drivers/bluetooth/virtio_bt.c +Auto-merging drivers/iommu/virtio-iommu.c +Auto-merging drivers/net/virtio_net.c +CONFLICT (content): Merge conflict in drivers/net/virtio_net.c +Auto-merging drivers/net/wireless/virtual/mac80211_hwsim.c +Auto-merging drivers/virtio/virtio_mem.c +CONFLICT (content): Merge conflict in drivers/virtio/virtio_mem.c +Auto-merging drivers/virtio/virtio_ring.c +CONFLICT (content): Merge conflict in drivers/virtio/virtio_ring.c +Auto-merging fs/coredump.c +Auto-merging fs/fuse/virtio_fs.c +Auto-merging include/linux/virtio.h +Resolved 'drivers/net/virtio_net.c' using previous resolution. +Resolved 'drivers/virtio/virtio_mem.c' using previous resolution. +Resolved 'drivers/virtio/virtio_ring.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master acde19fececa] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 10 +- + arch/um/drivers/virt-pci.c | 1 - + drivers/block/virtio_blk.c | 1 - + drivers/bluetooth/virtio_bt.c | 1 - + drivers/char/hw_random/virtio-rng.c | 1 - + drivers/char/virtio_console.c | 2 - + drivers/crypto/virtio/virtio_crypto_core.c | 1 - + drivers/firmware/arm_scmi/virtio.c | 1 - + drivers/gpio/gpio-virtio.c | 1 - + drivers/gpu/drm/virtio/virtgpu_drv.c | 1 - + drivers/iommu/virtio-iommu.c | 1 - + drivers/misc/nsm.c | 1 - + drivers/net/caif/caif_virtio.c | 1 - + drivers/net/virtio_net.c | 149 +++++++++++++++++++++----- + drivers/net/wireless/virtual/mac80211_hwsim.c | 1 - + drivers/nvdimm/virtio_pmem.c | 1 - + drivers/rpmsg/virtio_rpmsg_bus.c | 1 - + drivers/scsi/virtio_scsi.c | 1 - + drivers/vdpa/vdpa.c | 2 +- + drivers/vdpa/vdpa_user/vduse_dev.c | 24 ++++- + drivers/vdpa/virtio_pci/vp_vdpa.c | 27 +++-- + drivers/vhost/scsi.c | 70 +++++++----- + drivers/vhost/vdpa.c | 6 +- + drivers/vhost/vhost.c | 130 +++++++++++++++------- + drivers/vhost/vhost.h | 3 +- + drivers/virtio/virtio_balloon.c | 85 +++++++++------ + drivers/virtio/virtio_input.c | 1 - + drivers/virtio/virtio_mem.c | 69 ++++++++++-- + drivers/virtio/virtio_mmio.c | 6 +- + drivers/virtio/virtio_pci_common.c | 4 +- + drivers/virtio/virtio_ring.c | 52 +++++++++ + fs/coredump.c | 4 +- + fs/fuse/virtio_fs.c | 1 - + include/linux/sched/vhost_task.h | 3 +- + include/linux/virtio.h | 7 ++ + include/uapi/linux/virtio_mem.h | 2 + + kernel/exit.c | 5 +- + kernel/signal.c | 4 +- + kernel/vhost_task.c | 53 +++++---- + net/9p/trans_virtio.c | 1 - + net/vmw_vsock/virtio_transport.c | 1 - + sound/virtio/virtio_card.c | 1 - + 42 files changed, 537 insertions(+), 200 deletions(-) +Merging rpmsg/for-next (c8d8f841e95b Merge branches 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/remoteproc/mtk,scp.yaml | 2 + + .../bindings/remoteproc/qcom,msm8996-mss-pil.yaml | 1 - + .../bindings/remoteproc/qcom,qcs404-cdsp-pil.yaml | 6 +- + .../bindings/remoteproc/qcom,sc7280-wpss-pil.yaml | 6 +- + .../bindings/remoteproc/qcom,sdm845-adsp-pil.yaml | 6 +- + .../bindings/remoteproc/qcom,smd-edge.yaml | 3 +- + .../bindings/remoteproc/xlnx,zynqmp-r5fss.yaml | 277 +++++++++++++++-- + drivers/remoteproc/mtk_common.h | 11 +- + drivers/remoteproc/mtk_scp.c | 240 +++++++++++++-- + drivers/remoteproc/mtk_scp_ipi.c | 7 +- + drivers/remoteproc/remoteproc_internal.h | 2 +- + drivers/remoteproc/remoteproc_sysfs.c | 2 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 56 +++- + drivers/remoteproc/xlnx_r5_remoteproc.c | 329 ++++++++++----------- + drivers/rpmsg/qcom_glink_ssr.c | 1 + + drivers/rpmsg/rpmsg_char.c | 2 +- + drivers/rpmsg/rpmsg_core.c | 16 +- + drivers/rpmsg/rpmsg_ctrl.c | 2 +- + drivers/rpmsg/rpmsg_internal.h | 2 +- + include/linux/remoteproc/mtk_scp.h | 1 + + 20 files changed, 730 insertions(+), 242 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 (7f45fe2ea3b8 gpio: nuvoton: Fix sgpio irq handle error) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (ecc4b1418e23 gpio: Add Intel Granite Rapids-D vGPIO driver) +$ 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 (9429f847dd72 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/pinctrl/mediatek,mt7622-pinctrl.yaml | 113 ++++++++++------- + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 38 ++++++ + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.yaml | 1 + + .../bindings/pinctrl/qcom,sm4450-tlmm.yaml | 52 +++----- + .../bindings/pinctrl/samsung,pinctrl.yaml | 21 ++++ + MAINTAINERS | 1 - + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 83 +++++++++++-- + drivers/pinctrl/freescale/pinctrl-imx8ulp.c | 1 + + drivers/pinctrl/mediatek/pinctrl-mt6765.c | 1 + + drivers/pinctrl/mediatek/pinctrl-mt6779.c | 1 + + drivers/pinctrl/mvebu/pinctrl-armada-37xx.c | 3 - + drivers/pinctrl/pinconf-generic.c | 2 +- + drivers/pinctrl/pinctrl-aw9523.c | 131 +++++++------------- + drivers/pinctrl/pinctrl-loongson2.c | 1 + + drivers/pinctrl/pinctrl-max77620.c | 2 - + drivers/pinctrl/pinctrl-single.c | 50 ++++---- + drivers/pinctrl/pinmux.c | 26 ++-- + drivers/pinctrl/pxa/pinctrl-pxa2xx.c | 55 ++++----- + drivers/pinctrl/pxa/pinctrl-pxa2xx.h | 15 +-- + drivers/pinctrl/qcom/pinctrl-sm7150.c | 21 ++-- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 4 + + drivers/pinctrl/realtek/pinctrl-rtd1315e.c | 1 + + drivers/pinctrl/realtek/pinctrl-rtd1319d.c | 1 + + drivers/pinctrl/renesas/pfc-r8a779h0.c | 136 +++++++++++++++++++-- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 4 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 112 +++++++++++++++++ + drivers/pinctrl/samsung/pinctrl-samsung.c | 95 +++++++++++++- + drivers/pinctrl/samsung/pinctrl-samsung.h | 2 + + drivers/pinctrl/sunxi/pinctrl-sun9i-a80-r.c | 1 - + include/dt-bindings/pinctrl/samsung.h | 95 -------------- + 30 files changed, 679 insertions(+), 390 deletions(-) + delete mode 100644 include/dt-bindings/pinctrl/samsung.h +Merging pinctrl-intel/for-next (5d10a157ebe0 pinctrl: baytrail: Add pinconf group for uart3) +$ 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 (cd27553b0dee pinctrl: renesas: rzg2l: Limit 2.5V power supply to Ethernet interfaces) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (e5b3732a9654 pinctrl: samsung: drop redundant drvdata assignment) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/pwm/for-next (4817118f257e pwm: pca9685: Drop explicit initialization of struct i2c_device_id::driver_data to 0) +$ 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 +Already up to date. +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 (2c3b8f8f37c6 selftests/sgx: Include KHDR_INCLUDES in Makefile) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (4cece7649650 Linux 6.9-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 (5496b9b77d74 kunit: bail out early in __kunit_test_suites_init() if there are no suites to test) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging livepatching/for-next (73a98bc5a947 Merge branch 'for-6.10' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Auto-merging init/init_task.c +Merge made by the 'ort' strategy. + include/linux/livepatch.h | 6 ++--- + init/init_task.c | 2 +- + kernel/livepatch/core.c | 4 ++-- + kernel/livepatch/patch.c | 4 ++-- + kernel/livepatch/transition.c | 54 +++++++++++++++++++++---------------------- + 5 files changed, 35 insertions(+), 35 deletions(-) +Merging rtc/rtc-next (1c431b92e21b dt-bindings: rtc: convert trivial devices into dtschema) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/rtc/alphascale,asm9260-rtc.txt | 19 -- + .../bindings/rtc/alphascale,asm9260-rtc.yaml | 50 +++ + .../devicetree/bindings/rtc/armada-380-rtc.txt | 24 -- + .../devicetree/bindings/rtc/digicolor-rtc.txt | 17 - + .../devicetree/bindings/rtc/fsl,stmp3xxx-rtc.yaml | 51 +++ + .../bindings/rtc/google,goldfish-rtc.txt | 17 - + .../devicetree/bindings/rtc/lpc32xx-rtc.txt | 15 - + .../bindings/rtc/marvell,armada-380-rtc.yaml | 51 +++ + .../devicetree/bindings/rtc/marvell,pxa-rtc.yaml | 40 +++ + .../devicetree/bindings/rtc/maxim,ds1742.txt | 12 - + .../devicetree/bindings/rtc/nxp,lpc1788-rtc.txt | 21 -- + .../devicetree/bindings/rtc/nxp,lpc1788-rtc.yaml | 58 ++++ + .../devicetree/bindings/rtc/orion-rtc.txt | 18 -- + Documentation/devicetree/bindings/rtc/pxa-rtc.txt | 14 - + .../devicetree/bindings/rtc/rtc-aspeed.txt | 22 -- + .../devicetree/bindings/rtc/spear-rtc.txt | 15 - + .../devicetree/bindings/rtc/stmp3xxx-rtc.txt | 21 -- + .../devicetree/bindings/rtc/trivial-rtc.yaml | 21 ++ + .../devicetree/bindings/rtc/via,vt8500-rtc.txt | 15 - + MAINTAINERS | 1 - + drivers/rtc/Kconfig | 10 + + drivers/rtc/Makefile | 1 + + drivers/rtc/lib_test.c | 33 +- + drivers/rtc/rtc-cros-ec.c | 9 +- + drivers/rtc/rtc-mcp795.c | 1 - + drivers/rtc/rtc-nct3018y.c | 15 +- + drivers/rtc/rtc-rx8111.c | 356 +++++++++++++++++++++ + 27 files changed, 681 insertions(+), 246 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/rtc/alphascale,asm9260-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/alphascale,asm9260-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/armada-380-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/digicolor-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/fsl,stmp3xxx-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/google,goldfish-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/lpc32xx-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/marvell,armada-380-rtc.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/marvell,pxa-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/maxim,ds1742.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.txt + create mode 100644 Documentation/devicetree/bindings/rtc/nxp,lpc1788-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/orion-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/pxa-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-aspeed.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/spear-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/stmp3xxx-rtc.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/via,vt8500-rtc.txt + create mode 100644 drivers/rtc/rtc-rx8111.c +Merging nvdimm/libnvdimm-for-next (41147b006be2 dax: remove redundant assignment to variable rc) +$ 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 MAINTAINERS +Auto-merging drivers/dax/bus.c +Auto-merging tools/testing/nvdimm/test/ndtest.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + arch/powerpc/platforms/pseries/papr_scm.c | 43 +------------------ + drivers/dax/bus.c | 3 +- + drivers/nvdimm/btt.c | 12 ++++-- + drivers/nvdimm/core.c | 30 ------------- + drivers/nvdimm/nd.h | 1 - + include/linux/papr_scm.h | 49 ++++++++++++++++++++++ + .../uapi/asm => include/uapi/linux}/papr_pdsm.h | 0 + tools/testing/nvdimm/test/ndtest.c | 2 + + tools/testing/nvdimm/test/ndtest.h | 31 -------------- + 10 files changed, 64 insertions(+), 109 deletions(-) + create mode 100644 include/linux/papr_scm.h + rename {arch/powerpc/include/uapi/asm => include/uapi/linux}/papr_pdsm.h (100%) +Merging at24/at24/for-next (4cece7649650 Linux 6.9-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 (e406737b1110 seccomp: Constify sysctl subhelpers) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging fsi/next (c5eeb63edac9 fsi: Fix panic on scom file read) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Merge made by the 'ort' strategy. + drivers/fsi/fsi-sbefifo.c | 9 ++++++++- + drivers/fsi/i2cr-scom.c | 11 ++++++++++- + 2 files changed, 18 insertions(+), 2 deletions(-) +Merging slimbus/for-next (4cece7649650 Linux 6.9-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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Already up to date. +Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (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 (93ee235f55d3 auxdisplay: charlcd: Don't rebuild when CONFIG_PANEL_BOOT_MESSAGE=y) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Already up to date. +Merging kgdb/kgdb/for-next (b2aba15ad6f9 serial: kgdboc: Fix NMI-safety problems from keyboard reset code) +$ 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. + drivers/tty/serial/kgdboc.c | 30 ++++++++- + kernel/debug/kdb/kdb_io.c | 153 ++++++++++++++++++++++---------------------- + kernel/debug/kdb/kdb_main.c | 2 +- + 3 files changed, 108 insertions(+), 77 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 (48f98496b1de bus: mhi: host: pci_generic: Add generic edl_trigger to allow devices to enter EDL mode) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (e5d1fdecfaf8 mm/memblock: remove empty dummy entry) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Merge made by the 'ort' strategy. + mm/memblock.c | 7 ++----- + tools/testing/memblock/tests/basic_api.c | 8 ++++---- + tools/testing/memblock/tests/common.c | 4 ++-- + 3 files changed, 8 insertions(+), 11 deletions(-) +Merging cxl/next (d99f13843237 cxl/cper: Remove duplicated GUID defines) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging MAINTAINERS +Auto-merging drivers/cxl/cxl.h +Auto-merging drivers/cxl/pci.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/acpi/apei/ghes.c | 84 ++++++++++++++++++++ + drivers/cxl/Kconfig | 1 + + drivers/cxl/acpi.c | 93 +++++++++++++---------- + drivers/cxl/core/core.h | 14 ++++ + drivers/cxl/core/hdm.c | 13 ++-- + drivers/cxl/core/mbox.c | 48 ++++++++++-- + drivers/cxl/core/memdev.c | 44 ----------- + drivers/cxl/core/region.c | 177 +++++++++++++++++++++++++++++++++++++------ + drivers/cxl/core/trace.c | 91 ---------------------- + drivers/cxl/core/trace.h | 50 ++++++++---- + drivers/cxl/cxl.h | 7 ++ + drivers/cxl/cxlmem.h | 3 + + drivers/cxl/pci.c | 71 ++++++++++++++++- + drivers/cxl/pmem.c | 2 - + include/linux/cxl-event.h | 39 ++++++++++ + include/uapi/linux/cxl_mem.h | 3 + + tools/testing/cxl/test/mem.c | 19 ++++- + 18 files changed, 527 insertions(+), 234 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 (4b2543f7e1e6 efi: libstub: only free priv.runtime_map when allocated) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (0131c1f3cce7 unicode: make utf8 test count static) +$ 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/utf8-selftest.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging slab/slab/for-next (4a8dd3b3d550 Merge branch 'slab/for-6.10/cleanup' into slab/for-next) +$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Merge made by the 'ort' strategy. +Merging random/master (7b1bcd6b50a6 virt: vmgenid: add support for devicetree bindings) +$ 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 drivers/virt/vmgenid.c +CONFLICT (content): Merge conflict in drivers/virt/vmgenid.c +Resolved 'drivers/virt/vmgenid.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6fead10eb068] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/rng/microsoft,vmgenid.yaml | 49 +++++++ + MAINTAINERS | 1 + + drivers/virt/Kconfig | 1 - + drivers/virt/vmgenid.c | 151 ++++++++++++++++----- + 4 files changed, 166 insertions(+), 36 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rng/microsoft,vmgenid.yaml +Merging landlock/next (5bf9e57e634b MAINTAINERS: Add Günther Noack as Landlock reviewer) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/userspace-api/landlock.rst | 78 ++++- + MAINTAINERS | 2 + + fs/ioctl.c | 3 + + include/uapi/linux/landlock.h | 38 ++- + samples/landlock/sandboxer.c | 18 +- + security/landlock/fs.c | 225 ++++++++++++- + security/landlock/limits.h | 2 +- + security/landlock/syscalls.c | 2 +- + tools/testing/selftests/landlock/base_test.c | 2 +- + tools/testing/selftests/landlock/fs_test.c | 487 ++++++++++++++++++++++++++- + 10 files changed, 811 insertions(+), 46 deletions(-) +Merging rust/rust-next (97ab3e8eec0c rust: alloc: fix dangling pointer in VecExt<T>::reserve()) +$ 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 (a35dd3a786f5 sysctl: drop now unnecessary out-of-bounds check) +$ 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 include/linux/sysctl.h +Auto-merging ipc/ipc_sysctl.c +Auto-merging ipc/mq_sysctl.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/exit.c +Auto-merging kernel/kprobes.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sched/topology.c +Auto-merging kernel/seccomp.c +Auto-merging kernel/signal.c +Auto-merging kernel/stackleak.c +Auto-merging kernel/time/timer.c +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/ucount.c +Auto-merging kernel/watchdog.c +Merge made by the 'ort' strategy. + fs/proc/proc_sysctl.c | 21 +++++++++------------ + include/linux/sysctl.h | 25 ++++++++++++------------- + ipc/ipc_sysctl.c | 5 ++--- + ipc/mq_sysctl.c | 5 ++--- + kernel/acct.c | 1 - + kernel/bpf/syscall.c | 1 - + kernel/delayacct.c | 1 - + kernel/exit.c | 1 - + kernel/hung_task.c | 1 - + kernel/kexec_core.c | 1 - + kernel/kprobes.c | 1 - + kernel/latencytop.c | 1 - + kernel/panic.c | 1 - + kernel/pid_namespace.c | 1 - + kernel/pid_sysctl.h | 1 - + kernel/printk/sysctl.c | 1 - + kernel/reboot.c | 1 - + kernel/sched/autogroup.c | 1 - + kernel/sched/core.c | 1 - + kernel/sched/deadline.c | 1 - + kernel/sched/fair.c | 1 - + kernel/sched/rt.c | 1 - + kernel/sched/topology.c | 1 - + kernel/seccomp.c | 1 - + kernel/signal.c | 1 - + kernel/stackleak.c | 1 - + kernel/sysctl.c | 2 -- + kernel/time/timer.c | 1 - + kernel/trace/ftrace.c | 1 - + kernel/trace/trace_events_user.c | 1 - + kernel/ucount.c | 5 ++--- + kernel/umh.c | 1 - + kernel/utsname_sysctl.c | 1 - + kernel/watchdog.c | 2 -- + net/sysctl_net.c | 3 +-- + 35 files changed, 28 insertions(+), 67 deletions(-) +Merging execve/for-next/execve (4bbf9c3b53e6 fs/coredump: Enable dynamic configuration of max file note size) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (c3052c2f53d3 usercopy: Don't use "proxy" headers) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging MAINTAINERS +Auto-merging include/linux/bitops.h +Auto-merging include/linux/cpumask.h +Auto-merging include/linux/find.h +Auto-merging kernel/sched/topology.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/find_bit.c +Auto-merging lib/test_bitmap.c +Merge made by the 'ort' strategy. + MAINTAINERS | 14 ++++++++++ + include/linux/bitops.h | 55 +++++++++++++++++++++++++------------ + include/linux/compiler_attributes.h | 13 +++++++++ + include/linux/cpumask.h | 10 +++++++ + include/linux/find.h | 2 +- + include/linux/wordpart.h | 7 +++++ + kernel/sched/topology.c | 6 ++-- + lib/Kconfig.debug | 1 - + lib/find_bit.c | 2 +- + lib/test_bitmap.c | 4 +-- + lib/test_bitops.c | 28 +++++++++++++++++++ + lib/usercopy.c | 9 ++++-- + 12 files changed, 122 insertions(+), 29 deletions(-) +Merging hte/for-next (297f26dbf870 hte: tegra-194: Convert to platform remove callback returning void) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (5a1f2a9c4236 ubsan: Restore dependency on ARCH_HAS_UBSAN) +$ 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 +Merge made by the 'ort' strategy. + lib/Kconfig.ubsan | 1 + + security/loadpin/Kconfig | 3 +++ + 2 files changed, 4 insertions(+) +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 (0adab2b6b733 tools/nolibc: add support for uname(2)) +$ 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 (4cece7649650 Linux 6.9-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. +Merging turbostat/next (dedcf3a8e704 tools/power turbostat: version 2024.05.10) +$ 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 | 27 +- + tools/power/x86/turbostat/turbostat.8 | 4 +- + tools/power/x86/turbostat/turbostat.c | 1172 ++++++++++++++++++++++++--------- + 3 files changed, 896 insertions(+), 307 deletions(-) +Merging refactor-heap/refactor-heap (940c306fd779 bcachefs: Remove heap-related macros and switch to generic min_heap) +$ git merge -m Merge branch 'refactor-heap' of https://evilpiepirate.org/git/bcachefs.git refactor-heap/refactor-heap +Auto-merging drivers/md/bcache/bset.c +CONFLICT (content): Merge conflict in drivers/md/bcache/bset.c +Auto-merging drivers/md/bcache/bset.h +CONFLICT (content): Merge conflict in drivers/md/bcache/bset.h +Auto-merging drivers/md/bcache/btree.c +CONFLICT (content): Merge conflict in drivers/md/bcache/btree.c +Auto-merging drivers/md/bcache/sysfs.c +Auto-merging drivers/md/bcache/writeback.c +CONFLICT (content): Merge conflict in drivers/md/bcache/writeback.c +Auto-merging fs/bcachefs/ec.c +Auto-merging fs/bcachefs/util.c +Auto-merging fs/bcachefs/util.h +Auto-merging kernel/events/core.c +Recorded preimage for 'drivers/md/bcache/bset.c' +Recorded preimage for 'drivers/md/bcache/bset.h' +Recorded preimage for 'drivers/md/bcache/btree.c' +Recorded preimage for 'drivers/md/bcache/writeback.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git merge --abort +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 00000000000000..0c27c68191c2f9 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20240515 |