diff options
| -rw-r--r-- | Next/SHA1s | 375 | ||||
| -rw-r--r-- | Next/Trees | 377 | ||||
| -rw-r--r-- | Next/merge.log | 4979 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 5732 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 0000000000000..c002618254fa9 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,375 @@ +Name SHA1 +---- ---- +origin 29c73fc794c83505066ee6db893b2a83ac5fac63 +fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +mm-hotfixes 20141ebd2d7d6b96bb99a3a98e48974bec90bfeb +kbuild-current ab32efe0e2b6ab01ba079995071da8d587c976cc +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 d65e1a0f305ba3e7aabf6261a37bb871790d9f93 +fscrypt-current 4cece764965020c22cff7665b18a012006359095 +fsverity-current 4cece764965020c22cff7665b18a012006359095 +net 30a92c9e3d6b073932762bef2ac66f4ee784c657 +bpf 8d00547ea8754afdc4a550af2fb7af2e3ba93cf8 +ipsec b6d2e438e16c7d4dbde08cfb2b95b0f3f325ba40 +netfilter 4b377b4868ef17b040065bd468668c707d2477a5 +ipvs a26ff37e624d12e28077e5b24d2b264f62764ad6 +wireless 838c7b8f1f278404d9d684c34a8cb26dc41aaaa1 +wpan 07aa33988ad92fef79056f5ec30b9a0e4364b616 +rdma-fixes ed30a4a51bb196781c8058073ea720133a65596f +sound-current 45e37f9ce28d248470bab4376df2687a215d1b22 +sound-asoc-fixes 47d09270d7776e46858a161f94b735640b2fb056 +regmap-fixes 7ba822189e6060a8a2833b721d430f833bf0db43 +regulator-fixes 81d3d32de658ad06511e6406a38f837e4db4ef03 +spi-fixes ef13561d2b163ac0ae6befa53bca58a26dc3320b +pci-current f0bae243b2bcf2b160ae547463bf542762beef8f +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 c6ab5c915da460c0397960af3c308386c3f3247b +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 ee63777c9b410cb872fb956f87a7230d00627981 +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 adbc49a5a8c6fcf7be154c2e30213bbf472940da +pinctrl-intel-fixes 5d10a157ebe02ac9b8abacfd529f8b045e8aa41b +auxdisplay-fixes 4cece764965020c22cff7665b18a012006359095 +erofs-fixes 7af2ae1b1531feab5d38ec9c8f472dc6cceb4606 +kunit-fixes cfedfb24c9ddee2bf1641545f6e9b6a02b924aee +memblock-fixes 592447f6cb3c20d606d6c5d8e6af68e99707b786 +nfsd-fixes 18180a4550d08be4eb0387fe83f02f703f92d4e7 +renesas-fixes 8c987693dc2d292d777f1be63cb35233049ae25e +perf-current ea558c86248b4955e5c5f3c0c921df450880605e +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 e8dc41afca161b988e6d462f4d0803d247e22250 +overlayfs-fixes 77a28aa476873048024ad56daf8f4f17d58ee48e +i2c-host-fixes b6394d6f715919c053c1450ef0d7c5e517b53764 +sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +clk-fixes aacb99de1099346244d488bdf7df489a44278574 +drm-misc-fixes 39bc27bd688066a63e56f7f64ad34fae03fbe3b8 +mm-stable 99b80ac45f7ec351c2d1c9fbfec702213dcae566 +mm-nonmm-stable db3e24a02e29b507c24c0adb4d22914c65dab763 +mm f24042adabb5e2c9173f1cde834ef640d5802581 +kbuild daa121128a2d2ac6006159e2c47676e4fcd21eab +clang-format 5a205c6a9f79d14db38006aa2d7c4f4e76b1bfc7 +perf ea558c86248b4955e5c5f3c0c921df450880605e +compiler-attributes 2993eb7a8d34aee6165e1f6676e81cdf1d22aa62 +dma-mapping a6016aac5252da9d22a4dc0b98121b0acdf6d2f5 +asm-generic 02af68767d27aa66c95ef0850545a9616c5e847e +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm 64ae2326dd774e64e8ef794b522d200bc60eda95 +arm64 ffbf4fb9b5c12ff878a10ea17997147ea4ebea6f +arm-perf 410e471f87465f04d7ae7f8ed16ef8e7a3b5517c +arm-soc 1e3dd71e2587a67cdd7afbafce95bdaa47ba8235 +amlogic e30237bd4f71204ffe13e7f92763cda3873376c7 +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed c44211af1aa9c6b93178a3993e18a7ebffab7488 +at91 fa8e55345b646f3eb5b1dc889bad4a2a1fa360d9 +broadcom 06902980d07aa6a4178851e31e663a6e32022ec8 +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 03be434863b9606435be9ef43651d4c0cbbe6788 +clk-imx f5072cffb35c122ec85d91ef327fa8814f04297b +clk-renesas 5add5ebc4e35a703a49976abfd82e708d9aea4ad +csky 2c40c1c6adab90ee4660caf03722b3a3ec67767b +loongarch 9cc1df421f00453afdcaf78b105d8e7fd03cce78 +m68k ec8c8266373f6283a3e99b036aea7b9428480625 +m68knommu a5044ce7d1d94cd37be99e86964aa054f7e5564c +microblaze 58d647506c92ccd3cfa0c453c68ddd14f40bf06f +mips 07e6a6d7f1d9fa4685003a195032698ba99577bb +openrisc 4dc70e1aadfadf968676d983587c6f5d455aba85 +parisc-hd bbf5c979011a099af5dc76498918ed7df445635b +powerpc 61700f816e6f58f6b1aaa881a69a784d146e30f0 +powerpc-kdump-hotplug 9803af291162dbca4b9773586a3f5c392f0dd974 +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v 92cce91949a497a8a4615f9ba5813b03f7a1f1d5 +riscv-dt 1c80d50bb697f84bfbc3876e08e1a1d42bfbdddb +riscv-soc 16d9122246cc05b5e89e207757ca2a69f720509c +s390 c1248638f8c35b74400efa7e02e78ecda23373f9 +sh efe976b7eecfa3f81e241da67d1a511e30a87779 +sparc 1c9e709cde80fb612e07d9503ad04457e8a58da2 +uml 919e3ece7f5aaf7b5f3c54538d5303b6eeeb053b +xtensa b7cf2a1d9881823133acc48427815a48b35b49f4 +bcachefs dcb8f1e8fc299c13169af5468b19063d829eba7e +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt 7f016edaa0f385da0c37eee1ebb64c7f6929c533 +afs abcbd3bfbbfe97a8912d0c929d4aa18f50d9bc52 +btrfs 7b79c81bbd20a4c50b980bd7ff8637c277998f92 +ceph d3e0469306793972fd2b1ea016fa7ab0658c9849 +cifs 6f82ac3618b544edcacdc35497a97c1be5276077 +configfs 4425c1d9b44ded655d2668e1ce95a62bccf7b21b +erofs 80eb4f62056d6ae709bdd0636ab96ce660f494b2 +exfat f19257997d9c31864b4cf3fcef6e2d2b9ede148d +exportfs e8f897f4afef0031fe618a8e94127a0934896aba +ext3 82172cca18b25e36c0c2bdd96ed6c158617ead2f +ext4 c6a6c9694aadc4c3ab8d89bdd44aed3eab1e43c6 +f2fs 72ece20127a366518d91c5ab8e9dd8bf7d7fdb2f +fsverity ee5814dddefbaa181cb247a75676dd5103775db1 +fuse 529395d2ae6456c556405016ea0c43081fe607f3 +gfs2 c1c53c26e3380a79b65e6b53dac6c3c797a7e8f1 +jfs e42e29cc442395d62f1a8963ec2dfb700ba6a5d7 +ksmbd 9f237320678677f4e28abb23d0c41d37ebe907fe +nfs 3c0a2e0b0ae661457c8505fecc7be5501aa7a715 +nfs-anna 57331a59ac0d680f606403eb24edd3c35aecba31 +nfsd 8d915bbf39266bb66082c1e4980e123883f19830 +ntfs3 24f6f5020b0b2c89c2cba5ec224547be95f753ee +orangefs 53e4efa470d5fc6a96662d2d3322cfc925818517 +overlayfs e9229c18dae3b3c2556cea8413edd1f76c78d767 +ubifs af9a8730ddb6a4b2edd779ccc0aceb994d616830 +v9fs 25ef7dc83ebef20c1a06b241213a8aa8be790d62 +v9fs-ericvh a38297e3fb012ddfa7ce0321a7e5a8daeb1872b6 +xfs 25576c5420e61dea4c2b52942460f2221b8e46e8 +zonefs 567e629fd296561aacd04547a603b163de3dabbe +iomap 3ac974796e5d94509b85a403449132ea660127c2 +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner 584bbf439d0fa83d728ec49f3a38c581bdc828b4 +vfs a38297e3fb012ddfa7ce0321a7e5a8daeb1872b6 +printk 596ffa476e201ecbf7ea024f1b59d4f28e91060c +pci f0bae243b2bcf2b160ae547463bf542762beef8f +pstore 9dd12ed95c2d06a29a5d289c6e65589c577ef8ca +hid 14ee3d12f37b2594b9aa01fee2f7cff51bc71b26 +i2c 24a9d78e808cf7523be4281bd3dddbe45443b954 +i2c-host 61e05bad821cb293418794738e7cc359949f44fe +i3c acec16dbb3382304a4993de8c2dd54a625c6240d +dmi 4d1b28a8119c615f1e932520f9ee1f80bdda5204 +hwmon-staging 5fbf8734fb36cf67339f599f0e51747a6aff690c +jc_docs 955e15969c1d1abb53fc61018bc176bec570b8f4 +v4l-dvb 8771b7f31b7fff91a998e6afdb60650d4bac59a5 +v4l-dvb-next 8771b7f31b7fff91a998e6afdb60650d4bac59a5 +pm bbfa78f51501be282c574d844beccdfb2762366d +cpufreq-arm fde234239d161f958390e41d26cda2bb166f1994 +cpupower 55f9f60852ef0dfcb270fd088ea9f493a5a7bdf8 +devfreq ccad360a2d415447bd6f0de9e873eec05442d159 +pmdomain e8dc41afca161b988e6d462f4d0803d247e22250 +opp 4cece764965020c22cff7665b18a012006359095 +thermal 69b08420b6972425b52c2f0562e5c2c33bf10a59 +dlm 7b72ab2c6a468305449db8f204bf1e406fd3e147 +rdma 9c0731832d3b7420cbadba6a7f334363bc8dfb15 +net-next 4b377b4868ef17b040065bd468668c707d2477a5 +bpf-next 5c1672705a1a2389f5ad78e0fea6f08ed32d6f18 +ipsec-next dcf280ea0aad87e70ef1646d579d11f8a52f8b67 +mlx5-next d727d27db536faea7178290c677cc0567f647231 +netfilter-next 5c1672705a1a2389f5ad78e0fea6f08ed32d6f18 +ipvs-next 5c1672705a1a2389f5ad78e0fea6f08ed32d6f18 +bluetooth 7b13a745870c1d098466fcb44e44edb550ef3338 +wireless-next 1d60eabb82694e58543e2b6366dae3e7465892a5 +wpan-next 9187210eee7d87eea37b45ea93454a88681894a4 +wpan-staging 9187210eee7d87eea37b45ea93454a88681894a4 +mtd 6277967d872e229de53b0585ebc34c8172965492 +nand 6819db94e1cd3ce24a432f3616cd563ed0c4eaba +spi-nor c84b3925c7d6c649f5add009084ff409139f894d +crypto 13909a0c88972c5ef5d13f44d1a8bf065a31bdf4 +drm 5a5a10d9db77939a22e1d65fc0a4ba6b5d8f4fce +drm-exynos 7a5bdb7ca1b4bb4ffb20ea610ef4e09c56552667 +drm-misc 5a507b7d2be15fddb95bf8dee01110b723e2bcd9 +amdgpu 9c1a429217d294ade1a88eddde987a183d4d3ae4 +drm-intel a568ff8cd0feb9202d8bd7d572b170931b57248c +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm b587f413ca47530b41aadc6f6bda6fc76153f77f +drm-msm-lumag 104e548a7c97da24224b375632fca0fc8b64c0db +drm-xe 01d71dff61c7e1efae1d7f11b71dfa4549c172bb +etnaviv e843e87abb909a042813497ab32f85a8eb03bcc8 +fbdev a38297e3fb012ddfa7ce0321a7e5a8daeb1872b6 +regmap 7ba822189e6060a8a2833b721d430f833bf0db43 +sound 45e37f9ce28d248470bab4376df2687a215d1b22 +ieee1394 21151fd8f0ea5dcff27e8db25b65bf892d408bdc +sound-asoc 47d09270d7776e46858a161f94b735640b2fb056 +modules 2c9e5d4a008293407836d29d35dfd4353615bd2f +input e7647cbaba0e3792d03fa538e58d063ec8c8b35c +block b4b6c637a30f1c7732912e553e918eb0079206e9 +device-mapper 825d8bbd2f32cb229c3b6653bd454832c3c20acb +libata d4a89339f17c87c4990070e9116462d16e75894f +pcmcia ccae53aa8aa2d902242555638c5de104aab08879 +mmc 35eea0defb6e46b26e286066e0e77ac5d53e7fba +mfd 1482489b5196f4203576ae1dc2ba4ce3ada381c7 +backlight 1fd949f653ee1a3c1776ef8a5295ae072c9b67f2 +battery 55f7073f6f59ef2c9e98b70f74118dba62e1aabc +regulator 81d3d32de658ad06511e6406a38f837e4db4ef03 +security dd80c7465029dd0671e6f9fc2678ae0fbdf785ac +apparmor 3dd384108d53834002be5630132ad5c3f32166ad +integrity 9fa8e76250082a45d0d3dad525419ab98bd01658 +selinux 4b60f3cd1134b46557ceffb8fecd6d0493b9f740 +smack 69b6d71052b54fb10feba68564ccb41c0f0ce1e9 +tomoyo 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tpmdd 050bf3c793a07f96bd1e2fd62e1447f731ed733b +watchdog c45b8cfc6d5c12fbbc4d89b24b59402df99c1ecb +iommu 2bd5059c6cc04b02073d4d9f57137ab74e1d8e7a +audit 4cece764965020c22cff7665b18a012006359095 +devicetree d976c6f4b32c2d273d44ff9ad7099efe16279a39 +dt-krzk 3d679a406f3a323361247c42268ed6031d366e61 +mailbox 10b98582bc76a65b7c9dcee82b7918d7949740de +spi e958cffa42dfa99c25ec855b124d9bbc47173826 +tip 5242c6fd8c29e620393d7f12763bdf1efb1ab164 +clockevents 2030a7e11f161b4067bd4eadd984cdb36446fcca +edac ab80b31cd7b2913902f79c9b9bae343d28fdcf71 +ftrace fde0aeca59268df5f3884b1c8d015ac53e6618f4 +rcu 0e9b1d2b05601ee54f26a3f562450db708707e85 +kvm 6f627b425378915b6eda30908bedefc21b70b8c4 +kvm-arm eaa46a28d59655aa89a8fb885affa6fc0de44376 +kvms390 39cd87c4eb2b893354f3b850f916353f2658ae6f +kvm-ppc b52e8cd3f835869370f8540f1bc804a47a47f02b +kvm-riscv 5ef2f3d4e747c7851678ad2b70e37be886a8c9eb +kvm-x86 d91a9cc16417b8247213a0144a1f0fd61dc855dd +xen-tip 89af61fb8f0f96646e1462246a825c1268ba70ba +percpu 2d9ad81ef93570bc0d4929d05d0601ea400d6fcf +workqueues 2a1b02bcba78f8498ab00d6142e1238d85b01591 +drivers-x86 2513563edc984c3cf05bca1244b46de06daa4755 +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 f5b335dc025cfee90957efa90dc72fada0d5abb4 +accel f03eee5fc922158654405318a02db9982c0ddf07 +coresight 9b47d9982d1de5adf0abcb8f1a400e51d68cca1f +fastrpc 4cece764965020c22cff7665b18a012006359095 +fpga b7c0e1ecee403a43abc89eb3e75672b01ff2ece9 +icc 230d05b1179f6ce6f8dc8a2b99eba92799ac22d7 +iio 827dca3129708a8465bde90c86c2e3c38e62dd4f +phy-next 960b3f023d3bda0efd6e573a0647227d1115d266 +soundwire a0df7e04eab07cb2c08517209f792a8070504f0d +extcon 3e8e45b65d9f3f1811c020325a306da0f01e485b +gnss 0bbac3facb5d6cc0171c45c9873a2dc96bea9680 +vfio cbb325e77fbe62a06184175aa98c9eb98736c3e8 +w1 cde37a5bdb0ed2c4c7b86ef688e5fdb697525a57 +spmi 4cece764965020c22cff7665b18a012006359095 +staging eb563dc752d33b0a5d4952964af15ca892f59524 +counter-next 89d5d9e9500826cbd3b15ea7b6e8d9fae966f073 +siox db418d5f1ca5b7bafc8eaa9393ea18a7901bb0ed +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 28059ddbee0eb92730931a652e16a994499a7858 +cgroup 21c38a3bd4ee3fb7337d013a638302fb5e5f9dc2 +scsi 5621e21c7fd983ab31810f50a0eb854f9de1bcdf +scsi-mkp e4f5f8298cf6ddae43210d236ad65ac2c6379559 +vhost c9d853a0540291d48ab10fcf4e5a75f1f4741da9 +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 a97853f25b06f71c23b2d7a59fbd40f3f42d55ac +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 15aa8fb852f995dd234a57f12dfb989044968bb6 +unicode 0131c1f3cce7c01b0eb657a9e9e1a5e42c09a68b +slab 4a8dd3b3d55099efba5d98975ebf78c05e52d1ab +random 8f6a15f095a63a83b096d9b29aaff4f0fbe6f6e6 +landlock 38a04f7415696c892f9e4a8e29668ad72c429214 +rust 97ab3e8eec0ce79d9e265e6c9e4c480492180409 +sysctl a35dd3a786f57903151b18275b1eed105084cf72 +execve 4bbf9c3b53e637eb3a14ee27b996300ce88e752a +bitmap 5671dca241b9a2f4ecf88d8e992041cfb580e0a5 +hte 297f26dbf870d4f19591b74a0ab535c327917b81 +kspp ae1a863bcdbd6ea2abc93519a82ab5d715d5dcbc +kspp-gustavo 6613476e225e090cc9aad49be7fa504e290dd33d +nolibc 0adab2b6b7336fb6ee3c6456a432dad3b1d25647 +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd 4cece764965020c22cff7665b18a012006359095 +turbostat 256d218ec6aea99855dc5c54af550fcff96fc732 +refactor-heap 940c306fd77984112185b93c4edd9c8fc7e84194 +header_cleanup 5f4c01f1e3c7b0c8d1e5dd6f080531de7aa5e47b diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 0000000000000..b3b458ea39673 --- /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 https://gitlab.freedesktop.org/drm/i915/kernel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +auxdisplay-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes +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 https://gitlab.freedesktop.org/drm/i915/kernel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +drm-xe git https://gitlab.freedesktop.org/drm/xe/kernel#drm-xe-next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 git https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git 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 0000000000000..9df4c08ff18d0 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4979 @@ +$ date -R +Wed, 22 May 2024 09:25:04 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 3eb3c33c1d87 Merge tag 'asm-generic-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic +Merging origin/master (29c73fc794c8 Merge tag 'perf-tools-for-v6.10-1-2024-05-21' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 3eb3c33c1d87..29c73fc794c8 +Fast-forward (no commit created; -m option ignored) + .../testing/sysfs-bus-event_source-devices-events | 6 + + Documentation/PCI/msi-howto.rst | 2 +- + Documentation/PCI/pci.rst | 2 +- + Documentation/PCI/pcieaer-howto.rst | 2 +- + .../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 + + .../devicetree/bindings/mailbox/arm,mhuv3.yaml | 224 ++ + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 1 + + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 1 + + .../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 | 2 +- + .../devicetree/bindings/pci/qcom,pcie-common.yaml | 2 +- + .../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 | 3 +- + .../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 | 2 +- + .../bindings/pci/xlnx,axi-pcie-host.yaml | 2 +- + .../devicetree/bindings/pci/xlnx,nwl-pcie.yaml | 2 +- + .../devicetree/bindings/pci/xlnx,xdma-host.yaml | 2 +- + .../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 + + .../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 ++- + Documentation/filesystems/porting.rst | 7 + + Documentation/translations/zh_CN/PCI/msi-howto.rst | 2 +- + Documentation/translations/zh_CN/PCI/pci.rst | 2 +- + MAINTAINERS | 29 +- + arch/m68k/include/uapi/asm/ptrace.h | 2 +- + arch/s390/boot/startup.c | 1 - + arch/s390/include/asm/alternative-asm.h | 1 + + arch/s390/include/asm/alternative.h | 1 + + arch/s390/include/asm/cpacf.h | 109 +- + arch/s390/include/asm/pgtable.h | 12 +- + arch/s390/include/asm/processor.h | 17 +- + arch/s390/include/asm/stacktrace.h | 12 + + arch/s390/kernel/Makefile | 1 - + 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/kprobes.c | 67 +- + arch/s390/kernel/kprobes.h | 9 - + arch/s390/kernel/kprobes_insn_page.S | 22 - + arch/s390/kernel/perf_event.c | 34 +- + arch/s390/kernel/process.c | 5 - + arch/s390/kernel/setup.c | 2 +- + 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 +- + arch/x86/kernel/apic/msi.c | 5 - + arch/x86/pci/mmconfig-shared.c | 40 +- + arch/x86/pci/olpc.c | 3 - + block/bdev.c | 97 +- + block/blk-core.c | 17 +- + block/blk-mq.c | 2 +- + block/blk-zoned.c | 8 +- + 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/acpi/ec.c | 25 +- + drivers/acpi/internal.h | 1 - + drivers/ata/pata_cs5520.c | 6 - + 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/cpufreq/amd-pstate.c | 7 + + 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/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 +- + drivers/firmware/efi/libstub/x86-stub.c | 28 +- + drivers/gpio/gpiolib-acpi.c | 29 +- + 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/mailbox/Kconfig | 21 +- + drivers/mailbox/Makefile | 2 + + drivers/mailbox/arm_mhuv3.c | 1103 ++++++++++ + drivers/mailbox/bcm-pdc-mailbox.c | 21 +- + drivers/mailbox/imx-mailbox.c | 16 +- + drivers/mailbox/mtk-cmdq-mailbox.c | 3 +- + drivers/mailbox/omap-mailbox.c | 517 +---- + drivers/mailbox/zynqmp-ipi-mailbox.c | 412 +++- + drivers/md/bcache/super.c | 6 +- + drivers/md/dm-cache-target.c | 5 +- + drivers/md/dm-clone-target.c | 4 +- + drivers/md/dm-integrity.c | 1 + + drivers/md/dm-log-writes.c | 2 +- + drivers/md/dm-snap.c | 2 +- + drivers/md/dm-target.c | 1 - + drivers/md/dm-thin.c | 4 +- + drivers/md/dm-vdo/dm-vdo-target.c | 4 +- + drivers/md/dm-vdo/indexer/io-factory.c | 2 +- + drivers/md/dm-zero.c | 1 - + drivers/md/dm-zoned-target.c | 1 - + drivers/md/dm.c | 2 +- + drivers/mfd/intel-lpss-pci.c | 2 +- + drivers/misc/vmw_vmci/vmci_guest.c | 3 +- + drivers/mtd/devices/block2mtd.c | 6 +- + 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/opp/core.c | 31 +- + drivers/pci/access.c | 44 +- + drivers/pci/controller/cadence/pcie-cadence-ep.c | 7 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 9 + + drivers/pci/controller/dwc/pci-imx6.c | 10 + + drivers/pci/controller/dwc/pci-keystone.c | 11 + + drivers/pci/controller/dwc/pci-layerscape-ep.c | 9 + + drivers/pci/controller/dwc/pcie-artpec6.c | 15 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 240 ++- + drivers/pci/controller/dwc/pcie-designware-plat.c | 11 + + drivers/pci/controller/dwc/pcie-designware.h | 14 +- + drivers/pci/controller/dwc/pcie-keembay.c | 18 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 4 +- + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 28 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 8 +- + 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/doe.c | 12 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 80 +- + drivers/pci/endpoint/pci-ep-cfs.c | 9 + + drivers/pci/endpoint/pci-epc-core.c | 22 + + 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 | 2 - + 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 | 20 + + drivers/perf/cxl_pmu.c | 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 +- + drivers/platform/x86/intel_ips.c | 2 +- + drivers/platform/x86/wmi.c | 92 - + drivers/pmdomain/core.c | 10 + + drivers/remoteproc/mtk_common.h | 11 +- + drivers/remoteproc/mtk_scp.c | 241 ++- + 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 | 58 +- + 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 +- + drivers/s390/block/dasd_ioctl.c | 2 +- + drivers/s390/char/vmlogrdr.c | 20 +- + drivers/s390/cio/airq.c | 1 - + drivers/s390/cio/cio.c | 1 - + drivers/s390/crypto/ap_bus.c | 10 +- + drivers/s390/crypto/pkey_api.c | 109 +- + drivers/s390/crypto/zcrypt_api.c | 9 +- + drivers/s390/crypto/zcrypt_ccamisc.c | 12 +- + drivers/s390/crypto/zcrypt_ep11misc.c | 6 +- + drivers/s390/net/netiucv.c | 20 +- + drivers/s390/net/smsgiucv_app.c | 21 +- + 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/scsicam.c | 2 +- + drivers/scsi/vmw_pvscsi.c | 2 +- + 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 + + drivers/target/target_core_file.c | 4 +- + drivers/thermal/mediatek/lvts_thermal.c | 15 +- + drivers/thermal/thermal_core.c | 9 +- + drivers/thermal/thermal_trip.c | 18 + + drivers/tty/hvc/hvc_iucv.c | 15 +- + drivers/tty/serial/8250/8250_pci.c | 2 +- + drivers/usb/core/hcd-pci.c | 3 +- + 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/pidfs.c | 28 +- + 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/dt-bindings/arm/mhuv3-dt.h | 13 + + include/dt-bindings/phy/phy-qcom-qmp.h | 4 + + include/linux/bitops.h | 19 +- + include/linux/blk_types.h | 19 +- + include/linux/blkdev.h | 40 +- + include/linux/buffer_head.h | 4 +- + include/linux/compiler_attributes.h | 13 + + include/linux/cpumask.h | 10 + + include/linux/dma/imx-dma.h | 1 + + include/linux/fdtable.h | 15 +- + include/linux/find.h | 2 +- + include/linux/fs.h | 14 +- + include/linux/irqdomain_defs.h | 1 - + include/linux/jbd2.h | 4 +- + include/linux/lockdep.h | 5 + + include/linux/msi.h | 2 - + include/linux/msi_api.h | 1 - + include/linux/omap-mailbox.h | 13 - + include/linux/part_stat.h | 2 +- + include/linux/pci-epc.h | 7 +- + include/linux/pci.h | 74 +- + include/linux/pci_ids.h | 2 + + include/linux/pm_domain.h | 6 + + include/linux/remoteproc/mtk_scp.h | 1 + + include/linux/soundwire/sdw.h | 19 +- + include/linux/soundwire/sdw_intel.h | 11 +- + include/linux/soundwire/sdw_registers.h | 2 +- + include/linux/swap.h | 2 - + include/linux/wordpart.h | 7 + + include/net/iucv/iucv.h | 7 +- + include/uapi/linux/pci_regs.h | 6 + + io_uring/rw.c | 4 +- + kernel/power/swap.c | 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 +- + lib/vsprintf.c | 4 +- + mm/swapfile.c | 29 +- + net/iucv/iucv.c | 38 +- + scripts/Makefile.vdsoinst | 2 +- + scripts/coccinelle/api/pm_runtime.cocci | 2 +- + scripts/coccinelle/misc/minmax.cocci | 32 +- + scripts/headers_install.sh | 1 - + security/keys/trusted-keys/trusted_tpm2.c | 25 +- + sound/soc/intel/avs/core.c | 2 +- + sound/soc/sof/intel/hda.c | 4 +- + 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 +- + 701 files changed, 25230 insertions(+), 9737 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/dma/qcom_hidma_mgmt.txt + create mode 100644 Documentation/devicetree/bindings/mailbox/arm,mhuv3.yaml + 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 + 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 + delete mode 100644 arch/s390/kernel/kprobes.h + delete mode 100644 arch/s390/kernel/kprobes_insn_page.S + create mode 100644 drivers/dma/fsl-edma-trace.c + create mode 100644 drivers/dma/fsl-edma-trace.h + create mode 100644 drivers/mailbox/arm_mhuv3.c + 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 + create mode 100644 include/dt-bindings/arm/mhuv3-dt.h + 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 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 (20141ebd2d7d lib-add-version-into-proc-allocinfo-output-fix) +$ 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. + Documentation/filesystems/proc.rst | 5 ++-- + lib/alloc_tag.c | 47 ++++++++++++++++++++++++++------------ + mm/vmalloc.c | 5 ++-- + 3 files changed, 37 insertions(+), 20 deletions(-) +Merging kbuild-current/fixes (ab32efe0e2b6 kbuild: scripts/gdb: Replace missed $(srctree)/$(src) w/ $(src)) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Merge made by the 'ort' strategy. + scripts/gdb/linux/Makefile | 2 +- + scripts/kconfig/expr.c | 2 +- + scripts/kconfig/expr.h | 5 ----- + scripts/kconfig/symbol.c | 6 ++++-- + 4 files changed, 6 insertions(+), 9 deletions(-) +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 (d65e1a0f305b Merge tag 's390-6.10-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ 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 (30a92c9e3d6b openvswitch: Set the skbuff pkt_type for proper pmtud support.) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Auto-merging drivers/net/ethernet/realtek/r8169_main.c +Auto-merging net/unix/af_unix.c +Merge made by the 'ort' strategy. + drivers/net/Makefile | 4 +- + drivers/net/ethernet/realtek/r8169_main.c | 6 +-- + net/ipv4/tcp_dctcp.c | 13 ++++- + net/ipv6/seg6_hmac.c | 42 ++++++++++------ + net/ipv6/seg6_iptunnel.c | 11 ++-- + net/nfc/nci/core.c | 15 +++++- + net/openvswitch/actions.c | 6 +++ + net/unix/af_unix.c | 28 ++++++++--- + net/unix/garbage.c | 23 +++++---- + tools/testing/selftests/net/af_unix/scm_rights.c | 4 +- + tools/testing/selftests/net/amt.sh | 8 ++- + .../selftests/net/arp_ndisc_untracked_subnets.sh | 53 +++++++------------- + tools/testing/selftests/net/forwarding/lib.sh | 58 ---------------------- + tools/testing/selftests/net/lib.sh | 58 ++++++++++++++++++++++ + 14 files changed, 191 insertions(+), 138 deletions(-) +Merging bpf/master (8d00547ea875 MAINTAINERS: Add myself as reviewer of ARM64 BPF JIT) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + 1 file changed, 1 insertion(+) +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 (4b377b4868ef kprobe/ftrace: fix build error due to bad function definition) +$ 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 +Already up to date. +Merging wpan/master (07aa33988ad9 mac802154: fix time calculation in ieee802154_configure_durations()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Merge made by the 'ort' strategy. + net/mac802154/main.c | 14 ++++++++------ + 1 file changed, 8 insertions(+), 6 deletions(-) +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 (45e37f9ce28d ALSA: hda/realtek: Enable headset mic of JP-IK LEAP W502 with ALC897) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + Documentation/sound/hd-audio/notes.rst | 16 ++++++++-------- + sound/core/timer.c | 8 ++++++++ + sound/pci/hda/patch_realtek.c | 9 +++++++++ + sound/usb/quirks.c | 4 ++-- + 4 files changed, 27 insertions(+), 10 deletions(-) +Merging sound-asoc-fixes/for-linus (47d09270d777 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 +Auto-merging Documentation/devicetree/bindings/sound/st,stm32-sai.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/st,stm32-sai.yaml | 2 +- + include/sound/tas2781-dsp.h | 7 +- + sound/soc/codecs/es8326.c | 6 +- + sound/soc/codecs/rt5645.c | 1 + + sound/soc/codecs/tas2552.c | 15 ++- + sound/soc/codecs/tas2781-fmwlib.c | 103 ++++++--------------- + sound/soc/codecs/tas2781-i2c.c | 4 +- + .../soc/intel/boards/sof_sdw_rt_sdca_jack_common.c | 2 +- + 8 files changed, 51 insertions(+), 89 deletions(-) +Merging regmap-fixes/for-linus (7ba822189e60 regmap: kunit: Fix array overflow in stride() test) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/base/regmap/regmap-kunit.c | 9 ++++++++- + 1 file changed, 8 insertions(+), 1 deletion(-) +Merging regulator-fixes/for-linus (81d3d32de658 Merge remote-tracking branch 'regulator/for-6.9' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/regulator/bd71828-regulator.c | 58 ++-------------------------------- + drivers/regulator/helpers.c | 43 +++++++++++++++++-------- + drivers/regulator/rohm-regulator.c | 4 +++ + drivers/regulator/tps6287x-regulator.c | 1 + + drivers/regulator/tps6594-regulator.c | 16 +++++----- + include/linux/regulator/driver.h | 3 ++ + 6 files changed, 48 insertions(+), 77 deletions(-) +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 (f0bae243b2bc Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) +$ 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 (c6ab5c915da4 crypto: ecc - Prevent ecc_digits_from_bytes from reading too many bytes) +$ 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 (ee63777c9b41 Merge branch 'misc-6.10' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Auto-merging fs/btrfs/zoned.c +Merge made by the 'ort' strategy. + fs/btrfs/extent-tree.c | 2 +- + fs/btrfs/qgroup.c | 32 +++++++++++++++++++++++++------- + fs/btrfs/scrub.c | 2 +- + fs/btrfs/super.c | 8 ++++++++ + fs/btrfs/zoned.c | 13 ++++++++++--- + 5 files changed, 45 insertions(+), 12 deletions(-) +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 https://gitlab.freedesktop.org/drm/i915/kernel 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 +Already up to date. +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 (adbc49a5a8c6 gpiolib: acpi: Fix failed in acpi_gpiochip_find() by adding parent node match) +$ 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 (ea558c86248b tools lib subcmd: Show parent options in help) +$ 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 (e8dc41afca16 pmdomain: imx: gpcv2: Add delay after power up handshake) +$ 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/imx/gpcv2.c | 11 +++++++++++ + 1 file changed, 11 insertions(+) +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 (b6394d6f7159 Merge tag 'pull-misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'i2c/i2c-host-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-host-fixes/i2c/i2c-host-fixes +Already up to date. +Merging sparc-fixes/for-linus (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging clk-fixes/clk-fixes (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 (39bc27bd6880 drm/shmem-helper: Fix BUG_ON() on mmap(PROT_WRITE, MAP_PRIVATE)) +$ 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 +Auto-merging drivers/gpu/drm/drm_buddy.c +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_abi16.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_bo.c +Auto-merging drivers/gpu/drm/tests/drm_buddy_test.c +Auto-merging include/drm/drm_buddy.h +Auto-merging include/uapi/drm/nouveau_drm.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/drm_buddy.c | 2 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 3 +++ + drivers/gpu/drm/nouveau/nouveau_abi16.c | 3 +++ + drivers/gpu/drm/nouveau/nouveau_bo.c | 44 ++++++++++++++------------------- + drivers/gpu/drm/tests/drm_buddy_test.c | 42 +++++++++++++++---------------- + include/drm/drm_buddy.h | 6 ++--- + include/uapi/drm/nouveau_drm.h | 7 ++++++ + 7 files changed, 57 insertions(+), 50 deletions(-) +Merging mm-stable/mm-stable (99b80ac45f7e mm/page-owner: use gfp_nested_mask() instead of open coded masking) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Merge made by the 'ort' strategy. + include/linux/gfp.h | 25 +++++++++++++++++++++++++ + lib/stackdepot.c | 11 ++--------- + mm/kmemleak.c | 12 ++++-------- + mm/page_owner.c | 7 +------ + 4 files changed, 32 insertions(+), 23 deletions(-) +Merging mm-nonmm-stable/mm-nonmm-stable (db3e24a02e29 nilfs2: make block erasure safe in nilfs_finish_roll_forward()) +$ 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/core-api/index.rst +Auto-merging arch/x86/Makefile +Auto-merging lib/Kconfig.debug +Auto-merging tools/testing/selftests/kselftest_harness.h +Merge made by the 'ort' strategy. + Documentation/core-api/floating-point.rst | 78 ++++++++++++++++++++++++++ + Documentation/core-api/index.rst | 1 + + Makefile | 5 ++ + arch/Kconfig | 6 ++ + arch/arm/Makefile | 7 +++ + arch/arm/include/asm/fpu.h | 15 +++++ + arch/arm/lib/Makefile | 3 +- + arch/arm64/Kconfig | 1 + + arch/arm64/Makefile | 9 ++- + arch/arm64/include/asm/fpu.h | 15 +++++ + arch/arm64/lib/Makefile | 6 +- + arch/loongarch/Kconfig | 1 + + arch/loongarch/Makefile | 5 +- + arch/loongarch/include/asm/fpu.h | 1 + + arch/powerpc/Kconfig | 1 + + arch/powerpc/Makefile | 5 +- + arch/powerpc/include/asm/fpu.h | 28 +++++++++ + 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/x86/Kconfig | 1 + + arch/x86/Makefile | 20 +++++++ + arch/x86/include/asm/fpu.h | 13 +++++ + arch/x86/include/asm/fpu/types.h | 6 +- + 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 ++++ + lib/Kconfig.debug | 2 +- + lib/Makefile | 26 +-------- + lib/raid6/Makefile | 33 ++++------- + lib/test_fpu.h | 8 +++ + lib/{test_fpu.c => test_fpu_glue.c} | 37 ++---------- + lib/test_fpu_impl.c | 37 ++++++++++++ + scripts/Makefile.extrawarn | 29 ++++------ + tools/testing/selftests/kselftest_harness.h | 11 +--- + tools/testing/selftests/mm/mdwe_test.c | 1 - + 41 files changed, 365 insertions(+), 220 deletions(-) + create mode 100644 Documentation/core-api/floating-point.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 +Merging mm/mm-everything (f24042adabb5 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 include/linux/swap.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 18 +- + Documentation/userspace-api/index.rst | 1 + + Documentation/userspace-api/mseal.rst | 199 +++ + arch/alpha/kernel/syscalls/syscall.tbl | 1 + + arch/arm/tools/syscall.tbl | 1 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 2 + + arch/m68k/kernel/syscalls/syscall.tbl | 1 + + arch/microblaze/kernel/syscalls/syscall.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 1 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 1 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 1 + + arch/parisc/kernel/syscalls/syscall.tbl | 1 + + arch/powerpc/kernel/syscalls/syscall.tbl | 1 + + arch/s390/kernel/syscalls/syscall.tbl | 1 + + arch/sh/kernel/syscalls/syscall.tbl | 1 + + arch/sparc/kernel/syscalls/syscall.tbl | 1 + + arch/x86/entry/syscalls/syscall_32.tbl | 1 + + arch/x86/entry/syscalls/syscall_64.tbl | 1 + + arch/xtensa/kernel/syscalls/syscall.tbl | 1 + + include/linux/swap.h | 5 +- + include/linux/syscalls.h | 1 + + include/uapi/asm-generic/unistd.h | 5 +- + kernel/backtracetest.c | 1 + + kernel/sys_ni.c | 1 + + mm/Makefile | 4 + + mm/filemap.c | 3 +- + mm/internal.h | 37 + + mm/madvise.c | 12 + + mm/memcontrol.c | 59 +- + mm/mmap.c | 31 +- + mm/mprotect.c | 10 + + mm/mremap.c | 31 + + mm/mseal.c | 307 +++++ + mm/page_alloc.c | 44 +- + mm/vmscan.c | 37 +- + tools/testing/selftests/mm/.gitignore | 2 + + tools/testing/selftests/mm/Makefile | 2 + + tools/testing/selftests/mm/mseal_test.c | 1894 +++++++++++++++++++++++++++ + tools/testing/selftests/mm/seal_elf.c | 179 +++ + 40 files changed, 2865 insertions(+), 37 deletions(-) + create mode 100644 Documentation/userspace-api/mseal.rst + 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 (daa121128a2d Merge tag 'dma-mapping-6.10-2024-05-20' of git://git.infradead.org/users/hch/dma-mapping) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Already up to date. +Merging clang-format/clang-format (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 +Already up to date. +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 +Already up to date. +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 +Merge made by the 'ort' strategy. +Merging arc/for-next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (64ae2326dd77 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 +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (ffbf4fb9b5c1 arm64: asm-bug: Add .align 2 to the end of __BUG_ENTRY) +$ 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/asm-bug.h | 1 + + arch/arm64/include/asm/barrier.h | 4 +++ + arch/arm64/include/asm/cpucaps.h | 2 ++ + arch/arm64/include/asm/cputype.h | 4 +++ + arch/arm64/include/asm/processor.h | 1 - + arch/arm64/kernel/cpu_errata.c | 19 +++++++++++++ + arch/arm64/kernel/cpufeature.c | 8 ++++++ + arch/arm64/kernel/fpsimd.c | 18 ------------- + arch/arm64/kernel/proton-pack.c | 12 +++++++++ + arch/arm64/tools/cpucaps | 1 + + drivers/perf/arm_dmc620_pmu.c | 9 ++++--- + 13 files changed, 103 insertions(+), 22 deletions(-) +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 +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 144 +++++++++++++++++++++++++++++++++ + 1 file changed, 144 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +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 (06902980d07a 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. + .../bindings/soc/bcm/brcm,bcm2711-avs-monitor.yaml | 44 ++++++++++++++++++++++ + 1 file changed, 44 insertions(+) + create mode 100644 Documentation/devicetree/bindings/soc/bcm/brcm,bcm2711-avs-monitor.yaml +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. +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 +++++++++++++++++++++ + 3 files changed, 139 insertions(+) + 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. +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 Documentation/devicetree/bindings/display/panel/panel-simple.yaml +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 +Resolved 'arch/arm64/boot/dts/st/stm32mp251.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bf14f9ae9533] 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. +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 (03be434863b9 Merge branches 'clk-microchip', 'clk-samsung' and 'clk-qcom' 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 +Already up to date. +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 (9cc1df421f00 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 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 rust/Makefile +Auto-merging scripts/generate_rust_target.rs +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 8c2abd13447e] Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git +$ git diff -M --stat --summary HEAD^.. + 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 | 24 +++++++ + 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/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 +- + 19 files changed, 243 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 +Already up to date. +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 +Already up to date. +Merging openrisc/for-next (4dc70e1aadfa openrisc: Move FPU state out of pt_regs) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (bbf5c979011a Linux 5.9) +$ 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 +Already up to date. +Merging powerpc/next (61700f816e6f powerpc/fadump: Fix section mismatch warning) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging 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/asm/sbi.h +Auto-merging arch/riscv/include/uapi/asm/hwprobe.h +Auto-merging arch/riscv/kernel/patch.c +Auto-merging arch/riscv/mm/init.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 4da8445dc48f] 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 (c1248638f8c3 s390/zcrypt: Use kvcalloc() instead of kvmalloc_array()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Already up to date. +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 85b2275cbdc0] 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 (dcb8f1e8fc29 bcachefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method) +$ 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. + fs/bcachefs/buckets.c | 8 ++++---- + fs/bcachefs/fs.c | 3 ++- + 2 files changed, 6 insertions(+), 5 deletions(-) +Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +Merging fscrypt/for-next (7f016edaa0f3 fscrypt: try to avoid refing parent dentry in fscrypt_file_open) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging afs/afs-next (abcbd3bfbbfe afs: trace: Log afs_make_call(), including server address) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (7b79c81bbd20 Merge branch 'for-next-next-v6.10-20240515' into for-next-20240515) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/btrfs/zoned.c +Merge made by the 'ort' strategy. + fs/btrfs/compression.c | 8 ++++---- + fs/btrfs/delayed-ref.c | 42 ------------------------------------------ + fs/btrfs/delayed-ref.h | 2 -- + fs/btrfs/ioctl.c | 28 ++++++++++++++++++++++++++++ + fs/btrfs/ordered-data.c | 2 +- + fs/btrfs/volumes.c | 49 ++++++++++++++++++++++++++----------------------- + fs/btrfs/zoned.c | 3 +-- + fs/btrfs/zoned.h | 7 ------- + 8 files changed, 60 insertions(+), 81 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 (6f82ac3618b5 netfs: Fix setting of BDP_ASYNC from iocb flags) +$ 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/buffered_write.c | 2 +- + fs/netfs/direct_write.c | 3 ++- + fs/smb/client/cifsfs.h | 4 ++-- + fs/smb/client/file.c | 23 +++++++++++++++++++++++ + include/linux/netfs.h | 2 ++ + 5 files changed, 30 insertions(+), 4 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 (80eb4f62056d erofs: avoid allocating DEFLATE streams before mounting) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Auto-merging fs/erofs/data.c +Merge made by the 'ort' strategy. + fs/erofs/data.c | 15 ++++++----- + fs/erofs/decompressor_deflate.c | 55 ++++++++++++++++++++++------------------- + fs/erofs/fscache.c | 12 +++------ + fs/erofs/inode.c | 4 +-- + fs/erofs/internal.h | 5 +--- + fs/erofs/super.c | 36 +++++++++------------------ + fs/erofs/zdata.c | 2 +- + fs/erofs/zmap.c | 24 +++++++++--------- + 8 files changed, 65 insertions(+), 88 deletions(-) +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 +Merge made by the 'ort' strategy. +Merging ext4/dev (c6a6c9694aad ext4: fix error pointer dereference in ext4_mb_load_buddy_gfp()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (72ece20127a3 Merge tag 'f2fs-for-6.10.rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/for-next (ee5814dddefb fsverity: use register_sysctl_init() to avoid kmemleak warning) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (529395d2ae64 virtio-fs: add multi-queue support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +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 +Already up to date. +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 (9f2373206786 ksmbd: ignore trailing slashes in share paths) +$ 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/mgmt/share_config.c | 6 +++++- + fs/smb/server/oplock.c | 21 +++++++++++++-------- + fs/smb/server/vfs_cache.c | 9 ++++++++- + fs/smb/server/vfs_cache.h | 1 + + 4 files changed, 27 insertions(+), 10 deletions(-) +Merging nfs/linux-next (3c0a2e0b0ae6 nfs: fix undefined behavior in nfs_block_bits()) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Merge made by the 'ort' strategy. + fs/nfs/Kconfig | 4 +-- + fs/nfs/dir.c | 54 ++++++++++++++++++++++++++++++++-- + fs/nfs/filelayout/filelayout.c | 24 +++++---------- + fs/nfs/flexfilelayout/flexfilelayout.c | 12 ++------ + fs/nfs/fs_context.c | 11 +++++-- + fs/nfs/internal.h | 11 +++++-- + fs/nfs/nfs3proc.c | 1 + + fs/nfs/nfs4proc.c | 2 +- + fs/nfs/nfs4state.c | 12 ++++---- + fs/nfs/pnfs.c | 29 ++++++------------ + fs/nfs/pnfs.h | 3 +- + fs/nfs/proc.c | 1 + + fs/nfs/super.c | 10 +++++++ + include/linux/nfs_fs.h | 3 ++ + net/sunrpc/clnt.c | 14 ++++++++- + net/sunrpc/xprtrdma/verbs.c | 6 +++- + 16 files changed, 129 insertions(+), 68 deletions(-) +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 +Already up to date. +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 +Already up to date. +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 (25ef7dc83ebe net/9p: fix uninit-value in p9_client_rpc()) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Auto-merging net/9p/client.c +Merge made by the 'ort' strategy. + net/9p/client.c | 2 ++ + 1 file changed, 2 insertions(+) +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 +Already up to date. +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 e4f4d3b232f6] 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 (a38297e3fb01 Linux 6.9) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merging 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 +Merge made by the 'ort' strategy. +Merging pci/next (f0bae243b2bc Merge tag 'pci-v6.10-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Already up to date. +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 +Merge made by the 'ort' strategy. + drivers/i2c/i2c-core-smbus.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging i2c-host/i2c/i2c-host (49b33f4b3a9e i2c: Remove I2C_CLASS_SPD) +$ 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 +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-synquacer.c | 11 +++++------ + include/linux/i2c.h | 1 - + 2 files changed, 5 insertions(+), 7 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 3a1d34c8a02c Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git +Merging next-20240521 version of i2c-host +$ git merge -m next-20240521/i2c-host 61e05bad821cb293418794738e7cc359949f44fe +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 +Already up to date. +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 (8771b7f31b7f media: bcm2835-unicam: Depend on COMMON_CLK) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (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 +Already up to date. +Merging pm/linux-next (bbfa78f51501 Merge branch 'thermal-core' 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 (e8dc41afca16 pmdomain: imx: gpcv2: Add delay after power up handshake) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Already up to date. +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/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 +- + 8 files changed, 41 insertions(+), 34 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 +Already up to date. +Merging rdma/for-next (9c0731832d3b RDMA/cma: Fix kmemleak in rdma_core observed during blktests nvme/rdma use siw) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/main (4b377b4868ef kprobe/ftrace: fix build error due to bad function definition) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (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 (5c1672705a1a net: revert partially applied PHY topology series) +$ 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 (7b13a745870c tty: rfcomm: prefer array indexing over pointer arithmetic) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging drivers/bluetooth/btmtksdio.c +Merge made by the 'ort' strategy. + drivers/bluetooth/btintel.c | 122 ++++++++++++--------------------------- + drivers/bluetooth/btintel.h | 5 ++ + drivers/bluetooth/btintel_pcie.c | 10 +++- + drivers/bluetooth/btmtk.c | 18 ++++++ + drivers/bluetooth/btmtk.h | 8 +++ + drivers/bluetooth/btmtksdio.c | 3 + + drivers/bluetooth/btnxpuart.c | 70 ++++++++++++++-------- + drivers/bluetooth/btusb.c | 81 ++++++++++++++++---------- + drivers/bluetooth/hci_bcm4377.c | 15 ++++- + include/net/bluetooth/hci.h | 11 ++++ + include/net/bluetooth/hci_sock.h | 2 +- + include/net/bluetooth/hci_sync.h | 3 + + include/net/bluetooth/rfcomm.h | 2 +- + net/bluetooth/hci_core.c | 15 ++--- + net/bluetooth/hci_event.c | 7 +++ + net/bluetooth/hci_sync.c | 20 ++++++- + net/bluetooth/mgmt.c | 50 +++++++++++++++- + net/bluetooth/rfcomm/tty.c | 23 ++++---- + 18 files changed, 295 insertions(+), 170 deletions(-) +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 +Already up to date. +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 +Already up to date. +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 +Already up to date. +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 (5a5a10d9db77 drm/buddy: Fix the warn on's during force merge) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging drivers/gpu/drm/drm_buddy.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/drm_buddy.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +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 (5a507b7d2be1 drm/mst: Fix NULL pointer dereference at drm_dp_add_payload_part2) +$ 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. + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 2 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 3 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 4 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- + 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/drm/display/drm_dp_mst_helper.h | 1 - + include/uapi/drm/panthor_drm.h | 20 +++++++-- + 16 files changed, 100 insertions(+), 56 deletions(-) +Merging amdgpu/drm-next (9c1a429217d2 drm/amdgpu: Fix amdgpu_vm_is_bo_always_valid kerneldoc) +$ 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_helpers.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. + Documentation/gpu/amdgpu/thermal.rst | 6 + + drivers/gpu/drm/amd/amdgpu/Makefile | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.h | 4 +- + 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 | 60 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atombios.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 269 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 105 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 150 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 37 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 28 + + drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_eeprom.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 4 +- + 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 | 84 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 11 + + 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 | 419 +- + 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_object.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 94 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 13 +- + 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 | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 21 + + 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 | 7 +- + 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 | 5005 + + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.h | 29 + + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 40 - + 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 | 1023 + + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 76 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/imu_v12_0.c | 401 + + 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 | 1540 + + 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 | 1643 + + 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 | 600 + + 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 | 33 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 72 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.h | 5 +- + drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c | 6 +- + drivers/gpu/drm/amd/display/Kconfig | 2 + + drivers/gpu/drm/amd/display/Makefile | 3 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 388 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 10 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 59 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 121 + + .../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 | 10 +- + 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 | 1515 + + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h | 112 + + .../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 | 206 +- + .../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 | 224 +- + 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 | 67 +- + 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 | 8 +- + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 47 +- + drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 181 + + 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 | 2 +- + .../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 | 994 + + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.h | 217 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 64 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 3 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 117 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.h | 8 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 12 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 4 + + drivers/gpu/drm/amd/display/dc/dce/dce_opp.c | 1 - + .../drm/amd/display/dc/dce/dce_stream_encoder.c | 1 + + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 1 - + .../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 +- + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.h | 1 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.c | 25 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_opp.h | 4 +- + drivers/gpu/drm/amd/display/dc/dcn201/Makefile | 9 +- + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_opp.h | 3 +- + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 6 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 5 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 3 +- + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 14 + + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn314/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 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 | 12 + + .../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_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 | 4 +- + .../drm/amd/display/dc/dml2/display_mode_core.h | 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 | 431 + + .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.h | 68 + + .../dc/dml2/dml21/inc/bounding_boxes/dcn3_soc_bb.h | 401 + + .../dc/dml2/dml21/inc/bounding_boxes/dcn4_soc_bb.h | 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 | 90 +- + .../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 | 32 + + 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 | 729 + + .../drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 303 + + .../amd/display/dc/dpp/dcn401/dcn401_dpp_dscl.c | 1132 + + drivers/gpu/drm/amd/display/dc/dsc/Makefile | 9 +- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 36 +- + .../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 | 104 + + .../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 + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 933 + + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.h | 192 + + 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 | 39 +- + .../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 | 1691 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 81 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 150 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.h | 12 + + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 23 + + .../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 | 726 +- + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/hw/optc.h | 4 +- + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 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 +- + .../drm/amd/display/dc/link/protocols/link_ddc.c | 4 - + .../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 | 9 +- + .../dc/link/protocols/link_dp_training_dpia.c | 16 - + .../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 | 11 +- + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.c | 477 + + .../drm/amd/display/dc/optc/dcn401/dcn401_optc.h | 167 + + drivers/gpu/drm/amd/display/dc/os_types.h | 2 - + drivers/gpu/drm/amd/display/dc/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 | 2138 + + .../display/dc/resource/dcn401/dcn401_resource.h | 631 + + drivers/gpu/drm/amd/display/dc/spl/Makefile | 33 + + drivers/gpu/drm/amd/display/dc/spl/dc_spl.c | 1409 + + 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 | 486 + + 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 | 2 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_offset.h | 108 + + .../amd/include/asic_reg/dcn/dcn_3_0_0_sh_mask.h | 56 + + .../amd/include/asic_reg/dcn/dcn_3_0_2_offset.h | 90 + + .../amd/include/asic_reg/dcn/dcn_3_0_2_sh_mask.h | 44 + + .../amd/include/asic_reg/dcn/dcn_3_0_3_offset.h | 16 + + .../amd/include/asic_reg/dcn/dcn_3_0_3_sh_mask.h | 16 + + .../amd/include/asic_reg/dcn/dcn_3_2_0_sh_mask.h | 28 + + .../amd/include/asic_reg/dcn/dcn_4_1_0_offset.h | 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 + + .../amd/include/asic_reg/thm/thm_14_0_2_offset.h | 228 + + .../amd/include/asic_reg/thm/thm_14_0_2_sh_mask.h | 940 + + drivers/gpu/drm/amd/include/discovery.h | 28 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 17 + + drivers/gpu/drm/amd/include/mes_v12_api_def.h | 798 + + drivers/gpu/drm/amd/include/soc24_enum.h | 21073 +++ + drivers/gpu/drm/amd/include/v12_structs.h | 1189 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 49 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 211 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 10 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_pm.h | 1 - + drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 9 - + drivers/gpu/drm/amd/pm/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 +- + .../amd/pm/powerplay/hwmgr/process_pptables_v1_0.c | 2 - + .../drm/amd/pm/powerplay/hwmgr/processpptables.c | 2 - + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 37 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 78 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 29 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 86 +- + .../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 | 134 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 41 +- + .../pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0.h | 21 +- + .../pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0_0.h | 1 - + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 3 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 3 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 4 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 18 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 69 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 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 | 63 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 64 +- + .../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 | 212 +- + .../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 | 71 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 168 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 61 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 2 + + drivers/gpu/drm/radeon/atombios_encoders.c | 2 +- + 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 +- + 584 files changed, 331333 insertions(+), 2468 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 (99%) + 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_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/hubbub/dcn401/dcn401_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hubbub/dcn401/dcn401_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hubp/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn10/dcn10_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn10/dcn10_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn20/dcn20_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn20/dcn20_hubp.h (92%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn201/dcn201_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn201/dcn201_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn21/dcn21_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn21/dcn21_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn30/dcn30_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn30/dcn30_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn31/dcn31_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn31/dcn31_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn32/dcn32_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn32/dcn32_hubp.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn35/dcn35_hubp.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hubp}/dcn35/dcn35_hubp.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/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/asic_reg/thm/thm_14_0_2_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/thm/thm_14_0_2_sh_mask.h + 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 (a568ff8cd0fe MAINTAINERS: Move the drm-intel repo location to fd.o GitLab) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel/for-linux-next +Auto-merging MAINTAINERS +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/i915/gvt/handlers.c +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 39c008935a93] Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/i915.rst | 3 - + MAINTAINERS | 2 +- + arch/x86/kernel/early-quirks.c | 19 +- + 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 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 7 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 68 +- + drivers/gpu/drm/i915/display/intel_cursor_regs.h | 98 +++ + 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 | 27 +- + .../gpu/drm/i915/display/intel_display_device.c | 27 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 38 +- + .../gpu/drm/i915/display/intel_display_params.c | 5 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 4 + + drivers/gpu/drm/i915/display/intel_display_types.h | 16 +- + drivers/gpu/drm/i915/display/intel_dp.c | 26 +- + 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_dpt_common.c | 1 + + 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_fbc.c | 5 +- + 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_hdmi.c | 3 +- + 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 | 352 ++++++---- + drivers/gpu/drm/i915/display/intel_psr_regs.h | 44 +- + 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 | 169 +++-- + drivers/gpu/drm/i915/display/skl_universal_plane.h | 5 + + .../drm/i915/display/skl_universal_plane_regs.h | 370 +++++++++++ + drivers/gpu/drm/i915/display/skl_watermark.c | 115 +--- + drivers/gpu/drm/i915/display/skl_watermark.h | 13 +- + drivers/gpu/drm/i915/display/skl_watermark_regs.h | 83 --- + .../gpu/drm/i915/gem/selftests/i915_gem_dmabuf.c | 2 +- + drivers/gpu/drm/i915/gvt/display.c | 9 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 3 +- + drivers/gpu/drm/i915/gvt/fb_decoder.c | 8 +- + drivers/gpu/drm/i915/gvt/handlers.c | 50 +- + drivers/gpu/drm/i915/gvt/reg.h | 3 - + drivers/gpu/drm/i915/i915_drv.h | 11 +- + drivers/gpu/drm/i915/i915_pci.c | 13 +- + drivers/gpu/drm/i915/i915_reg.h | 514 +-------------- + drivers/gpu/drm/i915/intel_device_info.c | 3 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 104 +-- + 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 + + include/drm/display/drm_dp.h | 6 + + include/drm/i915_pciids.h | 67 +- + 82 files changed, 2830 insertions(+), 1532 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_cursor_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_tdf.h + create mode 100644 drivers/gpu/drm/i915/display/skl_universal_plane_regs.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 (01d71dff61c7 drm/xe/tests: Use uninterruptible VM lock) +$ 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_guc_ct.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 d81f017c906b] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/drm-usage-stats.rst | 21 +- + Documentation/gpu/xe/index.rst | 1 + + Documentation/gpu/xe/xe-drm-usage-stats.rst | 10 + + drivers/gpu/drm/xe/Makefile | 6 + + drivers/gpu/drm/xe/abi/guc_actions_sriov_abi.h | 190 +++++ + 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 | 8 + + drivers/gpu/drm/xe/regs/xe_sriov_regs.h | 3 + + drivers/gpu/drm/xe/tests/Makefile | 1 + + drivers/gpu/drm/xe/tests/xe_args_test.c | 221 ++++++ + .../gpu/drm/xe/tests/xe_gt_sriov_pf_service_test.c | 232 ++++++ + drivers/gpu/drm/xe/tests/xe_migrate.c | 88 +-- + drivers/gpu/drm/xe/xe_args.h | 143 ++++ + drivers/gpu/drm/xe/xe_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 | 15 + + drivers/gpu/drm/xe/xe_drm_client.c | 121 +++- + drivers/gpu/drm/xe/xe_exec_queue.c | 37 + + drivers/gpu/drm/xe/xe_exec_queue.h | 10 + + drivers/gpu/drm/xe/xe_execlist.c | 2 +- + 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 | 78 +- + drivers/gpu/drm/xe/xe_gt.h | 27 + + drivers/gpu/drm/xe/xe_gt_ccs_mode.c | 5 +- + drivers/gpu/drm/xe/xe_gt_clock.c | 1 + + drivers/gpu/drm/xe/xe_gt_debugfs.c | 19 + + 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 | 105 ++- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 6 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config_types.h | 4 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 427 +++++++++++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.h | 18 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.c | 147 ++++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.h | 27 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor_types.h | 22 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 550 ++++++++++++++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.h | 36 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_service_types.h | 52 ++ + drivers/gpu/drm/xe/xe_gt_sriov_pf_types.h | 10 + + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 747 +++++++++++++++++++ + drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 23 + + drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c | 72 ++ + drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.h | 14 + + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 82 +++ + 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 | 34 +- + drivers/gpu/drm/xe/xe_guc.c | 93 ++- + 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_ct.c | 4 + + drivers/gpu/drm/xe/xe_guc_db_mgr.c | 3 +- + drivers/gpu/drm/xe/xe_guc_id_mgr.c | 3 +- + drivers/gpu/drm/xe/xe_guc_klv_helpers.c | 12 + + drivers/gpu/drm/xe/xe_guc_klv_helpers.h | 15 +- + drivers/gpu/drm/xe/xe_guc_klv_thresholds_set.h | 64 ++ + .../gpu/drm/xe/xe_guc_klv_thresholds_set_types.h | 68 ++ + drivers/gpu/drm/xe/xe_guc_pc.c | 4 + + drivers/gpu/drm/xe/xe_guc_relay.c | 8 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 172 +++-- + 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 | 179 ++++- + drivers/gpu/drm/xe/xe_hw_engine.h | 3 + + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 18 - + 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 | 204 +++++- + drivers/gpu/drm/xe/xe_lrc.h | 24 +- + drivers/gpu/drm/xe/xe_lrc_types.h | 7 + + 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 | 21 +- + drivers/gpu/drm/xe/xe_pci_sriov.c | 143 ++++ + drivers/gpu/drm/xe/xe_pci_sriov.h | 13 + + drivers/gpu/drm/xe/xe_pci_types.h | 4 + + drivers/gpu/drm/xe/xe_pcode.c | 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 | 69 +- + drivers/gpu/drm/xe/xe_query.c | 10 +- + 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_sriov.c | 11 + + 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 + + include/uapi/drm/xe_drm.h | 2 + + 121 files changed, 6090 insertions(+), 874 deletions(-) + create mode 100644 Documentation/gpu/xe/xe-drm-usage-stats.rst + 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_monitor.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_monitor_types.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_service.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_pf_service_types.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf_debugfs.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h + create mode 100644 drivers/gpu/drm/xe/xe_guc_klv_thresholds_set.h + create mode 100644 drivers/gpu/drm/xe/xe_guc_klv_thresholds_set_types.h + create mode 100644 drivers/gpu/drm/xe/xe_pci_sriov.c + create mode 100644 drivers/gpu/drm/xe/xe_pci_sriov.h +Merging etnaviv/etnaviv/next (e843e87abb90 drm/etnaviv: Disable SH_EU clock gating on VIPNano-Si+) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Merge made by the 'ort' strategy. + drivers/gpu/drm/etnaviv/cmdstream.xml.h | 52 ++++++++++++++-- + drivers/gpu/drm/etnaviv/common.xml.h | 12 ++-- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 73 ++++++++++++----------- + drivers/gpu/drm/etnaviv/state.xml.h | 101 +++++++++++++++++++++++++++----- + drivers/gpu/drm/etnaviv/state_blt.xml.h | 20 +++---- + drivers/gpu/drm/etnaviv/state_hi.xml.h | 28 +++++---- + 6 files changed, 210 insertions(+), 76 deletions(-) +Merging fbdev/for-next (a38297e3fb01 Linux 6.9) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +Merging regmap/for-next (7ba822189e60 regmap: kunit: Fix array overflow in stride() test) +$ 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 (45e37f9ce28d ALSA: hda/realtek: Enable headset mic of JP-IK LEAP W502 with ALC897) +$ 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 +Already up to date. +Merging sound-asoc/for-next (47d09270d777 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 +Already up to date. +Merging input/next (e7647cbaba0e Input: xpad - add support for Machenike G5 Pro Controller) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/joystick/xpad.c +Auto-merging drivers/input/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/input.c | 104 ++++++++++++++++++--- + drivers/input/joystick/adafruit-seesaw.c | 21 ++++- + drivers/input/joystick/as5011.c | 2 +- + drivers/input/joystick/qwiic-joystick.c | 4 +- + drivers/input/joystick/xpad.c | 2 + + 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 +- + 80 files changed, 314 insertions(+), 168 deletions(-) +Merging block/for-next (b4b6c637a30f Merge branch 'io_uring-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 block/blk-mq.c +Merge made by the 'ort' strategy. + block/blk-cgroup.c | 87 ++++++++++++++++++++++++---------- + block/blk-mq.c | 20 +++++++- + block/t10-pi.c | 2 +- + 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/cdrom/cdrom.c | 2 +- + 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 +++---- + include/trace/events/nbd.h | 2 +- + io_uring/sqpoll.c | 6 ++- + 25 files changed, 285 insertions(+), 163 deletions(-) +Merging device-mapper/for-next (825d8bbd2f32 dm: always manage discard support in terms of max_hw_discard_sectors) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (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 +Already up to date. +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 +Already up to date. +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 +Auto-merging drivers/regulator/tps6594-regulator.c +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 1c36b6d31457] 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 (55f7073f6f59 dt-bindings: power: supply: max8903: specify flt-gpios as input) +$ 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 +Already up to date. +Merging regulator/for-next (81d3d32de658 Merge remote-tracking branch 'regulator/for-6.9' into regulator-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Already up to date. +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 +Already up to date. +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 +Already up to date. +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 +Merge made by the 'ort' strategy. +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 (050bf3c793a0 KEYS: trusted: Do not use WARN when encode fails) +$ 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 +Already up to date. +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 +Already up to date. +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) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +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 (10b98582bc76 dt-bindings: mailbox: qcom-ipcc: Document the SDX75 IPCC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Already up to date. +Merging spi/for-next (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 (5242c6fd8c29 Merge branch into tip/master: 'x86/percpu') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging arch/x86/Kconfig +Merge made by the 'ort' strategy. + arch/x86/Kconfig | 3 +- + arch/x86/Kconfig.debug | 5 +- + arch/x86/boot/main.c | 42 ++-- + arch/x86/events/amd/core.c | 4 +- + arch/x86/events/amd/uncore.c | 8 +- + arch/x86/include/asm/percpu.h | 535 ++++++++++++++++++++++-------------------- + 6 files changed, 310 insertions(+), 287 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 (fde0aeca5926 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 +Merge made by the 'ort' strategy. +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 (6f627b425378 KVM: SVM: Add module parameter to enable SEV-SNP) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/include/asm/sev.h +Auto-merging include/linux/pagemap.h +Auto-merging mm/truncate.c +Merge made by the 'ort' strategy. + .../virt/kvm/x86/amd-memory-encryption.rst | 110 +- + arch/x86/include/asm/kvm-x86-ops.h | 3 + + arch/x86/include/asm/kvm_host.h | 5 + + arch/x86/include/asm/sev-common.h | 25 + + arch/x86/include/asm/sev.h | 3 + + arch/x86/include/asm/svm.h | 9 +- + arch/x86/include/uapi/asm/kvm.h | 48 + + arch/x86/kvm/Kconfig | 3 + + arch/x86/kvm/mmu.h | 2 - + arch/x86/kvm/mmu/mmu.c | 48 +- + arch/x86/kvm/svm/sev.c | 1364 +++++++++++++++++++- + arch/x86/kvm/svm/svm.c | 37 +- + arch/x86/kvm/svm/svm.h | 49 + + arch/x86/kvm/trace.h | 31 + + arch/x86/kvm/x86.c | 30 + + include/linux/kvm_host.h | 36 + + include/linux/pagemap.h | 1 + + include/linux/psp-sev.h | 4 +- + mm/truncate.c | 3 +- + virt/kvm/Kconfig | 8 + + virt/kvm/guest_memfd.c | 167 ++- + 21 files changed, 1934 insertions(+), 52 deletions(-) +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 (89af61fb8f0f 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/xenbus/Makefile | 18 ++++++++---------- + 3 files changed, 46 insertions(+), 16 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 (2a1b02bcba78 workqueue: Refactor worker ID formatting and make wq_worker_comm() use full ID string) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. + kernel/workqueue.c | 51 ++++++++++++++++++++++++++++++++++----------------- + 1 file changed, 34 insertions(+), 17 deletions(-) +Merging drivers-x86/for-next (2513563edc98 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 +Already up to date. +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 +Already up to date. +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/scsi/mvsas/mv_init.c +Auto-merging drivers/scsi/smartpqi/smartpqi_init.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 2036b955d21b] 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 (f5b335dc025c misc: ntsync: mark driver as "broken" to prevent from building) +$ 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 +Auto-merging tools/testing/nvdimm/test/ndtest.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 | 31 +- + 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 +++ + 280 files changed, 12857 insertions(+), 3984 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 +Already up to date. +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 +Already up to date. +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 (cbb325e77fbe vfio/pci: Restore zero affected bus reset devices warning) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +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 +Already up to date. +Merging cgroup/for-next (21c38a3bd4ee cgroup/rstat: add cgroup_rstat_cpu_lock helpers and tracepoints) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Already up to date. +Merging scsi/for-next (5621e21c7fd9 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Merge made by the 'ort' strategy. + Documentation/cdrom/cdrom-standard.rst | 4 +-- + drivers/scsi/device_handler/scsi_dh_alua.c | 31 ++++++++++++++------ + drivers/scsi/mpi3mr/mpi3mr_transport.c | 2 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 4 +-- + drivers/scsi/qedf/qedf.h | 1 + + drivers/scsi/qedf/qedf_main.c | 47 ++++++++++++++++++++++++++++-- + drivers/scsi/sr.h | 2 +- + drivers/scsi/sr_ioctl.c | 5 +++- + include/linux/cdrom.h | 2 +- + 9 files changed, 78 insertions(+), 20 deletions(-) +Merging scsi-mkp/for-next (e4f5f8298cf6 scsi: mpt3sas: Add missing kerneldoc parameter descriptions) +$ 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 (c9d853a05402 virtio: vdpa: vDPA driver for Marvell OCTEON DPU devices) +$ 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 +Auto-merging kernel/exit.c +Auto-merging kernel/signal.c +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 9abac0ca9f56] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 15 +- + 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/Kconfig | 9 + + drivers/vdpa/Makefile | 1 + + drivers/vdpa/octeon_ep/Makefile | 4 + + drivers/vdpa/octeon_ep/octep_vdpa.h | 94 +++ + drivers/vdpa/octeon_ep/octep_vdpa_hw.c | 517 ++++++++++++++++ + drivers/vdpa/octeon_ep/octep_vdpa_main.c | 856 ++++++++++++++++++++++++++ + 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 | 6 +- + 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 - + 48 files changed, 2024 insertions(+), 201 deletions(-) + create mode 100644 drivers/vdpa/octeon_ep/Makefile + create mode 100644 drivers/vdpa/octeon_ep/octep_vdpa.h + create mode 100644 drivers/vdpa/octeon_ep/octep_vdpa_hw.c + create mode 100644 drivers/vdpa/octeon_ep/octep_vdpa_main.c +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. +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 +Merge made by the 'ort' strategy. +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 (a97853f25b06 Revert "selftests/cgroup: Drop define _GNU_SOURCE") +$ 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 +Merge made by the 'ort' strategy. +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 +Already up to date. +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 +Already up to date. +Merging hmm/hmm (6613476e225e Linux 6.8-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (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 +Already up to date. +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 (15aa8fb852f9 x86/efistub: Omit physical KASLR when memory reservations exist) +$ 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 (8f6a15f095a6 Merge tag 'cocci-for-6.10' of git://git.kernel.org/pub/scm/linux/kernel/git/jlawall/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (38a04f741569 selftests/landlock: Add layout1.refer_mount_root) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Merge made by the 'ort' strategy. + security/landlock/fs.c | 13 +++++++-- + tools/testing/selftests/landlock/fs_test.c | 45 ++++++++++++++++++++++++++++++ + 2 files changed, 56 insertions(+), 2 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 +Already up to date. +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 (5671dca241b9 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 +Already up to date. +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 (ae1a863bcdbd kunit/fortify: Fix memcmp() test to be amplitude agnostic) +$ 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 + + lib/fortify_kunit.c | 2 +- + security/loadpin/Kconfig | 3 +++ + 3 files changed, 5 insertions(+), 1 deletion(-) +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 (256d218ec6ae 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 +Already up to date. +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 0000000000000..f271c7e40d02e --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20240522 |