diff options
author | Stephen Rothwell <sfr@canb.auug.org.au> | 2025-08-01 15:46:27 +1000 |
---|---|---|
committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2025-08-01 15:46:27 +1000 |
commit | b9ddaa95fd283bce7041550ddbbe7e764c477110 (patch) | |
tree | 199aa49110afa2a18b7fd44443455d7bb81cf7b9 | |
parent | 32b8792875f06e4e4700f2de402ba2835d778e7d (diff) |
Add linux-next specific files for 20250801next/masternext/HEAD
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
-rw-r--r-- | Next/SHA1s | 407 | ||||
-rw-r--r-- | Next/Trees | 409 | ||||
-rw-r--r-- | Next/merge.log | 8765 | ||||
-rw-r--r-- | localversion-next | 1 |
4 files changed, 9582 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..7cf7041e7dcf --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,407 @@ +Name SHA1 +---- ---- +origin f2d282e1dfb3d8cb95b5ccdea43f2411f27201db +fixes 89be9a83ccf1f88522317ce02f854f30d6115c41 +ext4-fixes d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af +vfs-brauner-fixes 8b3c655fa2406b9853138142746a39b7615c54a2 +fscrypt-current 0af2f6be1b4281385b618cb86ad946eded089ac8 +fsverity-current 0af2f6be1b4281385b618cb86ad946eded089ac8 +btrfs-fixes 296391a79b552cd54ac22a31cd72af523e184b92 +vfs-fixes 33927f3d0ecdcff06326d6e4edb6166aed42811c +erofs-fixes 347e9f5043c89695b01e66b3ed111755afcf1911 +nfsd-fixes 94d10a4dba0bc482f2b01e39f06d5513d0f75742 +v9fs-fixes 2014c95afecee3e76ca4a56956a936e23283f05b +overlayfs-fixes 924577e4f6ca473de1528953a0e13505fae61d7b +bcachefs 24c5e7ab4066da2073d1c50e82308c8bc0ec4ec3 +fscrypt fa65058063cbaba6e519b5291a7e2e9e0fa24ae3 +btrfs 841778d9fd80e77c33fd46af40d0a894046f64dd +ceph b828b4bf29d10a3e505a76a39c4daea969e19dc9 +cifs 9338a1afff36288487959631c5f8ee1692cc5dd1 +configfs c6b1908224593db76f77b904894cd51933559ae9 +ecryptfs fba133a3411847db49297c965218400c49571ebd +dlm 6f8b4788266c7df3b7cfc6c665f663b4c3d09aad +erofs df0ce6cefa453d2236381645e529a27ef2f0a573 +exfat b33f91c6276255ca0b90c42142828de05496ed1d +exportfs adc218676eef25575469234709c2d87185ca223a +ext3 17e58687367a5d9488106067112ef7dfb201d985 +ext4 099b847ccc6c1ad2f805d13cfbcc83f5b6d4bc42 +f2fs 078cad8212ce4f4ebbafcc0936475b8215e1ca2a +fsverity d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af +fuse f0e84022479b4700609e874cf220b5d7d0363403 +gfs2 a90f1b6ad6649d553c9d76f50a42e4ba5783164b +jfs 856db37592021e9155384094e331e2d4589f28b1 +ksmbd e5cf61fa6e2fb9ae6339eaa892612488c966baaf +nfs 99765233ab42bf7a4950377ad7894dce8a5c0e60 +nfs-anna 38074de35b015df5623f524d6f2b49a0cd395c40 +nfsd e339967eecf1305557f7c697e1bc10b5cc495454 +ntfs3 a49f0abd8959048af18c6c690b065eb0d65b2d21 +orangefs 2138e89cb066b40386b1d9ddd61253347d356474 +overlayfs 6f9ccdad0feaef58b05f07e0fc9d31004147177c +ubifs 99dbb2a1bd661418be33b1ff1462c09b7d2221cf +v9fs 4210030d8bc4834fcb774babc458d02a2432ee76 +v9fs-ericvh 2014c95afecee3e76ca4a56956a936e23283f05b +xfs ded74fddcaf685a9440c5612f7831d0c4c1473ca +zonefs 6982100bb8297c46122cac4f684dcf44cb7d0d8c +vfs-brauner 66639db858112bf6b0f76677f7517643d586e575 +vfs dd589648208a4deab9049805e94b680a15149e61 +mm-hotfixes f01a22f845d8c5f03a327cf4a20e3a6e6ea83821 +fs-current 9cdfffb657a8df911fc71f25cad9cafa16b1c7dc +kbuild-current e04c78d86a9699d136910cfc0bdcf01087e3267e +arc-current d7b8f8e20813f0179d8ef519541a3527e7661d3a +arm-current 0c66c6f4e21cb22220cbd8821c5c73fc157d20dc +arm64-fixes d42e6c20de6192f8e4ab4cf10be8c694ef27e8cb +arm-soc-fixes 9f9d41d643224e1cc7eac89794cf5e5997f8171f +davinci-current 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +drivers-memory-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +m68k-current c8995932db2bad6fa093ac64dbaf7a3e8870eafa +powerpc-fixes ab107276607af90b13a5994997e19b7b9731e251 +s390-fixes 62355f1f87b8c7f8785a8dd3cd5ca6e5b513566a +net 01051012887329ea78eaca19b1d2eac4c9f601b5 +bpf 93acc0f43f58743737888985133809634e298753 +ipsec 28712d6ed32028b0f2e0defe6681411496971ca3 +netfilter eccf7a3480a06eb698f064af829733bd8d0ec263 +ipvs eccf7a3480a06eb698f064af829733bd8d0ec263 +wireless 6832a9317eee280117cd695fa885b2b7a7a38daf +ath 6832a9317eee280117cd695fa885b2b7a7a38daf +iwlwifi 6832a9317eee280117cd695fa885b2b7a7a38daf +wpan 8ce4f287524c74a118b0af1eebd4b24a8efca57a +rdma-fixes a9a9e68954f29b1e197663f76289db4879fd51bb +sound-current df485a4b2b3ee5b35c80f990beb554e38a8a5fb1 +sound-asoc-fixes 282528da82a0436f3bed0755338539ba5d7d730b +regmap-fixes c871c199accb39d0f4cb941ad0dccabfc21e9214 +regulator-fixes 10dfd36f078423c51602a9a21ed85e8e6c947a00 +spi-fixes 618393ea7752af48ae32191477e2cedf41713bbe +pci-current 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +driver-core.current 260f6f4fda93c8485c8037865c941b42b9cba5d2 +tty.current 260f6f4fda93c8485c8037865c941b42b9cba5d2 +usb.current beb6c8326eb4e7006c4aa16b0fee3e303d42e685 +usb-serial-fixes ad1244e1ce18f8c1a5ebad8074bfcf10eacb0311 +phy 89be9a83ccf1f88522317ce02f854f30d6115c41 +staging.current 260f6f4fda93c8485c8037865c941b42b9cba5d2 +iio-fixes ae68ad3d7a93ea1eedbce8e5813273163b971b36 +counter-current 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +char-misc.current 260f6f4fda93c8485c8037865c941b42b9cba5d2 +soundwire-fixes 89be9a83ccf1f88522317ce02f854f30d6115c41 +thunderbolt-fixes 038d61fd642278bab63ee8ef722c50d10ab01e8f +input-current bcce05041b21888f10b80ea903dcfe51a25c586e +crypto-current bf24d64268544379d9a9b5b8efc2bb03967703b3 +libcrypto-fixes 68279380266a5fa70e664de754503338e2ec3f43 +vfio-fixes c1d9dac0db168198b6f63f460665256dedad9b6e +kselftest-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +dmaengine-fixes 89be9a83ccf1f88522317ce02f854f30d6115c41 +backlight-fixes 1613e604df0cd359cf2a7fbd9be7a0bcfacfabd0 +mtd-fixes 6463cbe08b0cbf9bba8763306764f5fd643023e1 +mfd-fixes d9d79e4f7dc935fea96dbf3de524404c08d08b03 +v4l-dvb-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +reset-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +mips-fixes 86731a2a651e58953fc949573895f2fa6d456841 +at91-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +omap-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +kvm-fixes 038d61fd642278bab63ee8ef722c50d10ab01e8f +kvms390-fixes d8dfda5af0be6e48178b6f4b46c6af30b06335b2 +hwmon-fixes 9c62e2282900332c8b711d9f9e37af369a8ef71b +nvdimm-fixes d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af +cxl-fixes d0b3b7b22dfa1f4b515fd3a295b3fd958f9e81af +dma-mapping-fixes aa807b9f22df2eee28593cbbabba0f93f4aa26c1 +drivers-x86-fixes e2967b50b709970547b5cdfa1b42526835327f36 +samsung-krzk-fixes 8d2c2fa2209e83d0eb10f7330d8a0bbdc1df32ff +pinctrl-samsung-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +devicetree-fixes 79aef1a3705bbc95b36dad892af1f313490bd65c +dt-krzk-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +scsi-fixes 021f243627ead17eb6500170256d3d9be787dad8 +drm-fixes 038d61fd642278bab63ee8ef722c50d10ab01e8f +drm-intel-fixes 038d61fd642278bab63ee8ef722c50d10ab01e8f +mmc-fixes 4b290aae788e06561754b28c6842e4080957d3f7 +rtc-fixes 08d82d0cad51c2b1d454fe41ea1ff96ade676961 +gnss-fixes 86731a2a651e58953fc949573895f2fa6d456841 +hyperv-fixes a4131a50d072b369bfed0b41e741c41fd8048641 +risc-v-fixes b65ca21835ed615907ba231a60db80a2605b94dc +riscv-dt-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +riscv-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx beb6c8326eb4e7006c4aa16b0fee3e303d42e685 +gpio-brgl-fixes 89be9a83ccf1f88522317ce02f854f30d6115c41 +gpio-intel-fixes 9ab29ed505557bd106e292184fa4917955eb8e6e +pinctrl-intel-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +auxdisplay-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +kunit-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +memblock-fixes da8bf5daa5e55a6af2b285ecda460d6454712ff4 +renesas-fixes 379c590113ce46f605439d4887996c60ab8820cc +perf-current 86731a2a651e58953fc949573895f2fa6d456841 +efi-fixes 64e135f1eaba0bbb0cdee859af3328c68d5b9789 +battery-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +iommufd-fixes 9a96876e3c6578031fa5dc5dde7759d383b2fb75 +rust-fixes 038d61fd642278bab63ee8ef722c50d10ab01e8f +w1-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +pmdomain-fixes 621a88dbfe9006c318a0cafbd12e677ccfe006e7 +i2c-host-fixes 0ae982df67760cd08affa935c0fe86c8a9311797 +sparc-fixes 6613476e225e090cc9aad49be7fa504e290dd33d +clk-fixes e4b2a0c2b9be6d10b0e50a7485fe9f569a6f2436 +thead-clk-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +pwrseq-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +thead-dt-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +ftrace-fixes 327e28664307d49ce3fa71ba30dcc0007c270974 +ring-buffer-fixes e4d4b8670c44cdd22212cab3c576e2d317efa67c +trace-fixes b5e8acc14dcb314a9b61ff19dcd9fdd0d88f70df +tracefs-fixes 8b55572e51805184353ee7d587c720a51818fb82 +spacemit-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +tip-fixes 98e8f2c0e0930feee6a2538450c74d9d7de0a9cc +slab-fixes be8250786ca94952a19ce87f98ad9906448bc9ef +drm-msm-fixes d3deabe4c619875714b9a844b1a3d9752dbae1dd +uml-fixes 2dca89df0d1116f722b4be100e4bfcff858058e8 +fwctl-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +devsec-tsm-fixes fba4ceaa242d2bdf4c04b77bda41d32d02d3925d +drm-misc-fixes 038d61fd642278bab63ee8ef722c50d10ab01e8f +linus ffd294d346d185b70e28b1a28abe367bbfe53c04 +mm-stable af915c3c13b64d196d1c305016092f5da20942c4 +mm-nonmm-stable a9ed4422adacce848fd368c3a7076368ead7fc18 +mm-unstable 01da54f10fddf3b01c5a3b80f6b16bbad390c302 +mm-nonmm-unstable 43f5de099338eb161cf57fc078e358612e720f7b +kbuild dae742fa564b7f53de83c16dce033d547c84c0f3 +clang-format c147f663b6a5813b9860f3917cc473fb2c462d8d +perf 022245067f07ab913d27054ee9e1fab45256acd5 +compiler-attributes 98f7e32f20d28ec452afb208f9cffc08448a2652 +dma-mapping fbf5e2234169067a811ab38dc89cc0d260499622 +asm-generic 582847f9702461b0a1cba3efdb2b8135bf940d53 +alpha 1523226edda566057bdd3264ceb56631ddf5f6f7 +arm 8dd85887ad83438750fa09237da9342ce966dd0f +arm64 5b1ae9de71335865d06ff0e60eadcf368a735edf +arm-perf e480898e767c54a883e965fc306e2ece013cbca5 +arm-soc 9f9d41d643224e1cc7eac89794cf5e5997f8171f +amlogic 58abdca0eb653c1a2e755ba9ba406ee475d87636 +asahi-soc 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +at91 e99113d11171a03c865ca5b10e0ae9b587034ae2 +bmc ef8e64bf72d883114adb815c6c03c0ce4e4f7b9c +broadcom 89abb622d518a917e16b6cd441dc75f547300303 +davinci 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +drivers-memory 93a7aedc4cc4476da54ea45f3ed5308aabafef75 +fsl 8b3da0519ae664dd7e3d840c3a6851ec5a7f42de +imx-mxs cdc22fb12efffa2357cea791a7c4a1a4407a66a7 +mediatek 6cbb623586d5cd1abf2b1b8500294546b8543058 +mvebu 88084e0358ff6f5c39accddf3f0da4162e6d0ccf +omap db91121f001a3a1fad41ff816bdbddb7da443297 +qcom ba94ec807b071becbed7377f8c84308f1b6ccd51 +renesas 7a323accaf6bf40f0d345694978e3657363c3772 +reset 335bb23abed39d9ec174ea520bc2337e2fe605ef +rockchip 1f0c7abd82357d425e34645fa086280f552ae822 +samsung-krzk 94f19ac4670d5867609484329ee62f6bf254c090 +scmi 038d61fd642278bab63ee8ef722c50d10ab01e8f +sophgo 349ae53a949ce96d0e1453170d31d26ed54ba68e +sophgo-soc c8754c7deab4cbfa947fa2d656cbaf83771828ef +spacemit 6be7a5a768aafcb07d177bd2ae36ab84e4e0acde +stm32 1a32f7427eb3d1248bc64cd745b93f88cc838933 +sunxi cbe908fc8ebbea52f2d674773c2ddaf8cbfa4757 +tee c580875fc93accdd6a4aa3ac3026c81d528761e3 +tegra 499b75defe5654ba29e838bd2f5e79d3a16229af +thead-dt c31f2899eab084b3557e9f9e10fc7898113ef18d +ti 65f6e3eb6351ff402a03f2b6b56ab1fd61511334 +xilinx 7f9c1c0a006e687304f3a3d9516a143436a8aa6c +clk 64c21f253a3737c15ab745e9276b2352d86aed26 +clk-imx c78865241ecffaff7ce5db00ed5b71c1a70c0ff1 +clk-renesas 0ab2d84f94dae48c3e7605cdc99dbb4e7c7b206a +thead-clk 54edba916e2913b0893b0f6404b73155d48374ea +csky 2b48804336be69272d43939ff0dc3b0c0a703395 +loongarch 36d09b96d3e79518e2be31fc7960cc694702afb8 +m68k c8995932db2bad6fa093ac64dbaf7a3e8870eafa +m68knommu 89be9a83ccf1f88522317ce02f854f30d6115c41 +microblaze c0e7bb02f7962cd4b2327196aa1b0f9568c783e4 +mips 3ebcbf079c26ab6e82faa7f896b66def55547eee +openrisc f0eedcf22581ca1cc438fb38a479ff41ab882d51 +parisc-hd 89f686a0fb6e473a876a9a60a13aec67a62b9a7e +powerpc cf2a6de32cabbf84a889e24a9ee7c51dee4a1f70 +risc-v fda589c286040d9ba2d72a0eaf0a13945fc48026 +riscv-dt 28fa0dcb571ab8f3be4d919f0e20e01d4e44bcb1 +riscv-soc bd4d5d3faadcdf5d65377f14dcbaa4dbb27ee637 +s390 d3a0de1a9dbc77623ffeb4d478204c4df0470236 +sh c32969d0362a790fbc6117e0b6a737a7e510b843 +sparc 2cec2c4dc90cbf5194c1acef08c1e74f0437af95 +uml fc9ed2f6589dc2c11f05883e5c323be5f39fd241 +xtensa 44a4ef59d5506c6dc7599d876a3a1014697ec480 +fs-next 4537c1c375ddef0613a8c15784fb7554a7d64987 +printk dcc3191a3dde4027ac3a995d852b957e398cf6cc +pci 58d2b6b6b214d8b4914cd4c821a8bd0c75436c2c +pstore d679c2e1e8d96f71f85e2ef3877407d264212cc3 +hid 1330eb33bddca5f8dd163bbe3a8f8e828697c0fd +i2c 0a5c73a0b158b17a8502d2970b79c121e14bca20 +i2c-host 85c34532849dae0fdcf880900ac9d7718a73fd1b +i3c 3b661ca549b9e5bb11d0bc97ada6110aac3282d2 +dmi 4d1b28a8119c615f1e932520f9ee1f80bdda5204 +hwmon-staging de1fffd88600c5ee1c095c84b86484cd0329a9e8 +jc_docs 35293ebbb65e0295d3b9357f786004ae1026d00f +v4l-dvb d968e50b5c26642754492dea23cbd3592bde62d8 +v4l-dvb-next b36c41c51e9d763393634359b90f02414ef470a3 +pm 77d832285656c59238e7992f12296e18657251ee +cpufreq-arm bbd67be5546d6080a7dc9903355a54ac4b865caa +cpupower e6c3f96141ebab688d96cf582bcab67f930e0baa +devfreq 7da2fdaaa1e6062686ac96a9f096c2d7847533e4 +pmdomain 05e35bd07d56780f0a5119973995b97a16843579 +opp 22679d807dea5c065d8019acfce48f20e87ba5ca +thermal 1d264d3a198839c7483580acdce17e1015d0ef91 +rdma ee235923d205c6de73bf5035f3cdcaee22f3291c +net-next d9104cec3e8fe4b458b74709853231385779001f +bpf-next e8d780dcd957d80725ad5dd00bab53b856429bc0 +ipsec-next 95cfe23285a6de17f11715378c93e6aee6d0ca75 +mlx5-next 888a7776f4fb04c19bec70c737c61c2f383c6b1e +netfilter-next e3f96b3556e4856dc4125ce875e87c5b5028b40b +ipvs-next e3f96b3556e4856dc4125ce875e87c5b5028b40b +bluetooth 9c533991fe15be60ad9f9a7629c25dbc5b09788d +wireless-next 126d85fb040559ba6654f51c0b587d280b041abb +ath-next 708243c62efde8241e2c66e9c3f377658855149d +iwlwifi-next d2af710d6d50b3a3e691c4e2b262ed9de3038e96 +wpan-next 1dd9291eb90378f8096669d9cb33761fd84599e0 +wpan-staging 1dd9291eb90378f8096669d9cb33761fd84599e0 +mtd 9cf9db888f387844e063efc6296e9fa5c042995e +nand fb2fae70e7e985c4acb1ad96110d8b98bb64a87c +spi-nor 2e3a7476ec3989e77270b9481e76e137824b17c0 +crypto bf24d64268544379d9a9b5b8efc2bb03967703b3 +libcrypto 2a1a127aecf628a7629c860e2ad645174b5d3211 +drm 6531a2cf07ef156956840853692755cc7e1621b7 +drm-exynos 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +drm-misc b213eb34f857c45bdd769c9e9191a386accc9e8f +amdgpu 9f1f7cd467358e27205af0076e2f7b435a588893 +drm-intel 5a569ef4d4ab184a481dd8ecb58f464a89b44d2f +drm-msm 8290d37ad2b087bbcfe65fa5bcaf260e184b250a +drm-msm-lumag cd86e80b77b2f3d9e72c2d27a967b666d2c47a44 +drm-nova 14ae91a81ec8fa0bc23170d4aa16dd2a20d54105 +drm-xe 1cda3c755bb7770be07d75949bb0f45fb88651f6 +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +fbdev 81b96e4aef9592493873507eec52eca68f0721ac +regmap 58e6b2cce564e372582d3ae5cae6efd30996b7d4 +sound df485a4b2b3ee5b35c80f990beb554e38a8a5fb1 +ieee1394 95a042a0c8ecd3c1e886648f6f6ab9c7e4403db9 +sound-asoc 282528da82a0436f3bed0755338539ba5d7d730b +modules 40a826bd6c82ae45cfd3a19cd2a60a10f56b74c0 +input 1c44b818b81bf6a111a702536a560f5bc830c6d5 +block 301d58c33f1e9895af0d64d3b729d141b584c1e3 +device-mapper 55a0fbd2ac3fe8f61a30ea697b2eb3034f6778c8 +libata 6cb43739b93c64c4a2148222bd606e6920257752 +pcmcia 0630e3bc0e91b57288921df2927859b23184ca45 +mmc 4b290aae788e06561754b28c6842e4080957d3f7 +mfd b6bf74c821780259495b1f86e319854ef5bee0db +backlight 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +battery 7b41a2341fa62babda5d5c7a32c632e9eba2ee11 +regulator 10dfd36f078423c51602a9a21ed85e8e6c947a00 +security 5d8b97c946777118930e1cfb075cab59a139ca7c +apparmor 43584e993293326cfc508e664fe81f56a65f6240 +integrity aa9bb1b32594cd67cafd29b330b158128b503882 +selinux 850dada4b3afd014e2c69226bf9bb85469338000 +smack 6ddd169d0288ebee8ec9afcd75825ce8476edb00 +tomoyo 038d61fd642278bab63ee8ef722c50d10ab01e8f +tpmdd 7f0c6675b3194461ad7bb8db1d822445121fb029 +watchdog 48defdf6b083f74a44e1f742db284960d3444aec +iommu b9e6e8ae0a5f9edae7cc1b5972a1d3dea9223fe2 +audit ae1ae11fb277f1335d6bcd4935ba0ea985af3c32 +devicetree 0121898ec05fa4c1f566fc05c7e8b3caf0998f97 +dt-krzk 6cd594ed969d5cfc7f97029f8ca0d240637ebb8d +mailbox 872798f61d8bfea857e54aa17baa7b0d3ee24b65 +spi 618393ea7752af48ae32191477e2cedf41713bbe +tip 6cdd7ae1b73b49ce35529c65765a5d2617b83e5d +clockevents d7b8f8e20813f0179d8ef519541a3527e7661d3a +edac 1fb0ddddf5d139089675b86702933cbca992b4d4 +ftrace e01821781f0139ba998e497be14469684ea83cee +rcu cc1d1365f0f414f6522378867baa997642a7e6b2 +paulmck b706eec9304fc3cbc48a6a09aff8533081815ebc +kvm 196d9e72c4b0bd68b74a4ec7f52d248f37d0f030 +kvm-arm 7b8346bd9fce6b76a96c6780d2e5bba76687f97f +kvms390 57d88f02eb4449d96dfee3af4b7cd4287998bdbd +kvm-ppc fac04efc5c793dccbd07e2d59af9f90b7fc0dca4 +kvm-riscv 07a289a031404ec583c01d8e87680d434fc62c1f +kvm-x86 33f843444e28920d6e624c6c24637b4bb5d3c8de +xen-tip 114a2de6fa86d99ed9546cc9113a3cad58beef79 +percpu 87d6aab2389e5ce0197d8257d5f8ee965a67c4cd +workqueues 324cee0c272cb3fa6c4d3c0de4b68a9c5357d2e7 +sched-ext 9f0744a0e87e4e74725d495bba2aa540dec4a77a +drivers-x86 1798561befd8be1e52feb54f850efcab5a595f43 +chrome-platform cc2d5b72b13b3af2b9b4bed3d5dfd0de14414230 +chrome-platform-firmware 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +hsi 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +leds-lj 4903924ac7ef31fbbe48b3261b1bc86ce6cd7e97 +ipmi f6f9760320a93930e70ad6016afbabc475bcdd09 +driver-core 260f6f4fda93c8485c8037865c941b42b9cba5d2 +usb beb6c8326eb4e7006c4aa16b0fee3e303d42e685 +thunderbolt 2d1beba54fdaac0d624b016025d4ec5856713fb1 +usb-serial bdf2ab177e2fca85394fce86629f5e35aa7fa33a +tty 260f6f4fda93c8485c8037865c941b42b9cba5d2 +char-misc 260f6f4fda93c8485c8037865c941b42b9cba5d2 +accel f03eee5fc922158654405318a02db9982c0ddf07 +coresight a80198ba650f50d266d7fc4a6c5262df9970f9f2 +fastrpc 0af2f6be1b4281385b618cb86ad946eded089ac8 +fpga 37e00703228ab44d0aacc32a97809a4f6f58df1b +icc ca652cf0c2612add5d3c9283bbc742dabc704a77 +iio 0a686b9c4f847dc21346df8e56d5b119918fefef +phy-next 4a3556b81b99f0c8c0358f7cc6801a62b4538fe2 +soundwire 34b1cb4ec286603127aa8c4191ea527eb8dd3567 +extcon 5f09caafc652bcee7a5247e40dd34d1de1ad7d7f +gnss e326371f3002dbf54befd8ada9570fa489a46991 +vfio d2272d898186fa96c6fa4ad067219b45b8c2ef5f +w1 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spmi 0ff41df1cb268fc69e703a08a57ee14ae967d0ca +staging 260f6f4fda93c8485c8037865c941b42b9cba5d2 +counter-next 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +siox db418d5f1ca5b7bafc8eaa9393ea18a7901bb0ed +mux 59b723cd2adbac2a34fc8e12c74ae26ae45bf230 +dmaengine e3a9ccd21897a59d02cf2b7a95297086249306d6 +cgroup d445d2ab8129b1da93f25a9a71e36f43223d5543 +scsi b3a40acce7b3d0a7e9d0b2042a33129a7e3d6e41 +scsi-mkp 383cd6d879a18acdaa84c29330b25c49cbc0b490 +vhost 9bac62b70cffac0ff8dafde81a41df6f55210e96 +rpmsg 01d7d9241256597eb38ec8a119ff89062b9fa10a +gpio-brgl 6b94bf976f9f9e6d4a6bf3218968a506c049702e +gpio-intel 9ab29ed505557bd106e292184fa4917955eb8e6e +pinctrl a3fe1324c3c5c292ec79bd756497c1c44ff247d2 +pinctrl-intel 3b4408038da935be7b1efb7589cc1badb6d10a67 +pinctrl-renesas 7000167796a00d64322dc3ed0c0970e31d481ed6 +pinctrl-samsung 683d532dfc9657ab8aae25204f378352ed144646 +pwm f365b1d8ecc3a1a646171c697f56a91b3156dae6 +ktest a5e71638ddd7f1dc0b9f3a5ac8ab8bef48b9f0ee +kselftest 30fb5e134f05800dc424f8aa1d69841a6bdd9a54 +kunit 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +kunit-next 34db4fba81916a2001d7a503dfcf718c08ed5c42 +livepatching a8e905a819fdfb4ce674363896320e36657d0f16 +rtc 95f610e36adc74f3972e31c28567d66777ce37f3 +nvdimm 9f97e61bde6a91a429f48da1a461488a15b01813 +at24 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +ntb 0cadf92e93d4caed1714faac53e9a0051810f4b0 +seccomp b0c9bfbab925ac6385d4d06a134fd89cadf771fe +slimbus 0af2f6be1b4281385b618cb86ad946eded089ac8 +nvmem 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +xarray 6684aba0780da9f505c202f27e68ee6d18c0aa66 +hyperv d9016a249be5316ec2476f9947356711e70a16ec +auxdisplay 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +kgdb afdbe49276accb87a0c7414e75864c78289ece2f +hmm 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +cfi 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +mhi 00559ba3ae740e7544b48fb509b2b97f56615892 +memblock 3b394dff15e14550a26b133fc7b556b5b526f6a5 +cxl f11a5f89910a7ae970fbce4fdc02d86a8ba8570f +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi 02eb7a8eee20b9ec6aafd5e17c5c41b53e8b13ef +unicode 6b56a63d286f6f57066c4b5648d8fbec9510beae +slab 8185696483dcb29688fc23c45c99d86b73754982 +random 3778dcb2dcc1ce03a2b25e5d951fe9912e843d1e +landlock 6dde339a3df80a57ac3d780d8cfc14d9262e2acd +rust dff64b072708ffef23c117fa1ee1ea59eb417807 +rust-alloc d49ac7744f578bcc8708a845cce24d3b91f86260 +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init fc3870dc5cadb701b4122e4a8daa85f9fa2f57b9 +rust-timekeeping d4b29ddf82a458935f1bd4909b8a7a13df9d3bdc +rust-xarray fa616196fbea12462107774fb6a1908c95f71cf0 +sysctl 060a1b0567f76106656030bbaa0e0b0924bd9ebc +execve 7f71195c15dcf5f34c4c7f056603659374e3a525 +bitmap f66f9c3d09c12f6ceea17d1ba22be2cb8bc9e4e4 +hte 9e4259716f60c96c069a38e826884ad783dc4eb4 +kspp f627b51aaa041cba715b59026cf2d9cb1476c7ed +nolibc b9e50363178a40c76bebaf2f00faa2b0b6baf8d1 +iommufd 2c78e74493d33b002312296fbab1d688bfd0f76f +turbostat 447c98c1ca4a4b0d43be99f76c558c09956484f3 +pwrseq 07d59dec6795428983a840de85aa02febaf7e01b +capabilities-next cdd73b1666079a73d061396f361df55d59fe96e6 +ipe 038d61fd642278bab63ee8ef722c50d10ab01e8f +kcsan 9872916ad1a1a5e7d089e05166c85dbd65e5b0e8 +crc 118da22eb6fbd48f896d17411f942399283d600c +fwctl 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +devsec-tsm 9d948b8804096d940022b1a3c483a5beb8b46574 +hisilicon b1136432c97241f0e5c40d58597da00d49cd9917 +kthread d8b4bf4ea04dd96fe43f6010c614149aba4c9b91 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2477ec47fb71 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,409 @@ +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 +ext4-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#fixes +vfs-brauner-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.fixes +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +v9fs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +overlayfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes +bcachefs git git://evilpiepirate.org/bcachefs.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +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.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git#configfs-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +exportfs git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#exportfs-next +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +v9fs-ericvh git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +vfs-brauner git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +fs-current git linux-next +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +sophgo-fixes git https://github.com/sophgo/linux.git#fixes +sophgo-soc-fixes git https://github.com/sophgo/linux.git#soc-fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +ath git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-current +iwlwifi git https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#fixes +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/driver-core/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 +libcrypto-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-fixes +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 git://linuxtv.org/media-ci/media-pending.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +dma-mapping-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git https://gitlab.freedesktop.org/drm/kernel.git#drm-fixes +drm-intel-fixes git https://gitlab.freedesktop.org/drm/i915/kernel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +auxdisplay-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools#perf-tools +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +iommufd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes git https://github.com/Rust-for-Linux/linux.git#rust-fixes +w1-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +i2c-host-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host-fixes +sparc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-linus +clk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-fixes +thead-clk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-fixes +pwrseq-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-current +thead-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-fixes +ftrace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ftrace/fixes +ring-buffer-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ring-buffer/fixes +trace-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#trace/fixes +tracefs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#tracefs/fixes +spacemit-fixes git https://github.com/spacemit-com/linux#fixes +tip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#tip/urgent +slab-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#slab/for-next-fixes +drm-msm-fixes git https://gitlab.freedesktop.org/drm/msm.git#msm-fixes +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +fwctl-fixes git git//git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-rc +devsec-tsm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#fixes +drm-misc-fixes git https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next-fixes +linus git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#for-next +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-unstable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-unstable +mm-nonmm-unstable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-unstable +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.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +alpha git git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git#alpha-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 +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +bmc git git://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git#for-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 +fsl git https://github.com/chleroy/linux.git#soc_fsl +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +sophgo git https://github.com/sophgo/linux.git#for-next +sophgo-soc git https://github.com/sophgo/linux.git#soc-for-next +spacemit git https://github.com/spacemit-com/linux#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 git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +thead-dt git git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +thead-clk git git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-next +uml git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +fs-next git linux-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i2c-host git git://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-host +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media-ci/media-pending.git#next +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +pmdomain git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +ath-next git git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-next +iwlwifi-next git https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#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 +libcrypto git git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-next +drm git https://gitlab.freedesktop.org/drm/kernel.git#drm-next +drm-exynos git git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next +drm-misc git https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git https://gitlab.freedesktop.org/drm/i915/kernel#for-linux-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +drm-nova git https://gitlab.freedesktop.org/drm/nova.git#nova-next +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/modules/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git git://git.code.sf.net/p/tomoyo/tomoyo.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git#next +paulmck git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#non-rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm +kvm-riscv git https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 git https://github.com/kvm-x86/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sched-ext git git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +chrome-platform-firmware git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/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-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 +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 +rust-alloc git https://github.com/Rust-for-Linux/linux.git#alloc-next +rust-io git https://github.com/Rust-for-Linux/linux.git#io-next +rust-pin-init git https://github.com/Rust-for-Linux/linux.git#pin-init-next +rust-timekeeping git https://github.com/Rust-for-Linux/linux.git#timekeeping-next +rust-xarray git https://github.com/Rust-for-Linux/linux.git#xarray-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 +nolibc git git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git#for-next +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +turbostat git git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +pwrseq git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-next +capabilities-next git git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git#caps-next +ipe git https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git#next +kcsan git git://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git#next +crc git git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#crc-next +fwctl git git//git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-next +devsec-tsm git git://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#next +hisilicon git https://github.com/hisilicon/linux-hisi.git#for-next +kthread git git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#for-next diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..ddc1ff22073c --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,8765 @@ +$ date -R +Fri, 01 Aug 2025 10:50:05 +1000 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at e8d780dcd957 Merge tag 'slab-for-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab +Merging origin/master (f2d282e1dfb3 Merge tag 'bitmap-for-6.17' of https://github.com/norov/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating e8d780dcd957..f2d282e1dfb3 +Fast-forward (no commit created; -m option ignored) + .gitignore | 1 + + .mailmap | 6 +- + Documentation/ABI/README | 4 +- + Documentation/ABI/stable/sysfs-devices-node | 9 + + Documentation/ABI/testing/debugfs-driver-qat | 2 +- + .../ABI/testing/debugfs-driver-qat_telemetry | 10 +- + .../ABI/testing/sysfs-driver-intel-xe-hwmon | 48 + + Documentation/ABI/testing/sysfs-driver-qaic | 18 + + Documentation/ABI/testing/sysfs-driver-qat | 50 +- + Documentation/ABI/testing/sysfs-driver-qat_rl | 14 +- + Documentation/ABI/testing/sysfs-driver-ufs | 83 + + Documentation/ABI/testing/sysfs-kernel-mm-damon | 29 + + Documentation/Makefile | 2 + + Documentation/admin-guide/bootconfig.rst | 2 +- + Documentation/admin-guide/cgroup-v2.rst | 9 + + Documentation/admin-guide/kernel-parameters.txt | 13 + + Documentation/admin-guide/mm/damon/index.rst | 1 + + Documentation/admin-guide/mm/damon/stat.rst | 69 + + Documentation/admin-guide/mm/damon/usage.rst | 46 +- + Documentation/admin-guide/mm/transhuge.rst | 19 +- + Documentation/admin-guide/sysctl/kernel.rst | 4 +- + Documentation/arch/arm64/booting.rst | 41 + + Documentation/arch/powerpc/index.rst | 1 + + Documentation/conf.py | 400 +- + Documentation/core-api/dma-api-howto.rst | 36 +- + Documentation/core-api/dma-api.rst | 197 +- + Documentation/core-api/entry.rst | 6 +- + Documentation/core-api/index.rst | 1 + + Documentation/core-api/kernel-api.rst | 6 - + Documentation/core-api/list.rst | 776 ++ + Documentation/core-api/memory-hotplug.rst | 91 +- + Documentation/core-api/mm-api.rst | 6 - + Documentation/core-api/packing.rst | 2 +- + Documentation/core-api/workqueue.rst | 6 + + Documentation/crypto/crypto_engine.rst | 6 - + .../bus/fsl,imx8qxp-pixel-link-msi-bus.yaml | 7 +- + .../devicetree/bindings/clock/alphascale,acc.txt | 114 - + .../clock/alphascale,asm9260-clock-controller.yaml | 49 + + .../bindings/clock/apm,xgene-device-clock.yaml | 80 + + .../bindings/clock/apm,xgene-socpll-clock.yaml | 50 + + .../bindings/clock/armada3700-periph-clock.txt | 71 - + .../bindings/clock/armada3700-tbg-clock.txt | 27 - + .../devicetree/bindings/clock/artpec6.txt | 41 - + .../bindings/clock/axis,artpec6-clkctrl.yaml | 55 + + .../bindings/clock/brcm,bcm2835-cprman.txt | 60 - + .../bindings/clock/brcm,bcm2835-cprman.yaml | 59 + + .../bindings/clock/brcm,bcm53573-ilp.txt | 36 - + .../bindings/clock/brcm,bcm53573-ilp.yaml | 46 + + .../bindings/clock/brcm,bcm63xx-clocks.txt | 24 - + .../bindings/clock/brcm,bcm63xx-clocks.yaml | 44 + + .../bindings/clock/cirrus,ep7209-clk.yaml | 47 + + .../devicetree/bindings/clock/clps711x-clock.txt | 19 - + .../bindings/clock/dove-divider-clock.txt | 28 - + .../bindings/clock/img,pistachio-clk.yaml | 136 + + .../devicetree/bindings/clock/lpc1850-ccu.txt | 77 - + .../devicetree/bindings/clock/lpc1850-cgu.txt | 131 - + .../devicetree/bindings/clock/lpc1850-creg-clk.txt | 52 - + .../devicetree/bindings/clock/lsi,axm5516-clks.txt | 29 - + .../bindings/clock/lsi,axm5516-clks.yaml | 43 + + .../bindings/clock/lsi,nspire-cx-clock.yaml | 33 + + .../clock/marvell,armada-370-corediv-clock.yaml | 52 + + .../clock/marvell,armada-3700-periph-clock.yaml | 96 + + .../clock/marvell,armada-3700-tbg-clock.yaml | 54 + + .../clock/marvell,armada-xp-cpu-clock.yaml | 44 + + .../devicetree/bindings/clock/marvell,berlin.txt | 31 - + .../bindings/clock/marvell,berlin2-clk.yaml | 51 + + .../bindings/clock/marvell,dove-divider-clock.yaml | 50 + + .../bindings/clock/marvell,mvebu-core-clock.yaml | 94 + + .../clock/marvell-armada-370-gating-clock.yaml | 227 + + .../devicetree/bindings/clock/maxim,max9485.txt | 59 - + .../devicetree/bindings/clock/maxim,max9485.yaml | 82 + + .../bindings/clock/mediatek,mtmips-sysc.yaml | 28 +- + .../devicetree/bindings/clock/microchip,pic32.txt | 39 - + .../bindings/clock/microchip,pic32mzda-clk.yaml | 45 + + .../bindings/clock/moxa,moxart-clock.txt | 48 - + .../bindings/clock/moxa,moxart-clock.yaml | 38 + + .../devicetree/bindings/clock/mvebu-core-clock.txt | 87 - + .../bindings/clock/mvebu-corediv-clock.txt | 23 - + .../devicetree/bindings/clock/mvebu-cpu-clock.txt | 23 - + .../bindings/clock/mvebu-gated-clock.txt | 205 - + .../devicetree/bindings/clock/nspire-clock.txt | 24 - + .../bindings/clock/nuvoton,npcm750-clk.txt | 100 - + .../bindings/clock/nuvoton,npcm750-clk.yaml | 66 + + .../bindings/clock/nxp,imx95-blk-ctl.yaml | 2 + + .../devicetree/bindings/clock/nxp,lpc1850-ccu.yaml | 104 + + .../devicetree/bindings/clock/nxp,lpc1850-cgu.yaml | 99 + + .../devicetree/bindings/clock/pistachio-clock.txt | 123 - + .../devicetree/bindings/clock/qca,ath79-pll.txt | 33 - + .../devicetree/bindings/clock/qca,ath79-pll.yaml | 70 + + .../bindings/clock/qcom,camcc-sm8250.yaml | 2 +- + .../bindings/clock/qcom,dispcc-sm6125.yaml | 2 +- + .../bindings/clock/qcom,dispcc-sm6350.yaml | 2 +- + .../bindings/clock/qcom,gcc-ipq4019.yaml | 2 +- + .../bindings/clock/qcom,gcc-ipq8074.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8976.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8994.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8996.yaml | 2 +- + .../bindings/clock/qcom,gcc-msm8998.yaml | 2 +- + .../bindings/clock/qcom,gcc-qcm2290.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-qcs404.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sc7180.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sc7280.yaml | 2 +- + .../bindings/clock/qcom,gcc-sc8180x.yaml | 2 +- + .../bindings/clock/qcom,gcc-sc8280xp.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sdm845.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sdx55.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sdx65.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm6115.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm6125.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm6350.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 2 +- + .../devicetree/bindings/clock/qcom,gcc-sm8450.yaml | 2 +- + .../bindings/clock/qcom,ipq9574-cmn-pll.yaml | 2 + + .../devicetree/bindings/clock/qcom,krait-cc.txt | 34 - + .../devicetree/bindings/clock/qcom,krait-cc.yaml | 43 + + .../bindings/clock/qcom,milos-camcc.yaml | 51 + + .../bindings/clock/qcom,milos-dispcc.yaml | 63 + + .../devicetree/bindings/clock/qcom,milos-gcc.yaml | 62 + + .../bindings/clock/qcom,milos-videocc.yaml | 53 + + .../devicetree/bindings/clock/qcom,mmcc.yaml | 24 +- + .../bindings/clock/qcom,msm8998-gpucc.yaml | 2 +- + .../bindings/clock/qcom,qcm2290-dispcc.yaml | 2 +- + .../bindings/clock/qcom,qcs615-dispcc.yaml | 55 + + .../bindings/clock/qcom,qcs615-gpucc.yaml | 49 + + .../bindings/clock/qcom,qcs615-videocc.yaml | 47 + + .../bindings/clock/qcom,qdu1000-ecpricc.yaml | 2 +- + .../bindings/clock/qcom,qdu1000-gcc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 + + .../bindings/clock/qcom,sa8775p-camcc.yaml | 15 + + .../bindings/clock/qcom,sa8775p-gcc.yaml | 2 +- + .../bindings/clock/qcom,sc7180-camcc.yaml | 2 +- + .../bindings/clock/qcom,sc7180-dispcc.yaml | 2 +- + .../bindings/clock/qcom,sc7180-lpasscorecc.yaml | 2 +- + .../bindings/clock/qcom,sc7280-camcc.yaml | 2 +- + .../bindings/clock/qcom,sc7280-dispcc.yaml | 2 +- + .../bindings/clock/qcom,sc7280-lpasscc.yaml | 2 +- + .../bindings/clock/qcom,sdm845-camcc.yaml | 2 +- + .../bindings/clock/qcom,sdm845-dispcc.yaml | 2 +- + .../bindings/clock/qcom,sdm845-lpasscc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,sdx75-gcc.yaml | 2 +- + .../bindings/clock/qcom,sm4450-camcc.yaml | 22 +- + .../bindings/clock/qcom,sm4450-dispcc.yaml | 22 +- + .../devicetree/bindings/clock/qcom,sm4450-gcc.yaml | 2 +- + .../bindings/clock/qcom,sm6115-dispcc.yaml | 2 +- + .../bindings/clock/qcom,sm6115-gpucc.yaml | 2 +- + .../bindings/clock/qcom,sm6125-gpucc.yaml | 2 +- + .../bindings/clock/qcom,sm6350-camcc.yaml | 11 +- + .../bindings/clock/qcom,sm6375-dispcc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,sm6375-gcc.yaml | 2 +- + .../bindings/clock/qcom,sm6375-gpucc.yaml | 2 +- + .../bindings/clock/qcom,sm7150-camcc.yaml | 2 +- + .../bindings/clock/qcom,sm7150-dispcc.yaml | 2 +- + .../devicetree/bindings/clock/qcom,sm7150-gcc.yaml | 2 +- + .../bindings/clock/qcom,sm7150-videocc.yaml | 2 +- + .../bindings/clock/qcom,sm8150-camcc.yaml | 22 +- + .../bindings/clock/qcom,sm8450-camcc.yaml | 20 +- + .../bindings/clock/qcom,sm8450-dispcc.yaml | 2 +- + .../bindings/clock/qcom,sm8450-gpucc.yaml | 2 + + .../bindings/clock/qcom,sm8450-videocc.yaml | 19 +- + .../devicetree/bindings/clock/qcom,sm8550-gcc.yaml | 2 +- + .../bindings/clock/qcom,sm8550-tcsr.yaml | 1 + + .../devicetree/bindings/clock/qcom,sm8650-gcc.yaml | 2 +- + .../bindings/clock/qcom,x1e80100-gcc.yaml | 2 +- + .../bindings/clock/renesas,cpg-mssr.yaml | 49 +- + .../bindings/clock/renesas,rzg2l-cpg.yaml | 18 +- + .../clock/samsung,exynosautov920-clock.yaml | 37 +- + .../devicetree/bindings/clock/ti/autoidle.txt | 37 - + .../bindings/clock/ti/fixed-factor-clock.txt | 42 - + .../devicetree/bindings/clock/ti/ti,autoidle.yaml | 34 + + .../bindings/clock/ti/ti,divider-clock.yaml | 22 +- + .../bindings/clock/ti/ti,fixed-factor-clock.yaml | 76 + + Documentation/devicetree/bindings/clock/xgene.txt | 131 - + .../bindings/crypto/atmel,at91sam9g46-aes.yaml | 4 +- + .../bindings/crypto/atmel,at91sam9g46-sha.yaml | 4 +- + .../bindings/crypto/atmel,at91sam9g46-tdes.yaml | 4 +- + .../devicetree/bindings/crypto/fsl,sec-v4.0.yaml | 41 +- + .../devicetree/bindings/crypto/omap-aes.txt | 31 - + .../devicetree/bindings/crypto/omap-des.txt | 30 - + .../devicetree/bindings/crypto/ti,omap2-aes.yaml | 58 + + .../devicetree/bindings/crypto/ti,omap4-des.yaml | 65 + + .../display/allwinner,sun8i-a83t-de2-mixer.yaml | 34 +- + .../fsl,imx8qxp-dc-axi-performance-counter.yaml | 57 + + .../display/imx/fsl,imx8qxp-dc-blit-engine.yaml | 204 + + .../display/imx/fsl,imx8qxp-dc-blitblend.yaml | 41 + + .../bindings/display/imx/fsl,imx8qxp-dc-clut.yaml | 44 + + .../imx/fsl,imx8qxp-dc-command-sequencer.yaml | 67 + + .../display/imx/fsl,imx8qxp-dc-constframe.yaml | 44 + + .../display/imx/fsl,imx8qxp-dc-display-engine.yaml | 152 + + .../display/imx/fsl,imx8qxp-dc-dither.yaml | 45 + + .../display/imx/fsl,imx8qxp-dc-extdst.yaml | 72 + + .../display/imx/fsl,imx8qxp-dc-fetchunit.yaml | 141 + + .../display/imx/fsl,imx8qxp-dc-filter.yaml | 43 + + .../display/imx/fsl,imx8qxp-dc-framegen.yaml | 64 + + .../display/imx/fsl,imx8qxp-dc-gammacor.yaml | 32 + + .../display/imx/fsl,imx8qxp-dc-layerblend.yaml | 39 + + .../display/imx/fsl,imx8qxp-dc-matrix.yaml | 44 + + .../display/imx/fsl,imx8qxp-dc-pixel-engine.yaml | 250 + + .../bindings/display/imx/fsl,imx8qxp-dc-rop.yaml | 43 + + .../display/imx/fsl,imx8qxp-dc-safety.yaml | 34 + + .../display/imx/fsl,imx8qxp-dc-scaling-engine.yaml | 83 + + .../display/imx/fsl,imx8qxp-dc-signature.yaml | 53 + + .../bindings/display/imx/fsl,imx8qxp-dc-store.yaml | 96 + + .../bindings/display/imx/fsl,imx8qxp-dc-tcon.yaml | 45 + + .../bindings/display/imx/fsl,imx8qxp-dc.yaml | 236 + + .../bindings/display/msm/dp-controller.yaml | 4 + + .../bindings/display/msm/dsi-controller-main.yaml | 54 +- + .../bindings/display/msm/dsi-phy-7nm.yaml | 1 + + .../bindings/display/msm/qcom,sm8650-dpu.yaml | 1 + + .../bindings/display/msm/qcom,sm8750-mdss.yaml | 470 ++ + .../bindings/display/panel/himax,hx83112b.yaml | 73 + + .../bindings/display/panel/himax,hx8394.yaml | 17 +- + .../bindings/display/panel/ilitek,ili9881c.yaml | 1 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/panel/raydium,rm67200.yaml | 1 - + .../bindings/display/panel/renesas,r61307.yaml | 94 + + .../bindings/display/panel/renesas,r69328.yaml | 73 + + .../bindings/display/panel/samsung,atna33xc20.yaml | 2 + + .../bindings/display/panel/sitronix,st7701.yaml | 1 + + .../bindings/display/panel/visionox,rm69299.yaml | 4 +- + .../bindings/display/renesas,rzg2l-du.yaml | 23 +- + .../display/rockchip/rockchip,dw-mipi-dsi.yaml | 6 - + .../bindings/display/rockchip/rockchip-vop2.yaml | 56 +- + .../bindings/display/sitronix,st7567.yaml | 63 + + .../bindings/display/ti/ti,am625-oldi.yaml | 79 + + .../bindings/display/ti/ti,am65x-dss.yaml | 220 +- + .../devicetree/bindings/dma/lpc1850-dmamux.txt | 54 - + .../devicetree/bindings/gnss/u-blox,neo-6m.yaml | 12 +- + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 5 +- + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 2 + + .../devicetree/bindings/hwmon/adi,adm1266.yaml | 2 +- + .../devicetree/bindings/hwmon/adi,ltc2992.yaml | 2 +- + .../devicetree/bindings/hwmon/adt7475.yaml | 15 +- + .../devicetree/bindings/hwmon/lltc,ltc2978.yaml | 2 + + .../devicetree/bindings/hwmon/maxim,max20730.yaml | 1 + + .../devicetree/bindings/hwmon/national,lm90.yaml | 8 + + .../bindings/hwmon/pmbus/adi,adp1050.yaml | 15 +- + .../bindings/hwmon/pmbus/isil,isl68137.yaml | 1 + + .../bindings/hwmon/pmbus/ti,ucd90320.yaml | 6 + + .../devicetree/bindings/hwmon/ti,amc6821.yaml | 6 + + .../devicetree/bindings/hwmon/ti,ina2xx.yaml | 2 + + .../devicetree/bindings/hwmon/ti,lm87.yaml | 4 +- + .../interrupt-controller/arm,gic-v5-iwb.yaml | 78 + + .../bindings/interrupt-controller/arm,gic-v5.yaml | 267 + + .../interrupt-controller/fsl,imx8qxp-dc-intc.yaml | 318 + + .../devicetree/bindings/leds/leds-lp50xx.yaml | 19 +- + .../devicetree/bindings/leds/onnn,ncp5623.yaml | 4 +- + .../devicetree/bindings/media/cdns,csi2rx.yaml | 8 + + .../devicetree/bindings/media/fsl,imx6q-vdoa.yaml | 42 + + .../devicetree/bindings/media/fsl,imx8qm-isi.yaml | 117 + + .../devicetree/bindings/media/fsl,imx8qxp-isi.yaml | 106 + + .../devicetree/bindings/media/fsl-vdoa.txt | 21 - + .../devicetree/bindings/media/i2c/mipi-ccs.yaml | 13 +- + .../bindings/media/i2c/onnn,mt9m114.yaml | 9 + + .../devicetree/bindings/media/i2c/ovti,ov8858.yaml | 4 +- + .../devicetree/bindings/media/i2c/sony,imx214.yaml | 31 +- + .../devicetree/bindings/media/i2c/sony,imx258.yaml | 4 +- + .../devicetree/bindings/media/nxp,imx8-jpeg.yaml | 28 +- + .../bindings/media/nxp,imx8mq-mipi-csi2.yaml | 38 +- + .../bindings/media/qcom,x1e80100-camss.yaml | 14 +- + .../devicetree/bindings/media/renesas,fcp.yaml | 1 + + .../devicetree/bindings/media/renesas,vsp1.yaml | 1 + + .../devicetree/bindings/media/rockchip,vdec.yaml | 80 +- + .../devicetree/bindings/mfd/fsl,imx8qxp-csr.yaml | 192 - + .../devicetree/bindings/mfd/mxs-lradc.txt | 45 - + .../devicetree/bindings/mfd/mxs-lradc.yaml | 134 + + .../devicetree/bindings/mfd/nxp,lpc1850-creg.yaml | 148 + + .../devicetree/bindings/mfd/rockchip,rk806.yaml | 21 + + .../devicetree/bindings/mfd/samsung,s2mps11.yaml | 3 + + .../devicetree/bindings/mfd/ti,tps65910.yaml | 318 + + Documentation/devicetree/bindings/mfd/tps65910.txt | 205 - + .../devicetree/bindings/mtd/jedec,spi-nor.yaml | 2 +- + .../devicetree/bindings/mtd/nxp,lpc1773-spifi.yaml | 74 + + .../devicetree/bindings/mtd/nxp-spifi.txt | 58 - + .../bindings/opp/opp-v2-qcom-adreno.yaml | 2 +- + .../bindings/phy/phy-lpc18xx-usb-otg.txt | 26 - + .../devicetree/bindings/rng/atmel,at91-trng.yaml | 1 + + .../devicetree/bindings/soc/renesas/renesas.yaml | 10 + + .../devicetree/bindings/trivial-devices.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + Documentation/doc-guide/sphinx.rst | 23 + + Documentation/driver-api/gpio/driver.rst | 2 +- + Documentation/driver-api/media/v4l2-controls.rst | 9 +- + Documentation/fault-injection/fault-injection.rst | 2 +- + Documentation/filesystems/dax.rst | 1 - + Documentation/filesystems/ext4/atomic_writes.rst | 10 +- + Documentation/filesystems/ext4/bitmaps.rst | 7 - + Documentation/filesystems/ext4/blockgroup.rst | 11 +- + Documentation/filesystems/ext4/dynamic.rst | 10 +- + Documentation/filesystems/ext4/globals.rst | 15 +- + Documentation/filesystems/ext4/index.rst | 2 +- + Documentation/filesystems/ext4/inode_table.rst | 9 + + Documentation/filesystems/ext4/overview.rst | 22 +- + Documentation/filesystems/f2fs.rst | 4 +- + Documentation/filesystems/overlayfs.rst | 26 +- + Documentation/filesystems/proc.rst | 8 +- + Documentation/filesystems/ubifs-authentication.rst | 2 +- + Documentation/gpu/amdgpu/debugging.rst | 18 + + Documentation/gpu/drm-uapi.rst | 36 + + Documentation/gpu/i915.rst | 10 +- + Documentation/gpu/nova/core/devinit.rst | 61 + + Documentation/gpu/nova/core/falcon.rst | 158 + + Documentation/gpu/nova/core/fwsec.rst | 181 + + Documentation/gpu/nova/core/todo.rst | 107 +- + Documentation/gpu/nova/core/vbios.rst | 181 + + Documentation/gpu/nova/index.rst | 4 + + Documentation/gpu/rfc/gpusvm.rst | 12 +- + Documentation/gpu/todo.rst | 15 + + Documentation/gpu/vkms.rst | 15 +- + Documentation/gpu/xe/xe_configfs.rst | 10 +- + Documentation/hwmon/adp1050.rst | 71 +- + Documentation/hwmon/asus_ec_sensors.rst | 2 + + Documentation/hwmon/corsair-psu.rst | 2 +- + Documentation/hwmon/tps53679.rst | 8 + + Documentation/mm/arch_pgtable_helpers.rst | 14 +- + Documentation/mm/damon/design.rst | 4 +- + Documentation/mm/damon/maintainer-profile.rst | 33 +- + Documentation/mm/page_migration.rst | 35 +- + Documentation/mm/physical_memory.rst | 2 +- + Documentation/mm/process_addrs.rst | 54 +- + .../networking/device_drivers/ethernet/ti/cpsw.rst | 6 +- + Documentation/process/changes.rst | 14 - + Documentation/process/coding-style.rst | 5 +- + Documentation/scheduler/sched-deadline.rst | 77 +- + Documentation/scheduler/sched-ext.rst | 11 +- + Documentation/scheduler/sched-stats.rst | 53 +- + Documentation/scsi/scsi_fc_transport.rst | 35 +- + Documentation/sphinx-static/custom.css | 15 + + Documentation/sphinx/automarkup.py | 27 +- + Documentation/sphinx/cdomain.py | 1 + + Documentation/sphinx/kernel_abi.py | 6 +- + Documentation/sphinx/kernel_include.py | 1 + + Documentation/sphinx/kerneldoc.py | 3 +- + Documentation/sphinx/kfigure.py | 1 + + Documentation/sphinx/load_config.py | 1 + + Documentation/sphinx/min_requirements.txt | 11 + + Documentation/sphinx/parse-headers.pl | 5 +- + Documentation/sphinx/requirements.txt | 1 + + Documentation/sphinx/rstFlatTable.py | 1 + + Documentation/tools/rtla/common_appendix.rst | 11 + + Documentation/tools/rtla/rtla-timerlat-hist.rst | 2 + + Documentation/trace/boottime-trace.rst | 4 +- + Documentation/trace/ftrace-design.rst | 12 +- + Documentation/trace/histogram.rst | 2 +- + Documentation/trace/rv/da_monitor_synthesis.rst | 147 - + Documentation/trace/rv/index.rst | 4 +- + Documentation/trace/rv/linear_temporal_logic.rst | 134 + + Documentation/trace/rv/monitor_rtapp.rst | 133 + + Documentation/trace/rv/monitor_sched.rst | 307 +- + Documentation/trace/rv/monitor_synthesis.rst | 271 + + .../translations/zh_CN/core-api/memory-hotplug.rst | 3 - + Documentation/translations/zh_CN/how-to.rst | 108 +- + .../translations/zh_CN/networking/alias.rst | 56 + + .../translations/zh_CN/networking/index.rst | 12 +- + .../translations/zh_CN/networking/napi.rst | 362 + + .../translations/zh_CN/networking/netif-msg.rst | 92 + + .../translations/zh_CN/networking/netmem.rst | 92 + + .../translations/zh_CN/networking/vxlan.rst | 85 + + .../translations/zh_CN/networking/xfrm_proc.rst | 126 + + .../translations/zh_CN/process/1.Intro.rst | 10 +- + .../translations/zh_CN/process/2.Process.rst | 7 +- + .../translations/zh_CN/process/5.Posting.rst | 11 + + .../translations/zh_CN/process/6.Followthrough.rst | 5 + + .../zh_CN/process/7.AdvancedTopics.rst | 14 + + Documentation/translations/zh_CN/staging/index.rst | 2 +- + .../translations/zh_CN/staging/speculation.rst | 85 + + Documentation/usb/gadget-testing.rst | 2 +- + Documentation/userspace-api/dma-buf-heaps.rst | 11 +- + Documentation/userspace-api/fwctl/fwctl.rst | 30 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 550 +- + Documentation/userspace-api/iommufd.rst | 12 + + .../userspace-api/media/cec/cec-pin-error-inj.rst | 42 + + Documentation/userspace-api/media/v4l/biblio.rst | 2 +- + .../userspace-api/media/v4l/dev-sliced-vbi.rst | 4 +- + .../userspace-api/media/v4l/ext-ctrls-fm-rx.rst | 11 +- + .../userspace-api/media/v4l/ext-ctrls-fm-tx.rst | 21 +- + .../userspace-api/media/v4l/meta-formats.rst | 1 + + .../media/v4l/metafmt-uvc-msxu-1-5.rst | 23 + + .../userspace-api/media/v4l/metafmt-uvc.rst | 4 +- + .../userspace-api/media/v4l/pixfmt-bayer.rst | 1 + + .../userspace-api/media/v4l/pixfmt-rawnn-cru.rst | 143 + + .../userspace-api/media/v4l/pixfmt-srggb12p.rst | 4 +- + .../userspace-api/media/v4l/pixfmt-srggb14p.rst | 2 +- + .../userspace-api/sysfs-platform_profile.rst | 6 +- + Documentation/virt/kvm/api.rst | 40 +- + Documentation/virt/kvm/devices/arm-vgic-v3.rst | 77 +- + MAINTAINERS | 228 +- + arch/alpha/Kconfig | 1 + + arch/alpha/include/asm/percpu.h | 5 +- + arch/arm/Kconfig | 2 +- + arch/arm/crypto/aes-neonbs-glue.c | 2 +- + arch/arm/mm/fault.c | 2 +- + arch/arm64/Kconfig | 4 +- + arch/arm64/boot/dts/mediatek/mt8370.dtsi | 16 + + arch/arm64/include/asm/barrier.h | 3 + + arch/arm64/include/asm/el2_setup.h | 45 + + arch/arm64/include/asm/kvm_emulate.h | 51 +- + arch/arm64/include/asm/kvm_host.h | 36 +- + arch/arm64/include/asm/kvm_mmu.h | 18 + + arch/arm64/include/asm/kvm_nested.h | 2 + + arch/arm64/include/asm/mman.h | 10 +- + arch/arm64/include/asm/pgtable-prot.h | 1 - + arch/arm64/include/asm/pgtable.h | 42 +- + arch/arm64/include/asm/smp.h | 24 +- + arch/arm64/include/asm/sysreg.h | 71 +- + arch/arm64/include/asm/tlbflush.h | 11 - + arch/arm64/include/asm/vncr_mapping.h | 2 + + arch/arm64/kernel/cpufeature.c | 26 +- + arch/arm64/kernel/smp.c | 144 +- + arch/arm64/kvm/Makefile | 3 +- + arch/arm64/kvm/arch_timer.c | 2 +- + arch/arm64/kvm/arm.c | 36 +- + arch/arm64/kvm/at.c | 80 +- + arch/arm64/kvm/config.c | 255 +- + arch/arm64/kvm/emulate-nested.c | 49 +- + arch/arm64/kvm/guest.c | 62 +- + arch/arm64/kvm/handle_exit.c | 24 +- + arch/arm64/kvm/hyp/exception.c | 16 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 53 +- + arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 49 +- + arch/arm64/kvm/hyp/vgic-v3-sr.c | 53 +- + arch/arm64/kvm/hyp/vhe/switch.c | 14 +- + arch/arm64/kvm/hyp/vhe/sysreg-sr.c | 6 + + arch/arm64/kvm/inject_fault.c | 235 +- + arch/arm64/kvm/mmio.c | 12 +- + arch/arm64/kvm/mmu.c | 105 +- + arch/arm64/kvm/nested.c | 109 +- + arch/arm64/kvm/sys_regs.c | 205 +- + arch/arm64/kvm/sys_regs.h | 2 +- + arch/arm64/kvm/trace_handle_exit.h | 2 +- + arch/arm64/kvm/vgic-sys-reg-v3.c | 127 +- + arch/arm64/kvm/vgic/vgic-init.c | 30 +- + arch/arm64/kvm/vgic/vgic-its.c | 5 +- + arch/arm64/kvm/vgic/vgic-kvm-device.c | 70 +- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 33 +- + arch/arm64/kvm/vgic/vgic-v3-nested.c | 2 +- + arch/arm64/kvm/vgic/vgic-v4.c | 14 +- + arch/arm64/kvm/vgic/vgic-v5.c | 52 + + arch/arm64/kvm/vgic/vgic.c | 4 +- + arch/arm64/kvm/vgic/vgic.h | 48 + + arch/arm64/mm/fault.c | 2 +- + arch/arm64/mm/mmap.c | 2 +- + arch/arm64/mm/mmu.c | 30 +- + arch/arm64/mm/ptdump_debugfs.c | 3 - + arch/arm64/tools/cpucaps | 4 +- + arch/arm64/tools/sysreg | 514 +- + arch/csky/Kconfig | 1 - + arch/loongarch/Kconfig | 2 - + arch/loongarch/include/asm/hugetlb.h | 14 - + arch/loongarch/include/asm/kvm_host.h | 12 +- + arch/loongarch/include/asm/pgtable-bits.h | 6 +- + arch/loongarch/include/asm/pgtable.h | 19 - + arch/loongarch/kvm/exit.c | 33 +- + arch/loongarch/kvm/intc/eiointc.c | 553 +- + arch/loongarch/kvm/intc/ipi.c | 28 +- + arch/loongarch/kvm/intc/pch_pic.c | 4 +- + arch/loongarch/kvm/interrupt.c | 25 +- + arch/loongarch/kvm/trace.h | 14 +- + arch/loongarch/kvm/vcpu.c | 8 +- + arch/loongarch/mm/pageattr.c | 2 +- + arch/microblaze/Kconfig | 1 - + arch/mips/Kconfig | 3 +- + arch/mips/boot/Makefile | 8 +- + arch/mips/boot/dts/mobileye/eyeq5-epm5.dts | 8 + + arch/mips/boot/dts/mobileye/eyeq5.dtsi | 127 + + arch/mips/boot/dts/mobileye/eyeq6h.dtsi | 22 + + arch/mips/boot/dts/qca/ar9132.dtsi | 9 + + arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 4 + + arch/mips/boot/dts/qca/ar9331.dtsi | 9 + + arch/mips/boot/dts/qca/ar9331_dpt_module.dts | 4 + + arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts | 4 + + arch/mips/boot/dts/qca/ar9331_omega.dts | 4 + + .../dts/qca/ar9331_openembed_som9331_board.dts | 4 + + arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts | 4 + + .../dts/ralink/gardena_smart_gateway_mt7688.dts | 2 +- + arch/mips/boot/dts/ralink/mt7628a.dtsi | 11 +- + .../dts/realtek/cameo-rtl9302c-2x-rtl8224-2xge.dts | 96 + + arch/mips/boot/dts/realtek/rtl930x.dtsi | 31 + + arch/mips/configs/eyeq5_defconfig | 12 +- + arch/mips/configs/eyeq6_defconfig | 2 + + arch/mips/include/asm/cpu-info.h | 1 + + arch/mips/include/asm/hugetlb.h | 14 - + arch/mips/include/asm/mach-generic/mc146818rtc.h | 4 - + .../include/asm/mach-ip30/cpu-feature-overrides.h | 2 +- + arch/mips/include/asm/mach-ip30/spaces.h | 2 +- + arch/mips/include/asm/mach-jazz/mc146818rtc.h | 2 - + .../mips/include/asm/mach-lantiq/xway/lantiq_soc.h | 3 + + arch/mips/include/asm/mach-malta/mc146818rtc.h | 2 - + arch/mips/include/asm/mach-rm/mc146818rtc.h | 21 - + arch/mips/include/asm/mc146818-time.h | 105 +- + arch/mips/include/asm/mips-cps.h | 4 +- + arch/mips/include/asm/sgi/heart.h | 2 +- + arch/mips/include/asm/smp-cps.h | 1 + + arch/mips/include/asm/vpe.h | 8 + + arch/mips/kernel/cpu-probe.c | 42 +- + arch/mips/kernel/mips-cm.c | 50 +- + arch/mips/kernel/process.c | 16 +- + arch/mips/kernel/relocate.c | 10 +- + arch/mips/kernel/smp-cps.c | 16 +- + arch/mips/kvm/mips.c | 2 +- + arch/mips/lantiq/falcon/prom.c | 4 +- + arch/mips/lantiq/falcon/sysctrl.c | 29 +- + arch/mips/lantiq/irq.c | 4 +- + arch/mips/lantiq/xway/clk.c | 2 +- + arch/mips/lantiq/xway/dcdc.c | 2 +- + arch/mips/lantiq/xway/dma.c | 2 +- + arch/mips/lantiq/xway/gptu.c | 2 +- + arch/mips/loongson64/setup.c | 1 - + arch/mips/mm/physaddr.c | 2 +- + arch/mips/mm/tlb-r4k.c | 56 +- + arch/mips/pci/pci-lantiq.c | 2 +- + arch/mips/pci/pci-rt2880.c | 2 +- + arch/mips/ralink/irq.c | 1 + + arch/mips/sgi-ip27/ip27-irq.c | 2 +- + arch/mips/sgi-ip30/ip30-power.c | 2 +- + arch/mips/sgi-ip30/ip30-setup.c | 2 +- + arch/mips/sgi-ip30/ip30-smp.c | 2 +- + arch/mips/sgi-ip30/ip30-timer.c | 2 +- + arch/mips/sgi-ip30/ip30-xtalk.c | 2 +- + arch/mips/txx9/generic/setup.c | 4 +- + arch/openrisc/kernel/dma.c | 4 +- + arch/parisc/Kconfig | 1 - + arch/powerpc/Kconfig | 2 - + arch/powerpc/include/asm/book3s/64/hash-4k.h | 6 - + arch/powerpc/include/asm/book3s/64/hash-64k.h | 7 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 53 +- + arch/powerpc/include/asm/book3s/64/pkeys.h | 2 +- + arch/powerpc/include/asm/book3s/64/radix.h | 14 +- + arch/powerpc/include/asm/mman.h | 2 +- + arch/powerpc/include/asm/pkeys.h | 4 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +- + arch/powerpc/mm/book3s64/hash_hugepage.c | 2 +- + arch/powerpc/mm/book3s64/hash_pgtable.c | 3 +- + arch/powerpc/mm/book3s64/hugetlbpage.c | 2 +- + arch/powerpc/mm/book3s64/pgtable.c | 12 +- + arch/powerpc/mm/book3s64/radix_pgtable.c | 5 +- + arch/powerpc/mm/pgtable.c | 2 +- + arch/powerpc/platforms/pseries/cmm.c | 2 +- + arch/powerpc/platforms/pseries/pci_dlpar.c | 2 +- + arch/riscv/Kconfig | 2 - + arch/riscv/include/asm/kvm_aia.h | 2 +- + arch/riscv/include/asm/kvm_gstage.h | 72 + + arch/riscv/include/asm/kvm_host.h | 105 +- + arch/riscv/include/asm/kvm_mmu.h | 21 + + arch/riscv/include/asm/kvm_tlb.h | 84 + + arch/riscv/include/asm/kvm_vcpu_sbi.h | 12 + + arch/riscv/include/asm/kvm_vmid.h | 27 + + arch/riscv/include/asm/pgtable-64.h | 16 - + arch/riscv/include/asm/pgtable-bits.h | 1 - + arch/riscv/include/asm/pgtable.h | 22 - + arch/riscv/include/asm/tlbflush.h | 1 - + arch/riscv/include/uapi/asm/kvm.h | 1 + + arch/riscv/kvm/Kconfig | 1 + + arch/riscv/kvm/Makefile | 1 + + arch/riscv/kvm/aia_device.c | 6 +- + arch/riscv/kvm/aia_imsic.c | 12 +- + arch/riscv/kvm/gstage.c | 338 + + arch/riscv/kvm/main.c | 3 +- + arch/riscv/kvm/mmu.c | 509 +- + arch/riscv/kvm/tlb.c | 110 +- + arch/riscv/kvm/vcpu.c | 48 +- + arch/riscv/kvm/vcpu_exit.c | 20 +- + arch/riscv/kvm/vcpu_onereg.c | 83 +- + arch/riscv/kvm/vcpu_sbi.c | 49 + + arch/riscv/kvm/vcpu_sbi_replace.c | 17 +- + arch/riscv/kvm/vcpu_sbi_sta.c | 3 +- + arch/riscv/kvm/vcpu_sbi_v01.c | 25 +- + arch/riscv/kvm/vm.c | 7 +- + arch/riscv/kvm/vmid.c | 25 + + arch/riscv/mm/fault.c | 8 + + arch/riscv/mm/pageattr.c | 8 +- + arch/riscv/mm/ptdump.c | 3 - + arch/riscv/mm/tlbflush.c | 5 - + arch/s390/Kconfig | 2 +- + arch/s390/configs/debug_defconfig | 1 + + arch/s390/configs/defconfig | 1 + + arch/s390/crypto/Makefile | 1 + + arch/s390/crypto/hmac_s390.c | 12 +- + arch/s390/crypto/paes_s390.c | 2 +- + arch/s390/crypto/phmac_s390.c | 1048 +++ + arch/s390/crypto/sha.h | 3 + + arch/s390/crypto/sha3_256_s390.c | 22 +- + arch/s390/crypto/sha3_512_s390.c | 23 +- + arch/s390/include/asm/cpacf.h | 4 + + arch/s390/include/asm/entry-common.h | 10 + + arch/s390/include/asm/kvm_host.h | 3 + + arch/s390/include/asm/percpu.h | 5 +- + arch/s390/kvm/kvm-s390.c | 51 +- + arch/s390/kvm/vsie.c | 17 +- + arch/s390/mm/dump_pagetables.c | 2 - + arch/sh/Kconfig | 1 - + arch/sh/Makefile | 10 +- + arch/sh/boot/compressed/Makefile | 4 +- + arch/sh/boot/romimage/Makefile | 4 +- + arch/sparc/Kconfig | 2 +- + arch/sparc/include/asm/hugetlb.h | 5 - + arch/sparc/include/asm/mman.h | 4 +- + arch/sparc/mm/hugetlbpage.c | 119 - + arch/sparc/mm/init_64.c | 2 +- + arch/x86/Kconfig | 3 +- + arch/x86/crypto/aegis128-aesni-glue.c | 40 +- + arch/x86/crypto/aria_aesni_avx2_glue.c | 1 + + arch/x86/crypto/aria_aesni_avx_glue.c | 1 + + arch/x86/crypto/camellia_aesni_avx_glue.c | 1 + + arch/x86/crypto/camellia_glue.c | 1 + + arch/x86/crypto/curve25519-x86_64.c | 1 + + arch/x86/crypto/serpent_avx_glue.c | 1 + + arch/x86/crypto/sm4_aesni_avx_glue.c | 1 + + arch/x86/crypto/twofish_glue.c | 1 + + arch/x86/crypto/twofish_glue_3way.c | 1 + + arch/x86/include/asm/apic.h | 66 +- + arch/x86/include/asm/irq_remapping.h | 17 +- + arch/x86/include/asm/kvm-x86-ops.h | 5 +- + arch/x86/include/asm/kvm_host.h | 76 +- + arch/x86/include/asm/msr-index.h | 1 + + arch/x86/include/asm/pgtable.h | 51 +- + arch/x86/include/asm/pgtable_types.h | 5 +- + arch/x86/include/asm/svm.h | 13 +- + arch/x86/include/asm/tlbflush.h | 5 - + arch/x86/kernel/cpu/sgx/encl.c | 8 +- + arch/x86/kernel/cpu/sgx/encl.h | 2 +- + arch/x86/kernel/setup.c | 4 + + arch/x86/kvm/Kconfig | 10 + + arch/x86/kvm/Makefile | 7 +- + arch/x86/kvm/cpuid.c | 1 + + arch/x86/kvm/hyperv.c | 10 +- + arch/x86/kvm/hyperv.h | 3 +- + arch/x86/kvm/i8254.c | 90 +- + arch/x86/kvm/i8254.h | 17 +- + arch/x86/kvm/i8259.c | 17 +- + arch/x86/kvm/ioapic.c | 55 +- + arch/x86/kvm/ioapic.h | 24 +- + arch/x86/kvm/irq.c | 560 +- + arch/x86/kvm/irq.h | 45 +- + arch/x86/kvm/irq_comm.c | 469 -- + arch/x86/kvm/lapic.c | 104 +- + arch/x86/kvm/lapic.h | 26 +- + arch/x86/kvm/mmu/mmu.c | 75 +- + arch/x86/kvm/mmu/mmu_internal.h | 3 + + arch/x86/kvm/mmu/paging_tmpl.h | 8 +- + arch/x86/kvm/mmu/spte.c | 43 +- + arch/x86/kvm/mmu/spte.h | 10 + + arch/x86/kvm/svm/avic.c | 692 +- + arch/x86/kvm/svm/nested.c | 128 +- + arch/x86/kvm/svm/sev.c | 149 +- + arch/x86/kvm/svm/svm.c | 512 +- + arch/x86/kvm/svm/svm.h | 137 +- + arch/x86/kvm/trace.h | 99 +- + arch/x86/kvm/vmx/capabilities.h | 1 - + arch/x86/kvm/vmx/common.h | 2 - + arch/x86/kvm/vmx/main.c | 61 +- + arch/x86/kvm/vmx/nested.c | 27 +- + arch/x86/kvm/vmx/pmu_intel.c | 8 +- + arch/x86/kvm/vmx/posted_intr.c | 138 +- + arch/x86/kvm/vmx/posted_intr.h | 10 +- + arch/x86/kvm/vmx/run_flags.h | 10 +- + arch/x86/kvm/vmx/tdx.c | 71 +- + arch/x86/kvm/vmx/tdx.h | 1 + + arch/x86/kvm/vmx/vmx.c | 296 +- + arch/x86/kvm/vmx/vmx.h | 57 +- + arch/x86/kvm/vmx/x86_ops.h | 16 +- + arch/x86/kvm/x86.c | 389 +- + arch/x86/kvm/x86.h | 40 +- + arch/x86/mm/pat/memtype.c | 1 - + arch/x86/mm/pgprot.c | 2 +- + block/bio.c | 4 +- + crypto/ahash.c | 39 +- + crypto/cryptd.c | 6 + + crypto/crypto_engine.c | 55 +- + crypto/deflate.c | 7 +- + crypto/jitterentropy-kcapi.c | 9 +- + crypto/jitterentropy.c | 2 +- + crypto/krb5/selftest.c | 1 + + crypto/pcrypt.c | 7 +- + crypto/testmgr.c | 39 +- + crypto/zstd.c | 390 +- + drivers/Kconfig | 2 - + drivers/accel/amdxdna/aie2_ctx.c | 7 +- + drivers/accel/amdxdna/amdxdna_gem.c | 191 +- + drivers/accel/amdxdna/amdxdna_gem.h | 3 +- + drivers/accel/drm_accel.c | 16 - + drivers/accel/habanalabs/common/device.c | 25 +- + drivers/accel/ivpu/ivpu_drv.c | 1 + + drivers/accel/ivpu/ivpu_drv.h | 15 +- + drivers/accel/ivpu/ivpu_hw.c | 4 + + drivers/accel/ivpu/ivpu_hw_ip.c | 1 + + drivers/accel/ivpu/ivpu_job.c | 81 +- + drivers/accel/ivpu/ivpu_pm.c | 15 +- + drivers/accel/qaic/Makefile | 1 + + drivers/accel/qaic/qaic.h | 10 +- + drivers/accel/qaic/qaic_data.c | 1 - + drivers/accel/qaic/qaic_drv.c | 6 + + drivers/accel/qaic/qaic_ras.c | 642 ++ + drivers/accel/qaic/qaic_ras.h | 10 + + drivers/acpi/numa/hmat.c | 8 +- + drivers/base/memory.c | 21 +- + drivers/base/node.c | 121 +- + drivers/base/power/main.c | 14 + + drivers/block/null_blk/main.c | 2 +- + drivers/char/hw_random/atmel-rng.c | 1 - + drivers/char/hw_random/cctrng.c | 1 - + drivers/char/hw_random/mtk-rng.c | 5 +- + drivers/char/hw_random/npcm-rng.c | 1 - + drivers/char/hw_random/omap3-rom-rng.c | 1 - + drivers/char/hw_random/rockchip-rng.c | 3 - + drivers/char/hw_random/stm32-rng.c | 1 - + drivers/clk/Kconfig | 1 - + drivers/clk/Makefile | 1 + + drivers/clk/at91/sam9x7.c | 20 +- + drivers/clk/baikal-t1/clk-ccu-div.c | 2 +- + drivers/clk/baikal-t1/clk-ccu-pll.c | 2 +- + drivers/clk/bcm/clk-bcm2835.c | 19 +- + drivers/clk/bcm/clk-bcm53573-ilp.c | 2 +- + drivers/clk/berlin/berlin2-avpll.c | 2 +- + drivers/clk/clk-asm9260.c | 4 +- + drivers/clk/clk-ast2600.c | 2 +- + drivers/clk/clk-axi-clkgen.c | 161 +- + drivers/clk/clk-clps711x.c | 2 +- + drivers/clk/clk-eyeq.c | 2 +- + drivers/clk/clk-gate.c | 2 +- + drivers/clk/clk-hsdk-pll.c | 2 +- + drivers/clk/clk-pwm.c | 49 +- + drivers/clk/clk-s2mps11.c | 2 +- + drivers/clk/clk-scmi.c | 2 +- + drivers/clk/clk-si5351.c | 6 +- + drivers/clk/clk-si544.c | 2 +- + drivers/clk/clk-si570.c | 4 +- + drivers/clk/clk-sp7021.c | 2 +- + drivers/clk/clk-stm32f4.c | 2 +- + drivers/clk/clk-versaclock5.c | 2 +- + drivers/clk/clk-versaclock7.c | 2 +- + drivers/clk/clk.c | 12 + + drivers/clk/clk_test.c | 226 +- + drivers/clk/davinci/pll.h | 2 +- + drivers/clk/davinci/psc.c | 5 + + drivers/clk/hisilicon/clkgate-separated.c | 16 +- + drivers/clk/imx/clk-busy.c | 8 +- + drivers/clk/imx/clk-composite-8m.c | 16 - + drivers/clk/imx/clk-composite-93.c | 7 - + drivers/clk/imx/clk-cpu.c | 10 +- + drivers/clk/imx/clk-fixup-div.c | 10 +- + drivers/clk/imx/clk-fixup-mux.c | 2 +- + drivers/clk/imx/clk-frac-pll.c | 20 +- + drivers/clk/imx/clk-fracn-gppll.c | 17 +- + drivers/clk/imx/clk-gate-exclusive.c | 2 +- + drivers/clk/imx/clk-imx5.c | 2 +- + drivers/clk/imx/clk-imx8-acm.c | 2 +- + drivers/clk/imx/clk-imx8qxp-lpcg.c | 1 - + drivers/clk/imx/clk-imx95-blk-ctl.c | 93 +- + drivers/clk/imx/clk-pfd.c | 18 +- + drivers/clk/imx/clk-pll14xx.c | 29 +- + drivers/clk/imx/clk-pllv2.c | 23 +- + drivers/clk/imx/clk-pllv3.c | 72 +- + drivers/clk/imx/clk-pllv4.c | 29 +- + drivers/clk/imx/clk-scu.c | 39 +- + drivers/clk/ingenic/cgu.h | 2 +- + drivers/clk/kunit_clk_hw_get_dev_of_node.dtso | 10 + + drivers/clk/meson/Kconfig | 4 +- + drivers/clk/meson/a1-peripherals.c | 194 +- + drivers/clk/meson/a1-peripherals.h | 46 - + drivers/clk/meson/a1-pll.c | 28 +- + drivers/clk/meson/a1-pll.h | 28 - + drivers/clk/meson/axg-aoclk.c | 22 - + drivers/clk/meson/axg-audio.c | 603 +- + drivers/clk/meson/axg-audio.h | 70 - + drivers/clk/meson/axg.c | 220 +- + drivers/clk/meson/axg.h | 105 - + drivers/clk/meson/c3-peripherals.c | 210 +- + drivers/clk/meson/c3-pll.c | 32 +- + drivers/clk/meson/clk-cpu-dyndiv.c | 1 + + drivers/clk/meson/clk-dualdiv.c | 2 + + drivers/clk/meson/clk-mpll.c | 6 + + drivers/clk/meson/clk-phase.c | 11 + + drivers/clk/meson/clk-pll.c | 7 + + drivers/clk/meson/clk-regmap.c | 49 + + drivers/clk/meson/clk-regmap.h | 4 + + drivers/clk/meson/g12a-aoclk.c | 34 - + drivers/clk/meson/g12a.c | 378 +- + drivers/clk/meson/g12a.h | 130 - + drivers/clk/meson/gxbb-aoclk.c | 19 - + drivers/clk/meson/gxbb.c | 494 +- + drivers/clk/meson/gxbb.h | 115 - + drivers/clk/meson/meson-aoclk.c | 5 +- + drivers/clk/meson/meson-aoclk.h | 2 - + drivers/clk/meson/meson-eeclk.c | 4 - + drivers/clk/meson/meson-eeclk.h | 2 - + drivers/clk/meson/meson8-ddr.c | 9 - + drivers/clk/meson/meson8b.c | 267 +- + drivers/clk/meson/meson8b.h | 80 - + drivers/clk/meson/s4-peripherals.c | 388 +- + drivers/clk/meson/s4-peripherals.h | 56 - + drivers/clk/meson/s4-pll.c | 60 +- + drivers/clk/meson/s4-pll.h | 38 - + drivers/clk/meson/sclk-div.c | 5 + + drivers/clk/meson/vclk.c | 2 + + drivers/clk/meson/vid-pll-div.c | 1 + + drivers/clk/microchip/clk-core.c | 2 +- + drivers/clk/mmp/clk-gate.c | 2 +- + drivers/clk/mvebu/armada-xp.c | 5 +- + drivers/clk/mxs/clk-div.c | 2 +- + drivers/clk/nuvoton/Kconfig | 4 +- + drivers/clk/nxp/clk-lpc18xx-ccu.c | 2 +- + drivers/clk/qcom/Kconfig | 104 +- + drivers/clk/qcom/Makefile | 11 + + drivers/clk/qcom/camcc-milos.c | 2161 +++++ + drivers/clk/qcom/camcc-qcs615.c | 1597 ++++ + drivers/clk/qcom/camcc-sc8180x.c | 2889 +++++++ + drivers/clk/qcom/camcc-sm8450.c | 89 +- + drivers/clk/qcom/camcc-sm8550.c | 85 +- + drivers/clk/qcom/camcc-sm8650.c | 83 +- + drivers/clk/qcom/camcc-x1e80100.c | 67 +- + drivers/clk/qcom/clk-alpha-pll.c | 249 +- + drivers/clk/qcom/clk-alpha-pll.h | 4 + + drivers/clk/qcom/clk-rpm.c | 10 +- + drivers/clk/qcom/clk-rpmh.c | 34 +- + drivers/clk/qcom/clk-smd-rpm.c | 8 +- + drivers/clk/qcom/clk-spmi-pmic-div.c | 12 +- + drivers/clk/qcom/common.c | 91 +- + drivers/clk/qcom/common.h | 12 + + drivers/clk/qcom/dispcc-milos.c | 974 +++ + drivers/clk/qcom/dispcc-qcs615.c | 792 ++ + drivers/clk/qcom/dispcc-sm8750.c | 10 +- + drivers/clk/qcom/gcc-ipq4019.c | 14 +- + drivers/clk/qcom/gcc-ipq5018.c | 4 +- + drivers/clk/qcom/gcc-ipq8074.c | 6 +- + drivers/clk/qcom/gcc-milos.c | 3225 ++++++++ + drivers/clk/qcom/gcc-qcm2290.c | 1 + + drivers/clk/qcom/gcc-sm8150.c | 6 +- + drivers/clk/qcom/gcc-x1e80100.c | 2 + + drivers/clk/qcom/gpucc-milos.c | 562 ++ + drivers/clk/qcom/gpucc-qcs615.c | 531 ++ + drivers/clk/qcom/ipq-cmn-pll.c | 50 +- + drivers/clk/qcom/lpassaudiocc-sc7280.c | 2 - + drivers/clk/qcom/lpasscorecc-sc7180.c | 2 - + drivers/clk/qcom/tcsrcc-sm8650.c | 8 + + drivers/clk/qcom/videocc-milos.c | 403 + + drivers/clk/qcom/videocc-qcs615.c | 338 + + drivers/clk/qcom/videocc-sc7180.c | 2 +- + drivers/clk/qcom/videocc-sdm845.c | 4 +- + drivers/clk/qcom/videocc-sm6350.c | 355 + + drivers/clk/qcom/videocc-sm7150.c | 4 +- + drivers/clk/qcom/videocc-sm8150.c | 4 +- + drivers/clk/qcom/videocc-sm8450.c | 62 +- + drivers/clk/qcom/videocc-sm8550.c | 91 +- + drivers/clk/renesas/Kconfig | 10 + + drivers/clk/renesas/Makefile | 2 + + drivers/clk/renesas/r7s9210-cpg-mssr.c | 7 +- + drivers/clk/renesas/r8a77970-cpg-mssr.c | 8 +- + drivers/clk/renesas/r9a07g043-cpg.c | 132 +- + drivers/clk/renesas/r9a07g044-cpg.c | 168 +- + drivers/clk/renesas/r9a08g045-cpg.c | 229 +- + drivers/clk/renesas/r9a09g011-cpg.c | 116 +- + drivers/clk/renesas/r9a09g047-cpg.c | 72 + + drivers/clk/renesas/r9a09g056-cpg.c | 202 +- + drivers/clk/renesas/r9a09g057-cpg.c | 127 +- + drivers/clk/renesas/r9a09g077-cpg.c | 256 + + drivers/clk/renesas/rcar-gen2-cpg.c | 5 +- + drivers/clk/renesas/rcar-gen2-cpg.h | 3 +- + drivers/clk/renesas/rcar-gen3-cpg.c | 6 +- + drivers/clk/renesas/rcar-gen3-cpg.h | 3 +- + drivers/clk/renesas/rcar-gen4-cpg.c | 6 +- + drivers/clk/renesas/rcar-gen4-cpg.h | 3 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 195 +- + drivers/clk/renesas/renesas-cpg-mssr.h | 32 +- + drivers/clk/renesas/rzg2l-cpg.c | 529 +- + drivers/clk/renesas/rzg2l-cpg.h | 66 +- + drivers/clk/renesas/rzv2h-cpg.c | 130 +- + drivers/clk/renesas/rzv2h-cpg.h | 49 +- + drivers/clk/rockchip/clk-cpu.c | 6 +- + drivers/clk/rockchip/clk-mmc-phase.c | 4 +- + drivers/clk/rockchip/clk-pll.c | 2 +- + drivers/clk/rockchip/clk-rk3568.c | 1 + + drivers/clk/rockchip/clk.h | 2 +- + drivers/clk/samsung/clk-cpu.c | 2 +- + drivers/clk/samsung/clk-exynos850.c | 2 +- + drivers/clk/samsung/clk-exynosautov920.c | 72 + + drivers/clk/samsung/clk-gs101.c | 4 +- + drivers/clk/samsung/clk-pll.c | 2 +- + drivers/clk/sophgo/clk-sg2042-clkgen.c | 2 +- + drivers/clk/sophgo/clk-sg2042-pll.c | 4 +- + drivers/clk/spacemit/Kconfig | 1 + + drivers/clk/spacemit/ccu-k1.c | 242 +- + drivers/clk/spacemit/ccu_mix.h | 11 +- + drivers/clk/spacemit/ccu_pll.c | 2 +- + drivers/clk/spear/spear1340_clock.c | 2 +- + drivers/clk/sprd/gate.h | 2 +- + drivers/clk/sprd/ums512-clk.c | 4 +- + drivers/clk/starfive/clk-starfive-jh7110-sys.c | 2 +- + drivers/clk/stm32/Kconfig | 8 +- + drivers/clk/stm32/clk-stm32mp1.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun50i-h6-r.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun55i-a523-r.c | 1 + + drivers/clk/sunxi-ng/ccu-sun8i-r40.c | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-v3s.c | 22 +- + drivers/clk/sunxi-ng/ccu_common.c | 2 +- + drivers/clk/sunxi-ng/ccu_gate.c | 14 +- + drivers/clk/sunxi-ng/ccu_nk.c | 14 +- + drivers/clk/sunxi-ng/ccu_nkmp.c | 23 +- + drivers/clk/sunxi-ng/ccu_nm.c | 43 +- + drivers/clk/tegra/clk-periph.c | 6 +- + drivers/clk/tegra/clk-tegra210.c | 2 +- + drivers/clk/tegra/clk.h | 1 - + drivers/clk/thead/clk-th1520-ap.c | 107 +- + drivers/clk/ti/autoidle.c | 2 +- + drivers/clk/ti/clk-43xx.c | 2 +- + drivers/clk/ti/clk.c | 27 +- + drivers/clk/ti/mux.c | 2 +- + drivers/clk/versatile/clk-icst.c | 2 +- + drivers/clk/visconti/pll.c | 2 +- + drivers/clk/xilinx/clk-xlnx-clock-wizard.c | 2 +- + drivers/clk/xilinx/xlnx_vcu.c | 33 +- + drivers/cpufreq/Makefile | 1 + + drivers/cpufreq/powernv-cpufreq.c | 4 +- + drivers/cpufreq/powernv-trace.h | 44 + + drivers/crypto/Kconfig | 13 + + .../crypto/allwinner/sun8i-ce/sun8i-ce-cipher.c | 15 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-hash.c | 6 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 2 - + drivers/crypto/aspeed/aspeed-hace-hash.c | 802 +- + drivers/crypto/aspeed/aspeed-hace.h | 28 +- + drivers/crypto/atmel-aes.c | 1 + + drivers/crypto/atmel-sha.c | 1 + + drivers/crypto/caam/Makefile | 4 - + drivers/crypto/caam/ctrl.c | 13 +- + drivers/crypto/caam/debugfs.c | 2 +- + drivers/crypto/caam/debugfs.h | 2 +- + drivers/crypto/caam/intern.h | 5 +- + drivers/crypto/caam/jr.c | 3 +- + drivers/crypto/caam/qi.c | 5 +- + drivers/crypto/ccp/ccp-debugfs.c | 3 + + drivers/crypto/ccp/ccp-ops.c | 163 +- + drivers/crypto/ccp/sev-dev.c | 26 +- + drivers/crypto/ccp/sp-pci.c | 1 + + drivers/crypto/ccree/cc_buffer_mgr.c | 54 +- + drivers/crypto/ccree/cc_cipher.c | 4 +- + drivers/crypto/ccree/cc_hash.c | 30 +- + drivers/crypto/ccree/cc_pm.c | 1 - + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 8 +- + drivers/crypto/hisilicon/qm.c | 1 - + drivers/crypto/hisilicon/sec2/sec.h | 63 +- + drivers/crypto/hisilicon/sec2/sec_crypto.c | 595 +- + drivers/crypto/hisilicon/sgl.c | 15 +- + drivers/crypto/hisilicon/zip/zip_crypto.c | 13 +- + drivers/crypto/img-hash.c | 2 +- + drivers/crypto/inside-secure/safexcel_hash.c | 8 +- + .../crypto/intel/keembay/keembay-ocs-hcu-core.c | 8 +- + drivers/crypto/intel/keembay/ocs-aes.c | 4 +- + .../crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c | 18 +- + .../crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c | 14 +- + .../crypto/intel/qat/qat_6xxx/adf_6xxx_hw_data.c | 129 +- + .../crypto/intel/qat/qat_6xxx/adf_6xxx_hw_data.h | 22 +- + drivers/crypto/intel/qat/qat_common/Makefile | 4 + + .../intel/qat/qat_common/adf_accel_devices.h | 40 +- + drivers/crypto/intel/qat/qat_common/adf_aer.c | 2 +- + .../crypto/intel/qat/qat_common/adf_bank_state.c | 238 + + .../crypto/intel/qat/qat_common/adf_bank_state.h | 49 + + .../crypto/intel/qat/qat_common/adf_cfg_common.h | 1 + + .../crypto/intel/qat/qat_common/adf_cfg_services.c | 45 +- + .../crypto/intel/qat/qat_common/adf_cfg_services.h | 13 +- + .../crypto/intel/qat/qat_common/adf_cfg_strings.h | 1 + + .../crypto/intel/qat/qat_common/adf_common_drv.h | 2 +- + .../crypto/intel/qat/qat_common/adf_gen4_hw_data.c | 229 +- + .../crypto/intel/qat/qat_common/adf_gen4_hw_data.h | 10 +- + .../intel/qat/qat_common/adf_gen4_pm_debugfs.c | 105 +- + .../crypto/intel/qat/qat_common/adf_gen4_vf_mig.c | 7 +- + drivers/crypto/intel/qat/qat_common/adf_gen6_pm.h | 24 + + .../intel/qat/qat_common/adf_gen6_pm_dbgfs.c | 124 + + .../crypto/intel/qat/qat_common/adf_gen6_shared.c | 7 + + .../crypto/intel/qat/qat_common/adf_gen6_shared.h | 2 + + drivers/crypto/intel/qat/qat_common/adf_gen6_tl.c | 146 + + drivers/crypto/intel/qat/qat_common/adf_gen6_tl.h | 198 + + drivers/crypto/intel/qat/qat_common/adf_init.c | 1 + + drivers/crypto/intel/qat/qat_common/adf_isr.c | 5 + + .../intel/qat/qat_common/adf_pm_dbgfs_utils.c | 52 + + .../intel/qat/qat_common/adf_pm_dbgfs_utils.h | 36 + + drivers/crypto/intel/qat/qat_common/adf_rl.c | 86 +- + drivers/crypto/intel/qat/qat_common/adf_rl.h | 11 +- + drivers/crypto/intel/qat/qat_common/adf_rl_admin.c | 1 + + drivers/crypto/intel/qat/qat_common/adf_sriov.c | 1 - + drivers/crypto/intel/qat/qat_common/adf_sysfs.c | 2 + + drivers/crypto/intel/qat/qat_common/adf_sysfs_rl.c | 21 +- + .../crypto/intel/qat/qat_common/adf_tl_debugfs.c | 3 + + .../intel/qat/qat_common/adf_transport_debug.c | 21 +- + drivers/crypto/intel/qat/qat_common/qat_algs.c | 12 +- + drivers/crypto/intel/qat/qat_common/qat_bl.c | 6 +- + .../crypto/intel/qat/qat_common/qat_compression.c | 8 +- + drivers/crypto/marvell/cesa/cipher.c | 4 +- + drivers/crypto/marvell/cesa/hash.c | 10 +- + drivers/crypto/marvell/octeontx2/otx2_cpt_reqmgr.h | 128 +- + drivers/crypto/marvell/octeontx2/otx2_cptlf.h | 3 +- + .../crypto/marvell/octeontx2/otx2_cptpf_ucode.c | 51 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 6 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_main.c | 28 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_mbox.c | 7 +- + .../crypto/marvell/octeontx2/otx2_cptvf_reqmgr.c | 14 +- + drivers/crypto/omap-aes-gcm.c | 1 - + drivers/crypto/omap-aes.c | 1 - + drivers/crypto/omap-des.c | 1 - + drivers/crypto/omap-sham.c | 1 - + drivers/crypto/stm32/stm32-cryp.c | 1 - + drivers/crypto/stm32/stm32-hash.c | 1 - + drivers/crypto/virtio/virtio_crypto_common.h | 2 - + drivers/crypto/virtio/virtio_crypto_core.c | 2 +- + drivers/crypto/virtio/virtio_crypto_mgr.c | 36 - + drivers/cxl/core/region.c | 16 +- + drivers/cxl/cxl.h | 5 +- + drivers/dax/device.c | 23 +- + drivers/dax/hmem/hmem.c | 1 - + drivers/dax/kmem.c | 1 - + drivers/dax/pmem.c | 1 - + drivers/dax/super.c | 3 +- + drivers/dma-buf/Kconfig | 1 - + drivers/dma-buf/dma-fence-chain.c | 7 +- + drivers/dma-buf/dma-fence.c | 169 +- + drivers/dma-buf/heaps/Kconfig | 10 + + drivers/dma-buf/heaps/cma_heap.c | 36 +- + drivers/dma-buf/heaps/system_heap.c | 43 +- + drivers/dma-buf/sw_sync.c | 2 +- + drivers/dma-buf/sync_file.c | 24 +- + drivers/dma-buf/udmabuf.c | 23 +- + drivers/dma/dma-axi-dmac.c | 2 +- + drivers/gpu/drm/Kconfig.debug | 1 + + drivers/gpu/drm/Makefile | 6 +- + drivers/gpu/drm/adp/adp-mipi.c | 8 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 33 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_aca.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 33 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_arcturus.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 54 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 491 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 58 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_eviction_fence.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 151 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 24 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 262 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_i2c.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ip.c | 96 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h | 29 + + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c | 175 + + drivers/gpu/drm/amd/amdgpu/amdgpu_isp.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.c | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 134 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 55 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 126 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 98 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 88 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 60 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 59 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 76 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 238 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.h | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 3 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 313 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 70 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 46 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 45 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 71 - + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 71 - + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 60 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 8 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 276 +- + drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c | 184 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 12 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 21 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 20 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 25 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 26 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_8.c | 6 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 20 - + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 12 +- + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 52 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0_8.c | 25 +- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 56 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c | 37 +- + drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 70 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 41 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 55 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 26 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 29 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 49 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 29 +- + drivers/gpu/drm/amd/amdgpu/soc15.h | 1 - + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 26 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 25 + + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 27 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 23 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 13 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 23 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 23 +- + drivers/gpu/drm/amd/amdkfd/Kconfig | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 123 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 11 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 1 - + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_smi_events.c | 8 +- + drivers/gpu/drm/amd/amdxcp/amdgpu_xcp_drv.c | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 200 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 3 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 6 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 4 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 26 + + .../gpu/drm/amd/display/dc/bios/command_table2.c | 1 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 2 +- + .../gpu/drm/amd/display/dc/clk_mgr/dcn30/dalsmc.h | 3 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 4 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30m_clk_mgr.c | 36 + + .../amd/display/dc/clk_mgr/dcn30/dcn30m_clk_mgr.h | 31 + + .../dc/clk_mgr/dcn30/dcn30m_clk_mgr_smu_msg.c | 118 + + .../dc/clk_mgr/dcn30/dcn30m_clk_mgr_smu_msg.h | 34 + + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 111 +- + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.h | 3 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 59 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 + + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 26 + + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 5 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 16 +- + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 13 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 67 + + drivers/gpu/drm/amd/display/dc/dc.h | 102 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 433 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 77 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 15 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 5 +- + drivers/gpu/drm/amd/display/dc/dc_spl_translate.c | 19 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 11 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 20 +- + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c | 2 +- + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.h | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 59 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 43 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.h | 2 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 4 - + .../gpu/drm/amd/display/dc/dml/calcs/dcn_calcs.c | 6 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 45 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.h | 12 +- + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 6 +- + .../gpu/drm/amd/display/dc/dml/dcn31/dcn31_fpu.h | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.h | 2 +- + .../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/dcn35/dcn35_fpu.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.h | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dcn351/dcn351_fpu.h | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.c | 239 - + .../gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.h | 14 - + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 13 +- + .../drm/amd/display/dc/dml2/display_mode_core.c | 2 +- + .../display/dc/dml2/display_mode_core_structs.h | 1 + + .../dc/dml2/dml21/dml21_translation_helper.c | 590 +- + .../dc/dml2/dml21/dml21_translation_helper.h | 4 +- + .../drm/amd/display/dc/dml2/dml21/dml21_utils.c | 14 +- + .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.c | 67 +- + .../drm/amd/display/dc/dml2/dml21/dml21_wrapper.h | 13 +- + .../drm/amd/display/dc/dml2/dml21/inc/dml_top.h | 1 - + .../dc/dml2/dml21/inc/dml_top_dchub_registers.h | 1 + + .../dc/dml2/dml21/inc/dml_top_display_cfg_types.h | 2 + + .../dml2/dml21/inc/dml_top_soc_parameter_types.h | 5 + + .../amd/display/dc/dml2/dml21/inc/dml_top_types.h | 14 +- + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 53 +- + .../dml21/src/dml2_core/dml2_core_shared_types.h | 181 +- + .../dc/dml2/dml21/src/dml2_core/dml2_core_utils.c | 2 +- + .../dc/dml2/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 3 - + .../amd/display/dc/dml2/dml21/src/inc/dml2_debug.h | 149 +- + .../dml21/src/inc/dml2_internal_shared_types.h | 10 +- + .../drm/amd/display/dc/dml2/dml2_mall_phantom.c | 2 +- + .../amd/display/dc/dml2/dml2_translation_helper.c | 19 - + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 265 +- + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 6 +- + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.c | 2 +- + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h | 3 +- + .../drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 24 - + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 192 +- + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c | 28 +- + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.h | 1 + + drivers/gpu/drm/amd/display/dc/dsc/dsc.h | 1 + + .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.h | 19 + + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 4 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h | 2 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 32 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.h | 4 + + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 59 + + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 30 +- + .../drm/amd/display/dc/hwss/dcn31/dcn31_hwseq.c | 13 + + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 6 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 316 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 9 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 3 + + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 17 +- + drivers/gpu/drm/amd/display/dc/inc/dcn_calcs.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 16 + + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 2 +- + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 47 + + drivers/gpu/drm/amd/display/dc/inc/hw/pg_cntl.h | 2 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/link.h | 6 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 63 +- + .../hwss/link_hwss_hpo_fixed_vs_pe_retimer_dp.c | 2 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 3 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 27 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 10 +- + .../gpu/drm/amd/display/dc/link/link_validation.c | 132 +- + .../gpu/drm/amd/display/dc/link/link_validation.h | 6 +- + .../display/dc/link/protocols/link_dp_capability.c | 19 + + .../amd/display/dc/link/protocols/link_dp_dpia.c | 15 +- + .../display/dc/link/protocols/link_dp_dpia_bw.c | 295 +- + .../display/dc/link/protocols/link_dp_dpia_bw.h | 39 +- + .../dc/link/protocols/link_edp_panel_control.c | 40 +- + .../dc/link/protocols/link_edp_panel_control.h | 1 + + drivers/gpu/drm/amd/display/dc/mpc/Makefile | 2 +- + .../gpu/drm/amd/display/dc/mpc/dcn32/dcn32_mpc.c | 5 +- + .../gpu/drm/amd/display/dc/mpc/dcn32/dcn32_mpc.h | 8 + + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c | 12 +- + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.h | 13 + + drivers/gpu/drm/amd/display/dc/os_types.h | 1 + + .../display/dc/resource/dce100/dce100_resource.c | 2 +- + .../display/dc/resource/dce110/dce110_resource.c | 2 +- + .../display/dc/resource/dce112/dce112_resource.c | 2 +- + .../display/dc/resource/dce112/dce112_resource.h | 2 +- + .../amd/display/dc/resource/dce60/dce60_resource.c | 2 +- + .../amd/display/dc/resource/dce80/dce80_resource.c | 2 +- + .../amd/display/dc/resource/dcn10/dcn10_resource.c | 4 +- + .../amd/display/dc/resource/dcn20/dcn20_resource.c | 10 +- + .../amd/display/dc/resource/dcn20/dcn20_resource.h | 4 +- + .../display/dc/resource/dcn201/dcn201_resource.c | 2 + + .../amd/display/dc/resource/dcn21/dcn21_resource.c | 10 +- + .../amd/display/dc/resource/dcn21/dcn21_resource.h | 2 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.c | 24 +- + .../amd/display/dc/resource/dcn30/dcn30_resource.h | 6 +- + .../display/dc/resource/dcn301/dcn301_resource.c | 2 + + .../display/dc/resource/dcn302/dcn302_resource.c | 2 + + .../display/dc/resource/dcn303/dcn303_resource.c | 2 + + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 56 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.h | 10 +- + .../display/dc/resource/dcn314/dcn314_resource.c | 20 +- + .../display/dc/resource/dcn314/dcn314_resource.h | 2 +- + .../display/dc/resource/dcn315/dcn315_resource.c | 10 +- + .../display/dc/resource/dcn316/dcn316_resource.c | 10 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 46 +- + .../amd/display/dc/resource/dcn32/dcn32_resource.h | 4 +- + .../display/dc/resource/dcn321/dcn321_resource.c | 22 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 19 +- + .../display/dc/resource/dcn351/dcn351_resource.c | 19 +- + .../amd/display/dc/resource/dcn36/dcn36_resource.c | 19 +- + .../display/dc/resource/dcn401/dcn401_resource.c | 52 +- + .../display/dc/resource/dcn401/dcn401_resource.h | 2 +- + drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c | 45 +- + drivers/gpu/drm/amd/display/dc/sspl/dc_spl_types.h | 2 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 13 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 367 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 5 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 21 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c | 5 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 13 +- + .../drm/amd/display/modules/freesync/freesync.c | 2 +- + .../drm/amd/display/modules/power/power_helpers.h | 2 + + drivers/gpu/drm/amd/include/amd_shared.h | 2 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 2 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 15 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 9 +- + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 72 +- + drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.c | 118 +- + drivers/gpu/drm/amd/pm/legacy-dpm/legacy_dpm.h | 7 +- + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 10 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu_helper.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 121 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 9 +- + .../pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0_0.h | 1 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_pmfw.h | 16 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 39 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 22 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 37 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 37 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 57 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 43 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 106 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 41 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 59 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h | 2 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 105 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 60 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_2_ppt.c | 94 +- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 10 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 41 +- + .../drm/arm/display/komeda/komeda_framebuffer.c | 3 +- + .../drm/arm/display/komeda/komeda_framebuffer.h | 1 + + drivers/gpu/drm/arm/hdlcd_crtc.c | 23 +- + drivers/gpu/drm/arm/malidp_drv.c | 12 +- + drivers/gpu/drm/armada/armada_fb.c | 12 +- + drivers/gpu/drm/armada/armada_fb.h | 4 +- + drivers/gpu/drm/armada/armada_fbdev.c | 5 +- + drivers/gpu/drm/ast/Makefile | 5 + + drivers/gpu/drm/ast/ast_2000.c | 149 + + drivers/gpu/drm/ast/ast_2100.c | 348 + + drivers/gpu/drm/ast/ast_2300.c | 1328 +++ + drivers/gpu/drm/ast/ast_2500.c | 569 ++ + drivers/gpu/drm/ast/ast_2600.c | 44 + + drivers/gpu/drm/ast/ast_dram_tables.h | 207 - + drivers/gpu/drm/ast/ast_drv.c | 2 +- + drivers/gpu/drm/ast/ast_drv.h | 17 +- + drivers/gpu/drm/ast/ast_mode.c | 69 +- + drivers/gpu/drm/ast/ast_post.c | 2027 +---- + drivers/gpu/drm/ast/ast_post.h | 50 + + drivers/gpu/drm/bridge/adv7511/Kconfig | 5 +- + drivers/gpu/drm/bridge/adv7511/adv7511.h | 53 +- + drivers/gpu/drm/bridge/adv7511/adv7511_audio.c | 77 +- + drivers/gpu/drm/bridge/adv7511/adv7511_cec.c | 57 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 360 +- + drivers/gpu/drm/bridge/adv7511/adv7533.c | 9 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 9 +- + .../gpu/drm/bridge/analogix/analogix-i2c-dptx.c | 2 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 41 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 3 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 9 +- + drivers/gpu/drm/bridge/aux-bridge.c | 9 +- + drivers/gpu/drm/bridge/aux-hpd-bridge.c | 10 +- + drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 72 +- + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 11 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 8 +- + drivers/gpu/drm/bridge/chrontel-ch7033.c | 10 +- + drivers/gpu/drm/bridge/cros-ec-anx7688.c | 8 +- + drivers/gpu/drm/bridge/display-connector.c | 11 +- + drivers/gpu/drm/bridge/fsl-ldb.c | 7 +- + drivers/gpu/drm/bridge/imx/imx-legacy-bridge.c | 10 +- + drivers/gpu/drm/bridge/imx/imx8mp-hdmi-pvi.c | 8 +- + .../gpu/drm/bridge/imx/imx8qxp-pixel-combiner.c | 27 +- + drivers/gpu/drm/bridge/imx/imx8qxp-pixel-link.c | 8 +- + drivers/gpu/drm/bridge/imx/imx8qxp-pxl2dpi.c | 8 +- + drivers/gpu/drm/bridge/ite-it6263.c | 11 +- + drivers/gpu/drm/bridge/ite-it6505.c | 10 +- + drivers/gpu/drm/bridge/ite-it66121.c | 11 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 14 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 7 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 23 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 3 +- + drivers/gpu/drm/bridge/lvds-codec.c | 9 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 16 +- + drivers/gpu/drm/bridge/microchip-lvds.c | 8 +- + drivers/gpu/drm/bridge/nwl-dsi.c | 8 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 9 +- + drivers/gpu/drm/bridge/panel.c | 13 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 8 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 8 +- + drivers/gpu/drm/bridge/samsung-dsim.c | 80 +- + drivers/gpu/drm/bridge/sii902x.c | 10 +- + drivers/gpu/drm/bridge/sii9234.c | 8 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 8 +- + drivers/gpu/drm/bridge/simple-bridge.c | 10 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 23 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 4 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 9 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 9 +- + drivers/gpu/drm/bridge/tc358762.c | 8 +- + drivers/gpu/drm/bridge/tc358764.c | 8 +- + drivers/gpu/drm/bridge/tc358767.c | 62 +- + drivers/gpu/drm/bridge/tc358768.c | 8 +- + drivers/gpu/drm/bridge/tc358775.c | 8 +- + drivers/gpu/drm/bridge/thc63lvd1024.c | 8 +- + drivers/gpu/drm/bridge/ti-dlpc3433.c | 8 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 73 +- + drivers/gpu/drm/bridge/ti-tdp158.c | 8 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 10 +- + drivers/gpu/drm/bridge/ti-tpd12s015.c | 16 +- + drivers/gpu/drm/ci/build-igt.sh | 2 +- + drivers/gpu/drm/ci/build.sh | 17 +- + drivers/gpu/drm/ci/build.yml | 10 +- + drivers/gpu/drm/ci/check-devicetrees.yml | 50 + + drivers/gpu/drm/ci/container.yml | 34 +- + drivers/gpu/drm/ci/dt-binding-check.sh | 19 + + drivers/gpu/drm/ci/dtbs-check.sh | 22 + + drivers/gpu/drm/ci/gitlab-ci.yml | 56 +- + drivers/gpu/drm/ci/igt_runner.sh | 1 + + drivers/gpu/drm/ci/image-tags.yml | 22 +- + drivers/gpu/drm/ci/kunit.sh | 16 + + drivers/gpu/drm/ci/kunit.yml | 37 + + drivers/gpu/drm/ci/lava-submit.sh | 6 +- + drivers/gpu/drm/ci/setup-llvm-links.sh | 13 + + drivers/gpu/drm/ci/test.yml | 47 +- + .../xfails/msm-sc7180-trogdor-kingoftown-skips.txt | 5 + + .../msm-sc7180-trogdor-lazor-limozeen-skips.txt | 5 + + drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt | 29 - + drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt | 139 - + drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt | 350 - + drivers/gpu/drm/clients/drm_client_setup.c | 7 + + drivers/gpu/drm/display/Kconfig | 13 +- + drivers/gpu/drm/display/Makefile | 4 + + drivers/gpu/drm/display/drm_bridge_connector.c | 126 +- + drivers/gpu/drm/display/drm_dp_aux_bus.c | 1 + + drivers/gpu/drm/display/drm_dp_cec.c | 1 + + drivers/gpu/drm/display/drm_dp_helper.c | 137 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 1 + + drivers/gpu/drm/display/drm_dp_tunnel.c | 1 + + drivers/gpu/drm/display/drm_dsc_helper.c | 1 + + drivers/gpu/drm/display/drm_hdmi_audio_helper.c | 4 + + drivers/gpu/drm/display/drm_hdmi_cec_helper.c | 193 + + .../gpu/drm/display/drm_hdmi_cec_notifier_helper.c | 65 + + drivers/gpu/drm/display/drm_hdmi_helper.c | 3 +- + drivers/gpu/drm/display/drm_hdmi_state_helper.c | 131 +- + drivers/gpu/drm/display/drm_scdc_helper.c | 1 + + drivers/gpu/drm/drm_atomic.c | 2 +- + drivers/gpu/drm/drm_atomic_helper.c | 161 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 1 + + drivers/gpu/drm/drm_atomic_uapi.c | 1 + + drivers/gpu/drm/drm_auth.c | 65 +- + drivers/gpu/drm/drm_bridge.c | 49 +- + drivers/gpu/drm/drm_bridge_helper.c | 2 + + drivers/gpu/drm/drm_buddy.c | 1 + + drivers/gpu/drm/drm_client.c | 36 +- + drivers/gpu/drm/drm_client_event.c | 1 + + drivers/gpu/drm/drm_client_modeset.c | 2 + + drivers/gpu/drm/drm_color_mgmt.c | 210 + + drivers/gpu/drm/drm_connector.c | 44 +- + drivers/gpu/drm/drm_damage_helper.c | 2 + + drivers/gpu/drm/drm_debugfs.c | 128 +- + drivers/gpu/drm/drm_debugfs_crc.c | 1 + + drivers/gpu/drm/drm_drv.c | 38 +- + drivers/gpu/drm/drm_edid.c | 252 +- + drivers/gpu/drm/drm_exec.c | 2 + + drivers/gpu/drm/drm_fb_dma_helper.c | 2 + + drivers/gpu/drm/drm_fb_helper.c | 1 + + drivers/gpu/drm/drm_fbdev_dma.c | 1 + + drivers/gpu/drm/drm_fbdev_shmem.c | 1 + + drivers/gpu/drm/drm_fbdev_ttm.c | 1 + + drivers/gpu/drm/drm_file.c | 18 +- + drivers/gpu/drm/drm_flip_work.c | 1 + + drivers/gpu/drm/drm_format_helper.c | 315 +- + drivers/gpu/drm/drm_format_internal.h | 16 +- + drivers/gpu/drm/drm_fourcc.c | 45 +- + drivers/gpu/drm/drm_framebuffer.c | 27 +- + drivers/gpu/drm/drm_gem.c | 47 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 1 + + drivers/gpu/drm/drm_gem_framebuffer_helper.c | 48 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 61 + + drivers/gpu/drm/drm_gem_ttm_helper.c | 1 + + drivers/gpu/drm/drm_gem_vram_helper.c | 80 +- + drivers/gpu/drm/drm_gpusvm.c | 797 +- + drivers/gpu/drm/drm_gpuvm.c | 133 +- + drivers/gpu/drm/drm_internal.h | 10 +- + drivers/gpu/drm/drm_managed.c | 1 + + drivers/gpu/drm/drm_mipi_dbi.c | 9 +- + drivers/gpu/drm/drm_mipi_dsi.c | 1 + + drivers/gpu/drm/drm_mode_config.c | 1 + + drivers/gpu/drm/drm_modeset_helper.c | 6 +- + drivers/gpu/drm/drm_modeset_lock.c | 2 + + drivers/gpu/drm/drm_pagemap.c | 838 ++ + drivers/gpu/drm/drm_panel.c | 52 +- + drivers/gpu/drm/drm_panel_backlight_quirks.c | 1 + + drivers/gpu/drm/drm_panel_orientation_quirks.c | 1 + + drivers/gpu/drm/drm_panic.c | 1 + + drivers/gpu/drm/drm_pci.c | 1 - + drivers/gpu/drm/drm_plane.c | 1 + + drivers/gpu/drm/drm_plane_helper.c | 1 + + drivers/gpu/drm/drm_prime.c | 58 +- + drivers/gpu/drm/drm_print.c | 1 + + drivers/gpu/drm/drm_privacy_screen.c | 1 + + drivers/gpu/drm/drm_self_refresh_helper.c | 1 + + drivers/gpu/drm/drm_simple_kms_helper.c | 1 + + drivers/gpu/drm/drm_suballoc.c | 2 + + drivers/gpu/drm/drm_syncobj.c | 1 + + drivers/gpu/drm/drm_vblank_work.c | 2 + + drivers/gpu/drm/drm_vma_manager.c | 1 + + drivers/gpu/drm/drm_writeback.c | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 2 +- + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 17 +- + drivers/gpu/drm/exynos/exynos_drm_fb.c | 7 +- + drivers/gpu/drm/exynos/exynos_drm_fb.h | 1 + + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 5 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 1 - + drivers/gpu/drm/gma500/fbdev.c | 8 +- + drivers/gpu/drm/gma500/framebuffer.c | 14 +- + drivers/gpu/drm/gma500/psb_drv.h | 1 + + drivers/gpu/drm/gud/gud_pipe.c | 9 +- + drivers/gpu/drm/hyperv/hyperv_drm.h | 4 +- + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 210 +- + drivers/gpu/drm/i915/Makefile | 12 +- + drivers/gpu/drm/i915/display/g4x_dp.c | 1 + + drivers/gpu/drm/i915/display/g4x_hdmi.c | 1 + + drivers/gpu/drm/i915/display/hsw_ips.c | 16 +- + drivers/gpu/drm/i915/display/i9xx_display_sr.c | 2 +- + drivers/gpu/drm/i915/display/i9xx_plane.c | 38 +- + drivers/gpu/drm/i915/display/i9xx_wm.c | 36 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 11 +- + drivers/gpu/drm/i915/display/icl_dsi_regs.h | 1 + + drivers/gpu/drm/i915/display/intel_alpm.c | 70 +- + drivers/gpu/drm/i915/display/intel_alpm.h | 4 + + drivers/gpu/drm/i915/display/intel_atomic.c | 6 +- + drivers/gpu/drm/i915/display/intel_audio.c | 2 +- + drivers/gpu/drm/i915/display/intel_backlight.c | 2 +- + drivers/gpu/drm/i915/display/intel_bios.c | 1 + + drivers/gpu/drm/i915/display/intel_bo.c | 17 + + drivers/gpu/drm/i915/display/intel_bo.h | 5 + + drivers/gpu/drm/i915/display/intel_bw.c | 239 +- + drivers/gpu/drm/i915/display/intel_bw.h | 53 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 204 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 50 +- + drivers/gpu/drm/i915/display/intel_cmtg.c | 4 +- + drivers/gpu/drm/i915/display/intel_cmtg_regs.h | 2 +- + drivers/gpu/drm/i915/display/intel_color.c | 73 +- + drivers/gpu/drm/i915/display/intel_color.h | 2 + + drivers/gpu/drm/i915/display/intel_combo_phy.c | 2 +- + .../gpu/drm/i915/display/intel_combo_phy_regs.h | 2 +- + drivers/gpu/drm/i915/display/intel_connector.c | 30 +- + drivers/gpu/drm/i915/display/intel_crt.c | 3 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 7 +- + drivers/gpu/drm/i915/display/intel_cursor.c | 11 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 41 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 2 + + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 5 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 101 +- + drivers/gpu/drm/i915/display/intel_ddi.h | 6 +- + drivers/gpu/drm/i915/display/intel_de.h | 20 +- + drivers/gpu/drm/i915/display/intel_display.c | 196 +- + drivers/gpu/drm/i915/display/intel_display.h | 26 +- + .../drm/i915/display/intel_display_conversion.c | 3 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 26 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 13 +- + .../gpu/drm/i915/display/intel_display_device.c | 12 +- + .../gpu/drm/i915/display/intel_display_device.h | 8 +- + .../gpu/drm/i915/display/intel_display_driver.c | 51 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 24 +- + .../gpu/drm/i915/display/intel_display_params.c | 3 + + .../gpu/drm/i915/display/intel_display_params.h | 1 + + drivers/gpu/drm/i915/display/intel_display_power.c | 22 +- + .../gpu/drm/i915/display/intel_display_power_map.c | 4 +- + .../drm/i915/display/intel_display_power_well.c | 116 +- + drivers/gpu/drm/i915/display/intel_display_regs.h | 2932 +++++++ + drivers/gpu/drm/i915/display/intel_display_reset.c | 1 + + drivers/gpu/drm/i915/display/intel_display_rpm.c | 1 + + drivers/gpu/drm/i915/display/intel_display_rps.c | 4 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 46 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 1 + + drivers/gpu/drm/i915/display/intel_dkl_phy.c | 4 +- + drivers/gpu/drm/i915/display/intel_dkl_phy_regs.h | 3 + + drivers/gpu/drm/i915/display/intel_dmc.c | 537 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 20 +- + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 489 +- + drivers/gpu/drm/i915/display/intel_dmc_wl.c | 6 +- + drivers/gpu/drm/i915/display/intel_dp.c | 79 +- + drivers/gpu/drm/i915/display/intel_dp.h | 7 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 3 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 144 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 22 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 94 +- + drivers/gpu/drm/i915/display/intel_dp_test.c | 2 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 203 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 197 +- + drivers/gpu/drm/i915/display/intel_dpll.h | 4 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 539 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 80 +- + drivers/gpu/drm/i915/display/intel_dpt.c | 3 +- + drivers/gpu/drm/i915/display/intel_dpt_common.c | 2 +- + drivers/gpu/drm/i915/display/intel_drrs.c | 9 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 248 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 9 +- + drivers/gpu/drm/i915/display/intel_dsb_regs.h | 2 + + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 3 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_encoder.c | 7 +- + drivers/gpu/drm/i915/display/intel_fb.c | 29 +- + drivers/gpu/drm/i915/display/intel_fb.h | 5 +- + drivers/gpu/drm/i915/display/intel_fb_bo.c | 1 + + drivers/gpu/drm/i915/display/intel_fb_pin.c | 8 +- + drivers/gpu/drm/i915/display/intel_fb_pin.h | 2 + + drivers/gpu/drm/i915/display/intel_fbc.c | 10 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 5 + + drivers/gpu/drm/i915/display/intel_fbdev.h | 6 +- + drivers/gpu/drm/i915/display/intel_fbdev_fb.c | 7 +- + drivers/gpu/drm/i915/display/intel_fdi.c | 3 +- + drivers/gpu/drm/i915/display/intel_fifo_underrun.c | 1 + + drivers/gpu/drm/i915/display/intel_flipq.c | 472 ++ + drivers/gpu/drm/i915/display/intel_flipq.h | 37 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 3 +- + drivers/gpu/drm/i915/display/intel_gmbus_regs.h | 2 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 28 +- + drivers/gpu/drm/i915/display/intel_hdcp_regs.h | 4 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 3 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 19 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 1 + + drivers/gpu/drm/i915/display/intel_hti_regs.h | 2 +- + drivers/gpu/drm/i915/display/intel_link_bw.c | 239 +- + drivers/gpu/drm/i915/display/intel_link_bw.h | 2 + + drivers/gpu/drm/i915/display/intel_lspcon.c | 2 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 3 +- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 13 +- + .../gpu/drm/i915/display/intel_modeset_verify.c | 4 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 8 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 2 + + drivers/gpu/drm/i915/display/intel_panel.c | 132 + + drivers/gpu/drm/i915/display/intel_panel.h | 6 + + drivers/gpu/drm/i915/display/intel_pch_display.c | 21 +- + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 154 +- + drivers/gpu/drm/i915/display/intel_pfit.c | 2 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 2 +- + .../{intel_atomic_plane.c => intel_plane.c} | 200 +- + .../{intel_atomic_plane.h => intel_plane.h} | 22 +- + drivers/gpu/drm/i915/display/intel_plane_initial.c | 6 +- + drivers/gpu/drm/i915/display/intel_pmdemand.c | 43 +- + drivers/gpu/drm/i915/display/intel_pps.c | 8 +- + drivers/gpu/drm/i915/display/intel_pps_regs.h | 15 +- + drivers/gpu/drm/i915/display/intel_psr.c | 110 +- + drivers/gpu/drm/i915/display/intel_psr.h | 4 + + drivers/gpu/drm/i915/display/intel_psr_regs.h | 10 + + drivers/gpu/drm/i915/display/intel_sbi.c | 90 + + drivers/gpu/drm/i915/display/intel_sbi.h | 27 + + drivers/gpu/drm/i915/display/intel_sbi_regs.h | 65 + + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_snps_hdmi_pll.c | 4 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 14 +- + drivers/gpu/drm/i915/display/intel_tc.c | 1 + + drivers/gpu/drm/i915/display/intel_tv.c | 2 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 2 +- + drivers/gpu/drm/i915/display/intel_vbt_defs.h | 2 +- + drivers/gpu/drm/i915/display/intel_vga.c | 1 - + drivers/gpu/drm/i915/display/intel_vrr.c | 25 +- + drivers/gpu/drm/i915/display/intel_vrr_regs.h | 119 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 19 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 39 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 467 +- + drivers/gpu/drm/i915/display/skl_watermark.h | 33 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 32 +- + drivers/gpu/drm/i915/display/vlv_dsi_pll.c | 46 +- + drivers/gpu/drm/i915/display/vlv_sideband.c | 50 + + drivers/gpu/drm/i915/display/vlv_sideband.h | 156 + + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 1 - + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 1 - + drivers/gpu/drm/i915/gem/i915_gem_object.h | 6 + + .../gpu/drm/i915/gem/i915_gem_object_frontbuffer.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 142 + + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 7 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 1 + + drivers/gpu/drm/i915/gt/intel_engine.h | 31 + + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 6 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 8 +- + drivers/gpu/drm/i915/gt/intel_gt_requests.c | 10 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 7 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 62 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 7 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 2 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 8 +- + drivers/gpu/drm/i915/gvt/display.c | 12 +- + drivers/gpu/drm/i915/gvt/display.h | 13 - + drivers/gpu/drm/i915/gvt/edid.c | 1 + + drivers/gpu/drm/i915/gvt/fb_decoder.c | 8 +- + drivers/gpu/drm/i915/gvt/handlers.c | 40 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 1 + + drivers/gpu/drm/i915/gvt/mmio.c | 1 + + drivers/gpu/drm/i915/i915_driver.c | 75 +- + drivers/gpu/drm/i915/i915_drv.h | 67 +- + drivers/gpu/drm/i915/i915_gem.h | 2 + + drivers/gpu/drm/i915/i915_getparam.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 2 +- + drivers/gpu/drm/i915/i915_irq.c | 156 +- + drivers/gpu/drm/i915/i915_pci.c | 1 - + drivers/gpu/drm/i915/i915_reg.h | 2977 +------ + drivers/gpu/drm/i915/i915_request.c | 7 +- + drivers/gpu/drm/i915/i915_sw_fence.c | 10 +- + drivers/gpu/drm/i915/i915_switcheroo.c | 2 + + drivers/gpu/drm/i915/i915_vma.c | 20 + + drivers/gpu/drm/i915/i915_vma.h | 27 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 6 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 3 + + drivers/gpu/drm/i915/intel_pcode.c | 29 +- + drivers/gpu/drm/i915/intel_pcode.h | 15 +- + drivers/gpu/drm/i915/intel_sbi.c | 94 - + drivers/gpu/drm/i915/intel_sbi.h | 27 - + drivers/gpu/drm/i915/intel_uncore.c | 8 +- + drivers/gpu/drm/i915/intel_uncore.h | 5 +- + .../gpu/drm/i915/selftests/intel_memory_region.c | 14 +- + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 12 +- + drivers/gpu/drm/i915/soc/intel_dram.c | 92 +- + drivers/gpu/drm/i915/soc/intel_dram.h | 26 +- + drivers/gpu/drm/i915/soc/intel_gmch.c | 2 + + .../gpu/drm/i915/{vlv_sideband.c => vlv_iosf_sb.c} | 190 +- + drivers/gpu/drm/i915/vlv_iosf_sb.h | 37 + + .../i915/{vlv_sideband_reg.h => vlv_iosf_sb_reg.h} | 6 +- + drivers/gpu/drm/i915/vlv_sideband.h | 125 - + drivers/gpu/drm/imagination/pvr_job.c | 2 +- + drivers/gpu/drm/imagination/pvr_power.c | 59 +- + drivers/gpu/drm/imagination/pvr_queue.c | 9 +- + drivers/gpu/drm/imagination/pvr_queue.h | 2 +- + drivers/gpu/drm/imx/Kconfig | 1 + + drivers/gpu/drm/imx/Makefile | 1 + + drivers/gpu/drm/imx/dc/Kconfig | 13 + + drivers/gpu/drm/imx/dc/Makefile | 7 + + drivers/gpu/drm/imx/dc/dc-cf.c | 172 + + drivers/gpu/drm/imx/dc/dc-crtc.c | 555 ++ + drivers/gpu/drm/imx/dc/dc-de.c | 177 + + drivers/gpu/drm/imx/dc/dc-de.h | 59 + + drivers/gpu/drm/imx/dc/dc-drv.c | 293 + + drivers/gpu/drm/imx/dc/dc-drv.h | 102 + + drivers/gpu/drm/imx/dc/dc-ed.c | 288 + + drivers/gpu/drm/imx/dc/dc-fg.c | 376 + + drivers/gpu/drm/imx/dc/dc-fl.c | 185 + + drivers/gpu/drm/imx/dc/dc-fu.c | 258 + + drivers/gpu/drm/imx/dc/dc-fu.h | 129 + + drivers/gpu/drm/imx/dc/dc-fw.c | 222 + + drivers/gpu/drm/imx/dc/dc-ic.c | 282 + + drivers/gpu/drm/imx/dc/dc-kms.c | 143 + + drivers/gpu/drm/imx/dc/dc-kms.h | 131 + + drivers/gpu/drm/imx/dc/dc-lb.c | 325 + + drivers/gpu/drm/imx/dc/dc-pe.c | 158 + + drivers/gpu/drm/imx/dc/dc-pe.h | 101 + + drivers/gpu/drm/imx/dc/dc-plane.c | 224 + + drivers/gpu/drm/imx/dc/dc-tc.c | 141 + + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 5 +- + drivers/gpu/drm/lib/drm_random.c | 1 + + drivers/gpu/drm/lima/lima_gem.c | 2 +- + drivers/gpu/drm/lima/lima_sched.c | 12 +- + drivers/gpu/drm/lima/lima_sched.h | 3 +- + drivers/gpu/drm/lima/lima_trace.h | 6 +- + drivers/gpu/drm/mediatek/mtk_dp.c | 11 +- + drivers/gpu/drm/mediatek/mtk_dpi.c | 8 +- + drivers/gpu/drm/mediatek/mtk_drm_drv.c | 5 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 8 +- + drivers/gpu/drm/mediatek/mtk_hdmi.c | 11 +- + drivers/gpu/drm/meson/meson_encoder_cvbs.c | 10 +- + drivers/gpu/drm/meson/meson_encoder_dsi.c | 10 +- + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 10 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 8 +- + drivers/gpu/drm/mgag200/mgag200_g200er.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_g200ev.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_g200se.c | 4 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 82 +- + drivers/gpu/drm/msm/Kconfig | 36 +- + drivers/gpu/drm/msm/Makefile | 26 +- + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 25 +- + drivers/gpu/drm/msm/adreno/a2xx_gpummu.c | 5 +- + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 17 +- + drivers/gpu/drm/msm/adreno/a4xx_gpu.c | 17 +- + drivers/gpu/drm/msm/adreno/a5xx_debugfs.c | 4 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 42 +- + drivers/gpu/drm/msm/adreno/a5xx_power.c | 2 +- + drivers/gpu/drm/msm/adreno/a5xx_preempt.c | 10 +- + drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 48 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 30 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 187 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 4 + + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 8 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_preempt.c | 12 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 43 +- + .../gpu/drm/msm/adreno/adreno_gen7_9_0_snapshot.h | 4 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 104 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 67 +- + .../drm/msm/disp/dpu1/catalog/dpu_10_0_sm8650.h | 49 +- + .../drm/msm/disp/dpu1/catalog/dpu_12_0_sm8750.h | 494 ++ + .../drm/msm/disp/dpu1/catalog/dpu_1_14_msm8937.h | 2 - + .../drm/msm/disp/dpu1/catalog/dpu_1_15_msm8917.h | 2 - + .../drm/msm/disp/dpu1/catalog/dpu_1_16_msm8953.h | 2 - + .../drm/msm/disp/dpu1/catalog/dpu_1_7_msm8996.h | 7 - + .../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 7 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_3_2_sdm660.h | 7 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_3_3_sdm630.h | 4 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 17 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_1_sdm670.h | 11 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 39 +- + .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 44 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_2_sm7150.h | 29 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_3_sm6150.h | 19 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 16 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 38 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 14 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 5 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 16 +- + .../drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 5 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 6 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 40 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 22 +- + .../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 46 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 43 +- + .../drm/msm/disp/dpu1/catalog/dpu_8_4_sa8775p.h | 49 +- + .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 43 +- + .../drm/msm/disp/dpu1/catalog/dpu_9_1_sar2130p.h | 43 +- + .../drm/msm/disp/dpu1/catalog/dpu_9_2_x1e80100.h | 48 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 61 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 22 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 3 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 5 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 18 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.c | 20 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_formats.h | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 71 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 103 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 147 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.h | 21 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 21 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc_1_2.c | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dspp.c | 10 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.c | 224 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_lm.h | 21 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_merge3d.c | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.c | 11 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_sspp.h | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 11 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_wb.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 65 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.h | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 25 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.h | 2 - + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 10 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.h | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 15 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 41 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.h | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 18 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 6 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 36 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 18 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot_util.c | 12 +- + drivers/gpu/drm/msm/dp/dp_audio.c | 138 +- + drivers/gpu/drm/msm/dp/dp_audio.h | 15 +- + drivers/gpu/drm/msm/dp/dp_aux.c | 216 +- + drivers/gpu/drm/msm/dp/dp_aux.h | 15 +- + drivers/gpu/drm/msm/dp/dp_catalog.c | 1298 --- + drivers/gpu/drm/msm/dp/dp_catalog.h | 113 - + drivers/gpu/drm/msm/dp/dp_ctrl.c | 607 +- + drivers/gpu/drm/msm/dp/dp_ctrl.h | 17 +- + drivers/gpu/drm/msm/dp/dp_debug.c | 5 +- + drivers/gpu/drm/msm/dp/dp_display.c | 156 +- + drivers/gpu/drm/msm/dp/dp_drm.c | 3 +- + drivers/gpu/drm/msm/dp/dp_link.c | 1 + + drivers/gpu/drm/msm/dp/dp_panel.c | 258 +- + drivers/gpu/drm/msm/dp/dp_panel.h | 13 +- + drivers/gpu/drm/msm/dp/dp_reg.h | 19 + + drivers/gpu/drm/msm/dsi/dsi.c | 4 +- + drivers/gpu/drm/msm/dsi/dsi.h | 2 + + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 14 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 1 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 75 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 2 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 1 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 79 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 9 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 10 +- + drivers/gpu/drm/msm/hdmi/hdmi_audio.c | 8 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_hpd.c | 4 +- + drivers/gpu/drm/msm/msm_debugfs.c | 97 +- + drivers/gpu/drm/msm/msm_drv.c | 371 +- + drivers/gpu/drm/msm/msm_drv.h | 64 +- + drivers/gpu/drm/msm/msm_fb.c | 51 +- + drivers/gpu/drm/msm/msm_fbdev.c | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 539 +- + drivers/gpu/drm/msm/msm_gem.h | 298 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 65 + + drivers/gpu/drm/msm/msm_gem_shrinker.c | 104 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 318 +- + drivers/gpu/drm/msm/msm_gem_vma.c | 1526 +++- + drivers/gpu/drm/msm/msm_gpu.c | 210 +- + drivers/gpu/drm/msm/msm_gpu.h | 144 +- + drivers/gpu/drm/msm/msm_gpu_trace.h | 14 + + drivers/gpu/drm/msm/msm_iommu.c | 302 +- + drivers/gpu/drm/msm/msm_kms.c | 59 +- + drivers/gpu/drm/msm/msm_kms.h | 48 +- + drivers/gpu/drm/msm/msm_mdss.c | 341 +- + drivers/gpu/drm/msm/msm_mdss.h | 28 - + drivers/gpu/drm/msm/msm_mmu.h | 38 +- + drivers/gpu/drm/msm/msm_rd.c | 62 +- + drivers/gpu/drm/msm/msm_ringbuffer.c | 10 +- + drivers/gpu/drm/msm/msm_submitqueue.c | 96 +- + drivers/gpu/drm/msm/msm_syncobj.c | 172 + + drivers/gpu/drm/msm/msm_syncobj.h | 37 + + drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 3576 ++------- + .../drm/msm/registers/adreno/a6xx_descriptors.xml | 198 + + .../gpu/drm/msm/registers/adreno/a6xx_enums.xml | 383 + + .../drm/msm/registers/adreno/a6xx_perfcntrs.xml | 600 ++ + .../gpu/drm/msm/registers/adreno/a7xx_enums.xml | 223 + + .../drm/msm/registers/adreno/a7xx_perfcntrs.xml | 1030 +++ + .../gpu/drm/msm/registers/adreno/adreno_pm4.xml | 302 +- + .../gpu/drm/msm/registers/display/dsi_phy_7nm.xml | 14 + + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 9 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_display.h | 1 + + drivers/gpu/drm/nouveau/nouveau_exec.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 107 +- + drivers/gpu/drm/nouveau/nouveau_fence.h | 7 + + drivers/gpu/drm/nouveau/nouveau_sched.c | 40 +- + drivers/gpu/drm/nouveau/nouveau_sched.h | 9 +- + drivers/gpu/drm/nouveau/nouveau_uvmm.c | 8 +- + drivers/gpu/drm/nouveau/nvkm/engine/fifo/chan.c | 2 +- + .../gpu/drm/nouveau/nvkm/subdev/gsp/rm/r535/disp.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dispc.c | 2 +- + drivers/gpu/drm/omapdrm/dss/dpi.c | 7 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 7 +- + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 26 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 26 +- + drivers/gpu/drm/omapdrm/dss/sdi.c | 25 +- + drivers/gpu/drm/omapdrm/dss/venc.c | 23 +- + drivers/gpu/drm/omapdrm/omap_fb.c | 10 +- + drivers/gpu/drm/omapdrm/omap_fb.h | 3 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 7 +- + drivers/gpu/drm/panel/Kconfig | 36 + + drivers/gpu/drm/panel/Makefile | 3 + + drivers/gpu/drm/panel/panel-boe-himax8279d.c | 11 +- + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 10 +- + drivers/gpu/drm/panel/panel-edp.c | 8 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 10 +- + drivers/gpu/drm/panel/panel-feixin-k101-im2ba02.c | 11 +- + .../gpu/drm/panel/panel-feiyang-fy07024di26a30d.c | 10 +- + drivers/gpu/drm/panel/panel-himax-hx83102.c | 10 +- + drivers/gpu/drm/panel/panel-himax-hx83112a.c | 10 +- + drivers/gpu/drm/panel/panel-himax-hx83112b.c | 430 + + drivers/gpu/drm/panel/panel-himax-hx8394.c | 153 +- + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 10 +- + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 11 +- + drivers/gpu/drm/panel/panel-ilitek-ili9805.c | 12 +- + drivers/gpu/drm/panel/panel-ilitek-ili9806e.c | 10 +- + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 236 +- + drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 10 +- + drivers/gpu/drm/panel/panel-innolux-ej030na.c | 11 +- + drivers/gpu/drm/panel/panel-innolux-p079zca.c | 11 +- + drivers/gpu/drm/panel/panel-jadard-jd9365da-h3.c | 10 +- + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 10 +- + drivers/gpu/drm/panel/panel-jdi-lpm102a188a.c | 12 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 11 +- + drivers/gpu/drm/panel/panel-khadas-ts050.c | 13 +- + drivers/gpu/drm/panel/panel-kingdisplay-kd097d04.c | 12 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 11 +- + drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 11 +- + drivers/gpu/drm/panel/panel-lg-lb035q02.c | 10 +- + drivers/gpu/drm/panel/panel-lg-lg4573.c | 11 +- + drivers/gpu/drm/panel/panel-lg-sw43408.c | 10 +- + drivers/gpu/drm/panel/panel-lincolntech-lcd197.c | 11 +- + drivers/gpu/drm/panel/panel-lvds.c | 12 +- + .../gpu/drm/panel/panel-magnachip-d53e6ea8966.c | 11 +- + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 11 +- + drivers/gpu/drm/panel/panel-nec-nl8048hl11.c | 10 +- + drivers/gpu/drm/panel/panel-newvision-nv3051d.c | 11 +- + drivers/gpu/drm/panel/panel-newvision-nv3052c.c | 10 +- + drivers/gpu/drm/panel/panel-novatek-nt35510.c | 12 +- + drivers/gpu/drm/panel/panel-novatek-nt35560.c | 12 +- + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 10 +- + drivers/gpu/drm/panel/panel-novatek-nt36523.c | 9 +- + drivers/gpu/drm/panel/panel-novatek-nt36672a.c | 10 +- + drivers/gpu/drm/panel/panel-novatek-nt36672e.c | 10 +- + drivers/gpu/drm/panel/panel-novatek-nt39016.c | 10 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 11 +- + drivers/gpu/drm/panel/panel-orisetech-ota5601a.c | 11 +- + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 11 +- + drivers/gpu/drm/panel/panel-osd-osd101t2587-53ts.c | 12 +- + .../gpu/drm/panel/panel-panasonic-vvx10f034n00.c | 12 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 12 +- + drivers/gpu/drm/panel/panel-raydium-rm67191.c | 10 +- + drivers/gpu/drm/panel/panel-raydium-rm67200.c | 50 +- + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 11 +- + drivers/gpu/drm/panel/panel-raydium-rm692e5.c | 10 +- + drivers/gpu/drm/panel/panel-raydium-rm69380.c | 10 +- + drivers/gpu/drm/panel/panel-renesas-r61307.c | 325 + + drivers/gpu/drm/panel/panel-renesas-r69328.c | 281 + + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 11 +- + drivers/gpu/drm/panel/panel-samsung-ams581vf01.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-ams639rq08.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 11 +- + drivers/gpu/drm/panel/panel-samsung-db7430.c | 11 +- + drivers/gpu/drm/panel/panel-samsung-ld9040.c | 11 +- + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 11 +- + drivers/gpu/drm/panel/panel-samsung-s6d27a1.c | 11 +- + drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c | 12 +- + drivers/gpu/drm/panel/panel-samsung-s6e3fa7.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 1 + + .../drm/panel/panel-samsung-s6e88a0-ams427ap24.c | 10 +- + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 11 +- + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 12 +- + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 11 +- + drivers/gpu/drm/panel/panel-seiko-43wvf1g.c | 11 +- + drivers/gpu/drm/panel/panel-sharp-lq101r1sx01.c | 11 +- + drivers/gpu/drm/panel/panel-sharp-ls037v7dw01.c | 10 +- + drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 11 +- + drivers/gpu/drm/panel/panel-simple.c | 27 + + drivers/gpu/drm/panel/panel-sitronix-st7701.c | 132 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 11 +- + drivers/gpu/drm/panel/panel-sitronix-st7789v.c | 10 +- + drivers/gpu/drm/panel/panel-sony-acx565akm.c | 10 +- + drivers/gpu/drm/panel/panel-sony-td4353-jdi.c | 11 +- + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 11 +- + drivers/gpu/drm/panel/panel-summit.c | 10 +- + drivers/gpu/drm/panel/panel-synaptics-r63353.c | 11 +- + drivers/gpu/drm/panel/panel-tpo-td028ttec1.c | 11 +- + drivers/gpu/drm/panel/panel-tpo-td043mtea1.c | 10 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 11 +- + drivers/gpu/drm/panel/panel-visionox-r66451.c | 9 +- + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 257 +- + drivers/gpu/drm/panel/panel-visionox-rm692e5.c | 10 +- + drivers/gpu/drm/panel/panel-visionox-vtdr6130.c | 11 +- + drivers/gpu/drm/panel/panel-widechips-ws2401.c | 11 +- + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 5 + + drivers/gpu/drm/panfrost/panfrost_device.h | 15 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 142 +- + drivers/gpu/drm/panfrost/panfrost_gem.c | 186 + + drivers/gpu/drm/panfrost/panfrost_gem.h | 66 + + drivers/gpu/drm/panfrost/panfrost_job.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_perfcnt.c | 2 + + drivers/gpu/drm/panthor/panthor_device.h | 89 + + drivers/gpu/drm/panthor/panthor_drv.c | 63 +- + drivers/gpu/drm/panthor/panthor_fw.c | 9 +- + drivers/gpu/drm/panthor/panthor_gem.c | 31 +- + drivers/gpu/drm/panthor/panthor_gem.h | 3 - + drivers/gpu/drm/panthor/panthor_gpu.c | 160 +- + drivers/gpu/drm/panthor/panthor_gpu.h | 12 +- + drivers/gpu/drm/panthor/panthor_mmu.c | 49 +- + drivers/gpu/drm/panthor/panthor_mmu.h | 1 - + drivers/gpu/drm/panthor/panthor_regs.h | 90 +- + drivers/gpu/drm/panthor/panthor_sched.c | 7 +- + drivers/gpu/drm/panthor/panthor_sched.h | 3 +- + drivers/gpu/drm/qxl/qxl_display.c | 3 +- + drivers/gpu/drm/radeon/evergreen_cs.c | 98 +- + drivers/gpu/drm/radeon/radeon_display.c | 3 +- + drivers/gpu/drm/radeon/radeon_drv.c | 3 +- + drivers/gpu/drm/radeon/radeon_fbdev.c | 3 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_kms.c | 3 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_plane.h | 2 +- + drivers/gpu/drm/renesas/rcar-du/rcar_lvds.c | 8 +- + drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 8 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 11 + + drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c | 44 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_kms.c | 3 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 355 +- + .../gpu/drm/renesas/rz-du/rzg2l_mipi_dsi_regs.h | 56 +- + drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c | 3 +- + drivers/gpu/drm/rockchip/cdn-dp-core.c | 291 +- + drivers/gpu/drm/rockchip/cdn-dp-core.h | 8 +- + drivers/gpu/drm/rockchip/dw_hdmi-rockchip.c | 16 +- + drivers/gpu/drm/rockchip/inno_hdmi.c | 452 +- + drivers/gpu/drm/rockchip/inno_hdmi.h | 349 - + drivers/gpu/drm/rockchip/rk3066_hdmi.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_fb.c | 20 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 29 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.h | 33 + + drivers/gpu/drm/rockchip/rockchip_lvds.c | 68 +- + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 89 +- + drivers/gpu/drm/scheduler/gpu_scheduler_trace.h | 103 +- + drivers/gpu/drm/scheduler/sched_entity.c | 26 +- + drivers/gpu/drm/scheduler/sched_fence.c | 6 +- + drivers/gpu/drm/scheduler/sched_internal.h | 2 +- + drivers/gpu/drm/scheduler/sched_main.c | 203 +- + drivers/gpu/drm/scheduler/tests/mock_scheduler.c | 109 +- + drivers/gpu/drm/scheduler/tests/sched_tests.h | 3 +- + drivers/gpu/drm/scheduler/tests/tests_basic.c | 93 +- + drivers/gpu/drm/sitronix/Kconfig | 10 - + drivers/gpu/drm/sitronix/st7571-i2c.c | 95 +- + drivers/gpu/drm/sti/sti_dvo.c | 29 +- + drivers/gpu/drm/sti/sti_hda.c | 27 +- + drivers/gpu/drm/sti/sti_hdmi.c | 26 +- + drivers/gpu/drm/sti/sti_hdmi.h | 2 + + drivers/gpu/drm/stm/lvds.c | 7 +- + drivers/gpu/drm/sun4i/sun8i_csc.c | 4 +- + drivers/gpu/drm/sun4i/sun8i_mixer.c | 168 +- + drivers/gpu/drm/sun4i/sun8i_mixer.h | 31 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 27 +- + drivers/gpu/drm/sun4i/sun8i_ui_scaler.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 14 +- + drivers/gpu/drm/sun4i/sun8i_vi_scaler.c | 6 +- + drivers/gpu/drm/sysfb/drm_sysfb_helper.h | 4 + + drivers/gpu/drm/sysfb/drm_sysfb_modeset.c | 138 + + drivers/gpu/drm/sysfb/efidrm.c | 6 +- + drivers/gpu/drm/sysfb/ofdrm.c | 85 +- + drivers/gpu/drm/sysfb/simpledrm.c | 5 +- + drivers/gpu/drm/sysfb/vesadrm.c | 106 +- + drivers/gpu/drm/tegra/drm.h | 2 + + drivers/gpu/drm/tegra/fb.c | 7 +- + drivers/gpu/drm/tegra/fbdev.c | 4 +- + drivers/gpu/drm/tegra/gem.c | 4 +- + drivers/gpu/drm/tests/Makefile | 3 +- + drivers/gpu/drm/tests/drm_bridge_test.c | 176 +- + drivers/gpu/drm/tests/drm_format_helper_test.c | 266 +- + drivers/gpu/drm/tests/drm_framebuffer_test.c | 1 + + drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 651 +- + drivers/gpu/drm/tests/drm_kunit_edid.h | 374 +- + drivers/gpu/drm/tests/drm_kunit_helpers.c | 1 + + drivers/gpu/drm/tests/drm_sysfb_modeset_test.c | 168 + + drivers/gpu/drm/tidss/Makefile | 3 +- + drivers/gpu/drm/tidss/tidss_crtc.c | 4 +- + drivers/gpu/drm/tidss/tidss_dispc.c | 287 +- + drivers/gpu/drm/tidss/tidss_dispc.h | 20 +- + drivers/gpu/drm/tidss/tidss_dispc_regs.h | 29 +- + drivers/gpu/drm/tidss/tidss_drv.c | 10 + + drivers/gpu/drm/tidss/tidss_drv.h | 5 + + drivers/gpu/drm/tidss/tidss_encoder.c | 10 +- + drivers/gpu/drm/tidss/tidss_kms.c | 4 +- + drivers/gpu/drm/tidss/tidss_oldi.c | 598 ++ + drivers/gpu/drm/tidss/tidss_oldi.h | 43 + + drivers/gpu/drm/tidss/tidss_plane.c | 2 +- + drivers/gpu/drm/tiny/bochs.c | 19 + + drivers/gpu/drm/ttm/tests/ttm_bo_validate_test.c | 60 +- + drivers/gpu/drm/ttm/tests/ttm_kunit_helpers.c | 3 + + drivers/gpu/drm/ttm/tests/ttm_mock_manager.c | 3 + + drivers/gpu/drm/ttm/ttm_agp_backend.c | 1 + + drivers/gpu/drm/ttm/ttm_backup.c | 11 +- + drivers/gpu/drm/ttm/ttm_bo.c | 26 +- + drivers/gpu/drm/ttm/ttm_bo_internal.h | 58 + + drivers/gpu/drm/ttm/ttm_bo_util.c | 232 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 2 + + drivers/gpu/drm/ttm/ttm_device.c | 24 + + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 2 + + drivers/gpu/drm/ttm/ttm_pool.c | 31 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 2 + + drivers/gpu/drm/ttm/ttm_resource.c | 4 + + drivers/gpu/drm/ttm/ttm_tt.c | 1 + + drivers/gpu/drm/v3d/v3d_bo.c | 1 - + drivers/gpu/drm/v3d/v3d_sched.c | 18 +- + drivers/gpu/drm/v3d/v3d_submit.c | 2 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 8 +- + drivers/gpu/drm/vc4/vc4_kms.c | 3 +- + drivers/gpu/drm/vgem/vgem_drv.c | 30 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 6 +- + drivers/gpu/drm/vkms/tests/Makefile | 6 +- + drivers/gpu/drm/vkms/tests/vkms_format_test.c | 280 + + drivers/gpu/drm/vkms/vkms_crtc.c | 2 - + drivers/gpu/drm/vkms/vkms_drv.c | 28 +- + drivers/gpu/drm/vkms/vkms_drv.h | 39 +- + drivers/gpu/drm/vkms/vkms_formats.c | 467 +- + drivers/gpu/drm/vkms/vkms_formats.h | 9 + + drivers/gpu/drm/vkms/vkms_plane.c | 29 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmd.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 22 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 19 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 29 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.c | 510 +- + drivers/gpu/drm/vmwgfx/vmwgfx_fence.h | 21 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 5 +- + drivers/gpu/drm/vmwgfx/vmwgfx_irq.c | 61 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 15 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 1 + + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 2 +- + drivers/gpu/drm/xe/Kconfig | 14 +- + drivers/gpu/drm/xe/Kconfig.debug | 11 +- + drivers/gpu/drm/xe/Makefile | 20 +- + drivers/gpu/drm/xe/abi/guc_actions_abi.h | 35 + + drivers/gpu/drm/xe/abi/guc_errors_abi.h | 14 +- + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 28 + + .../gpu/drm/xe/compat-i915-headers/intel_pcode.h | 31 - + .../gpu/drm/xe/compat-i915-headers/intel_uncore.h | 12 +- + .../gpu/drm/xe/compat-i915-headers/vlv_iosf_sb.h | 42 + + .../{vlv_sideband_reg.h => vlv_iosf_sb_reg.h} | 2 +- + .../gpu/drm/xe/compat-i915-headers/vlv_sideband.h | 132 - + drivers/gpu/drm/xe/display/intel_bo.c | 91 + + drivers/gpu/drm/xe/display/intel_fbdev_fb.c | 7 +- + drivers/gpu/drm/xe/display/xe_display.c | 101 +- + drivers/gpu/drm/xe/display/xe_display.h | 4 - + drivers/gpu/drm/xe/display/xe_display_rpm.c | 4 +- + drivers/gpu/drm/xe/display/xe_display_wa.c | 2 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 61 +- + drivers/gpu/drm/xe/display/xe_hdcp_gsc.c | 2 +- + drivers/gpu/drm/xe/display/xe_plane_initial.c | 13 +- + drivers/gpu/drm/xe/display/xe_tdf.c | 4 +- + drivers/gpu/drm/xe/regs/xe_gsc_regs.h | 4 + + drivers/gpu/drm/xe/regs/xe_i2c_regs.h | 20 + + drivers/gpu/drm/xe/regs/xe_irq_regs.h | 1 + + drivers/gpu/drm/xe/regs/xe_lrc_layout.h | 7 + + drivers/gpu/drm/xe/regs/xe_oa_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_pcode_regs.h | 2 - + drivers/gpu/drm/xe/regs/xe_pmt.h | 7 +- + drivers/gpu/drm/xe/regs/xe_regs.h | 2 + + drivers/gpu/drm/xe/tests/xe_bo.c | 6 +- + .../gpu/drm/xe/tests/xe_gt_sriov_pf_service_test.c | 232 - + drivers/gpu/drm/xe/tests/xe_guc_buf_kunit.c | 13 +- + drivers/gpu/drm/xe/tests/xe_migrate.c | 52 +- + drivers/gpu/drm/xe/tests/xe_pci.c | 100 +- + drivers/gpu/drm/xe/tests/xe_pci_test.c | 28 +- + drivers/gpu/drm/xe/tests/xe_pci_test.h | 12 +- + .../gpu/drm/xe/tests/xe_sriov_pf_service_kunit.c | 227 + + drivers/gpu/drm/xe/xe_bb.c | 2 +- + drivers/gpu/drm/xe/xe_bb.h | 2 +- + drivers/gpu/drm/xe/xe_bo.c | 121 +- + drivers/gpu/drm/xe/xe_bo.h | 20 +- + drivers/gpu/drm/xe/xe_bo_evict.c | 4 +- + drivers/gpu/drm/xe/xe_bo_types.h | 4 +- + drivers/gpu/drm/xe/xe_configfs.c | 160 + + drivers/gpu/drm/xe/xe_configfs.h | 11 +- + drivers/gpu/drm/xe/xe_debugfs.c | 62 + + drivers/gpu/drm/xe/xe_devcoredump.c | 12 - + drivers/gpu/drm/xe/xe_device.c | 73 +- + drivers/gpu/drm/xe/xe_device.h | 53 +- + drivers/gpu/drm/xe/xe_device_sysfs.c | 143 +- + drivers/gpu/drm/xe/xe_device_types.h | 83 +- + drivers/gpu/drm/xe/xe_device_wa_oob.rules | 2 + + drivers/gpu/drm/xe/xe_drm_client.c | 2 +- + drivers/gpu/drm/xe/xe_eu_stall.c | 6 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 2 +- + drivers/gpu/drm/xe/xe_force_wake.c | 2 +- + drivers/gpu/drm/xe/xe_gen_wa_oob.c | 45 +- + drivers/gpu/drm/xe/xe_ggtt.c | 257 +- + drivers/gpu/drm/xe/xe_ggtt.h | 24 +- + drivers/gpu/drm/xe/xe_ggtt_types.h | 4 +- + drivers/gpu/drm/xe/xe_gsc.c | 6 +- + drivers/gpu/drm/xe/xe_gsc_proxy.c | 3 +- + drivers/gpu/drm/xe/xe_gt.c | 260 +- + drivers/gpu/drm/xe/xe_gt.h | 6 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 96 +- + drivers/gpu/drm/xe/xe_gt_idle.c | 2 +- + drivers/gpu/drm/xe/xe_gt_mcr.c | 47 +- + drivers/gpu/drm/xe/xe_gt_pagefault.c | 106 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 131 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_control.c | 7 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_debugfs.c | 13 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 168 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.h | 2 - + drivers/gpu/drm/xe/xe_gt_sriov_vf.c | 330 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf.h | 9 +- + drivers/gpu/drm/xe/xe_gt_sriov_vf_types.h | 33 +- + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 58 +- + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.h | 4 +- + drivers/gpu/drm/xe/xe_gt_topology.c | 49 +- + drivers/gpu/drm/xe/xe_gt_topology.h | 2 - + drivers/gpu/drm/xe/xe_gt_types.h | 2 + + drivers/gpu/drm/xe/xe_guc.c | 166 +- + drivers/gpu/drm/xe/xe_guc.h | 2 + + drivers/gpu/drm/xe/xe_guc_ads.c | 34 +- + drivers/gpu/drm/xe/xe_guc_buf.c | 4 - + drivers/gpu/drm/xe/xe_guc_ct.c | 394 +- + drivers/gpu/drm/xe/xe_guc_ct.h | 3 + + drivers/gpu/drm/xe/xe_guc_ct_types.h | 15 + + drivers/gpu/drm/xe/xe_guc_engine_activity.c | 2 +- + drivers/gpu/drm/xe/xe_guc_exec_queue_types.h | 2 + + drivers/gpu/drm/xe/xe_guc_log.c | 2 +- + drivers/gpu/drm/xe/xe_guc_log.h | 2 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 10 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 64 +- + drivers/gpu/drm/xe/xe_heci_gsc.c | 5 +- + drivers/gpu/drm/xe/xe_huc.c | 2 +- + drivers/gpu/drm/xe/xe_hw_engine.c | 40 +- + drivers/gpu/drm/xe/xe_hw_engine_group.c | 19 +- + drivers/gpu/drm/xe/xe_hw_fence.c | 5 +- + drivers/gpu/drm/xe/xe_hwmon.c | 230 +- + drivers/gpu/drm/xe/xe_i2c.c | 329 + + drivers/gpu/drm/xe/xe_i2c.h | 62 + + drivers/gpu/drm/xe/xe_irq.c | 9 +- + drivers/gpu/drm/xe/xe_lmtt.c | 60 +- + drivers/gpu/drm/xe/xe_lmtt.h | 1 + + drivers/gpu/drm/xe/xe_lrc.c | 322 +- + drivers/gpu/drm/xe/xe_lrc.h | 2 +- + drivers/gpu/drm/xe/xe_lrc_types.h | 5 +- + drivers/gpu/drm/xe/xe_map.h | 18 + + drivers/gpu/drm/xe/xe_migrate.c | 30 +- + drivers/gpu/drm/xe/xe_mmio.c | 24 +- + drivers/gpu/drm/xe/xe_module.c | 40 +- + drivers/gpu/drm/xe/xe_nvm.c | 167 + + drivers/gpu/drm/xe/xe_nvm.h | 15 + + drivers/gpu/drm/xe/xe_oa.c | 222 +- + drivers/gpu/drm/xe/xe_oa_types.h | 6 + + drivers/gpu/drm/xe/xe_pat.c | 44 +- + drivers/gpu/drm/xe/xe_pci.c | 78 +- + drivers/gpu/drm/xe/xe_pci_types.h | 41 + + drivers/gpu/drm/xe/xe_pcode.c | 30 + + drivers/gpu/drm/xe/xe_pcode.h | 12 +- + drivers/gpu/drm/xe/xe_pcode_api.h | 15 + + drivers/gpu/drm/xe/xe_pm.c | 9 + + drivers/gpu/drm/xe/xe_pmu.c | 7 +- + drivers/gpu/drm/xe/xe_pt.c | 135 +- + drivers/gpu/drm/xe/xe_pxp.c | 153 +- + drivers/gpu/drm/xe/xe_query.c | 33 +- + drivers/gpu/drm/xe/xe_rtp.c | 47 +- + drivers/gpu/drm/xe/xe_rtp.h | 14 +- + drivers/gpu/drm/xe/xe_rtp_types.h | 2 + + drivers/gpu/drm/xe/xe_sched_job.c | 17 +- + drivers/gpu/drm/xe/xe_shrinker.c | 45 +- + drivers/gpu/drm/xe/xe_shrinker.h | 4 +- + drivers/gpu/drm/xe/xe_sriov_pf.c | 61 +- + drivers/gpu/drm/xe/xe_sriov_pf.h | 6 + + drivers/gpu/drm/xe/xe_sriov_pf_service.c | 216 + + drivers/gpu/drm/xe/xe_sriov_pf_service.h | 23 + + drivers/gpu/drm/xe/xe_sriov_pf_service_types.h | 36 + + drivers/gpu/drm/xe/xe_sriov_pf_types.h | 45 + + drivers/gpu/drm/xe/xe_sriov_types.h | 36 - + drivers/gpu/drm/xe/xe_sriov_vf.c | 181 +- + drivers/gpu/drm/xe/xe_sriov_vf_types.h | 41 + + drivers/gpu/drm/xe/xe_step.c | 2 + + drivers/gpu/drm/xe/xe_survivability_mode.c | 19 +- + drivers/gpu/drm/xe/xe_svm.c | 403 +- + drivers/gpu/drm/xe/xe_svm.h | 136 + + drivers/gpu/drm/xe/xe_tile.c | 13 +- + drivers/gpu/drm/xe/xe_tile.h | 17 + + drivers/gpu/drm/xe/xe_tile_sriov_vf.c | 254 + + drivers/gpu/drm/xe/xe_tile_sriov_vf.h | 18 + + drivers/gpu/drm/xe/xe_trace_bo.h | 4 +- + drivers/gpu/drm/xe/xe_tuning.c | 5 + + drivers/gpu/drm/xe/xe_uc.c | 78 +- + drivers/gpu/drm/xe/xe_uc.h | 5 +- + drivers/gpu/drm/xe/xe_uc_fw.c | 58 +- + drivers/gpu/drm/xe/xe_uc_fw_types.h | 2 + + drivers/gpu/drm/xe/xe_vm.c | 385 +- + drivers/gpu/drm/xe/xe_vm.h | 24 + + drivers/gpu/drm/xe/xe_vm_types.h | 26 +- + drivers/gpu/drm/xe/xe_vsec.c | 4 +- + drivers/gpu/drm/xe/xe_vsec.h | 4 + + drivers/gpu/drm/xe/xe_wa.c | 120 +- + drivers/gpu/drm/xe/xe_wa.h | 22 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 12 +- + drivers/gpu/drm/xen/xen_drm_front_kms.c | 3 +- + drivers/gpu/drm/xlnx/zynqmp_dp.c | 34 +- + drivers/gpu/drm/xlnx/zynqmp_dpsub.c | 1 - + drivers/gpu/drm/xlnx/zynqmp_kms.c | 3 +- + drivers/gpu/nova-core/dma.rs | 58 + + drivers/gpu/nova-core/driver.rs | 6 +- + drivers/gpu/nova-core/falcon.rs | 588 ++ + drivers/gpu/nova-core/falcon/gsp.rs | 24 + + drivers/gpu/nova-core/falcon/hal.rs | 54 + + drivers/gpu/nova-core/falcon/hal/ga102.rs | 119 + + drivers/gpu/nova-core/falcon/sec2.rs | 10 + + drivers/gpu/nova-core/fb.rs | 147 + + drivers/gpu/nova-core/fb/hal.rs | 39 + + drivers/gpu/nova-core/fb/hal/ga100.rs | 57 + + drivers/gpu/nova-core/fb/hal/ga102.rs | 36 + + drivers/gpu/nova-core/fb/hal/tu102.rs | 58 + + drivers/gpu/nova-core/firmware.rs | 108 + + drivers/gpu/nova-core/firmware/fwsec.rs | 423 + + drivers/gpu/nova-core/gfw.rs | 71 + + drivers/gpu/nova-core/gpu.rs | 127 +- + drivers/gpu/nova-core/nova_core.rs | 5 + + drivers/gpu/nova-core/regs.rs | 303 +- + drivers/gpu/nova-core/regs/macros.rs | 65 +- + drivers/gpu/nova-core/util.rs | 26 + + drivers/gpu/nova-core/vbios.rs | 1166 +++ + drivers/gpu/trace/Kconfig | 11 +- + drivers/hv/mshv_eventfd.c | 8 + + drivers/hwmon/adt7475.c | 20 +- + drivers/hwmon/amc6821.c | 127 +- + drivers/hwmon/asus-ec-sensors.c | 60 + + drivers/hwmon/axi-fan-control.c | 2 +- + drivers/hwmon/corsair-psu.c | 1 + + drivers/hwmon/emc2305.c | 181 +- + drivers/hwmon/gsc-hwmon.c | 4 +- + drivers/hwmon/ibmaem.c | 27 +- + drivers/hwmon/ina238.c | 134 +- + drivers/hwmon/ltc4282.c | 16 +- + drivers/hwmon/max31827.c | 2 +- + drivers/hwmon/pmbus/Kconfig | 9 + + drivers/hwmon/pmbus/adp1050.c | 72 +- + drivers/hwmon/pmbus/isl68137.c | 3 + + drivers/hwmon/pmbus/tps53679.c | 37 +- + drivers/hwmon/w83627ehf.c | 9 +- + drivers/hwtracing/intel_th/msu.c | 3 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 18 +- + drivers/iio/adc/adi-axi-adc.c | 3 +- + drivers/iio/dac/adi-axi-dac.c | 2 +- + drivers/infiniband/Kconfig | 1 - + drivers/infiniband/core/Makefile | 1 + + drivers/infiniband/core/cm.c | 47 +- + drivers/infiniband/core/counters.c | 2 +- + drivers/infiniband/core/cq.c | 12 +- + drivers/infiniband/core/device.c | 47 +- + drivers/infiniband/core/mad.c | 468 +- + drivers/infiniband/core/mad_priv.h | 76 +- + drivers/infiniband/core/mad_rmpp.c | 41 +- + drivers/infiniband/core/nldev.c | 24 +- + drivers/infiniband/core/rdma_core.c | 29 + + drivers/infiniband/core/rdma_core.h | 1 + + drivers/infiniband/core/restrack.c | 2 + + drivers/infiniband/core/uverbs_cmd.c | 13 +- + drivers/infiniband/core/uverbs_std_types_cq.c | 87 +- + drivers/infiniband/core/uverbs_std_types_dmah.c | 145 + + drivers/infiniband/core/uverbs_std_types_mr.c | 172 +- + drivers/infiniband/core/uverbs_std_types_qp.c | 2 +- + drivers/infiniband/core/uverbs_uapi.c | 1 + + drivers/infiniband/core/verbs.c | 5 +- + drivers/infiniband/hw/Makefile | 1 - + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 10 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.h | 2 + + drivers/infiniband/hw/bnxt_re/qplib_fp.c | 28 +- + drivers/infiniband/hw/bnxt_re/qplib_fp.h | 3 + + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 2 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.h | 1 + + drivers/infiniband/hw/cxgb4/device.c | 3 +- + drivers/infiniband/hw/cxgb4/iw_cxgb4.h | 1 + + drivers/infiniband/hw/cxgb4/mem.c | 6 +- + drivers/infiniband/hw/efa/efa.h | 5 + + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 17 +- + drivers/infiniband/hw/efa/efa_com_cmd.c | 53 +- + drivers/infiniband/hw/efa/efa_com_cmd.h | 11 +- + drivers/infiniband/hw/efa/efa_main.c | 1 + + drivers/infiniband/hw/efa/efa_verbs.c | 91 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 9 +- + drivers/infiniband/hw/erdma/erdma_verbs.h | 3 +- + drivers/infiniband/hw/hfi1/affinity.c | 94 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 21 +- + drivers/infiniband/hw/hns/hns_roce_hem.c | 18 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 134 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 16 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 32 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 120 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 4 +- + drivers/infiniband/hw/irdma/verbs.c | 9 + + drivers/infiniband/hw/mana/counters.c | 78 +- + drivers/infiniband/hw/mana/counters.h | 18 + + drivers/infiniband/hw/mana/device.c | 116 +- + drivers/infiniband/hw/mana/main.c | 13 +- + drivers/infiniband/hw/mana/mana_ib.h | 30 + + drivers/infiniband/hw/mana/mr.c | 8 + + drivers/infiniband/hw/mana/qp.c | 2 +- + drivers/infiniband/hw/mlx4/mlx4_ib.h | 1 + + drivers/infiniband/hw/mlx4/mr.c | 4 + + drivers/infiniband/hw/mlx5/Makefile | 1 + + drivers/infiniband/hw/mlx5/counters.c | 30 +- + drivers/infiniband/hw/mlx5/counters.h | 13 - + drivers/infiniband/hw/mlx5/cq.c | 19 +- + drivers/infiniband/hw/mlx5/devx.c | 6 +- + drivers/infiniband/hw/mlx5/dmah.c | 54 + + drivers/infiniband/hw/mlx5/dmah.h | 23 + + drivers/infiniband/hw/mlx5/fs.c | 121 +- + drivers/infiniband/hw/mlx5/fs.h | 8 +- + drivers/infiniband/hw/mlx5/ib_rep.c | 3 +- + drivers/infiniband/hw/mlx5/main.c | 13 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 99 +- + drivers/infiniband/hw/mlx5/mr.c | 116 +- + drivers/infiniband/hw/mlx5/odp.c | 32 +- + drivers/infiniband/hw/mlx5/umr.c | 303 +- + drivers/infiniband/hw/mlx5/umr.h | 13 +- + drivers/infiniband/hw/mthca/mthca_provider.c | 6 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 6 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.h | 3 +- + drivers/infiniband/hw/qedr/verbs.c | 6 +- + drivers/infiniband/hw/qedr/verbs.h | 3 +- + drivers/infiniband/hw/qib/Kconfig | 17 - + drivers/infiniband/hw/qib/Makefile | 17 - + drivers/infiniband/hw/qib/qib.h | 1492 ---- + drivers/infiniband/hw/qib/qib_6120_regs.h | 977 --- + drivers/infiniband/hw/qib/qib_7220.h | 149 - + drivers/infiniband/hw/qib/qib_7220_regs.h | 1496 ---- + drivers/infiniband/hw/qib/qib_7322_regs.h | 3163 -------- + drivers/infiniband/hw/qib/qib_common.h | 798 -- + drivers/infiniband/hw/qib/qib_debugfs.c | 274 - + drivers/infiniband/hw/qib/qib_debugfs.h | 45 - + drivers/infiniband/hw/qib/qib_diag.c | 906 --- + drivers/infiniband/hw/qib/qib_driver.c | 798 -- + drivers/infiniband/hw/qib/qib_eeprom.c | 271 - + drivers/infiniband/hw/qib/qib_file_ops.c | 2401 ------ + drivers/infiniband/hw/qib/qib_fs.c | 549 -- + drivers/infiniband/hw/qib/qib_iba6120.c | 3533 -------- + drivers/infiniband/hw/qib/qib_iba7220.c | 4596 ----------- + drivers/infiniband/hw/qib/qib_iba7322.c | 8475 -------------------- + drivers/infiniband/hw/qib/qib_init.c | 1782 ---- + drivers/infiniband/hw/qib/qib_intr.c | 241 - + drivers/infiniband/hw/qib/qib_mad.c | 2450 ------ + drivers/infiniband/hw/qib/qib_mad.h | 300 - + drivers/infiniband/hw/qib/qib_pcie.c | 598 -- + drivers/infiniband/hw/qib/qib_pio_copy.c | 64 - + drivers/infiniband/hw/qib/qib_qp.c | 454 -- + drivers/infiniband/hw/qib/qib_qsfp.c | 549 -- + drivers/infiniband/hw/qib/qib_qsfp.h | 188 - + drivers/infiniband/hw/qib/qib_rc.c | 2131 ----- + drivers/infiniband/hw/qib/qib_ruc.c | 314 - + drivers/infiniband/hw/qib/qib_sd7220.c | 1445 ---- + drivers/infiniband/hw/qib/qib_sdma.c | 999 --- + drivers/infiniband/hw/qib/qib_sysfs.c | 731 -- + drivers/infiniband/hw/qib/qib_twsi.c | 502 -- + drivers/infiniband/hw/qib/qib_tx.c | 566 -- + drivers/infiniband/hw/qib/qib_uc.c | 521 -- + drivers/infiniband/hw/qib/qib_ud.c | 583 -- + drivers/infiniband/hw/qib/qib_user_pages.c | 137 - + drivers/infiniband/hw/qib/qib_user_sdma.c | 1470 ---- + drivers/infiniband/hw/qib/qib_user_sdma.h | 52 - + drivers/infiniband/hw/qib/qib_verbs.c | 1705 ---- + drivers/infiniband/hw/qib/qib_verbs.h | 398 - + drivers/infiniband/hw/qib/qib_wc_ppc64.c | 62 - + drivers/infiniband/hw/qib/qib_wc_x86_64.c | 150 - + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 4 + + drivers/infiniband/hw/usnic/usnic_ib_verbs.h | 1 + + drivers/infiniband/hw/vmw_pvrdma/pvrdma_mr.c | 5 + + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.h | 1 + + drivers/infiniband/sw/rdmavt/mr.c | 5 + + drivers/infiniband/sw/rdmavt/mr.h | 1 + + drivers/infiniband/sw/rdmavt/vt.c | 2 +- + drivers/infiniband/sw/rxe/rxe.c | 7 + + drivers/infiniband/sw/rxe/rxe_loc.h | 12 + + drivers/infiniband/sw/rxe/rxe_odp.c | 192 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 4 + + drivers/infiniband/sw/siw/siw_qp_tx.c | 22 +- + drivers/infiniband/sw/siw/siw_verbs.c | 7 +- + drivers/infiniband/sw/siw/siw_verbs.h | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 + + drivers/infiniband/ulp/iser/iscsi_iser.c | 6 +- + drivers/iommu/amd/amd_iommu_types.h | 1 - + drivers/iommu/amd/iommu.c | 125 +- + .../iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 70 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 17 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 33 +- + drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 493 +- + drivers/iommu/intel/iommu.c | 7 +- + drivers/iommu/intel/irq_remapping.c | 10 +- + drivers/iommu/iommufd/device.c | 143 +- + drivers/iommu/iommufd/driver.c | 113 +- + drivers/iommu/iommufd/eventq.c | 14 +- + drivers/iommu/iommufd/hw_pagetable.c | 10 +- + drivers/iommu/iommufd/io_pagetable.c | 57 +- + drivers/iommu/iommufd/io_pagetable.h | 5 +- + drivers/iommu/iommufd/iommufd_private.h | 135 +- + drivers/iommu/iommufd/iommufd_test.h | 20 + + drivers/iommu/iommufd/iova_bitmap.c | 1 - + drivers/iommu/iommufd/main.c | 206 +- + drivers/iommu/iommufd/pages.c | 21 +- + drivers/iommu/iommufd/selftest.c | 207 +- + drivers/iommu/iommufd/viommu.c | 313 +- + drivers/irqchip/Kconfig | 12 + + drivers/irqchip/Makefile | 5 +- + drivers/irqchip/irq-gic-common.h | 2 - + ...3-its-msi-parent.c => irq-gic-its-msi-parent.c} | 168 +- + drivers/irqchip/irq-gic-its-msi-parent.h | 12 + + drivers/irqchip/irq-gic-v3-its.c | 1 + + drivers/irqchip/irq-gic-v4.c | 4 +- + drivers/irqchip/irq-gic-v5-irs.c | 822 ++ + drivers/irqchip/irq-gic-v5-its.c | 1228 +++ + drivers/irqchip/irq-gic-v5-iwb.c | 284 + + drivers/irqchip/irq-gic-v5.c | 1137 +++ + drivers/irqchip/irq-gic.c | 2 +- + drivers/irqchip/irq-msi-lib.c | 5 +- + drivers/leds/flash/Kconfig | 1 + + drivers/leds/flash/leds-qcom-flash.c | 15 +- + drivers/leds/led-class.c | 3 +- + drivers/leds/leds-lp50xx.c | 11 +- + drivers/leds/leds-pca955x.c | 4 +- + drivers/leds/trigger/ledtrig-netdev.c | 16 +- + drivers/md/dm-linear.c | 2 +- + drivers/md/dm-log-writes.c | 2 +- + drivers/md/dm-stripe.c | 2 +- + drivers/md/dm-target.c | 2 +- + drivers/md/dm-writecache.c | 11 +- + drivers/md/dm.c | 2 +- + drivers/media/cec/core/cec-pin-error-inj.c | 59 +- + drivers/media/cec/core/cec-pin-priv.h | 8 + + drivers/media/cec/core/cec-pin.c | 31 +- + drivers/media/cec/platform/cec-gpio/cec-gpio.c | 68 +- + drivers/media/cec/usb/rainshadow/rainshadow-cec.c | 3 +- + drivers/media/common/b2c2/flexcop-i2c.c | 2 +- + drivers/media/dvb-frontends/cxd2820r_core.c | 6 +- + drivers/media/dvb-frontends/dib7000p.c | 8 + + drivers/media/i2c/Kconfig | 41 +- + drivers/media/i2c/adv7180.c | 16 - + drivers/media/i2c/adv748x/adv748x-afe.c | 17 - + drivers/media/i2c/adv748x/adv748x-hdmi.c | 10 - + drivers/media/i2c/adv7604.c | 4 +- + drivers/media/i2c/ds90ub913.c | 14 +- + drivers/media/i2c/ds90ub953.c | 19 +- + drivers/media/i2c/ds90ub960.c | 8 - + drivers/media/i2c/dw9714.c | 62 +- + drivers/media/i2c/hi556.c | 73 +- + drivers/media/i2c/imx214.c | 263 +- + drivers/media/i2c/imx290.c | 1 - + drivers/media/i2c/imx415.c | 2 +- + drivers/media/i2c/lt6911uxe.c | 2 +- + drivers/media/i2c/max9286.c | 8 +- + drivers/media/i2c/max96714.c | 7 - + drivers/media/i2c/max96717.c | 11 +- + drivers/media/i2c/mt9m114.c | 173 +- + drivers/media/i2c/ov2659.c | 3 +- + drivers/media/i2c/ov2740.c | 18 +- + drivers/media/i2c/ov5670.c | 9 +- + drivers/media/i2c/ov5693.c | 7 +- + drivers/media/i2c/ov7251.c | 7 +- + drivers/media/i2c/ov8865.c | 3 +- + drivers/media/i2c/saa7115.c | 12 +- + drivers/media/i2c/tc358743.c | 138 +- + drivers/media/i2c/tda1997x.c | 4 +- + drivers/media/i2c/vd55g1.c | 32 +- + drivers/media/pci/cx18/cx18-av-vbi.c | 12 +- + drivers/media/pci/cx18/cx18-driver.h | 12 - + drivers/media/pci/cx18/cx18-fileops.c | 2 +- + drivers/media/pci/cx18/cx18-ioctl.c | 2 +- + drivers/media/pci/intel/ipu-bridge.c | 13 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 82 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.h | 2 - + drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 12 +- + drivers/media/pci/intel/ipu6/ipu6-isys.h | 2 +- + drivers/media/pci/intel/ivsc/mei_ace.c | 4 +- + drivers/media/pci/intel/ivsc/mei_csi.c | 4 +- + drivers/media/pci/mgb4/mgb4_vout.c | 9 +- + drivers/media/pci/saa7164/saa7164-buffer.c | 20 - + drivers/media/pci/saa7164/saa7164-cmd.c | 28 - + drivers/media/pci/saa7164/saa7164.h | 2 - + drivers/media/pci/solo6x10/solo6x10-gpio.c | 22 +- + drivers/media/platform/amphion/vdec.c | 294 +- + drivers/media/platform/amphion/vpu.h | 7 +- + drivers/media/platform/amphion/vpu_color.c | 73 - + drivers/media/platform/amphion/vpu_dbg.c | 15 +- + drivers/media/platform/amphion/vpu_defs.h | 12 + + drivers/media/platform/amphion/vpu_helpers.c | 123 + + drivers/media/platform/amphion/vpu_helpers.h | 12 +- + drivers/media/platform/amphion/vpu_malone.c | 5 +- + drivers/media/platform/amphion/vpu_mbox.c | 4 - + drivers/media/platform/amphion/vpu_mbox.h | 1 - + drivers/media/platform/amphion/vpu_v4l2.c | 11 + + drivers/media/platform/cadence/cdns-csi2rx.c | 131 + + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 47 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h | 1 + + drivers/media/platform/nxp/imx-mipi-csis.c | 68 +- + .../media/platform/nxp/imx8-isi/imx8-isi-core.c | 135 +- + .../media/platform/nxp/imx8-isi/imx8-isi-core.h | 6 +- + .../platform/nxp/imx8-isi/imx8-isi-crossbar.c | 18 +- + drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 169 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 3 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 5 - + drivers/media/platform/qcom/camss/camss-csiphy.h | 1 - + drivers/media/platform/qcom/camss/camss-video.c | 39 +- + drivers/media/platform/qcom/camss/camss.c | 105 +- + drivers/media/platform/qcom/iris/iris_buffer.c | 35 +- + drivers/media/platform/qcom/iris/iris_buffer.h | 3 +- + drivers/media/platform/qcom/iris/iris_ctrls.c | 35 +- + drivers/media/platform/qcom/iris/iris_hfi_common.h | 1 + + .../platform/qcom/iris/iris_hfi_gen1_command.c | 48 +- + .../platform/qcom/iris/iris_hfi_gen1_defines.h | 5 +- + .../platform/qcom/iris/iris_hfi_gen1_response.c | 37 +- + .../platform/qcom/iris/iris_hfi_gen2_command.c | 143 +- + .../platform/qcom/iris/iris_hfi_gen2_defines.h | 5 + + .../platform/qcom/iris/iris_hfi_gen2_response.c | 56 +- + drivers/media/platform/qcom/iris/iris_hfi_queue.c | 2 +- + drivers/media/platform/qcom/iris/iris_instance.h | 6 + + .../platform/qcom/iris/iris_platform_common.h | 28 +- + .../media/platform/qcom/iris/iris_platform_gen2.c | 198 +- + .../platform/qcom/iris/iris_platform_qcs8300.h | 126 +- + .../platform/qcom/iris/iris_platform_sm8250.c | 15 +- + drivers/media/platform/qcom/iris/iris_probe.c | 2 +- + drivers/media/platform/qcom/iris/iris_state.c | 2 +- + drivers/media/platform/qcom/iris/iris_state.h | 1 + + drivers/media/platform/qcom/iris/iris_vb2.c | 18 +- + drivers/media/platform/qcom/iris/iris_vdec.c | 116 +- + drivers/media/platform/qcom/iris/iris_vdec.h | 11 + + drivers/media/platform/qcom/iris/iris_vidc.c | 36 +- + drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 397 +- + drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 42 +- + drivers/media/platform/qcom/venus/core.c | 18 +- + drivers/media/platform/qcom/venus/core.h | 2 + + drivers/media/platform/qcom/venus/hfi_msgs.c | 83 +- + drivers/media/platform/qcom/venus/hfi_venus.c | 5 + + drivers/media/platform/qcom/venus/pm_helpers.c | 58 +- + drivers/media/platform/qcom/venus/vdec.c | 8 +- + drivers/media/platform/qcom/venus/venc.c | 8 +- + drivers/media/platform/raspberrypi/pisp_be/Kconfig | 1 + + .../media/platform/raspberrypi/pisp_be/pisp_be.c | 207 +- + drivers/media/platform/raspberrypi/rp1-cfe/cfe.c | 4 +- + drivers/media/platform/renesas/rcar-csi2.c | 336 +- + drivers/media/platform/renesas/rcar-fcp.c | 36 + + .../media/platform/renesas/rcar-vin/rcar-core.c | 698 +- + drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 77 +- + .../media/platform/renesas/rcar-vin/rcar-v4l2.c | 492 +- + drivers/media/platform/renesas/rcar-vin/rcar-vin.h | 16 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-core.c | 6 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-cru.h | 14 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 45 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-ip.c | 108 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-video.c | 42 +- + drivers/media/platform/renesas/vsp1/Makefile | 1 + + drivers/media/platform/renesas/vsp1/vsp1.h | 1 + + drivers/media/platform/renesas/vsp1/vsp1_dl.c | 25 + + drivers/media/platform/renesas/vsp1/vsp1_drm.c | 1 + + drivers/media/platform/renesas/vsp1/vsp1_drv.c | 22 +- + drivers/media/platform/renesas/vsp1/vsp1_pipe.c | 3 + + drivers/media/platform/renesas/vsp1/vsp1_regs.h | 1 + + drivers/media/platform/renesas/vsp1/vsp1_vspx.c | 633 ++ + drivers/media/platform/renesas/vsp1/vsp1_vspx.h | 16 + + drivers/media/platform/rockchip/Kconfig | 1 + + drivers/media/platform/rockchip/Makefile | 1 + + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 2 + + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 150 +- + .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 99 +- + .../platform/rockchip}/rkvdec/Kconfig | 0 + .../platform/rockchip}/rkvdec/Makefile | 0 + .../platform/rockchip}/rkvdec/rkvdec-h264.c | 0 + .../platform/rockchip}/rkvdec/rkvdec-regs.h | 0 + .../platform/rockchip}/rkvdec/rkvdec-vp9.c | 0 + .../platform/rockchip}/rkvdec/rkvdec.c | 43 +- + .../platform/rockchip}/rkvdec/rkvdec.h | 1 + + .../platform/samsung/exynos4-is/fimc-is-i2c.c | 2 +- + .../platform/samsung/exynos4-is/fimc-is-i2c.h | 2 - + .../media/platform/samsung/exynos4-is/fimc-is.c | 2 +- + .../media/platform/samsung/exynos4-is/media-dev.c | 27 +- + .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 34 +- + .../media/platform/ti/j721e-csi2rx/j721e-csi2rx.c | 2 + + drivers/media/platform/ti/vpe/vpdma.c | 32 - + drivers/media/platform/ti/vpe/vpdma.h | 3 - + drivers/media/platform/verisilicon/hantro.h | 2 + + .../media/platform/verisilicon/hantro_g1_regs.h | 2 +- + drivers/media/platform/verisilicon/hantro_h264.c | 6 +- + .../media/platform/verisilicon/hantro_postproc.c | 6 +- + .../media/platform/verisilicon/rockchip_vpu_hw.c | 9 - + drivers/media/platform/xilinx/xilinx-vipp.c | 7 +- + drivers/media/rc/ir-spi.c | 40 +- + drivers/media/test-drivers/vivid/vivid-ctrls.c | 3 +- + drivers/media/test-drivers/vivid/vivid-vbi-gen.c | 8 +- + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 4 +- + drivers/media/usb/gspca/vicam.c | 10 +- + drivers/media/usb/hdpvr/hdpvr-i2c.c | 30 +- + drivers/media/usb/usbtv/usbtv-video.c | 4 + + drivers/media/usb/uvc/uvc_ctrl.c | 133 +- + drivers/media/usb/uvc/uvc_driver.c | 74 +- + drivers/media/usb/uvc/uvc_metadata.c | 122 +- + drivers/media/usb/uvc/uvc_queue.c | 201 +- + drivers/media/usb/uvc/uvc_v4l2.c | 366 +- + drivers/media/usb/uvc/uvc_video.c | 21 +- + drivers/media/usb/uvc/uvcvideo.h | 46 +- + drivers/media/v4l2-core/v4l2-common.c | 40 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 20 +- + drivers/media/v4l2-core/v4l2-i2c.c | 3 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 10 +- + drivers/media/v4l2-core/v4l2-jpeg.c | 80 - + drivers/media/v4l2-core/v4l2-subdev.c | 31 +- + drivers/mfd/Kconfig | 96 +- + drivers/mfd/ab8500-core.c | 3 +- + drivers/mfd/arizona-irq.c | 1 - + drivers/mfd/atmel-smc.c | 9 +- + drivers/mfd/axp20x.c | 8 +- + drivers/mfd/cros_ec_dev.c | 10 +- + drivers/mfd/cs40l50-core.c | 3 +- + drivers/mfd/cs42l43.c | 1 - + drivers/mfd/fsl-imx25-tsadc.c | 4 +- + drivers/mfd/ioc3.c | 2 +- + drivers/mfd/lp8788-irq.c | 2 +- + drivers/mfd/mt6358-irq.c | 3 +- + drivers/mfd/mt6370.c | 2 +- + drivers/mfd/mt6370.h | 2 +- + drivers/mfd/mt6397-core.c | 12 +- + drivers/mfd/mt6397-irq.c | 4 +- + drivers/mfd/qcom-pm8xxx.c | 4 +- + drivers/mfd/rk8xx-core.c | 12 + + drivers/mfd/rohm-bd71828.c | 12 +- + drivers/mfd/stm32-timers.c | 1 + + drivers/mfd/stmfx.c | 5 +- + drivers/mfd/tps65217.c | 4 +- + drivers/mfd/tps65219.c | 17 +- + drivers/mfd/tps6586x.c | 6 +- + drivers/mfd/twl6030-irq.c | 79 +- + drivers/mfd/twl6040.c | 2 +- + drivers/mfd/wm831x-irq.c | 10 +- + drivers/misc/vmw_balloon.c | 3 +- + drivers/mtd/devices/Kconfig | 11 + + drivers/mtd/devices/Makefile | 1 + + drivers/mtd/devices/mtd_intel_dg.c | 830 ++ + drivers/mtd/ftl.c | 2 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 2 +- + drivers/mtd/nand/raw/atmel/pmecc.c | 6 + + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 62 +- + drivers/mtd/nand/raw/fsmc_nand.c | 2 + + drivers/mtd/nand/raw/nand_hynix.c | 4 +- + drivers/mtd/nand/raw/renesas-nand-controller.c | 6 + + drivers/mtd/nand/raw/rockchip-nand-controller.c | 15 + + drivers/mtd/nand/spi/alliancememory.c | 12 +- + drivers/mtd/nand/spi/ato.c | 6 +- + drivers/mtd/nand/spi/core.c | 27 +- + drivers/mtd/nand/spi/esmt.c | 8 +- + drivers/mtd/nand/spi/foresee.c | 8 +- + drivers/mtd/nand/spi/gigadevice.c | 68 +- + drivers/mtd/nand/spi/macronix.c | 8 +- + drivers/mtd/nand/spi/micron.c | 20 +- + drivers/mtd/nand/spi/paragon.c | 12 +- + drivers/mtd/nand/spi/skyhigh.c | 12 +- + drivers/mtd/nand/spi/toshiba.c | 8 +- + drivers/mtd/nand/spi/winbond.c | 163 +- + drivers/mtd/nand/spi/xtx.c | 12 +- + drivers/mtd/nftlcore.c | 43 +- + drivers/mtd/spi-nor/micron-st.c | 8 +- + drivers/mtd/spi-nor/spansion.c | 35 +- + drivers/mtd/spi-nor/swp.c | 19 +- + drivers/mtd/ubi/kapi.c | 27 - + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 5 + + drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 5 - + drivers/net/ethernet/mellanox/mlx5/core/lib/st.c | 164 + + drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 + + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 9 + + drivers/net/xen-netfront.c | 5 - + drivers/nvdimm/pmem.c | 8 +- + drivers/nvdimm/pmem.h | 4 +- + drivers/of/irq.c | 22 +- + drivers/pci/msi/irqdomain.c | 20 + + drivers/pci/tph.c | 11 +- + .../x86/intel/int3472/tps68470_board_data.c | 128 + + drivers/pwm/pwm-axi-pwmgen.c | 2 +- + drivers/pwm/pwm-imx-tpm.c | 9 + + drivers/pwm/pwm-mediatek.c | 71 +- + drivers/reset/Kconfig | 9 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-spacemit.c | 304 + + drivers/s390/block/dcssblk.c | 10 +- + drivers/scsi/bfa/bfad_im.c | 1 + + drivers/scsi/elx/efct/efct_lio.c | 2 +- + drivers/scsi/fcoe/fcoe.c | 22 +- + drivers/scsi/hisi_sas/hisi_sas_v2_hw.c | 6 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 6 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 2 +- + drivers/scsi/ibmvscsi_tgt/libsrp.c | 6 +- + drivers/scsi/isci/request.c | 2 +- + drivers/scsi/libiscsi.c | 3 +- + drivers/scsi/lpfc/lpfc_ct.c | 28 +- + drivers/scsi/lpfc/lpfc_debugfs.c | 20 +- + drivers/scsi/lpfc/lpfc_els.c | 11 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 11 +- + drivers/scsi/lpfc/lpfc_hw4.h | 20 +- + drivers/scsi/lpfc/lpfc_init.c | 84 +- + drivers/scsi/lpfc/lpfc_scsi.c | 9 +- + drivers/scsi/lpfc/lpfc_sli.c | 14 +- + drivers/scsi/lpfc/lpfc_sli4.h | 4 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/mpi3mr/mpi3mr.h | 10 +- + drivers/scsi/mpi3mr/mpi3mr_app.c | 10 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 17 +- + drivers/scsi/mpi3mr/mpi3mr_os.c | 22 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 3 - + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 19 + + drivers/scsi/mvsas/mv_sas.c | 4 +- + drivers/scsi/pm8001/pm8001_sas.h | 10 + + drivers/scsi/pm8001/pm80xx_hwi.c | 60 +- + drivers/scsi/qla2xxx/Kconfig | 6 +- + drivers/scsi/qla2xxx/qla_dfs.c | 18 +- + drivers/scsi/qla2xxx/qla_gbl.h | 1 + + drivers/scsi/qla2xxx/qla_init.c | 4 - + drivers/scsi/qla2xxx/qla_mbx.c | 48 + + drivers/scsi/scsi.c | 15 +- + drivers/scsi/scsi_debug.c | 2 +- + drivers/scsi/scsi_devinfo.c | 11 +- + drivers/scsi/scsi_lib.c | 2 +- + drivers/scsi/scsi_scan.c | 3 +- + drivers/scsi/scsi_transport_fc.c | 72 +- + drivers/scsi/sd.c | 13 +- + drivers/soc/qcom/Kconfig | 8 + + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/ubwc_config.c | 282 + + drivers/spi/spi-axi-spi-engine.c | 2 +- + drivers/spi/spi-mem.c | 27 +- + drivers/staging/media/Kconfig | 4 +- + drivers/staging/media/Makefile | 2 +- + drivers/staging/media/atomisp/Kconfig | 1 + + drivers/staging/media/atomisp/Makefile | 1 - + drivers/staging/media/atomisp/TODO | 2 - + drivers/staging/media/atomisp/i2c/Kconfig | 1 + + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 627 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 2 - + drivers/staging/media/atomisp/i2c/gc2235.h | 16 +- + drivers/staging/media/atomisp/i2c/ov2722.h | 16 +- + .../media/atomisp/pci/atomisp_compat_css20.c | 2 +- + drivers/staging/media/atomisp/pci/atomisp_csi2.h | 17 - + .../media/atomisp/pci/atomisp_csi2_bridge.c | 239 +- + drivers/staging/media/atomisp/pci/atomisp_drvfs.c | 155 - + drivers/staging/media/atomisp/pci/atomisp_drvfs.h | 15 - + drivers/staging/media/atomisp/pci/atomisp_fops.c | 5 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 129 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.h | 3 - + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 5 +- + .../pci/hive_isp_css_include/math_support.h | 5 - + drivers/staging/media/atomisp/pci/hmm/hmm.c | 91 - + drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 5 +- + drivers/staging/media/atomisp/pci/ia_css_pipe.h | 2 - + .../pci/isp/kernels/anr/anr_1.0/ia_css_anr_types.h | 4 +- + .../pci/isp/kernels/dpc2/ia_css_dpc2_param.h | 6 +- + .../pci/isp/kernels/dvs/dvs_1.0/ia_css_dvs.host.c | 4 +- + .../pci/isp/kernels/eed1_8/ia_css_eed1_8_param.h | 22 +- + .../pci/isp/kernels/fpn/fpn_1.0/ia_css_fpn.host.c | 6 +- + .../pci/isp/kernels/sc/sc_1.0/ia_css_sc_param.h | 2 +- + .../pci/isp/kernels/vf/vf_1.0/ia_css_vf.host.c | 3 +- + .../pci/isp/modes/interface/input_buf.isp.h | 6 +- + .../atomisp/pci/isp/modes/interface/isp_const.h | 157 - + .../atomisp/pci/runtime/debug/src/ia_css_debug.c | 1 - + .../media/atomisp/pci/runtime/frame/src/frame.c | 29 +- + .../media/atomisp/pci/runtime/ifmtr/src/ifmtr.c | 11 +- + .../atomisp/pci/runtime/isys/src/virtual_isys.c | 2 +- + .../runtime/pipeline/interface/ia_css_pipeline.h | 1 - + .../atomisp/pci/runtime/pipeline/src/pipeline.c | 2 - + drivers/staging/media/atomisp/pci/sh_css.c | 27 - + drivers/staging/media/atomisp/pci/sh_css_defs.h | 12 +- + .../staging/media/atomisp/pci/sh_css_internal.h | 8 +- + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 11 - + drivers/staging/media/atomisp/pci/sh_css_mipi.h | 2 - + .../staging/media/atomisp/pci/sh_css_param_dvs.h | 22 +- + drivers/staging/media/atomisp/pci/sh_css_params.c | 12 +- + drivers/staging/media/imx/imx-media-csc-scaler.c | 2 +- + drivers/staging/media/ipu7/Kconfig | 19 + + drivers/staging/media/ipu7/Makefile | 23 + + drivers/staging/media/ipu7/TODO | 28 + + drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h | 163 + + .../staging/media/ipu7/abi/ipu7_fw_common_abi.h | 175 + + .../staging/media/ipu7/abi/ipu7_fw_config_abi.h | 19 + + .../media/ipu7/abi/ipu7_fw_insys_config_abi.h | 19 + + drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h | 412 + + drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h | 465 ++ + .../media/ipu7/abi/ipu7_fw_psys_config_abi.h | 24 + + .../staging/media/ipu7/abi/ipu7_fw_syscom_abi.h | 49 + + drivers/staging/media/ipu7/ipu7-boot.c | 430 + + drivers/staging/media/ipu7/ipu7-boot.h | 25 + + drivers/staging/media/ipu7/ipu7-bus.c | 158 + + drivers/staging/media/ipu7/ipu7-bus.h | 69 + + drivers/staging/media/ipu7/ipu7-buttress-regs.h | 461 ++ + drivers/staging/media/ipu7/ipu7-buttress.c | 1192 +++ + drivers/staging/media/ipu7/ipu7-buttress.h | 77 + + drivers/staging/media/ipu7/ipu7-cpd.c | 276 + + drivers/staging/media/ipu7/ipu7-cpd.h | 16 + + drivers/staging/media/ipu7/ipu7-dma.c | 477 ++ + drivers/staging/media/ipu7/ipu7-dma.h | 46 + + drivers/staging/media/ipu7/ipu7-fw-isys.c | 301 + + drivers/staging/media/ipu7/ipu7-fw-isys.h | 39 + + drivers/staging/media/ipu7/ipu7-isys-csi-phy.c | 1034 +++ + drivers/staging/media/ipu7/ipu7-isys-csi-phy.h | 16 + + drivers/staging/media/ipu7/ipu7-isys-csi2-regs.h | 1197 +++ + drivers/staging/media/ipu7/ipu7-isys-csi2.c | 543 ++ + drivers/staging/media/ipu7/ipu7-isys-csi2.h | 64 + + drivers/staging/media/ipu7/ipu7-isys-queue.c | 829 ++ + drivers/staging/media/ipu7/ipu7-isys-queue.h | 72 + + drivers/staging/media/ipu7/ipu7-isys-subdev.c | 348 + + drivers/staging/media/ipu7/ipu7-isys-subdev.h | 53 + + drivers/staging/media/ipu7/ipu7-isys-video.c | 1112 +++ + drivers/staging/media/ipu7/ipu7-isys-video.h | 117 + + drivers/staging/media/ipu7/ipu7-isys.c | 1166 +++ + drivers/staging/media/ipu7/ipu7-isys.h | 140 + + drivers/staging/media/ipu7/ipu7-mmu.c | 853 ++ + drivers/staging/media/ipu7/ipu7-mmu.h | 414 + + drivers/staging/media/ipu7/ipu7-platform-regs.h | 82 + + drivers/staging/media/ipu7/ipu7-syscom.c | 78 + + drivers/staging/media/ipu7/ipu7-syscom.h | 35 + + drivers/staging/media/ipu7/ipu7.c | 2783 +++++++ + drivers/staging/media/ipu7/ipu7.h | 242 + + drivers/staging/media/rkvdec/TODO | 11 - + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 19 +- + drivers/staging/media/sunxi/cedrus/cedrus_video.c | 18 + + drivers/tty/serial/8250/8250_ioc3.c | 2 +- + drivers/ufs/core/ufs-sysfs.c | 190 + + drivers/ufs/core/ufshcd.c | 71 +- + drivers/ufs/host/ufs-exynos.c | 4 +- + drivers/ufs/host/ufs-qcom.c | 24 +- + drivers/ufs/host/ufs-qcom.h | 9 + + drivers/vfio/pci/vfio_pci_core.c | 7 +- + drivers/vfio/pci/vfio_pci_intrs.c | 10 +- + drivers/vhost/vdpa.c | 10 +- + drivers/video/Kconfig | 18 + + drivers/video/fbdev/c2p_iplan2.c | 1 + + drivers/video/fbdev/c2p_planar.c | 1 + + drivers/video/fbdev/core/Kconfig | 15 - + drivers/video/fbdev/core/cfbcopyarea.c | 2 + + drivers/video/fbdev/core/cfbfillrect.c | 2 + + drivers/video/fbdev/core/cfbimgblt.c | 2 + + drivers/video/fbdev/core/fb_ddc.c | 1 + + drivers/video/fbdev/core/fb_defio.c | 1 + + drivers/video/fbdev/core/fb_io_fops.c | 1 + + drivers/video/fbdev/core/fb_sys_fops.c | 2 + + drivers/video/fbdev/core/fbcmap.c | 1 + + drivers/video/fbdev/core/fbcon.c | 5 +- + drivers/video/fbdev/core/fbmon.c | 5 +- + drivers/video/fbdev/core/modedb.c | 1 + + drivers/video/fbdev/core/svgalib.c | 1 + + drivers/video/fbdev/core/syscopyarea.c | 2 + + drivers/video/fbdev/core/sysfillrect.c | 2 + + drivers/video/fbdev/core/sysimgblt.c | 2 + + drivers/video/fbdev/cyber2000fb.c | 36 - + drivers/video/fbdev/cyber2000fb.h | 2 - + drivers/video/fbdev/macmodes.c | 3 +- + drivers/video/fbdev/matrox/g450_pll.c | 26 +- + drivers/video/fbdev/matrox/matroxfb_DAC1064.c | 47 +- + drivers/video/fbdev/matrox/matroxfb_Ti3026.c | 1 + + drivers/video/fbdev/matrox/matroxfb_accel.c | 2 + + drivers/video/fbdev/matrox/matroxfb_base.c | 1 + + drivers/video/fbdev/matrox/matroxfb_g450.c | 62 +- + drivers/video/fbdev/matrox/matroxfb_misc.c | 21 +- + drivers/video/fbdev/mb862xx/mb862xx-i2c.c | 1 - + drivers/video/fbdev/omap/lcd_dma.c | 1 + + drivers/video/fbdev/omap/lcdc.c | 2 + + drivers/video/fbdev/omap/omapfb_main.c | 2 + + drivers/video/fbdev/omap2/omapfb/dss/apply.c | 1 + + drivers/video/fbdev/omap2/omapfb/dss/core.c | 1 + + .../video/fbdev/omap2/omapfb/dss/dispc-compat.c | 1 + + drivers/video/fbdev/omap2/omapfb/dss/display.c | 1 + + drivers/video/fbdev/omap2/omapfb/dss/dpi.c | 1 - + drivers/video/fbdev/omap2/omapfb/dss/dss-of.c | 1 + + .../video/fbdev/omap2/omapfb/dss/dss_features.c | 1 + + drivers/video/fbdev/omap2/omapfb/dss/manager.c | 1 + + drivers/video/fbdev/omap2/omapfb/dss/output.c | 1 + + drivers/video/fbdev/omap2/omapfb/dss/overlay.c | 1 + + drivers/video/fbdev/omap2/omapfb/dss/sdi.c | 1 - + drivers/video/fbdev/omap2/omapfb/dss/venc.c | 1 + + drivers/video/fbdev/omap2/omapfb/omapfb-ioctl.c | 1 - + drivers/video/fbdev/omap2/omapfb/vrfb.c | 1 + + drivers/video/fbdev/pxafb.c | 17 +- + drivers/video/fbdev/sbuslib.c | 1 + + drivers/video/fbdev/sis/sis.h | 2 - + drivers/video/fbdev/sis/sis_main.c | 25 - + drivers/video/fbdev/via/via-core.c | 1 + + drivers/video/fbdev/via/via-gpio.c | 1 - + drivers/video/fbdev/via/via_i2c.c | 1 + + drivers/video/fbdev/wmt_ge_rops.c | 1 + + drivers/virtio/virtio_balloon.c | 4 +- + drivers/virtio/virtio_mem.c | 2 +- + drivers/xen/gntdev-common.h | 4 + + drivers/xen/gntdev-dmabuf.c | 28 +- + drivers/xen/gntdev.c | 71 +- + drivers/xen/manage.c | 6 - + drivers/xen/time.c | 8 - + drivers/xen/xen-pciback/pci_stub.c | 12 +- + drivers/xen/xenbus/xenbus_client.c | 2 + + drivers/xen/xenbus/xenbus_xs.c | 17 - + fs/Kconfig | 11 +- + fs/ceph/file.c | 22 +- + fs/cramfs/inode.c | 5 +- + fs/dax.c | 67 +- + fs/direct-io.c | 2 +- + fs/exec.c | 2 +- + fs/ext4/balloc.c | 2 +- + fs/ext4/ext4.h | 74 +- + fs/ext4/ext4_extents.h | 7 - + fs/ext4/extents.c | 6 +- + fs/ext4/file.c | 2 +- + fs/ext4/ialloc.c | 3 +- + fs/ext4/inline.c | 91 +- + fs/ext4/inode.c | 358 +- + fs/ext4/mballoc-test.c | 5 + + fs/ext4/mballoc.c | 899 ++- + fs/ext4/mballoc.h | 9 +- + fs/ext4/move_extent.c | 3 +- + fs/ext4/namei.c | 69 +- + fs/ext4/page-io.c | 16 +- + fs/ext4/xattr.c | 4 +- + fs/file_table.c | 2 +- + fs/fuse/dax.c | 3 +- + fs/fuse/file.c | 11 - + fs/fuse/virtio_fs.c | 5 +- + fs/hugetlbfs/inode.c | 16 +- + fs/jfs/file.c | 3 + + fs/jfs/inode.c | 2 +- + fs/jfs/jfs_dmap.c | 10 +- + fs/jfs/jfs_metapage.c | 8 +- + fs/jfs/jfs_xtree.c | 142 +- + fs/nfs/write.c | 2 +- + fs/notify/fanotify/fanotify.c | 8 +- + fs/notify/fsnotify.c | 93 +- + fs/open.c | 6 +- + fs/orangefs/orangefs-debugfs.c | 8 +- + fs/orangefs/orangefs-sysfs.c | 28 +- + fs/proc/generic.c | 2 + + fs/proc/inode.c | 2 +- + fs/proc/internal.h | 10 + + fs/proc/meminfo.c | 3 +- + fs/proc/page.c | 54 +- + fs/proc/task_mmu.c | 162 +- + fs/ubifs/file.c | 10 +- + fs/userfaultfd.c | 97 +- + fs/xfs/xfs_file.c | 2 +- + include/asm-generic/codetag.lds.h | 16 +- + include/asm-generic/hugetlb.h | 17 - + include/asm-generic/msi.h | 1 + + include/asm-generic/vmlinux.lds.h | 2 +- + include/crypto/engine.h | 1 - + include/crypto/internal/acompress.h | 5 +- + include/crypto/internal/engine.h | 15 - + include/crypto/internal/hash.h | 36 + + include/drm/amd/isp.h | 51 + + include/drm/display/drm_dp.h | 22 +- + include/drm/display/drm_dp_helper.h | 17 +- + include/drm/display/drm_hdmi_audio_helper.h | 1 + + include/drm/display/drm_hdmi_cec_helper.h | 72 + + include/drm/drm_accel.h | 5 - + include/drm/drm_bridge.h | 375 +- + include/drm/drm_color_mgmt.h | 27 + + include/drm/drm_connector.h | 60 +- + include/drm/drm_debugfs.h | 11 + + include/drm/drm_device.h | 11 + + include/drm/drm_drv.h | 22 +- + include/drm/drm_edid.h | 8 + + include/drm/drm_file.h | 7 + + include/drm/drm_format_helper.h | 19 +- + include/drm/drm_fourcc.h | 3 +- + include/drm/drm_gem.h | 13 +- + include/drm/drm_gem_framebuffer_helper.h | 6 + + include/drm/drm_gem_shmem_helper.h | 11 +- + include/drm/drm_gem_vram_helper.h | 2 - + include/drm/drm_gpusvm.h | 101 +- + include/drm/drm_gpuvm.h | 8 + + include/drm/drm_managed.h | 15 +- + include/drm/drm_mipi_dsi.h | 2 - + include/drm/drm_mode_config.h | 3 +- + include/drm/drm_modeset_helper.h | 2 + + include/drm/drm_pagemap.h | 135 + + include/drm/drm_panic.h | 6 + + include/drm/drm_prime.h | 3 + + include/drm/gpu_scheduler.h | 40 +- + include/drm/intel/pciids.h | 12 +- + include/drm/ttm/ttm_bo.h | 73 +- + include/drm/ttm/ttm_device.h | 1 + + include/dt-bindings/clock/nxp,imx94-clock.h | 13 + + include/dt-bindings/clock/qcom,ipq5018-cmn-pll.h | 16 + + include/dt-bindings/clock/qcom,ipq5424-cmn-pll.h | 22 + + include/dt-bindings/clock/qcom,milos-camcc.h | 131 + + include/dt-bindings/clock/qcom,milos-dispcc.h | 61 + + include/dt-bindings/clock/qcom,milos-gcc.h | 210 + + include/dt-bindings/clock/qcom,milos-gpucc.h | 56 + + include/dt-bindings/clock/qcom,milos-videocc.h | 36 + + include/dt-bindings/clock/qcom,qcs615-camcc.h | 110 + + include/dt-bindings/clock/qcom,qcs615-dispcc.h | 52 + + include/dt-bindings/clock/qcom,qcs615-gpucc.h | 39 + + include/dt-bindings/clock/qcom,qcs615-videocc.h | 30 + + include/dt-bindings/clock/qcom,x1e80100-gcc.h | 2 + + include/dt-bindings/clock/r9a07g043-cpg.h | 53 - + include/dt-bindings/clock/r9a07g044-cpg.h | 58 - + include/dt-bindings/clock/r9a07g054-cpg.h | 58 - + include/dt-bindings/clock/r9a08g045-cpg.h | 71 - + .../dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h | 29 + + .../dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h | 29 + + include/dt-bindings/clock/samsung,exynosautov920.h | 9 + + include/dt-bindings/power/qcom-rpmpd.h | 1 + + include/kvm/arm_vgic.h | 11 +- + include/linux/adi-axi-common.h | 56 + + include/linux/alloc_tag.h | 6 +- + include/linux/amd-iommu.h | 25 +- + include/linux/balloon_compaction.h | 94 +- + include/linux/bcm47xx_nvram.h | 1 - + include/linux/bcm47xx_sprom.h | 2 +- + include/linux/bitfield.h | 8 +- + include/linux/bits.h | 29 +- + include/linux/cgroup-defs.h | 21 +- + include/linux/clk-provider.h | 26 + + include/linux/codetag.h | 1 + + include/linux/coredump.h | 2 +- + include/linux/cpumask.h | 40 +- + include/linux/crypto.h | 3 + + include/linux/damon.h | 80 +- + include/linux/dax.h | 9 +- + include/linux/device-mapper.h | 2 +- + include/linux/dma-fence.h | 45 +- + include/linux/dmapool.h | 8 + + include/linux/find.h | 29 +- + include/linux/fpga/adi-axi-common.h | 23 - + include/linux/fprobe.h | 5 + + include/linux/fs.h | 25 +- + include/linux/fsnotify.h | 35 +- + include/linux/ftrace.h | 2 +- + include/linux/gfp.h | 7 +- + include/linux/highmem-internal.h | 2 +- + include/linux/highmem.h | 12 - + include/linux/hisi_acc_qm.h | 4 +- + include/linux/huge_mm.h | 52 +- + include/linux/hugetlb.h | 20 +- + include/linux/intel_dg_nvm_aux.h | 32 + + include/linux/iommu.h | 74 +- + include/linux/iommufd.h | 196 +- + include/linux/irq-entry-common.h | 16 + + include/linux/irqbypass.h | 46 +- + include/linux/irqchip/arm-gic-v4.h | 2 +- + include/linux/irqchip/arm-gic-v5.h | 394 + + include/linux/irqchip/arm-vgic-info.h | 4 + + include/linux/irqdomain.h | 3 + + include/linux/kernel.h | 6 +- + include/linux/khugepaged.h | 4 +- + include/linux/ksm.h | 12 +- + include/linux/kvm_dirty_ring.h | 18 +- + include/linux/kvm_host.h | 36 +- + include/linux/kvm_irqfd.h | 5 +- + include/linux/led-class-flash.h | 2 +- + include/linux/leds.h | 1 - + include/linux/libnvdimm.h | 15 +- + include/linux/llist.h | 6 +- + include/linux/maple_tree.h | 4 +- + include/linux/memcontrol.h | 44 +- + include/linux/memfd.h | 4 +- + include/linux/memory-tiers.h | 2 +- + include/linux/memory.h | 20 +- + include/linux/memory_hotplug.h | 3 +- + include/linux/mfd/davinci_voicecodec.h | 8 +- + include/linux/mfd/madera/pdata.h | 3 +- + include/linux/mfd/pcf50633/core.h | 229 - + include/linux/mfd/rk808.h | 2 + + include/linux/mfd/syscon/atmel-smc.h | 8 +- + include/linux/mfd/tps65219.h | 5 - + include/linux/mfd/twl.h | 21 - + include/linux/mfd/wm8350/core.h | 10 +- + include/linux/migrate.h | 46 +- + include/linux/mlx5/driver.h | 25 + + include/linux/mlx5/mlx5_ifc.h | 14 +- + include/linux/mm.h | 77 +- + include/linux/mm_types.h | 3 +- + include/linux/mman.h | 4 +- + include/linux/mmap_lock.h | 11 + + include/linux/mmdebug.h | 12 + + include/linux/mmzone.h | 36 +- + include/linux/module.h | 6 +- + include/linux/msi.h | 1 + + include/linux/mtd/map.h | 13 +- + include/linux/mtd/spinand.h | 70 +- + include/linux/mtd/ubi.h | 1 - + include/linux/node.h | 81 +- + include/linux/nodemask.h | 16 +- + include/linux/of_irq.h | 5 + + include/linux/padata.h | 4 - + include/linux/page-flags.h | 106 +- + include/linux/page-isolation.h | 47 +- + include/linux/page_owner.h | 8 +- + include/linux/pageblock-flags.h | 56 +- + include/linux/pagemap.h | 14 +- + include/linux/pagewalk.h | 9 +- + include/linux/panic.h | 3 + + include/linux/pci-tph.h | 1 + + include/linux/percpu-defs.h | 7 +- + include/linux/pfn.h | 9 - + include/linux/pfn_t.h | 131 - + include/linux/pgtable.h | 118 +- + include/linux/platform_data/emc2305.h | 6 + + include/linux/platform_data/video-pxafb.h | 1 - + include/linux/printk.h | 7 + + include/linux/proc_fs.h | 1 + + include/linux/ring_buffer.h | 4 +- + include/linux/rmap.h | 4 +- + include/linux/rv.h | 88 +- + include/linux/sched.h | 15 +- + include/linux/sched/ext.h | 23 +- + include/linux/shmem_fs.h | 5 +- + include/linux/soc/qcom/ubwc.h | 75 + + include/linux/spi/spi-mem.h | 2 +- + include/linux/suspend.h | 2 + + include/linux/swap.h | 23 +- + include/linux/sysfb.h | 6 +- + include/linux/usb/uvc.h | 3 + + include/linux/userfaultfd_k.h | 15 +- + include/linux/vmstat.h | 4 +- + include/linux/wait.h | 2 + + include/linux/workqueue.h | 34 +- + include/linux/writeback.h | 11 - + include/linux/zsmalloc.h | 2 + + include/media/rcar-fcp.h | 5 + + include/media/v4l2-ctrls.h | 4 +- + include/media/v4l2-dev.h | 12 +- + include/media/v4l2-ioctl.h | 1 + + include/media/v4l2-jpeg.h | 9 - + include/media/v4l2-subdev.h | 3 - + include/media/vsp1.h | 89 + + include/ras/ras_event.h | 2 + + include/rdma/ib_umem.h | 25 +- + include/rdma/ib_verbs.h | 65 +- + include/rdma/restrack.h | 4 + + include/rv/da_monitor.h | 168 +- + include/rv/ltl_monitor.h | 186 + + include/scsi/scsi_device.h | 5 + + include/scsi/scsi_transport_fc.h | 5 +- + include/soc/spacemit/k1-syscon.h | 160 + + include/trace/events/alarmtimer.h | 2 + + include/trace/events/btrfs.h | 7 +- + include/trace/events/cgroup.h | 47 - + include/trace/events/damon.h | 41 + + include/trace/events/dma_fence.h | 38 +- + include/trace/events/ext4.h | 50 +- + include/trace/events/fs_dax.h | 6 +- + include/trace/events/ipi.h | 58 +- + include/trace/events/kmem.h | 38 - + include/trace/events/kvm.h | 111 +- + include/trace/events/mmap.h | 52 - + include/trace/events/power.h | 28 +- + include/trace/events/sched.h | 14 +- + include/trace/events/scsi.h | 13 +- + include/trace/events/thp.h | 2 + + include/trace/events/writeback.h | 8 +- + include/uapi/drm/amdgpu_drm.h | 2 + + include/uapi/drm/drm_fourcc.h | 56 +- + include/uapi/drm/ivpu_accel.h | 14 + + include/uapi/drm/msm_drm.h | 149 +- + include/uapi/drm/panfrost_drm.h | 21 + + include/uapi/drm/panthor_drm.h | 41 + + include/uapi/drm/xe_drm.h | 12 +- + include/uapi/linux/capability.h | 5 +- + include/uapi/linux/iommufd.h | 154 +- + include/uapi/linux/kvm.h | 2 + + .../uapi/linux/media/raspberrypi/pisp_be_config.h | 9 +- + include/uapi/linux/rkisp1-config.h | 106 +- + include/uapi/linux/v4l2-controls.h | 6 + + include/uapi/linux/videodev2.h | 9 +- + include/uapi/rdma/efa-abi.h | 3 +- + include/uapi/rdma/ib_user_ioctl_cmds.h | 36 + + include/ufs/ufs.h | 26 + + include/ufs/ufshcd.h | 1 + + include/video/edid.h | 3 +- + include/video/sisfb.h | 6 - + include/xen/xen-ops.h | 2 - + include/xen/xenbus.h | 2 - + init/Kconfig | 6 + + kernel/cgroup/cgroup-v1.c | 14 +- + kernel/cgroup/cpuset.c | 2 +- + kernel/cgroup/rstat.c | 197 +- + kernel/entry/common.c | 3 +- + kernel/events/uprobes.c | 5 +- + kernel/fork.c | 5 +- + kernel/kexec_handover.c | 4 +- + kernel/kprobes.c | 8 +- + kernel/module/main.c | 2 +- + kernel/padata.c | 154 +- + kernel/panic.c | 18 +- + kernel/power/hibernate.c | 26 + + kernel/printk/internal.h | 1 - + kernel/rcu/tree_stall.h | 7 + + kernel/sched/core.c | 42 +- + kernel/sched/ext.c | 250 +- + kernel/sched/ext.h | 20 +- + kernel/sched/ext_idle.c | 45 +- + kernel/sched/ext_idle.h | 12 - + kernel/sched/sched.h | 9 +- + kernel/sched/wait.c | 22 +- + kernel/sys.c | 50 +- + kernel/time/clocksource.c | 5 +- + kernel/trace/Kconfig | 26 +- + kernel/trace/fgraph.c | 16 +- + kernel/trace/fprobe.c | 9 +- + kernel/trace/ftrace.c | 4 - + kernel/trace/power-traces.c | 1 - + kernel/trace/ring_buffer.c | 168 +- + kernel/trace/rv/Kconfig | 43 +- + kernel/trace/rv/Makefile | 9 +- + kernel/trace/rv/monitors/{tss => nrp}/Kconfig | 12 +- + kernel/trace/rv/monitors/nrp/nrp.c | 138 + + kernel/trace/rv/monitors/nrp/nrp.h | 75 + + kernel/trace/rv/monitors/nrp/nrp_trace.h | 15 + + kernel/trace/rv/monitors/opid/Kconfig | 19 + + kernel/trace/rv/monitors/opid/opid.c | 168 + + kernel/trace/rv/monitors/opid/opid.h | 104 + + .../{sncid/sncid_trace.h => opid/opid_trace.h} | 8 +- + kernel/trace/rv/monitors/pagefault/Kconfig | 20 + + kernel/trace/rv/monitors/pagefault/pagefault.c | 88 + + kernel/trace/rv/monitors/pagefault/pagefault.h | 64 + + .../trace/rv/monitors/pagefault/pagefault_trace.h | 14 + + kernel/trace/rv/monitors/rtapp/Kconfig | 11 + + kernel/trace/rv/monitors/rtapp/rtapp.c | 33 + + kernel/trace/rv/monitors/rtapp/rtapp.h | 3 + + kernel/trace/rv/monitors/sched/Kconfig | 1 + + kernel/trace/rv/monitors/sched/sched.c | 3 +- + kernel/trace/rv/monitors/sco/sco.c | 7 +- + kernel/trace/rv/monitors/scpd/Kconfig | 2 +- + kernel/trace/rv/monitors/scpd/scpd.c | 7 +- + kernel/trace/rv/monitors/sleep/Kconfig | 22 + + kernel/trace/rv/monitors/sleep/sleep.c | 237 + + kernel/trace/rv/monitors/sleep/sleep.h | 257 + + kernel/trace/rv/monitors/sleep/sleep_trace.h | 14 + + kernel/trace/rv/monitors/sncid/sncid.c | 96 - + kernel/trace/rv/monitors/sncid/sncid.h | 49 - + kernel/trace/rv/monitors/snep/Kconfig | 2 +- + kernel/trace/rv/monitors/snep/snep.c | 7 +- + kernel/trace/rv/monitors/snep/snep.h | 14 +- + kernel/trace/rv/monitors/snroc/snroc.c | 3 +- + kernel/trace/rv/monitors/{sncid => sssw}/Kconfig | 10 +- + kernel/trace/rv/monitors/sssw/sssw.c | 116 + + kernel/trace/rv/monitors/sssw/sssw.h | 105 + + kernel/trace/rv/monitors/sssw/sssw_trace.h | 15 + + kernel/trace/rv/monitors/sts/Kconfig | 19 + + kernel/trace/rv/monitors/sts/sts.c | 156 + + kernel/trace/rv/monitors/sts/sts.h | 117 + + .../monitors/{tss/tss_trace.h => sts/sts_trace.h} | 8 +- + kernel/trace/rv/monitors/tss/tss.c | 91 - + kernel/trace/rv/monitors/tss/tss.h | 47 - + kernel/trace/rv/monitors/wip/Kconfig | 2 +- + kernel/trace/rv/monitors/wip/wip.c | 3 +- + kernel/trace/rv/monitors/wwnr/wwnr.c | 3 +- + kernel/trace/rv/reactor_panic.c | 8 +- + kernel/trace/rv/reactor_printk.c | 8 +- + kernel/trace/rv/rv.c | 220 +- + kernel/trace/rv/rv.h | 39 +- + kernel/trace/rv/rv_reactors.c | 138 +- + kernel/trace/rv/rv_trace.h | 166 +- + kernel/trace/trace.c | 14 +- + kernel/trace/trace_eprobe.c | 53 +- + kernel/trace/trace_events_filter.c | 4 + + kernel/trace/trace_fprobe.c | 614 +- + kernel/trace/trace_functions_graph.c | 2 +- + kernel/trace/trace_kdb.c | 8 +- + kernel/trace/trace_kprobe.c | 65 +- + kernel/trace/trace_probe.c | 150 +- + kernel/trace/trace_probe.h | 26 +- + kernel/trace/trace_uprobe.c | 53 +- + kernel/watchdog_buddy.c | 5 +- + kernel/workqueue.c | 74 +- + lib/alloc_tag.c | 31 +- + lib/codetag.c | 17 +- + lib/find_bit.c | 24 + + lib/maple_tree.c | 40 +- + lib/test_hmm.c | 14 +- + lib/test_maple_tree.c | 32 + + lib/test_vmalloc.c | 42 +- + lib/tests/test_bits.c | 19 + + lib/xarray.c | 3 + + mm/Kconfig | 28 +- + mm/balloon_compaction.c | 21 +- + mm/cma.c | 341 +- + mm/cma_debug.c | 10 +- + mm/compaction.c | 44 +- + mm/damon/Kconfig | 16 + + mm/damon/Makefile | 1 + + mm/damon/core.c | 189 +- + mm/damon/lru_sort.c | 75 +- + mm/damon/ops-common.c | 274 + + mm/damon/ops-common.h | 5 + + mm/damon/paddr.c | 277 +- + mm/damon/reclaim.c | 71 +- + mm/damon/stat.c | 264 + + mm/damon/sysfs-schemes.c | 504 +- + mm/damon/sysfs.c | 171 +- + mm/damon/tests/core-kunit.h | 4 +- + mm/damon/tests/vaddr-kunit.h | 2 +- + mm/damon/vaddr.c | 241 + + mm/debug.c | 44 +- + mm/debug_vm_pgtable.c | 113 +- + mm/dmapool.c | 6 +- + mm/execmem.c | 8 +- + mm/filemap.c | 68 +- + mm/gup.c | 245 +- + mm/hmm.c | 14 +- + mm/huge_memory.c | 489 +- + mm/hugetlb.c | 173 +- + mm/hugetlb_vmemmap.c | 2 +- + mm/internal.h | 150 +- + mm/kasan/kasan_test_c.c | 8 + + mm/khugepaged.c | 23 +- + mm/ksm.c | 57 +- + mm/list_lru.c | 34 +- + mm/maccess.c | 1 - + mm/madvise.c | 828 +- + mm/mapping_dirty_helpers.c | 6 +- + mm/memcontrol.c | 92 +- + mm/memfd.c | 38 +- + mm/memory-failure.c | 4 +- + mm/memory-tiers.c | 19 +- + mm/memory.c | 153 +- + mm/memory_hotplug.c | 195 +- + mm/mempolicy.c | 31 +- + mm/mempool.c | 34 +- + mm/memremap.c | 34 +- + mm/migrate.c | 283 +- + mm/migrate_device.c | 2 +- + mm/mlock.c | 4 +- + mm/mm_init.c | 26 +- + mm/mmap.c | 28 +- + mm/mmap_lock.c | 93 + + mm/mprotect.c | 309 +- + mm/mremap.c | 629 +- + mm/nommu.c | 12 +- + mm/page-writeback.c | 4 +- + mm/page_alloc.c | 398 +- + mm/page_ext.c | 17 +- + mm/page_io.c | 71 +- + mm/page_isolation.c | 112 +- + mm/page_owner.c | 4 +- + mm/page_vma_mapped.c | 5 +- + mm/pagewalk.c | 90 +- + mm/percpu-stats.c | 1 - + mm/percpu.c | 2 +- + mm/pgtable-generic.c | 7 +- + mm/ptdump.c | 5 +- + mm/readahead.c | 36 +- + mm/rmap.c | 26 +- + mm/secretmem.c | 16 +- + mm/shmem.c | 112 +- + mm/show_mem.c | 2 - + mm/slub.c | 61 +- + mm/swap.c | 33 +- + mm/swap.h | 9 +- + mm/swapfile.c | 70 +- + mm/userfaultfd.c | 92 +- + mm/util.c | 116 +- + mm/vma.c | 159 +- + mm/vma.h | 29 +- + mm/vma_exec.c | 2 +- + mm/vmpressure.c | 2 +- + mm/vmscan.c | 506 +- + mm/vmstat.c | 444 +- + mm/zpdesc.h | 15 +- + mm/zsmalloc.c | 33 +- + mm/zswap.c | 5 +- + rust/kernel/clk.rs | 42 +- + rust/kernel/dma.rs | 199 +- + rust/kernel/drm/device.rs | 2 +- + rust/kernel/drm/file.rs | 8 +- + rust/kernel/drm/gem/mod.rs | 16 +- + rust/kernel/drm/ioctl.rs | 4 +- + rust/kernel/error.rs | 1 + + rust/kernel/sizes.rs | 24 + + samples/damon/mtier.c | 78 +- + samples/damon/prcl.c | 53 +- + samples/damon/wsse.c | 53 +- + samples/fanotify/fs-monitor.c | 7 + + samples/rust/rust_dma.rs | 28 +- + scripts/checktransupdate.py | 38 +- + scripts/kernel-doc.py | 10 + + scripts/lib/kdoc/kdoc_files.py | 4 +- + scripts/lib/kdoc/kdoc_item.py | 42 + + scripts/lib/kdoc/kdoc_output.py | 172 +- + scripts/lib/kdoc/kdoc_parser.py | 875 +- + scripts/lib/kdoc/kdoc_re.py | 7 +- + scripts/module.lds.S | 5 - + scripts/recordmcount.pl | 2 +- + scripts/sphinx-pre-install | 6 +- + scripts/test_doc_build.py | 513 ++ + scripts/ver_linux | 2 - + security/commoncap.c | 20 +- + security/integrity/ima/ima_main.c | 26 + + security/ipe/Kconfig | 1 + + security/ipe/audit.c | 33 +- + tools/bootconfig/main.c | 43 +- + tools/bootconfig/scripts/ftrace.sh | 1 + + tools/bootconfig/test-bootconfig.sh | 37 +- + tools/include/uapi/linux/kvm.h | 1 + + tools/mm/show_page_info.py | 169 + + tools/objtool/noreturns.h | 1 + + tools/perf/arch/riscv/util/kvm-stat.c | 6 +- + tools/perf/arch/riscv/util/riscv_exception_types.h | 35 - + tools/perf/arch/riscv/util/riscv_trap_types.h | 57 + + tools/sched_ext/scx_qmap.bpf.c | 23 + + tools/testing/ktest/ktest.pl | 116 +- + tools/testing/ktest/sample.conf | 2 + + tools/testing/nvdimm/pmem-dax.c | 6 +- + tools/testing/nvdimm/test/iomap.c | 11 - + tools/testing/nvdimm/test/nfit_test.h | 1 - + tools/testing/radix-tree/maple.c | 19 +- + tools/testing/selftests/cgroup/lib/cgroup_util.c | 4 +- + .../selftests/cgroup/lib/include/cgroup_util.h | 5 + + tools/testing/selftests/cgroup/test_core.c | 84 +- + tools/testing/selftests/cgroup/test_cpu.c | 63 +- + tools/testing/selftests/cgroup/test_kmem.c | 5 +- + tools/testing/selftests/cgroup/test_zswap.c | 2 +- + tools/testing/selftests/damon/Makefile | 2 + + tools/testing/selftests/damon/_common.sh | 11 + + tools/testing/selftests/damon/_damon_sysfs.py | 304 +- + .../selftests/damon/drgn_dump_damon_status.py | 222 + + tools/testing/selftests/damon/lru_sort.sh | 8 +- + tools/testing/selftests/damon/reclaim.sh | 8 +- + tools/testing/selftests/damon/sysfs.py | 272 + + tools/testing/selftests/damon/sysfs.sh | 11 +- + .../selftests/damon/sysfs_memcg_path_leak.sh | 43 + + .../damon/sysfs_update_removed_scheme_dir.sh | 8 +- + tools/testing/selftests/drivers/dma-buf/udmabuf.c | 20 +- + .../ftrace/test.d/dynevent/add_remove_fprobe.tc | 46 +- + tools/testing/selftests/iommu/iommufd.c | 521 +- + tools/testing/selftests/iommu/iommufd_fail_nth.c | 15 +- + tools/testing/selftests/iommu/iommufd_utils.h | 89 +- + tools/testing/selftests/kvm/Makefile.kvm | 4 +- + .../selftests/kvm/access_tracking_perf_test.c | 7 +- + tools/testing/selftests/kvm/arch_timer.c | 7 +- + .../selftests/kvm/arm64/arch_timer_edge_cases.c | 23 +- + .../testing/selftests/kvm/arm64/external_aborts.c | 330 + + tools/testing/selftests/kvm/arm64/get-reg-list.c | 203 +- + tools/testing/selftests/kvm/arm64/mmio_abort.c | 159 - + tools/testing/selftests/kvm/arm64/set_id_regs.c | 14 +- + tools/testing/selftests/kvm/arm64/vgic_init.c | 259 +- + tools/testing/selftests/kvm/arm64/vgic_irq.c | 12 +- + tools/testing/selftests/kvm/config | 1 + + .../selftests/kvm/include/arm64/processor.h | 10 + + tools/testing/selftests/kvm/include/kvm_util.h | 72 +- + .../testing/selftests/kvm/include/x86/processor.h | 6 +- + tools/testing/selftests/kvm/irqfd_test.c | 135 + + tools/testing/selftests/kvm/lib/kvm_util.c | 51 +- + tools/testing/selftests/kvm/lib/memstress.c | 2 +- + tools/testing/selftests/kvm/lib/sparsebit.c | 4 +- + tools/testing/selftests/kvm/lib/x86/processor.c | 10 - + tools/testing/selftests/kvm/x86/aperfmperf_test.c | 213 + + .../selftests/kvm/x86/userspace_msr_exit_test.c | 8 + + .../x86/vmx_exception_with_invalid_guest_state.c | 2 +- + tools/testing/selftests/kvm/x86/xen_shinfo_test.c | 21 +- + tools/testing/selftests/mm/.gitignore | 3 - + tools/testing/selftests/mm/cow.c | 101 +- + tools/testing/selftests/mm/guard-regions.c | 9 +- + tools/testing/selftests/mm/gup_longterm.c | 10 +- + tools/testing/selftests/mm/hugetlb-madvise.c | 5 +- + tools/testing/selftests/mm/khugepaged.c | 7 +- + tools/testing/selftests/mm/ksm_functional_tests.c | 28 +- + tools/testing/selftests/mm/ksm_tests.c | 6 + + tools/testing/selftests/mm/merge.c | 677 +- + tools/testing/selftests/mm/migration.c | 21 +- + tools/testing/selftests/mm/mremap_test.c | 361 +- + tools/testing/selftests/mm/pagemap_ioctl.c | 70 +- + tools/testing/selftests/mm/run_vmtests.sh | 8 +- + tools/testing/selftests/mm/soft-dirty.c | 9 +- + tools/testing/selftests/mm/split_huge_page_test.c | 4 +- + tools/testing/selftests/mm/thp_settings.c | 11 + + tools/testing/selftests/mm/thp_settings.h | 2 + + tools/testing/selftests/mm/thuge-gen.c | 44 +- + tools/testing/selftests/mm/uffd-unit-tests.c | 20 +- + tools/testing/selftests/mm/vm_util.c | 31 + + tools/testing/selftests/mm/vm_util.h | 12 + + tools/testing/selftests/proc/.gitignore | 1 + + tools/testing/selftests/proc/Makefile | 1 + + tools/testing/selftests/proc/proc-maps-race.c | 741 ++ + tools/testing/selftests/sched_ext/maximal.bpf.c | 5 + + tools/testing/vma/vma.c | 272 +- + tools/testing/vma/vma_internal.h | 23 +- + tools/verification/dot2/Makefile | 26 - + tools/verification/dot2/dot2k | 53 - + tools/verification/models/rtapp/pagefault.ltl | 1 + + tools/verification/models/rtapp/sleep.ltl | 22 + + tools/verification/models/sched/nrp.dot | 29 + + tools/verification/models/sched/opid.dot | 35 + + tools/verification/models/sched/sncid.dot | 18 - + tools/verification/models/sched/sssw.dot | 30 + + tools/verification/models/sched/sts.dot | 38 + + tools/verification/models/sched/tss.dot | 18 - + tools/verification/rv/src/in_kernel.c | 4 +- + tools/verification/rv/src/rv.c | 1 + + tools/verification/rvgen/.gitignore | 3 + + tools/verification/rvgen/Makefile | 27 + + tools/verification/rvgen/__main__.py | 67 + + tools/verification/{dot2 => rvgen}/dot2c | 2 +- + .../verification/{dot2 => rvgen/rvgen}/automata.py | 0 + tools/verification/rvgen/rvgen/container.py | 32 + + tools/verification/{dot2 => rvgen/rvgen}/dot2c.py | 24 +- + tools/verification/rvgen/rvgen/dot2k.py | 129 + + .../{dot2/dot2k.py => rvgen/rvgen/generator.py} | 265 +- + tools/verification/rvgen/rvgen/ltl2ba.py | 566 ++ + tools/verification/rvgen/rvgen/ltl2k.py | 271 + + .../rvgen/templates}/Kconfig | 0 + .../rvgen/rvgen/templates/container/Kconfig | 5 + + .../rvgen/templates/container/main.c} | 3 +- + .../rvgen/templates/container/main.h} | 0 + .../rvgen/templates/dot2k}/main.c | 3 +- + .../rvgen/templates/dot2k}/trace.h | 0 + .../rvgen/rvgen/templates/ltl2k/main.c | 102 + + .../rvgen/rvgen/templates/ltl2k/trace.h | 14 + + virt/kvm/dirty_ring.c | 107 +- + virt/kvm/eventfd.c | 159 +- + virt/kvm/guest_memfd.c | 11 - + virt/kvm/irqchip.c | 2 - + virt/kvm/kvm_main.c | 13 +- + virt/kvm/vfio.c | 3 - + virt/lib/irqbypass.c | 190 +- + 3684 files changed, 156613 insertions(+), 110975 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-qaic + create mode 100644 Documentation/admin-guide/mm/damon/stat.rst + create mode 100644 Documentation/core-api/list.rst + delete mode 100644 Documentation/devicetree/bindings/clock/alphascale,acc.txt + create mode 100644 Documentation/devicetree/bindings/clock/alphascale,asm9260-clock-controller.yaml + create mode 100644 Documentation/devicetree/bindings/clock/apm,xgene-device-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/apm,xgene-socpll-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/armada3700-periph-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/armada3700-tbg-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/artpec6.txt + create mode 100644 Documentation/devicetree/bindings/clock/axis,artpec6-clkctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.txt + create mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm2835-cprman.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm53573-ilp.txt + create mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm53573-ilp.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm63xx-clocks.txt + create mode 100644 Documentation/devicetree/bindings/clock/brcm,bcm63xx-clocks.yaml + create mode 100644 Documentation/devicetree/bindings/clock/cirrus,ep7209-clk.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/clps711x-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/dove-divider-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/img,pistachio-clk.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/lpc1850-ccu.txt + delete mode 100644 Documentation/devicetree/bindings/clock/lpc1850-cgu.txt + delete mode 100644 Documentation/devicetree/bindings/clock/lpc1850-creg-clk.txt + delete mode 100644 Documentation/devicetree/bindings/clock/lsi,axm5516-clks.txt + create mode 100644 Documentation/devicetree/bindings/clock/lsi,axm5516-clks.yaml + create mode 100644 Documentation/devicetree/bindings/clock/lsi,nspire-cx-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/marvell,armada-370-corediv-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/marvell,armada-3700-periph-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/marvell,armada-3700-tbg-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/marvell,armada-xp-cpu-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/marvell,berlin.txt + create mode 100644 Documentation/devicetree/bindings/clock/marvell,berlin2-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/marvell,dove-divider-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/marvell,mvebu-core-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/marvell-armada-370-gating-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/maxim,max9485.txt + create mode 100644 Documentation/devicetree/bindings/clock/maxim,max9485.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/microchip,pic32.txt + create mode 100644 Documentation/devicetree/bindings/clock/microchip,pic32mzda-clk.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/moxa,moxart-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/moxa,moxart-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/mvebu-core-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/mvebu-corediv-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/mvebu-cpu-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/mvebu-gated-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/nspire-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/nuvoton,npcm750-clk.txt + create mode 100644 Documentation/devicetree/bindings/clock/nuvoton,npcm750-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/nxp,lpc1850-ccu.yaml + create mode 100644 Documentation/devicetree/bindings/clock/nxp,lpc1850-cgu.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/pistachio-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/qca,ath79-pll.txt + create mode 100644 Documentation/devicetree/bindings/clock/qca,ath79-pll.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,krait-cc.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,krait-cc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,milos-camcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,milos-dispcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,milos-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,milos-videocc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,qcs615-dispcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,qcs615-gpucc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,qcs615-videocc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/ti/autoidle.txt + delete mode 100644 Documentation/devicetree/bindings/clock/ti/fixed-factor-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/ti,autoidle.yaml + create mode 100644 Documentation/devicetree/bindings/clock/ti/ti,fixed-factor-clock.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/xgene.txt + delete mode 100644 Documentation/devicetree/bindings/crypto/omap-aes.txt + delete mode 100644 Documentation/devicetree/bindings/crypto/omap-des.txt + create mode 100644 Documentation/devicetree/bindings/crypto/ti,omap2-aes.yaml + create mode 100644 Documentation/devicetree/bindings/crypto/ti,omap4-des.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-axi-performance-counter.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-blit-engine.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-blitblend.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-clut.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-command-sequencer.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-constframe.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-display-engine.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-dither.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-extdst.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-fetchunit.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-filter.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-framegen.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-gammacor.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-layerblend.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-matrix.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-pixel-engine.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-rop.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-safety.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-scaling-engine.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-signature.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-store.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc-tcon.yaml + create mode 100644 Documentation/devicetree/bindings/display/imx/fsl,imx8qxp-dc.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8750-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/himax,hx83112b.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/renesas,r61307.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/renesas,r69328.yaml + create mode 100644 Documentation/devicetree/bindings/display/sitronix,st7567.yaml + create mode 100644 Documentation/devicetree/bindings/display/ti/ti,am625-oldi.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/lpc1850-dmamux.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/arm,gic-v5-iwb.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/arm,gic-v5.yaml + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/fsl,imx8qxp-dc-intc.yaml + create mode 100644 Documentation/devicetree/bindings/media/fsl,imx6q-vdoa.yaml + create mode 100644 Documentation/devicetree/bindings/media/fsl,imx8qm-isi.yaml + create mode 100644 Documentation/devicetree/bindings/media/fsl,imx8qxp-isi.yaml + delete mode 100644 Documentation/devicetree/bindings/media/fsl-vdoa.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/fsl,imx8qxp-csr.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/mxs-lradc.txt + create mode 100644 Documentation/devicetree/bindings/mfd/mxs-lradc.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/nxp,lpc1850-creg.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ti,tps65910.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/tps65910.txt + create mode 100644 Documentation/devicetree/bindings/mtd/nxp,lpc1773-spifi.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/nxp-spifi.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-lpc18xx-usb-otg.txt + create mode 100644 Documentation/filesystems/ext4/inode_table.rst + create mode 100644 Documentation/gpu/nova/core/devinit.rst + create mode 100644 Documentation/gpu/nova/core/falcon.rst + create mode 100644 Documentation/gpu/nova/core/fwsec.rst + create mode 100644 Documentation/gpu/nova/core/vbios.rst + create mode 100644 Documentation/sphinx/min_requirements.txt + delete mode 100644 Documentation/trace/rv/da_monitor_synthesis.rst + create mode 100644 Documentation/trace/rv/linear_temporal_logic.rst + create mode 100644 Documentation/trace/rv/monitor_rtapp.rst + create mode 100644 Documentation/trace/rv/monitor_synthesis.rst + create mode 100644 Documentation/translations/zh_CN/networking/alias.rst + create mode 100644 Documentation/translations/zh_CN/networking/napi.rst + create mode 100644 Documentation/translations/zh_CN/networking/netif-msg.rst + create mode 100644 Documentation/translations/zh_CN/networking/netmem.rst + create mode 100644 Documentation/translations/zh_CN/networking/vxlan.rst + create mode 100644 Documentation/translations/zh_CN/networking/xfrm_proc.rst + create mode 100644 Documentation/translations/zh_CN/staging/speculation.rst + create mode 100644 Documentation/userspace-api/media/v4l/metafmt-uvc-msxu-1-5.rst + create mode 100644 Documentation/userspace-api/media/v4l/pixfmt-rawnn-cru.rst + create mode 100644 arch/arm64/kvm/vgic/vgic-v5.c + delete mode 100644 arch/mips/include/asm/mach-rm/mc146818rtc.h + create mode 100644 arch/riscv/include/asm/kvm_gstage.h + create mode 100644 arch/riscv/include/asm/kvm_mmu.h + create mode 100644 arch/riscv/include/asm/kvm_tlb.h + create mode 100644 arch/riscv/include/asm/kvm_vmid.h + create mode 100644 arch/riscv/kvm/gstage.c + create mode 100644 arch/s390/crypto/phmac_s390.c + delete mode 100644 arch/x86/kvm/irq_comm.c + create mode 100644 drivers/accel/qaic/qaic_ras.c + create mode 100644 drivers/accel/qaic/qaic_ras.h + create mode 100644 drivers/clk/kunit_clk_hw_get_dev_of_node.dtso + delete mode 100644 drivers/clk/meson/a1-peripherals.h + delete mode 100644 drivers/clk/meson/a1-pll.h + delete mode 100644 drivers/clk/meson/axg-audio.h + delete mode 100644 drivers/clk/meson/axg.h + delete mode 100644 drivers/clk/meson/g12a.h + delete mode 100644 drivers/clk/meson/gxbb.h + delete mode 100644 drivers/clk/meson/meson8b.h + delete mode 100644 drivers/clk/meson/s4-peripherals.h + delete mode 100644 drivers/clk/meson/s4-pll.h + create mode 100644 drivers/clk/qcom/camcc-milos.c + create mode 100644 drivers/clk/qcom/camcc-qcs615.c + create mode 100644 drivers/clk/qcom/camcc-sc8180x.c + create mode 100644 drivers/clk/qcom/dispcc-milos.c + create mode 100644 drivers/clk/qcom/dispcc-qcs615.c + create mode 100644 drivers/clk/qcom/gcc-milos.c + create mode 100644 drivers/clk/qcom/gpucc-milos.c + create mode 100644 drivers/clk/qcom/gpucc-qcs615.c + create mode 100644 drivers/clk/qcom/videocc-milos.c + create mode 100644 drivers/clk/qcom/videocc-qcs615.c + create mode 100644 drivers/clk/qcom/videocc-sm6350.c + create mode 100644 drivers/clk/renesas/r9a09g077-cpg.c + create mode 100644 drivers/cpufreq/powernv-trace.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_bank_state.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_bank_state.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen6_pm_dbgfs.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen6_tl.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen6_tl.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_pm_dbgfs_utils.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_pm_dbgfs_utils.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ip.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30m_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30m_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30m_clk_mgr_smu_msg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn30/dcn30m_clk_mgr_smu_msg.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn401/dcn401_fpu.h + create mode 100644 drivers/gpu/drm/ast/ast_2000.c + create mode 100644 drivers/gpu/drm/ast/ast_2100.c + create mode 100644 drivers/gpu/drm/ast/ast_2300.c + create mode 100644 drivers/gpu/drm/ast/ast_2500.c + create mode 100644 drivers/gpu/drm/ast/ast_2600.c + delete mode 100644 drivers/gpu/drm/ast/ast_dram_tables.h + create mode 100644 drivers/gpu/drm/ast/ast_post.h + create mode 100644 drivers/gpu/drm/ci/check-devicetrees.yml + create mode 100755 drivers/gpu/drm/ci/dt-binding-check.sh + create mode 100755 drivers/gpu/drm/ci/dtbs-check.sh + create mode 100755 drivers/gpu/drm/ci/kunit.sh + create mode 100644 drivers/gpu/drm/ci/kunit.yml + create mode 100755 drivers/gpu/drm/ci/setup-llvm-links.sh + delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sdm845-fails.txt + delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sdm845-flakes.txt + delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sdm845-skips.txt + create mode 100644 drivers/gpu/drm/display/drm_hdmi_cec_helper.c + create mode 100644 drivers/gpu/drm/display/drm_hdmi_cec_notifier_helper.c + create mode 100644 drivers/gpu/drm/drm_pagemap.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_flipq.c + create mode 100644 drivers/gpu/drm/i915/display/intel_flipq.h + rename drivers/gpu/drm/i915/display/{intel_atomic_plane.c => intel_plane.c} (89%) + rename drivers/gpu/drm/i915/display/{intel_atomic_plane.h => intel_plane.h} (86%) + create mode 100644 drivers/gpu/drm/i915/display/intel_sbi.c + create mode 100644 drivers/gpu/drm/i915/display/intel_sbi.h + create mode 100644 drivers/gpu/drm/i915/display/intel_sbi_regs.h + create mode 100644 drivers/gpu/drm/i915/display/vlv_sideband.c + create mode 100644 drivers/gpu/drm/i915/display/vlv_sideband.h + delete mode 100644 drivers/gpu/drm/i915/intel_sbi.c + delete mode 100644 drivers/gpu/drm/i915/intel_sbi.h + rename drivers/gpu/drm/i915/{vlv_sideband.c => vlv_iosf_sb.c} (54%) + create mode 100644 drivers/gpu/drm/i915/vlv_iosf_sb.h + rename drivers/gpu/drm/i915/{vlv_sideband_reg.h => vlv_iosf_sb_reg.h} (98%) + delete mode 100644 drivers/gpu/drm/i915/vlv_sideband.h + create mode 100644 drivers/gpu/drm/imx/dc/Kconfig + create mode 100644 drivers/gpu/drm/imx/dc/Makefile + create mode 100644 drivers/gpu/drm/imx/dc/dc-cf.c + create mode 100644 drivers/gpu/drm/imx/dc/dc-crtc.c + create mode 100644 drivers/gpu/drm/imx/dc/dc-de.c + create mode 100644 drivers/gpu/drm/imx/dc/dc-de.h + create mode 100644 drivers/gpu/drm/imx/dc/dc-drv.c + create mode 100644 drivers/gpu/drm/imx/dc/dc-drv.h + create mode 100644 drivers/gpu/drm/imx/dc/dc-ed.c + create mode 100644 drivers/gpu/drm/imx/dc/dc-fg.c + create mode 100644 drivers/gpu/drm/imx/dc/dc-fl.c + create mode 100644 drivers/gpu/drm/imx/dc/dc-fu.c + create mode 100644 drivers/gpu/drm/imx/dc/dc-fu.h + create mode 100644 drivers/gpu/drm/imx/dc/dc-fw.c + create mode 100644 drivers/gpu/drm/imx/dc/dc-ic.c + create mode 100644 drivers/gpu/drm/imx/dc/dc-kms.c + create mode 100644 drivers/gpu/drm/imx/dc/dc-kms.h + create mode 100644 drivers/gpu/drm/imx/dc/dc-lb.c + create mode 100644 drivers/gpu/drm/imx/dc/dc-pe.c + create mode 100644 drivers/gpu/drm/imx/dc/dc-pe.h + create mode 100644 drivers/gpu/drm/imx/dc/dc-plane.c + create mode 100644 drivers/gpu/drm/imx/dc/dc-tc.c + create mode 100644 drivers/gpu/drm/msm/disp/dpu1/catalog/dpu_12_0_sm8750.h + delete mode 100644 drivers/gpu/drm/msm/dp/dp_catalog.c + delete mode 100644 drivers/gpu/drm/msm/dp/dp_catalog.h + delete mode 100644 drivers/gpu/drm/msm/msm_mdss.h + create mode 100644 drivers/gpu/drm/msm/msm_syncobj.c + create mode 100644 drivers/gpu/drm/msm/msm_syncobj.h + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a6xx_descriptors.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a6xx_enums.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a6xx_perfcntrs.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a7xx_enums.xml + create mode 100644 drivers/gpu/drm/msm/registers/adreno/a7xx_perfcntrs.xml + create mode 100644 drivers/gpu/drm/panel/panel-himax-hx83112b.c + create mode 100644 drivers/gpu/drm/panel/panel-renesas-r61307.c + create mode 100644 drivers/gpu/drm/panel/panel-renesas-r69328.c + delete mode 100644 drivers/gpu/drm/rockchip/inno_hdmi.h + create mode 100644 drivers/gpu/drm/tests/drm_sysfb_modeset_test.c + create mode 100644 drivers/gpu/drm/tidss/tidss_oldi.c + create mode 100644 drivers/gpu/drm/tidss/tidss_oldi.h + create mode 100644 drivers/gpu/drm/ttm/ttm_bo_internal.h + create mode 100644 drivers/gpu/drm/vkms/tests/vkms_format_test.c + create mode 100644 drivers/gpu/drm/xe/compat-i915-headers/vlv_iosf_sb.h + rename drivers/gpu/drm/xe/compat-i915-headers/{vlv_sideband_reg.h => vlv_iosf_sb_reg.h} (66%) + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/vlv_sideband.h + create mode 100644 drivers/gpu/drm/xe/regs/xe_i2c_regs.h + delete mode 100644 drivers/gpu/drm/xe/tests/xe_gt_sriov_pf_service_test.c + create mode 100644 drivers/gpu/drm/xe/tests/xe_sriov_pf_service_kunit.c + create mode 100644 drivers/gpu/drm/xe/xe_device_wa_oob.rules + create mode 100644 drivers/gpu/drm/xe/xe_i2c.c + create mode 100644 drivers/gpu/drm/xe/xe_i2c.h + create mode 100644 drivers/gpu/drm/xe/xe_nvm.c + create mode 100644 drivers/gpu/drm/xe/xe_nvm.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_service.c + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_service.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_service_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_pf_types.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_vf_types.h + create mode 100644 drivers/gpu/drm/xe/xe_tile_sriov_vf.c + create mode 100644 drivers/gpu/drm/xe/xe_tile_sriov_vf.h + create mode 100644 drivers/gpu/nova-core/dma.rs + create mode 100644 drivers/gpu/nova-core/falcon.rs + create mode 100644 drivers/gpu/nova-core/falcon/gsp.rs + create mode 100644 drivers/gpu/nova-core/falcon/hal.rs + create mode 100644 drivers/gpu/nova-core/falcon/hal/ga102.rs + create mode 100644 drivers/gpu/nova-core/falcon/sec2.rs + create mode 100644 drivers/gpu/nova-core/fb.rs + create mode 100644 drivers/gpu/nova-core/fb/hal.rs + create mode 100644 drivers/gpu/nova-core/fb/hal/ga100.rs + create mode 100644 drivers/gpu/nova-core/fb/hal/ga102.rs + create mode 100644 drivers/gpu/nova-core/fb/hal/tu102.rs + create mode 100644 drivers/gpu/nova-core/firmware/fwsec.rs + create mode 100644 drivers/gpu/nova-core/gfw.rs + create mode 100644 drivers/gpu/nova-core/vbios.rs + create mode 100644 drivers/infiniband/core/uverbs_std_types_dmah.c + create mode 100644 drivers/infiniband/hw/mlx5/dmah.c + create mode 100644 drivers/infiniband/hw/mlx5/dmah.h + delete mode 100644 drivers/infiniband/hw/qib/Kconfig + delete mode 100644 drivers/infiniband/hw/qib/Makefile + delete mode 100644 drivers/infiniband/hw/qib/qib.h + delete mode 100644 drivers/infiniband/hw/qib/qib_6120_regs.h + delete mode 100644 drivers/infiniband/hw/qib/qib_7220.h + delete mode 100644 drivers/infiniband/hw/qib/qib_7220_regs.h + delete mode 100644 drivers/infiniband/hw/qib/qib_7322_regs.h + delete mode 100644 drivers/infiniband/hw/qib/qib_common.h + delete mode 100644 drivers/infiniband/hw/qib/qib_debugfs.c + delete mode 100644 drivers/infiniband/hw/qib/qib_debugfs.h + delete mode 100644 drivers/infiniband/hw/qib/qib_diag.c + delete mode 100644 drivers/infiniband/hw/qib/qib_driver.c + delete mode 100644 drivers/infiniband/hw/qib/qib_eeprom.c + delete mode 100644 drivers/infiniband/hw/qib/qib_file_ops.c + delete mode 100644 drivers/infiniband/hw/qib/qib_fs.c + delete mode 100644 drivers/infiniband/hw/qib/qib_iba6120.c + delete mode 100644 drivers/infiniband/hw/qib/qib_iba7220.c + delete mode 100644 drivers/infiniband/hw/qib/qib_iba7322.c + delete mode 100644 drivers/infiniband/hw/qib/qib_init.c + delete mode 100644 drivers/infiniband/hw/qib/qib_intr.c + delete mode 100644 drivers/infiniband/hw/qib/qib_mad.c + delete mode 100644 drivers/infiniband/hw/qib/qib_mad.h + delete mode 100644 drivers/infiniband/hw/qib/qib_pcie.c + delete mode 100644 drivers/infiniband/hw/qib/qib_pio_copy.c + delete mode 100644 drivers/infiniband/hw/qib/qib_qp.c + delete mode 100644 drivers/infiniband/hw/qib/qib_qsfp.c + delete mode 100644 drivers/infiniband/hw/qib/qib_qsfp.h + delete mode 100644 drivers/infiniband/hw/qib/qib_rc.c + delete mode 100644 drivers/infiniband/hw/qib/qib_ruc.c + delete mode 100644 drivers/infiniband/hw/qib/qib_sd7220.c + delete mode 100644 drivers/infiniband/hw/qib/qib_sdma.c + delete mode 100644 drivers/infiniband/hw/qib/qib_sysfs.c + delete mode 100644 drivers/infiniband/hw/qib/qib_twsi.c + delete mode 100644 drivers/infiniband/hw/qib/qib_tx.c + delete mode 100644 drivers/infiniband/hw/qib/qib_uc.c + delete mode 100644 drivers/infiniband/hw/qib/qib_ud.c + delete mode 100644 drivers/infiniband/hw/qib/qib_user_pages.c + delete mode 100644 drivers/infiniband/hw/qib/qib_user_sdma.c + delete mode 100644 drivers/infiniband/hw/qib/qib_user_sdma.h + delete mode 100644 drivers/infiniband/hw/qib/qib_verbs.c + delete mode 100644 drivers/infiniband/hw/qib/qib_verbs.h + delete mode 100644 drivers/infiniband/hw/qib/qib_wc_ppc64.c + delete mode 100644 drivers/infiniband/hw/qib/qib_wc_x86_64.c + rename drivers/irqchip/{irq-gic-v3-its-msi-parent.c => irq-gic-its-msi-parent.c} (59%) + create mode 100644 drivers/irqchip/irq-gic-its-msi-parent.h + create mode 100644 drivers/irqchip/irq-gic-v5-irs.c + create mode 100644 drivers/irqchip/irq-gic-v5-its.c + create mode 100644 drivers/irqchip/irq-gic-v5-iwb.c + create mode 100644 drivers/irqchip/irq-gic-v5.c + create mode 100644 drivers/media/platform/renesas/vsp1/vsp1_vspx.c + create mode 100644 drivers/media/platform/renesas/vsp1/vsp1_vspx.h + rename drivers/{staging/media => media/platform/rockchip}/rkvdec/Kconfig (100%) + rename drivers/{staging/media => media/platform/rockchip}/rkvdec/Makefile (100%) + rename drivers/{staging/media => media/platform/rockchip}/rkvdec/rkvdec-h264.c (100%) + rename drivers/{staging/media => media/platform/rockchip}/rkvdec/rkvdec-regs.h (100%) + rename drivers/{staging/media => media/platform/rockchip}/rkvdec/rkvdec-vp9.c (100%) + rename drivers/{staging/media => media/platform/rockchip}/rkvdec/rkvdec.c (96%) + rename drivers/{staging/media => media/platform/rockchip}/rkvdec/rkvdec.h (98%) + create mode 100644 drivers/mtd/devices/mtd_intel_dg.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/st.c + create mode 100644 drivers/reset/reset-spacemit.c + create mode 100644 drivers/soc/qcom/ubwc_config.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_drvfs.c + delete mode 100644 drivers/staging/media/atomisp/pci/atomisp_drvfs.h + delete mode 100644 drivers/staging/media/atomisp/pci/isp/modes/interface/isp_const.h + create mode 100644 drivers/staging/media/ipu7/Kconfig + create mode 100644 drivers/staging/media/ipu7/Makefile + create mode 100644 drivers/staging/media/ipu7/TODO + create mode 100644 drivers/staging/media/ipu7/abi/ipu7_fw_boot_abi.h + create mode 100644 drivers/staging/media/ipu7/abi/ipu7_fw_common_abi.h + create mode 100644 drivers/staging/media/ipu7/abi/ipu7_fw_config_abi.h + create mode 100644 drivers/staging/media/ipu7/abi/ipu7_fw_insys_config_abi.h + create mode 100644 drivers/staging/media/ipu7/abi/ipu7_fw_isys_abi.h + create mode 100644 drivers/staging/media/ipu7/abi/ipu7_fw_msg_abi.h + create mode 100644 drivers/staging/media/ipu7/abi/ipu7_fw_psys_config_abi.h + create mode 100644 drivers/staging/media/ipu7/abi/ipu7_fw_syscom_abi.h + create mode 100644 drivers/staging/media/ipu7/ipu7-boot.c + create mode 100644 drivers/staging/media/ipu7/ipu7-boot.h + create mode 100644 drivers/staging/media/ipu7/ipu7-bus.c + create mode 100644 drivers/staging/media/ipu7/ipu7-bus.h + create mode 100644 drivers/staging/media/ipu7/ipu7-buttress-regs.h + create mode 100644 drivers/staging/media/ipu7/ipu7-buttress.c + create mode 100644 drivers/staging/media/ipu7/ipu7-buttress.h + create mode 100644 drivers/staging/media/ipu7/ipu7-cpd.c + create mode 100644 drivers/staging/media/ipu7/ipu7-cpd.h + create mode 100644 drivers/staging/media/ipu7/ipu7-dma.c + create mode 100644 drivers/staging/media/ipu7/ipu7-dma.h + create mode 100644 drivers/staging/media/ipu7/ipu7-fw-isys.c + create mode 100644 drivers/staging/media/ipu7/ipu7-fw-isys.h + create mode 100644 drivers/staging/media/ipu7/ipu7-isys-csi-phy.c + create mode 100644 drivers/staging/media/ipu7/ipu7-isys-csi-phy.h + create mode 100644 drivers/staging/media/ipu7/ipu7-isys-csi2-regs.h + create mode 100644 drivers/staging/media/ipu7/ipu7-isys-csi2.c + create mode 100644 drivers/staging/media/ipu7/ipu7-isys-csi2.h + create mode 100644 drivers/staging/media/ipu7/ipu7-isys-queue.c + create mode 100644 drivers/staging/media/ipu7/ipu7-isys-queue.h + create mode 100644 drivers/staging/media/ipu7/ipu7-isys-subdev.c + create mode 100644 drivers/staging/media/ipu7/ipu7-isys-subdev.h + create mode 100644 drivers/staging/media/ipu7/ipu7-isys-video.c + create mode 100644 drivers/staging/media/ipu7/ipu7-isys-video.h + create mode 100644 drivers/staging/media/ipu7/ipu7-isys.c + create mode 100644 drivers/staging/media/ipu7/ipu7-isys.h + create mode 100644 drivers/staging/media/ipu7/ipu7-mmu.c + create mode 100644 drivers/staging/media/ipu7/ipu7-mmu.h + create mode 100644 drivers/staging/media/ipu7/ipu7-platform-regs.h + create mode 100644 drivers/staging/media/ipu7/ipu7-syscom.c + create mode 100644 drivers/staging/media/ipu7/ipu7-syscom.h + create mode 100644 drivers/staging/media/ipu7/ipu7.c + create mode 100644 drivers/staging/media/ipu7/ipu7.h + delete mode 100644 drivers/staging/media/rkvdec/TODO + create mode 100644 include/drm/amd/isp.h + create mode 100644 include/drm/display/drm_hdmi_cec_helper.h + create mode 100644 include/dt-bindings/clock/nxp,imx94-clock.h + create mode 100644 include/dt-bindings/clock/qcom,ipq5018-cmn-pll.h + create mode 100644 include/dt-bindings/clock/qcom,ipq5424-cmn-pll.h + create mode 100644 include/dt-bindings/clock/qcom,milos-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,milos-dispcc.h + create mode 100644 include/dt-bindings/clock/qcom,milos-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,milos-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,milos-videocc.h + create mode 100644 include/dt-bindings/clock/qcom,qcs615-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,qcs615-dispcc.h + create mode 100644 include/dt-bindings/clock/qcom,qcs615-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,qcs615-videocc.h + create mode 100644 include/dt-bindings/clock/renesas,r9a09g077-cpg-mssr.h + create mode 100644 include/dt-bindings/clock/renesas,r9a09g087-cpg-mssr.h + create mode 100644 include/linux/adi-axi-common.h + delete mode 100644 include/linux/fpga/adi-axi-common.h + create mode 100644 include/linux/intel_dg_nvm_aux.h + create mode 100644 include/linux/irqchip/arm-gic-v5.h + delete mode 100644 include/linux/mfd/pcf50633/core.h + delete mode 100644 include/linux/pfn_t.h + create mode 100644 include/linux/soc/qcom/ubwc.h + create mode 100644 include/rv/ltl_monitor.h + create mode 100644 include/soc/spacemit/k1-syscon.h + rename kernel/trace/rv/monitors/{tss => nrp}/Kconfig (51%) + create mode 100644 kernel/trace/rv/monitors/nrp/nrp.c + create mode 100644 kernel/trace/rv/monitors/nrp/nrp.h + create mode 100644 kernel/trace/rv/monitors/nrp/nrp_trace.h + create mode 100644 kernel/trace/rv/monitors/opid/Kconfig + create mode 100644 kernel/trace/rv/monitors/opid/opid.c + create mode 100644 kernel/trace/rv/monitors/opid/opid.h + rename kernel/trace/rv/monitors/{sncid/sncid_trace.h => opid/opid_trace.h} (66%) + create mode 100644 kernel/trace/rv/monitors/pagefault/Kconfig + create mode 100644 kernel/trace/rv/monitors/pagefault/pagefault.c + create mode 100644 kernel/trace/rv/monitors/pagefault/pagefault.h + create mode 100644 kernel/trace/rv/monitors/pagefault/pagefault_trace.h + create mode 100644 kernel/trace/rv/monitors/rtapp/Kconfig + create mode 100644 kernel/trace/rv/monitors/rtapp/rtapp.c + create mode 100644 kernel/trace/rv/monitors/rtapp/rtapp.h + create mode 100644 kernel/trace/rv/monitors/sleep/Kconfig + create mode 100644 kernel/trace/rv/monitors/sleep/sleep.c + create mode 100644 kernel/trace/rv/monitors/sleep/sleep.h + create mode 100644 kernel/trace/rv/monitors/sleep/sleep_trace.h + delete mode 100644 kernel/trace/rv/monitors/sncid/sncid.c + delete mode 100644 kernel/trace/rv/monitors/sncid/sncid.h + rename kernel/trace/rv/monitors/{sncid => sssw}/Kconfig (58%) + create mode 100644 kernel/trace/rv/monitors/sssw/sssw.c + create mode 100644 kernel/trace/rv/monitors/sssw/sssw.h + create mode 100644 kernel/trace/rv/monitors/sssw/sssw_trace.h + create mode 100644 kernel/trace/rv/monitors/sts/Kconfig + create mode 100644 kernel/trace/rv/monitors/sts/sts.c + create mode 100644 kernel/trace/rv/monitors/sts/sts.h + rename kernel/trace/rv/monitors/{tss/tss_trace.h => sts/sts_trace.h} (67%) + delete mode 100644 kernel/trace/rv/monitors/tss/tss.c + delete mode 100644 kernel/trace/rv/monitors/tss/tss.h + create mode 100644 mm/damon/stat.c + create mode 100644 scripts/lib/kdoc/kdoc_item.py + create mode 100755 scripts/test_doc_build.py + create mode 100644 tools/mm/show_page_info.py + delete mode 100644 tools/perf/arch/riscv/util/riscv_exception_types.h + create mode 100644 tools/perf/arch/riscv/util/riscv_trap_types.h + create mode 100644 tools/testing/selftests/damon/_common.sh + create mode 100755 tools/testing/selftests/damon/drgn_dump_damon_status.py + create mode 100755 tools/testing/selftests/damon/sysfs.py + create mode 100755 tools/testing/selftests/damon/sysfs_memcg_path_leak.sh + create mode 100644 tools/testing/selftests/kvm/arm64/external_aborts.c + delete mode 100644 tools/testing/selftests/kvm/arm64/mmio_abort.c + create mode 100644 tools/testing/selftests/kvm/irqfd_test.c + create mode 100644 tools/testing/selftests/kvm/x86/aperfmperf_test.c + create mode 100644 tools/testing/selftests/proc/proc-maps-race.c + delete mode 100644 tools/verification/dot2/Makefile + delete mode 100644 tools/verification/dot2/dot2k + create mode 100644 tools/verification/models/rtapp/pagefault.ltl + create mode 100644 tools/verification/models/rtapp/sleep.ltl + create mode 100644 tools/verification/models/sched/nrp.dot + create mode 100644 tools/verification/models/sched/opid.dot + delete mode 100644 tools/verification/models/sched/sncid.dot + create mode 100644 tools/verification/models/sched/sssw.dot + create mode 100644 tools/verification/models/sched/sts.dot + delete mode 100644 tools/verification/models/sched/tss.dot + create mode 100644 tools/verification/rvgen/.gitignore + create mode 100644 tools/verification/rvgen/Makefile + create mode 100644 tools/verification/rvgen/__main__.py + rename tools/verification/{dot2 => rvgen}/dot2c (97%) + rename tools/verification/{dot2 => rvgen/rvgen}/automata.py (100%) + create mode 100644 tools/verification/rvgen/rvgen/container.py + rename tools/verification/{dot2 => rvgen/rvgen}/dot2c.py (92%) + create mode 100644 tools/verification/rvgen/rvgen/dot2k.py + rename tools/verification/{dot2/dot2k.py => rvgen/rvgen/generator.py} (51%) + create mode 100644 tools/verification/rvgen/rvgen/ltl2ba.py + create mode 100644 tools/verification/rvgen/rvgen/ltl2k.py + rename tools/verification/{dot2/dot2k_templates => rvgen/rvgen/templates}/Kconfig (100%) + create mode 100644 tools/verification/rvgen/rvgen/templates/container/Kconfig + rename tools/verification/{dot2/dot2k_templates/main_container.c => rvgen/rvgen/templates/container/main.c} (92%) + rename tools/verification/{dot2/dot2k_templates/main_container.h => rvgen/rvgen/templates/container/main.h} (100%) + rename tools/verification/{dot2/dot2k_templates => rvgen/rvgen/templates/dot2k}/main.c (96%) + rename tools/verification/{dot2/dot2k_templates => rvgen/rvgen/templates/dot2k}/trace.h (100%) + create mode 100644 tools/verification/rvgen/rvgen/templates/ltl2k/main.c + create mode 100644 tools/verification/rvgen/rvgen/templates/ltl2k/trace.h +Merging fixes/fixes (89be9a83ccf1 Linux 6.16-rc7) +$ 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 ext4-fixes/fixes (d0b3b7b22dfa Linux 6.16-rc4) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes +Already up to date. +Merging vfs-brauner-fixes/vfs.fixes (8b3c655fa240 afs: Set vllist to NULL if addr parsing fails) +$ git merge -m Merge branch 'vfs.fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Already up to date. +Merging fscrypt-current/for-current (0af2f6be1b42 Linux 6.15-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 (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging btrfs-fixes/next-fixes (296391a79b55 Merge branch 'misc-6.16' 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/qgroup.c +CONFLICT (content): Merge conflict in fs/btrfs/qgroup.c +Auto-merging fs/btrfs/transaction.c +Resolved 'fs/btrfs/qgroup.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-current 3d2f5af12925] Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git +$ git diff -M --stat --summary HEAD^.. + +Merging vfs-fixes/fixes (33927f3d0ecd habanalabs: fix UAF in export_dmabuf()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Merge made by the 'ort' strategy. + drivers/accel/habanalabs/common/memory.c | 23 +++++++---------------- + 1 file changed, 7 insertions(+), 16 deletions(-) +Merging erofs-fixes/fixes (347e9f5043c8 Linux 6.16-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (94d10a4dba0b sunrpc: handle SVC_GARBAGE during svc auth processing as auth error) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (2014c95afece Linux 6.14-rc1) +$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging overlayfs-fixes/ovl-fixes (924577e4f6ca ovl: Fix nested backing file paths) +$ git merge -m Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging bcachefs/for-next (24c5e7ab4066 bcachefs: Convert bch2_bkey_get_mut() to CLASS(btree_iter)) +$ git merge -m Merge branch 'for-next' of git://evilpiepirate.org/bcachefs.git bcachefs/for-next +Auto-merging fs/bcachefs/fs-io-buffered.c +Auto-merging fs/bcachefs/fs.c +Merge made by the 'ort' strategy. + fs/bcachefs/acl.c | 29 +- + fs/bcachefs/alloc_background.c | 512 ++++++++++------------- + fs/bcachefs/alloc_background.h | 9 +- + fs/bcachefs/alloc_foreground.c | 258 +++++------- + fs/bcachefs/alloc_foreground.h | 9 +- + fs/bcachefs/async_objs.c | 29 +- + fs/bcachefs/async_objs.h | 7 +- + fs/bcachefs/async_objs_types.h | 2 +- + fs/bcachefs/backpointers.c | 145 +++---- + fs/bcachefs/bcachefs.h | 70 ++-- + fs/bcachefs/bkey.c | 4 +- + fs/bcachefs/bset.c | 74 ++-- + fs/bcachefs/btree_cache.c | 38 +- + fs/bcachefs/btree_cache.h | 11 + + fs/bcachefs/btree_gc.c | 131 +++--- + fs/bcachefs/btree_io.c | 121 +++--- + fs/bcachefs/btree_iter.c | 356 ++++++++-------- + fs/bcachefs/btree_iter.h | 344 +++++++++------- + fs/bcachefs/btree_journal_iter.c | 20 +- + fs/bcachefs/btree_key_cache.c | 68 ++- + fs/bcachefs/btree_locking.c | 17 +- + fs/bcachefs/btree_node_scan.c | 32 +- + fs/bcachefs/btree_trans_commit.c | 123 ++++-- + fs/bcachefs/btree_types.h | 25 +- + fs/bcachefs/btree_update.c | 286 +++++++------ + fs/bcachefs/btree_update.h | 133 +++--- + fs/bcachefs/btree_update_interior.c | 363 ++++++++-------- + fs/bcachefs/btree_update_interior.h | 12 +- + fs/bcachefs/btree_write_buffer.c | 68 ++- + fs/bcachefs/btree_write_buffer.h | 6 +- + fs/bcachefs/buckets.c | 258 +++++------- + fs/bcachefs/buckets_waiting_for_journal.c | 30 +- + fs/bcachefs/chardev.c | 120 ++---- + fs/bcachefs/checksum.c | 54 +-- + fs/bcachefs/clock.c | 17 +- + fs/bcachefs/compress.c | 29 +- + fs/bcachefs/compress.h | 36 +- + fs/bcachefs/data_update.c | 47 ++- + fs/bcachefs/debug.c | 88 ++-- + fs/bcachefs/dirent.c | 75 ++-- + fs/bcachefs/dirent.h | 4 +- + fs/bcachefs/disk_accounting.c | 267 ++++++------ + fs/bcachefs/disk_accounting.h | 9 +- + fs/bcachefs/disk_groups.c | 27 +- + fs/bcachefs/ec.c | 362 +++++++--------- + fs/bcachefs/ec.h | 2 +- + fs/bcachefs/enumerated_ref.c | 4 +- + fs/bcachefs/errcode.c | 3 +- + fs/bcachefs/errcode.h | 13 + + fs/bcachefs/error.c | 65 ++- + fs/bcachefs/extent_update.c | 13 +- + fs/bcachefs/extents.c | 38 +- + fs/bcachefs/extents.h | 3 + + fs/bcachefs/fast_list.c | 32 +- + fs/bcachefs/fast_list.h | 2 +- + fs/bcachefs/fs-io-buffered.c | 95 ++--- + fs/bcachefs/fs-io-direct.c | 26 +- + fs/bcachefs/fs-io-pagecache.c | 55 ++- + fs/bcachefs/fs-io.c | 141 +++---- + fs/bcachefs/fs-io.h | 19 +- + fs/bcachefs/fs-ioctl.c | 33 +- + fs/bcachefs/fs.c | 238 +++++------ + fs/bcachefs/fsck.c | 658 +++++++++++++++--------------- + fs/bcachefs/inode.c | 245 +++++------ + fs/bcachefs/io_misc.c | 71 ++-- + fs/bcachefs/io_read.c | 235 ++++++----- + fs/bcachefs/io_read.h | 24 +- + fs/bcachefs/io_write.c | 97 +++-- + fs/bcachefs/journal.c | 253 ++++++------ + fs/bcachefs/journal.h | 3 +- + fs/bcachefs/journal_io.c | 248 +++++------ + fs/bcachefs/journal_io.h | 7 + + fs/bcachefs/journal_reclaim.c | 220 +++++----- + fs/bcachefs/journal_seq_blacklist.c | 56 ++- + fs/bcachefs/journal_seq_blacklist.h | 3 + + fs/bcachefs/logged_ops.c | 16 +- + fs/bcachefs/lru.c | 48 +-- + fs/bcachefs/migrate.c | 31 +- + fs/bcachefs/move.c | 294 ++++++------- + fs/bcachefs/move.h | 14 +- + fs/bcachefs/movinggc.c | 22 +- + fs/bcachefs/namei.c | 159 ++++---- + fs/bcachefs/nocow_locking.c | 10 +- + fs/bcachefs/opts.c | 33 +- + fs/bcachefs/opts.h | 8 +- + fs/bcachefs/printbuf.h | 4 + + fs/bcachefs/progress.c | 6 +- + fs/bcachefs/progress.h | 3 + + fs/bcachefs/quota.c | 103 ++--- + fs/bcachefs/rebalance.c | 135 +++--- + fs/bcachefs/recovery.c | 225 +++++----- + fs/bcachefs/recovery_passes.c | 68 +-- + fs/bcachefs/recovery_passes.h | 9 +- + fs/bcachefs/reflink.c | 137 +++---- + fs/bcachefs/replicas.c | 161 +++----- + fs/bcachefs/sb-clean.c | 36 +- + fs/bcachefs/sb-counters_format.h | 6 + + fs/bcachefs/sb-downgrade.c | 19 +- + fs/bcachefs/sb-errors.c | 45 +- + fs/bcachefs/sb-errors_format.h | 9 +- + fs/bcachefs/sb-members.c | 50 ++- + fs/bcachefs/sb-members.h | 19 +- + fs/bcachefs/sb-members_format.h | 2 +- + fs/bcachefs/six.c | 21 +- + fs/bcachefs/snapshot.c | 435 ++++++++------------ + fs/bcachefs/snapshot.h | 32 +- + fs/bcachefs/snapshot_types.h | 2 +- + fs/bcachefs/str_hash.c | 57 ++- + fs/bcachefs/str_hash.h | 47 ++- + fs/bcachefs/subvolume.c | 246 +++++------ + fs/bcachefs/subvolume.h | 20 +- + fs/bcachefs/super-io.c | 83 ++-- + fs/bcachefs/super.c | 582 ++++++++++++-------------- + fs/bcachefs/sysfs.c | 28 +- + fs/bcachefs/tests.c | 340 +++++++-------- + fs/bcachefs/thread_with_file.c | 48 +-- + fs/bcachefs/time_stats.c | 7 +- + fs/bcachefs/trace.h | 152 ++----- + fs/bcachefs/util.c | 28 +- + fs/bcachefs/util.h | 10 +- + fs/bcachefs/xattr.c | 58 ++- + lib/closure.c | 12 +- + 122 files changed, 5325 insertions(+), 6182 deletions(-) +Merging fscrypt/for-next (fa65058063cb ceph: Remove gfp_t argument from ceph_fscrypt_encrypt_*()) +$ 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 btrfs/for-next (841778d9fd80 Merge branch 'for-next-next-v6.16-20250721' into for-next-20250721) +$ 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/Kconfig +Auto-merging fs/btrfs/bio.c +Auto-merging fs/btrfs/btrfs_inode.h +CONFLICT (content): Merge conflict in fs/btrfs/btrfs_inode.h +Auto-merging fs/btrfs/compression.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/extent_io.c +CONFLICT (content): Merge conflict in fs/btrfs/extent_io.c +Auto-merging fs/btrfs/file-item.c +Auto-merging fs/btrfs/file.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/subpage.h +CONFLICT (content): Merge conflict in fs/btrfs/subpage.h +Auto-merging fs/btrfs/super.c +Auto-merging fs/btrfs/tree-log.c +CONFLICT (content): Merge conflict in fs/btrfs/tree-log.c +Auto-merging include/trace/events/btrfs.h +Recorded preimage for 'fs/btrfs/btrfs_inode.h' +Recorded preimage for 'fs/btrfs/extent_io.c' +Recorded preimage for 'fs/btrfs/subpage.h' +Recorded preimage for 'fs/btrfs/tree-log.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git merge --abort +$ git diff -M --stat --summary HEAD^.. + fs/bcachefs/acl.c | 29 +- + fs/bcachefs/alloc_background.c | 512 ++++++++++------------- + fs/bcachefs/alloc_background.h | 9 +- + fs/bcachefs/alloc_foreground.c | 258 +++++------- + fs/bcachefs/alloc_foreground.h | 9 +- + fs/bcachefs/async_objs.c | 29 +- + fs/bcachefs/async_objs.h | 7 +- + fs/bcachefs/async_objs_types.h | 2 +- + fs/bcachefs/backpointers.c | 145 +++---- + fs/bcachefs/bcachefs.h | 70 ++-- + fs/bcachefs/bkey.c | 4 +- + fs/bcachefs/bset.c | 74 ++-- + fs/bcachefs/btree_cache.c | 38 +- + fs/bcachefs/btree_cache.h | 11 + + fs/bcachefs/btree_gc.c | 131 +++--- + fs/bcachefs/btree_io.c | 121 +++--- + fs/bcachefs/btree_iter.c | 356 ++++++++-------- + fs/bcachefs/btree_iter.h | 344 +++++++++------- + fs/bcachefs/btree_journal_iter.c | 20 +- + fs/bcachefs/btree_key_cache.c | 68 ++- + fs/bcachefs/btree_locking.c | 17 +- + fs/bcachefs/btree_node_scan.c | 32 +- + fs/bcachefs/btree_trans_commit.c | 123 ++++-- + fs/bcachefs/btree_types.h | 25 +- + fs/bcachefs/btree_update.c | 286 +++++++------ + fs/bcachefs/btree_update.h | 133 +++--- + fs/bcachefs/btree_update_interior.c | 363 ++++++++-------- + fs/bcachefs/btree_update_interior.h | 12 +- + fs/bcachefs/btree_write_buffer.c | 68 ++- + fs/bcachefs/btree_write_buffer.h | 6 +- + fs/bcachefs/buckets.c | 258 +++++------- + fs/bcachefs/buckets_waiting_for_journal.c | 30 +- + fs/bcachefs/chardev.c | 120 ++---- + fs/bcachefs/checksum.c | 54 +-- + fs/bcachefs/clock.c | 17 +- + fs/bcachefs/compress.c | 29 +- + fs/bcachefs/compress.h | 36 +- + fs/bcachefs/data_update.c | 47 ++- + fs/bcachefs/debug.c | 88 ++-- + fs/bcachefs/dirent.c | 75 ++-- + fs/bcachefs/dirent.h | 4 +- + fs/bcachefs/disk_accounting.c | 267 ++++++------ + fs/bcachefs/disk_accounting.h | 9 +- + fs/bcachefs/disk_groups.c | 27 +- + fs/bcachefs/ec.c | 362 +++++++--------- + fs/bcachefs/ec.h | 2 +- + fs/bcachefs/enumerated_ref.c | 4 +- + fs/bcachefs/errcode.c | 3 +- + fs/bcachefs/errcode.h | 13 + + fs/bcachefs/error.c | 65 ++- + fs/bcachefs/extent_update.c | 13 +- + fs/bcachefs/extents.c | 38 +- + fs/bcachefs/extents.h | 3 + + fs/bcachefs/fast_list.c | 32 +- + fs/bcachefs/fast_list.h | 2 +- + fs/bcachefs/fs-io-buffered.c | 95 ++--- + fs/bcachefs/fs-io-direct.c | 26 +- + fs/bcachefs/fs-io-pagecache.c | 55 ++- + fs/bcachefs/fs-io.c | 141 +++---- + fs/bcachefs/fs-io.h | 19 +- + fs/bcachefs/fs-ioctl.c | 33 +- + fs/bcachefs/fs.c | 238 +++++------ + fs/bcachefs/fsck.c | 658 +++++++++++++++--------------- + fs/bcachefs/inode.c | 245 +++++------ + fs/bcachefs/io_misc.c | 71 ++-- + fs/bcachefs/io_read.c | 235 ++++++----- + fs/bcachefs/io_read.h | 24 +- + fs/bcachefs/io_write.c | 97 +++-- + fs/bcachefs/journal.c | 253 ++++++------ + fs/bcachefs/journal.h | 3 +- + fs/bcachefs/journal_io.c | 248 +++++------ + fs/bcachefs/journal_io.h | 7 + + fs/bcachefs/journal_reclaim.c | 220 +++++----- + fs/bcachefs/journal_seq_blacklist.c | 56 ++- + fs/bcachefs/journal_seq_blacklist.h | 3 + + fs/bcachefs/logged_ops.c | 16 +- + fs/bcachefs/lru.c | 48 +-- + fs/bcachefs/migrate.c | 31 +- + fs/bcachefs/move.c | 294 ++++++------- + fs/bcachefs/move.h | 14 +- + fs/bcachefs/movinggc.c | 22 +- + fs/bcachefs/namei.c | 159 ++++---- + fs/bcachefs/nocow_locking.c | 10 +- + fs/bcachefs/opts.c | 33 +- + fs/bcachefs/opts.h | 8 +- + fs/bcachefs/printbuf.h | 4 + + fs/bcachefs/progress.c | 6 +- + fs/bcachefs/progress.h | 3 + + fs/bcachefs/quota.c | 103 ++--- + fs/bcachefs/rebalance.c | 135 +++--- + fs/bcachefs/recovery.c | 225 +++++----- + fs/bcachefs/recovery_passes.c | 68 +-- + fs/bcachefs/recovery_passes.h | 9 +- + fs/bcachefs/reflink.c | 137 +++---- + fs/bcachefs/replicas.c | 161 +++----- + fs/bcachefs/sb-clean.c | 36 +- + fs/bcachefs/sb-counters_format.h | 6 + + fs/bcachefs/sb-downgrade.c | 19 +- + fs/bcachefs/sb-errors.c | 45 +- + fs/bcachefs/sb-errors_format.h | 9 +- + fs/bcachefs/sb-members.c | 50 ++- + fs/bcachefs/sb-members.h | 19 +- + fs/bcachefs/sb-members_format.h | 2 +- + fs/bcachefs/six.c | 21 +- + fs/bcachefs/snapshot.c | 435 ++++++++------------ + fs/bcachefs/snapshot.h | 32 +- + fs/bcachefs/snapshot_types.h | 2 +- + fs/bcachefs/str_hash.c | 57 ++- + fs/bcachefs/str_hash.h | 47 ++- + fs/bcachefs/subvolume.c | 246 +++++------ + fs/bcachefs/subvolume.h | 20 +- + fs/bcachefs/super-io.c | 83 ++-- + fs/bcachefs/super.c | 582 ++++++++++++-------------- + fs/bcachefs/sysfs.c | 28 +- + fs/bcachefs/tests.c | 340 +++++++-------- + fs/bcachefs/thread_with_file.c | 48 +-- + fs/bcachefs/time_stats.c | 7 +- + fs/bcachefs/trace.h | 152 ++----- + fs/bcachefs/util.c | 28 +- + fs/bcachefs/util.h | 10 +- + fs/bcachefs/xattr.c | 58 ++- + lib/closure.c | 12 +- + 122 files changed, 5325 insertions(+), 6182 deletions(-) +Merging ceph/master (b828b4bf29d1 ceph: fix variable dereferenced before check in ceph_umount_begin()) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (9338a1afff36 smb: client: fix creating symlinks under POSIX mounts) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging fs/smb/client/cifsfs.c +Merge made by the 'ort' strategy. + fs/smb/client/cached_dir.c | 8 ++- + fs/smb/client/cached_dir.h | 4 +- + fs/smb/client/cifs_debug.c | 53 +++++++++++++++++ + fs/smb/client/cifsencrypt.c | 83 +++++++++++++++++++------- + fs/smb/client/cifsfs.c | 2 +- + fs/smb/client/cifsglob.h | 19 ++++-- + fs/smb/client/cifsproto.h | 8 +++ + fs/smb/client/cifssmb.c | 142 +++++++++++++++++++++++++++++++++++++++++++- + fs/smb/client/connect.c | 9 +-- + fs/smb/client/fs_context.c | 51 ++-------------- + fs/smb/client/fs_context.h | 18 +++++- + fs/smb/client/link.c | 24 +++----- + fs/smb/client/reparse.c | 18 +++--- + fs/smb/client/reparse.h | 4 +- + fs/smb/client/sess.c | 9 +++ + fs/smb/client/smb1ops.c | 31 ++++++---- + fs/smb/client/smb2inode.c | 14 ++--- + fs/smb/client/smb2ops.c | 15 +++-- + fs/smb/client/smb2proto.h | 5 +- + 19 files changed, 376 insertions(+), 141 deletions(-) +Merging configfs/configfs-next (c6b190822459 MAINTAINERS: add configfs Rust abstractions) +$ git merge -m Merge branch 'configfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git configfs/configfs-next +Already up to date. +Merging ecryptfs/next (fba133a34118 ecryptfs: Remove unused declartion ecryptfs_fill_zeros()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Auto-merging fs/ecryptfs/crypto.c +Auto-merging fs/ecryptfs/ecryptfs_kernel.h +Merge made by the 'ort' strategy. + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 1 - + fs/ecryptfs/keystore.c | 4 ++-- + 3 files changed, 3 insertions(+), 4 deletions(-) +Merging dlm/next (6f8b4788266c dlm: drop SCTP Kconfig dependency) +$ 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 erofs/dev (df0ce6cefa45 erofs: support to readahead dirent blocks in erofs_readdir()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (b33f91c62762 exfat: optimize allocation bitmap loading time) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/balloc.c | 12 +++++++++++- + fs/exfat/dir.c | 13 ++++++++++++- + fs/exfat/exfat_fs.h | 1 + + fs/exfat/fatent.c | 10 ++++++++++ + fs/exfat/file.c | 5 ++--- + fs/exfat/namei.c | 5 +++++ + fs/exfat/super.c | 32 +++++++++++++++++++++----------- + 7 files changed, 62 insertions(+), 16 deletions(-) +Merging exportfs/exportfs-next (adc218676eef Linux 6.12) +$ 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 (17e58687367a Merge fsnotify changes with fixed up authorship.) +$ 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 (099b847ccc6c ext4: do not BUG when INLINE_DATA_FL lacks system.data xattr) +$ 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 (078cad8212ce f2fs: drop inode from the donation list when the last file is closed) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging Documentation/filesystems/f2fs.rst +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +Auto-merging include/linux/fscrypt.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 22 + + Documentation/filesystems/f2fs.rst | 6 +- + fs/f2fs/checkpoint.c | 8 +- + fs/f2fs/compress.c | 120 +- + fs/f2fs/data.c | 183 +-- + fs/f2fs/debug.c | 21 +- + fs/f2fs/dir.c | 4 +- + fs/f2fs/extent_cache.c | 10 +- + fs/f2fs/f2fs.h | 151 ++- + fs/f2fs/file.c | 107 +- + fs/f2fs/gc.c | 54 +- + fs/f2fs/gc.h | 5 +- + fs/f2fs/inline.c | 20 +- + fs/f2fs/inode.c | 84 +- + fs/f2fs/namei.c | 12 +- + fs/f2fs/node.c | 261 ++-- + fs/f2fs/node.h | 77 +- + fs/f2fs/recovery.c | 116 +- + fs/f2fs/segment.c | 62 +- + fs/f2fs/segment.h | 59 +- + fs/f2fs/super.c | 2185 +++++++++++++++++-------------- + fs/f2fs/sysfs.c | 48 + + include/linux/f2fs_fs.h | 2 +- + include/linux/fscrypt.h | 10 +- + 24 files changed, 2056 insertions(+), 1571 deletions(-) +Merging fsverity/for-next (d0b3b7b22dfa Linux 6.16-rc4) +$ 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 (f0e84022479b virtio_fs: Remove redundant spinlock in virtio_fs_request_complete()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging MAINTAINERS +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/virtio_fs.c +Auto-merging include/linux/wait.h +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + .../filesystems/{ => fuse}/fuse-io-uring.rst | 0 + Documentation/filesystems/{ => fuse}/fuse-io.rst | 2 +- + .../filesystems/{ => fuse}/fuse-passthrough.rst | 0 + Documentation/filesystems/{ => fuse}/fuse.rst | 20 ++- + Documentation/filesystems/fuse/index.rst | 14 ++ + Documentation/filesystems/index.rst | 5 +- + MAINTAINERS | 3 +- + fs/fuse/dev.c | 5 +- + fs/fuse/file.c | 1 - + fs/fuse/virtio_fs.c | 3 - + include/linux/wait.h | 12 ++ + tools/testing/selftests/Makefile | 1 + + .../testing/selftests/filesystems/fuse/.gitignore | 3 + + tools/testing/selftests/filesystems/fuse/Makefile | 21 +++ + .../testing/selftests/filesystems/fuse/fuse_mnt.c | 146 +++++++++++++++++++++ + .../selftests/filesystems/fuse/fusectl_test.c | 140 ++++++++++++++++++++ + 16 files changed, 361 insertions(+), 15 deletions(-) + rename Documentation/filesystems/{ => fuse}/fuse-io-uring.rst (100%) + rename Documentation/filesystems/{ => fuse}/fuse-io.rst (99%) + rename Documentation/filesystems/{ => fuse}/fuse-passthrough.rst (100%) + rename Documentation/filesystems/{ => fuse}/fuse.rst (95%) + create mode 100644 Documentation/filesystems/fuse/index.rst + create mode 100644 tools/testing/selftests/filesystems/fuse/.gitignore + create mode 100644 tools/testing/selftests/filesystems/fuse/Makefile + create mode 100644 tools/testing/selftests/filesystems/fuse/fuse_mnt.c + create mode 100644 tools/testing/selftests/filesystems/fuse/fusectl_test.c +Merging gfs2/for-next (a90f1b6ad664 Merge tag 'gfs2-for-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ 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 (856db3759202 jfs: fix metapage reference count leak in dbAllocCtl) +$ 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 (e5cf61fa6e2f Merge tag 'v6.17-rc-smb3-server-fixes' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (99765233ab42 NFS: Fixup allocation flags for nfsiod's __GFP_NORETRY) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/nfs4file.c +Auto-merging fs/nfs/write.c +Auto-merging include/linux/sunrpc/xdr.h +Auto-merging net/sunrpc/xdr.c +Merge made by the 'ort' strategy. + fs/nfs/blocklayout/blocklayout.c | 4 +- + fs/nfs/blocklayout/dev.c | 5 +- + fs/nfs/blocklayout/extent_tree.c | 104 +++++++++++++++--- + fs/nfs/client.c | 3 +- + fs/nfs/delegation.c | 114 ++++++++++++-------- + fs/nfs/delegation.h | 3 + + fs/nfs/dir.c | 4 +- + fs/nfs/export.c | 11 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 26 +++-- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 6 +- + fs/nfs/fs_context.c | 42 ++++++++ + fs/nfs/inode.c | 69 +++++++++++- + fs/nfs/internal.h | 10 +- + fs/nfs/mount_clnt.c | 68 ------------ + fs/nfs/nfs4client.c | 165 ++++++++++++++--------------- + fs/nfs/nfs4file.c | 25 +---- + fs/nfs/nfs4proc.c | 50 +++++++-- + fs/nfs/nfs4trace.c | 2 + + fs/nfs/nfs4trace.h | 168 +++++++++++++++++++++++++++++- + fs/nfs/nfs4xdr.c | 24 +++++ + fs/nfs/nfstrace.h | 11 +- + fs/nfs/pnfs.c | 39 ++++--- + fs/nfs/pnfs_nfs.c | 14 ++- + fs/nfs/write.c | 8 +- + include/linux/nfs_fs.h | 8 ++ + include/linux/nfs_fs_sb.h | 8 +- + include/linux/nfs_xdr.h | 57 +++++----- + include/linux/sunrpc/xdr.h | 9 -- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 4 +- + net/sunrpc/xdr.c | 110 ------------------- + 30 files changed, 715 insertions(+), 456 deletions(-) +Merging nfs-anna/linux-next (38074de35b01 NFSv4/flexfiles: Fix handling of NFS level errors in I/O) +$ 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 (e339967eecf1 nfsd: Drop dprintk in blocklayout xdr functions) +$ 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 (a49f0abd8959 Revert "fs/ntfs3: Replace inode_trylock with inode_lock") +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Already up to date. +Merging orangefs/for-next (2138e89cb066 fs/orangefs: Allow 2 more characters in do_c_string()) +$ 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 (6f9ccdad0fea ovl: Annotate struct ovl_entry with __counted_by()) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (99dbb2a1bd66 ubifs: stop using write_cache_pages) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (4210030d8bc4 docs: fs/9p: Add missing "not" in cache documentation) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (2014c95afece Linux 6.14-rc1) +$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (ded74fddcaf6 xfs: don't use a xfs_log_iovec for ri_buf in log recovery) +$ 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 (6982100bb829 zonefs: use ZONEFS_SUPER_SIZE instead of PAGE_SIZE) +$ 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 vfs-brauner/vfs.all (66639db85811 Merge branch 'vfs-6.17.iomap' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging Documentation/filesystems/porting.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/porting.rst +Auto-merging fs/coredump.c +CONFLICT (content): Merge conflict in fs/coredump.c +Auto-merging fs/fuse/file.c +Auto-merging net/unix/af_unix.c +Auto-merging tools/testing/selftests/coredump/stackdump_test.c +CONFLICT (content): Merge conflict in tools/testing/selftests/coredump/stackdump_test.c +Resolved 'Documentation/filesystems/porting.rst' using previous resolution. +Resolved 'fs/coredump.c' using previous resolution. +Resolved 'tools/testing/selftests/coredump/stackdump_test.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 82b1a7925c4c] 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 (dd589648208a Merge branch 'work.mount' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging Documentation/filesystems/porting.rst +CONFLICT (content): Merge conflict in Documentation/filesystems/porting.rst +Resolved 'Documentation/filesystems/porting.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next 4537c1c375dd] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git +$ git diff -M --stat --summary HEAD^.. + +Merging mm-hotfixes/mm-hotfixes-unstable (f01a22f845d8 mm: shmem: fix the shmem large folio allocation for the i915 driver) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_shmem.c +Auto-merging drivers/gpu/drm/ttm/ttm_backup.c +Auto-merging include/linux/shmem_fs.h +Auto-merging mm/kasan/kasan_test_c.c +Auto-merging mm/memory_hotplug.c +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/drm_gem.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 7 ++++- + drivers/gpu/drm/ttm/ttm_backup.c | 2 +- + include/linux/shmem_fs.h | 4 +-- + mm/kasan/kasan_test_c.c | 2 +- + mm/memory_hotplug.c | 21 ++++++++------ + mm/shmem.c | 46 +++++++++++++++++++++++-------- + 7 files changed, 58 insertions(+), 26 deletions(-) +Merging fs-current (9cdfffb657a8 Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Merge made by the 'ort' strategy. + drivers/accel/habanalabs/common/memory.c | 23 +++++++---------------- + 1 file changed, 7 insertions(+), 16 deletions(-) +Merging kbuild-current/fixes (e04c78d86a96 Linux 6.16-rc2) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (d7b8f8e20813 Linux 6.16-rc5) +$ 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 (d42e6c20de61 arm64/entry: Mask DAIF in cpu_switch_to(), call_on_irq_stack()) +$ 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 (9f9d41d64322 Merge tag 'arm-soc/for-6.17/drivers-part2' of https://github.com/Broadcom/stblinux 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 +Merge made by the 'ort' strategy. + arch/arm/boot/dts/broadcom/bcm7445.dtsi | 9 +- + arch/arm/mach-s3c/gpio-samsung.c | 2 +- + drivers/clk/clk-rp1.c | 976 ++++++++++++++++++++- + include/dt-bindings/clock/raspberrypi,rp1-clocks.h | 4 + + 4 files changed, 979 insertions(+), 12 deletions(-) +Merging davinci-current/davinci/for-current (19272b37aa4f Linux 6.16-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 (19272b37aa4f Linux 6.16-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 (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'soc-fixes' of https://github.com/sophgo/linux.git sophgo-soc-fixes/soc-fixes +Already up to date. +Merging m68k-current/for-linus (c8995932db2b m68k: mac: Improve clocksource driver commentary) +$ 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 (ab107276607a powerpc: Fix struct termio related ioctl macros) +$ 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 (62355f1f87b8 s390/pci: Allow automatic recovery with minimal driver support) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging net/main (010510128873 netlink: specs: ethtool: fix module EEPROM input/output arguments) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + Documentation/netlink/specs/ethtool.yaml | 6 +++--- + drivers/net/ethernet/freescale/dpaa/dpaa_ethtool.c | 4 +++- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 14 +++++++++++-- + drivers/net/ethernet/freescale/gianfar_ethtool.c | 4 +++- + drivers/net/ethernet/mediatek/mtk_wed.c | 1 - + drivers/net/ethernet/ti/icssg/icss_iep.c | 23 +++++++++++++++++----- + drivers/net/ipa/ipa_sysfs.c | 6 +++++- + drivers/net/phy/mdio_bus.c | 4 ++-- + drivers/net/phy/mscc/mscc_ptp.c | 1 + + drivers/net/phy/mscc/mscc_ptp.h | 1 + + drivers/net/phy/smsc.c | 1 + + drivers/net/ppp/pptp.c | 15 ++++++++------ + net/core/netpoll.c | 7 +++++++ + net/kcm/kcmsock.c | 6 ++++++ + net/netlink/af_netlink.c | 2 +- + 15 files changed, 72 insertions(+), 23 deletions(-) +Merging bpf/master (93acc0f43f58 Merge branch 'support-kcfi-bpf-on-arm64') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + arch/arm64/include/asm/cfi.h | 7 +++++ + arch/arm64/net/bpf_jit_comp.c | 30 +++++++++++++++++++--- + arch/riscv/include/asm/cfi.h | 16 ------------ + arch/riscv/kernel/cfi.c | 53 -------------------------------------- + arch/x86/include/asm/cfi.h | 10 ++------ + arch/x86/kernel/alternative.c | 37 -------------------------- + include/linux/bpf-cgroup.h | 5 ---- + include/linux/bpf.h | 60 ++++++++++++++++++++++++++++--------------- + include/linux/cfi.h | 47 +++++++++++++++++++++++++++------ + include/linux/cfi_types.h | 23 +++++++++++++++++ + kernel/bpf/core.c | 50 ++++++++++++++++++++++++------------ + kernel/bpf/syscall.c | 19 +++++++++----- + kernel/cfi.c | 15 +++++++++++ + tools/lib/bpf/libbpf.c | 2 +- + 14 files changed, 200 insertions(+), 174 deletions(-) + create mode 100644 arch/arm64/include/asm/cfi.h +Merging ipsec/master (28712d6ed320 Merge branch 'ipsec: fix splat due to ipcomp fallback tunnel') +$ 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 (eccf7a3480a0 Merge tag 'linux-can-fixes-for-6.16-20250725' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can) +$ 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 (eccf7a3480a0 Merge tag 'linux-can-fixes-for-6.16-20250725' of git://git.kernel.org/pub/scm/linux/kernel/git/mkl/linux-can) +$ 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 (6832a9317eee Merge tag 'net-6.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging ath/for-current (6832a9317eee Merge tag 'net-6.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current +Already up to date. +Merging iwlwifi/fixes (6832a9317eee Merge tag 'net-6.16-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi/fixes +Already up to date. +Merging wpan/master (8ce4f287524c net: libwx: fix firmware mailbox abnormal return) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (a9a9e68954f2 RDMA/mlx5: Fix vport loopback for MPV device) +$ 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 (df485a4b2b3e ALSA: usb: scarlett2: Fix missing NULL check) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/loongarch/configs/loongson3_defconfig +Auto-merging arch/mips/configs/loongson2k_defconfig +Auto-merging arch/mips/configs/loongson3_defconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/atmel,at91-ssc.yaml | 11 ++- + arch/arm/configs/multi_v7_defconfig | 4 +- + arch/arm/configs/tegra_defconfig | 5 ++ + arch/loongarch/configs/loongson3_defconfig | 15 ++++ + arch/mips/configs/loongson2k_defconfig | 11 +++ + arch/mips/configs/loongson3_defconfig | 15 +++- + include/sound/sdca_function.h | 14 +-- + include/sound/tas2770-tlv.h | 4 +- + sound/hda/codecs/cirrus/Kconfig | 9 ++ + sound/hda/codecs/hdmi/Kconfig | 24 ++++-- + sound/hda/codecs/hdmi/Makefile | 2 +- + sound/hda/codecs/realtek/Kconfig | 12 ++- + sound/hda/codecs/realtek/alc269.c | 3 + + sound/hda/codecs/side-codecs/tas2781_hda_i2c.c | 2 +- + sound/soc/codecs/aw88399.c | 9 ++ + sound/soc/fsl/fsl_xcvr.c | 25 +++++- + sound/soc/fsl/imx-card.c | 40 +++++++++ + sound/soc/sdca/sdca_functions.c | 99 ++++++++++++++-------- + sound/soc/sdca/sdca_regmap.c | 29 +++++-- + sound/usb/mixer_scarlett2.c | 14 ++- + sound/usb/quirks.c | 2 + + tools/testing/selftests/alsa/utimer-test.c | 1 + + 22 files changed, 282 insertions(+), 68 deletions(-) +Merging sound-asoc-fixes/for-linus (282528da82a0 Merge remote-tracking branch 'asoc/for-6.16' into asoc-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-cs42l43.c | 2 +- + sound/soc/codecs/wm8962.c | 11 +++++++++++ + sound/soc/intel/avs/core.c | 3 ++- + sound/soc/sof/amd/acp-loader.c | 6 +++--- + 4 files changed, 17 insertions(+), 5 deletions(-) +Merging regmap-fixes/for-linus (c871c199accb regmap: fix potential memory leak of regmap_bus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (10dfd36f0784 regulator: core: correct convergence check in regulator_set_voltage()) +$ 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/core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging spi-fixes/for-linus (618393ea7752 Merge remote-tracking branch 'spi/for-6.16' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 8 ++++++++ + 1 file changed, 8 insertions(+) +Merging pci-current/for-linus (19272b37aa4f Linux 6.16-rc1) +$ 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 (260f6f4fda93 Merge tag 'drm-next-2025-07-30' of https://gitlab.freedesktop.org/drm/kernel) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (260f6f4fda93 Merge tag 'drm-next-2025-07-30' of https://gitlab.freedesktop.org/drm/kernel) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (beb6c8326eb4 Merge tag 'uml-for-linux-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux) +$ 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 (ad1244e1ce18 USB: serial: option: add Foxconn T99W709) +$ 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 (89be9a83ccf1 Linux 6.16-rc7) +$ 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 (260f6f4fda93 Merge tag 'drm-next-2025-07-30' of https://gitlab.freedesktop.org/drm/kernel) +$ 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 (ae68ad3d7a93 MAINTAINERS: add miscdevice Rust abstractions) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Already up to date. +Merging counter-current/counter-current (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (260f6f4fda93 Merge tag 'drm-next-2025-07-30' of https://gitlab.freedesktop.org/drm/kernel) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (89be9a83ccf1 Linux 6.16-rc7) +$ 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 (038d61fd6422 Linux 6.16) +$ 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 (bcce05041b21 Input: xpad - set correct controller type for Acer NGR200) +$ 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 (bf24d6426854 crypto: keembay - Use min() to simplify ocs_create_linked_list_from_sg()) +$ 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 libcrypto-fixes/libcrypto-fixes (68279380266a crypto: s390/sha - Fix uninitialized variable in SHA-1 and SHA-2) +$ git merge -m Merge branch 'libcrypto-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Already up to date. +Merging vfio-fixes/for-linus (c1d9dac0db16 vfio/pci: Align huge faults to order) +$ 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 (19272b37aa4f Linux 6.16-rc1) +$ 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 (89be9a83ccf1 Linux 6.16-rc7) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (1613e604df0c Linux 6.10-rc1) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (6463cbe08b0c mtd: spinand: fix memory leak of ECC engine conf) +$ 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 (d9d79e4f7dc9 mfd: Fix building without CONFIG_OF) +$ 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 (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (19272b37aa4f Linux 6.16-rc1) +$ 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 (86731a2a651e Linux 6.16-rc3) +$ 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 (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (038d61fd6422 Linux 6.16) +$ 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 (d8dfda5af0be KVM: s390: pv: fix race when making a page secure) +$ 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 (9c62e2282900 hwmon: (gsc-hwmon) fix fan pwm setpoint show functions) +$ 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 (d0b3b7b22dfa Linux 6.16-rc4) +$ 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 (d0b3b7b22dfa Linux 6.16-rc4) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/dma-mapping-fixes (aa807b9f22df dma-contiguous: hornor the cma address limit setup by user) +$ git merge -m Merge branch 'dma-mapping-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping-fixes/dma-mapping-fixes +Already up to date. +Merging drivers-x86-fixes/fixes (e2967b50b709 MAINTAINERS: Update entries for IFS and SBL drivers) +$ 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 (8d2c2fa2209e firmware: exynos-acpm: fix timeouts on xfers handling) +$ 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 (19272b37aa4f Linux 6.16-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 (79aef1a3705b of: Clarify OF device context in of_match_device() comment) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Merge made by the 'ort' strategy. + drivers/of/device.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging dt-krzk-fixes/fixes (19272b37aa4f Linux 6.16-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 (021f243627ea scsi: ufs: core: Fix spelling of a sysfs attribute name) +$ 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 (038d61fd6422 Linux 6.16) +$ 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 (038d61fd6422 Linux 6.16) +$ 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 (4b290aae788e Merge tag 'sysctl-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl) +$ 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 (08d82d0cad51 rtc: pcf2127: add missing semicolon after statement) +$ 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 (86731a2a651e Linux 6.16-rc3) +$ 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 (a4131a50d072 tools/hv: fcopy: Fix irregularities with size of ring buffer) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging risc-v-fixes/fixes (b65ca21835ed riscv: uaccess: Fix -Wuninitialized and -Wshadow in __put_user_nocheck) +$ 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 (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (beb6c8326eb4 Merge tag 'uml-for-linux-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (89be9a83ccf1 Linux 6.16-rc7) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (9ab29ed50555 gpiolib: acpi: Add a quirk for Acer Nitro V15) +$ 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 (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging memblock-fixes/fixes (da8bf5daa5e5 memblock: Accept allocated memory before use in memblock_double_array()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging renesas-fixes/fixes (379c590113ce ARM: shmobile: smp: Enforce shmobile_smp_* alignment) +$ 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 (86731a2a651e Linux 6.16-rc3) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (64e135f1eaba efivarfs: Fix memory leak of efivarfs_fs_info in fs_context error paths) +$ 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 battery-fixes/fixes (0af2f6be1b42 Linux 6.15-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (9a96876e3c65 iommufd/selftest: Fix build warnings due to uninitialized mfd) +$ 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 (038d61fd6422 Linux 6.16) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging w1-fixes/fixes (19272b37aa4f Linux 6.16-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 (621a88dbfe90 cpuidle: psci: Fix cpuhotplug routine with PREEMPT_RT=y) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging i2c-host-fixes/i2c/i2c-host-fixes (0ae982df6776 Merge tag 'i2c-for-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux) +$ 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 (e4b2a0c2b9be Merge tag 'sunxi-clk-fixes-for-6.16' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux into clk-fixes) +$ git merge -m Merge branch 'clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Already up to date. +Merging thead-clk-fixes/thead-clk-fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'thead-clk-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk-fixes/thead-clk-fixes +Already up to date. +Merging pwrseq-fixes/pwrseq/for-current (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'pwrseq/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current +Already up to date. +Merging thead-dt-fixes/thead-dt-fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'thead-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt-fixes/thead-dt-fixes +Already up to date. +Merging ftrace-fixes/ftrace/fixes (327e28664307 fgraph: Do not enable function_graph tracer when setting funcgraph-args) +$ git merge -m Merge branch 'ftrace/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace-fixes/ftrace/fixes +Already up to date. +Merging ring-buffer-fixes/ring-buffer/fixes (e4d4b8670c44 ring-buffer: Use flush_kernel_vmap_range() over flush_dcache_folio()) +$ git merge -m Merge branch 'ring-buffer/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ring-buffer-fixes/ring-buffer/fixes +Already up to date. +Merging trace-fixes/trace/fixes (b5e8acc14dcb tracing: Add down_write(trace_event_sem) when adding trace event) +$ git merge -m Merge branch 'trace/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes +Already up to date. +Merging tracefs-fixes/tracefs/fixes (8b55572e5180 tracing/selftests: Add tracefs mount options test) +$ git merge -m Merge branch 'tracefs/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes +Already up to date. +Merging spacemit-fixes/fixes (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/spacemit-com/linux spacemit-fixes/fixes +Already up to date. +Merging tip-fixes/tip/urgent (98e8f2c0e093 Merge tag 'x86-platform-2025-07-29' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'tip/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Already up to date. +Merging slab-fixes/slab/for-next-fixes (be8250786ca9 mm, slab: clean up slab->obj_exts always) +$ git merge -m Merge branch 'slab/for-next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab-fixes/slab/for-next-fixes +Already up to date. +Merging drm-msm-fixes/msm-fixes (d3deabe4c619 drm/msm: Fix inverted WARN_ON() logic) +$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes +Already up to date. +Merging uml-fixes/fixes (2dca89df0d11 Merge tag 'uml-for-6.16-rc4' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux) +$ 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 fwctl-fixes/for-rc (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-rc' of git//git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl-fixes/for-rc +Already up to date. +Merging devsec-tsm-fixes/fixes (fba4ceaa242d configfs-tsm-report: Fix NULL dereference of tsm_ops) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm-fixes/fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (038d61fd6422 Linux 6.16) +$ 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 +Already up to date. +Merging linus/for-next (ffd294d346d1 Linux 6.13) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git linus/for-next +Already up to date. +Merging mm-stable/mm-stable (af915c3c13b6 MAINTAINERS: add missing headers to mempory policy & migration section) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (a9ed4422adac lib/raid6: update recov_rvv.c zero page usage) +$ 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 .mailmap +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/kernel/fadump.c +Auto-merging arch/riscv/Kconfig +Auto-merging arch/x86/kernel/setup.c +Auto-merging fs/ocfs2/aops.c +Auto-merging init/main.c +Auto-merging kernel/events/uprobes.c +Auto-merging kernel/fork.c +Auto-merging kernel/locking/rwsem.c +Auto-merging kernel/panic.c +CONFLICT (content): Merge conflict in kernel/panic.c +Auto-merging kernel/trace/blktrace.c +Auto-merging lib/Makefile +Auto-merging lib/raid6/recov_s390xc.c +Auto-merging scripts/checkpatch.pl +Auto-merging scripts/gdb/linux/constants.py.in +Resolved 'kernel/panic.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 09543ab104b5] Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + Documentation/accounting/delay-accounting.rst | 47 ++ + Documentation/admin-guide/kdump/kdump.rst | 21 + + Documentation/admin-guide/kernel-parameters.txt | 43 +- + Documentation/admin-guide/sysctl/kernel.rst | 20 +- + MAINTAINERS | 1 + + arch/alpha/kernel/core_marvel.c | 11 +- + arch/arm/kernel/setup.c | 2 +- + arch/arm64/mm/init.c | 2 +- + arch/loongarch/kernel/setup.c | 2 +- + arch/mips/kernel/setup.c | 2 +- + arch/powerpc/kernel/fadump.c | 2 +- + arch/powerpc/kexec/core.c | 2 +- + arch/powerpc/mm/nohash/kaslr_booke.c | 2 +- + arch/riscv/Kconfig | 1 + + arch/riscv/kernel/setup.c | 5 + + arch/riscv/mm/init.c | 2 +- + arch/s390/kernel/setup.c | 2 +- + arch/sh/kernel/machine_kexec.c | 2 +- + arch/x86/kernel/crash.c | 26 +- + arch/x86/kernel/setup.c | 5 +- + crypto/async_tx/async_pq.c | 2 +- + crypto/async_tx/async_raid6_recov.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_log.c | 3 +- + drivers/net/wwan/iosm/iosm_ipc_trace.c | 3 +- + drivers/net/wwan/t7xx/t7xx_port_trace.c | 2 +- + fs/fat/fatent.c | 2 +- + fs/ocfs2/aops.c | 1 + + fs/ocfs2/dir.c | 8 + + fs/ocfs2/dlm/dlmrecovery.c | 2 +- + fs/ocfs2/inode.c | 70 +- + fs/ocfs2/move_extents.c | 19 +- + fs/ocfs2/namei.c | 11 +- + fs/ocfs2/stack_user.c | 15 +- + fs/proc/vmcore.c | 29 +- + fs/squashfs/block.c | 47 +- + fs/squashfs/file.c | 7 +- + include/linux/crash_reserve.h | 15 +- + include/linux/gcd.h | 3 + + include/linux/hung_task.h | 18 +- + include/linux/jhash.h | 8 +- + include/linux/raid/pq.h | 12 +- + include/linux/relay.h | 24 +- + include/linux/rwsem.h | 12 + + include/linux/sys_info.h | 28 + + init/main.c | 6 +- + kernel/crash_core.c | 15 + + kernel/crash_reserve.c | 68 +- + kernel/events/uprobes.c | 4 +- + kernel/exit.c | 7 +- + kernel/fork.c | 95 ++- + kernel/hung_task.c | 29 +- + kernel/kcov.c | 2 +- + kernel/kthread.c | 11 +- + kernel/locking/rwsem.c | 31 +- + kernel/panic.c | 70 +- + kernel/relay.c | 69 +- + kernel/trace/blktrace.c | 22 +- + lib/Makefile | 2 +- + lib/math/div64.c | 13 +- + lib/math/gcd.c | 27 +- + lib/raid6/algos.c | 3 - + lib/raid6/recov.c | 6 +- + lib/raid6/recov_avx2.c | 6 +- + lib/raid6/recov_avx512.c | 6 +- + lib/raid6/recov_loongarch_simd.c | 12 +- + lib/raid6/recov_neon.c | 6 +- + lib/raid6/recov_rvv.c | 6 +- + lib/raid6/recov_s390xc.c | 6 +- + lib/raid6/recov_ssse3.c | 6 +- + lib/sys_info.c | 122 ++++ + samples/Kconfig | 7 +- + samples/hung_task/hung_task_tests.c | 81 ++- + scripts/checkpatch.pl | 33 +- + scripts/coccinelle/misc/secs_to_jiffies.cocci | 49 +- + scripts/gdb/linux/constants.py.in | 12 +- + tools/accounting/Makefile | 2 +- + tools/accounting/delaytop.c | 808 +++++++++++++++++++++ + tools/testing/selftests/ptrace/.gitignore | 1 + + .../intel/workload_hint/workload_hint_test.c | 16 +- + 80 files changed, 1844 insertions(+), 361 deletions(-) + create mode 100644 include/linux/sys_info.h + create mode 100644 lib/sys_info.c + create mode 100644 tools/accounting/delaytop.c +Merging mm-unstable/mm-unstable (01da54f10fdd mm: fixup very disguised vmalloc flags parameter) +$ git merge -m Merge branch 'mm-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-unstable/mm-unstable +Auto-merging Documentation/core-api/mm-api.rst +Auto-merging arch/x86/kernel/alternative.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/pagemap.h +Auto-merging kernel/fork.c +Auto-merging kernel/module/main.c +Auto-merging mm/filemap.c +Auto-merging mm/internal.h +Auto-merging mm/memory-failure.c +Auto-merging mm/nommu.c +Auto-merging mm/shmem.c +Auto-merging mm/vma.c +Auto-merging tools/testing/vma/vma_internal.h +Merge made by the 'ort' strategy. + Documentation/core-api/mm-api.rst | 1 - + arch/arm64/mm/mmu.c | 4 +- + arch/x86/kernel/alternative.c | 3 +- + arch/x86/kernel/ftrace.c | 2 +- + arch/x86/kernel/kprobes/core.c | 18 -- + arch/x86/mm/init.c | 24 +- + include/linux/execmem.h | 54 ++-- + include/linux/io-mapping.h | 3 - + include/linux/mm.h | 6 +- + include/linux/mmap_lock.h | 30 ++ + include/linux/page-flags.h | 2 - + include/linux/pagemap.h | 6 + + include/linux/pgtable.h | 45 +++ + include/linux/rmap.h | 22 ++ + kernel/fork.c | 9 +- + kernel/module/main.c | 13 +- + mm/Kconfig | 4 - + mm/Makefile | 1 - + mm/damon/vaddr.c | 4 + + mm/execmem.c | 212 +++++++++---- + mm/filemap.c | 5 +- + mm/internal.h | 2 +- + mm/io-mapping.c | 30 -- + mm/kasan/common.c | 25 +- + mm/khugepaged.c | 58 ++-- + mm/madvise.c | 71 ++++- + mm/memory-failure.c | 12 +- + mm/mincore.c | 3 + + mm/mmap_lock.c | 10 +- + mm/mprotect.c | 2 +- + mm/mremap.c | 4 +- + mm/mseal.c | 170 +++------- + mm/nommu.c | 2 +- + mm/rmap.c | 2 +- + mm/shmem.c | 246 ++++++++------- + mm/vma.c | 4 +- + mm/vma.h | 27 +- + tools/testing/selftests/cachestat/test_cachestat.c | 62 +++- + tools/testing/selftests/mm/.gitignore | 1 + + tools/testing/selftests/mm/Makefile | 1 + + tools/testing/selftests/mm/process_madv.c | 344 +++++++++++++++++++++ + tools/testing/selftests/mm/run_vmtests.sh | 5 + + tools/testing/vma/vma_internal.h | 6 +- + 43 files changed, 1057 insertions(+), 498 deletions(-) + delete mode 100644 mm/io-mapping.c + create mode 100644 tools/testing/selftests/mm/process_madv.c +Merging mm-nonmm-unstable/mm-nonmm-unstable (43f5de099338 kho-add-test-for-kexec-handover-fix) +$ git merge -m Merge branch 'mm-nonmm-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-unstable/mm-nonmm-unstable +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/x86/kvm/i8254.c +Auto-merging drivers/gpu/drm/xe/xe_vm_types.h +Auto-merging drivers/net/ethernet/marvell/mvneta.c +Auto-merging fs/ocfs2/super.c +Auto-merging include/xen/xenbus.h +Auto-merging init/Kconfig +Auto-merging kernel/kexec_core.c +Auto-merging kernel/kexec_file.c +Auto-merging lib/Kconfig.debug +CONFLICT (content): Merge conflict in lib/Kconfig.debug +Auto-merging lib/Makefile +Resolved 'lib/Kconfig.debug' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6036e1c38a46] Merge branch 'mm-nonmm-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/accounting/delay-accounting.rst | 61 +++-- + Documentation/admin-guide/kernel-parameters.txt | 5 + + Documentation/dev-tools/kcov.rst | 7 +- + MAINTAINERS | 11 + + arch/riscv/kernel/kexec_elf.c | 1 + + arch/x86/kvm/i8254.c | 4 +- + drivers/cxl/core/mce.h | 2 +- + drivers/gpu/drm/xe/xe_vm_types.h | 2 +- + drivers/net/ethernet/marvell/mvneta.c | 2 +- + fs/fat/misc.c | 6 +- + fs/ocfs2/ocfs2.h | 2 - + fs/ocfs2/super.c | 2 - + fs/ocfs2/sysfile.c | 9 +- + include/linux/kexec.h | 10 + + include/linux/xxhash.h | 26 -- + include/uapi/linux/kexec.h | 1 + + include/xen/xenbus.h | 2 +- + init/Kconfig | 4 + + kernel/kcov.c | 9 + + kernel/kexec.c | 2 +- + kernel/kexec_core.c | 100 +++++++- + kernel/kexec_file.c | 51 +++- + kernel/kexec_internal.h | 2 +- + kernel/ucount.c | 16 +- + lib/Kconfig.debug | 21 ++ + lib/Makefile | 1 + + lib/stackdepot.c | 67 +++++- + lib/test_kho.c | 305 ++++++++++++++++++++++++ + lib/xxhash.c | 107 --------- + mm/kmemleak.c | 5 + + samples/Kconfig | 2 +- + scripts/spelling.txt | 1 + + tools/accounting/delaytop.c | 162 ++++++++----- + tools/testing/selftests/kho/arm64.conf | 9 + + tools/testing/selftests/kho/init.c | 100 ++++++++ + tools/testing/selftests/kho/vmtest.sh | 183 ++++++++++++++ + tools/testing/selftests/kho/x86.conf | 7 + + 37 files changed, 1044 insertions(+), 263 deletions(-) + create mode 100644 lib/test_kho.c + create mode 100644 tools/testing/selftests/kho/arm64.conf + create mode 100644 tools/testing/selftests/kho/init.c + create mode 100755 tools/testing/selftests/kho/vmtest.sh + create mode 100644 tools/testing/selftests/kho/x86.conf +Merging kbuild/for-next (dae742fa564b kheaders: make it possible to override TAR) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Makefile +Auto-merging arch/s390/kernel/vmlinux.lds.S +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/module.h +Auto-merging include/net/tcp.h +Auto-merging kernel/Makefile +Auto-merging rust/kernel/device_id.rs +Merge made by the 'ort' strategy. + Documentation/kbuild/kconfig.rst | 8 +- + Makefile | 5 +- + arch/s390/kernel/vmlinux.lds.S | 10 +- + drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 2 +- + drivers/scsi/BusLogic.c | 2 - + include/asm-generic/vmlinux.lds.h | 2 +- + include/crypto/algapi.h | 4 +- + include/linux/module.h | 21 +- + include/linux/moduleparam.h | 9 +- + include/net/tcp.h | 4 +- + kernel/.gitignore | 2 + + kernel/Makefile | 47 +- + kernel/gen_kheaders.sh | 93 +- + rust/kernel/device_id.rs | 8 +- + scripts/Makefile.vmlinux | 77 +- + scripts/Makefile.vmlinux_o | 26 +- + scripts/extract-vmlinux | 13 +- + scripts/gendwarfksyms/cache.c | 2 +- + scripts/gendwarfksyms/die.c | 4 +- + scripts/gendwarfksyms/dwarf.c | 2 +- + scripts/gendwarfksyms/kabi.c | 2 +- + scripts/gendwarfksyms/symbols.c | 2 +- + scripts/gendwarfksyms/types.c | 33 +- + scripts/kconfig/conf.c | 2 +- + scripts/kconfig/confdata.c | 2 +- + scripts/kconfig/gconf-cfg.sh | 11 +- + scripts/kconfig/gconf.c | 1783 +++++++++++++--------------- + scripts/kconfig/{gconf.glade => gconf.ui} | 361 ++---- + scripts/kconfig/lkc.h | 2 + + scripts/kconfig/lxdialog/inputbox.c | 6 +- + scripts/kconfig/lxdialog/menubox.c | 2 +- + scripts/kconfig/lxdialog/util.c | 3 +- + scripts/kconfig/menu.c | 94 ++ + scripts/kconfig/nconf.c | 2 + + scripts/kconfig/nconf.gui.c | 1 + + scripts/kconfig/qconf.cc | 36 +- + scripts/kconfig/qconf.h | 1 + + scripts/kconfig/symbol.c | 4 + + scripts/link-vmlinux.sh | 5 +- + scripts/mksysmap | 6 + + scripts/mod/file2alias.c | 34 +- + scripts/mod/modpost.c | 17 +- + scripts/mod/modpost.h | 2 + + 43 files changed, 1342 insertions(+), 1410 deletions(-) + rename scripts/kconfig/{gconf.glade => gconf.ui} (57%) +$ git am -3 ../patches/0001-Revert-kbuild-vmlinux.unstripped-should-always-depen.patch +Applying: Revert "kbuild: vmlinux.unstripped should always depend on .vmlinux.export.o" +$ git reset HEAD^ +Unstaged changes after reset: +M scripts/Makefile.vmlinux +M scripts/link-vmlinux.sh +$ git add -A . +$ git commit -v -a --amend +[master 0d7d95abff9f] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git + Date: Fri Aug 1 12:21:05 2025 +1000 +$ git am -3 ../patches/0002-Revert-modpost-Create-modalias-for-builtin-modules.patch +Applying: Revert "modpost: Create modalias for builtin modules" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/module.h +M scripts/Makefile.vmlinux +M scripts/mksysmap +M scripts/mod/file2alias.c +M scripts/mod/modpost.c +M scripts/mod/modpost.h +$ git add -A . +$ git commit -v -a --amend +[master 9ca4e4148003] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git + Date: Fri Aug 1 12:21:05 2025 +1000 +$ git am -3 ../patches/0003-Revert-modpost-Add-modname-to-mod_device_table-alias.patch +Applying: Revert "modpost: Add modname to mod_device_table alias" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/module.h +M rust/kernel/device_id.rs +M scripts/mod/file2alias.c +$ git add -A . +$ git commit -v -a --amend +[master 35aa74909736] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git + Date: Fri Aug 1 12:21:05 2025 +1000 +Merging clang-format/clang-format (c147f663b6a5 clang-format: Update with v6.11-rc1's `for_each` macro list) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf-tools-next (022245067f07 perf test: Ensure lock contention using pipe mode) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Merge made by the 'ort' strategy. + tools/build/Makefile.feature | 9 +- + tools/build/feature/Makefile | 27 +- + tools/build/feature/test-all.c | 24 - + tools/build/feature/test-libbpf-strings.c | 10 + + tools/build/feature/test-libcrypto.c | 25 - + tools/lib/perf/evlist.c | 123 +- + tools/lib/perf/evsel.c | 11 + + tools/lib/perf/include/internal/evsel.h | 3 +- + tools/lib/perf/include/perf/event.h | 18 + + tools/lib/subcmd/help.c | 12 +- + tools/lib/subcmd/run-command.c | 15 +- + tools/perf/.gitignore | 2 - + tools/perf/Build | 2 +- + tools/perf/Documentation/perf-check.txt | 2 +- + tools/perf/Documentation/perf-ftrace.txt | 10 + + tools/perf/Documentation/perf-list.txt | 25 +- + tools/perf/Documentation/perf-record.txt | 4 +- + tools/perf/Documentation/perf-stat.txt | 6 +- + tools/perf/Documentation/perf-trace.txt | 8 - + tools/perf/Makefile.config | 34 +- + tools/perf/Makefile.perf | 12 +- + tools/perf/arch/powerpc/util/Build | 1 - + tools/perf/arch/powerpc/util/event.c | 60 - + tools/perf/arch/x86/Build | 2 +- + tools/perf/arch/x86/include/arch-tests.h | 5 +- + tools/perf/arch/x86/tests/Build | 4 +- + tools/perf/arch/x86/tests/arch-tests.c | 3 +- + tools/perf/arch/x86/tests/sample-parsing.c | 125 -- + tools/perf/arch/x86/tests/topdown.c | 76 ++ + tools/perf/arch/x86/util/event.c | 46 - + tools/perf/arch/x86/util/evlist.c | 24 + + tools/perf/arch/x86/util/evsel.c | 46 +- + tools/perf/arch/x86/util/topdown.c | 59 +- + tools/perf/arch/x86/util/topdown.h | 6 + + tools/perf/bench/evlist-open-close.c | 36 +- + tools/perf/bench/inject-buildid.c | 2 +- + tools/perf/bench/synthesize.c | 27 +- + tools/perf/builtin-annotate.c | 6 +- + tools/perf/builtin-buildid-cache.c | 22 +- + tools/perf/builtin-buildid-list.c | 11 +- + tools/perf/builtin-c2c.c | 69 +- + tools/perf/builtin-check.c | 2 +- + tools/perf/builtin-diff.c | 2 +- + tools/perf/builtin-ftrace.c | 111 +- + tools/perf/builtin-inject.c | 42 +- + tools/perf/builtin-kallsyms.c | 21 +- + tools/perf/builtin-kmem.c | 2 +- + tools/perf/builtin-kvm.c | 6 +- + tools/perf/builtin-kwork.c | 2 +- + tools/perf/builtin-list.c | 65 +- + tools/perf/builtin-lock.c | 4 +- + tools/perf/builtin-mem.c | 2 +- + tools/perf/builtin-record.c | 101 +- + tools/perf/builtin-report.c | 27 +- + tools/perf/builtin-sched.c | 160 ++- + tools/perf/builtin-script.c | 36 +- + tools/perf/builtin-stat.c | 61 +- + tools/perf/builtin-timechart.c | 2 +- + tools/perf/builtin-top.c | 88 +- + tools/perf/builtin-trace.c | 268 ++--- + tools/perf/check-headers.sh | 9 +- + tools/perf/include/perf/perf_dlfilter.h | 2 +- + tools/perf/jvmti/libjvmti.c | 4 +- + tools/perf/perf-archive.sh | 35 +- + tools/perf/perf.c | 3 - + .../arch/arm64/common-and-microarch.json | 70 ++ + .../arch/arm64/fujitsu/monaka/core-imp-def.json | 2 +- + .../arm64/fujitsu/monaka/cycle_accounting.json | 4 +- + .../arch/arm64/fujitsu/monaka/exception.json | 2 +- + .../arch/arm64/fujitsu/monaka/fp_operation.json | 98 +- + .../arch/arm64/fujitsu/monaka/l1d_cache.json | 10 +- + .../arch/arm64/fujitsu/monaka/l1i_cache.json | 8 +- + .../arch/arm64/fujitsu/monaka/l2_cache.json | 28 +- + .../arch/arm64/fujitsu/monaka/l3_cache.json | 63 +- + .../arch/arm64/fujitsu/monaka/ll_cache.json | 2 +- + .../arch/arm64/fujitsu/monaka/pipeline.json | 6 +- + .../arch/arm64/fujitsu/monaka/spec_operation.json | 12 +- + .../arch/arm64/fujitsu/monaka/stall.json | 4 +- + .../pmu-events/arch/arm64/fujitsu/monaka/sve.json | 44 +- + .../pmu-events/arch/arm64/fujitsu/monaka/tlb.json | 56 +- + .../pmu-events/arch/common/common/software.json | 92 ++ + .../pmu-events/arch/s390/cf_z16/pai_crypto.json | 14 +- + tools/perf/pmu-events/arch/s390/cf_z17/basic.json | 58 + + .../perf/pmu-events/arch/s390/cf_z17/crypto6.json | 142 +++ + .../perf/pmu-events/arch/s390/cf_z17/extended.json | 541 +++++++++ + .../pmu-events/arch/s390/cf_z17/pai_crypto.json | 1213 ++++++++++++++++++++ + .../perf/pmu-events/arch/s390/cf_z17/pai_ext.json | 261 +++++ + .../pmu-events/arch/s390/cf_z17/transaction.json | 72 ++ + tools/perf/pmu-events/arch/s390/mapfile.csv | 1 + + .../perf/pmu-events/arch/x86/alderlake/cache.json | 56 +- + .../arch/x86/alderlake/floating-point.json | 1 - + .../perf/pmu-events/arch/x86/alderlake/other.json | 1 - + .../pmu-events/arch/x86/alderlake/pipeline.json | 44 +- + .../arch/x86/alderlake/virtual-memory.json | 3 - + .../perf/pmu-events/arch/x86/alderlaken/cache.json | 52 +- + .../arch/x86/alderlaken/floating-point.json | 1 - + .../perf/pmu-events/arch/x86/alderlaken/other.json | 1 - + .../pmu-events/arch/x86/alderlaken/pipeline.json | 42 +- + .../arch/x86/alderlaken/virtual-memory.json | 3 - + .../perf/pmu-events/arch/x86/arrowlake/cache.json | 13 +- + .../pmu-events/arch/x86/arrowlake/frontend.json | 135 +++ + .../arch/x86/cascadelakex/floating-point.json | 6 +- + .../pmu-events/arch/x86/cascadelakex/pipeline.json | 2 +- + .../arch/x86/emeraldrapids/pipeline.json | 2 +- + .../arch/x86/emeraldrapids/uncore-io.json | 12 + + .../arch/x86/emeraldrapids/uncore-memory.json | 20 + + .../arch/x86/grandridge/grr-metrics.json | 30 +- + .../arch/x86/grandridge/uncore-interconnect.json | 10 + + .../pmu-events/arch/x86/grandridge/uncore-io.json | 12 + + .../pmu-events/arch/x86/graniterapids/cache.json | 9 + + .../pmu-events/arch/x86/graniterapids/counter.json | 10 +- + .../arch/x86/graniterapids/gnr-metrics.json | 36 + + .../arch/x86/graniterapids/pipeline.json | 2 +- + .../x86/graniterapids/uncore-interconnect.json | 19 - + .../arch/x86/graniterapids/uncore-io.json | 27 +- + .../pmu-events/arch/x86/icelakex/pipeline.json | 2 +- + .../pmu-events/arch/x86/icelakex/uncore-cache.json | 2 - + .../perf/pmu-events/arch/x86/lunarlake/cache.json | 11 + + .../pmu-events/arch/x86/lunarlake/pipeline.json | 18 +- + .../arch/x86/lunarlake/virtual-memory.json | 18 - + tools/perf/pmu-events/arch/x86/mapfile.csv | 29 +- + .../perf/pmu-events/arch/x86/meteorlake/cache.json | 2 +- + .../pmu-events/arch/x86/meteorlake/frontend.json | 72 ++ + .../pmu-events/arch/x86/meteorlake/pipeline.json | 2 +- + .../pmu-events/arch/x86/pantherlake/cache.json | 278 +++++ + .../pmu-events/arch/x86/pantherlake/counter.json | 12 + + .../pmu-events/arch/x86/pantherlake/frontend.json | 30 + + .../pmu-events/arch/x86/pantherlake/memory.json | 215 ++++ + .../pmu-events/arch/x86/pantherlake/pipeline.json | 325 ++++++ + .../arch/x86/pantherlake/virtual-memory.json | 62 + + .../arch/x86/sapphirerapids/pipeline.json | 2 +- + .../arch/x86/sapphirerapids/uncore-io.json | 12 + + .../arch/x86/sapphirerapids/uncore-memory.json | 20 + + .../pmu-events/arch/x86/sierraforest/frontend.json | 64 ++ + .../pmu-events/arch/x86/sierraforest/pipeline.json | 8 + + .../arch/x86/sierraforest/srf-metrics.json | 48 + + .../arch/x86/sierraforest/uncore-cache.json | 6 +- + .../arch/x86/sierraforest/uncore-interconnect.json | 53 +- + .../arch/x86/sierraforest/uncore-io.json | 27 +- + .../pmu-events/arch/x86/skylakex/pipeline.json | 2 +- + .../pmu-events/arch/x86/tigerlake/pipeline.json | 2 +- + tools/perf/pmu-events/empty-pmu-events.c | 266 +++-- + tools/perf/pmu-events/jevents.py | 19 +- + tools/perf/pmu-events/pmu-events.h | 14 +- + tools/perf/scripts/python/flamegraph.py | 82 +- + tools/perf/tests/Build | 3 +- + tools/perf/tests/backward-ring-buffer.c | 1 - + tools/perf/tests/bp_account.c | 1 + + tools/perf/tests/builtin-test.c | 92 +- + tools/perf/tests/code-reading.c | 13 +- + tools/perf/tests/dlfilter-test.c | 51 +- + tools/perf/tests/dwarf-unwind.c | 10 +- + tools/perf/tests/event-times.c | 8 +- + tools/perf/tests/event_update.c | 4 +- + tools/perf/tests/expand-cgroup.c | 24 +- + tools/perf/tests/hists_cumulate.c | 8 +- + tools/perf/tests/hists_filter.c | 8 +- + tools/perf/tests/hists_link.c | 8 +- + tools/perf/tests/hists_output.c | 10 +- + tools/perf/tests/hwmon_pmu.c | 11 +- + tools/perf/tests/keep-tracking.c | 2 +- + tools/perf/tests/make | 8 +- + tools/perf/tests/mmap-basic.c | 309 +++-- + tools/perf/tests/mmap-thread-lookup.c | 6 +- + tools/perf/tests/openat-syscall-all-cpus.c | 2 +- + tools/perf/tests/openat-syscall-tp-fields.c | 1 - + tools/perf/tests/openat-syscall.c | 2 +- + tools/perf/tests/parse-events.c | 24 +- + tools/perf/tests/parse-metric.c | 16 +- + tools/perf/tests/pe-file-parsing.c | 2 +- + tools/perf/tests/perf-record.c | 1 - + tools/perf/tests/perf-targz-src-pkg | 2 +- + tools/perf/tests/perf-time-to-tsc.c | 2 +- + tools/perf/tests/pmu-events.c | 30 +- + tools/perf/tests/sample-parsing.c | 14 + + tools/perf/tests/sdt.c | 4 +- + tools/perf/tests/shell/amd-ibs-swfilt.sh | 2 +- + tools/perf/tests/shell/annotate.sh | 15 +- + tools/perf/tests/shell/buildid.sh | 2 +- + tools/perf/tests/shell/coresight/asm_pure_loop.sh | 2 +- + .../tests/shell/coresight/memcpy_thread_16k_10.sh | 2 +- + .../shell/coresight/thread_loop_check_tid_10.sh | 2 +- + .../shell/coresight/thread_loop_check_tid_2.sh | 2 +- + .../tests/shell/coresight/unroll_loop_thread_10.sh | 2 +- + tools/perf/tests/shell/diff.sh | 2 +- + tools/perf/tests/shell/drm_pmu.sh | 78 ++ + tools/perf/tests/shell/ftrace.sh | 2 +- + tools/perf/tests/shell/header.sh | 74 ++ + tools/perf/tests/shell/lib/perf_has_symbol.sh | 2 +- + .../perf/tests/shell/lib/perf_json_output_lint.py | 4 +- + tools/perf/tests/shell/lib/probe_vfs_getname.sh | 2 +- + tools/perf/tests/shell/lib/setup_python.sh | 2 +- + tools/perf/tests/shell/lib/waiting.sh | 2 +- + tools/perf/tests/shell/list.sh | 2 +- + tools/perf/tests/shell/lock_contention.sh | 28 +- + tools/perf/tests/shell/perf-report-hierarchy.sh | 2 +- + tools/perf/tests/shell/probe_vfs_getname.sh | 2 +- + .../tests/shell/record+probe_libc_inet_pton.sh | 7 +- + .../tests/shell/record+script_probe_vfs_getname.sh | 2 +- + tools/perf/tests/shell/record+zstd_comp_decomp.sh | 2 +- + tools/perf/tests/shell/record.sh | 56 + + tools/perf/tests/shell/record_bpf_filter.sh | 2 +- + tools/perf/tests/shell/record_offcpu.sh | 2 +- + tools/perf/tests/shell/record_sideband.sh | 2 +- + tools/perf/tests/shell/sched.sh | 116 ++ + tools/perf/tests/shell/script.sh | 2 +- + tools/perf/tests/shell/stat+csv_summary.sh | 2 +- + tools/perf/tests/shell/stat+shadow_stat.sh | 2 +- + tools/perf/tests/shell/stat_all_pfm.sh | 2 +- + tools/perf/tests/shell/stat_bpf_counters.sh | 2 +- + tools/perf/tests/shell/stat_bpf_counters_cgrp.sh | 2 +- + tools/perf/tests/shell/test_arm_callgraph_fp.sh | 2 +- + tools/perf/tests/shell/test_arm_coresight.sh | 2 +- + .../perf/tests/shell/test_arm_coresight_disasm.sh | 2 +- + tools/perf/tests/shell/test_arm_spe.sh | 2 +- + tools/perf/tests/shell/test_arm_spe_fork.sh | 2 +- + tools/perf/tests/shell/test_bpf_metadata.sh | 76 ++ + tools/perf/tests/shell/test_intel_pt.sh | 2 +- + tools/perf/tests/shell/trace+probe_vfs_getname.sh | 2 +- + tools/perf/tests/shell/trace_btf_enum.sh | 19 +- + tools/perf/tests/shell/trace_btf_general.sh | 19 +- + tools/perf/tests/shell/trace_exit_race.sh | 2 +- + tools/perf/tests/shell/trace_record_replay.sh | 2 +- + tools/perf/tests/shell/trace_summary.sh | 2 +- + tools/perf/tests/subcmd-help.c | 108 ++ + tools/perf/tests/switch-tracking.c | 2 +- + tools/perf/tests/symbols.c | 12 +- + tools/perf/tests/task-exit.c | 1 - + tools/perf/tests/tests-scripts.c | 2 +- + tools/perf/tests/tests.h | 11 + + tools/perf/tests/thread-map.c | 2 +- + tools/perf/tests/topology.c | 39 +- + tools/perf/tests/util.c | 45 +- + tools/perf/tests/workloads/noploop.c | 2 + + tools/perf/trace/beauty/Build | 2 +- + tools/perf/ui/browser.h | 4 +- + tools/perf/ui/browsers/annotate.c | 86 +- + tools/perf/ui/browsers/header.c | 4 +- + tools/perf/ui/browsers/hists.c | 2 +- + tools/perf/ui/browsers/scripts.c | 2 +- + tools/perf/ui/tui/setup.c | 2 +- + tools/perf/util/Build | 6 +- + tools/perf/util/affinity.c | 18 + + tools/perf/util/affinity.h | 2 + + tools/perf/util/amd-sample-raw.c | 2 +- + tools/perf/util/annotate.c | 2 + + tools/perf/util/annotate.h | 1 + + tools/perf/util/arm-spe.c | 2 +- + tools/perf/util/auxtrace.c | 13 +- + tools/perf/util/auxtrace.h | 6 +- + tools/perf/util/bpf-event.c | 380 +++++- + tools/perf/util/bpf-event.h | 13 + + tools/perf/util/bpf-filter.c | 30 +- + tools/perf/util/bpf-filter.h | 3 + + tools/perf/util/bpf_ftrace.c | 75 +- + .../util/bpf_skel/augmented_raw_syscalls.bpf.c | 3 +- + tools/perf/util/bpf_skel/func_latency.bpf.c | 166 ++- + tools/perf/util/bpf_skel/perf_version.h | 17 + + tools/perf/util/bpf_trace_augment.c | 143 +++ + tools/perf/util/branch.c | 2 +- + tools/perf/util/build-id.c | 63 +- + tools/perf/util/build-id.h | 8 +- + tools/perf/util/cap.c | 1 - + tools/perf/util/cap.h | 5 + + tools/perf/util/cgroup.c | 23 +- + tools/perf/util/cgroup.h | 3 +- + tools/perf/util/comm.c | 2 + + tools/perf/util/data-convert-bt.c | 16 +- + tools/perf/util/data-convert-json.c | 36 +- + tools/perf/util/db-export.c | 11 +- + tools/perf/util/debug.c | 75 +- + tools/perf/util/debug.h | 1 + + tools/perf/util/debuginfo.c | 2 +- + tools/perf/util/disasm.c | 9 +- + tools/perf/util/dlfilter.c | 2 +- + tools/perf/util/drm_pmu.c | 686 +++++++++++ + tools/perf/util/drm_pmu.h | 39 + + tools/perf/util/dso.c | 115 +- + tools/perf/util/dso.h | 75 +- + tools/perf/util/dsos.c | 20 +- + tools/perf/util/env.c | 132 ++- + tools/perf/util/env.h | 9 +- + tools/perf/util/event.c | 23 +- + tools/perf/util/event.h | 6 +- + tools/perf/util/evlist.c | 21 +- + tools/perf/util/evlist.h | 9 +- + tools/perf/util/evsel.c | 125 +- + tools/perf/util/evsel.h | 8 + + tools/perf/util/expr.c | 8 +- + tools/perf/util/ftrace.h | 5 + + tools/perf/util/genelf.c | 87 +- + tools/perf/util/header.c | 258 +++-- + tools/perf/util/header.h | 1 + + tools/perf/util/hist.c | 4 +- + tools/perf/util/hist.h | 3 +- + tools/perf/util/hwmon_pmu.c | 40 +- + tools/perf/util/hwmon_pmu.h | 4 +- + tools/perf/util/intel-tpebs.c | 4 +- + tools/perf/util/jitdump.c | 19 +- + tools/perf/util/machine.c | 44 +- + tools/perf/util/machine.h | 6 +- + tools/perf/util/map.c | 15 +- + tools/perf/util/map.h | 5 +- + tools/perf/util/metricgroup.c | 277 +---- + tools/perf/util/metricgroup.h | 10 +- + tools/perf/util/parse-events.c | 440 +++---- + tools/perf/util/parse-events.h | 5 +- + tools/perf/util/parse-events.l | 38 +- + tools/perf/util/parse-events.y | 29 +- + tools/perf/util/pfm.c | 6 +- + tools/perf/util/pmu.c | 63 +- + tools/perf/util/pmu.h | 5 +- + tools/perf/util/pmus.c | 134 ++- + tools/perf/util/pmus.h | 7 +- + tools/perf/util/print-events.c | 233 ++-- + tools/perf/util/print-events.h | 4 +- + tools/perf/util/probe-event.c | 12 +- + tools/perf/util/probe-file.c | 4 +- + tools/perf/util/probe-finder.c | 5 +- + tools/perf/util/python.c | 145 ++- + tools/perf/util/s390-cpumsf.c | 2 +- + tools/perf/util/sample-raw.c | 7 +- + tools/perf/util/sample-raw.h | 2 +- + tools/perf/util/sample.h | 6 +- + .../util/scripting-engines/trace-event-python.c | 9 +- + tools/perf/util/session.c | 23 +- + tools/perf/util/session.h | 7 +- + tools/perf/util/sha1.c | 97 ++ + tools/perf/util/sha1.h | 6 + + tools/perf/util/sort.c | 93 +- + tools/perf/util/sort.h | 5 +- + tools/perf/util/spark.c | 8 +- + tools/perf/util/spark.h | 1 + + tools/perf/util/srcline.c | 10 +- + tools/perf/util/stat-display.c | 50 +- + tools/perf/util/stat-shadow.c | 12 +- + tools/perf/util/stat.c | 8 +- + tools/perf/util/stat.h | 12 +- + tools/perf/util/symbol-minimal.c | 2 +- + tools/perf/util/symbol.c | 10 +- + tools/perf/util/symbol_conf.h | 2 +- + tools/perf/util/synthetic-events.c | 58 +- + tools/perf/util/synthetic-events.h | 2 + + tools/perf/util/target.c | 54 +- + tools/perf/util/target.h | 15 +- + tools/perf/util/thread.c | 26 +- + tools/perf/util/thread.h | 11 +- + tools/perf/util/thread_map.c | 32 +- + tools/perf/util/thread_map.h | 6 +- + tools/perf/util/tool.c | 16 +- + tools/perf/util/tool.h | 3 +- + tools/perf/util/tool_pmu.c | 56 +- + tools/perf/util/tool_pmu.h | 2 +- + tools/perf/util/top.c | 4 +- + tools/perf/util/top.h | 1 + + tools/perf/util/tp_pmu.c | 210 ++++ + tools/perf/util/tp_pmu.h | 19 + + tools/perf/util/trace_augment.h | 62 +- + tools/perf/util/unwind-libdw.c | 7 +- + 359 files changed, 10632 insertions(+), 3344 deletions(-) + create mode 100644 tools/build/feature/test-libbpf-strings.c + delete mode 100644 tools/build/feature/test-libcrypto.c + delete mode 100644 tools/perf/arch/powerpc/util/event.c + delete mode 100644 tools/perf/arch/x86/tests/sample-parsing.c + create mode 100644 tools/perf/arch/x86/tests/topdown.c + create mode 100644 tools/perf/pmu-events/arch/common/common/software.json + create mode 100644 tools/perf/pmu-events/arch/s390/cf_z17/basic.json + create mode 100644 tools/perf/pmu-events/arch/s390/cf_z17/crypto6.json + create mode 100644 tools/perf/pmu-events/arch/s390/cf_z17/extended.json + create mode 100644 tools/perf/pmu-events/arch/s390/cf_z17/pai_crypto.json + create mode 100644 tools/perf/pmu-events/arch/s390/cf_z17/pai_ext.json + create mode 100644 tools/perf/pmu-events/arch/s390/cf_z17/transaction.json + create mode 100644 tools/perf/pmu-events/arch/x86/pantherlake/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/pantherlake/counter.json + create mode 100644 tools/perf/pmu-events/arch/x86/pantherlake/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/pantherlake/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/pantherlake/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/pantherlake/virtual-memory.json + create mode 100755 tools/perf/tests/shell/drm_pmu.sh + create mode 100755 tools/perf/tests/shell/header.sh + create mode 100755 tools/perf/tests/shell/sched.sh + create mode 100755 tools/perf/tests/shell/test_bpf_metadata.sh + create mode 100644 tools/perf/tests/subcmd-help.c + create mode 100644 tools/perf/util/bpf_skel/perf_version.h + create mode 100644 tools/perf/util/bpf_trace_augment.c + create mode 100644 tools/perf/util/drm_pmu.c + create mode 100644 tools/perf/util/drm_pmu.h + create mode 100644 tools/perf/util/sha1.c + create mode 100644 tools/perf/util/sha1.h + create mode 100644 tools/perf/util/tp_pmu.c + create mode 100644 tools/perf/util/tp_pmu.h +Merging compiler-attributes/compiler-attributes (98f7e32f20d2 Linux 6.11) +$ 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/dma-mapping-for-next (fbf5e2234169 dma-mapping: properly calculate offset in the page) +$ git merge -m Merge branch 'dma-mapping-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next +Auto-merging Documentation/core-api/dma-api.rst +Auto-merging drivers/virtio/virtio_ring.c +Auto-merging mm/hmm.c +Merge made by the 'ort' strategy. + Documentation/core-api/dma-api.rst | 4 +-- + arch/powerpc/kernel/dma-iommu.c | 4 +-- + drivers/iommu/dma-iommu.c | 14 ++++---- + drivers/virtio/virtio_ring.c | 4 +-- + include/linux/dma-map-ops.h | 8 ++--- + include/linux/dma-mapping.h | 13 ++++++++ + include/linux/iommu-dma.h | 7 ++-- + include/linux/kmsan.h | 12 ++++--- + include/trace/events/dma.h | 4 +-- + kernel/dma/debug.c | 28 ++++++++++------ + kernel/dma/debug.h | 16 ++++----- + kernel/dma/direct.c | 6 ++-- + kernel/dma/direct.h | 13 ++++---- + kernel/dma/mapping.c | 68 +++++++++++++++++++++++++++----------- + kernel/dma/ops_helpers.c | 6 ++-- + mm/hmm.c | 8 ++--- + mm/kmsan/hooks.c | 36 ++++++++++++++++---- + tools/virtio/linux/kmsan.h | 2 +- + 18 files changed, 160 insertions(+), 93 deletions(-) +Merging asm-generic/master (582847f97024 Makefile.kcov: apply needed compiler option unconditionally in CFLAGS_KCOV) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date. +Merging alpha/alpha-next (1523226edda5 alpha: Use str_yes_no() helper in pci_dac_dma_supported()) +$ git merge -m Merge branch 'alpha-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next +Already up to date. +Merging arm/for-next (8dd85887ad83 Merge branches 'fixes' and 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Merge made by the 'ort' strategy. + arch/arm/include/asm/cti.h | 160 --------------------------------------------- + 1 file changed, 160 deletions(-) + delete mode 100644 arch/arm/include/asm/cti.h +Merging arm64/for-next/core (5b1ae9de7133 Merge branch 'for-next/feat_mte_store_only' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Already up to date. +Merging arm-perf/for-next/perf (e480898e767c drivers/perf: hisi: Support PMUs with no interrupt) +$ 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 (9f9d41d64322 Merge tag 'arm-soc/for-6.17/drivers-part2' of https://github.com/Broadcom/stblinux into arm/fixes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Already up to date. +Merging amlogic/for-next (58abdca0eb65 Merge branch 'v6.17/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. +Merging asahi-soc/asahi-soc/for-next (19272b37aa4f Linux 6.16-rc1) +$ 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 at91/at91-next (e99113d11171 Merge branch 'clk-microchip' 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 bmc/for-next (ef8e64bf72d8 Merge branches 'aspeed/drivers', 'aspeed/dt', 'nuvoton/arm/dt' and 'nuvoton/arm64/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git bmc/for-next +Auto-merging arch/arm64/boot/dts/nuvoton/nuvoton-common-npcm8xx.dtsi +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 3 + + arch/arm/boot/dts/aspeed/Makefile | 3 + + .../boot/dts/aspeed/aspeed-bmc-facebook-darwin.dts | 72 ++ + .../boot/dts/aspeed/aspeed-bmc-facebook-elbert.dts | 12 + + .../dts/aspeed/aspeed-bmc-facebook-fuji-data64.dts | 1256 ++++++++++++++++++++ + .../boot/dts/aspeed/aspeed-bmc-facebook-fuji.dts | 1247 +------------------ + .../aspeed/aspeed-bmc-facebook-wedge400-data64.dts | 375 ++++++ + .../dts/aspeed/aspeed-bmc-facebook-wedge400.dts | 366 +----- + .../dts/aspeed/aspeed-bmc-nvidia-gb200nvl-bmc.dts | 54 +- + .../dts/aspeed/ast2600-facebook-netbmc-common.dtsi | 22 +- + .../facebook-bmc-flash-layout-128-data64.dtsi | 60 + + .../boot/dts/nuvoton/nuvoton-common-npcm7xx.dtsi | 2 +- + arch/arm/boot/dts/nuvoton/nuvoton-npcm750.dtsi | 2 +- + .../boot/dts/nuvoton/nuvoton-common-npcm8xx.dtsi | 669 ++++++++++- + .../arm64/boot/dts/nuvoton/nuvoton-npcm845-evb.dts | 6 + + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 14 +- + drivers/soc/aspeed/aspeed-p2a-ctrl.c | 14 +- + 17 files changed, 2519 insertions(+), 1658 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-darwin.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-fuji-data64.dts + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-wedge400-data64.dts + create mode 100644 arch/arm/boot/dts/aspeed/facebook-bmc-flash-layout-128-data64.dtsi +Merging broadcom/next (89abb622d518 Merge branch 'drivers/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. +Merging davinci/davinci/for-next (19272b37aa4f Linux 6.16-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 (93a7aedc4cc4 dt-bindings: memory: renesas,rzg3e-xspi: Document RZ/V2H(P) and RZ/V2N support) +$ 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 fsl/soc_fsl (8b3da0519ae6 soc: fsl: qe: convert set_multiple() to returning an integer) +$ git merge -m Merge branch 'soc_fsl' of https://github.com/chleroy/linux.git fsl/soc_fsl +Merge made by the 'ort' strategy. +Merging imx-mxs/for-next (cdc22fb12eff 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 (6cbb623586d5 Merge branches 'v6.16-next/arm32', 'v6.16-next/dts32', 'v6.16-next/dts64' and 'v6.16-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (88084e0358ff Merge branch 'mvebu/dt' 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 (db91121f001a Merge branch 'omap-for-v6.17/soc' into tmp/omap-next-20250707.142928) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm/configs/omap2plus_defconfig +Merge made by the 'ort' strategy. +Merging qcom/for-next (ba94ec807b07 Merge branches 'arm32-for-6.17', 'arm64-defconfig-fixes-for-6.16', 'arm64-defconfig-for-6.17', 'arm64-fixes-for-6.16', 'arm64-for-6.17', 'clk-for-6.17' and 'drivers-for-6.17' 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. + Documentation/devicetree/bindings/arm/qcom.yaml | 9 + + arch/arm/boot/dts/qcom/Makefile | 1 + + arch/arm/boot/dts/qcom/pm8921.dtsi | 6 + + arch/arm/boot/dts/qcom/qcom-msm8960-pins.dtsi | 40 +++ + .../dts/qcom/qcom-msm8960-samsung-expressatt.dts | 5 + + .../boot/dts/qcom/qcom-msm8960-sony-huashan.dts | 361 +++++++++++++++++++++ + arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 32 ++ + arch/arm64/boot/dts/qcom/ipq5018.dtsi | 226 ++++++++++++- + arch/arm64/boot/dts/qcom/ipq5424-rdp466.dts | 26 +- + arch/arm64/boot/dts/qcom/ipq5424.dtsi | 27 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 8 - + arch/arm64/boot/dts/qcom/qcs615-ride.dts | 4 +- + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sar2130p.dtsi | 23 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 8 - + arch/arm64/boot/dts/qcom/sdm845.dtsi | 16 +- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 104 +++++- + .../boot/dts/qcom/{qcs615.dtsi => sm6150.dtsi} | 6 + + arch/arm64/boot/dts/qcom/sm6350.dtsi | 11 + + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 36 ++ + arch/arm64/boot/dts/qcom/sm8250.dtsi | 8 - + .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 143 ++++++++ + arch/arm64/boot/dts/qcom/x1e80100.dtsi | 7 + + arch/arm64/boot/dts/qcom/x1p42100-crd.dts | 4 + + arch/arm64/boot/dts/qcom/x1p42100.dtsi | 120 ++++++- + 25 files changed, 1173 insertions(+), 60 deletions(-) + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8960-sony-huashan.dts + rename arch/arm64/boot/dts/qcom/{qcs615.dtsi => sm6150.dtsi} (99%) +Merging renesas/next (7a323accaf6b Merge branches 'renesas-arm-defconfig-for-v6.17', 'renesas-drivers-for-v6.17', 'renesas-dt-bindings-for-v6.17' and 'renesas-dts-for-v6.17' 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 (335bb23abed3 MAINTAINERS: Use https:// protocol for Reset Controller Framework tree) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rockchip/for-next (1f0c7abd8235 Merge branch 'v6.16-armsoc/dtsfixes' 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. +Merging samsung-krzk/for-next (94f19ac4670d Merge branch 'next/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. +Merging scmi/for-linux-next (038d61fd6422 Linux 6.16) +$ 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 +Already up to date. +Merging sophgo/for-next (349ae53a949c Merge branch 'dt/riscv' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Merge made by the 'ort' strategy. +Merging sophgo-soc/soc-for-next (c8754c7deab4 soc: sophgo: cv1800: rtcsys: New driver (handling RTC only)) +$ git merge -m Merge branch 'soc-for-next' of https://github.com/sophgo/linux.git sophgo-soc/soc-for-next +Already up to date. +Merging spacemit/for-next (6be7a5a768aa Merge branch 'spacemit-clk-for-6.17' into spacemit-for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/spacemit-com/linux spacemit/for-next +Merge made by the 'ort' strategy. +Merging stm32/stm32-next (1a32f7427eb3 arm64: dts: st: remove empty line in stm32mp251.dtsi) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Already up to date. +Merging sunxi/sunxi/for-next (cbe908fc8ebb Merge branch 'sunxi/dt-for-6.17' 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 (c580875fc93a Merge branch 'optee_fix_for_6.16' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git tee/next +Merge made by the 'ort' strategy. +Merging tegra/for-next (499b75defe56 Merge branch for-6.17/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. + Documentation/devicetree/bindings/arm/tegra/nvidia,tegra234-cbb.yaml | 4 ++++ + arch/arm64/boot/dts/nvidia/tegra264.dtsi | 3 --- + drivers/firmware/tegra/bpmp-tegra186.c | 5 ++++- + 3 files changed, 8 insertions(+), 4 deletions(-) +Merging thead-dt/thead-dt-for-next (c31f2899eab0 riscv: dts: thead: Add PVT node) +$ git merge -m Merge branch 'thead-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt/thead-dt-for-next +Already up to date. +Merging ti/ti-next (65f6e3eb6351 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 (7f9c1c0a006e Merge branch 'zynqmp/soc' into for-next2) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/xilinx/versal-net.dtsi | 2 +- + drivers/firmware/xilinx/zynqmp-debug.c | 13 ++++ + drivers/firmware/xilinx/zynqmp.c | 114 +++++++++++++++++++++-------- + drivers/pinctrl/pinctrl-zynqmp.c | 7 +- + drivers/soc/xilinx/xlnx_event_manager.c | 8 +- + drivers/soc/xilinx/zynqmp_power.c | 10 ++- + include/linux/firmware/xlnx-zynqmp.h | 30 ++++---- + 7 files changed, 129 insertions(+), 55 deletions(-) +Merging clk/clk-next (64c21f253a37 Merge branch 'clk-fixes' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (c78865241ecf MAINTAINERS: Update i.MX Clock Entry) +$ 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 (0ab2d84f94da clk: renesas: r9a08g045: Add MSTOP for coupled clocks as well) +$ 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 thead-clk/thead-clk-for-next (54edba916e29 clk: thead: th1520-ap: Describe mux clocks with clk_mux) +$ git merge -m Merge branch 'thead-clk-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk/thead-clk-for-next +Already up to date. +Merging csky/linux-next (2b48804336be csky: fix csky_cmpxchg_fixup not working) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Merge made by the 'ort' strategy. + arch/csky/mm/fault.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging loongarch/loongarch-next (36d09b96d3e7 LoongArch: KVM: Add tracepoints for CPUCFG and CSR emulation exits) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Already up to date. +Merging m68k/for-next (c8995932db2b m68k: mac: Improve clocksource driver commentary) +$ 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 (89be9a83ccf1 Linux 6.16-rc7) +$ 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 (c0e7bb02f796 microblaze: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Auto-merging arch/microblaze/include/asm/pgtable.h +Merge made by the 'ort' strategy. + arch/microblaze/Kconfig.platform | 10 +++++----- + arch/microblaze/include/asm/asm-compat.h | 2 +- + arch/microblaze/include/asm/current.h | 4 ++-- + arch/microblaze/include/asm/entry.h | 4 ++-- + arch/microblaze/include/asm/exceptions.h | 4 ++-- + arch/microblaze/include/asm/fixmap.h | 4 ++-- + arch/microblaze/include/asm/ftrace.h | 2 +- + arch/microblaze/include/asm/kgdb.h | 4 ++-- + arch/microblaze/include/asm/mmu.h | 4 ++-- + arch/microblaze/include/asm/page.h | 8 ++++---- + arch/microblaze/include/asm/pgtable.h | 18 +++++++++--------- + arch/microblaze/include/asm/processor.h | 8 ++++---- + arch/microblaze/include/asm/ptrace.h | 4 ++-- + arch/microblaze/include/asm/sections.h | 4 ++-- + arch/microblaze/include/asm/setup.h | 4 ++-- + arch/microblaze/include/asm/thread_info.h | 4 ++-- + arch/microblaze/include/asm/unistd.h | 4 ++-- + arch/microblaze/include/asm/xilinx_mb_manager.h | 4 ++-- + arch/microblaze/include/uapi/asm/ptrace.h | 4 ++-- + 19 files changed, 50 insertions(+), 50 deletions(-) +Merging mips/mips-next (3ebcbf079c26 MIPS: Don't use %pK through printk) +$ 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 (f0eedcf22581 openrisc: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Auto-merging arch/openrisc/include/asm/pgtable.h +Merge made by the 'ort' strategy. + arch/openrisc/include/asm/mmu.h | 2 +- + arch/openrisc/include/asm/page.h | 8 ++++---- + arch/openrisc/include/asm/pgtable.h | 4 ++-- + arch/openrisc/include/asm/processor.h | 4 ++-- + arch/openrisc/include/asm/ptrace.h | 4 ++-- + arch/openrisc/include/asm/setup.h | 2 +- + arch/openrisc/include/asm/thread_info.h | 8 ++++---- + arch/openrisc/include/uapi/asm/ptrace.h | 2 +- + 8 files changed, 17 insertions(+), 17 deletions(-) +Merging parisc-hd/for-next (89f686a0fb6e parisc: Revise __get_user() to probe user read access) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/Makefile | 6 ++++-- + arch/parisc/include/asm/pgtable.h | 7 ++++--- + arch/parisc/include/asm/special_insns.h | 28 ++++++++++++++++++++++++++++ + arch/parisc/include/asm/uaccess.h | 21 ++++++++++++++++++--- + arch/parisc/kernel/cache.c | 6 +++--- + arch/parisc/kernel/entry.S | 17 ++++++++++++----- + arch/parisc/kernel/syscall.S | 30 +++++++++++++++++++++--------- + arch/parisc/lib/memcpy.c | 19 ++++++++++++++++++- + arch/parisc/mm/fault.c | 4 ++++ + 9 files changed, 112 insertions(+), 26 deletions(-) +Merging powerpc/next (cf2a6de32cab powerpc64/bpf: Add jit support for load_acquire and store_release) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging Documentation/arch/powerpc/index.rst +Auto-merging arch/powerpc/net/bpf_jit_comp64.c +Auto-merging tools/testing/selftests/bpf/progs/bpf_misc.h +Merge made by the 'ort' strategy. + Documentation/arch/powerpc/index.rst | 1 + + arch/powerpc/include/asm/ppc-opcode.h | 1 + + arch/powerpc/kernel/eeh.c | 1 + + arch/powerpc/kernel/eeh_driver.c | 48 +++-- + arch/powerpc/kernel/eeh_pe.c | 10 +- + arch/powerpc/kernel/pci-hotplug.c | 3 + + arch/powerpc/net/bpf_jit_comp64.c | 82 +++++++++ + drivers/pci/hotplug/pnv_php.c | 250 ++++++++++++++++++++++++--- + tools/testing/selftests/bpf/progs/bpf_misc.h | 3 +- + 9 files changed, 354 insertions(+), 45 deletions(-) +Merging risc-v/for-next (fda589c28604 Merge patch series "Move duplicated instructions macros into asm/insn.h") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/configs/defconfig +Auto-merging arch/riscv/kernel/traps_misaligned.c +Merge made by the 'ort' strategy. + arch/riscv/configs/defconfig | 5 +- + arch/riscv/include/asm/insn.h | 206 +++++++++++++++++++++++++++++---- + arch/riscv/kernel/machine_kexec_file.c | 2 +- + arch/riscv/kernel/traps_misaligned.c | 144 +---------------------- + arch/riscv/kernel/vector.c | 2 +- + arch/riscv/kvm/vcpu_insn.c | 128 +------------------- + 6 files changed, 190 insertions(+), 297 deletions(-) +Merging riscv-dt/riscv-dt-for-next (28fa0dcb571a dt-bindings: riscv: cpus: Add AMD MicroBlaze V 64bit compatible) +$ 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 (bd4d5d3faadc riscv: defconfig: spacemit: enable sdhci driver for K1 SoC) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Already up to date. +Merging s390/for-next (d3a0de1a9dbc Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/kernel/setup.c +Merge made by the 'ort' strategy. + arch/s390/Kconfig | 3 +++ + arch/s390/include/asm/ap.h | 2 +- + arch/s390/include/asm/pgtable.h | 45 +++++++++++++++++++++++++++++++++++++++++ + arch/s390/kernel/setup.c | 6 ++++++ + drivers/s390/crypto/ap_bus.h | 2 +- + 5 files changed, 56 insertions(+), 2 deletions(-) +Merging sh/for-next (c32969d0362a sh: Do not use hyphen in exported variable name) +$ 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 (2cec2c4dc90c sparc/irq: Remove unneeded if check in sun4v_cookie_only_virqs()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Already up to date. +Merging uml/next (fc9ed2f6589d um: Replace __ASSEMBLY__ with __ASSEMBLER__ in the usermode headers) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (44a4ef59d550 xtensa: Replace __ASSEMBLY__ with __ASSEMBLER__ in non-uapi headers) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Auto-merging arch/xtensa/include/asm/pgtable.h +Auto-merging arch/xtensa/include/asm/ptrace.h +Merge made by the 'ort' strategy. + arch/xtensa/include/asm/bootparam.h | 2 +- + arch/xtensa/include/asm/cmpxchg.h | 4 ++-- + arch/xtensa/include/asm/coprocessor.h | 8 ++++---- + arch/xtensa/include/asm/current.h | 2 +- + arch/xtensa/include/asm/ftrace.h | 8 ++++---- + arch/xtensa/include/asm/initialize_mmu.h | 4 ++-- + arch/xtensa/include/asm/jump_label.h | 4 ++-- + arch/xtensa/include/asm/kasan.h | 2 +- + arch/xtensa/include/asm/kmem_layout.h | 2 +- + arch/xtensa/include/asm/page.h | 4 ++-- + arch/xtensa/include/asm/pgtable.h | 8 ++++---- + arch/xtensa/include/asm/processor.h | 4 ++-- + arch/xtensa/include/asm/ptrace.h | 6 +++--- + arch/xtensa/include/asm/signal.h | 4 ++-- + arch/xtensa/include/asm/thread_info.h | 8 ++++---- + arch/xtensa/include/asm/tlbflush.h | 4 ++-- + arch/xtensa/include/uapi/asm/ptrace.h | 2 +- + arch/xtensa/include/uapi/asm/signal.h | 6 +++--- + arch/xtensa/include/uapi/asm/types.h | 4 ++-- + 19 files changed, 43 insertions(+), 43 deletions(-) +Merging fs-next (4537c1c375dd Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 22 + + Documentation/filesystems/f2fs.rst | 6 +- + .../filesystems/{ => fuse}/fuse-io-uring.rst | 0 + Documentation/filesystems/{ => fuse}/fuse-io.rst | 2 +- + .../filesystems/{ => fuse}/fuse-passthrough.rst | 0 + Documentation/filesystems/{ => fuse}/fuse.rst | 20 +- + Documentation/filesystems/fuse/index.rst | 14 + + Documentation/filesystems/index.rst | 5 +- + MAINTAINERS | 3 +- + fs/bcachefs/acl.c | 29 +- + fs/bcachefs/alloc_background.c | 512 ++--- + fs/bcachefs/alloc_background.h | 9 +- + fs/bcachefs/alloc_foreground.c | 258 +-- + fs/bcachefs/alloc_foreground.h | 9 +- + fs/bcachefs/async_objs.c | 29 +- + fs/bcachefs/async_objs.h | 7 +- + fs/bcachefs/async_objs_types.h | 2 +- + fs/bcachefs/backpointers.c | 145 +- + fs/bcachefs/bcachefs.h | 70 +- + fs/bcachefs/bkey.c | 4 +- + fs/bcachefs/bset.c | 74 +- + fs/bcachefs/btree_cache.c | 38 +- + fs/bcachefs/btree_cache.h | 11 + + fs/bcachefs/btree_gc.c | 131 +- + fs/bcachefs/btree_io.c | 121 +- + fs/bcachefs/btree_iter.c | 356 ++-- + fs/bcachefs/btree_iter.h | 344 +-- + fs/bcachefs/btree_journal_iter.c | 20 +- + fs/bcachefs/btree_key_cache.c | 68 +- + fs/bcachefs/btree_locking.c | 17 +- + fs/bcachefs/btree_node_scan.c | 32 +- + fs/bcachefs/btree_trans_commit.c | 123 +- + fs/bcachefs/btree_types.h | 25 +- + fs/bcachefs/btree_update.c | 286 ++- + fs/bcachefs/btree_update.h | 133 +- + fs/bcachefs/btree_update_interior.c | 363 ++-- + fs/bcachefs/btree_update_interior.h | 12 +- + fs/bcachefs/btree_write_buffer.c | 68 +- + fs/bcachefs/btree_write_buffer.h | 6 +- + fs/bcachefs/buckets.c | 258 +-- + fs/bcachefs/buckets_waiting_for_journal.c | 30 +- + fs/bcachefs/chardev.c | 120 +- + fs/bcachefs/checksum.c | 54 +- + fs/bcachefs/clock.c | 17 +- + fs/bcachefs/compress.c | 29 +- + fs/bcachefs/compress.h | 36 +- + fs/bcachefs/data_update.c | 47 +- + fs/bcachefs/debug.c | 88 +- + fs/bcachefs/dirent.c | 75 +- + fs/bcachefs/dirent.h | 4 +- + fs/bcachefs/disk_accounting.c | 267 ++- + fs/bcachefs/disk_accounting.h | 9 +- + fs/bcachefs/disk_groups.c | 27 +- + fs/bcachefs/ec.c | 362 ++-- + fs/bcachefs/ec.h | 2 +- + fs/bcachefs/enumerated_ref.c | 4 +- + fs/bcachefs/errcode.c | 3 +- + fs/bcachefs/errcode.h | 13 + + fs/bcachefs/error.c | 65 +- + fs/bcachefs/extent_update.c | 13 +- + fs/bcachefs/extents.c | 38 +- + fs/bcachefs/extents.h | 3 + + fs/bcachefs/fast_list.c | 32 +- + fs/bcachefs/fast_list.h | 2 +- + fs/bcachefs/fs-io-buffered.c | 95 +- + fs/bcachefs/fs-io-direct.c | 26 +- + fs/bcachefs/fs-io-pagecache.c | 55 +- + fs/bcachefs/fs-io.c | 141 +- + fs/bcachefs/fs-io.h | 19 +- + fs/bcachefs/fs-ioctl.c | 33 +- + fs/bcachefs/fs.c | 238 +-- + fs/bcachefs/fsck.c | 658 +++--- + fs/bcachefs/inode.c | 245 +-- + fs/bcachefs/io_misc.c | 71 +- + fs/bcachefs/io_read.c | 235 ++- + fs/bcachefs/io_read.h | 24 +- + fs/bcachefs/io_write.c | 97 +- + fs/bcachefs/journal.c | 253 ++- + fs/bcachefs/journal.h | 3 +- + fs/bcachefs/journal_io.c | 248 +-- + fs/bcachefs/journal_io.h | 7 + + fs/bcachefs/journal_reclaim.c | 220 +- + fs/bcachefs/journal_seq_blacklist.c | 56 +- + fs/bcachefs/journal_seq_blacklist.h | 3 + + fs/bcachefs/logged_ops.c | 16 +- + fs/bcachefs/lru.c | 48 +- + fs/bcachefs/migrate.c | 31 +- + fs/bcachefs/move.c | 294 ++- + fs/bcachefs/move.h | 14 +- + fs/bcachefs/movinggc.c | 22 +- + fs/bcachefs/namei.c | 159 +- + fs/bcachefs/nocow_locking.c | 10 +- + fs/bcachefs/opts.c | 33 +- + fs/bcachefs/opts.h | 8 +- + fs/bcachefs/printbuf.h | 4 + + fs/bcachefs/progress.c | 6 +- + fs/bcachefs/progress.h | 3 + + fs/bcachefs/quota.c | 103 +- + fs/bcachefs/rebalance.c | 135 +- + fs/bcachefs/recovery.c | 225 +- + fs/bcachefs/recovery_passes.c | 68 +- + fs/bcachefs/recovery_passes.h | 9 +- + fs/bcachefs/reflink.c | 137 +- + fs/bcachefs/replicas.c | 161 +- + fs/bcachefs/sb-clean.c | 36 +- + fs/bcachefs/sb-counters_format.h | 6 + + fs/bcachefs/sb-downgrade.c | 19 +- + fs/bcachefs/sb-errors.c | 45 +- + fs/bcachefs/sb-errors_format.h | 9 +- + fs/bcachefs/sb-members.c | 50 +- + fs/bcachefs/sb-members.h | 19 +- + fs/bcachefs/sb-members_format.h | 2 +- + fs/bcachefs/six.c | 21 +- + fs/bcachefs/snapshot.c | 435 ++-- + fs/bcachefs/snapshot.h | 32 +- + fs/bcachefs/snapshot_types.h | 2 +- + fs/bcachefs/str_hash.c | 57 +- + fs/bcachefs/str_hash.h | 47 +- + fs/bcachefs/subvolume.c | 246 +-- + fs/bcachefs/subvolume.h | 20 +- + fs/bcachefs/super-io.c | 83 +- + fs/bcachefs/super.c | 582 +++--- + fs/bcachefs/sysfs.c | 28 +- + fs/bcachefs/tests.c | 340 ++- + fs/bcachefs/thread_with_file.c | 48 +- + fs/bcachefs/time_stats.c | 7 +- + fs/bcachefs/trace.h | 152 +- + fs/bcachefs/util.c | 28 +- + fs/bcachefs/util.h | 10 +- + fs/bcachefs/xattr.c | 58 +- + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 1 - + fs/ecryptfs/keystore.c | 4 +- + fs/exfat/balloc.c | 12 +- + fs/exfat/dir.c | 13 +- + fs/exfat/exfat_fs.h | 1 + + fs/exfat/fatent.c | 10 + + fs/exfat/file.c | 5 +- + fs/exfat/namei.c | 5 + + fs/exfat/super.c | 32 +- + fs/f2fs/checkpoint.c | 8 +- + fs/f2fs/compress.c | 120 +- + fs/f2fs/data.c | 183 +- + fs/f2fs/debug.c | 21 +- + fs/f2fs/dir.c | 4 +- + fs/f2fs/extent_cache.c | 10 +- + fs/f2fs/f2fs.h | 151 +- + fs/f2fs/file.c | 107 +- + fs/f2fs/gc.c | 54 +- + fs/f2fs/gc.h | 5 +- + fs/f2fs/inline.c | 20 +- + fs/f2fs/inode.c | 84 +- + fs/f2fs/namei.c | 12 +- + fs/f2fs/node.c | 261 ++- + fs/f2fs/node.h | 77 +- + fs/f2fs/recovery.c | 116 +- + fs/f2fs/segment.c | 62 +- + fs/f2fs/segment.h | 59 +- + fs/f2fs/super.c | 2185 +++++++++++--------- + fs/f2fs/sysfs.c | 48 + + fs/fuse/dev.c | 5 +- + fs/fuse/file.c | 1 - + fs/fuse/virtio_fs.c | 3 - + fs/nfs/blocklayout/blocklayout.c | 4 +- + fs/nfs/blocklayout/dev.c | 5 +- + fs/nfs/blocklayout/extent_tree.c | 104 +- + fs/nfs/client.c | 3 +- + fs/nfs/delegation.c | 114 +- + fs/nfs/delegation.h | 3 + + fs/nfs/dir.c | 4 +- + fs/nfs/export.c | 11 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 26 +- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 6 +- + fs/nfs/fs_context.c | 42 + + fs/nfs/inode.c | 69 +- + fs/nfs/internal.h | 10 +- + fs/nfs/mount_clnt.c | 68 - + fs/nfs/nfs4client.c | 165 +- + fs/nfs/nfs4file.c | 25 +- + fs/nfs/nfs4proc.c | 50 +- + fs/nfs/nfs4trace.c | 2 + + fs/nfs/nfs4trace.h | 168 +- + fs/nfs/nfs4xdr.c | 24 + + fs/nfs/nfstrace.h | 11 +- + fs/nfs/pnfs.c | 39 +- + fs/nfs/pnfs_nfs.c | 14 +- + fs/nfs/write.c | 8 +- + fs/smb/client/cached_dir.c | 8 +- + fs/smb/client/cached_dir.h | 4 +- + fs/smb/client/cifs_debug.c | 53 + + fs/smb/client/cifsencrypt.c | 83 +- + fs/smb/client/cifsfs.c | 2 +- + fs/smb/client/cifsglob.h | 19 +- + fs/smb/client/cifsproto.h | 8 + + fs/smb/client/cifssmb.c | 142 +- + fs/smb/client/connect.c | 9 +- + fs/smb/client/fs_context.c | 51 +- + fs/smb/client/fs_context.h | 18 +- + fs/smb/client/link.c | 24 +- + fs/smb/client/reparse.c | 18 +- + fs/smb/client/reparse.h | 4 +- + fs/smb/client/sess.c | 9 + + fs/smb/client/smb1ops.c | 31 +- + fs/smb/client/smb2inode.c | 14 +- + fs/smb/client/smb2ops.c | 15 +- + fs/smb/client/smb2proto.h | 5 +- + include/linux/f2fs_fs.h | 2 +- + include/linux/fscrypt.h | 10 +- + include/linux/nfs_fs.h | 8 + + include/linux/nfs_fs_sb.h | 8 +- + include/linux/nfs_xdr.h | 57 +- + include/linux/sunrpc/xdr.h | 9 - + include/linux/wait.h | 12 + + lib/closure.c | 12 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 4 +- + net/sunrpc/xdr.c | 110 - + tools/testing/selftests/Makefile | 1 + + .../testing/selftests/filesystems/fuse/.gitignore | 3 + + tools/testing/selftests/filesystems/fuse/Makefile | 21 + + .../testing/selftests/filesystems/fuse/fuse_mnt.c | 146 ++ + .../selftests/filesystems/fuse/fusectl_test.c | 140 ++ + 221 files changed, 8898 insertions(+), 8385 deletions(-) + rename Documentation/filesystems/{ => fuse}/fuse-io-uring.rst (100%) + rename Documentation/filesystems/{ => fuse}/fuse-io.rst (99%) + rename Documentation/filesystems/{ => fuse}/fuse-passthrough.rst (100%) + rename Documentation/filesystems/{ => fuse}/fuse.rst (95%) + create mode 100644 Documentation/filesystems/fuse/index.rst + create mode 100644 tools/testing/selftests/filesystems/fuse/.gitignore + create mode 100644 tools/testing/selftests/filesystems/fuse/Makefile + create mode 100644 tools/testing/selftests/filesystems/fuse/fuse_mnt.c + create mode 100644 tools/testing/selftests/filesystems/fuse/fusectl_test.c +Merging printk/for-next (dcc3191a3dde Merge branch 'rework/ringbuffer-kunit-test' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging include/linux/sprintf.h +Auto-merging init/Kconfig +Auto-merging kernel/printk/internal.h +Auto-merging mm/slub.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 38 ++- + include/linux/compiler-gcc.h | 2 + + include/linux/sprintf.h | 2 +- + init/Kconfig | 12 + + kernel/printk/.kunitconfig | 3 + + kernel/printk/Makefile | 2 + + kernel/printk/internal.h | 2 + + kernel/printk/nbcon.c | 89 +++++-- + kernel/printk/printk.c | 20 +- + kernel/printk/printk_ringbuffer.c | 5 + + kernel/printk/printk_ringbuffer_kunit_test.c | 315 ++++++++++++++++++++++++ + lib/vsprintf.c | 70 +++++- + mm/slub.c | 5 +- + 13 files changed, 507 insertions(+), 58 deletions(-) + create mode 100644 kernel/printk/.kunitconfig + create mode 100644 kernel/printk/printk_ringbuffer_kunit_test.c +Merging pci/next (58d2b6b6b214 Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging MAINTAINERS +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/pci/controller/pci-host-common.c +Auto-merging drivers/pci/hotplug/pciehp_hpc.c +Auto-merging drivers/pci/msi/msi.c +Auto-merging drivers/pci/pci-acpi.c +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/pci/pci.c +CONFLICT (content): Merge conflict in drivers/pci/pci.c +Auto-merging drivers/pci/pcie/ptm.c +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/quirks.c +Auto-merging include/linux/cpuhotplug.h +Auto-merging kernel/irq/chip.c +Auto-merging sound/hda/controllers/intel.c +Resolved 'drivers/pci/pci.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 18023f1a470f] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git +$ git diff -M --stat --summary HEAD^.. + Documentation/PCI/endpoint/pci-test-howto.rst | 15 + + .../devicetree/bindings/pci/83xx-512x-pci.txt | 39 -- + .../devicetree/bindings/pci/aardvark-pci.txt | 59 --- + .../bindings/pci/amazon,al-alpine-v3-pcie.yaml | 71 ++++ + .../devicetree/bindings/pci/apm,xgene-pcie.yaml | 84 ++++ + .../devicetree/bindings/pci/axis,artpec6-pcie.txt | 50 --- + .../devicetree/bindings/pci/axis,artpec6-pcie.yaml | 118 ++++++ + .../devicetree/bindings/pci/brcm,stb-pcie.yaml | 4 + + .../bindings/pci/marvell,armada-3700-pcie.yaml | 99 +++++ + Documentation/devicetree/bindings/pci/pci-ep.yaml | 2 +- + Documentation/devicetree/bindings/pci/pcie-al.txt | 46 --- + .../devicetree/bindings/pci/qcom,pcie-common.yaml | 32 +- + .../devicetree/bindings/pci/qcom,pcie-sa8255p.yaml | 122 ++++++ + .../devicetree/bindings/pci/qcom,pcie-sa8775p.yaml | 18 +- + .../devicetree/bindings/pci/qcom,pcie-sc7280.yaml | 16 +- + .../devicetree/bindings/pci/qcom,pcie-sc8180x.yaml | 14 +- + .../devicetree/bindings/pci/qcom,pcie-sm8150.yaml | 21 +- + .../devicetree/bindings/pci/snps,dw-pcie.yaml | 2 +- + .../bindings/pci/sophgo,sg2044-pcie.yaml | 122 ++++++ + .../devicetree/bindings/pci/spear13xx-pcie.txt | 14 - + .../devicetree/bindings/pci/st,spear1340-pcie.yaml | 45 +++ + .../devicetree/bindings/pci/xgene-pci.txt | 50 --- + MAINTAINERS | 7 +- + drivers/gpu/vga/vga_switcheroo.c | 2 +- + drivers/iommu/intel/iommu.c | 2 +- + drivers/misc/pci_endpoint_test.c | 83 ++++ + drivers/pci/bus.c | 5 +- + drivers/pci/controller/Kconfig | 11 + + drivers/pci/controller/cadence/pcie-cadence-ep.c | 2 +- + drivers/pci/controller/cadence/pcie-cadence.h | 20 - + drivers/pci/controller/dwc/Kconfig | 12 + + drivers/pci/controller/dwc/Makefile | 1 + + drivers/pci/controller/dwc/pci-imx6.c | 40 +- + .../pci/controller/dwc/pcie-designware-debugfs.c | 16 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 103 ++--- + drivers/pci/controller/dwc/pcie-designware.c | 14 +- + drivers/pci/controller/dwc/pcie-designware.h | 19 +- + drivers/pci/controller/dwc/pcie-dw-rockchip.c | 16 +- + drivers/pci/controller/dwc/pcie-qcom.c | 327 ++++++++++++++-- + drivers/pci/controller/dwc/pcie-sophgo.c | 257 +++++++++++++ + drivers/pci/controller/mobiveil/Kconfig | 1 + + .../pci/controller/mobiveil/pcie-mobiveil-host.c | 48 +-- + drivers/pci/controller/mobiveil/pcie-mobiveil.h | 1 - + drivers/pci/controller/pci-aardvark.c | 57 ++- + drivers/pci/controller/pci-host-common.c | 5 +- + drivers/pci/controller/pci-host-common.h | 2 + + drivers/pci/controller/pci-mvebu.c | 6 +- + drivers/pci/controller/pci-xgene-msi.c | 426 ++++++++------------- + drivers/pci/controller/pci-xgene.c | 33 +- + drivers/pci/controller/pcie-altera-msi.c | 43 +-- + drivers/pci/controller/pcie-altera.c | 3 +- + drivers/pci/controller/pcie-brcmstb.c | 80 ++-- + drivers/pci/controller/pcie-iproc-msi.c | 44 +-- + drivers/pci/controller/pcie-mediatek-gen3.c | 64 ++-- + drivers/pci/controller/pcie-mediatek.c | 48 ++- + drivers/pci/controller/pcie-rcar-host.c | 68 ++-- + drivers/pci/controller/pcie-rockchip-ep.c | 4 +- + drivers/pci/controller/pcie-rockchip-host.c | 64 ++-- + drivers/pci/controller/pcie-rockchip.h | 26 +- + drivers/pci/controller/pcie-xilinx-dma-pl.c | 47 +-- + drivers/pci/controller/pcie-xilinx-nwl.c | 44 +-- + drivers/pci/controller/pcie-xilinx.c | 54 +-- + drivers/pci/controller/plda/Kconfig | 1 + + drivers/pci/controller/plda/pcie-plda-host.c | 43 +-- + drivers/pci/controller/plda/pcie-plda.h | 1 - + drivers/pci/controller/plda/pcie-starfive.c | 2 +- + drivers/pci/controller/vmd.c | 249 ++++++------ + drivers/pci/endpoint/Kconfig | 8 + + drivers/pci/endpoint/Makefile | 1 + + drivers/pci/endpoint/functions/pci-epf-test.c | 130 +++++++ + drivers/pci/endpoint/functions/pci-epf-vntb.c | 144 ++++++- + drivers/pci/endpoint/pci-ep-cfs.c | 1 + + drivers/pci/endpoint/pci-ep-msi.c | 100 +++++ + drivers/pci/endpoint/pci-epf-core.c | 40 +- + drivers/pci/hotplug/TODO | 4 - + drivers/pci/hotplug/pciehp_hpc.c | 2 +- + drivers/pci/iov.c | 153 +++++++- + drivers/pci/msi/msi.c | 2 +- + drivers/pci/pci-acpi.c | 7 +- + drivers/pci/pci-driver.c | 6 +- + drivers/pci/pci.c | 30 +- + drivers/pci/pci.h | 84 +++- + drivers/pci/pcie/aer.c | 7 +- + drivers/pci/pcie/aspm.c | 11 +- + drivers/pci/pcie/portdrv.c | 2 +- + drivers/pci/pcie/ptm.c | 2 +- + drivers/pci/probe.c | 12 +- + drivers/pci/quirks.c | 6 +- + drivers/pci/setup-bus.c | 3 +- + drivers/pci/setup-res.c | 35 +- + drivers/vfio/pci/vfio_pci_igd.c | 3 +- + include/linux/cpuhotplug.h | 1 - + include/linux/hypervisor.h | 3 + + include/linux/pci-ep-msi.h | 28 ++ + include/linux/pci-epf.h | 18 + + include/linux/pci-pwrctrl.h | 2 +- + include/linux/pci.h | 27 ++ + include/linux/pci_hotplug.h | 3 +- + include/uapi/linux/pci_regs.h | 9 + + include/uapi/linux/pcitest.h | 1 + + kernel/irq/chip.c | 8 +- + sound/hda/controllers/intel.c | 4 +- + sound/hda/core/i915.c | 2 +- + .../selftests/pci_endpoint/pci_endpoint_test.c | 28 ++ + 104 files changed, 2996 insertions(+), 1375 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pci/83xx-512x-pci.txt + delete mode 100644 Documentation/devicetree/bindings/pci/aardvark-pci.txt + create mode 100644 Documentation/devicetree/bindings/pci/amazon,al-alpine-v3-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/apm,xgene-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/axis,artpec6-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/axis,artpec6-pcie.yaml + create mode 100644 Documentation/devicetree/bindings/pci/marvell,armada-3700-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/pcie-al.txt + create mode 100644 Documentation/devicetree/bindings/pci/qcom,pcie-sa8255p.yaml + create mode 100644 Documentation/devicetree/bindings/pci/sophgo,sg2044-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/spear13xx-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/st,spear1340-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/xgene-pci.txt + create mode 100644 drivers/pci/controller/dwc/pcie-sophgo.c + create mode 100644 drivers/pci/endpoint/pci-ep-msi.c + create mode 100644 include/linux/pci-ep-msi.h +Merging pstore/for-next/pstore (d679c2e1e8d9 pstore/zone: rewrite some comments for better understanding) +$ 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/zone.c | 21 +++++++++++---------- + 1 file changed, 11 insertions(+), 10 deletions(-) +Merging hid/for-next (1330eb33bddc Merge branch 'for-6.17/core' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging drivers/hid/hid-core.c +Merge made by the 'ort' strategy. + Documentation/hid/intel-thc-hid.rst | 28 ++ + drivers/hid/Kconfig | 1 + + drivers/hid/amd-sfh-hid/amd_sfh_client.c | 23 ++ + drivers/hid/amd-sfh-hid/amd_sfh_hid.h | 2 +- + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 4 + + drivers/hid/amd-sfh-hid/amd_sfh_pcie.h | 1 + + drivers/hid/hid-apple.c | 244 ++++++----- + drivers/hid/hid-core.c | 12 +- + drivers/hid/hid-debug.c | 2 +- + drivers/hid/hid-ids.h | 30 +- + drivers/hid/hid-lg4ff.c | 6 +- + drivers/hid/hid-magicmouse.c | 64 +-- + drivers/hid/hid-mcp2221.c | 108 ++++- + drivers/hid/hid-multitouch.c | 62 ++- + drivers/hid/hid-quirks.c | 9 +- + drivers/hid/hid-uclogic-core.c | 66 ++- + drivers/hid/hid-uclogic-params.c | 134 ++++++- + drivers/hid/hid-uclogic-params.h | 5 + + drivers/hid/hid-uclogic-rdesc.c | 44 ++ + drivers/hid/hid-uclogic-rdesc.h | 4 + + drivers/hid/hid-universal-pidff.c | 5 +- + drivers/hid/intel-thc-hid/Makefile | 1 + + .../intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 216 ++++++---- + .../intel-thc-hid/intel-quicki2c/quicki2c-dev.h | 55 ++- + .../intel-thc-hid/intel-quickspi/pci-quickspi.c | 15 + + .../hid/intel-thc-hid/intel-thc/intel-thc-dev.c | 140 +++++++ + .../hid/intel-thc-hid/intel-thc/intel-thc-dev.h | 33 +- + .../hid/intel-thc-hid/intel-thc/intel-thc-dma.c | 40 ++ + .../hid/intel-thc-hid/intel-thc/intel-thc-dma.h | 38 +- + drivers/hid/intel-thc-hid/intel-thc/intel-thc-hw.h | 5 + + .../hid/intel-thc-hid/intel-thc/intel-thc-wot.c | 94 +++++ + .../hid/intel-thc-hid/intel-thc/intel-thc-wot.h | 26 ++ + drivers/hid/usbhid/hid-pidff.c | 46 +-- + drivers/hid/usbhid/hid-pidff.h | 3 +- + include/linux/hid.h | 8 +- + tools/testing/selftests/hid/tests/base.py | 46 ++- + tools/testing/selftests/hid/tests/base_device.py | 49 ++- + .../selftests/hid/tests/test_apple_keyboard.py | 3 +- + tools/testing/selftests/hid/tests/test_gamepad.py | 3 +- + .../selftests/hid/tests/test_ite_keyboard.py | 3 +- + .../testing/selftests/hid/tests/test_multitouch.py | 2 +- + tools/testing/selftests/hid/tests/test_sony.py | 7 +- + tools/testing/selftests/hid/tests/test_tablet.py | 11 +- + .../selftests/hid/tests/test_wacom_generic.py | 445 +++++++++++++++------ + 44 files changed, 1667 insertions(+), 476 deletions(-) + create mode 100644 drivers/hid/intel-thc-hid/intel-thc/intel-thc-wot.c + create mode 100644 drivers/hid/intel-thc-hid/intel-thc/intel-thc-wot.h +Merging i2c/i2c/for-next (0a5c73a0b158 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. +Merging i2c-host/i2c/i2c-host (85c34532849d i2c: qcom-geni: fix I2C frequency table to achieve accurate bus rates) +$ 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. + .../devicetree/bindings/i2c/apple,i2c.yaml | 5 ++ + drivers/i2c/busses/i2c-qcom-geni.c | 6 +- + drivers/i2c/busses/i2c-stm32f7.c | 32 +++++++---- + drivers/i2c/busses/i2c-tegra.c | 64 +++++++++++++++------- + 4 files changed, 73 insertions(+), 34 deletions(-) +Merging i3c/i3c/next (3b661ca549b9 i3c: add missing include to internal header) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/i3c/renesas,i3c.yaml | 179 +++ + MAINTAINERS | 8 + + drivers/i3c/device.c | 11 +- + drivers/i3c/internals.h | 38 + + drivers/i3c/master.c | 38 +- + drivers/i3c/master/Kconfig | 10 + + drivers/i3c/master/Makefile | 1 + + drivers/i3c/master/dw-i3c-master.c | 47 +- + drivers/i3c/master/i3c-master-cdns.c | 90 +- + drivers/i3c/master/mipi-i3c-hci/core.c | 2 +- + drivers/i3c/master/renesas-i3c.c | 1404 ++++++++++++++++++++ + drivers/i3c/master/svc-i3c-master.c | 30 +- + include/linux/i3c/device.h | 4 +- + include/linux/i3c/master.h | 13 +- + 14 files changed, 1727 insertions(+), 148 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i3c/renesas,i3c.yaml + create mode 100644 drivers/i3c/master/renesas-i3c.c +Merging dmi/dmi-for-next (4d1b28a8119c firmware: dmi: Add info message for number of populated and total memory slots) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (de1fffd88600 dt-bindings: hwmon: Replace bouncing Alexandru Tachici emails) +$ 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 (35293ebbb65e scripts: add origin commit identification based on specific patterns) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/next (d968e50b5c26 media: rkvdec: Unstage the driver) +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Already up to date. +Merging v4l-dvb-next/master (b36c41c51e9d media: atomisp: set lock before calling vb2_queue_init()) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (77d832285656 Merge branch 'pm-cpufreq' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (bbd67be5546d cpufreq: mediatek-hw: Add support for MT8196) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'ort' strategy. + .../cpufreq/mediatek,mt8196-cpufreq-hw.yaml | 82 +++++++++++++ + drivers/cpufreq/mediatek-cpufreq-hw.c | 132 +++++++++++++++++---- + 2 files changed, 191 insertions(+), 23 deletions(-) + create mode 100644 Documentation/devicetree/bindings/cpufreq/mediatek,mt8196-cpufreq-hw.yaml +Merging cpupower/cpupower (e6c3f96141eb cpupower: Allow control of boost feature on non-x86 based systems with boost support.) +$ 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/man/cpupower-set.1 | 7 +-- + tools/power/cpupower/utils/cpufreq-info.c | 16 +++++- + tools/power/cpupower/utils/cpupower-set.c | 5 +- + tools/power/cpupower/utils/helpers/helpers.h | 14 ++--- + tools/power/cpupower/utils/helpers/misc.c | 76 ++++++++++++++++++++-------- + 5 files changed, 83 insertions(+), 35 deletions(-) +Merging devfreq/devfreq-next (7da2fdaaa1e6 PM / devfreq: Add HiSilicon uncore frequency scaling driver) +$ 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 (05e35bd07d56 pmdomain: qcom: rpmhpd: Add Glymur RPMh Power Domains) +$ 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 (22679d807dea rust: opp: use c_* types via kernel prelude) +$ 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 (1d264d3a1988 dt-bindings: thermal: tegra: Document Tegra210B01) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging rdma/for-next (ee235923d205 RDMA/siw: Change maintainer email address) +$ 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 (d9104cec3e8f Merge tag 'bpf-next-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (e8d780dcd957 Merge tag 'slab-for-6.17' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab) +$ 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 (95cfe23285a6 xfrm: Skip redundant statistics update for crypto offload) +$ 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 (888a7776f4fb net/mlx5: Add support for device steering tag) +$ 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 (e3f96b3556e4 Merge branch 'net-dsa-microchip-add-ksz8463-switch-support') +$ 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 (e3f96b3556e4 Merge branch 'net-dsa-microchip-add-ksz8463-switch-support') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (9c533991fe15 Bluetooth: hci_conn: Fix not cleaning up Broadcaster/Broadcast Source) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btintel.c | 3 ++ + drivers/bluetooth/btintel_pcie.c | 95 ++++++++++++++++++++++++++++++++++++++++ + net/bluetooth/hci_conn.c | 14 +++++- + net/bluetooth/hci_event.c | 7 ++- + net/bluetooth/hci_sync.c | 9 ++-- + net/bluetooth/iso.c | 2 +- + 6 files changed, 123 insertions(+), 7 deletions(-) +Merging wireless-next/for-next (126d85fb0405 Merge tag 'wireless-next-2025-07-24' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging ath-next/for-next (708243c62efd wifi: mac80211: fix unassigned variable access) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Already up to date. +Merging iwlwifi-next/next (d2af710d6d50 wifi: iwlwifi: mvm/fw: Avoid -Wflex-array-member-not-at-end warnings) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi-next/next +Already up to date. +Merging wpan-next/master (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Merge made by the 'ort' strategy. + net/ieee802154/core.c | 49 ++++++++++++++++++++++++++++--------------------- + 1 file changed, 28 insertions(+), 21 deletions(-) +Merging wpan-staging/staging (1dd9291eb903 ieee802154: Remove WARN_ON() in cfg802154_pernet_exit()) +$ 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 (9cf9db888f38 Merge tag 'nand/for-6.17' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (fb2fae70e7e9 mtd: spinand: winbond: Add comment about the maximum frequency) +$ 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 (2e3a7476ec39 mtd: spi-nor: Fix spi_nor_try_unlock_all()) +$ 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 (bf24d6426854 crypto: keembay - Use min() to simplify ocs_create_linked_list_from_sg()) +$ 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 libcrypto/libcrypto-next (2a1a127aecf6 Merge branches 'libcrypto-conversions' and 'libcrypto-tests' into libcrypto-next) +$ git merge -m Merge branch 'libcrypto-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next +Merge made by the 'ort' strategy. +Merging drm/drm-next (6531a2cf07ef Merge tag 'drm-xe-next-fixes-2025-07-31' of https://gitlab.freedesktop.org/drm/xe/kernel into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cper.c | 8 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 6 ++-- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 14 ++++++--- + drivers/gpu/drm/amd/amdgpu/imu_v12_0.c | 13 ++++++--- + drivers/gpu/drm/amd/amdgpu/mmhub_v4_1_0.c | 34 +++++++++------------- + drivers/gpu/drm/amd/amdgpu/psp_v14_0.c | 2 ++ + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 11 ++++--- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 6 ++-- + drivers/gpu/drm/amd/display/dc/core/dc.c | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 8 ++++- + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 29 +++++++++--------- + .../display/dc/resource/dcn314/dcn314_resource.c | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 11 +++++-- + drivers/gpu/drm/xe/xe_configfs.c | 3 +- + drivers/gpu/drm/xe/xe_device.c | 1 + + drivers/gpu/drm/xe/xe_device_sysfs.c | 7 ++++- + drivers/gpu/drm/xe/xe_guc_ct.c | 6 +--- + drivers/gpu/drm/xe/xe_hw_engine_group.c | 28 ++++-------------- + drivers/gpu/drm/xe/xe_i2c.c | 7 +++-- + drivers/gpu/drm/xe/xe_oa.c | 2 +- + drivers/gpu/drm/xe/xe_uc.c | 2 +- + 25 files changed, 112 insertions(+), 95 deletions(-) +Merging drm-exynos/for-linux-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (b213eb34f857 drm/tidss: oldi: convert to devm_drm_bridge_alloc() API) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (9f1f7cd46735 drm/amdgpu: fix module parameter description) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c +Merge made by the 'ort' strategy. + Documentation/gpu/amdgpu/display/dc-glossary.rst | 2 +- + .../gpu/amdgpu/display/display-contributing.rst | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 261 +++++++++++++++++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 20 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 38 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.h | 17 ++ + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 12 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 1 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 2 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 11 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 10 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c | 11 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 24 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 35 ++- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.h | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 1 + + .../amd/display/amdgpu_dm/amdgpu_dm_irq_params.h | 1 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 1 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_pp_smu.c | 1 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 2 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 1 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 145 ++---------- + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 7 + + drivers/gpu/drm/amd/display/dc/dc.h | 16 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 4 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 16 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 2 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 14 ++ + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 56 ++--- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.h | 2 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 39 ++- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.h | 7 + + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 2 + + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 2 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 7 +- + drivers/gpu/drm/amd/display/dc/inc/link.h | 5 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 30 ++- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 3 - + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 2 + + .../gpu/drm/amd/display/dc/link/link_validation.c | 6 +- + .../display/dc/link/protocols/link_dp_capability.c | 37 +++ + .../display/dc/link/protocols/link_dp_capability.h | 6 + + .../display/dc/link/protocols/link_dp_dpia_bw.c | 71 +++--- + .../display/dc/link/protocols/link_dp_training.c | 9 +- + .../dc/link/protocols/link_edp_panel_control.c | 10 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.c | 5 +- + .../amd/display/dc/resource/dcn31/dcn31_resource.h | 3 +- + .../display/dc/virtual/virtual_stream_encoder.c | 7 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 111 ++++++--- + 71 files changed, 766 insertions(+), 393 deletions(-) +Merging drm-intel/for-linux-next (5a569ef4d4ab drm/i915/display: Set C10_VDR_CTRL_MSGBUS_ACCESS before phy reg read) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel drm-intel/for-linux-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 21 +++++++++++++++------ + 1 file changed, 15 insertions(+), 6 deletions(-) +Merging drm-msm/msm-next (8290d37ad2b0 drm/msm: Small function param doc fix) +$ 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 (cd86e80b77b2 drm/msm/dp: add linux/io.h header to fix build errors) +$ 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-nova/nova-next (14ae91a81ec8 gpu: nova-core: fix bounds check in PmuLookupTableEntry::new) +$ git merge -m Merge branch 'nova-next' of https://gitlab.freedesktop.org/drm/nova.git drm-nova/nova-next +Already up to date. +Merging drm-xe/drm-xe-next (1cda3c755bb7 drm/xe: Fix oops in xe_gem_fault when running core_hotunplug test.) + 0bdd05c2a82b ("drm/xe/configfs: Fix pci_dev reference leak") + 159afd92bae8 ("drm/xe/guc: Clear whole g2h_fence during initialization") + 176f44a5ec0b ("drm/xe/uc: Fix missing unwind goto") + 2f264d58cc80 ("drm/xe: Fix a NULL vs IS_ERR() bug in xe_i2c_register_adapter()") + 308dc9b27874 ("drm/xe/oa: Fix static checker warning about null gt") + 552dbba1caaf ("drm/xe/vf: Disable CSC support on VF") + 9a220e065914 ("drm/xe/vf: Don't register I2C devices if VF") + ed5461daa150 ("drm/xe: Don't fail probe on unsupported mailbox command") + f98de826b418 ("drm/xe/hw_engine_group: Avoid call kfree() for drmm_kzalloc()") +$ 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/display/xe_fb_pin.c +Auto-merging drivers/gpu/drm/xe/display/xe_plane_initial.c +Auto-merging drivers/gpu/drm/xe/xe_configfs.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_guc_submit.c +Auto-merging drivers/gpu/drm/xe/xe_hw_engine_group.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/xe/Makefile | 4 + + drivers/gpu/drm/xe/abi/guc_errors_abi.h | 3 + + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 1 + + drivers/gpu/drm/xe/display/xe_fb_pin.c | 5 +- + drivers/gpu/drm/xe/display/xe_plane_initial.c | 3 +- + drivers/gpu/drm/xe/instructions/xe_mi_commands.h | 1 + + drivers/gpu/drm/xe/regs/xe_engine_regs.h | 3 + + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 2 +- + drivers/gpu/drm/xe/regs/xe_pmt.h | 10 + + drivers/gpu/drm/xe/xe_assert.h | 4 +- + drivers/gpu/drm/xe/xe_bb.c | 35 +++ + drivers/gpu/drm/xe/xe_bb.h | 3 + + drivers/gpu/drm/xe/xe_bo.c | 52 +++- + drivers/gpu/drm/xe/xe_bo.h | 4 +- + drivers/gpu/drm/xe/xe_bo_types.h | 4 + + drivers/gpu/drm/xe/xe_configfs.c | 15 +- + drivers/gpu/drm/xe/xe_debugfs.c | 107 +++++++ + drivers/gpu/drm/xe/xe_dep_job_types.h | 29 ++ + drivers/gpu/drm/xe/xe_dep_scheduler.c | 143 +++++++++ + drivers/gpu/drm/xe/xe_dep_scheduler.h | 21 ++ + drivers/gpu/drm/xe/xe_device.c | 24 ++ + drivers/gpu/drm/xe/xe_device_types.h | 69 +---- + drivers/gpu/drm/xe/xe_exec_queue.c | 48 +++ + drivers/gpu/drm/xe/xe_exec_queue_types.h | 15 + + drivers/gpu/drm/xe/xe_ggtt.c | 3 +- + drivers/gpu/drm/xe/xe_gt.c | 6 +- + drivers/gpu/drm/xe/xe_gt_debugfs.c | 53 +++- + drivers/gpu/drm/xe/xe_gt_mcr.c | 4 +- + drivers/gpu/drm/xe/xe_gt_pagefault.c | 13 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 3 +- + drivers/gpu/drm/xe/xe_gt_tlb_inval_job.c | 274 +++++++++++++++++ + drivers/gpu/drm/xe/xe_gt_tlb_inval_job.h | 34 +++ + drivers/gpu/drm/xe/xe_gt_tlb_invalidation.c | 8 + + drivers/gpu/drm/xe/xe_gt_types.h | 2 + + drivers/gpu/drm/xe/xe_guc.c | 19 +- + drivers/gpu/drm/xe/xe_guc_ads.c | 35 +++ + drivers/gpu/drm/xe/xe_guc_fwif.h | 5 + + drivers/gpu/drm/xe/xe_guc_submit.c | 34 ++- + drivers/gpu/drm/xe/xe_guc_submit.h | 1 + + drivers/gpu/drm/xe/xe_hw_engine_group.c | 4 +- + drivers/gpu/drm/xe/xe_lrc.c | 65 ++++ + drivers/gpu/drm/xe/xe_migrate.c | 301 +++++++++++++++--- + drivers/gpu/drm/xe/xe_migrate.h | 24 +- + drivers/gpu/drm/xe/xe_mmio_gem.c | 226 ++++++++++++++ + drivers/gpu/drm/xe/xe_mmio_gem.h | 20 ++ + drivers/gpu/drm/xe/xe_module.c | 8 +- + drivers/gpu/drm/xe/xe_pci.c | 11 + + drivers/gpu/drm/xe/xe_pm.c | 4 + + drivers/gpu/drm/xe/xe_pt.c | 178 +++++------ + drivers/gpu/drm/xe/xe_query.c | 9 +- + drivers/gpu/drm/xe/xe_ring_ops.c | 8 +- + drivers/gpu/drm/xe/xe_sriov.c | 19 ++ + drivers/gpu/drm/xe/xe_sriov.h | 1 + + drivers/gpu/drm/xe/xe_sriov_vf_ccs.c | 372 +++++++++++++++++++++++ + drivers/gpu/drm/xe/xe_sriov_vf_ccs.h | 17 ++ + drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h | 53 ++++ + drivers/gpu/drm/xe/xe_sriov_vf_types.h | 6 + + drivers/gpu/drm/xe/xe_svm.c | 63 ++-- + drivers/gpu/drm/xe/xe_tile.c | 62 ++-- + drivers/gpu/drm/xe/xe_tile.h | 14 +- + drivers/gpu/drm/xe/xe_trace.h | 16 - + drivers/gpu/drm/xe/xe_ttm_stolen_mgr.c | 10 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 22 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.h | 3 +- + drivers/gpu/drm/xe/xe_vm.c | 6 +- + drivers/gpu/drm/xe/xe_vram.c | 211 +++++++++---- + drivers/gpu/drm/xe/xe_vram.h | 11 + + drivers/gpu/drm/xe/xe_vram_types.h | 85 ++++++ + drivers/gpu/drm/xe/xe_wa_oob.rules | 3 + + include/uapi/drm/xe_drm.h | 6 +- + 70 files changed, 2502 insertions(+), 435 deletions(-) + create mode 100644 drivers/gpu/drm/xe/xe_dep_job_types.h + create mode 100644 drivers/gpu/drm/xe/xe_dep_scheduler.c + create mode 100644 drivers/gpu/drm/xe/xe_dep_scheduler.h + create mode 100644 drivers/gpu/drm/xe/xe_gt_tlb_inval_job.c + create mode 100644 drivers/gpu/drm/xe/xe_gt_tlb_inval_job.h + create mode 100644 drivers/gpu/drm/xe/xe_mmio_gem.c + create mode 100644 drivers/gpu/drm/xe/xe_mmio_gem.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_vf_ccs.c + create mode 100644 drivers/gpu/drm/xe/xe_sriov_vf_ccs.h + create mode 100644 drivers/gpu/drm/xe/xe_sriov_vf_ccs_types.h + create mode 100644 drivers/gpu/drm/xe/xe_vram_types.h +Merging etnaviv/etnaviv/next (6bde14ba5f7e drm/etnaviv: add optional reset support) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (81b96e4aef95 fbcon: Use 'bool' where appopriate) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/core/Kconfig +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/video/fbdev/core/svgalib.c +Merge made by the 'ort' strategy. + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/core/Kconfig | 2 +- + drivers/video/fbdev/core/fbcon.c | 77 ++++++++++++++++------------ + drivers/video/fbdev/core/fbmem.c | 3 ++ + drivers/video/fbdev/core/svgalib.c | 95 ++++++++++++++++------------------- + drivers/video/fbdev/imxfb.c | 9 +++- + drivers/video/fbdev/kyro/fbdev.c | 24 ++++----- + drivers/video/fbdev/nvidia/nv_local.h | 2 +- + drivers/video/fbdev/simplefb.c | 17 ++----- + 9 files changed, 116 insertions(+), 115 deletions(-) +Merging regmap/for-next (58e6b2cce564 Merge remote-tracking branch 'regmap/for-6.17' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. +Merging sound/for-next (df485a4b2b3e ALSA: usb: scarlett2: Fix missing NULL check) +$ 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 (95a042a0c8ec firewire: ohci: reduce the size of common context structure by extracting members into AT structure) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Merge made by the 'ort' strategy. + drivers/firewire/core-card.c | 59 ++++++++----- + drivers/firewire/core-cdev.c | 3 +- + drivers/firewire/core-device.c | 15 ++-- + drivers/firewire/core-transaction.c | 7 +- + drivers/firewire/net.c | 4 +- + drivers/firewire/ohci.c | 162 +++++++++++++++++++----------------- + include/linux/firewire.h | 12 ++- + 7 files changed, 146 insertions(+), 116 deletions(-) +Merging sound-asoc/for-next (282528da82a0 Merge remote-tracking branch 'asoc/for-6.16' 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 (40a826bd6c82 module: Rename MAX_PARAM_PREFIX_LEN to __MODULE_NAME_LEN) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Auto-merging include/linux/module.h +Auto-merging include/linux/moduleparam.h +CONFLICT (content): Merge conflict in include/linux/moduleparam.h +Auto-merging kernel/module/main.c +Recorded preimage for 'include/linux/moduleparam.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'include/linux/moduleparam.h'. +[master 25522643a71b] Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git +$ git diff -M --stat --summary HEAD^.. + include/linux/module.h | 29 +++++++++++------------------ + include/linux/moduleparam.h | 15 +++++++++------ + kernel/module/internal.h | 7 +++++++ + kernel/module/main.c | 12 +++++++----- + kernel/trace/trace.c | 2 +- + lib/kunit/test.c | 8 -------- + 6 files changed, 35 insertions(+), 38 deletions(-) +Merging input/next (1c44b818b81b Input: st1232 - add touch-overlay handling) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging MAINTAINERS +Auto-merging drivers/hid/hid-debug.c +Auto-merging drivers/input/input.c +Auto-merging drivers/input/joystick/xpad.c +CONFLICT (modify/delete): drivers/input/keyboard/adp5589-keys.c deleted in HEAD and modified in input/next. Version input/next of drivers/input/keyboard/adp5589-keys.c left in tree. +Auto-merging drivers/input/keyboard/atkbd.c +Auto-merging drivers/input/misc/cs40l50-vibra.c +Auto-merging drivers/input/touchscreen/ad7879.c +Auto-merging include/uapi/linux/input-event-codes.h +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/input/keyboard/adp5589-keys.c +rm 'drivers/input/keyboard/adp5589-keys.c' +$ git commit --no-edit -v -a +[master 7a57b8a4dd81] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/input/syna,rmi4.yaml | 20 ++ + .../bindings/input/touchscreen/edt-ft5x06.yaml | 1 + + .../bindings/input/touchscreen/lpc32xx-tsc.txt | 16 -- + .../input/touchscreen/nxp,lpc3220-tsc.yaml | 43 ++++ + .../input/touchscreen/sitronix,st1232.yaml | 29 +++ + .../bindings/input/touchscreen/ti.tsc2007.yaml | 75 ++++++ + .../bindings/input/touchscreen/touchscreen.yaml | 119 +++++++++ + .../bindings/input/touchscreen/tsc2007.txt | 39 --- + Documentation/input/devices/edt-ft5x06.rst | 21 +- + Documentation/input/gamepad.rst | 19 +- + Documentation/userspace-api/media/rc/rc-protos.rst | 4 +- + MAINTAINERS | 7 + + drivers/hid/hid-debug.c | 2 + + drivers/input/Makefile | 2 +- + drivers/input/evdev.c | 8 +- + drivers/input/input.c | 2 +- + drivers/input/joystick/xpad.c | 64 ++--- + drivers/input/keyboard/adp5588-keys.c | 9 +- + drivers/input/keyboard/atkbd.c | 12 +- + drivers/input/keyboard/mtk-pmic-keys.c | 17 ++ + drivers/input/keyboard/samsung-keypad.c | 137 +++++----- + drivers/input/misc/Kconfig | 7 - + drivers/input/misc/Makefile | 1 - + drivers/input/misc/cs40l50-vibra.c | 1 - + drivers/input/misc/max8997_haptic.c | 98 ++++---- + drivers/input/misc/pcf50633-input.c | 113 --------- + drivers/input/rmi4/Kconfig | 15 ++ + drivers/input/rmi4/Makefile | 2 + + drivers/input/rmi4/rmi_bus.c | 6 + + drivers/input/rmi4/rmi_driver.h | 2 + + drivers/input/rmi4/rmi_f1a.c | 143 +++++++++++ + drivers/input/rmi4/rmi_f21.c | 179 +++++++++++++ + drivers/input/touch-overlay.c | 277 +++++++++++++++++++++ + drivers/input/touchscreen/ad7879.c | 11 +- + drivers/input/touchscreen/edt-ft5x06.c | 26 +- + drivers/input/touchscreen/goodix.c | 50 +++- + drivers/input/touchscreen/st1232.c | 35 ++- + include/linux/input/touch-overlay.h | 25 ++ + include/uapi/linux/input-event-codes.h | 5 + + 39 files changed, 1259 insertions(+), 383 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/lpc32xx-tsc.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/nxp,lpc3220-tsc.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/ti.tsc2007.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/tsc2007.txt + delete mode 100644 drivers/input/misc/pcf50633-input.c + create mode 100644 drivers/input/rmi4/rmi_f1a.c + create mode 100644 drivers/input/rmi4/rmi_f21.c + create mode 100644 drivers/input/touch-overlay.c + create mode 100644 include/linux/input/touch-overlay.h +Merging block/for-next (301d58c33f1e Merge branch 'block-6.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Merge made by the 'ort' strategy. + block/bfq-iosched.c | 31 +----- + block/blk-ioc.c | 16 ++- + block/blk-mq-sched.c | 223 ++++++++++++++++++++++++++++------------- + block/blk-mq-sched.h | 12 ++- + block/blk-mq.c | 16 ++- + block/blk-settings.c | 33 ++++-- + block/blk.h | 4 +- + block/elevator.c | 38 +++++-- + block/elevator.h | 16 ++- + block/kyber-iosched.c | 11 +- + block/mq-deadline.c | 14 +-- + drivers/block/zloop.c | 3 +- + drivers/nvme/host/auth.c | 4 +- + drivers/nvme/host/core.c | 16 +++ + drivers/nvme/host/fc.c | 4 +- + drivers/nvme/host/pci.c | 2 +- + drivers/nvme/host/tcp.c | 2 +- + drivers/nvme/target/core.c | 16 +-- + drivers/nvme/target/fc.c | 6 +- + drivers/nvme/target/passthru.c | 2 + + drivers/nvme/target/rdma.c | 6 +- + include/linux/ioprio.h | 3 +- + include/uapi/linux/io_uring.h | 4 + + io_uring/net.c | 9 +- + 24 files changed, 315 insertions(+), 176 deletions(-) +Merging device-mapper/for-next (55a0fbd2ac3f dm: set DM_TARGET_PASSES_CRYPTO feature for dm-thin) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Auto-merging drivers/md/dm-raid.c +Auto-merging drivers/md/dm-table.c +Auto-merging drivers/md/dm.c +Merge made by the 'ort' strategy. + .../device-mapper/thin-provisioning.rst | 16 +- + drivers/md/dm-flakey.c | 9 +- + drivers/md/dm-ima.c | 42 +++-- + drivers/md/dm-path-selector.c | 8 +- + drivers/md/dm-path-selector.h | 2 +- + drivers/md/dm-ps-historical-service-time.c | 9 +- + drivers/md/dm-ps-io-affinity.c | 5 +- + drivers/md/dm-ps-queue-length.c | 9 +- + drivers/md/dm-ps-round-robin.c | 9 +- + drivers/md/dm-ps-service-time.c | 9 +- + drivers/md/dm-raid.c | 7 +- + drivers/md/dm-table.c | 10 +- + drivers/md/dm-thin.c | 7 +- + drivers/md/dm-vdo/funnel-workqueue.c | 3 +- + drivers/md/dm-verity-fec.c | 4 +- + drivers/md/dm-verity-target.c | 185 ++++----------------- + drivers/md/dm-verity.h | 22 +-- + drivers/md/dm-zone.c | 2 - + drivers/md/dm-zoned-target.c | 2 +- + drivers/md/dm.c | 11 +- + 20 files changed, 110 insertions(+), 261 deletions(-) +Merging libata/for-next (6cb43739b93c ata: pata_pdc2027x: Remove space before newline and abbreviations) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Merge made by the 'ort' strategy. + drivers/ata/ata_piix.c | 1 + + drivers/ata/libahci.c | 1 + + drivers/ata/libata-core.c | 2 +- + drivers/ata/libata-sata.c | 53 +++++++++++++++++++++++++++++++++++---------- + drivers/ata/libata-scsi.c | 38 ++++++++++++++++---------------- + drivers/ata/pata_macio.c | 2 +- + drivers/ata/pata_pdc2027x.c | 12 +++++----- + include/linux/libata.h | 1 + + 8 files changed, 71 insertions(+), 39 deletions(-) +Merging pcmcia/pcmcia-next (0630e3bc0e91 pcmcia: add missing MODULE_DESCRIPTION() macros) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (4b290aae788e Merge tag 'sysctl-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl) +$ 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 (b6bf74c82178 mfd: dt-bindings: Convert TPS65910 to DT schema) +$ 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/Kconfig +Merge made by the 'ort' strategy. + drivers/mfd/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging backlight/for-backlight-next (19272b37aa4f Linux 6.16-rc1) +$ 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 +Already up to date. +Merging battery/for-next (7b41a2341fa6 power: supply: core: fix static checker warning) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/power/reset/Kconfig +Auto-merging drivers/power/supply/power_supply_core.c +Auto-merging include/linux/power_supply.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/power/supply/bq24190.yaml | 1 - + .../devicetree/bindings/power/supply/bq2515x.yaml | 7 +- + .../devicetree/bindings/power/supply/bq256xx.yaml | 5 +- + .../devicetree/bindings/power/supply/bq25980.yaml | 4 +- + .../bindings/power/supply/cw2015_battery.yaml | 5 +- + .../power/supply/qcom,pmi8998-charger.yaml | 7 +- + .../power/supply/richtek,rt5033-charger.yaml | 4 +- + .../power/supply/stericsson,ab8500-btemp.yaml | 4 +- + .../power/supply/stericsson,ab8500-chargalg.yaml | 4 +- + .../power/supply/stericsson,ab8500-charger.yaml | 4 +- + .../power/supply/stericsson,ab8500-fg.yaml | 4 +- + .../power/supply/summit,smb347-charger.yaml | 5 +- + .../x-powers,axp20x-battery-power-supply.yaml | 6 +- + MAINTAINERS | 7 + + drivers/phy/allwinner/phy-sun4i-usb.c | 2 +- + drivers/power/reset/Kconfig | 1 + + drivers/power/reset/at91-sama5d2_shdwc.c | 2 +- + drivers/power/reset/qcom-pon.c | 30 ++-- + drivers/power/supply/Makefile | 2 +- + drivers/power/supply/bq2415x_charger.c | 2 +- + drivers/power/supply/bq24190_charger.c | 16 +- + drivers/power/supply/bq256xx_charger.c | 6 +- + drivers/power/supply/bq25980_charger.c | 6 +- + drivers/power/supply/cpcap-charger.c | 5 +- + drivers/power/supply/max14577_charger.c | 4 +- + drivers/power/supply/max1720x_battery.c | 13 +- + drivers/power/supply/power_supply_core.c | 185 +++++++++++---------- + drivers/power/supply/qcom_battmgr.c | 25 +++ + .../supply/{qcom_pmi8998_charger.c => qcom_smbx.c} | 152 ++++++++--------- + drivers/power/supply/twl4030_charger.c | 1 - + drivers/power/supply/ug3105_battery.c | 81 ++------- + drivers/regulator/act8865-regulator.c | 2 +- + include/linux/power_supply.h | 16 +- + 33 files changed, 285 insertions(+), 333 deletions(-) + rename drivers/power/supply/{qcom_pmi8998_charger.c => qcom_smbx.c} (88%) +Merging regulator/for-next (10dfd36f0784 regulator: core: correct convergence check in regulator_set_voltage()) +$ 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 (5d8b97c94677 MAINTAINERS: Add Xiu and myself as Lockdown maintainers) +$ 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 (43584e993293 apparmor: fix Regression on linux-next (next-20250721)) +$ 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/apparmorfs.c +Auto-merging security/apparmor/file.c +Auto-merging security/apparmor/lsm.c +Auto-merging security/apparmor/policy_unpack_test.c +Merge made by the 'ort' strategy. + security/apparmor/Makefile | 6 +- + security/apparmor/af_unix.c | 799 +++++++++++++++++++++++++++++++++ + security/apparmor/apparmorfs.c | 39 +- + security/apparmor/audit.c | 2 +- + security/apparmor/capability.c | 61 ++- + security/apparmor/domain.c | 203 ++++++--- + security/apparmor/file.c | 92 ++-- + security/apparmor/include/af_unix.h | 55 +++ + security/apparmor/include/apparmor.h | 4 +- + security/apparmor/include/audit.h | 5 +- + security/apparmor/include/capability.h | 1 + + security/apparmor/include/cred.h | 31 +- + security/apparmor/include/file.h | 11 +- + security/apparmor/include/ipc.h | 3 + + security/apparmor/include/label.h | 51 ++- + security/apparmor/include/lib.h | 46 +- + security/apparmor/include/match.h | 10 +- + security/apparmor/include/net.h | 36 +- + security/apparmor/include/path.h | 1 + + security/apparmor/include/perms.h | 8 +- + security/apparmor/include/policy.h | 63 ++- + security/apparmor/include/sig_names.h | 6 +- + security/apparmor/include/signal.h | 19 + + security/apparmor/ipc.c | 13 +- + security/apparmor/label.c | 37 +- + security/apparmor/lib.c | 114 +++++ + security/apparmor/lsm.c | 468 +++++++++++++++---- + security/apparmor/match.c | 23 +- + security/apparmor/mount.c | 12 +- + security/apparmor/net.c | 189 ++++++-- + security/apparmor/policy.c | 90 ++-- + security/apparmor/policy_compat.c | 6 +- + security/apparmor/policy_ns.c | 2 +- + security/apparmor/policy_unpack.c | 67 ++- + security/apparmor/policy_unpack_test.c | 6 +- + security/apparmor/procattr.c | 6 +- + security/apparmor/resource.c | 11 +- + security/apparmor/task.c | 11 +- + 38 files changed, 2176 insertions(+), 431 deletions(-) + create mode 100644 security/apparmor/af_unix.c + create mode 100644 security/apparmor/include/af_unix.h + create mode 100644 security/apparmor/include/signal.h +Merging integrity/next-integrity (aa9bb1b32594 ima: add a knob ima= to allow disabling IMA in kdump kernel) +$ 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 (850dada4b3af 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 (6ddd169d0288 smack: fix kernel-doc warnings for smk_import_valid_label()) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Merge made by the 'ort' strategy. + Documentation/admin-guide/LSM/Smack.rst | 16 +- + security/smack/smack.h | 3 + + security/smack/smack_access.c | 95 ++++++++--- + security/smack/smack_lsm.c | 277 +++++++++++++++++++++----------- + 4 files changed, 273 insertions(+), 118 deletions(-) +Merging tomoyo/master (038d61fd6422 Linux 6.16) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Already up to date. +Merging tpmdd/next (7f0c6675b319 tpm_crb_ffa: handle tpm busy return code) +$ 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 (48defdf6b083 watchdog: sbsa: Adjust keepalive timeout to avoid MediaTek WS0 race condition) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Merge made by the 'ort' strategy. + .../bindings/watchdog/nxp,pnx4008-wdt.yaml | 3 ++ + drivers/watchdog/dw_wdt.c | 2 + + drivers/watchdog/iTCO_wdt.c | 6 ++- + drivers/watchdog/it87_wdt.c | 4 +- + drivers/watchdog/renesas_wdt.c | 8 ++-- + drivers/watchdog/rti_wdt.c | 14 ++---- + drivers/watchdog/sbsa_gwdt.c | 50 ++++++++++++++++++++-- + drivers/watchdog/watchdog_core.h | 8 +++- + drivers/watchdog/watchdog_pretimeout.c | 2 + + drivers/watchdog/ziirave_wdt.c | 3 ++ + include/linux/watchdog.h | 12 ++++-- + 11 files changed, 87 insertions(+), 25 deletions(-) +Merging iommu/next (b9e6e8ae0a5f Merge branch 'arm/smmu/updates' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Already up to date. +Merging audit/next (ae1ae11fb277 audit,module: restore audit logging in load failure case) +$ 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 (0121898ec05f dt-bindings: Correct indentation and style in DTS example) +$ 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 (6cd594ed969d ARM: dts: vt8500: Add L2 cache controller on WM8850/WM8950) +$ 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 +Already up to date. +Merging mailbox/for-next (872798f61d8b dt-bindings: mailbox: qcom-ipcc: document the SM7635 Inter-Processor Communication Controller) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +Auto-merging Documentation/devicetree/bindings/mailbox/nvidia,tegra186-hsp.yaml +Auto-merging drivers/mailbox/Kconfig +CONFLICT (content): Merge conflict in drivers/mailbox/Kconfig +Auto-merging drivers/mailbox/Makefile +CONFLICT (content): Merge conflict in drivers/mailbox/Makefile +Resolved 'drivers/mailbox/Kconfig' using previous resolution. +Resolved 'drivers/mailbox/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 202d8701a412] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git +$ git diff -M --stat --summary HEAD^.. + .../mailbox/allwinner,sun6i-a31-msgbox.yaml | 14 +- + .../bindings/mailbox/amlogic,meson-gxbb-mhu.yaml | 10 +- + .../devicetree/bindings/mailbox/apple,mailbox.yaml | 16 +- + .../bindings/mailbox/brcm,bcm74110-mbox.yaml | 64 ++ + .../bindings/mailbox/nvidia,tegra186-hsp.yaml | 9 +- + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 9 +- + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 2 + + .../bindings/mailbox/ti,omap-mailbox.yaml | 10 +- + .../bindings/mailbox/ti,secure-proxy.yaml | 18 +- + drivers/mailbox/Kconfig | 10 + + drivers/mailbox/Makefile | 2 + + drivers/mailbox/bcm74110-mailbox.c | 656 +++++++++++++++++++++ + drivers/mailbox/mtk-cmdq-mailbox.c | 10 +- + drivers/mailbox/qcom-ipcc.c | 3 +- + 14 files changed, 774 insertions(+), 59 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mailbox/brcm,bcm74110-mbox.yaml + create mode 100644 drivers/mailbox/bcm74110-mailbox.c +Merging spi/for-next (618393ea7752 Merge remote-tracking branch 'spi/for-6.16' into spi-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Already up to date. +Merging tip/master (6cdd7ae1b73b Merge branch into tip/master: 'timers/clocksource') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging drivers/of/irq.c +Auto-merging kernel/panic.c +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + .../devicetree/bindings/timer/faraday,fttmr010.txt | 38 --------- + .../bindings/timer/faraday,fttmr010.yaml | 89 ++++++++++++++++++++ + .../devicetree/bindings/timer/fsl,ftm-timer.yaml | 7 +- + .../devicetree/bindings/timer/fsl,timrot.yaml | 48 +++++++++++ + .../devicetree/bindings/timer/mediatek,timer.yaml | 2 + + arch/arm64/include/asm/bug.h | 2 +- + arch/loongarch/include/asm/bug.h | 27 +++--- + arch/parisc/include/asm/bug.h | 6 +- + arch/powerpc/include/asm/bug.h | 12 +-- + arch/riscv/include/asm/bug.h | 10 +-- + arch/s390/include/asm/bug.h | 96 +++++++++------------- + arch/sh/include/asm/bug.h | 4 +- + arch/x86/include/asm/bug.h | 14 ++-- + drivers/clocksource/exynos_mct.c | 24 ++++-- + drivers/clocksource/scx200_hrt.c | 1 + + drivers/clocksource/timer-cs5535.c | 1 + + drivers/clocksource/timer-econet-en751221.c | 2 +- + drivers/clocksource/timer-nxp-stm.c | 2 + + drivers/clocksource/timer-stm32-lp.c | 1 + + drivers/clocksource/timer-sun5i.c | 2 + + drivers/clocksource/timer-tegra186.c | 30 ++++--- + drivers/of/irq.c | 1 + + include/asm-generic/bug.h | 13 ++- + kernel/panic.c | 16 ++-- + kernel/time/sched_clock.c | 4 +- + lib/Kconfig.debug | 10 +++ + 26 files changed, 300 insertions(+), 162 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/timer/faraday,fttmr010.txt + create mode 100644 Documentation/devicetree/bindings/timer/faraday,fttmr010.yaml + create mode 100644 Documentation/devicetree/bindings/timer/fsl,timrot.yaml +Merging clockevents/timers/drivers/next (d7b8f8e20813 Linux 6.16-rc5) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (1fb0ddddf5d1 Merge branch 'edac-drivers' into edac-for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging drivers/edac/mem_repair.c +CONFLICT (content): Merge conflict in drivers/edac/mem_repair.c +Resolved 'drivers/edac/mem_repair.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a5ac4d32a4e5] Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git +$ git diff -M --stat --summary HEAD^.. + +Merging ftrace/for-next (e01821781f01 Merge unwind/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging MAINTAINERS +Auto-merging arch/Kconfig +Auto-merging include/linux/entry-common.h +CONFLICT (content): Merge conflict in include/linux/entry-common.h +Auto-merging include/linux/sched.h +Auto-merging kernel/Makefile +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Auto-merging kernel/trace/trace.c +Resolved 'include/linux/entry-common.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8e9b77db12d9] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/obsolete/automount-tracefs-debugfs | 20 ++ + .../tools/rtla/common_timerlat_options.rst | 64 ++++ + Documentation/trace/eprobetrace.rst | 269 +++++++++++++++ + Documentation/trace/index.rst | 1 + + MAINTAINERS | 8 + + arch/Kconfig | 7 + + include/asm-generic/Kbuild | 1 + + include/asm-generic/unwind_user.h | 5 + + include/linux/sched.h | 5 + + include/linux/trace_events.h | 3 - + include/linux/unwind_deferred.h | 81 +++++ + include/linux/unwind_deferred_types.h | 39 +++ + include/linux/unwind_user.h | 14 + + include/linux/unwind_user_types.h | 44 +++ + include/trace/events/sched.h | 2 - + kernel/Makefile | 1 + + kernel/exit.c | 2 + + kernel/fork.c | 4 + + kernel/trace/Kconfig | 27 ++ + kernel/trace/Makefile | 2 +- + kernel/trace/preemptirq_delay_test.c | 13 +- + kernel/trace/rv/rv.c | 6 - + kernel/trace/trace.c | 49 +-- + kernel/trace/trace.h | 4 +- + kernel/trace/trace_events.c | 156 +++++++-- + kernel/trace/trace_events_filter.c | 28 +- + kernel/trace/trace_hwlat.c | 5 +- + kernel/unwind/Makefile | 1 + + kernel/unwind/deferred.c | 362 +++++++++++++++++++++ + kernel/unwind/user.c | 128 ++++++++ + tools/tracing/rtla/src/Build | 1 + + tools/tracing/rtla/src/actions.c | 260 +++++++++++++++ + tools/tracing/rtla/src/actions.h | 52 +++ + tools/tracing/rtla/src/timerlat.bpf.c | 13 +- + tools/tracing/rtla/src/timerlat.c | 24 +- + tools/tracing/rtla/src/timerlat.h | 24 +- + tools/tracing/rtla/src/timerlat_bpf.c | 13 + + tools/tracing/rtla/src/timerlat_bpf.h | 3 + + tools/tracing/rtla/src/timerlat_hist.c | 140 ++++++-- + tools/tracing/rtla/src/timerlat_top.c | 179 ++++++---- + tools/tracing/rtla/tests/engine.sh | 21 +- + tools/tracing/rtla/tests/hwnoise.t | 13 +- + tools/tracing/rtla/tests/osnoise.t | 10 +- + tools/tracing/rtla/tests/scripts/check-priority.sh | 8 + + tools/tracing/rtla/tests/timerlat.t | 45 ++- + 45 files changed, 1940 insertions(+), 217 deletions(-) + create mode 100644 Documentation/ABI/obsolete/automount-tracefs-debugfs + create mode 100644 Documentation/trace/eprobetrace.rst + create mode 100644 include/asm-generic/unwind_user.h + create mode 100644 include/linux/unwind_deferred.h + create mode 100644 include/linux/unwind_deferred_types.h + create mode 100644 include/linux/unwind_user.h + create mode 100644 include/linux/unwind_user_types.h + create mode 100644 kernel/unwind/Makefile + create mode 100644 kernel/unwind/deferred.c + create mode 100644 kernel/unwind/user.c + create mode 100644 tools/tracing/rtla/src/actions.c + create mode 100644 tools/tracing/rtla/src/actions.h + create mode 100755 tools/tracing/rtla/tests/scripts/check-priority.sh +$ git am -3 ../patches/0001-fix-up-for-unwind_user-deferred-Add-unwind-cache.patch +Applying: fix up for "unwind_user/deferred: Add unwind cache" +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/irq-entry-common.h +$ git add -A . +$ git commit -v -a --amend +[master 13f557450596] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git + Date: Fri Aug 1 13:29:10 2025 +1000 +Merging rcu/next (cc1d1365f0f4 Merge branches 'rcu-exp.23.07.2025', 'rcu.22.07.2025', 'torture-scripts.16.07.2025', 'srcu.19.07.2025', 'rcu.nocb.18.07.2025' and 'refscale.07.07.2025' into rcu.merge.23.07.2025) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux.git rcu/next +Already up to date. +Merging paulmck/non-rcu/next (b706eec9304f Merge branches 'lkmm.2025.07.09a', 'ratelimit.2025.06.24a' and 'stop-machine.2025.07.17a' into HEAD) +$ git merge -m Merge branch 'non-rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Merge made by the 'ort' strategy. +Merging kvm/next (196d9e72c4b0 Merge tag 'kvm-s390-next-6.17-1' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (7b8346bd9fce KVM: arm64: Don't attempt vLPI mappings when vPE allocation is disabled) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Merge made by the 'ort' strategy. + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 8 ++++++++ + arch/arm64/kvm/vgic/vgic.h | 10 +--------- + 2 files changed, 9 insertions(+), 9 deletions(-) +Merging kvms390/next (57d88f02eb44 KVM: s390: Rework guest entry logic) +$ 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 (fac04efc5c79 Linux 6.13-rc2) +$ 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 (07a289a03140 RISC-V: KVM: Avoid re-acquiring memslot in kvm_riscv_gstage_map()) +$ 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 (33f843444e28 Merge branch 'vmx') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Merge made by the 'ort' strategy. + Documentation/virt/kvm/x86/intel-tdx.rst | 22 ++++++++++++++++++- + arch/x86/include/uapi/asm/kvm.h | 7 ++++++- + arch/x86/kvm/vmx/tdx.c | 36 +++++++++++++++++++++++++------- + 3 files changed, 55 insertions(+), 10 deletions(-) +Merging xen-tip/linux-next (114a2de6fa86 xen/netfront: Fix TX response spurious interrupts) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (87d6aab2389e Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (324cee0c272c Merge branch 'for-6.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. +Merging sched-ext/for-next (9f0744a0e87e Merge branch 'for-6.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Merge made by the 'ort' strategy. +Merging drivers-x86/for-next (1798561befd8 platform/x86: oxpec: Add support for OneXPlayer X1 Mini Pro (Strix Point)) +$ 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 (cc2d5b72b13b platform/chrome: Fix typo in CROS_USBPD_NOTIFY help text) +$ 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 (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds-lj/for-leds-next (4903924ac7ef dt-bindings: leds: ncp5623: Add 0x39 as a valid I2C address) +$ 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 +Already up to date. +Merging ipmi/for-next (f6f9760320a9 char: ipmi: remove redundant variable 'type' and check) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Auto-merging drivers/char/ipmi/ipmi_si_intf.c +Merge made by the 'ort' strategy. + drivers/char/ipmi/ipmi_si_intf.c | 4 --- + drivers/char/ipmi/ipmi_watchdog.c | 59 ++++++++++++++++++++++++++++----------- + 2 files changed, 42 insertions(+), 21 deletions(-) +Merging driver-core/driver-core-next (260f6f4fda93 Merge tag 'drm-next-2025-07-30' of https://gitlab.freedesktop.org/drm/kernel) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (beb6c8326eb4 Merge tag 'uml-for-linux-6.17-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (2d1beba54fda thunderbolt: Fix typos in documentation comments) +$ 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 (bdf2ab177e2f USB: serial: cp210x: use new GPIO line value setter callbacks) +$ 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 (260f6f4fda93 Merge tag 'drm-next-2025-07-30' of https://gitlab.freedesktop.org/drm/kernel) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (260f6f4fda93 Merge tag 'drm-next-2025-07-30' of https://gitlab.freedesktop.org/drm/kernel) +$ 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 +Already up to date. +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 (a80198ba650f coresight: fix indentation error in cscfg_remove_owned_csdev_configs()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Merge made by the 'ort' strategy. + .../bindings/arm/qcom,coresight-tnoc.yaml | 113 ++++++++++ + drivers/hwtracing/coresight/Kconfig | 12 + + drivers/hwtracing/coresight/Makefile | 1 + + drivers/hwtracing/coresight/coresight-core.c | 6 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 4 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 1 + + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 1 + + drivers/hwtracing/coresight/coresight-stm.c | 8 +- + drivers/hwtracing/coresight/coresight-syscfg.c | 2 +- + drivers/hwtracing/coresight/coresight-tmc-core.c | 22 +- + drivers/hwtracing/coresight/coresight-tnoc.c | 242 +++++++++++++++++++++ + drivers/hwtracing/coresight/coresight-trbe.c | 1 + + drivers/hwtracing/coresight/ultrasoc-smb.h | 1 + + 13 files changed, 389 insertions(+), 25 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/qcom,coresight-tnoc.yaml + create mode 100644 drivers/hwtracing/coresight/coresight-tnoc.c +Merging fastrpc/for-next (0af2f6be1b42 Linux 6.15-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 (37e00703228a zynq_fpga: use sgtable-based scatterlist wrappers) +$ 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 (ca652cf0c261 Merge branch 'icc-milos' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (0a686b9c4f84 iio: adc: ad_sigma_delta: Select IIO_BUFFER_DMAENGINE and SPI_OFFLOAD) +$ 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 (4a3556b81b99 phy: qcom: phy-qcom-m31: Update IPQ5332 M31 USB phy initialization sequence) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/phy/phy-snps-eusb2.c +Auto-merging drivers/ufs/host/ufs-qcom.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3112c20e885c] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/mfd/motorola-cpcap.txt | 2 +- + .../devicetree/bindings/phy/apm,xgene-phy.yaml | 169 +++++++++++ + .../devicetree/bindings/phy/apm-xgene-phy.txt | 76 ----- + .../devicetree/bindings/phy/berlin-sata-phy.txt | 36 --- + .../devicetree/bindings/phy/berlin-usb-phy.txt | 16 - + .../devicetree/bindings/phy/brcm,ns2-drd-phy.txt | 30 -- + .../devicetree/bindings/phy/brcm,ns2-drd-phy.yaml | 62 ++++ + .../devicetree/bindings/phy/brcm,sr-pcie-phy.txt | 41 --- + .../devicetree/bindings/phy/brcm,sr-pcie-phy.yaml | 46 +++ + .../bindings/phy/brcm,sr-usb-combo-phy.yaml | 65 +++++ + .../bindings/phy/brcm,stingray-usb-phy.txt | 32 -- + .../devicetree/bindings/phy/dm816x-phy.txt | 24 -- + .../bindings/phy/hisilicon,hi6220-usb-phy.yaml | 35 +++ + .../bindings/phy/hisilicon,hix5hd2-sata-phy.yaml | 48 +++ + .../bindings/phy/hisilicon,inno-usb2-phy.yaml | 93 ++++++ + .../devicetree/bindings/phy/hix5hd2-phy.txt | 22 -- + .../bindings/phy/img,pistachio-usb-phy.yaml | 62 ++++ + .../devicetree/bindings/phy/keystone-usb-phy.txt | 19 -- + .../bindings/phy/lantiq,ase-usb2-phy.yaml | 71 +++++ + .../phy/marvell,armada-375-usb-cluster.yaml | 40 +++ + .../bindings/phy/marvell,armada-380-comphy.yaml | 83 ++++++ + .../bindings/phy/marvell,berlin2-sata-phy.yaml | 76 +++++ + .../bindings/phy/marvell,berlin2-usb-phy.yaml | 42 +++ + .../bindings/phy/marvell,comphy-cp110.yaml | 154 ++++++++++ + .../bindings/phy/marvell,mmp2-usb-phy.yaml | 37 +++ + .../bindings/phy/marvell,mvebu-sata-phy.yaml | 47 +++ + .../bindings/phy/mixel,mipi-dsi-phy.yaml | 5 - + .../bindings/phy/motorola,cpcap-usb-phy.yaml | 107 +++++++ + .../bindings/phy/motorola,mapphone-mdm6600.yaml | 81 ++++++ + .../bindings/phy/phy-armada38x-comphy.txt | 48 --- + .../devicetree/bindings/phy/phy-ath79-usb.txt | 18 -- + .../devicetree/bindings/phy/phy-cpcap-usb.txt | 40 --- + .../devicetree/bindings/phy/phy-da8xx-usb.txt | 40 --- + .../devicetree/bindings/phy/phy-hi6220-usb.txt | 16 - + .../devicetree/bindings/phy/phy-hisi-inno-usb2.txt | 71 ----- + .../bindings/phy/phy-lantiq-rcu-usb2.txt | 40 --- + .../bindings/phy/phy-mapphone-mdm6600.txt | 29 -- + .../devicetree/bindings/phy/phy-mvebu-comphy.txt | 94 ------ + .../devicetree/bindings/phy/phy-mvebu.txt | 42 --- + .../devicetree/bindings/phy/phy-pxa-usb.txt | 18 -- + .../devicetree/bindings/phy/pistachio-usb-phy.txt | 29 -- + .../bindings/phy/qca,ar7100-usb-phy.yaml | 49 ++++ + .../bindings/phy/qcom,m31-eusb2-phy.yaml | 79 +++++ + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 2 +- + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 2 + + .../bindings/phy/qcom,snps-eusb2-phy.yaml | 1 + + .../bindings/phy/qcom,snps-eusb2-repeater.yaml | 3 - + .../devicetree/bindings/phy/renesas,usb2-phy.yaml | 4 + + .../bindings/phy/samsung,mipi-video-phy.yaml | 29 +- + .../bindings/phy/samsung,usb3-drd-phy.yaml | 2 + + .../bindings/phy/st,spear1310-miphy.yaml | 53 ++++ + .../devicetree/bindings/phy/st-spear-miphy.txt | 15 - + .../devicetree/bindings/phy/ti,da830-usb-phy.yaml | 53 ++++ + .../devicetree/bindings/phy/ti,dm8168-usb-phy.yaml | 58 ++++ + .../bindings/phy/ti,keystone-usbphy.yaml | 37 +++ + .../devicetree/bindings/usb/qcom,snps-dwc3.yaml | 3 + + MAINTAINERS | 4 +- + drivers/phy/broadcom/phy-bcm-ns2-pcie.c | 2 - + drivers/phy/broadcom/phy-bcm-ns2-usbdrd.c | 1 - + drivers/phy/broadcom/phy-bcm-sr-pcie.c | 2 - + drivers/phy/broadcom/phy-brcm-sata.c | 2 +- + drivers/phy/cadence/phy-cadence-sierra.c | 180 ++++++++++++ + drivers/phy/cadence/phy-cadence-torrent.c | 288 +++++++++++++++++- + drivers/phy/marvell/phy-pxa-usb.c | 1 - + drivers/phy/mediatek/phy-mtk-tphy.c | 65 +++-- + drivers/phy/phy-snps-eusb2.c | 46 +-- + drivers/phy/qualcomm/Kconfig | 16 +- + drivers/phy/qualcomm/Makefile | 1 + + drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 85 ++---- + drivers/phy/qualcomm/phy-qcom-m31-eusb2.c | 324 +++++++++++++++++++++ + drivers/phy/qualcomm/phy-qcom-m31.c | 16 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 224 ++++++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 89 +++--- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h | 2 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v8.h | 38 +++ + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5_20.h | 4 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v8.h | 32 ++ + drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v8.h | 64 ++++ + .../phy/qualcomm/phy-qcom-qmp-qserdes-ln-shrd-v5.h | 11 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v8.h | 68 +++++ + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 141 +++------ + drivers/phy/qualcomm/phy-qcom-qmp.h | 6 + + drivers/phy/qualcomm/phy-qcom-qusb2.c | 4 +- + drivers/phy/rockchip/phy-rockchip-pcie.c | 15 +- + drivers/phy/samsung/phy-exynos-mipi-video.c | 52 ++++ + drivers/phy/samsung/phy-exynos5-usbdrd.c | 32 ++ + drivers/phy/st/phy-stih407-usb.c | 2 - + drivers/phy/st/phy-stm32-usbphyc.c | 4 +- + drivers/phy/ti/phy-twl4030-usb.c | 1 - + drivers/ufs/host/ufs-qcom.c | 66 +++-- + include/linux/soc/samsung/exynos-regs-pmu.h | 8 + + 91 files changed, 3264 insertions(+), 1128 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/apm,xgene-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/apm-xgene-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/berlin-sata-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/berlin-usb-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/brcm,ns2-drd-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/brcm,ns2-drd-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/brcm,sr-pcie-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/brcm,sr-pcie-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/brcm,sr-usb-combo-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/brcm,stingray-usb-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/dm816x-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/hisilicon,hi6220-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/hisilicon,hix5hd2-sata-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/hisilicon,inno-usb2-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/hix5hd2-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/img,pistachio-usb-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/keystone-usb-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/lantiq,ase-usb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/marvell,armada-375-usb-cluster.yaml + create mode 100644 Documentation/devicetree/bindings/phy/marvell,armada-380-comphy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/marvell,berlin2-sata-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/marvell,berlin2-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/marvell,comphy-cp110.yaml + create mode 100644 Documentation/devicetree/bindings/phy/marvell,mmp2-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/marvell,mvebu-sata-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/motorola,cpcap-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/motorola,mapphone-mdm6600.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-armada38x-comphy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-ath79-usb.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-cpcap-usb.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-da8xx-usb.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-hi6220-usb.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-hisi-inno-usb2.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-lantiq-rcu-usb2.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-mapphone-mdm6600.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-mvebu-comphy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-mvebu.txt + delete mode 100644 Documentation/devicetree/bindings/phy/phy-pxa-usb.txt + delete mode 100644 Documentation/devicetree/bindings/phy/pistachio-usb-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qca,ar7100-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,m31-eusb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/st,spear1310-miphy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/st-spear-miphy.txt + create mode 100644 Documentation/devicetree/bindings/phy/ti,da830-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/ti,dm8168-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/ti,keystone-usbphy.yaml + create mode 100644 drivers/phy/qualcomm/phy-qcom-m31-eusb2.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v8.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v8.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v8.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-ln-shrd-v5.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v8.h +Merging soundwire/next (34b1cb4ec286 soundwire: amd: Add support for acp7.2 platform) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging MAINTAINERS +Auto-merging drivers/soundwire/amd_manager.c +Auto-merging drivers/soundwire/qcom.c +Auto-merging sound/soc/codecs/cs42l43-jack.c +Auto-merging sound/soc/codecs/cs42l43.c +Merge made by the 'ort' strategy. + Documentation/driver-api/soundwire/bra.rst | 2 +- + MAINTAINERS | 1 - + drivers/soundwire/amd_manager.c | 14 +++++++-- + drivers/soundwire/bus.c | 6 ++-- + drivers/soundwire/debugfs.c | 6 ++-- + drivers/soundwire/intel_ace2x.c | 11 +++---- + drivers/soundwire/intel_auxdevice.c | 1 + + drivers/soundwire/mipi_disco.c | 4 +-- + drivers/soundwire/qcom.c | 6 ++-- + drivers/soundwire/stream.c | 2 +- + include/linux/soundwire/sdw_amd.h | 1 + + sound/soc/codecs/cs42l43-jack.c | 46 ++++++++++++------------------ + sound/soc/codecs/cs42l43.c | 24 ++++------------ + sound/soc/codecs/cs42l43.h | 5 ---- + 14 files changed, 55 insertions(+), 74 deletions(-) +Merging extcon/extcon-next (5f09caafc652 extcon: fsa9480: Avoid buffer overflow in fsa9480_handle_change()) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/extcon/maxim,max14526.yaml | 80 ++++++ + drivers/extcon/Kconfig | 13 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-adc-jack.c | 2 + + drivers/extcon/extcon-axp288.c | 2 +- + drivers/extcon/extcon-fsa9480.c | 6 +- + drivers/extcon/extcon-max14526.c | 302 +++++++++++++++++++++ + drivers/extcon/extcon-qcom-spmi-misc.c | 2 +- + 8 files changed, 404 insertions(+), 4 deletions(-) + create mode 100644 Documentation/devicetree/bindings/extcon/maxim,max14526.yaml + create mode 100644 drivers/extcon/extcon-max14526.c +Merging gnss/gnss-next (e326371f3002 dt-bindings: gnss: u-blox: add u-blox,neo-9m compatible) +$ 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 (d2272d898186 vfio/type1: correct logic of vfio_find_vpfn()) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging MAINTAINERS +Auto-merging drivers/vfio/pci/vfio_pci_core.c +Auto-merging include/linux/mm.h +Merge made by the 'ort' strategy. + MAINTAINERS | 1 - + drivers/vfio/device_cdev.c | 38 +++++++- + drivers/vfio/group.c | 7 +- + drivers/vfio/iommufd.c | 4 + + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 1 + + drivers/vfio/pci/mlx5/cmd.c | 4 +- + drivers/vfio/pci/mlx5/main.c | 1 + + drivers/vfio/pci/nvgrace-gpu/main.c | 2 + + drivers/vfio/pci/pds/vfio_dev.c | 2 + + drivers/vfio/pci/qat/main.c | 5 +- + drivers/vfio/pci/vfio_pci.c | 1 + + drivers/vfio/pci/vfio_pci_core.c | 24 +++-- + drivers/vfio/pci/virtio/main.c | 3 + + drivers/vfio/vfio_iommu_type1.c | 118 ++++++++++++++++++++----- + drivers/vfio/vfio_main.c | 3 +- + include/linux/mm.h | 23 +++++ + include/linux/vfio.h | 4 + + include/linux/vfio_pci_core.h | 2 + + include/uapi/linux/vfio.h | 12 ++- + 19 files changed, 212 insertions(+), 43 deletions(-) +Merging w1/for-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging spmi/spmi-next (0ff41df1cb26 Linux 6.15) +$ 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 (260f6f4fda93 Merge tag 'drm-next-2025-07-30' of https://gitlab.freedesktop.org/drm/kernel) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging counter-next/counter-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging 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 (59b723cd2adb Linux 6.12-rc6) +$ 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 (e3a9ccd21897 dt-bindings: dma: fsl-mxs-dma: allow interrupt-names for fsl,imx23-dma-apbx) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging drivers/dma/nbpfaxi.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/brcm,iproc-sba.txt | 29 --- + .../devicetree/bindings/dma/brcm,iproc-sba.yaml | 41 ++++ + .../devicetree/bindings/dma/fsl,mxs-dma.yaml | 33 +++ + .../devicetree/bindings/dma/marvell,orion-xor.yaml | 84 +++++++ + Documentation/devicetree/bindings/dma/mv-xor.txt | 40 ---- + .../devicetree/bindings/dma/qcom,gpi.yaml | 2 + + .../bindings/dma/sophgo,cv1800b-dmamux.yaml | 51 ++++ + drivers/dma/Kconfig | 12 +- + drivers/dma/Makefile | 1 + + drivers/dma/cv1800b-dmamux.c | 259 +++++++++++++++++++++ + drivers/dma/dw-edma/dw-edma-core.c | 12 - + drivers/dma/fsl-dpaa2-qdma/dpdmai.c | 5 - + drivers/dma/fsl-qdma.c | 3 + + drivers/dma/idxd/init.c | 1 - + drivers/dma/idxd/registers.h | 60 ++--- + drivers/dma/mmp_tdma.c | 2 +- + drivers/dma/mv_xor.c | 21 +- + drivers/dma/nbpfaxi.c | 13 ++ + drivers/dma/qcom/gpi.c | 11 - + drivers/dma/sh/Kconfig | 2 +- + drivers/dma/stm32/stm32-dma.c | 12 +- + drivers/dma/stm32/stm32-dma3.c | 10 +- + drivers/dma/stm32/stm32-mdma.c | 8 +- + drivers/dma/sun4i-dma.c | 46 ++-- + drivers/dma/ti/Kconfig | 4 +- + 25 files changed, 578 insertions(+), 184 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/dma/brcm,iproc-sba.txt + create mode 100644 Documentation/devicetree/bindings/dma/brcm,iproc-sba.yaml + create mode 100644 Documentation/devicetree/bindings/dma/marvell,orion-xor.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/mv-xor.txt + create mode 100644 Documentation/devicetree/bindings/dma/sophgo,cv1800b-dmamux.yaml + create mode 100644 drivers/dma/cv1800b-dmamux.c +Merging cgroup/for-next (d445d2ab8129 Merge branch 'for-6.17' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. +Merging scsi/for-next (b3a40acce7b3 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/scsi/libsas/sas_ata.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/ufs/host/ufs-qcom.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/ufs/mediatek,ufs.yaml | 46 ++- + MAINTAINERS | 2 +- + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 25 ++ + drivers/scsi/aacraid/comminit.c | 3 +- + drivers/scsi/libsas/sas_ata.c | 10 +- + drivers/scsi/libsas/sas_discover.c | 2 +- + drivers/scsi/libsas/sas_internal.h | 78 ++++- + drivers/scsi/libsas/sas_phy.c | 6 +- + drivers/scsi/libsas/sas_port.c | 13 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 3 +- + drivers/scsi/scsi_scan.c | 2 +- + drivers/scsi/scsi_transport_iscsi.c | 2 + + drivers/scsi/scsi_transport_sas.c | 62 +++- + drivers/scsi/sd.c | 4 +- + drivers/target/target_core_fabric_lib.c | 65 +++- + drivers/target/target_core_iblock.c | 33 ++- + drivers/target/target_core_iblock.h | 1 + + drivers/target/target_core_internal.h | 4 +- + drivers/target/target_core_pr.c | 18 +- + drivers/ufs/core/ufs-sysfs.c | 3 +- + drivers/ufs/core/ufshcd.c | 105 +++---- + drivers/ufs/host/ufs-mediatek.c | 330 ++++++++++++++++++--- + drivers/ufs/host/ufs-mediatek.h | 32 ++ + drivers/ufs/host/ufs-qcom.c | 8 - + drivers/ufs/host/ufshcd-pci.c | 33 +-- + include/scsi/sas_ata.h | 91 +----- + 26 files changed, 703 insertions(+), 278 deletions(-) +Merging scsi-mkp/for-next (383cd6d879a1 scsi: scsi_debug: Make read-only arrays static const) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/scsi_sysfs.c +Merge made by the 'ort' strategy. + drivers/scsi/scsi_debug.c | 91 +++++++++++++++++++++++++++++------------------ + drivers/scsi/scsi_sysfs.c | 4 +-- + 2 files changed, 59 insertions(+), 36 deletions(-) +Merging vhost/linux-next (9bac62b70cff virtio_ring: rename virtqueue_reinit_xxx to virtqueue_reset_xxx()) +$ 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/pci/pci.h +Auto-merging drivers/vhost/net.c +CONFLICT (content): Merge conflict in drivers/vhost/net.c +Auto-merging drivers/vhost/vhost.c +Auto-merging drivers/vhost/vhost.h +Auto-merging drivers/virtio/virtio.c +Auto-merging drivers/virtio/virtio_pci_modern.c +Auto-merging drivers/virtio/virtio_ring.c +Auto-merging drivers/virtio/virtio_vdpa.c +Auto-merging include/linux/pci.h +Auto-merging include/linux/virtio.h +Auto-merging include/linux/virtio_config.h +Auto-merging include/uapi/linux/vhost.h +CONFLICT (content): Merge conflict in include/uapi/linux/vhost.h +Resolved 'drivers/vhost/net.c' using previous resolution. +Resolved 'include/uapi/linux/vhost.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ec908c89a1b8] Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 6 + + drivers/gpu/drm/virtio/virtgpu_drv.c | 8 +- + drivers/media/Kconfig | 13 + + drivers/media/Makefile | 2 + + drivers/media/virtio/Makefile | 9 + + drivers/media/virtio/protocol.h | 288 ++++++ + drivers/media/virtio/scatterlist_builder.c | 563 ++++++++++++ + drivers/media/virtio/scatterlist_builder.h | 111 +++ + drivers/media/virtio/session.h | 109 +++ + drivers/media/virtio/virtio_media.h | 93 ++ + drivers/media/virtio/virtio_media_driver.c | 959 ++++++++++++++++++++ + drivers/media/virtio/virtio_media_ioctls.c | 1297 ++++++++++++++++++++++++++++ + drivers/pci/pci.h | 6 + + drivers/vdpa/mlx5/core/mr.c | 3 + + drivers/vdpa/mlx5/net/mlx5_vnet.c | 12 +- + drivers/vdpa/vdpa_user/vduse_dev.c | 1 + + drivers/vhost/Kconfig | 18 + + drivers/vhost/net.c | 88 +- + drivers/vhost/scsi.c | 24 +- + drivers/vhost/vhost.c | 377 +++++++- + drivers/vhost/vhost.h | 30 +- + drivers/vhost/vringh.c | 118 --- + drivers/vhost/vsock.c | 15 +- + drivers/virtio/virtio.c | 25 +- + drivers/virtio/virtio_dma_buf.c | 2 + + drivers/virtio/virtio_mmio.c | 52 +- + drivers/virtio/virtio_pci_common.c | 45 + + drivers/virtio/virtio_pci_common.h | 3 + + drivers/virtio/virtio_pci_legacy.c | 2 + + drivers/virtio/virtio_pci_modern.c | 2 + + drivers/virtio/virtio_ring.c | 16 +- + drivers/virtio/virtio_vdpa.c | 44 +- + include/linux/pci.h | 45 + + include/linux/virtio.h | 13 +- + include/linux/virtio_config.h | 32 + + include/linux/virtio_vsock.h | 46 +- + include/linux/vringh.h | 12 - + include/uapi/linux/vhost.h | 28 + + include/uapi/linux/virtio_ids.h | 1 + + kernel/vhost_task.c | 2 +- + net/vmw_vsock/virtio_transport.c | 20 +- + net/vmw_vsock/virtio_transport_common.c | 3 +- + 42 files changed, 4191 insertions(+), 352 deletions(-) + create mode 100644 drivers/media/virtio/Makefile + create mode 100644 drivers/media/virtio/protocol.h + create mode 100644 drivers/media/virtio/scatterlist_builder.c + create mode 100644 drivers/media/virtio/scatterlist_builder.h + create mode 100644 drivers/media/virtio/session.h + create mode 100644 drivers/media/virtio/virtio_media.h + create mode 100644 drivers/media/virtio/virtio_media_driver.c + create mode 100644 drivers/media/virtio/virtio_media_ioctls.c +Merging rpmsg/for-next (01d7d9241256 Merge branches 'rproc-next' and 'rpmsg-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../bindings/remoteproc/qcom,sa8775p-pas.yaml | 2 +- + .../bindings/remoteproc/qcom,sm8150-pas.yaml | 65 ++- + drivers/remoteproc/Kconfig | 11 +- + drivers/remoteproc/omap_remoteproc.c | 2 +- + drivers/remoteproc/pru_rproc.c | 2 +- + drivers/remoteproc/qcom_q6v5_pas.c | 615 ++++++++++----------- + drivers/remoteproc/remoteproc_core.c | 2 +- + drivers/remoteproc/remoteproc_virtio.c | 2 +- + drivers/remoteproc/st_slim_rproc.c | 2 +- + drivers/remoteproc/ti_k3_common.c | 4 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 2 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 74 ++- + drivers/rpmsg/qcom_glink_native.c | 2 +- + drivers/rpmsg/qcom_smd.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 3 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 2 +- + 16 files changed, 422 insertions(+), 370 deletions(-) +Merging gpio-brgl/gpio/for-next (6b94bf976f9f MIPS: alchemy: gpio: use new GPIO line value setter callbacks for the remaining chips) +$ 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 (9ab29ed50555 gpiolib: acpi: Add a quirk for Acer Nitro V15) +$ 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 (a3fe1324c3c5 pinctrl: mediatek: Add pinctrl driver for mt8189) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging drivers/pinctrl/Kconfig +Auto-merging drivers/pinctrl/Makefile +Auto-merging drivers/pinctrl/meson/pinctrl-amlogic-a4.c +Auto-merging drivers/pinctrl/nuvoton/pinctrl-ma35.c +Auto-merging drivers/pinctrl/pinctrl-amd.c +Auto-merging drivers/pinctrl/pinctrl-aw9523.c +Auto-merging drivers/pinctrl/pinctrl-st.c +Auto-merging drivers/pinctrl/pinctrl-tb10x.c +Auto-merging include/linux/soc/samsung/exynos-regs-pmu.h +Merge made by the 'ort' strategy. + .../bindings/pinctrl/amlogic,pinctrl-a4.yaml | 9 +- + .../bindings/pinctrl/eswin,eic7700-pinctrl.yaml | 156 ++ + .../bindings/pinctrl/mediatek,mt8189-pinctrl.yaml | 213 ++ + .../bindings/pinctrl/nxp,lpc1850-scu.txt | 71 - + .../bindings/pinctrl/nxp,lpc1850-scu.yaml | 79 + + .../bindings/pinctrl/qcom,milos-tlmm.yaml | 133 ++ + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 4 + + .../bindings/pinctrl/rockchip,pinctrl.yaml | 2 +- + .../devicetree/bindings/pinctrl/st,stm32-hdp.yaml | 187 ++ + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 25 + + MAINTAINERS | 14 + + arch/arm64/Kconfig.platforms | 1 - + drivers/pinctrl/Kconfig | 21 +- + drivers/pinctrl/Makefile | 3 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 2 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 2 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 14 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.c | 2 +- + drivers/pinctrl/aspeed/pinctrl-aspeed.h | 2 +- + drivers/pinctrl/bcm/pinctrl-bcm4908.c | 2 +- + drivers/pinctrl/bcm/pinctrl-cygnus-mux.c | 8 +- + drivers/pinctrl/bcm/pinctrl-ns.c | 2 +- + drivers/pinctrl/bcm/pinctrl-ns2-mux.c | 8 +- + drivers/pinctrl/bcm/pinctrl-nsp-mux.c | 8 +- + drivers/pinctrl/berlin/berlin.c | 10 +- + drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 23 +- + drivers/pinctrl/cirrus/pinctrl-lochnagar.c | 25 +- + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 14 +- + drivers/pinctrl/core.c | 13 +- + drivers/pinctrl/core.h | 2 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 8 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 6 +- + drivers/pinctrl/intel/pinctrl-intel.c | 20 +- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 6 +- + drivers/pinctrl/mediatek/Kconfig | 12 + + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/mtk-eint.c | 4 +- + drivers/pinctrl/mediatek/pinctrl-airoha.c | 10 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 5 +- + drivers/pinctrl/mediatek/pinctrl-mt8189.c | 1700 ++++++++++++++ + drivers/pinctrl/mediatek/pinctrl-mtk-mt8189.h | 2452 ++++++++++++++++++++ + drivers/pinctrl/meson/pinctrl-amlogic-a4.c | 118 +- + drivers/pinctrl/meson/pinctrl-meson-g12a.c | 22 +- + drivers/pinctrl/nuvoton/pinctrl-ma35.c | 6 +- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 2 +- + drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 2 +- + drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 2 +- + drivers/pinctrl/pinctrl-amd.c | 8 +- + drivers/pinctrl/pinctrl-amdisp.c | 6 +- + drivers/pinctrl/pinctrl-apple-gpio.c | 6 +- + drivers/pinctrl/pinctrl-artpec6.c | 2 +- + drivers/pinctrl/pinctrl-as3722.c | 23 +- + drivers/pinctrl/pinctrl-at91-pio4.c | 6 +- + drivers/pinctrl/pinctrl-aw9523.c | 26 +- + drivers/pinctrl/pinctrl-bm1880.c | 2 +- + drivers/pinctrl/pinctrl-da9062.c | 14 +- + drivers/pinctrl/pinctrl-digicolor.c | 8 +- + drivers/pinctrl/pinctrl-eic7700.c | 704 ++++++ + drivers/pinctrl/pinctrl-equilibrium.c | 9 +- + drivers/pinctrl/pinctrl-falcon.c | 2 +- + drivers/pinctrl/pinctrl-ingenic.c | 5 +- + drivers/pinctrl/pinctrl-k210.c | 2 +- + drivers/pinctrl/pinctrl-k230.c | 13 +- + drivers/pinctrl/pinctrl-keembay.c | 19 +- + drivers/pinctrl/pinctrl-lpc18xx.c | 2 +- + drivers/pinctrl/pinctrl-max77620.c | 9 +- + drivers/pinctrl/pinctrl-mcp23s08.c | 20 +- + drivers/pinctrl/pinctrl-mlxbf3.c | 2 +- + drivers/pinctrl/pinctrl-palmas.c | 4 +- + drivers/pinctrl/pinctrl-pic32.c | 8 +- + drivers/pinctrl/pinctrl-pistachio.c | 8 +- + drivers/pinctrl/pinctrl-st.c | 6 +- + drivers/pinctrl/pinctrl-tb10x.c | 2 +- + drivers/pinctrl/pinctrl-xway.c | 18 +- + drivers/pinctrl/pinctrl-zynq.c | 2 +- + drivers/pinctrl/pinmux.c | 45 +- + drivers/pinctrl/pinmux.h | 10 +- + drivers/pinctrl/qcom/Kconfig.msm | 8 + + drivers/pinctrl/qcom/Makefile | 1 + + drivers/pinctrl/qcom/pinctrl-milos.c | 1339 +++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 2 + + drivers/pinctrl/qcom/tlmm-test.c | 47 +- + drivers/pinctrl/renesas/Kconfig | 269 ++- + drivers/pinctrl/renesas/gpio.c | 6 +- + drivers/pinctrl/renesas/pinctrl-rza1.c | 7 +- + drivers/pinctrl/renesas/pinctrl-rza2.c | 7 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 53 +- + drivers/pinctrl/renesas/pinctrl-rzn1.c | 4 +- + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 8 +- + drivers/pinctrl/samsung/pinctrl-exynos-arm64.c | 6 +- + drivers/pinctrl/samsung/pinctrl-exynos.c | 103 +- + drivers/pinctrl/samsung/pinctrl-samsung.h | 4 + + drivers/pinctrl/spear/pinctrl-plgpio.c | 11 +- + drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 10 +- + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 7 +- + drivers/pinctrl/stm32/Kconfig | 20 +- + drivers/pinctrl/stm32/Makefile | 1 + + drivers/pinctrl/stm32/pinctrl-stm32-hdp.c | 720 ++++++ + drivers/pinctrl/stm32/pinctrl-stm32.c | 144 +- + drivers/pinctrl/stm32/pinctrl-stm32.h | 22 +- + drivers/pinctrl/stm32/pinctrl-stm32mp257.c | 15 +- + drivers/pinctrl/sunplus/sppctl.c | 6 +- + drivers/pinctrl/sunxi/pinctrl-sun8i-v3s.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 21 +- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 17 +- + drivers/rtc/rtc-stm32.c | 2 +- + include/dt-bindings/pinctrl/stm32-pinfunc.h | 1 + + include/linux/pinctrl/pinctrl.h | 8 +- + include/linux/soc/samsung/exynos-regs-pmu.h | 1 + + 109 files changed, 8736 insertions(+), 558 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/eswin,eic7700-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt8189-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/nxp,lpc1850-scu.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/nxp,lpc1850-scu.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,milos-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/st,stm32-hdp.yaml + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt8189.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt8189.h + create mode 100644 drivers/pinctrl/pinctrl-eic7700.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-milos.c + create mode 100644 drivers/pinctrl/stm32/pinctrl-stm32-hdp.c +Merging pinctrl-intel/for-next (3b4408038da9 pinctrl: intel: fix build warnings about export.h) +$ 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 (7000167796a0 pinctrl: renesas: Simplify PINCTRL_RZV2M logic) +$ 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 (683d532dfc96 pinctrl: samsung: Fix gs101 irq chip) +$ 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 (f365b1d8ecc3 dt-bindings: timer: renesas,rz-mtu3: Use #pwm-cells = <3>) +$ git merge -m Merge branch 'pwm/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/timer/renesas,rz-mtu3.yaml | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging ktest/for-next (a5e71638ddd7 ktest.pl: Add new PATCHCHECK_SKIP option to skip testing individual commits) +$ 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 (30fb5e134f05 selftests/pidfd: Fix duplicate-symbol warnings for SCHED_ CPP symbols) +$ 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 (19272b37aa4f Linux 6.16-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 (34db4fba8191 kunit: fix longest symbol length 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 (a8e905a819fd Merge branch 'for-6.15/ftrace-test' 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 (95f610e36adc rtc: pcf85063: scope pcf85063_config structures) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/rtc/amlogic,a4-rtc.yaml | 11 +- + .../devicetree/bindings/rtc/nxp,lpc1788-rtc.yaml | 7 +- + .../devicetree/bindings/rtc/nxp,lpc3220-rtc.yaml | 49 +++ + .../devicetree/bindings/rtc/nxp,pcf85063.yaml | 33 +- + .../{soc/sophgo => rtc}/sophgo,cv1800b-rtc.yaml | 2 +- + .../devicetree/bindings/rtc/trivial-rtc.yaml | 2 - + drivers/rtc/Kconfig | 21 +- + drivers/rtc/Makefile | 2 +- + drivers/rtc/lib.c | 40 ++- + drivers/rtc/rtc-ds1307.c | 15 +- + drivers/rtc/rtc-m41t80.c | 4 +- + drivers/rtc/rtc-pcf85063.c | 336 ++++++++++++++------- + drivers/rtc/rtc-s3c.c | 8 +- + drivers/rtc/rtc-sh.c | 8 +- + drivers/rtc/sysfs.c | 64 ++-- + drivers/rtc/{lib_test.c => test_rtc_lib.c} | 0 + 16 files changed, 412 insertions(+), 190 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/nxp,lpc3220-rtc.yaml + rename Documentation/devicetree/bindings/{soc/sophgo => rtc}/sophgo,cv1800b-rtc.yaml (96%) + rename drivers/rtc/{lib_test.c => test_rtc_lib.c} (100%) +Merging nvdimm/libnvdimm-for-next (9f97e61bde6a cxl: Include range.h in cxl.h) +$ 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 (19272b37aa4f Linux 6.16-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 (0cadf92e93d4 NTB/msi: Remove unused functions) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/ntb/msi.c +Merge made by the 'ort' strategy. + drivers/ntb/hw/mscc/ntb_hw_switchtec.c | 14 ++++++-- + drivers/ntb/msi.c | 64 ---------------------------------- + include/linux/ntb.h | 14 -------- + 3 files changed, 11 insertions(+), 81 deletions(-) +Merging seccomp/for-next/seccomp (b0c9bfbab925 selftests/seccomp: Add a test for the WAIT_KILLABLE_RECV fast reply race) +$ 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 +Merge made by the 'ort' strategy. + kernel/seccomp.c | 12 +-- + tools/testing/selftests/seccomp/seccomp_bpf.c | 131 ++++++++++++++++++++++++++ + 2 files changed, 136 insertions(+), 7 deletions(-) +Merging slimbus/for-next (0af2f6be1b42 Linux 6.15-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 (19272b37aa4f Linux 6.16-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 (6684aba0780d XArray: Add extra debugging check to xas_lock and friends) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Auto-merging include/linux/xarray.h +Auto-merging lib/xarray.c +Merge made by the 'ort' strategy. + include/linux/xarray.h | 60 +++++++++++++++++++++++++++----------------------- + lib/xarray.c | 3 +-- + 2 files changed, 34 insertions(+), 29 deletions(-) +Merging hyperv/hyperv-next (d9016a249be5 hv/hv_kvp_daemon: Prevent similar logs in kvp_key_add_or_modify()) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Merge made by the 'ort' strategy. + tools/hv/hv_get_dhcp_info.sh | 87 ++++++++++++++++++++++++++++++++++++++------ + tools/hv/hv_kvp_daemon.c | 18 ++++----- + 2 files changed, 82 insertions(+), 23 deletions(-) +Merging auxdisplay/for-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Already up to date. +Merging kgdb/kgdb/for-next (afdbe49276ac kdb: Remove optional size arguments from strscpy() calls) +$ 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 (19272b37aa4f Linux 6.16-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 (19272b37aa4f Linux 6.16-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 (00559ba3ae74 bus: mhi: host: pci_generic: Add Telit FN990B40 modem support) +$ 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 (3b394dff15e1 memblock tests: add test for memblock_set_node) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging cxl/next (f11a5f89910a Documentation/ABI/testing/debugfs-cxl: Add 'cxl' to clear_poison path) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging drivers/cxl/core/region.c +Auto-merging drivers/cxl/cxl.h +Auto-merging include/linux/cleanup.h +Auto-merging include/linux/mutex.h +Auto-merging include/linux/rwsem.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-cxl | 2 +- + Documentation/driver-api/cxl/conventions.rst | 47 ++ + .../driver-api/cxl/devices/device-types.rst | 10 +- + Documentation/driver-api/cxl/index.rst | 1 + + Documentation/driver-api/cxl/linux/cxl-driver.rst | 2 +- + .../driver-api/cxl/theory-of-operation.rst | 12 +- + drivers/cxl/acpi.c | 59 +++ + drivers/cxl/core/Makefile | 1 - + drivers/cxl/core/acpi.c | 11 - + drivers/cxl/core/cdat.c | 6 +- + drivers/cxl/core/core.h | 36 +- + drivers/cxl/core/edac.c | 55 ++- + drivers/cxl/core/hdm.c | 125 +++--- + drivers/cxl/core/mbox.c | 37 +- + drivers/cxl/core/memdev.c | 52 +-- + drivers/cxl/core/port.c | 29 +- + drivers/cxl/core/region.c | 490 +++++++++++---------- + drivers/cxl/core/trace.h | 133 +++++- + drivers/cxl/cxl.h | 17 +- + drivers/cxl/cxlmem.h | 12 +- + drivers/cxl/pci.c | 2 +- + include/cxl/event.h | 37 +- + include/linux/cleanup.h | 94 +++- + include/linux/mutex.h | 2 +- + include/linux/rwsem.h | 3 +- + tools/testing/cxl/Kbuild | 1 - + tools/testing/cxl/config_check.c | 1 + + tools/testing/cxl/test/cxl.c | 7 +- + 28 files changed, 829 insertions(+), 455 deletions(-) + create mode 100644 Documentation/driver-api/cxl/conventions.rst + delete mode 100644 drivers/cxl/core/acpi.c +Merging zstd/zstd-next (65d1f5507ed2 zstd: Import upstream v1.5.7) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (02eb7a8eee20 efi: add API doc entry for ovmf_debug_log) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging drivers/firmware/efi/Kconfig +Auto-merging include/linux/efi.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-firmware-efi | 7 ++ + drivers/firmware/efi/Kconfig | 8 ++ + drivers/firmware/efi/Makefile | 1 + + drivers/firmware/efi/efi.c | 8 ++ + drivers/firmware/efi/libstub/printk.c | 4 +- + drivers/firmware/efi/ovmf-debug-log.c | 111 +++++++++++++++++++++++++++ + include/linux/efi.h | 4 + + 7 files changed, 141 insertions(+), 2 deletions(-) + create mode 100644 drivers/firmware/efi/ovmf-debug-log.c +Merging unicode/for-next (6b56a63d286f MAINTAINERS: Add Unicode tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Already up to date. +Merging slab/slab/for-next (8185696483dc MAINTAINERS: add missing files to slab section) +$ 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 +Already up to date. +Merging random/master (3778dcb2dcc1 random: use offstack cpumask when necessary) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Auto-merging drivers/media/test-drivers/vivid/vivid-vid-cap.c +Merge made by the 'ort' strategy. + drivers/char/random.c | 23 ++++++++++++++--------- + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 4 +++- + include/linux/prandom.h | 6 ------ + 3 files changed, 17 insertions(+), 16 deletions(-) +Merging landlock/next (6dde339a3df8 landlock: Minor comments improvements) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging fs/namei.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + fs/namei.c | 2 +- + include/linux/fs.h | 1 + + security/landlock/errata/abi-1.h | 16 + + security/landlock/fs.c | 194 +++- + security/landlock/ruleset.c | 12 +- + security/landlock/ruleset.h | 2 +- + tools/testing/selftests/landlock/fs_test.c | 1317 +++++++++++++++++++++++++++- + 7 files changed, 1503 insertions(+), 41 deletions(-) + create mode 100644 security/landlock/errata/abi-1.h +Merging rust/rust-next (dff64b072708 rust: Add warn_on macro) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/riscv/include/asm/bug.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/bug.h +Auto-merging arch/x86/include/asm/bug.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/bug.h +Auto-merging drivers/cpufreq/rcpufreq_dt.rs +CONFLICT (content): Merge conflict in drivers/cpufreq/rcpufreq_dt.rs +Auto-merging drivers/gpu/drm/drm_panic_qr.rs +Auto-merging drivers/gpu/nova-core/driver.rs +Auto-merging drivers/gpu/nova-core/firmware.rs +Auto-merging drivers/gpu/nova-core/nova_core.rs +Auto-merging drivers/gpu/nova-core/regs.rs +Auto-merging drivers/gpu/nova-core/regs/macros.rs +Auto-merging rust/Makefile +Auto-merging rust/helpers/helpers.c +CONFLICT (content): Merge conflict in rust/helpers/helpers.c +Auto-merging rust/kernel/clk.rs +Auto-merging rust/kernel/cpufreq.rs +Auto-merging rust/kernel/cpumask.rs +Auto-merging rust/kernel/device.rs +Auto-merging rust/kernel/device_id.rs +CONFLICT (content): Merge conflict in rust/kernel/device_id.rs +Auto-merging rust/kernel/devres.rs +CONFLICT (content): Merge conflict in rust/kernel/devres.rs +Auto-merging rust/kernel/dma.rs +Auto-merging rust/kernel/drm/device.rs +Auto-merging rust/kernel/drm/gem/mod.rs +CONFLICT (content): Merge conflict in rust/kernel/drm/gem/mod.rs +Auto-merging rust/kernel/error.rs +Auto-merging rust/kernel/firmware.rs +Auto-merging rust/kernel/init.rs +Auto-merging rust/kernel/io.rs +Auto-merging rust/kernel/kunit.rs +Auto-merging rust/kernel/lib.rs +Auto-merging rust/kernel/miscdevice.rs +Auto-merging rust/kernel/net/phy.rs +Auto-merging rust/kernel/of.rs +Auto-merging rust/kernel/opp.rs +Auto-merging rust/kernel/pci.rs +CONFLICT (content): Merge conflict in rust/kernel/pci.rs +Auto-merging rust/kernel/platform.rs +CONFLICT (content): Merge conflict in rust/kernel/platform.rs +Auto-merging rust/kernel/revocable.rs +Auto-merging rust/kernel/sync/poll.rs +CONFLICT (content): Merge conflict in rust/kernel/sync/poll.rs +Auto-merging rust/kernel/types.rs +CONFLICT (content): Merge conflict in rust/kernel/types.rs +Auto-merging rust/macros/module.rs +Auto-merging samples/rust/rust_driver_auxiliary.rs +Auto-merging scripts/Makefile.build +CONFLICT (content): Merge conflict in scripts/Makefile.build +Resolved 'arch/riscv/include/asm/bug.h' using previous resolution. +Resolved 'arch/x86/include/asm/bug.h' using previous resolution. +Resolved 'drivers/cpufreq/rcpufreq_dt.rs' using previous resolution. +Resolved 'rust/helpers/helpers.c' using previous resolution. +Resolved 'rust/kernel/device_id.rs' using previous resolution. +Resolved 'rust/kernel/devres.rs' using previous resolution. +Resolved 'rust/kernel/drm/gem/mod.rs' using previous resolution. +Resolved 'rust/kernel/pci.rs' using previous resolution. +Resolved 'rust/kernel/platform.rs' using previous resolution. +Resolved 'rust/kernel/sync/poll.rs' using previous resolution. +Resolved 'rust/kernel/types.rs' using previous resolution. +Resolved 'scripts/Makefile.build' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cb1da79109fe] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 4 + + Makefile | 6 + + arch/arm64/include/asm/asm-bug.h | 33 ++- + arch/riscv/include/asm/bug.h | 35 +-- + arch/x86/include/asm/bug.h | 56 ++--- + drivers/cpufreq/rcpufreq_dt.rs | 5 +- + drivers/gpu/drm/drm_panic_qr.rs | 4 +- + drivers/gpu/drm/nova/nova.rs | 2 +- + drivers/gpu/nova-core/driver.rs | 2 +- + drivers/gpu/nova-core/firmware.rs | 5 +- + drivers/gpu/nova-core/nova_core.rs | 2 +- + drivers/gpu/nova-core/regs.rs | 2 +- + drivers/gpu/nova-core/regs/macros.rs | 2 +- + rust/Makefile | 8 + + rust/bindings/lib.rs | 3 + + rust/helpers/bug.c | 5 + + rust/helpers/helpers.c | 3 +- + rust/helpers/time.c | 35 +++ + rust/kernel/.gitignore | 2 + + rust/kernel/alloc/allocator_test.rs | 2 +- + rust/kernel/alloc/kbox.rs | 98 ++++++-- + rust/kernel/alloc/kvec.rs | 59 ++++- + rust/kernel/bits.rs | 203 +++++++++++++++ + rust/kernel/block/mq.rs | 2 +- + rust/kernel/block/mq/operations.rs | 2 +- + rust/kernel/block/mq/request.rs | 11 +- + rust/kernel/bug.rs | 126 ++++++++++ + rust/kernel/clk.rs | 6 +- + rust/kernel/configfs.rs | 30 +-- + rust/kernel/cpufreq.rs | 10 +- + rust/kernel/cpumask.rs | 4 +- + rust/kernel/device.rs | 4 +- + rust/kernel/device_id.rs | 4 +- + rust/kernel/devres.rs | 10 +- + rust/kernel/dma.rs | 10 +- + rust/kernel/drm/device.rs | 10 +- + rust/kernel/drm/gem/mod.rs | 4 +- + rust/kernel/error.rs | 10 +- + rust/kernel/firmware.rs | 9 +- + rust/kernel/fmt.rs | 7 + + rust/kernel/fs/file.rs | 2 +- + rust/kernel/generated_arch_reachable_asm.rs.S | 7 + + rust/kernel/generated_arch_warn_asm.rs.S | 7 + + rust/kernel/init.rs | 34 +-- + rust/kernel/io.rs | 20 +- + rust/kernel/kunit.rs | 13 +- + rust/kernel/lib.rs | 10 + + rust/kernel/list.rs | 63 ++--- + rust/kernel/list/impl_list_item_mod.rs | 239 ++++++++++++------ + rust/kernel/miscdevice.rs | 12 +- + rust/kernel/mm/virt.rs | 52 ++-- + rust/kernel/net/phy.rs | 4 +- + rust/kernel/of.rs | 6 +- + rust/kernel/opp.rs | 20 +- + rust/kernel/pci.rs | 13 +- + rust/kernel/platform.rs | 2 +- + rust/kernel/prelude.rs | 4 +- + rust/kernel/print.rs | 12 +- + rust/kernel/rbtree.rs | 29 +-- + rust/kernel/revocable.rs | 4 + + rust/kernel/seq_file.rs | 2 +- + rust/kernel/str.rs | 111 +++++---- + rust/kernel/sync.rs | 10 +- + rust/kernel/sync/arc.rs | 102 +++++++- + rust/kernel/sync/aref.rs | 154 ++++++++++++ + rust/kernel/time.rs | 233 ++++++++++++------ + rust/kernel/time/delay.rs | 49 ++++ + rust/kernel/time/hrtimer.rs | 304 +++++++++++++++-------- + rust/kernel/time/hrtimer/arc.rs | 8 +- + rust/kernel/time/hrtimer/pin.rs | 10 +- + rust/kernel/time/hrtimer/pin_mut.rs | 10 +- + rust/kernel/time/hrtimer/tbox.rs | 8 +- + rust/kernel/types.rs | 229 +++-------------- + rust/kernel/uaccess.rs | 167 +++++++++++-- + rust/kernel/workqueue.rs | 342 +++++++++++++++++++++++++- + rust/kernel/xarray.rs | 9 +- + rust/macros/module.rs | 6 - + rust/pin-init/README.md | 2 +- + rust/pin-init/examples/big_struct_in_place.rs | 28 ++- + rust/pin-init/examples/linked_list.rs | 10 +- + rust/pin-init/examples/mutex.rs | 97 +++++--- + rust/pin-init/examples/pthread_mutex.rs | 4 + + rust/pin-init/examples/static_init.rs | 75 +++--- + rust/pin-init/src/__internal.rs | 1 + + rust/pin-init/src/lib.rs | 120 +++++++-- + rust/pin-init/src/macros.rs | 16 +- + rust/uapi/lib.rs | 3 + + samples/rust/rust_configfs.rs | 2 +- + samples/rust/rust_driver_auxiliary.rs | 2 +- + samples/rust/rust_misc_device.rs | 2 + + samples/rust/rust_print_main.rs | 2 +- + scripts/Makefile.build | 5 +- + scripts/rustdoc_test_gen.rs | 31 +-- + 93 files changed, 2558 insertions(+), 984 deletions(-) + create mode 100644 rust/helpers/time.c + create mode 100644 rust/kernel/bits.rs + create mode 100644 rust/kernel/bug.rs + create mode 100644 rust/kernel/fmt.rs + create mode 100644 rust/kernel/generated_arch_reachable_asm.rs.S + create mode 100644 rust/kernel/generated_arch_warn_asm.rs.S + create mode 100644 rust/kernel/sync/aref.rs + create mode 100644 rust/kernel/time/delay.rs +Merging rust-alloc/alloc-next (d49ac7744f57 MAINTAINERS: add mm folks as reviewers to rust alloc) +$ git merge -m Merge branch 'alloc-next' of https://github.com/Rust-for-Linux/linux.git rust-alloc/alloc-next +Already up to date. +Merging rust-io/io-next (86731a2a651e Linux 6.16-rc3) +$ git merge -m Merge branch 'io-next' of https://github.com/Rust-for-Linux/linux.git rust-io/io-next +Already up to date. +Merging rust-pin-init/pin-init-next (fc3870dc5cad rust: pin-init: examples, tests: use `ignore` instead of conditionally compiling tests) +$ git merge -m Merge branch 'pin-init-next' of https://github.com/Rust-for-Linux/linux.git rust-pin-init/pin-init-next +Already up to date. +Merging rust-timekeeping/timekeeping-next (d4b29ddf82a4 rust: time: Add wrapper for fsleep() function) +$ git merge -m Merge branch 'timekeeping-next' of https://github.com/Rust-for-Linux/linux.git rust-timekeeping/timekeeping-next +Already up to date. +$ git am -3 ../patches/0001-fix-up-for-rust-time-Make-Instant-generic-over-Clock.patch +Applying: fix up for "rust: time: Make Instant generic over ClockSource" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/nova-core/util.rs +$ git add -A . +$ git commit -v -a --amend +[master 3dff6a60a888] Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git + Date: Fri Aug 1 14:22:37 2025 +1000 +Merging rust-xarray/xarray-next (fa616196fbea MAINTAINERS: add entry for Rust XArray API) +$ git merge -m Merge branch 'xarray-next' of https://github.com/Rust-for-Linux/linux.git rust-xarray/xarray-next +Already up to date. +Merging sysctl/sysctl-next (060a1b0567f7 docs: Downgrade arm64 & riscv from titles to comment) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging include/linux/module.h +CONFLICT (content): Merge conflict in include/linux/module.h +Auto-merging include/linux/panic.h +Auto-merging kernel/fork.c +Auto-merging kernel/module/internal.h +Auto-merging kernel/module/main.c +Auto-merging kernel/panic.c +CONFLICT (content): Merge conflict in kernel/panic.c +Auto-merging kernel/pid.c +Auto-merging kernel/rcu/tree_stall.h +Auto-merging kernel/sys.c +Auto-merging mm/memory.c +Resolved 'include/linux/module.h' using previous resolution. +Resolved 'kernel/panic.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 89ba2c443b02] Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git +$ git diff -M --stat --summary HEAD^.. + +Merging execve/for-next/execve (7f71195c15dc fork: reorder function qualifiers for copy_clone_args_from_user) +$ 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 (f66f9c3d09c1 bitfield: Ensure the return values of helper functions are checked) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging include/linux/cpumask.h +Auto-merging kernel/time/clocksource.c +Merge made by the 'ort' strategy. +Merging hte/for-next (9e4259716f60 hte: tegra-194: add missing MODULE_DESCRIPTION() macro) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (f627b51aaa04 compiler_types: Provide __no_kstack_erase to disable coverage only on Clang) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Already up to date. +Merging nolibc/for-next (b9e50363178a selftests/nolibc: add x32 test configuration) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Already up to date. +Merging iommufd/for-next (2c78e74493d3 iommu/arm-smmu-v3: Replace vsmmu_size/type with get_viommu_size) +$ 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 (447c98c1ca4a tools/power turbostat: Add idle governor statistics reporting) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Auto-merging tools/power/x86/turbostat/turbostat.8 +CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.8 +Auto-merging tools/power/x86/turbostat/turbostat.c +CONFLICT (content): Merge conflict in tools/power/x86/turbostat/turbostat.c +Resolved 'tools/power/x86/turbostat/turbostat.8' using previous resolution. +Resolved 'tools/power/x86/turbostat/turbostat.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 32b8792875f0] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git +$ git diff -M --stat --summary HEAD^.. + tools/power/x86/turbostat/turbostat.8 | 17 +- + tools/power/x86/turbostat/turbostat.c | 534 ++++++++-------------------------- + 2 files changed, 131 insertions(+), 420 deletions(-) +Merging pwrseq/pwrseq/for-next (07d59dec6795 power: sequencing: qcom-wcn: fix bluetooth-wifi copypasta for WCN6855) +$ git merge -m Merge branch 'pwrseq/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next +Already up to date. +Merging capabilities-next/caps-next (cdd73b166607 uapi: fix broken link in linux/capability.h) +$ git merge -m Merge branch 'caps-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next +Already up to date. +Merging ipe/next (038d61fd6422 Linux 6.16) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next +Already up to date. +Merging kcsan/next (9872916ad1a1 kcsan: test: Initialize dummy variable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next +Already up to date. +Merging crc/crc-next (118da22eb6fb lib/crc: x86/crc32c: Enable VPCLMULQDQ optimization where beneficial) +$ git merge -m Merge branch 'crc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next +Already up to date. +Merging fwctl/for-next (19272b37aa4f Linux 6.16-rc1) +$ git merge -m Merge branch 'for-next' of git//git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl/for-next +Already up to date. +Merging devsec-tsm/next (9d948b880409 Merge branch 'for-6.16/tsm-mr' into tsm-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm/next +Already up to date. +Merging hisilicon/for-next (b1136432c972 soc: hisilicon: kunpeng_hccs: Fix incorrect log information) +$ git merge -m Merge branch 'for-next' of https://github.com/hisilicon/linux-hisi.git hisilicon/for-next +Already up to date. +Merging kthread/for-next (d8b4bf4ea04d kthread: modify kernel-doc function name to match code) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..1d8c06cb5b62 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20250801 |