diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-02-27 12:16:34 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-02-27 12:16:34 +1100 |
| commit | 7f7a8831520f12a3cf894b0627641fad33971221 (patch) | |
| tree | 7140930278b3e4588df59334d987cdaffc84dcce | |
| parent | eda1817e9c61be43bdced2044352b675d83ed27a (diff) | |
Add linux-next specific files for 20230227next-20230227
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 357 | ||||
| -rw-r--r-- | Next/Trees | 359 | ||||
| -rw-r--r-- | Next/merge.log | 4858 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 5575 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..e49013613a66 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,357 @@ +Name SHA1 +---- ---- +origin f3a2439f20d918930cc4ae8f76fe1c1afd26958f +fixes 9c9155a3509a2ebdb06d77c7a621e9685c802eac +mm-hotfixes 2b1a3d3def5fc15e75a200c64b693f3b834061bc +kbuild-current 22e46f6480e83bcf49b6d5e6b66c81872c97a902 +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 2f62847cf6ae49a54515421f67b1badffaa805f3 +arm64-fixes 853e2dac25c15f7431dfe59805de1bada34c96e9 +arm-soc-fixes afeff81765c62da857ff709309f7351a56113795 +davinci-current 1b929c02afd37871d5afb9d498426f83432e71c2 +drivers-memory-fixes cb8fd6f75775165390ededea8799b60d93d9fe3e +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current 1e5b5df65af99013b4d31607ddb3ca5731dbe44d +powerpc-fixes c9c3395d5e3dcc6daee66c6908354d47bf98cb0c +s390-fixes bcf5470eb4a13e5670fefb21525b43ef385c6fc6 +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 31e1be62abdebc28bd51d0999a25f0eea535b5af +fsverity-current ef7592e466ef7b2595fdfdfd23559a779f4b211a +net aaa3c08ee0653beaa649d4adfb27ad562641cfd8 +bpf 5b7c4cabbb65f5c469464da6c5f614cbd7f730f2 +ipsec 8222d5910dae08213b6d9d4bc9a7f8502855e624 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs fd2a55e74a991ae5ff531c9da52963277dc7fbd5 +wireless 52fd90638a7269be2a6f6cf1e4dea6724f8e13b6 +rdma-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +sound-current e97fc9cffbb9f372b53b42c36cd7b20aab44a554 +sound-asoc-fixes 54bc59d1817867999317dd86166c2be5160f4cea +regmap-fixes 697c3892d825fb78f42ec8e53bed065dd728db3e +regulator-fixes c361e8d45e52f48375cddf37f92f3e0e6b8b46c3 +spi-fixes 4822fc06d054e76678f1d6d1b9f4629044204b5e +pci-current 1b929c02afd37871d5afb9d498426f83432e71c2 +driver-core.current 0c058fb94ae0e2a68639f4569de1c3abf5df7ad7 +tty.current 489fa31ea873282b41046d412ec741f93946fc2d +usb.current 489fa31ea873282b41046d412ec741f93946fc2d +usb-serial-fixes 4ec5183ec48656cec489c49f989c508b68b518e3 +phy 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +staging.current 489fa31ea873282b41046d412ec741f93946fc2d +iio-fixes 03fada47311a3e668f73efc9278c4a559e64ee85 +counter-current 1b929c02afd37871d5afb9d498426f83432e71c2 +char-misc.current 489fa31ea873282b41046d412ec741f93946fc2d +soundwire-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +thunderbolt-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +input-current 7ae9fb1b7ecbb5d85d07857943f677fd1a559b18 +crypto-current 8b84475318641c2b89320859332544cf187e1cbd +vfio-fixes 51cdc8bc120ef6e42f6fb758341f5d91bc955952 +kselftest-fixes a49fb7218ed84a4c5e6c56b9fd933498b9730912 +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes c0f7ae27539fbac267384a7bfc58296ea7550d52 +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes 3e62aba8284de0994a669d07983299242e68fe72 +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +at91-fixes 9bfa2544dbd1133f0b0af4e967de3bb9c1e3a497 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes 2c10b61421a28e95a46ab489fd56c0f442ff6952 +kvms390-fixes 0dd4cdccdab3d74bd86b868768a7dca216bcce7e +hwmon-fixes 58326709e8f8122df46d29981eb39896d600c7c4 +nvdimm-fixes c91d713630848460de8669e6570307b7e559863b +cxl-fixes 711442e29f16f0d39dd0e2460c9baacfccb9d5a7 +btrfs-fixes 000f66519f1a5560b712ec42f3f18c95aa27ef66 +vfs-fixes cd2dbcc759472f4f4a32b561a9bc6bab43e09f45 +dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6 +drivers-x86-fixes eb4b55f2f26fc8a7b7dc6f06f1de91480d53485b +samsung-krzk-fixes a3583e92d188ec6c58c7f603ac5e72dd8a11c21a +pinctrl-samsung-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +devicetree-fixes 707344c8a188bb1d6704d3546229fc7a07c01a63 +dt-krzk-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +scsi-fixes 15600159bcc6abbeae6b33a849bef90dca28b78f +drm-fixes c9c3395d5e3dcc6daee66c6908354d47bf98cb0c +drm-intel-fixes c9c3395d5e3dcc6daee66c6908354d47bf98cb0c +mmc-fixes 3f18c5046e633cc4bbad396b74c05d46d353033d +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +hyperv-fixes 25c94b051592c010abe92c85b0485f1faedc83f3 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 950b879b7f0251317d26bae0687e72592d607532 +riscv-dt-fixes 43d5f5d63699724d47f0d9e0eae516a260d232b4 +riscv-soc-fixes 730892135b7db8260195a31a676ef28e0972fe48 +fpga-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +spdx 489fa31ea873282b41046d412ec741f93946fc2d +gpio-brgl-fixes c9c3395d5e3dcc6daee66c6908354d47bf98cb0c +gpio-intel-fixes a69982c37cd0586e6832268155349301b87f2e35 +pinctrl-intel-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +erofs-fixes e02ac3e7329f76c5de40cba2746cbe165f571dff +kunit-fixes 254c71374a70051a043676b67ba4f7ad392b5fe6 +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 647037adcad00f2bab8828d3d41cd0553d41f3bd +nfsd-fixes 4102db175b5d884d133270fdbd0e59111ce688fc +irqchip-fixes 6c9f7434159b96231f5b27ab938f4766e3586b48 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current 3ef9fec011d471a259935f2e2ff58ab12886d683 +efi-fixes 190233164cd77115f8dea718cbac561f557092c6 +zstd-fixes 7f18d6eececb3d4334acbc217a7e75ab50e1db82 +battery-fixes d137900f237ad41cf432f1e09c6ee3e584146757 +uml-fixes bd71558d585ac61cfd799db7f25e78dca404dd7a +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +rust-fixes 2a02b7a197943d218ad1cddba3501da1dad2059e +drm-misc-fixes 1b9b4f922f96108da3bb5d87b2d603f5dfbc5650 +mm-stable f9366f4c2a29d14f5992b195e268240c2deb116e +mm-nonmm-stable 817013880a6883f7ab08030d1f8cfef5f07ba467 +mm c8044dd04874e75392efc384970f9b4c65d5eab9 +kbuild 7adf14d8aca1ea53bf9ccf8463809c82adb8c23a +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf f9fa0778ee7349a9aa3d2ea10e9f2ab843a0b44e +compiler-attributes 6cf1ab89c9e75ed8f3432563c212d688b6d3563b +dma-mapping 9b07d27d0fbb7f7441aa986859a0f53ec93a0335 +asm-generic a13408c205260716e925a734ef399899d69182ba +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm ba07b4efc9898cb2b1ee125c53d3b30711db7092 +arm64 1b561d3949f8478c5403c9752b5533211a757226 +arm-perf e8a709dc2a9156f223ec953ae70a919e87ad7e9a +arm-soc 1eebd1aaa62b8ed00c510feab76894b024462e4d +amlogic b6520fc7ee5777e46b7a1882aa77ef5afb28dee9 +asahi-soc 22991d8d57251509b8ee5c0b3dac04506fe5ed7a +aspeed 52dfcf784bbf18b8ee4bfdbd36289727fb950737 +at91 05ccf9c9c2fc64dfdc6e1f341d23e5356519156c +broadcom b691373a1bec006892f21083e84c5d2ef92f4097 +davinci c9c3395d5e3dcc6daee66c6908354d47bf98cb0c +drivers-memory 957b573ea840b5f2a440ec858886916d9bc7df33 +imx-mxs fd5368f6f08b283f15b162a4b6f3608fa974df60 +mediatek 74ba8bb2bfb225b5e2c9bfdb345f8d021451999a +mvebu b80b042da86099ec9a822f9c475d335617531b31 +omap f68a6fc5807388854f3b54a5331c6cb3e88cc9b4 +qcom e34ca36eb31078324b1c422112ddc658fb8ec766 +renesas 8dd3dae1705b14948974debe04021549519dfb0b +reset 1b929c02afd37871d5afb9d498426f83432e71c2 +rockchip cc2b5be472c0ade7b8a61e6c4b2c15a3bf67fe32 +samsung-krzk dd3d835d31ed9b1147c3774e98102d78837e034e +scmi 6d796c50f84ca79f1722bb131799e5a5710c4700 +stm32 4e74ad9f3af69cc91c92b7286f1936752b4db13b +sunxi caea0128c038b85682838d1fef960c044da83e0f +tee 816477edfba6e7ab9411acec5f07cfa00e0882f7 +tegra de98d45290c7a1ef062b2fc1afd3b243d87cda6b +ti 47d72bbb6c0f7dc0901d7601d1aa6b1419282049 +xilinx a18426505c2b720ab37ccb23b7eb1d52c24e0f0d +clk b64baafa24d2c430513329daf5ebb821620d0c03 +clk-imx 4e197ee880c24ecb63f7fe17449b3653bc64b03c +clk-renesas b1dec4e78599a2ce5bf8557056cd6dd72e1096b0 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 4a3ec00957fdf182be705d46e77acacc430f7d65 +loongarch 8883bf83127d533abb415b204eabc064863ae6c9 +m68k 1e5b5df65af99013b4d31607ddb3ca5731dbe44d +m68knommu 5aa52ccf692bfef7ddc23c2be1d48524a4427527 +microblaze 1b929c02afd37871d5afb9d498426f83432e71c2 +mips 91dc288f4edf0d768e46c2c6d33e0ab703403459 +openrisc 34a0bac084e49324c29e6d0984d24096e02c6314 +parisc-hd 3125e3b8f24c708b09232290359afe2f2b2e9ceb +powerpc f82cdc37c4bd4ba905bf99ade9782a639b5c12e9 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v eb9be8310c58c166f9fae3b71c0ad9d6741b4897 +riscv-dt d9c36d016f6112e636f18a49a5f779c7f8667deb +riscv-soc f3460326e38d6a084fb5b3348125a802567a3690 +s390 bcf5470eb4a13e5670fefb21525b43ef385c6fc6 +uml 04df97e150c83d4640540008e95d0229cb188135 +xtensa 4414c1f5c7a375eaa108676a56e12cc8234eb647 +pidfd 2372745ea25a5139a5f0d071f0b9fc7fc51822e7 +vfs-idmapping 9db35c4c2bc4492485f9fd72807de63350175021 +fscrypt 097d7c1fcb8d4b52c62a36f94b8f18bc21a24934 +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs a9eb558a5bea66cc43950632f5fffec6b5795233 +btrfs 80d1eec6927a616ff457bb5ae7380e2000b1a5bb +ceph f7c4d9b133c7a04ca619355574e96b6abf209fba +cifs fe3130bc4df0b1303de4321af2bc4dcee5d7db2f +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs c1cc2db216078f9b1e29c991b1b9177c26757162 +erofs 8d1b80a79452630f157bf634ae9cfcd9f4eed161 +exfat 5742d6a467d1073b2515255c4a90287b2e87d4e6 +ext3 90e4f9e498261170f0e2e07e86d2c99d0f9c86a1 +ext4 2c2dec1e86cc43266e084a8782f91613d52eeddf +f2fs ddf1eca4fc5a4038cb323306f51fbba34ce3f4d2 +fsverity 51e4e3153ebc32d3280d5d17418ae6f1a44f1ec1 +fuse 1cc4606d19e3710bfab3f6704b87ff9580493c69 +gfs2 c1b0c3cfcbad25d2c412863c27638c933f1d911b +jfs a60dca73a1a8079d867b2c2e9549440346c1ba83 +ksmbd 25ac8c12ff7886e3d9b99feb85c53302a3cc5556 +nfs c9c3395d5e3dcc6daee66c6908354d47bf98cb0c +nfs-anna 1683ed16ff1a51705f58e8083ed93a7428a543f2 +nfsd 4b471a8b847b82a3035709dcf87661915c340c8a +ntfs3 2024476646ed92d5ceed55e149d0952c17d68e14 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 4f11ada10d0ad3fd53e2bd67806351de63a4f9c3 +ubifs 8fcf2d012c8641c18adcd139dba6a1e556338d36 +v9fs 4ec5183ec48656cec489c49f989c508b68b518e3 +v9fs-ericvh 89c58cb395ec0fb58df5475dced1093eaf5896ad +xfs 60b730a40c43fbcc034970d3e77eb0f25b8cc1cf +zonefs 2b188a2cfc4d8f319ad23832ec1390bdae52daf6 +iomap 471859f57d42537626a56312cfb50cd6acee09ae +djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763 +file-locks eca3a04f140a7380d8a7b4cd89d681706a69380c +iversion eca3a04f140a7380d8a7b4cd89d681706a69380c +vfs e9f33f8668ab0982545b2b18b744fe93b7af869b +printk 10d639febe5629687dac17c4a7500a96537ce11a +pci 3eb5d0f26f4ea604e83ca499a72c0d33638f4765 +pstore 88603b6dc419445847923fcb7fe5080067a30f98 +hid 10635598711e49cff5947e8cc1e5e50095f23d69 +i2c dc67b2d9043871add05cbe9c584d8d736f3c4d2f +i3c 07eac9c306a0efd73a43804b50c88c67696a3c74 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 58326709e8f8122df46d29981eb39896d600c7c4 +jc_docs 27a6e6b2501600c6203bf3069731d1c48bb73b40 +v4l-dvb 3e62aba8284de0994a669d07983299242e68fe72 +v4l-dvb-next 3e62aba8284de0994a669d07983299242e68fe72 +pm 243d50840e68a096cfe5e136232898cddacb4e9f +cpufreq-arm ba38f3cbe7db2cec802c6d60e2bef57a3ff095a4 +cpupower 1b929c02afd37871d5afb9d498426f83432e71c2 +devfreq 497e92ab8c8ea709edd846ebb8907e784ed00bf5 +opp eca4c0eea53432ec4b711b2a8ad282cbad231b4f +thermal 6828e402d06f7c574430b61c05db784cd847b19f +dlm 723b197bbdf1e0adbab772b8e5e022c40db6a9fe +rdma 66fb1d5df6ace316a4a6e2c31e13fc123ea2b644 +net-next 5b7c4cabbb65f5c469464da6c5f614cbd7f730f2 +bpf-next 5b7c4cabbb65f5c469464da6c5f614cbd7f730f2 +ipsec-next 75da437a2f172759b2273091a938772e687242d0 +mlx5-next 22551e77e5507a06114c0af2b92bbf1a66ec33c5 +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 3fcdf2dfefb6313ea0395519d1784808c0b6559b +bluetooth fbfd2d6d43f8e701f89692e05fcb34e904b087b4 +wireless-next 38ae3192296924181537544e7cfc43ca78eadcda +mtd 84549c816dc317f012798e706e58669b3b013604 +nand ef3e6327ff04af8527b3558e023e99f1cc241bce +spi-nor f047382519ca41702ebaee5a862e87390f687137 +crypto 8b84475318641c2b89320859332544cf187e1cbd +drm a48bba98380cb0b43dcd01d276c7efc282e3c33f +drm-misc e034b8a18d4badceecb672c58b488bad1e901d95 +amdgpu 4f101d5710a84f334b05a96713000ce8dfd4d598 +drm-intel 5d2fdb255c52989e95704b5556dbf0ad833bddd2 +drm-tegra b9930311641cf2ed905a84aabe27e8f3868aee4a +drm-msm dbd7a2a941b8cbf9e5f79a777ed9fe0090eebb61 +drm-msm-lumag 1d233b1cb149ec78c20fac58331b27bb460f9558 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 4c22c61e429f004d84eba72d7195bccef33ea0ec +fbdev 822242608545c2913436a1f2d254645b7663013e +regmap 40f4b05868101e047a8502ebb94f05312186421b +sound 7933b90b42896f5b6596e6a829bb31c5121fc2a9 +sound-asoc 54bc59d1817867999317dd86166c2be5160f4cea +modules d6f55bb4857959740cbb9bb6f62b309c1ae7c473 +input d5f7638eb5fed0eb12e45a127764c4111b11c50e +block e19493205f5366ca3ebd22f8c6f50ad2dd7ed20b +device-mapper d695e44157c8da8d298295d1905428fb2495bc8b +libata 8844f0aa8dc42f54dc278c8d4ecbf32e92f2d6f1 +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 571f235163ac83407e212b78719175236962aede +mfd 59c54c59974649b2e7bc92faae4a21e2b2408db2 +backlight ad614f81d2e8b9704478921935c75ccd4024b854 +battery 13af134bdc6a9dacec4687e57b2ea8d3e08ff04f +regulator c361e8d45e52f48375cddf37f92f3e0e6b8b46c3 +security 88603b6dc419445847923fcb7fe5080067a30f98 +apparmor cb60752f0c37cba0d4a90fd62dfd3ba425df783f +integrity 4958db3245fa655bf18251bd2a83bcc164071c39 +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 88603b6dc419445847923fcb7fe5080067a30f98 +smack c0e48d3f7722399dcdca4111b13e8a5c49fae1b3 +tomoyo 5fc44ba8be52c92b8fc87e9a8244e0bd737de6ab +tpmdd 5b7c4cabbb65f5c469464da6c5f614cbd7f730f2 +watchdog 4443f6ce0d121779a851a6c1bbf9263b964ea0da +iommu bedd29d793da3312e1350a56245c4971a38d4453 +audit 6c6cd913accd77008f74a1a9d57b816db3651daa +devicetree 1ba7dfb905b3975bdb8b9d1f7793efcdfc59385b +dt-krzk 8254755399744f71d613678fe5b85c139b1a0ea2 +mailbox 6ccbe33a39523f6d62b22c5ee99c6695993c935e +spi 4822fc06d054e76678f1d6d1b9f4629044204b5e +tip 7fa08de735e41001a70c8ca869b2b159d74c2339 +clockevents ab407a1919d2676ddc5761ed459d4cc5c7be18ed +edac feac08675023d0450929758744e866a9b1a2dc4a +irqchip a83bf176fed4ee88dad84d59f77dde153b9a442a +ftrace ca6cbe8c481a2a2d7528cb9c7246f957494948fe +rcu 690ae0037d5bf262773b18d13a0b00019f1c6f4c +kvm 45dd9bc75d9adc9483f0c7d662ba6e73ed698a0b +kvm-arm 96a4627dbbd48144a65af936b321701c70876026 +kvms390 5fc5b94a273655128159186c87662105db8afeb5 +kvm-x86 62ef199250cd46fb66fe98267137b7f64e0b41b4 +xen-tip 99a7bcafbd0d04555074554573019096a8c10450 +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues c63a2e52d5e08f01140d7b76c08a78e15e801f03 +drivers-x86 0d9bdd8a550170306c2021b8d6766c5343b870c2 +chrome-platform b0d8a67715dae445c065c83a40a581d6563a341f +hsi 1b929c02afd37871d5afb9d498426f83432e71c2 +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 056f65c3938bfa40141669b974d441348af3ee54 +ipmi befb28f2676a65a5a4cc4626ae224461d8785af6 +driver-core a93e884edf61f9debc9ca61ef9e545f0394ab666 +usb 489fa31ea873282b41046d412ec741f93946fc2d +thunderbolt 06cbcbfaa6510eed406e3b6d5d071386b9830689 +usb-serial 617c331d91077f896111044628c096802551dc66 +tty 489fa31ea873282b41046d412ec741f93946fc2d +char-misc 489fa31ea873282b41046d412ec741f93946fc2d +accel f96b302a6b468b4ec34c38cb6ebc39a543113257 +coresight 669c4614236a7f78a2b693d0024cbdfa8536eb5a +fpga ffa562d000729dba5548e6c478355e5f5439820d +icc 7bf0008a52930e4d11ff1d6083cf13d9879bd2d0 +iio 91ba2700aa75859957613aedf307a04a83010cee +phy-next 3584f6392f09440769246d4936e1fcbff76ac3bc +soundwire 66f95de7c13be5e442d8ed4cf00e13f8dbdc1315 +extcon 2e85d0a0201d0cb466313ad434f7b25f14135300 +gnss 1b929c02afd37871d5afb9d498426f83432e71c2 +vfio d649c34cb916b015fdcb487e51409fcc5caeca8d +staging 489fa31ea873282b41046d412ec741f93946fc2d +counter-next 01f714ee022ecb2667ca8ba909138b1af4cfff2c +mux ea327624ae52936b2c0eccffd9369983ca2d08e3 +dmaengine e922bbf37564a4c67efca9dd6133eaadbffb65f5 +cgroup 14fffd51f9027fd393b3b074f11bc49c16fdf990 +scsi 81dab59be6eee412742520248776fc80a2822bb1 +scsi-mkp 901b894af5b933cf6576eec05746f34b46e2ac83 +vhost 0d0a7dda9cdf57941ca498f22448d7b4aef2e76b +rpmsg c7d00a6f6e4c14b2e00bcf027e7c25057c7f2d3f +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 4827aae061337251bb91801b316157a78b845ec7 +gpio-intel 1b929c02afd37871d5afb9d498426f83432e71c2 +pinctrl 099f37a539e616f762241ab999495fb8aa2f5971 +pinctrl-intel 88f8ac47bddc1674b2840c733f1120a548037199 +pinctrl-renesas 698485cd875be1109b2130e0ff6c927010a6b56b +pinctrl-samsung 1b929c02afd37871d5afb9d498426f83432e71c2 +pwm cf70d01a62c712ee715df1f7892b58c77474bcfb +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest 0eb15a47bf437a268b69ab1a1a45fdf1f609b69f +kunit 1b929c02afd37871d5afb9d498426f83432e71c2 +kunit-next 82649c7c0da431d147a75c6ae768ee42c1053f53 +livepatching b2e118419db38dcbb9bf51e7e4367bbaaae63545 +rtc 3ca04951b004fa184ff84369448a37bf5df98a79 +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 1b929c02afd37871d5afb9d498426f83432e71c2 +ntb 0310a30a9395cb535fd47151ae18eb6891897f2d +seccomp 0fb0624b15d21622c214617fda5c05a203b04564 +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus 1b929c02afd37871d5afb9d498426f83432e71c2 +nvmem fa7876365ad2e53445a8793ce9f1f2aae2781208 +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv b14033a3e6ba73a5c68974a80b05cba55553ed5b +auxdisplay ddf75a86aba2cfb7ec4497e8692b60c8c8fe0ee7 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 1b929c02afd37871d5afb9d498426f83432e71c2 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi 3c54a3ff0a2cdcd902482a62fef813f1d46e5eaf +memblock 2fe03412e2e1be3d5ab37b8351a37c3aec506556 +cxl e686c32590f40bffc45f105c04c836ffad3e531a +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi e1d447157f232c650e6f32c9fb89ff3d0207c69a +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 603c592a005a49eb64e4cc81c9367e20eb031ecb +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock ed35e2f2f0ded15df313ae6f8da21e85c8e1e493 +rust 7ea01d3169a28d090fc8f22e7fcb4e4f1090c2d2 +sysctl f1aa2eb5ea05ccd1fd92d235346e60e90a1ed949 +execve 88603b6dc419445847923fcb7fe5080067a30f98 +bitmap 18e93f4dc09976df5d818b45a81af8f02424cbaa +hte 1b929c02afd37871d5afb9d498426f83432e71c2 +kspp 78f7a3fd6dc66cb788c21d7705977ed13c879351 +kspp-gustavo b942a520d9e43bc31f0808d2f2267a1ddba75518 +iommufd 939204e4df962982cbc84acc26b29b421dd530a8 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..9e9342343277 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,359 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.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 +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +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/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +broadcom-fixes git https://github.com/Broadcom/stblinux.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +asahi-soc-fixes git https://github.com/AsahiLinux/linux.git#asahi-soc/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 +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc git https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +broadcom git https://github.com/Broadcom/stblinux.git#next +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#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 +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +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 +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +vfs-idmapping git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.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 +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/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +v9fs-ericvh git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +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 +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/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 +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#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 +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-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.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-x86 git https://github.com/kvm-x86/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +leds-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +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 +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 +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +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 +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-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#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..69a1a2667bba --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,4858 @@ +$ date -R +Mon, 27 Feb 2023 08:17:23 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at a93e884edf61 Merge tag 'driver-core-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core +Merging origin/master (f3a2439f20d9 Merge tag 'rproc-v6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating a93e884edf61..f3a2439f20d9 +Fast-forward (no commit created; -m option ignored) + .clang-format | 1 + + .gitattributes | 8 +- + .gitignore | 4 +- + Documentation/ABI/testing/sysfs-bus-cxl | 79 +- + .../testing/sysfs-bus-event_source-devices-iommu | 37 + + Documentation/ABI/testing/sysfs-class-power-rt9467 | 19 + + Documentation/ABI/testing/sysfs-class-power-rt9471 | 32 + + Documentation/ABI/testing/sysfs-secvar | 75 +- + Documentation/Makefile | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 11 +- + Documentation/admin-guide/media/cec.rst | 4 +- + Documentation/admin-guide/media/cpia2.rst | 145 - + Documentation/admin-guide/media/dvb-drivers.rst | 1 - + Documentation/admin-guide/media/meye.rst | 93 - + .../admin-guide/media/other-usb-cardlist.rst | 14 - + Documentation/admin-guide/media/pci-cardlist.rst | 1 - + .../admin-guide/media/platform-cardlist.rst | 1 - + .../admin-guide/media/tm6000-cardlist.rst | 83 - + Documentation/admin-guide/media/usb-cardlist.rst | 7 - + Documentation/admin-guide/media/v4l-drivers.rst | 2 - + Documentation/admin-guide/media/zr364xx.rst | 102 - + Documentation/devicetree/bindings/Makefile | 2 +- + Documentation/devicetree/bindings/arm/cpus.yaml | 4 +- + .../bindings/arm/mediatek/mediatek,ethsys.txt | 1 + + .../bindings/arm/mediatek/mediatek,infracfg.yaml | 1 + + .../arm/mediatek/mediatek,mt8195-clock.yaml | 16 - + .../bindings/arm/mediatek/mediatek,sgmiisys.txt | 2 + + .../bindings/ata/intel,ixp4xx-compact-flash.yaml | 1 + + .../devicetree/bindings/clock/idt,versaclock5.yaml | 1 + + .../devicetree/bindings/clock/imx8m-clock.yaml | 2 +- + .../bindings/clock/loongson,ls2k-clk.yaml | 63 + + .../bindings/clock/mediatek,apmixedsys.yaml | 1 + + .../bindings/clock/mediatek,topckgen.yaml | 1 + + .../bindings/clock/qcom,camcc-sm8250.yaml | 20 +- + .../bindings/clock/qcom,gcc-apq8084.yaml | 44 + + .../bindings/clock/qcom,gcc-msm8998.yaml | 6 +- + .../devicetree/bindings/clock/qcom,gcc-qcs404.yaml | 38 +- + .../bindings/clock/qcom,gcc-sc8280xp.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sdx55.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-sdx65.yaml | 8 +- + .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 2 - + .../bindings/clock/qcom,gpucc-sm8350.yaml | 71 - + .../devicetree/bindings/clock/qcom,gpucc.yaml | 2 + + .../devicetree/bindings/clock/qcom,mmcc.yaml | 46 +- + .../bindings/clock/qcom,msm8996-apcc.yaml | 6 +- + .../bindings/clock/qcom,msm8996-cbf.yaml | 53 + + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 + + .../bindings/clock/qcom,sa8775p-gcc.yaml | 84 + + .../bindings/clock/qcom,sm8450-camcc.yaml | 1 + + .../devicetree/bindings/clock/qcom,spmi-clkdiv.txt | 59 - + .../bindings/clock/qcom,spmi-clkdiv.yaml | 71 + + .../devicetree/bindings/clock/qcom,videocc.yaml | 59 +- + .../bindings/clock/sifive/fu540-prci.yaml | 1 - + .../bindings/clock/socionext,uniphier-clock.yaml | 39 +- + .../bindings/{arm => cpu}/cpu-capacity.txt | 4 +- + .../bindings/display/bridge/sil,sii8620.yaml | 108 + + .../bindings/display/bridge/sil-sii8620.txt | 33 - + .../bindings/display/msm/dp-controller.yaml | 3 +- + .../devicetree/bindings/display/msm/gpu.yaml | 2 +- + .../bindings/display/tegra/nvidia,tegra20-dc.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-dsi.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-epp.yaml | 3 +- + .../display/tegra/nvidia,tegra20-gr2d.yaml | 3 +- + .../display/tegra/nvidia,tegra20-gr3d.yaml | 3 +- + .../display/tegra/nvidia,tegra20-hdmi.yaml | 3 +- + .../display/tegra/nvidia,tegra20-host1x.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-mpe.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-tvo.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-vi.yaml | 3 +- + .../bindings/dma/allwinner,sun4i-a10-dma.yaml | 2 +- + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 2 +- + .../bindings/dma/allwinner,sun6i-a31-dma.yaml | 2 +- + .../devicetree/bindings/dma/altr,msgdma.yaml | 2 +- + .../devicetree/bindings/dma/apple,admac.yaml | 2 +- + .../devicetree/bindings/dma/arm-pl08x.yaml | 2 +- + .../devicetree/bindings/dma/dma-controller.yaml | 2 +- + .../devicetree/bindings/dma/dma-router.yaml | 2 +- + .../devicetree/bindings/dma/fsl,edma.yaml | 2 +- + .../devicetree/bindings/dma/fsl,imx-sdma.yaml | 149 + + .../devicetree/bindings/dma/fsl,mxs-dma.yaml | 80 + + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 118 - + .../devicetree/bindings/dma/fsl-mxs-dma.txt | 60 - + .../devicetree/bindings/dma/ingenic,dma.yaml | 2 +- + .../devicetree/bindings/dma/intel,ldma.yaml | 2 +- + .../devicetree/bindings/dma/mediatek,uart-dma.yaml | 2 +- + .../bindings/dma/nvidia,tegra186-gpc-dma.yaml | 2 +- + .../bindings/dma/nvidia,tegra210-adma.yaml | 2 +- + Documentation/devicetree/bindings/dma/owl-dma.yaml | 2 +- + .../devicetree/bindings/dma/qcom,bam-dma.yaml | 2 +- + .../devicetree/bindings/dma/qcom,gpi.yaml | 5 +- + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 2 +- + .../devicetree/bindings/dma/renesas,rz-dmac.yaml | 2 +- + .../bindings/dma/renesas,rzn1-dmamux.yaml | 2 +- + .../devicetree/bindings/dma/renesas,usb-dmac.yaml | 2 +- + .../bindings/dma/sifive,fu540-c000-pdma.yaml | 2 +- + .../bindings/dma/snps,dma-spear1340.yaml | 2 +- + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 38 +- + .../bindings/dma/socionext,uniphier-mio-dmac.yaml | 2 +- + .../bindings/dma/socionext,uniphier-xdmac.yaml | 2 +- + .../devicetree/bindings/dma/st,stm32-dma.yaml | 2 +- + .../devicetree/bindings/dma/st,stm32-dmamux.yaml | 2 +- + .../devicetree/bindings/dma/st,stm32-mdma.yaml | 2 +- + .../devicetree/bindings/dma/stericsson,dma40.yaml | 18 +- + .../devicetree/bindings/dma/ti/k3-bcdma.yaml | 77 +- + .../devicetree/bindings/dma/ti/k3-udma.yaml | 9 +- + .../devicetree/bindings/firmware/arm,scmi.yaml | 43 +- + .../bindings/fuse/nvidia,tegra20-fuse.yaml | 3 +- + .../hwlock/allwinner,sun6i-a31-hwspinlock.yaml | 5 + + .../devicetree/bindings/i2c/hpe,gxp-i2c.yaml | 59 + + .../devicetree/bindings/i2c/i2c-gpio.yaml | 26 + + .../devicetree/bindings/i2c/i2c-mt65xx.yaml | 4 + + Documentation/devicetree/bindings/i2c/i2c-st.txt | 41 - + .../devicetree/bindings/i2c/i2c-synquacer.txt | 29 - + .../devicetree/bindings/i2c/loongson,ls2x-i2c.yaml | 51 + + .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 49 +- + .../bindings/i2c/qcom,i2c-geni-qcom.yaml | 2 + + .../bindings/i2c/socionext,synquacer-i2c.yaml | 58 + + .../bindings/i2c/socionext,uniphier-fi2c.yaml | 3 + + .../bindings/i2c/socionext,uniphier-i2c.yaml | 3 + + .../devicetree/bindings/i2c/st,sti-i2c.yaml | 71 + + .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 11 +- + .../devicetree/bindings/input/iqs626a.yaml | 94 +- + .../bindings/input/microchip,cap11xx.yaml | 3 + + .../bindings/input/touchscreen/st,stmfts.txt | 41 - + .../bindings/input/touchscreen/st,stmfts.yaml | 72 + + .../interrupt-controller/brcm,bcm7120-l2-intc.yaml | 3 +- + .../interrupt-controller/loongson,ls1x-intc.txt | 24 - + .../interrupt-controller/loongson,ls1x-intc.yaml | 51 + + .../interrupt-controller/sifive,plic-1.0.0.yaml | 1 - + .../socionext,synquacer-exiu.txt | 31 - + .../socionext,synquacer-exiu.yaml | 53 + + .../devicetree/bindings/iommu/apple,dart.yaml | 1 + + .../devicetree/bindings/iommu/arm,smmu.yaml | 66 +- + .../devicetree/bindings/iommu/qcom,iommu.txt | 1 + + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 + + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 54 +- + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 2 + + .../bindings/mailbox/st,sti-mailbox.yaml | 53 + + .../devicetree/bindings/mailbox/sti-mailbox.txt | 51 - + .../devicetree/bindings/media/cec-gpio.txt | 42 - + Documentation/devicetree/bindings/media/cec.txt | 8 - + .../media/{ => cec}/amlogic,meson-gx-ao-cec.yaml | 11 +- + .../devicetree/bindings/media/cec/cec-common.yaml | 28 + + .../devicetree/bindings/media/cec/cec-gpio.yaml | 74 + + .../bindings/media/cec/nvidia,tegra114-cec.yaml | 58 + + .../bindings/media/cec/samsung,s5p-cec.yaml | 66 + + .../devicetree/bindings/media/cec/st,stih-cec.yaml | 66 + + .../bindings/media/cec/st,stm32-cec.yaml | 53 + + .../devicetree/bindings/media/fsl,imx6ull-pxp.yaml | 88 + + .../devicetree/bindings/media/fsl-pxp.txt | 26 - + .../devicetree/bindings/media/i2c/ak7375.txt | 8 - + .../bindings/media/i2c/asahi-kasei,ak7375.yaml | 52 + + .../bindings/media/i2c/chrontel,ch7322.yaml | 11 +- + .../bindings/media/i2c/maxim,max9286.yaml | 51 +- + .../devicetree/bindings/media/i2c/ovti,ov5670.yaml | 93 + + .../devicetree/bindings/media/i2c/ovti,ov5675.yaml | 122 + + .../devicetree/bindings/media/i2c/ovti,ov8858.yaml | 106 + + .../devicetree/bindings/media/i2c/sony,imx296.yaml | 106 + + .../devicetree/bindings/media/i2c/sony,imx415.yaml | 122 + + .../devicetree/bindings/media/nxp,imx7-csi.yaml | 15 + + .../devicetree/bindings/media/s5p-cec.txt | 36 - + .../devicetree/bindings/media/stih-cec.txt | 27 - + .../devicetree/bindings/media/tegra-cec.txt | 27 - + .../intel,ixp4xx-expansion-bus-controller.yaml | 66 +- + .../intel,ixp4xx-expansion-peripheral-props.yaml | 80 + + .../memory-controllers/mc-peripheral-props.yaml | 1 + + .../bindings/memory-controllers/ti,gpmc.yaml | 2 +- + .../bindings/mmc/nvidia,tegra20-sdhci.yaml | 3 +- + .../devicetree/bindings/mtd/mediatek,mtk-nfc.yaml | 155 + + .../bindings/mtd/mediatek,nand-ecc-engine.yaml | 63 + + .../devicetree/bindings/mtd/mtd-physmap.yaml | 1 + + Documentation/devicetree/bindings/mtd/mtk-nand.txt | 176 - + .../bindings/mtd/partitions/partitions.yaml | 2 +- + .../bindings/nvmem/socionext,uniphier-efuse.yaml | 101 +- + .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 3 + + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 6 +- + .../devicetree/bindings/pci/qcom,pcie.yaml | 103 +- + .../bindings/pci/rockchip,rk3399-pcie-common.yaml | 69 + + .../bindings/pci/rockchip,rk3399-pcie-ep.yaml | 68 + + .../bindings/pci/rockchip,rk3399-pcie.yaml | 132 + + .../devicetree/bindings/pci/rockchip-pcie-ep.txt | 62 - + .../devicetree/bindings/pci/rockchip-pcie-host.txt | 135 - + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 76 +- + .../devicetree/bindings/pci/ti,j721e-pci-host.yaml | 14 +- + .../devicetree/bindings/perf/riscv,pmu.yaml | 161 + + .../phy/allwinner,suniv-f1c100s-usb-phy.yaml | 83 + + .../bindings/phy/amlogic,g12a-usb3-pcie-phy.yaml | 5 + + .../bindings/phy/amlogic,meson-gxl-usb2-phy.yaml | 56 + + .../bindings/phy/hisilicon,hi3660-usb3.yaml | 3 +- + .../bindings/phy/hisilicon,hi3670-usb3.yaml | 3 +- + .../devicetree/bindings/phy/mediatek,tphy.yaml | 1 + + .../devicetree/bindings/phy/meson-gxl-usb2-phy.txt | 21 - + .../bindings/phy/nvidia,tegra124-xusb-padctl.txt | 779 ---- + .../bindings/phy/nvidia,tegra124-xusb-padctl.yaml | 654 +++ + .../bindings/phy/nvidia,tegra186-xusb-padctl.yaml | 544 +++ + .../bindings/phy/nvidia,tegra194-xusb-padctl.yaml | 632 +++ + .../bindings/phy/nvidia,tegra210-xusb-padctl.yaml | 786 ++++ + .../bindings/phy/qcom,msm8996-qmp-ufs-phy.yaml | 3 + + .../bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml | 3 + + .../devicetree/bindings/phy/qcom,pcie2-phy.yaml | 86 + + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 160 +- + .../bindings/phy/qcom,sc7180-qmp-usb3-dp-phy.yaml | 89 +- + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 52 +- + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 5 + + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 4 + + .../bindings/phy/qcom,snps-eusb2-phy.yaml | 79 + + .../bindings/phy/qcom,snps-eusb2-repeater.yaml | 52 + + .../devicetree/bindings/phy/qcom,usb-hsic-phy.txt | 65 - + .../devicetree/bindings/phy/qcom,usb-hsic-phy.yaml | 67 + + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 33 +- + .../devicetree/bindings/phy/qcom-pcie2-phy.txt | 42 - + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 24 +- + .../bindings/phy/socionext,uniphier-usb2-phy.yaml | 41 +- + .../phy/socionext,uniphier-usb3hs-phy.yaml | 29 +- + .../phy/socionext,uniphier-usb3ss-phy.yaml | 26 +- + .../devicetree/bindings/phy/ti,tcan104x-can.yaml | 1 + + .../pinctrl/socionext,uniphier-pinctrl.yaml | 17 +- + .../devicetree/bindings/power/power-domain.yaml | 3 - + .../bindings/power/reset/syscon-reboot.yaml | 4 + + .../power/supply/qcom,pm8941-coincell.yaml | 20 +- + .../power/supply/richtek,rt9467-charger.yaml | 82 + + .../bindings/power/supply/richtek,rt9471.yaml | 73 + + .../bindings/pwm/nvidia,tegra20-pwm.yaml | 3 +- + .../devicetree/bindings/pwm/pwm-sifive.yaml | 1 - + .../devicetree/bindings/regulator/mps,mpq7932.yaml | 68 + + .../regulator/socionext,uniphier-regulator.yaml | 21 +- + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 421 +- + .../bindings/remoteproc/qcom,glink-edge.yaml | 28 +- + .../bindings/remoteproc/qcom,glink-rpm-edge.yaml | 99 + + .../bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 289 ++ + .../bindings/remoteproc/qcom,msm8996-mss-pil.yaml | 393 ++ + .../bindings/remoteproc/qcom,pas-common.yaml | 89 + + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 172 +- + .../bindings/remoteproc/qcom,qcs404-pas.yaml | 94 + + .../bindings/remoteproc/qcom,sc7180-mss-pil.yaml | 3 +- + .../bindings/remoteproc/qcom,sc7180-pas.yaml | 133 + + .../bindings/remoteproc/qcom,sc7280-adsp-pil.yaml | 195 + + .../bindings/remoteproc/qcom,sc7280-mss-pil.yaml | 3 +- + .../bindings/remoteproc/qcom,sc8180x-pas.yaml | 95 + + .../bindings/remoteproc/qcom,sc8280xp-pas.yaml | 147 + + .../bindings/remoteproc/qcom,sdx55-pas.yaml | 109 + + .../bindings/remoteproc/qcom,sm6115-pas.yaml | 143 + + .../bindings/remoteproc/qcom,sm6350-pas.yaml | 167 + + .../bindings/remoteproc/qcom,sm8150-pas.yaml | 174 + + .../bindings/remoteproc/qcom,sm8350-pas.yaml | 182 + + .../bindings/remoteproc/qcom,sm8550-pas.yaml | 178 + + .../bindings/remoteproc/qcom,wcnss-pil.txt | 177 - + .../bindings/remoteproc/qcom,wcnss-pil.yaml | 294 ++ + .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 3 + + .../bindings/remoteproc/ti,pru-consumer.yaml | 60 + + .../bindings/reserved-memory/reserved-memory.yaml | 101 +- + .../reset/socionext,uniphier-glue-reset.yaml | 23 +- + .../bindings/reset/socionext,uniphier-reset.yaml | 52 +- + Documentation/devicetree/bindings/riscv/cpus.yaml | 6 + + .../devicetree/bindings/riscv/sifive,ccache0.yaml | 3 +- + Documentation/devicetree/bindings/serial/8250.yaml | 1 + + .../devicetree/bindings/serial/serial.yaml | 2 +- + .../devicetree/bindings/soc/qcom/qcom,glink.txt | 94 - + .../soc/socionext/socionext,uniphier-adamv.yaml | 50 + + .../socionext/socionext,uniphier-ahci-glue.yaml | 77 + + .../socionext/socionext,uniphier-dwc3-glue.yaml | 106 + + .../soc/socionext/socionext,uniphier-mioctrl.yaml | 65 + + .../soc/socionext/socionext,uniphier-perictrl.yaml | 64 + + .../soc/socionext/socionext,uniphier-sdctrl.yaml | 61 + + .../socionext,uniphier-soc-glue-debug.yaml | 68 + + .../soc/socionext/socionext,uniphier-soc-glue.yaml | 114 + + .../soc/socionext/socionext,uniphier-sysctrl.yaml | 104 + + .../devicetree/bindings/soc/ti/k3-ringacc.yaml | 13 +- + .../devicetree/bindings/sram/qcom,imem.yaml | 1 + + .../thermal/socionext,uniphier-thermal.yaml | 15 +- + .../devicetree/bindings/ufs/qcom,ufs.yaml | 3 + + .../devicetree/bindings/usb/fcs,fusb302.txt | 34 - + .../devicetree/bindings/usb/fcs,fusb302.yaml | 67 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../bindings/watchdog/maxim,max63xx.yaml | 1 + + .../bindings/watchdog/socionext,uniphier-wdt.yaml | 10 +- + Documentation/dontdiff | 1 - + Documentation/driver-api/index.rst | 1 + + .../driver-api/media/drivers/cpia2_devel.rst | 56 - + Documentation/driver-api/media/drivers/index.rst | 1 - + Documentation/driver-api/media/mc-core.rst | 10 +- + Documentation/driver-api/media/v4l2-subdev.rst | 8 + + Documentation/driver-api/phy/phy.rst | 24 +- + Documentation/driver-api/vfio-mediated-device.rst | 108 +- + Documentation/driver-api/vfio.rst | 82 +- + Documentation/driver-api/virtio/index.rst | 11 + + Documentation/driver-api/virtio/virtio.rst | 145 + + .../driver-api/virtio/writing_virtio_drivers.rst | 197 + + Documentation/i2c/gpio-fault-injection.rst | 2 +- + Documentation/i2c/smbus-protocol.rst | 2 +- + Documentation/kbuild/llvm.rst | 15 +- + Documentation/kbuild/makefiles.rst | 2144 +++++---- + Documentation/process/submitting-patches.rst | 2 +- + Documentation/riscv/uabi.rst | 42 + + Documentation/s390/vfio-ap.rst | 1 - + Documentation/scheduler/sched-capacity.rst | 2 +- + .../zh_CN/scheduler/sched-capacity.rst | 2 +- + .../userspace-api/media/drivers/aspeed-video.rst | 2 +- + .../userspace-api/media/drivers/index.rst | 1 - + .../userspace-api/media/drivers/meye-uapi.rst | 53 - + .../userspace-api/media/v4l/dev-subdev.rst | 166 + + .../userspace-api/media/v4l/pixfmt-reserved.rst | 2 +- + .../userspace-api/media/v4l/user-func.rst | 1 + + .../v4l/vidioc-subdev-enum-frame-interval.rst | 5 +- + .../media/v4l/vidioc-subdev-enum-frame-size.rst | 5 +- + .../media/v4l/vidioc-subdev-enum-mbus-code.rst | 5 +- + .../media/v4l/vidioc-subdev-g-crop.rst | 5 +- + .../media/v4l/vidioc-subdev-g-fmt.rst | 5 +- + .../media/v4l/vidioc-subdev-g-frame-interval.rst | 5 +- + .../media/v4l/vidioc-subdev-g-routing.rst | 147 + + .../media/v4l/vidioc-subdev-g-selection.rst | 5 +- + Documentation/virt/kvm/api.rst | 124 +- + Documentation/virt/kvm/devices/vm.rst | 4 + + Documentation/virt/kvm/locking.rst | 25 +- + Documentation/virt/kvm/x86/errata.rst | 11 + + MAINTAINERS | 125 +- + Makefile | 102 +- + arch/alpha/Kconfig | 1 + + arch/alpha/boot/bootp.c | 2 +- + arch/alpha/boot/bootpz.c | 2 +- + arch/alpha/boot/main.c | 2 +- + arch/alpha/boot/misc.c | 2 - + arch/alpha/boot/stdio.c | 16 +- + arch/alpha/boot/tools/objstrip.c | 2 +- + arch/alpha/configs/defconfig | 2 - + arch/alpha/include/asm/Kbuild | 1 + + arch/alpha/include/asm/asm-offsets.h | 1 - + arch/alpha/include/asm/div64.h | 1 - + arch/alpha/include/asm/fpu.h | 61 +- + arch/alpha/include/asm/io.h | 4 - + arch/alpha/include/asm/irq_regs.h | 1 - + arch/alpha/include/asm/kdebug.h | 1 - + arch/alpha/include/asm/thread_info.h | 18 + + arch/alpha/include/asm/unistd.h | 2 +- + arch/alpha/include/uapi/asm/ptrace.h | 2 + + arch/alpha/kernel/asm-offsets.c | 2 + + arch/alpha/kernel/core_cia.c | 2 +- + arch/alpha/kernel/entry.S | 148 +- + arch/alpha/kernel/module.c | 4 +- + arch/alpha/kernel/osf_sys.c | 2 +- + arch/alpha/kernel/pci_iommu.c | 8 +- + arch/alpha/kernel/perf_event.c | 6 +- + arch/alpha/kernel/process.c | 7 +- + arch/alpha/kernel/ptrace.c | 18 +- + arch/alpha/kernel/signal.c | 20 +- + arch/alpha/kernel/traps.c | 30 +- + arch/alpha/lib/fpreg.c | 43 +- + arch/alpha/lib/stacktrace.c | 2 +- + arch/arm/mach-s3c/Makefile | 2 +- + arch/arm/mm/dma-mapping.c | 11 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 8 +- + arch/arm64/include/asm/cache.h | 9 + + arch/arm64/include/asm/el2_setup.h | 99 + + arch/arm64/include/asm/esr.h | 4 + + arch/arm64/include/asm/kvm_arm.h | 23 +- + arch/arm64/include/asm/kvm_emulate.h | 70 +- + arch/arm64/include/asm/kvm_host.h | 67 +- + arch/arm64/include/asm/kvm_hyp.h | 1 + + arch/arm64/include/asm/kvm_mmu.h | 15 +- + arch/arm64/include/asm/kvm_nested.h | 20 + + arch/arm64/include/asm/kvm_pgtable.h | 8 + + arch/arm64/include/asm/sysreg.h | 39 +- + arch/arm64/include/uapi/asm/kvm.h | 1 + + arch/arm64/kernel/cacheinfo.c | 5 - + arch/arm64/kernel/cpufeature.c | 25 + + arch/arm64/kernel/hyp-stub.S | 86 +- + arch/arm64/kvm/Kconfig | 1 + + arch/arm64/kvm/Makefile | 2 +- + arch/arm64/kvm/arch_timer.c | 106 +- + arch/arm64/kvm/arm.c | 109 +- + arch/arm64/kvm/emulate-nested.c | 203 + + arch/arm64/kvm/fpsimd.c | 1 + + arch/arm64/kvm/guest.c | 6 + + arch/arm64/kvm/handle_exit.c | 47 +- + arch/arm64/kvm/hyp/exception.c | 48 +- + arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 21 +- + arch/arm64/kvm/hyp/nvhe/hyp-init.S | 1 + + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 1 + + arch/arm64/kvm/hyp/pgtable.c | 43 +- + arch/arm64/kvm/hyp/vhe/switch.c | 26 +- + arch/arm64/kvm/hypercalls.c | 2 +- + arch/arm64/kvm/inject_fault.c | 61 +- + arch/arm64/kvm/mmu.c | 46 +- + arch/arm64/kvm/nested.c | 161 + + arch/arm64/kvm/pvtime.c | 8 +- + arch/arm64/kvm/reset.c | 25 +- + arch/arm64/kvm/sys_regs.c | 459 +- + arch/arm64/kvm/sys_regs.h | 14 +- + arch/arm64/kvm/trace_arm.h | 59 + + arch/arm64/kvm/vgic/vgic-init.c | 21 +- + arch/arm64/kvm/vgic/vgic-mmio.c | 13 +- + arch/arm64/kvm/vgic/vgic-v3.c | 9 +- + arch/arm64/kvm/vmid.c | 6 +- + arch/arm64/tools/cpucaps | 1 + + arch/arm64/tools/gen-sysreg.awk | 20 +- + arch/arm64/tools/sysreg | 17 + + arch/ia64/kernel/Makefile | 2 +- + arch/mips/Kbuild | 2 +- + arch/mips/Kconfig | 1 + + arch/mips/Makefile | 13 +- + arch/mips/Makefile.postlink | 2 +- + arch/mips/bcm47xx/board.c | 1 + + arch/mips/bcm47xx/buttons.c | 9 + + .../boot/dts/cavium-octeon/dlink_dsr-1000n.dts | 10 +- + .../mips/boot/dts/cavium-octeon/dlink_dsr-500n.dts | 6 +- + arch/mips/boot/dts/img/boston.dts | 2 +- + arch/mips/boot/dts/ingenic/ci20.dts | 10 +- + arch/mips/boot/dts/ingenic/jz4780.dtsi | 2 + + arch/mips/boot/dts/lantiq/danube.dtsi | 1 - + arch/mips/boot/dts/pic32/pic32mzda_sk.dts | 6 +- + arch/mips/boot/dts/qca/ar9132_tl_wr1043nd_v1.dts | 8 +- + arch/mips/boot/dts/qca/ar9331_dragino_ms14.dts | 8 +- + arch/mips/boot/dts/qca/ar9331_omega.dts | 2 +- + arch/mips/boot/dts/qca/ar9331_tl_mr3020.dts | 8 +- + .../dts/ralink/gardena_smart_gateway_mt7688.dts | 22 +- + arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 20 +- + arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 21 +- + arch/mips/boot/dts/ralink/mt7621.dtsi | 19 +- + arch/mips/cavium-octeon/octeon-usb.c | 42 +- + arch/mips/include/asm/asmmacro-32.h | 4 +- + arch/mips/include/asm/asmmacro.h | 42 +- + arch/mips/include/asm/fpregdef.h | 14 - + arch/mips/include/asm/kvm_host.h | 3 +- + arch/mips/include/asm/mach-bcm47xx/bcm47xx_board.h | 1 + + arch/mips/include/asm/mach-rc32434/pci.h | 2 +- + arch/mips/include/asm/mipsregs.h | 20 +- + arch/mips/include/asm/syscall.h | 2 +- + arch/mips/include/asm/vpe.h | 1 - + arch/mips/kernel/genex.S | 2 +- + arch/mips/kernel/r2300_fpu.S | 4 +- + arch/mips/kernel/r4k_fpu.S | 12 +- + arch/mips/kernel/smp-cps.c | 8 +- + arch/mips/kernel/vpe-mt.c | 7 +- + arch/mips/kvm/Kconfig | 1 + + arch/mips/kvm/Makefile | 2 +- + arch/mips/kvm/callback.c | 14 - + arch/mips/kvm/fpu.S | 6 +- + arch/mips/kvm/mips.c | 34 +- + arch/mips/kvm/vz.c | 7 +- + arch/mips/lantiq/prom.c | 6 - + arch/mips/lantiq/xway/dcdc.c | 5 +- + arch/mips/lantiq/xway/dma.c | 4 +- + arch/mips/lantiq/xway/gptu.c | 5 +- + arch/mips/loongson2ef/Platform | 2 +- + arch/mips/pci/pci-lantiq.c | 8 +- + arch/mips/pci/pci-mt7620.c | 8 +- + arch/mips/ralink/Kconfig | 5 +- + arch/mips/ralink/timer.c | 3 +- + arch/mips/vdso/Kconfig | 14 +- + arch/mips/vdso/Makefile | 3 - + arch/powerpc/Kconfig | 19 +- + arch/powerpc/Makefile | 28 +- + arch/powerpc/Makefile.postlink | 2 +- + arch/powerpc/boot/Makefile | 14 +- + arch/powerpc/boot/dts/turris1x.dts | 23 + + arch/powerpc/configs/ps3_defconfig | 39 +- + arch/powerpc/crypto/crc32-vpmsum_core.S | 13 +- + arch/powerpc/include/asm/barrier.h | 12 +- + arch/powerpc/include/asm/hvcall.h | 1 + + arch/powerpc/include/asm/hw_irq.h | 6 +- + arch/powerpc/include/asm/interrupt.h | 35 +- + arch/powerpc/include/asm/irq.h | 3 - + arch/powerpc/include/asm/kvm_host.h | 3 - + arch/powerpc/include/asm/kvm_ppc.h | 1 - + arch/powerpc/include/asm/machdep.h | 16 +- + arch/powerpc/include/asm/paca.h | 1 - + arch/powerpc/include/asm/papr-sysparm.h | 38 + + arch/powerpc/include/asm/pci-bridge.h | 4 +- + arch/powerpc/include/asm/plpks.h | 195 + + arch/powerpc/include/asm/rtas-types.h | 2 - + arch/powerpc/include/asm/rtas-work-area.h | 96 + + arch/powerpc/include/asm/rtas.h | 184 + + arch/powerpc/include/asm/secvar.h | 21 +- + arch/powerpc/include/asm/smp.h | 1 + + arch/powerpc/include/asm/trace.h | 103 + + arch/powerpc/kernel/Makefile | 10 + + arch/powerpc/kernel/eeh_driver.c | 4 +- + arch/powerpc/kernel/epapr_hcalls.S | 6 + + arch/powerpc/kernel/head_64.S | 51 +- + arch/powerpc/kernel/iommu.c | 4 +- + arch/powerpc/kernel/irq_64.c | 105 +- + arch/powerpc/kernel/mce.c | 10 +- + arch/powerpc/kernel/module_64.c | 29 +- + arch/powerpc/kernel/pci_32.c | 17 +- + arch/powerpc/kernel/process.c | 14 +- + arch/powerpc/kernel/prom.c | 16 +- + arch/powerpc/kernel/prom_init_check.sh | 9 +- + arch/powerpc/kernel/rtas-proc.c | 24 +- + arch/powerpc/kernel/rtas-rtc.c | 6 +- + arch/powerpc/kernel/rtas.c | 1056 ++++- + arch/powerpc/kernel/rtas_flash.c | 21 +- + arch/powerpc/kernel/rtas_pci.c | 8 +- + arch/powerpc/kernel/rtasd.c | 2 +- + arch/powerpc/kernel/secvar-ops.c | 10 +- + arch/powerpc/kernel/secvar-sysfs.c | 178 +- + arch/powerpc/kernel/setup-common.c | 4 + + arch/powerpc/kernel/setup_64.c | 16 +- + arch/powerpc/kernel/time.c | 4 +- + arch/powerpc/kernel/trace/Makefile | 1 + + arch/powerpc/kernel/vdso/Makefile | 28 +- + arch/powerpc/kexec/file_load_64.c | 21 +- + arch/powerpc/kvm/book3s.c | 12 +- + arch/powerpc/kvm/booke.c | 2 +- + arch/powerpc/kvm/e500.c | 6 +- + arch/powerpc/kvm/e500mc.c | 8 +- + arch/powerpc/kvm/powerpc.c | 20 - + arch/powerpc/lib/Makefile | 2 + + arch/powerpc/mm/book3s64/hash_utils.c | 3 +- + arch/powerpc/mm/book3s64/radix_tlb.c | 73 +- + arch/powerpc/mm/mmu_decl.h | 1 + + arch/powerpc/mm/nohash/e500_hugetlbpage.c | 5 +- + arch/powerpc/mm/nohash/tlb_low_64e.S | 2 +- + arch/powerpc/net/bpf_jit.h | 2 +- + arch/powerpc/net/bpf_jit_comp.c | 91 +- + arch/powerpc/net/bpf_jit_comp32.c | 400 +- + arch/powerpc/net/bpf_jit_comp64.c | 16 +- + arch/powerpc/perf/hv-24x7.c | 44 +- + arch/powerpc/platforms/44x/fsp2.c | 2 +- + arch/powerpc/platforms/52xx/efika.c | 4 +- + arch/powerpc/platforms/Kconfig.cputype | 20 +- + arch/powerpc/platforms/cell/ras.c | 4 +- + arch/powerpc/platforms/cell/smp.c | 4 +- + arch/powerpc/platforms/chrp/nvram.c | 4 +- + arch/powerpc/platforms/chrp/pci.c | 4 +- + arch/powerpc/platforms/chrp/setup.c | 4 +- + arch/powerpc/platforms/maple/setup.c | 4 +- + arch/powerpc/platforms/powernv/opal-secvar.c | 60 +- + arch/powerpc/platforms/powernv/pci-ioda.c | 3 +- + arch/powerpc/platforms/ps3/htab.c | 2 +- + arch/powerpc/platforms/pseries/Kconfig | 20 +- + arch/powerpc/platforms/pseries/Makefile | 6 +- + arch/powerpc/platforms/pseries/dlpar.c | 29 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 22 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 4 +- + arch/powerpc/platforms/pseries/io_event_irq.c | 2 +- + arch/powerpc/platforms/pseries/lpar.c | 37 +- + arch/powerpc/platforms/pseries/lparcfg.c | 104 +- + arch/powerpc/platforms/pseries/mobility.c | 4 +- + arch/powerpc/platforms/pseries/msi.c | 4 +- + arch/powerpc/platforms/pseries/nvram.c | 4 +- + arch/powerpc/platforms/pseries/papr-sysparm.c | 151 + + arch/powerpc/platforms/pseries/pci.c | 2 +- + arch/powerpc/platforms/pseries/plpks-secvar.c | 217 + + arch/powerpc/platforms/pseries/plpks.c | 385 +- + arch/powerpc/platforms/pseries/plpks.h | 71 - + arch/powerpc/platforms/pseries/ras.c | 2 +- + arch/powerpc/platforms/pseries/rtas-work-area.c | 209 + + arch/powerpc/platforms/pseries/setup.c | 29 +- + arch/powerpc/platforms/pseries/smp.c | 12 +- + arch/powerpc/purgatory/Makefile | 1 + + arch/powerpc/sysdev/xics/ics-rtas.c | 8 +- + arch/powerpc/xmon/Makefile | 1 + + arch/powerpc/xmon/xmon.c | 16 +- + arch/riscv/Kconfig | 78 +- + arch/riscv/Kconfig.socs | 5 +- + arch/riscv/Makefile | 9 +- + arch/riscv/errata/sifive/errata.c | 6 +- + arch/riscv/errata/thead/errata.c | 17 +- + arch/riscv/include/asm/alternative-macros.h | 20 +- + arch/riscv/include/asm/alternative.h | 20 +- + arch/riscv/include/asm/elf.h | 10 +- + arch/riscv/include/asm/errata_list.h | 12 +- + arch/riscv/include/asm/ftrace.h | 50 +- + arch/riscv/include/asm/hwcap.h | 112 +- + arch/riscv/include/asm/insn-def.h | 58 + + arch/riscv/include/asm/insn.h | 381 ++ + arch/riscv/include/asm/jump_label.h | 2 + + arch/riscv/include/asm/kvm_host.h | 11 +- + arch/riscv/include/asm/kvm_vcpu_pmu.h | 107 + + arch/riscv/include/asm/kvm_vcpu_sbi.h | 13 +- + arch/riscv/include/asm/module.h | 16 + + arch/riscv/include/asm/parse_asm.h | 219 - + arch/riscv/include/asm/pgtable.h | 4 +- + arch/riscv/include/asm/sbi.h | 7 +- + arch/riscv/include/asm/signal.h | 2 +- + arch/riscv/include/asm/string.h | 10 + + arch/riscv/include/asm/switch_to.h | 3 +- + arch/riscv/include/asm/thread_info.h | 1 + + arch/riscv/include/asm/vdso.h | 4 + + arch/riscv/kernel/alternative.c | 113 + + arch/riscv/kernel/cpu.c | 54 +- + arch/riscv/kernel/cpufeature.c | 85 +- + arch/riscv/kernel/ftrace.c | 65 +- + arch/riscv/kernel/kgdb.c | 63 +- + arch/riscv/kernel/mcount-dyn.S | 42 +- + arch/riscv/kernel/module.c | 31 +- + arch/riscv/kernel/probes/simulate-insn.c | 19 +- + arch/riscv/kernel/probes/simulate-insn.h | 29 +- + arch/riscv/kernel/riscv_ksyms.c | 3 + + arch/riscv/kernel/setup.c | 3 + + arch/riscv/kernel/traps.c | 30 +- + arch/riscv/kernel/vdso.c | 5 - + arch/riscv/kernel/vdso/vdso.lds.S | 7 + + arch/riscv/kernel/vmlinux.lds.S | 9 + + arch/riscv/kvm/Kconfig | 1 + + arch/riscv/kvm/Makefile | 1 + + arch/riscv/kvm/main.c | 26 +- + arch/riscv/kvm/mmu.c | 20 +- + arch/riscv/kvm/tlb.c | 7 +- + arch/riscv/kvm/vcpu.c | 7 + + arch/riscv/kvm/vcpu_exit.c | 9 + + arch/riscv/kvm/vcpu_insn.c | 4 +- + arch/riscv/kvm/vcpu_pmu.c | 633 +++ + arch/riscv/kvm/vcpu_sbi.c | 72 +- + arch/riscv/kvm/vcpu_sbi_base.c | 27 +- + arch/riscv/kvm/vcpu_sbi_hsm.c | 28 +- + arch/riscv/kvm/vcpu_sbi_pmu.c | 86 + + arch/riscv/kvm/vcpu_sbi_replace.c | 50 +- + arch/riscv/kvm/vcpu_sbi_v01.c | 17 +- + arch/riscv/kvm/vmid.c | 4 +- + arch/riscv/lib/Makefile | 3 + + arch/riscv/lib/strcmp.S | 121 + + arch/riscv/lib/strlen.S | 133 + + arch/riscv/lib/strncmp.S | 139 + + arch/riscv/mm/fault.c | 10 +- + arch/riscv/purgatory/Makefile | 13 + + arch/s390/Kconfig | 8 +- + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + arch/s390/include/asm/kvm_host.h | 1 - + arch/s390/include/asm/msi.h | 17 + + arch/s390/include/asm/pci_dma.h | 5 +- + arch/s390/kernel/vdso64/Makefile | 4 +- + arch/s390/kvm/gaccess.c | 109 + + arch/s390/kvm/gaccess.h | 3 + + arch/s390/kvm/interrupt.c | 13 +- + arch/s390/kvm/kvm-s390.c | 348 +- + arch/s390/kvm/kvm-s390.h | 2 +- + arch/s390/kvm/pci.c | 2 +- + arch/s390/kvm/pci.h | 2 +- + arch/s390/pci/pci_dma.c | 31 +- + arch/s390/purgatory/Makefile | 2 +- + arch/sh/boot/compressed/Makefile | 7 - + arch/um/drivers/Makefile | 2 +- + arch/um/kernel/Makefile | 2 +- + arch/um/kernel/skas/Makefile | 2 +- + arch/um/os-Linux/Makefile | 2 +- + arch/um/os-Linux/drivers/Makefile | 2 +- + arch/um/os-Linux/skas/Makefile | 2 +- + arch/x86/Makefile.um | 2 +- + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/coco/tdx/tdcall.S | 81 +- + arch/x86/coco/tdx/tdx.c | 62 +- + arch/x86/events/intel/core.c | 1 + + arch/x86/events/intel/ds.c | 4 +- + arch/x86/include/asm/cpufeatures.h | 3 + + arch/x86/include/asm/hyperv-tlfs.h | 3 + + arch/x86/include/asm/idtentry.h | 16 +- + arch/x86/include/asm/kvm-x86-ops.h | 2 +- + arch/x86/include/asm/kvm_host.h | 109 +- + arch/x86/include/asm/reboot.h | 2 + + arch/x86/include/asm/shared/tdx.h | 6 + + arch/x86/include/asm/virtext.h | 16 +- + arch/x86/include/asm/xen/hypervisor.h | 4 +- + arch/x86/include/uapi/asm/kvm.h | 34 +- + arch/x86/kernel/asm-offsets.c | 6 + + arch/x86/kernel/cpu/mshyperv.c | 2 +- + arch/x86/kernel/crash.c | 17 +- + arch/x86/kernel/nmi.c | 8 +- + arch/x86/kernel/reboot.c | 88 +- + arch/x86/kernel/smp.c | 6 +- + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/cpuid.c | 43 +- + arch/x86/kvm/debugfs.c | 2 + + arch/x86/kvm/emulate.c | 18 +- + arch/x86/kvm/hyperv.c | 85 +- + arch/x86/kvm/hyperv.h | 27 + + arch/x86/kvm/i8254.c | 4 +- + arch/x86/kvm/i8259.c | 4 +- + arch/x86/kvm/ioapic.c | 1 + + arch/x86/kvm/irq.c | 1 + + arch/x86/kvm/irq_comm.c | 7 +- + arch/x86/kvm/kvm_cache_regs.h | 12 + + arch/x86/kvm/kvm_emulate.h | 7 +- + arch/x86/kvm/kvm_onhyperv.c | 1 + + arch/x86/kvm/lapic.c | 404 +- + arch/x86/kvm/lapic.h | 4 + + arch/x86/kvm/mmu.h | 6 +- + arch/x86/kvm/mmu/mmu.c | 320 +- + arch/x86/kvm/mmu/mmu_internal.h | 22 +- + arch/x86/kvm/mmu/page_track.c | 1 + + arch/x86/kvm/mmu/paging_tmpl.h | 25 +- + arch/x86/kvm/mmu/spte.c | 10 +- + arch/x86/kvm/mmu/spte.h | 20 +- + arch/x86/kvm/mmu/tdp_iter.c | 12 +- + arch/x86/kvm/mmu/tdp_mmu.c | 20 +- + arch/x86/kvm/mmu/tdp_mmu.h | 25 +- + arch/x86/kvm/mtrr.c | 1 + + arch/x86/kvm/pmu.c | 290 +- + arch/x86/kvm/pmu.h | 13 +- + arch/x86/kvm/reverse_cpuid.h | 7 + + arch/x86/kvm/smm.c | 3 +- + arch/x86/kvm/svm/avic.c | 374 +- + arch/x86/kvm/svm/nested.c | 5 +- + arch/x86/kvm/svm/pmu.c | 4 + + arch/x86/kvm/svm/sev.c | 7 +- + arch/x86/kvm/svm/svm.c | 131 +- + arch/x86/kvm/svm/svm.h | 58 +- + arch/x86/kvm/svm/svm_onhyperv.c | 1 + + arch/x86/kvm/svm/svm_onhyperv.h | 8 +- + arch/x86/kvm/vmx/capabilities.h | 4 +- + arch/x86/kvm/vmx/hyperv.c | 87 +- + arch/x86/kvm/vmx/hyperv.h | 128 +- + arch/x86/kvm/vmx/nested.c | 24 +- + arch/x86/kvm/vmx/pmu_intel.c | 28 +- + arch/x86/kvm/vmx/posted_intr.c | 2 + + arch/x86/kvm/vmx/sgx.c | 5 +- + arch/x86/kvm/vmx/vmcs.h | 4 +- + arch/x86/kvm/vmx/vmcs12.c | 1 + + arch/x86/kvm/vmx/vmenter.S | 80 +- + arch/x86/kvm/vmx/vmx.c | 624 +-- + arch/x86/kvm/vmx/vmx.h | 18 +- + arch/x86/kvm/vmx/vmx_ops.h | 6 +- + arch/x86/kvm/x86.c | 557 ++- + arch/x86/kvm/x86.h | 18 +- + arch/x86/kvm/xen.c | 27 + + arch/x86/kvm/xen.h | 7 + + arch/x86/tools/Makefile | 2 +- + arch/x86/um/Makefile | 2 +- + arch/x86/um/os-Linux/Makefile | 2 +- + certs/extract-cert.c | 9 +- + drivers/Makefile | 7 +- + drivers/acpi/device_pm.c | 19 + + drivers/acpi/numa/hmat.c | 4 +- + drivers/acpi/pci_root.c | 3 + + drivers/base/power/domain.c | 26 + + drivers/block/virtio_blk.c | 468 +- + drivers/clk/Kconfig | 1 - + drivers/clk/at91/Makefile | 16 +- + drivers/clk/at91/at91rm9200.c | 2 +- + drivers/clk/at91/at91sam9260.c | 2 +- + drivers/clk/at91/at91sam9g45.c | 10 +- + drivers/clk/at91/at91sam9n12.c | 12 +- + drivers/clk/at91/at91sam9rl.c | 2 +- + drivers/clk/at91/at91sam9x5.c | 17 +- + drivers/clk/at91/clk-peripheral.c | 8 +- + drivers/clk/at91/clk-system.c | 4 +- + drivers/clk/at91/dt-compat.c | 25 +- + drivers/clk/at91/pmc.h | 4 +- + drivers/clk/at91/sam9x60.c | 20 +- + drivers/clk/at91/sama5d2.c | 22 +- + drivers/clk/at91/sama5d3.c | 20 +- + drivers/clk/at91/sama5d4.c | 22 +- + drivers/clk/at91/sama7g5.c | 4 +- + drivers/clk/clk-renesas-pcie.c | 1 - + drivers/clk/clk-versaclock5.c | 28 +- + drivers/clk/clk.c | 11 + + drivers/clk/imx/Kconfig | 2 +- + drivers/clk/imx/Makefile | 1 + + drivers/clk/imx/clk-gpr-mux.c | 119 + + drivers/clk/imx/clk-imx25.c | 2 +- + drivers/clk/imx/clk-imx27.c | 2 +- + drivers/clk/imx/clk-imx35.c | 2 +- + drivers/clk/imx/clk-imx5.c | 6 +- + drivers/clk/imx/clk-imx6q.c | 15 +- + drivers/clk/imx/clk-imx6sl.c | 2 +- + drivers/clk/imx/clk-imx6sll.c | 2 +- + drivers/clk/imx/clk-imx6sx.c | 2 +- + drivers/clk/imx/clk-imx6ul.c | 33 +- + drivers/clk/imx/clk-imx7d.c | 2 +- + drivers/clk/imx/clk-imx7ulp.c | 4 +- + drivers/clk/imx/clk-imx8mm.c | 2 +- + drivers/clk/imx/clk-imx8mn.c | 2 +- + drivers/clk/imx/clk-imx8mp.c | 2 +- + drivers/clk/imx/clk-imx8mq.c | 2 +- + drivers/clk/imx/clk-imx8ulp.c | 2 +- + drivers/clk/imx/clk-imx93.c | 2 + + drivers/clk/imx/clk-imxrt1050.c | 4 + + drivers/clk/imx/clk-pfd.c | 2 + + drivers/clk/imx/clk-pll14xx.c | 2 +- + drivers/clk/imx/clk-pllv3.c | 2 + + drivers/clk/imx/clk.c | 31 +- + drivers/clk/imx/clk.h | 12 +- + drivers/clk/mediatek/Kconfig | 49 +- + drivers/clk/mediatek/Makefile | 10 +- + drivers/clk/mediatek/clk-cpumux.c | 8 +- + drivers/clk/mediatek/clk-cpumux.h | 2 +- + drivers/clk/mediatek/clk-gate.c | 23 +- + drivers/clk/mediatek/clk-gate.h | 7 +- + drivers/clk/mediatek/clk-mt2701-aud.c | 31 +- + drivers/clk/mediatek/clk-mt2701-eth.c | 36 +- + drivers/clk/mediatek/clk-mt2701-g3d.c | 56 +- + drivers/clk/mediatek/clk-mt2701-hif.c | 38 +- + drivers/clk/mediatek/clk-mt2701-mm.c | 4 +- + drivers/clk/mediatek/clk-mt2701.c | 24 +- + drivers/clk/mediatek/clk-mt2712-mm.c | 4 +- + drivers/clk/mediatek/clk-mt2712.c | 99 +- + drivers/clk/mediatek/clk-mt6765.c | 13 +- + drivers/clk/mediatek/clk-mt6779-mm.c | 4 +- + drivers/clk/mediatek/clk-mt6779.c | 59 +- + drivers/clk/mediatek/clk-mt6795-infracfg.c | 6 +- + drivers/clk/mediatek/clk-mt6795-mm.c | 3 +- + drivers/clk/mediatek/clk-mt6795-pericfg.c | 6 +- + drivers/clk/mediatek/clk-mt6795-topckgen.c | 84 +- + drivers/clk/mediatek/clk-mt6797-mm.c | 4 +- + drivers/clk/mediatek/clk-mt6797.c | 7 +- + drivers/clk/mediatek/clk-mt7622-aud.c | 54 +- + drivers/clk/mediatek/clk-mt7622-eth.c | 82 +- + drivers/clk/mediatek/clk-mt7622-hif.c | 85 +- + drivers/clk/mediatek/clk-mt7622.c | 26 +- + drivers/clk/mediatek/clk-mt7629-eth.c | 7 +- + drivers/clk/mediatek/clk-mt7629-hif.c | 85 +- + drivers/clk/mediatek/clk-mt7629.c | 22 +- + drivers/clk/mediatek/clk-mt7981-apmixed.c | 102 + + drivers/clk/mediatek/clk-mt7981-eth.c | 118 + + drivers/clk/mediatek/clk-mt7981-infracfg.c | 207 + + drivers/clk/mediatek/clk-mt7981-topckgen.c | 422 ++ + drivers/clk/mediatek/clk-mt7986-eth.c | 10 +- + drivers/clk/mediatek/clk-mt7986-infracfg.c | 7 +- + drivers/clk/mediatek/clk-mt7986-topckgen.c | 100 +- + drivers/clk/mediatek/clk-mt8135.c | 18 +- + drivers/clk/mediatek/clk-mt8167-aud.c | 2 +- + drivers/clk/mediatek/clk-mt8167-img.c | 2 +- + drivers/clk/mediatek/clk-mt8167-mfgcfg.c | 2 +- + drivers/clk/mediatek/clk-mt8167-mm.c | 4 +- + drivers/clk/mediatek/clk-mt8167-vdec.c | 3 +- + drivers/clk/mediatek/clk-mt8167.c | 12 +- + drivers/clk/mediatek/clk-mt8173-apmixedsys.c | 157 + + drivers/clk/mediatek/clk-mt8173-img.c | 55 + + drivers/clk/mediatek/clk-mt8173-infracfg.c | 155 + + drivers/clk/mediatek/clk-mt8173-mm.c | 22 +- + drivers/clk/mediatek/clk-mt8173-pericfg.c | 122 + + drivers/clk/mediatek/clk-mt8173-topckgen.c | 653 +++ + drivers/clk/mediatek/clk-mt8173-vdecsys.c | 57 + + drivers/clk/mediatek/clk-mt8173-vencsys.c | 64 + + drivers/clk/mediatek/clk-mt8173.c | 1125 ----- + drivers/clk/mediatek/clk-mt8183-audio.c | 27 +- + drivers/clk/mediatek/clk-mt8183-mm.c | 4 +- + drivers/clk/mediatek/clk-mt8183.c | 130 +- + drivers/clk/mediatek/clk-mt8186-mcu.c | 3 +- + drivers/clk/mediatek/clk-mt8186-mm.c | 3 +- + drivers/clk/mediatek/clk-mt8186-topckgen.c | 112 +- + drivers/clk/mediatek/clk-mt8192-aud.c | 30 +- + drivers/clk/mediatek/clk-mt8192-mm.c | 3 +- + drivers/clk/mediatek/clk-mt8192.c | 182 +- + drivers/clk/mediatek/clk-mt8195-apmixedsys.c | 3 +- + drivers/clk/mediatek/clk-mt8195-topckgen.c | 9 +- + drivers/clk/mediatek/clk-mt8195-vdo0.c | 3 +- + drivers/clk/mediatek/clk-mt8195-vdo1.c | 3 +- + drivers/clk/mediatek/clk-mt8195-vpp0.c | 58 +- + drivers/clk/mediatek/clk-mt8195-vpp1.c | 58 +- + drivers/clk/mediatek/clk-mt8365-mm.c | 5 +- + drivers/clk/mediatek/clk-mt8365.c | 14 +- + drivers/clk/mediatek/clk-mt8516-aud.c | 2 +- + drivers/clk/mediatek/clk-mt8516.c | 12 +- + drivers/clk/mediatek/clk-mtk.c | 136 +- + drivers/clk/mediatek/clk-mtk.h | 35 +- + drivers/clk/mediatek/clk-mux.c | 14 +- + drivers/clk/mediatek/clk-mux.h | 3 +- + drivers/clk/meson/clk-cpu-dyndiv.c | 9 +- + drivers/clk/meson/clk-dualdiv.c | 21 +- + drivers/clk/meson/clk-mpll.c | 20 +- + drivers/clk/meson/sclk-div.c | 11 +- + drivers/clk/qcom/Kconfig | 40 + + drivers/clk/qcom/Makefile | 7 +- + drivers/clk/qcom/apcs-msm8996.c | 89 + + drivers/clk/qcom/camcc-sc7280.c | 268 +- + drivers/clk/qcom/camcc-sm6350.c | 1906 ++++++++ + drivers/clk/qcom/camcc-sm8450.c | 324 +- + drivers/clk/qcom/clk-alpha-pll.c | 5 + + drivers/clk/qcom/clk-alpha-pll.h | 1 + + drivers/clk/qcom/clk-cbf-8996.c | 315 ++ + drivers/clk/qcom/clk-cpu-8996.c | 146 +- + drivers/clk/qcom/clk-rpmh.c | 56 + + drivers/clk/qcom/clk-smd-rpm.c | 1445 +++--- + drivers/clk/qcom/clk-spmi-pmic-div.c | 10 +- + drivers/clk/qcom/dispcc-qcm2290.c | 6 - + drivers/clk/qcom/dispcc-sc7180.c | 8 +- + drivers/clk/qcom/dispcc-sm6115.c | 4 +- + drivers/clk/qcom/dispcc-sm6125.c | 2 +- + drivers/clk/qcom/dispcc-sm6375.c | 4 +- + drivers/clk/qcom/dispcc-sm8250.c | 9 +- + drivers/clk/qcom/dispcc-sm8450.c | 221 +- + drivers/clk/qcom/dispcc-sm8550.c | 1807 ++++++++ + drivers/clk/qcom/gcc-apq8084.c | 1024 +++-- + drivers/clk/qcom/gcc-ipq8074.c | 4 +- + drivers/clk/qcom/gcc-msm8939.c | 32 +- + drivers/clk/qcom/gcc-msm8974.c | 10 +- + drivers/clk/qcom/gcc-msm8976.c | 30 +- + drivers/clk/qcom/gcc-msm8998.c | 13 - + drivers/clk/qcom/gcc-qcs404.c | 842 ++-- + drivers/clk/qcom/gcc-qdu1000.c | 2653 +++++++++++ + drivers/clk/qcom/gcc-sa8775p.c | 4785 ++++++++++++++++++++ + drivers/clk/qcom/gcc-sc7180.c | 19 +- + drivers/clk/qcom/gcc-sc7280.c | 10 +- + drivers/clk/qcom/gcc-sdx55.c | 64 +- + drivers/clk/qcom/gcc-sdx65.c | 109 +- + drivers/clk/qcom/gcc-sm6115.c | 4 +- + drivers/clk/qcom/gcc-sm6375.c | 257 +- + drivers/clk/qcom/gcc-sm8150.c | 17 - + drivers/clk/qcom/gcc-sm8250.c | 10 +- + drivers/clk/qcom/gcc-sm8350.c | 15 - + drivers/clk/qcom/gcc-sm8450.c | 236 +- + drivers/clk/qcom/gcc-sm8550.c | 252 +- + drivers/clk/qcom/gdsc.c | 11 +- + drivers/clk/qcom/gpucc-msm8998.c | 8 +- + drivers/clk/qcom/gpucc-sc7180.c | 11 +- + drivers/clk/qcom/gpucc-sdm845.c | 7 +- + drivers/clk/qcom/krait-cc.c | 4 +- + drivers/clk/qcom/lpasscc-sc7280.c | 10 +- + drivers/clk/qcom/lpasscorecc-sc7180.c | 20 +- + drivers/clk/qcom/mmcc-apq8084.c | 1189 ++--- + drivers/clk/qcom/mmcc-msm8998.c | 25 - + drivers/clk/qcom/tcsrcc-sm8550.c | 192 + + drivers/clk/qcom/videocc-sm8250.c | 9 +- + drivers/clk/ralink/clk-mt7621.c | 10 +- + drivers/clk/renesas/Kconfig | 2 +- + drivers/clk/renesas/r8a7795-cpg-mssr.c | 126 +- + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 4 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 37 +- + drivers/clk/renesas/r9a07g044-cpg.c | 26 +- + drivers/clk/renesas/r9a09g011-cpg.c | 73 + + drivers/clk/renesas/rcar-gen3-cpg.c | 17 +- + drivers/clk/renesas/rcar-gen4-cpg.c | 156 + + drivers/clk/renesas/rcar-gen4-cpg.h | 3 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 35 +- + drivers/clk/renesas/renesas-cpg-mssr.h | 14 - + drivers/clk/sprd/Kconfig | 2 + + drivers/clk/sunxi-ng/Kconfig | 71 +- + drivers/clk/sunxi-ng/ccu-sun20i-d1.c | 13 +- + drivers/clk/sunxi-ng/ccu-sun20i-d1.h | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 15 +- + drivers/clk/sunxi-ng/ccu_mmc_timing.c | 8 +- + drivers/clk/sunxi-ng/ccu_mp.c | 11 +- + drivers/clk/sunxi-ng/ccu_nk.c | 9 +- + drivers/clk/sunxi-ng/ccu_nkm.c | 10 +- + drivers/clk/sunxi-ng/ccu_nkmp.c | 10 +- + drivers/clk/sunxi-ng/ccu_nm.c | 9 +- + drivers/cxl/Kconfig | 14 +- + drivers/cxl/acpi.c | 5 +- + drivers/cxl/core/Makefile | 3 + + drivers/cxl/core/core.h | 7 +- + drivers/cxl/core/hdm.c | 144 +- + drivers/cxl/core/mbox.c | 263 +- + drivers/cxl/core/memdev.c | 3 +- + drivers/cxl/core/pci.c | 316 +- + drivers/cxl/core/port.c | 123 +- + drivers/cxl/core/region.c | 878 +++- + drivers/cxl/core/trace.c | 5 + + drivers/cxl/core/trace.h | 606 +++ + drivers/cxl/cxl.h | 96 +- + drivers/cxl/cxlmem.h | 186 +- + drivers/cxl/cxlpci.h | 12 +- + drivers/cxl/pci.c | 425 +- + drivers/cxl/pmem.c | 1 + + drivers/cxl/port.c | 119 +- + drivers/dax/Kconfig | 17 +- + drivers/dax/Makefile | 2 + + drivers/dax/bus.c | 55 +- + drivers/dax/bus.h | 12 +- + drivers/dax/cxl.c | 53 + + drivers/dax/device.c | 3 +- + drivers/dax/hmem/Makefile | 3 +- + drivers/dax/hmem/device.c | 102 +- + drivers/dax/hmem/hmem.c | 148 +- + drivers/dax/kmem.c | 5 +- + drivers/dma/Kconfig | 16 +- + drivers/dma/at_xdmac.c | 220 +- + drivers/dma/bcm2835-dma.c | 4 +- + drivers/dma/dma-axi-dmac.c | 4 +- + drivers/dma/dmaengine.c | 26 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 6 +- + drivers/dma/dw-edma/Kconfig | 5 +- + drivers/dma/dw-edma/dw-edma-core.c | 196 +- + drivers/dma/dw-edma/dw-edma-core.h | 10 +- + drivers/dma/dw-edma/dw-edma-pcie.c | 56 +- + drivers/dma/dw-edma/dw-edma-v0-core.c | 100 +- + drivers/dma/dw-edma/dw-edma-v0-core.h | 1 - + drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 374 +- + drivers/dma/dw-edma/dw-edma-v0-debugfs.h | 5 - + drivers/dma/dw/core.c | 11 +- + drivers/dma/fsl-edma.c | 8 +- + drivers/dma/fsl-qdma.c | 10 +- + drivers/dma/idma64.c | 8 +- + drivers/dma/idxd/device.c | 14 +- + drivers/dma/idxd/dma.c | 6 - + drivers/dma/idxd/init.c | 7 +- + drivers/dma/idxd/sysfs.c | 4 +- + drivers/dma/img-mdc-dma.c | 4 +- + drivers/dma/imx-dma.c | 4 +- + drivers/dma/imx-sdma.c | 43 +- + drivers/dma/mcf-edma.c | 5 +- + drivers/dma/mediatek/mtk-hsdma.c | 4 +- + drivers/dma/mmp_pdma.c | 4 +- + drivers/dma/mmp_tdma.c | 4 +- + drivers/dma/moxart-dma.c | 4 +- + drivers/dma/mv_xor_v2.c | 7 +- + drivers/dma/mxs-dma.c | 4 +- + drivers/dma/nbpfaxi.c | 4 +- + drivers/dma/ppc4xx/adma.c | 12 +- + drivers/dma/ptdma/ptdma-dmaengine.c | 2 +- + drivers/dma/pxa_dma.c | 4 +- + drivers/dma/qcom/bam_dma.c | 4 +- + drivers/dma/sf-pdma/sf-pdma.c | 7 +- + drivers/dma/sf-pdma/sf-pdma.h | 1 - + drivers/dma/sh/usb-dmac.c | 4 +- + drivers/dma/stm32-dmamux.c | 4 +- + drivers/dma/stm32-mdma.c | 4 +- + drivers/dma/sun4i-dma.c | 4 +- + drivers/dma/sun6i-dma.c | 7 +- + drivers/dma/tegra210-adma.c | 4 +- + drivers/dma/ti/Makefile | 3 +- + drivers/dma/ti/cppi41.c | 10 +- + drivers/dma/ti/k3-psil-am62a.c | 196 + + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 1 + + drivers/dma/ti/k3-udma.c | 42 +- + drivers/dma/ti/omap-dma.c | 4 +- + drivers/dma/xilinx/Makefile | 1 + + drivers/dma/xilinx/xdma-regs.h | 166 + + drivers/dma/xilinx/xdma.c | 974 ++++ + drivers/dma/xilinx/zynqmp_dma.c | 4 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 +- + drivers/gpu/drm/i915/Kconfig | 3 +- + .../gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 3 +- + drivers/gpu/drm/tegra/drm.c | 2 +- + drivers/gpu/host1x/cdma.c | 2 +- + drivers/hwspinlock/hwspinlock_core.c | 2 +- + drivers/i2c/algos/i2c-algo-bit.c | 77 +- + drivers/i2c/busses/Kconfig | 18 + + drivers/i2c/busses/Makefile | 2 + + drivers/i2c/busses/i2c-aspeed.c | 4 +- + drivers/i2c/busses/i2c-au1550.c | 4 +- + drivers/i2c/busses/i2c-bcm2835.c | 4 +- + drivers/i2c/busses/i2c-cadence.c | 23 +- + drivers/i2c/busses/i2c-designware-common.c | 13 +- + drivers/i2c/busses/i2c-designware-core.h | 5 +- + drivers/i2c/busses/i2c-designware-master.c | 33 +- + drivers/i2c/busses/i2c-designware-slave.c | 4 +- + drivers/i2c/busses/i2c-gpio.c | 47 +- + drivers/i2c/busses/i2c-gxp.c | 620 +++ + drivers/i2c/busses/i2c-i801.c | 310 +- + drivers/i2c/busses/i2c-ls2x.c | 370 ++ + drivers/i2c/busses/i2c-mt65xx.c | 7 +- + drivers/i2c/busses/i2c-qcom-cci.c | 8 +- + drivers/i2c/busses/i2c-qcom-geni.c | 2 +- + drivers/i2c/busses/i2c-st.c | 9 +- + drivers/i2c/busses/i2c-xiic.c | 586 ++- + drivers/i2c/i2c-core-base.c | 5 +- + drivers/i2c/i2c-dev.c | 16 +- + drivers/infiniband/core/cma.c | 300 +- + drivers/infiniband/core/sa_query.c | 171 +- + drivers/infiniband/hw/cxgb4/cm.c | 7 + + drivers/infiniband/hw/cxgb4/cq.c | 2 +- + drivers/infiniband/hw/cxgb4/restrack.c | 2 +- + drivers/infiniband/hw/cxgb4/t4fw_ri_api.h | 26 +- + drivers/infiniband/hw/erdma/erdma_hw.h | 4 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 4 +- + drivers/infiniband/hw/hfi1/chip.c | 59 +- + drivers/infiniband/hw/hfi1/exp_rcv.h | 5 +- + drivers/infiniband/hw/hfi1/file_ops.c | 81 +- + drivers/infiniband/hw/hfi1/init.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.c | 4 +- + drivers/infiniband/hw/hfi1/sdma.h | 15 +- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 46 +- + drivers/infiniband/hw/hfi1/user_pages.c | 61 +- + drivers/infiniband/hw/hfi1/verbs.c | 81 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 19 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 109 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 3 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 17 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 66 +- + drivers/infiniband/hw/irdma/hw.c | 2 + + drivers/infiniband/hw/irdma/verbs.c | 313 +- + drivers/infiniband/hw/mana/main.c | 22 +- + drivers/infiniband/hw/mlx4/main.c | 8 + + drivers/infiniband/hw/mlx4/mlx4_ib.h | 3 + + drivers/infiniband/hw/mlx4/qp.c | 121 +- + drivers/infiniband/hw/mlx5/cmd.c | 45 +- + drivers/infiniband/hw/mlx5/cmd.h | 3 +- + drivers/infiniband/hw/mlx5/cong.c | 28 +- + drivers/infiniband/hw/mlx5/main.c | 24 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 51 +- + drivers/infiniband/hw/mlx5/mr.c | 490 +- + drivers/infiniband/hw/mlx5/odp.c | 67 +- + drivers/infiniband/hw/mlx5/qp.c | 164 +- + drivers/infiniband/hw/mlx5/qp.h | 4 +- + drivers/infiniband/hw/mlx5/qpc.c | 7 +- + drivers/infiniband/hw/mlx5/srq.c | 2 +- + drivers/infiniband/hw/mlx5/umr.c | 4 +- + drivers/infiniband/hw/mlx5/wr.c | 2 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 8 +- + drivers/infiniband/sw/rxe/rxe.h | 38 + + drivers/infiniband/sw/rxe/rxe_loc.h | 12 +- + drivers/infiniband/sw/rxe/rxe_mr.c | 606 +-- + drivers/infiniband/sw/rxe/rxe_pool.c | 46 - + drivers/infiniband/sw/rxe/rxe_pool.h | 3 - + drivers/infiniband/sw/rxe/rxe_queue.h | 108 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 202 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 115 +- + drivers/infiniband/sw/rxe/rxe_verbs.h | 32 +- + drivers/infiniband/sw/siw/siw_mem.c | 23 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 2 +- + drivers/input/input.c | 7 +- + drivers/input/joystick/xpad.c | 2 + + drivers/input/keyboard/Kconfig | 2 +- + drivers/input/keyboard/applespi.c | 10 +- + drivers/input/keyboard/cap11xx.c | 19 +- + drivers/input/keyboard/cros_ec_keyb.c | 15 + + drivers/input/keyboard/omap4-keypad.c | 6 +- + drivers/input/keyboard/samsung-keypad.c | 12 +- + drivers/input/keyboard/spear-keyboard.c | 4 +- + drivers/input/keyboard/st-keyscan.c | 4 +- + drivers/input/keyboard/tegra-kbc.c | 4 +- + drivers/input/misc/88pm860x_onkey.c | 9 +- + drivers/input/misc/ad714x-i2c.c | 14 +- + drivers/input/misc/ad714x-spi.c | 14 +- + drivers/input/misc/ad714x.c | 12 +- + drivers/input/misc/ad714x.h | 4 +- + drivers/input/misc/adxl34x-i2c.c | 25 +- + drivers/input/misc/adxl34x-spi.c | 25 +- + drivers/input/misc/adxl34x.c | 16 +- + drivers/input/misc/adxl34x.h | 4 +- + drivers/input/misc/axp20x-pek.c | 12 +- + drivers/input/misc/cma3000_d0x_i2c.c | 6 +- + drivers/input/misc/da7280.c | 8 +- + drivers/input/misc/drv260x.c | 8 +- + drivers/input/misc/drv2665.c | 8 +- + drivers/input/misc/drv2667.c | 8 +- + drivers/input/misc/e3x0-button.c | 10 +- + drivers/input/misc/gpio-vibra.c | 10 +- + drivers/input/misc/iqs269a.c | 335 +- + drivers/input/misc/iqs626a.c | 164 +- + drivers/input/misc/kxtj9.c | 8 +- + drivers/input/misc/max77693-haptic.c | 11 +- + drivers/input/misc/max8925_onkey.c | 9 +- + drivers/input/misc/max8997_haptic.c | 7 +- + drivers/input/misc/palmas-pwrbutton.c | 10 +- + drivers/input/misc/pcf8574_keypad.c | 16 +- + drivers/input/misc/pm8941-pwrkey.c | 10 +- + drivers/input/misc/pm8xxx-vibrator.c | 6 +- + drivers/input/misc/pmic8xxx-pwrkey.c | 8 +- + drivers/input/misc/pwm-beeper.c | 10 +- + drivers/input/misc/pwm-vibra.c | 10 +- + drivers/input/misc/regulator-haptic.c | 8 +- + drivers/input/misc/rotary_encoder.c | 10 +- + drivers/input/misc/stpmic1_onkey.c | 12 +- + drivers/input/misc/twl4030-vibra.c | 10 +- + drivers/input/misc/twl6040-vibra.c | 7 +- + drivers/input/misc/wistron_btns.c | 6 +- + drivers/input/mouse/cyapa.c | 14 +- + drivers/input/mouse/elan_i2c_core.c | 8 +- + drivers/input/mouse/navpoint.c | 9 +- + drivers/input/mouse/synaptics_i2c.c | 10 +- + drivers/input/rmi4/rmi_i2c.c | 11 +- + drivers/input/rmi4/rmi_smbus.c | 15 +- + drivers/input/rmi4/rmi_spi.c | 13 +- + drivers/input/serio/altera_ps2.c | 4 +- + drivers/input/serio/ambakmi.c | 6 +- + drivers/input/serio/apbps2.c | 4 +- + drivers/input/serio/arc_ps2.c | 4 +- + drivers/input/serio/olpc_apsp.c | 4 +- + drivers/input/touchscreen/ad7877.c | 8 +- + drivers/input/touchscreen/ads7846.c | 31 +- + drivers/input/touchscreen/ar1021_i2c.c | 9 +- + drivers/input/touchscreen/atmel_mxt_ts.c | 8 +- + drivers/input/touchscreen/auo-pixcir-ts.c | 10 +- + drivers/input/touchscreen/bu21013_ts.c | 8 +- + drivers/input/touchscreen/bu21029_ts.c | 8 +- + drivers/input/touchscreen/chipone_icn8318.c | 6 +- + drivers/input/touchscreen/chipone_icn8505.c | 8 +- + drivers/input/touchscreen/cy8ctma140.c | 9 +- + drivers/input/touchscreen/cy8ctmg110_ts.c | 9 +- + drivers/input/touchscreen/cyttsp4_core.c | 9 +- + drivers/input/touchscreen/cyttsp4_i2c.c | 2 +- + drivers/input/touchscreen/cyttsp4_spi.c | 2 +- + drivers/input/touchscreen/cyttsp5.c | 2 +- + drivers/input/touchscreen/cyttsp_core.c | 7 +- + drivers/input/touchscreen/cyttsp_i2c.c | 2 +- + drivers/input/touchscreen/cyttsp_spi.c | 2 +- + drivers/input/touchscreen/edt-ft5x06.c | 12 +- + drivers/input/touchscreen/eeti_ts.c | 8 +- + drivers/input/touchscreen/egalax_ts.c | 9 +- + drivers/input/touchscreen/ektf2127.c | 10 +- + drivers/input/touchscreen/elants_i2c.c | 10 +- + drivers/input/touchscreen/exc3000.c | 10 + + drivers/input/touchscreen/goodix.c | 8 +- + drivers/input/touchscreen/hideep.c | 8 +- + drivers/input/touchscreen/ilitek_ts_i2c.c | 8 +- + drivers/input/touchscreen/imagis.c | 8 +- + drivers/input/touchscreen/imx6ul_tsc.c | 10 +- + drivers/input/touchscreen/ipaq-micro-ts.c | 11 +- + drivers/input/touchscreen/iqs5xx.c | 8 +- + drivers/input/touchscreen/mcs5000_ts.c | 9 +- + drivers/input/touchscreen/melfas_mip4.c | 8 +- + drivers/input/touchscreen/migor_ts.c | 8 +- + drivers/input/touchscreen/mms114.c | 8 +- + drivers/input/touchscreen/msg2638.c | 8 +- + drivers/input/touchscreen/pixcir_i2c_ts.c | 10 +- + drivers/input/touchscreen/raydium_i2c_ts.c | 12 +- + drivers/input/touchscreen/s6sy761.c | 15 +- + drivers/input/touchscreen/silead.c | 8 +- + drivers/input/touchscreen/st1232.c | 10 +- + drivers/input/touchscreen/stmfts.c | 14 +- + drivers/input/touchscreen/surface3_spi.c | 12 +- + drivers/input/touchscreen/ti_am335x_tsc.c | 8 +- + drivers/input/touchscreen/tsc2004.c | 2 +- + drivers/input/touchscreen/tsc2005.c | 2 +- + drivers/input/touchscreen/tsc200x-core.c | 7 +- + drivers/input/touchscreen/wacom_i2c.c | 8 +- + drivers/input/touchscreen/wdt87xx_i2c.c | 8 +- + drivers/input/touchscreen/wm97xx-core.c | 10 +- + drivers/input/touchscreen/zforce_ts.c | 8 +- + drivers/input/touchscreen/zinitix.c | 8 +- + drivers/iommu/Kconfig | 18 +- + drivers/iommu/amd/init.c | 16 +- + drivers/iommu/amd/iommu.c | 94 +- + drivers/iommu/apple-dart.c | 632 ++- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 + + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 23 - + drivers/iommu/dma-iommu.c | 21 +- + drivers/iommu/exynos-iommu.c | 216 +- + drivers/iommu/fsl_pamu_domain.c | 6 +- + drivers/iommu/intel/Kconfig | 11 + + drivers/iommu/intel/Makefile | 1 + + drivers/iommu/intel/dmar.c | 33 +- + drivers/iommu/intel/iommu.c | 124 +- + drivers/iommu/intel/iommu.h | 115 +- + drivers/iommu/intel/irq_remapping.c | 3 +- + drivers/iommu/intel/pasid.c | 20 +- + drivers/iommu/intel/perfmon.c | 877 ++++ + drivers/iommu/intel/perfmon.h | 64 + + drivers/iommu/intel/svm.c | 90 +- + drivers/iommu/iommu-traces.c | 1 - + drivers/iommu/iommu.c | 195 +- + drivers/iommu/iommufd/Kconfig | 2 +- + drivers/iommu/iommufd/device.c | 8 +- + drivers/iommu/iommufd/iommufd_private.h | 2 + + drivers/iommu/iommufd/main.c | 3 + + drivers/iommu/iommufd/pages.c | 6 +- + drivers/iommu/iommufd/vfio_compat.c | 107 +- + drivers/iommu/ipmmu-vmsa.c | 28 - + drivers/iommu/msm_iommu.c | 6 +- + drivers/iommu/mtk_iommu.c | 9 - + drivers/iommu/mtk_iommu_v1.c | 4 +- + drivers/iommu/of_iommu.c | 96 + + drivers/iommu/omap-iommu.c | 6 +- + drivers/iommu/rockchip-iommu.c | 1 - + drivers/iommu/s390-iommu.c | 24 +- + drivers/iommu/sprd-iommu.c | 16 - + drivers/iommu/sun50i-iommu.c | 1 - + drivers/iommu/tegra-gart.c | 6 +- + drivers/iommu/tegra-smmu.c | 5 +- + drivers/irqchip/irq-apple-aic.c | 53 +- + drivers/irqchip/irq-gic-v3-its.c | 4 +- + drivers/macintosh/windfarm_lm75_sensor.c | 4 +- + drivers/macintosh/windfarm_smu_sensors.c | 4 +- + drivers/mailbox/qcom-apcs-ipc-mailbox.c | 3 +- + drivers/mailbox/zynqmp-ipi-mailbox.c | 6 +- + drivers/md/bcache/bcache_ondisk.h | 8 +- + drivers/media/common/Kconfig | 1 + + drivers/media/common/Makefile | 2 +- + .../common => media/common/saa7146}/Kconfig | 0 + .../common => media/common/saa7146}/Makefile | 0 + .../common => media/common/saa7146}/saa7146_core.c | 2 +- + .../common => media/common/saa7146}/saa7146_fops.c | 2 +- + .../common => media/common/saa7146}/saa7146_hlp.c | 2 +- + .../common => media/common/saa7146}/saa7146_i2c.c | 2 +- + .../common => media/common/saa7146}/saa7146_vbi.c | 2 +- + .../common/saa7146}/saa7146_video.c | 2 +- + drivers/media/common/videobuf2/videobuf2-core.c | 25 +- + .../media/dvb-frontends/cxd2880/cxd2880_tnrdmd.c | 4 +- + .../dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt.c | 14 +- + .../dvb-frontends/cxd2880/cxd2880_tnrdmd_dvbt2.c | 14 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 9 +- + drivers/media/dvb-frontends/dvb-pll.c | 5 +- + drivers/media/dvb-frontends/m88ds3103.c | 6 +- + drivers/media/dvb-frontends/mb86a16.c | 9 +- + drivers/media/dvb-frontends/mn88443x.c | 6 +- + drivers/media/dvb-frontends/tc90522.c | 6 +- + drivers/media/i2c/Kconfig | 40 + + drivers/media/i2c/Makefile | 3 + + drivers/media/i2c/adv7180.c | 6 +- + drivers/media/i2c/adv7604.c | 6 +- + drivers/media/i2c/ak7375.c | 38 + + drivers/media/i2c/cs53l32a.c | 6 +- + drivers/media/i2c/imx219.c | 311 +- + drivers/media/i2c/imx290.c | 1059 +++-- + drivers/media/i2c/imx296.c | 1172 +++++ + drivers/media/i2c/imx415.c | 1300 ++++++ + drivers/media/i2c/ir-kbd-i2c.c | 5 +- + drivers/media/i2c/max9286.c | 463 +- + drivers/media/i2c/msp3400-driver.c | 5 +- + drivers/media/i2c/mt9p031.c | 6 +- + drivers/media/i2c/mt9v032.c | 6 +- + drivers/media/i2c/ov2740.c | 4 +- + drivers/media/i2c/ov5640.c | 86 +- + drivers/media/i2c/ov5670.c | 312 +- + drivers/media/i2c/ov5675.c | 198 +- + drivers/media/i2c/ov7670.c | 8 +- + drivers/media/i2c/ov772x.c | 3 +- + drivers/media/i2c/ov8858.c | 2008 ++++++++ + drivers/media/i2c/ov9282.c | 9 +- + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 22 +- + drivers/media/i2c/s5c73m3/s5c73m3-ctrls.c | 1 - + drivers/media/i2c/s5c73m3/s5c73m3.h | 1 - + drivers/media/i2c/saa7115.c | 6 +- + drivers/media/i2c/saa7127.c | 6 +- + drivers/media/i2c/st-vgxy61.c | 4 +- + drivers/media/i2c/tc358746.c | 9 +- + drivers/media/i2c/tda1997x.c | 6 +- + drivers/media/i2c/tvaudio.c | 5 +- + drivers/media/i2c/tvp514x.c | 6 +- + drivers/media/i2c/video-i2c.c | 6 +- + drivers/media/mc/mc-entity.c | 86 +- + drivers/media/pci/Kconfig | 2 + + drivers/media/pci/Makefile | 4 +- + drivers/media/pci/intel/ipu3/ipu3-cio2-main.c | 3 + + drivers/media/pci/saa7134/saa7134-core.c | 2 +- + .../saa7146 => media/pci}/saa7146/Kconfig | 15 +- + .../saa7146 => media/pci}/saa7146/Makefile | 0 + .../saa7146 => media/pci}/saa7146/hexium_gemini.c | 2 +- + .../saa7146 => media/pci}/saa7146/hexium_orion.c | 2 +- + .../deprecated/saa7146 => media/pci}/saa7146/mxb.c | 2 +- + .../deprecated/saa7146 => media/pci}/ttpci/Kconfig | 17 +- + .../saa7146 => media/pci}/ttpci/Makefile | 0 + .../saa7146 => media/pci}/ttpci/budget-av.c | 2 +- + .../saa7146 => media/pci}/ttpci/budget-ci.c | 0 + .../saa7146 => media/pci}/ttpci/budget-core.c | 0 + .../saa7146 => media/pci}/ttpci/budget.c | 0 + .../saa7146 => media/pci}/ttpci/budget.h | 2 +- + drivers/media/platform/amphion/venc.c | 18 +- + drivers/media/platform/amphion/vpu_color.c | 6 +- + drivers/media/platform/chips-media/imx-vdoa.c | 6 - + drivers/media/platform/marvell/mmp-driver.c | 2 +- + drivers/media/platform/mediatek/mdp3/Kconfig | 7 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 3 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-core.c | 7 +- + .../platform/mediatek/vcodec/mtk_vcodec_dec_pm.c | 6 +- + .../platform/mediatek/vcodec/venc/venc_h264_if.c | 4 +- + .../media/platform/microchip/microchip-isc-base.c | 109 +- + drivers/media/platform/nxp/dw100/dw100.c | 2 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 35 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h | 4 +- + drivers/media/platform/nxp/imx-mipi-csis.c | 252 +- + drivers/media/platform/nxp/imx-pxp.c | 359 +- + drivers/media/platform/nxp/imx7-media-csi.c | 239 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 3 +- + drivers/media/platform/qcom/venus/firmware.c | 2 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 2 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-video.c | 2 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 15 +- + .../media/platform/samsung/exynos4-is/fimc-is.h | 3 - + .../media/platform/samsung/exynos4-is/media-dev.h | 1 - + drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 4 +- + drivers/media/platform/sunxi/sun4i-csi/sun4i_csi.c | 1 + + drivers/media/platform/sunxi/sun4i-csi/sun4i_dma.c | 4 +- + drivers/media/platform/ti/cal/cal.c | 4 +- + drivers/media/platform/ti/davinci/vpif.c | 2 +- + drivers/media/platform/ti/omap3isp/isp.c | 9 + + drivers/media/platform/ti/omap3isp/ispvideo.c | 20 +- + drivers/media/platform/verisilicon/hantro_drv.c | 2 - + drivers/media/platform/verisilicon/hantro_v4l2.c | 9 +- + drivers/media/platform/xilinx/xilinx-dma.c | 28 +- + drivers/media/radio/wl128x/fmdrv_common.c | 2 +- + drivers/media/rc/Kconfig | 4 +- + drivers/media/rc/ene_ir.c | 3 +- + drivers/media/rc/gpio-ir-recv.c | 18 + + drivers/media/rc/ir-rx51.c | 6 - + drivers/media/rc/pwm-ir-tx.c | 2 +- + drivers/media/test-drivers/vidtv/vidtv_psi.c | 2 +- + drivers/media/test-drivers/visl/visl-video.c | 2 +- + drivers/media/tuners/si2157.c | 6 +- + drivers/media/usb/dvb-usb-v2/af9015.c | 4 +- + drivers/media/usb/go7007/go7007-v4l2.c | 6 +- + drivers/media/usb/siano/smsusb.c | 1 + + drivers/media/v4l2-core/v4l2-h264.c | 4 + + drivers/media/v4l2-core/v4l2-ioctl.c | 25 +- + drivers/media/v4l2-core/v4l2-jpeg.c | 4 +- + drivers/media/v4l2-core/v4l2-mem2mem.c | 4 +- + drivers/media/v4l2-core/v4l2-subdev.c | 1017 ++++- + drivers/misc/pci_endpoint_test.c | 4 +- + drivers/mtd/devices/mtd_dataflash.c | 9 - + drivers/mtd/nand/ecc-mtk.c | 28 +- + drivers/mtd/nand/raw/Kconfig | 7 - + drivers/mtd/nand/raw/Makefile | 1 - + drivers/mtd/nand/raw/fsl_elbc_nand.c | 8 + + drivers/mtd/nand/raw/marvell_nand.c | 7 + + drivers/mtd/nand/raw/nand_base.c | 149 +- + drivers/mtd/nand/raw/nand_jedec.c | 3 +- + drivers/mtd/nand/raw/nand_onfi.c | 3 +- + drivers/mtd/nand/raw/pasemi_nand.c | 63 +- + drivers/mtd/nand/raw/sunxi_nand.c | 120 +- + drivers/mtd/nand/raw/tmio_nand.c | 533 --- + drivers/mtd/nand/raw/vf610_nfc.c | 4 +- + drivers/mtd/nand/spi/Makefile | 2 +- + drivers/mtd/nand/spi/alliancememory.c | 153 + + drivers/mtd/nand/spi/core.c | 1 + + drivers/mtd/nand/spi/macronix.c | 3 +- + drivers/mtd/parsers/ofpart_core.c | 19 + + drivers/mtd/spi-nor/core.c | 20 +- + drivers/mtd/spi-nor/core.h | 44 +- + drivers/mtd/spi-nor/debugfs.c | 2 +- + drivers/mtd/spi-nor/issi.c | 2 +- + drivers/mtd/spi-nor/macronix.c | 2 +- + drivers/mtd/spi-nor/sfdp.c | 78 +- + drivers/mtd/spi-nor/sfdp.h | 9 +- + drivers/mtd/spi-nor/spansion.c | 27 +- + drivers/net/ethernet/freescale/fman/fman_memac.c | 9 +- + drivers/net/ethernet/mellanox/mlx4/qp.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 22 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 5 +- + drivers/net/ipa/ipa_mem.c | 6 +- + drivers/net/wireless/ath/ath10k/snoc.c | 2 +- + drivers/net/wireless/ath/ath11k/ahb.c | 4 +- + drivers/nvdimm/bus.c | 19 +- + drivers/nvdimm/dimm_devs.c | 5 +- + drivers/nvdimm/nd-core.h | 1 + + drivers/nvdimm/virtio_pmem.c | 11 +- + drivers/of/Kconfig | 14 +- + drivers/of/address.c | 41 + + drivers/of/base.c | 3 +- + drivers/of/dynamic.c | 31 +- + drivers/of/irq.c | 12 +- + drivers/of/kobj.c | 2 +- + drivers/of/of_reserved_mem.c | 10 + + drivers/of/overlay.c | 2 +- + drivers/of/platform.c | 7 +- + drivers/of/property.c | 4 +- + drivers/of/unittest-data/testcases_common.dtsi | 1 + + drivers/of/unittest-data/tests-lifecycle.dtsi | 8 + + drivers/of/unittest.c | 150 +- + drivers/pci/controller/Kconfig | 3 +- + drivers/pci/controller/dwc/Kconfig | 23 +- + drivers/pci/controller/dwc/pci-dra7xx.c | 2 +- + drivers/pci/controller/dwc/pci-imx6.c | 200 +- + drivers/pci/controller/dwc/pcie-bt1.c | 4 + + drivers/pci/controller/dwc/pcie-designware-ep.c | 12 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 25 +- + drivers/pci/controller/dwc/pcie-designware.c | 195 + + drivers/pci/controller/dwc/pcie-designware.h | 21 + + drivers/pci/controller/dwc/pcie-histb.c | 1 - + drivers/pci/controller/dwc/pcie-qcom.c | 15 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 9 +- + .../pci/controller/mobiveil/pcie-mobiveil-plat.c | 1 - + drivers/pci/controller/pci-loongson.c | 71 +- + drivers/pci/controller/pci-tegra.c | 6 +- + drivers/pci/controller/pci-versatile.c | 1 - + drivers/pci/controller/pcie-hisi-error.c | 1 - + drivers/pci/controller/pcie-microchip-host.c | 1 - + drivers/pci/controller/pcie-mt7621.c | 2 + + drivers/pci/controller/vmd.c | 97 +- + drivers/pci/endpoint/functions/pci-epf-test.c | 38 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + + drivers/pci/endpoint/pci-ep-cfs.c | 1 - + drivers/pci/endpoint/pci-epc-core.c | 33 +- + drivers/pci/endpoint/pci-epc-mem.c | 1 - + drivers/pci/endpoint/pci-epf-core.c | 1 - + drivers/pci/hotplug/acpiphp_core.c | 1 - + drivers/pci/hotplug/pciehp_hpc.c | 2 + + drivers/pci/hotplug/shpchp_core.c | 1 - + drivers/pci/iov.c | 2 +- + drivers/pci/p2pdma.c | 8 +- + drivers/pci/pci-acpi.c | 45 +- + drivers/pci/pci-driver.c | 2 +- + drivers/pci/pci.c | 69 +- + drivers/pci/pci.h | 59 +- + drivers/pci/pcie/aer.c | 51 +- + drivers/pci/pcie/aspm.c | 54 + + drivers/pci/pcie/dpc.c | 4 +- + drivers/pci/pcie/portdrv.c | 16 +- + drivers/pci/probe.c | 5 +- + drivers/pci/quirks.c | 31 + + drivers/pci/setup-bus.c | 236 +- + drivers/pci/slot.c | 2 +- + drivers/pci/switch/switchtec.c | 13 +- + drivers/perf/riscv_pmu_sbi.c | 64 +- + drivers/phy/allwinner/phy-sun4i-usb.c | 59 +- + drivers/phy/mediatek/phy-mtk-io.h | 4 +- + drivers/phy/phy-can-transceiver.c | 4 + + drivers/phy/phy-core.c | 51 +- + drivers/phy/qualcomm/Kconfig | 68 +- + drivers/phy/qualcomm/Makefile | 14 +- + drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 259 ++ + drivers/phy/qualcomm/phy-qcom-pcie2.c | 6 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 750 ++- + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 6 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 588 ++- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6.h | 15 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6_20.h | 23 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v2.h | 25 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v3.h | 3 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v5.h | 5 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h | 31 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v6.h | 31 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v2.h | 19 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5.h | 4 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6.h | 16 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6_20.h | 18 + + drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v6.h | 82 + + drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com.h | 2 +- + .../phy/qualcomm/phy-qcom-qmp-qserdes-ln-shrd-v6.h | 32 + + .../qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h | 30 + + .../qualcomm/phy-qcom-qmp-qserdes-txrx-v5_5nm.h | 5 - + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6.h | 77 + + .../phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6_20.h | 45 + + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 688 ++- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 83 +- + drivers/phy/qualcomm/phy-qcom-qmp.h | 23 +- + drivers/phy/qualcomm/phy-qcom-snps-eusb2.c | 441 ++ + drivers/phy/renesas/r8a779f0-ether-serdes.c | 65 +- + drivers/phy/rockchip/phy-rockchip-typec.c | 7 +- + drivers/phy/tegra/xusb.c | 17 + + drivers/phy/ti/phy-j721e-wiz.c | 66 +- + drivers/platform/x86/x86-android-tablets.c | 2 +- + drivers/power/reset/Kconfig | 7 + + drivers/power/reset/Makefile | 1 + + drivers/power/reset/odroid-go-ultra-poweroff.c | 177 + + drivers/power/reset/syscon-reboot.c | 6 +- + drivers/power/supply/Kconfig | 35 + + drivers/power/supply/Makefile | 2 + + drivers/power/supply/ab8500_fg.c | 22 +- + drivers/power/supply/bq2415x_charger.c | 42 +- + drivers/power/supply/bq24190_charger.c | 2 +- + drivers/power/supply/bq24257_charger.c | 8 +- + drivers/power/supply/bq256xx_charger.c | 4 +- + drivers/power/supply/bq25890_charger.c | 181 +- + drivers/power/supply/bq27xxx_battery.c | 8 +- + drivers/power/supply/charger-manager.c | 6 +- + drivers/power/supply/collie_battery.c | 4 +- + drivers/power/supply/da9150-charger.c | 9 +- + drivers/power/supply/ds2780_battery.c | 8 +- + drivers/power/supply/ds2781_battery.c | 8 +- + drivers/power/supply/lp8788-charger.c | 7 +- + drivers/power/supply/ltc4162-l-charger.c | 12 +- + drivers/power/supply/max14577_charger.c | 2 +- + drivers/power/supply/max1721x_battery.c | 8 +- + drivers/power/supply/max77650-charger.c | 8 +- + drivers/power/supply/max77693_charger.c | 6 +- + drivers/power/supply/mp2629_charger.c | 2 +- + drivers/power/supply/olpc_battery.c | 2 +- + drivers/power/supply/pcf50633-charger.c | 6 +- + drivers/power/supply/power_supply_core.c | 93 - + drivers/power/supply/power_supply_leds.c | 1 + + drivers/power/supply/power_supply_sysfs.c | 10 +- + drivers/power/supply/rt9467-charger.c | 1282 ++++++ + drivers/power/supply/rt9471.c | 930 ++++ + drivers/power/supply/test_power.c | 3 +- + drivers/power/supply/twl4030_charger.c | 6 +- + drivers/power/supply/wm8350_power.c | 2 +- + drivers/remoteproc/mtk_scp.c | 1 + + drivers/remoteproc/mtk_scp_ipi.c | 32 +- + drivers/remoteproc/pru_rproc.c | 230 +- + drivers/remoteproc/qcom_common.c | 19 +- + drivers/remoteproc/qcom_common.h | 8 +- + drivers/remoteproc/qcom_q6v5.c | 4 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 125 +- + drivers/remoteproc/qcom_q6v5_mss.c | 261 +- + drivers/remoteproc/qcom_q6v5_pas.c | 336 +- + drivers/remoteproc/qcom_sysmon.c | 2 +- + drivers/remoteproc/qcom_wcnss.c | 12 + + drivers/remoteproc/qcom_wcnss.h | 2 - + drivers/remoteproc/remoteproc_core.c | 5 +- + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 12 + + drivers/rpmsg/qcom_glink_native.c | 208 +- + drivers/rpmsg/qcom_glink_native.h | 8 +- + drivers/rpmsg/qcom_glink_rpm.c | 96 +- + drivers/rpmsg/qcom_glink_smem.c | 102 +- + drivers/rpmsg/qcom_glink_ssr.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 8 + + drivers/rpmsg/rpmsg_ctrl.c | 2 + + drivers/s390/virtio/virtio_ccw.c | 46 +- + drivers/scsi/virtio_scsi.c | 14 +- + drivers/soundwire/bus.c | 56 +- + drivers/soundwire/bus.h | 3 +- + drivers/soundwire/bus_type.c | 9 +- + drivers/soundwire/cadence_master.c | 80 +- + drivers/soundwire/cadence_master.h | 22 +- + drivers/soundwire/debugfs.c | 13 +- + drivers/soundwire/intel.c | 27 - + drivers/soundwire/intel_auxdevice.c | 1 - + drivers/soundwire/stream.c | 38 +- + drivers/staging/media/Kconfig | 9 +- + drivers/staging/media/Makefile | 8 +- + drivers/staging/media/atomisp/Kconfig | 2 +- + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 249 - + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 176 - + .../staging/media/atomisp/i2c/atomisp-mt9m114.c | 206 - + drivers/staging/media/atomisp/i2c/atomisp-ov2680.c | 1280 ++---- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 195 +- + drivers/staging/media/atomisp/i2c/gc0310.h | 10 - + drivers/staging/media/atomisp/i2c/gc2235.h | 31 - + drivers/staging/media/atomisp/i2c/mt9m114.h | 15 - + drivers/staging/media/atomisp/i2c/ov2680.h | 836 +--- + drivers/staging/media/atomisp/i2c/ov2722.h | 36 +- + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 195 - + drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 61 - + .../staging/media/atomisp/include/linux/atomisp.h | 50 - + .../atomisp/include/linux/atomisp_gmin_platform.h | 2 - + .../media/atomisp/include/linux/atomisp_platform.h | 11 +- + drivers/staging/media/atomisp/notes.txt | 6 - + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 90 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 9 +- + drivers/staging/media/atomisp/pci/atomisp_csi2.c | 41 +- + drivers/staging/media/atomisp/pci/atomisp_csi2.h | 5 - + drivers/staging/media/atomisp/pci/atomisp_fops.c | 89 +- + drivers/staging/media/atomisp/pci/atomisp_fops.h | 3 +- + .../media/atomisp/pci/atomisp_gmin_platform.c | 120 +- + .../staging/media/atomisp/pci/atomisp_internal.h | 7 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 60 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 171 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.h | 13 - + drivers/staging/media/atomisp/pci/atomisp_tpg.c | 2 +- + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 165 +- + .../pci/css_2401_system/host/isys_dma_private.h | 2 - + .../atomisp/pci/hive_isp_css_common/host/vmem.c | 20 +- + drivers/staging/media/atomisp/pci/sh_css.c | 7 +- + drivers/staging/media/atomisp/pci/sh_css_params.c | 38 +- + .../media/{deprecated/saa7146 => }/av7110/Kconfig | 20 +- + .../media/{deprecated/saa7146 => }/av7110/Makefile | 3 +- + drivers/staging/media/av7110/TODO | 3 + + .../av7110/audio-bilingual-channel-select.rst | 0 + .../saa7146 => }/av7110/audio-channel-select.rst | 0 + .../saa7146 => }/av7110/audio-clear-buffer.rst | 0 + .../saa7146 => }/av7110/audio-continue.rst | 0 + .../saa7146 => }/av7110/audio-fclose.rst | 0 + .../saa7146 => }/av7110/audio-fopen.rst | 0 + .../saa7146 => }/av7110/audio-fwrite.rst | 0 + .../saa7146 => }/av7110/audio-get-capabilities.rst | 0 + .../saa7146 => }/av7110/audio-get-status.rst | 0 + .../saa7146 => }/av7110/audio-pause.rst | 0 + .../{deprecated/saa7146 => }/av7110/audio-play.rst | 0 + .../saa7146 => }/av7110/audio-select-source.rst | 0 + .../saa7146 => }/av7110/audio-set-av-sync.rst | 0 + .../saa7146 => }/av7110/audio-set-bypass-mode.rst | 0 + .../saa7146 => }/av7110/audio-set-id.rst | 0 + .../saa7146 => }/av7110/audio-set-mixer.rst | 0 + .../saa7146 => }/av7110/audio-set-mute.rst | 0 + .../saa7146 => }/av7110/audio-set-streamtype.rst | 0 + .../{deprecated/saa7146 => }/av7110/audio-stop.rst | 0 + .../{deprecated/saa7146 => }/av7110/audio.rst | 0 + .../saa7146 => }/av7110/audio_data_types.rst | 0 + .../saa7146 => }/av7110/audio_function_calls.rst | 0 + .../media/{deprecated/saa7146 => }/av7110/av7110.c | 0 + .../media/{deprecated/saa7146 => }/av7110/av7110.h | 2 +- + .../{deprecated/saa7146 => }/av7110/av7110_av.c | 0 + .../{deprecated/saa7146 => }/av7110/av7110_av.h | 0 + .../{deprecated/saa7146 => }/av7110/av7110_ca.c | 0 + .../{deprecated/saa7146 => }/av7110/av7110_ca.h | 0 + .../{deprecated/saa7146 => }/av7110/av7110_hw.c | 0 + .../{deprecated/saa7146 => }/av7110/av7110_hw.h | 0 + .../{deprecated/saa7146 => }/av7110/av7110_ipack.c | 0 + .../{deprecated/saa7146 => }/av7110/av7110_ipack.h | 0 + .../{deprecated/saa7146 => }/av7110/av7110_ir.c | 0 + .../{deprecated/saa7146 => }/av7110/av7110_v4l.c | 0 + .../{deprecated/saa7146 => }/av7110/budget-patch.c | 0 + .../{deprecated/saa7146 => }/av7110/dvb_filter.c | 0 + .../{deprecated/saa7146 => }/av7110/dvb_filter.h | 0 + .../media/{deprecated/saa7146 => }/av7110/sp8870.c | 0 + .../media/{deprecated/saa7146 => }/av7110/sp8870.h | 0 + .../saa7146 => }/av7110/video-clear-buffer.rst | 0 + .../saa7146 => }/av7110/video-command.rst | 0 + .../saa7146 => }/av7110/video-continue.rst | 0 + .../saa7146 => }/av7110/video-fast-forward.rst | 0 + .../saa7146 => }/av7110/video-fclose.rst | 0 + .../saa7146 => }/av7110/video-fopen.rst | 0 + .../saa7146 => }/av7110/video-freeze.rst | 0 + .../saa7146 => }/av7110/video-fwrite.rst | 0 + .../saa7146 => }/av7110/video-get-capabilities.rst | 0 + .../saa7146 => }/av7110/video-get-event.rst | 0 + .../saa7146 => }/av7110/video-get-frame-count.rst | 0 + .../saa7146 => }/av7110/video-get-pts.rst | 0 + .../saa7146 => }/av7110/video-get-size.rst | 0 + .../saa7146 => }/av7110/video-get-status.rst | 0 + .../{deprecated/saa7146 => }/av7110/video-play.rst | 0 + .../saa7146 => }/av7110/video-select-source.rst | 0 + .../saa7146 => }/av7110/video-set-blank.rst | 0 + .../av7110/video-set-display-format.rst | 0 + .../saa7146 => }/av7110/video-set-format.rst | 0 + .../saa7146 => }/av7110/video-set-streamtype.rst | 0 + .../saa7146 => }/av7110/video-slowmotion.rst | 0 + .../saa7146 => }/av7110/video-stillpicture.rst | 0 + .../{deprecated/saa7146 => }/av7110/video-stop.rst | 0 + .../saa7146 => }/av7110/video-try-command.rst | 0 + .../{deprecated/saa7146 => }/av7110/video.rst | 0 + .../saa7146 => }/av7110/video_function_calls.rst | 0 + .../saa7146 => }/av7110/video_types.rst | 0 + drivers/staging/media/deprecated/cpia2/Kconfig | 13 - + drivers/staging/media/deprecated/cpia2/Makefile | 4 - + drivers/staging/media/deprecated/cpia2/TODO | 6 - + drivers/staging/media/deprecated/cpia2/cpia2.h | 475 -- + .../staging/media/deprecated/cpia2/cpia2_core.c | 2434 ---------- + .../media/deprecated/cpia2/cpia2_registers.h | 463 -- + drivers/staging/media/deprecated/cpia2/cpia2_usb.c | 966 ---- + drivers/staging/media/deprecated/cpia2/cpia2_v4l.c | 1226 ----- + drivers/staging/media/deprecated/fsl-viu/Kconfig | 15 - + drivers/staging/media/deprecated/fsl-viu/Makefile | 2 - + drivers/staging/media/deprecated/fsl-viu/TODO | 7 - + drivers/staging/media/deprecated/fsl-viu/fsl-viu.c | 1599 ------- + drivers/staging/media/deprecated/meye/Kconfig | 19 - + drivers/staging/media/deprecated/meye/Makefile | 2 - + drivers/staging/media/deprecated/meye/TODO | 6 - + drivers/staging/media/deprecated/meye/meye.c | 1814 -------- + drivers/staging/media/deprecated/meye/meye.h | 311 -- + drivers/staging/media/deprecated/saa7146/Kconfig | 5 - + drivers/staging/media/deprecated/saa7146/Makefile | 2 - + .../staging/media/deprecated/saa7146/av7110/TODO | 9 - + .../staging/media/deprecated/saa7146/saa7146/TODO | 7 - + .../staging/media/deprecated/saa7146/ttpci/TODO | 7 - + drivers/staging/media/deprecated/stkwebcam/Kconfig | 18 - + .../staging/media/deprecated/stkwebcam/Makefile | 5 - + drivers/staging/media/deprecated/stkwebcam/TODO | 12 - + .../media/deprecated/stkwebcam/stk-sensor.c | 587 --- + .../media/deprecated/stkwebcam/stk-webcam.c | 1434 ------ + .../media/deprecated/stkwebcam/stk-webcam.h | 123 - + drivers/staging/media/deprecated/tm6000/Kconfig | 37 - + drivers/staging/media/deprecated/tm6000/Makefile | 14 - + drivers/staging/media/deprecated/tm6000/TODO | 7 - + .../staging/media/deprecated/tm6000/tm6000-alsa.c | 440 -- + .../staging/media/deprecated/tm6000/tm6000-cards.c | 1397 ------ + .../staging/media/deprecated/tm6000/tm6000-core.c | 916 ---- + .../staging/media/deprecated/tm6000/tm6000-dvb.c | 454 -- + .../staging/media/deprecated/tm6000/tm6000-i2c.c | 317 -- + .../staging/media/deprecated/tm6000/tm6000-input.c | 503 -- + .../staging/media/deprecated/tm6000/tm6000-regs.h | 588 --- + .../staging/media/deprecated/tm6000/tm6000-stds.c | 623 --- + .../media/deprecated/tm6000/tm6000-usb-isoc.h | 38 - + .../staging/media/deprecated/tm6000/tm6000-video.c | 1703 ------- + drivers/staging/media/deprecated/tm6000/tm6000.h | 396 -- + drivers/staging/media/deprecated/zr364xx/Kconfig | 18 - + drivers/staging/media/deprecated/zr364xx/Makefile | 3 - + drivers/staging/media/deprecated/zr364xx/TODO | 7 - + drivers/staging/media/deprecated/zr364xx/zr364xx.c | 1635 ------- + drivers/staging/media/imx/imx-media-csi.c | 7 +- + drivers/staging/media/imx/imx-media-fim.c | 13 +- + drivers/staging/media/imx/imx-media.h | 6 +- + drivers/staging/media/meson/vdec/esparser.c | 3 +- + drivers/staging/media/omap4iss/iss_video.c | 66 +- + drivers/usb/host/ehci-exynos.c | 23 +- + drivers/usb/host/ohci-exynos.c | 23 +- + drivers/vdpa/Kconfig | 30 + + drivers/vdpa/Makefile | 1 + + drivers/vdpa/ifcvf/ifcvf_base.c | 32 +- + drivers/vdpa/ifcvf/ifcvf_base.h | 10 +- + drivers/vdpa/ifcvf/ifcvf_main.c | 162 +- + drivers/vdpa/mlx5/Makefile | 2 +- + drivers/vdpa/mlx5/core/mr.c | 1 - + drivers/vdpa/mlx5/core/resources.c | 3 +- + drivers/vdpa/mlx5/net/debug.c | 152 + + drivers/vdpa/mlx5/net/mlx5_vnet.c | 259 +- + drivers/vdpa/mlx5/net/mlx5_vnet.h | 94 + + drivers/vdpa/solidrun/Makefile | 6 + + drivers/vdpa/solidrun/snet_hwmon.c | 188 + + drivers/vdpa/solidrun/snet_main.c | 1111 +++++ + drivers/vdpa/solidrun/snet_vdpa.h | 194 + + drivers/vdpa/vdpa.c | 110 +- + drivers/vdpa/vdpa_sim/vdpa_sim.c | 233 +- + drivers/vdpa/vdpa_sim/vdpa_sim.h | 7 +- + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 1 + + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 219 +- + drivers/vfio/Kconfig | 2 +- + drivers/vfio/container.c | 14 +- + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 2 +- + drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 4 +- + drivers/vfio/group.c | 53 +- + drivers/vfio/iommufd.c | 19 +- + drivers/vfio/mdev/Kconfig | 8 +- + drivers/vfio/mdev/mdev_sysfs.c | 2 +- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 4 +- + drivers/vfio/pci/mlx5/cmd.c | 79 +- + drivers/vfio/pci/mlx5/cmd.h | 28 +- + drivers/vfio/pci/mlx5/main.c | 261 +- + drivers/vfio/pci/vfio_pci_config.c | 6 +- + drivers/vfio/pci/vfio_pci_core.c | 7 +- + drivers/vfio/pci/vfio_pci_igd.c | 2 +- + drivers/vfio/pci/vfio_pci_intrs.c | 10 +- + drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- + drivers/vfio/platform/vfio_platform_common.c | 12 +- + drivers/vfio/platform/vfio_platform_irq.c | 8 +- + drivers/vfio/vfio.h | 33 +- + drivers/vfio/vfio_iommu_type1.c | 273 +- + drivers/vfio/vfio_main.c | 77 +- + drivers/vfio/virqfd.c | 2 +- + drivers/vhost/net.c | 5 +- + drivers/vhost/scsi.c | 6 +- + drivers/vhost/test.c | 3 - + drivers/vhost/vdpa.c | 41 +- + drivers/vhost/vhost.c | 2 +- + drivers/vhost/vhost.h | 2 +- + drivers/vhost/vsock.c | 2 +- + drivers/virtio/virtio_ring.c | 133 +- + drivers/virtio/virtio_vdpa.c | 13 +- + fs/cramfs/inode.c | 9 +- + fs/hostfs/Makefile | 2 +- + fs/minix/bitmap.c | 16 +- + fs/minix/dir.c | 62 +- + fs/minix/minix.h | 5 +- + fs/minix/namei.c | 100 +- + fs/namespace.c | 18 +- + fs/nsfs.c | 3 +- + fs/sysv/dir.c | 154 +- + fs/sysv/namei.c | 42 +- + fs/sysv/sysv.h | 3 +- + include/acpi/acpi_bus.h | 1 + + include/acpi/actbl1.h | 2 +- + include/dt-bindings/clock/imx6qdl-clock.h | 4 +- + include/dt-bindings/clock/imx6sll-clock.h | 2 +- + include/dt-bindings/clock/imx6ul-clock.h | 7 +- + include/dt-bindings/clock/imx8ulp-clock.h | 4 +- + include/dt-bindings/clock/loongson,ls2k-clk.h | 29 + + include/dt-bindings/clock/mediatek,mt7981-clk.h | 215 + + include/dt-bindings/clock/qcom,gcc-apq8084.h | 1 + + include/dt-bindings/clock/qcom,gcc-qcs404.h | 4 + + include/dt-bindings/clock/qcom,gcc-sm8350.h | 1 - + include/dt-bindings/clock/qcom,gcc-sm8450.h | 1 - + include/dt-bindings/clock/qcom,rpmcc.h | 2 + + include/dt-bindings/clock/qcom,sa8775p-gcc.h | 320 ++ + include/dt-bindings/clock/stih416-clks.h | 17 - + include/dt-bindings/clock/sun20i-d1-ccu.h | 2 + + include/dt-bindings/gpio/gpio.h | 2 +- + include/dt-bindings/reset/sun20i-d1-ccu.h | 2 + + include/kvm/arm_arch_timer.h | 6 +- + include/kvm/arm_vgic.h | 4 + + include/linux/cpuhotplug.h | 6 +- + include/linux/dax.h | 7 +- + include/linux/dma/amd_xdma.h | 16 + + include/linux/dma/edma.h | 25 +- + include/linux/dma/imx-dma.h | 1 + + include/linux/dmaengine.h | 15 +- + include/linux/dmar.h | 1 + + include/linux/exportfs.h | 2 +- + include/linux/intel-svm.h | 16 - + include/linux/iommu.h | 41 +- + include/linux/iommufd.h | 12 +- + include/linux/irqdomain.h | 29 +- + include/linux/kvm_host.h | 19 +- + include/linux/kvm_types.h | 2 +- + include/linux/libnvdimm.h | 3 + + include/linux/memregion.h | 2 + + include/linux/memremap.h | 2 +- + include/linux/mfd/syscon/imx6q-iomuxc-gpr.h | 6 +- + include/linux/mlx4/qp.h | 1 + + include/linux/mlx5/driver.h | 1 - + include/linux/mlx5/mlx5_ifc.h | 22 +- + include/linux/mlx5/qp.h | 2 +- + include/linux/mount.h | 1 + + include/linux/msi.h | 17 + + include/linux/mtd/rawnand.h | 21 + + include/linux/mtd/spinand.h | 1 + + include/linux/of.h | 30 +- + include/linux/of_address.h | 2 + + include/linux/of_iommu.h | 8 + + include/linux/pci-epc.h | 10 +- + include/linux/pci-epf.h | 19 +- + include/linux/pci.h | 9 + + include/linux/pci_ids.h | 4 + + include/linux/perf/riscv_pmu.h | 5 + + include/linux/phy/phy.h | 16 +- + include/linux/pinctrl/devinfo.h | 15 + + include/linux/platform_data/amd_xdma.h | 34 + + include/linux/platform_data/cros_ec_commands.h | 3 + + include/linux/platform_data/i2c-gpio.h | 9 + + include/linux/pm_domain.h | 5 + + include/linux/range.h | 5 + + include/linux/remoteproc/pruss.h | 83 + + include/linux/rpmsg/qcom_glink.h | 12 +- + include/linux/soc/qcom/smd-rpm.h | 1 - + include/linux/soundwire/sdw.h | 122 +- + include/linux/vdpa.h | 12 +- + include/linux/vfio.h | 6 +- + include/linux/virtio_config.h | 8 +- + include/linux/virtio_ring.h | 16 + + include/linux/vringh.h | 2 +- + include/media/davinci/ccdc_types.h | 30 - + .../common => include/media/drv-intf}/saa7146.h | 0 + .../common => include/media/drv-intf}/saa7146_vv.h | 2 +- + include/media/i2c/s5c73m3.h | 41 - + include/media/media-entity.h | 102 +- + include/media/ov_16bit_addr_reg_helpers.h | 92 + + include/media/v4l2-subdev.h | 377 ++ + include/rdma/ib_sa.h | 2 +- + include/rdma/ib_umem.h | 1 - + include/rdma/ib_verbs.h | 2 +- + include/rdma/rdma_cm.h | 1 - + include/rdma/restrack.h | 4 +- + include/trace/events/cxl.h | 112 - + include/trace/events/iommu.h | 7 - + include/uapi/linux/cxl_mem.h | 30 +- + include/uapi/linux/kvm.h | 9 + + include/uapi/linux/meye.h | 65 - + include/uapi/linux/pci_regs.h | 1 + + include/uapi/linux/v4l2-controls.h | 8 +- + include/uapi/linux/v4l2-subdev.h | 74 +- + include/uapi/linux/vfio.h | 15 +- + include/uapi/linux/vhost.h | 8 + + include/uapi/linux/vhost_types.h | 2 + + include/uapi/linux/virtio_blk.h | 105 + + include/uapi/rdma/hns-abi.h | 4 + + init/Kconfig | 4 - + ipc/mqueue.c | 5 - + ipc/namespace.c | 35 +- + ipc/util.h | 2 - + kernel/gen_kheaders.sh | 2 +- + kernel/irq/irqdomain.c | 39 - + kernel/irq/msi.c | 27 + + kernel/resource.c | 14 - + kernel/trace/trace.h | 2 +- + kernel/trace/trace_eprobe.c | 83 +- + kernel/trace/trace_events_synth.c | 6 +- + kernel/trace/trace_kprobe.c | 72 +- + kernel/trace/trace_probe.c | 27 + + kernel/trace/trace_probe.h | 2 + + kernel/trace/trace_probe_kernel.h | 30 +- + kernel/trace/trace_probe_tmpl.h | 48 +- + kernel/trace/trace_uprobe.c | 13 +- + lib/Kconfig.kcsan | 1 + + lib/stackinit_kunit.c | 6 +- + mm/mprotect.c | 1 + + rust/.gitignore | 1 - + rust/Makefile | 27 +- + samples/Kconfig | 19 +- + samples/vfio-mdev/README.rst | 100 + + scripts/.gitignore | 3 +- + scripts/Kbuild.include | 50 +- + scripts/Kconfig.include | 2 +- + scripts/Makefile | 11 +- + scripts/Makefile.build | 26 +- + scripts/Makefile.clang | 2 + + scripts/Makefile.compiler | 8 +- + scripts/Makefile.host | 24 +- + scripts/Makefile.lib | 45 +- + scripts/Makefile.modfinal | 2 +- + scripts/Makefile.modpost | 8 +- + scripts/Makefile.package | 241 +- + scripts/as-version.sh | 2 +- + scripts/asn1_compiler.c | 4 +- + scripts/basic/fixdep.c | 238 +- + scripts/bin2c.c | 36 - + scripts/checkkconfigsymbols.py | 13 +- + scripts/clang-tools/gen_compile_commands.py | 2 +- + scripts/clang-tools/run-clang-tools.py | 21 +- + scripts/decodecode | 12 +- + scripts/diffconfig | 16 +- + scripts/dtc/dtc-parser.y | 11 +- + scripts/dtc/libfdt/fdt.h | 4 +- + scripts/dtc/of_unittest_expect | 183 +- + scripts/dtc/version_gen.h | 2 +- + scripts/kernel-doc | 4 +- + scripts/list-gitignored.c | 1057 +++++ + scripts/misc-check | 19 + + scripts/package/builddeb | 8 +- + scripts/package/buildtar | 52 +- + scripts/package/deb-build-option | 16 + + scripts/package/mkdebian | 40 +- + scripts/package/mkspec | 12 +- + scripts/remove-stale-files | 30 +- + scripts/setlocalversion | 132 +- + scripts/tags.sh | 2 +- + security/integrity/platform_certs/load_powerpc.c | 47 +- + sound/soc/codecs/rt1316-sdw.c | 1 - + sound/soc/codecs/rt1318-sdw.c | 1 - + sound/soc/codecs/rt711-sdca-sdw.c | 1 - + tools/testing/cxl/Kbuild | 9 + + tools/testing/cxl/config_check.c | 1 + + tools/testing/cxl/cxl_acpi_test.c | 6 + + tools/testing/cxl/cxl_core_test.c | 6 + + tools/testing/cxl/cxl_mem_test.c | 6 + + tools/testing/cxl/cxl_pmem_test.c | 6 + + tools/testing/cxl/cxl_port_test.c | 6 + + tools/testing/cxl/test/Kbuild | 2 +- + tools/testing/cxl/test/cxl.c | 165 +- + tools/testing/cxl/test/mem.c | 352 ++ + tools/testing/cxl/test/mock.c | 36 +- + tools/testing/cxl/test/mock.h | 6 +- + tools/testing/cxl/watermark.h | 25 + + tools/testing/selftests/iommu/iommufd.c | 2 +- + tools/testing/selftests/kvm/Makefile | 4 + + .../selftests/kvm/aarch64/page_fault_test.c | 2 - + tools/testing/selftests/kvm/config | 1 + + .../testing/selftests/kvm/include/x86_64/hyperv.h | 149 +- + .../selftests/kvm/include/x86_64/processor.h | 31 +- + .../testing/selftests/kvm/kvm_binary_stats_test.c | 21 +- + tools/testing/selftests/kvm/lib/elf.c | 2 + + tools/testing/selftests/kvm/lib/guest_modes.c | 2 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 4 +- + tools/testing/selftests/kvm/lib/x86_64/processor.c | 46 +- + tools/testing/selftests/kvm/memslot_perf_test.c | 5 +- + tools/testing/selftests/kvm/s390x/memop.c | 672 ++- + .../kvm/x86_64/exit_on_emulation_failure_test.c | 3 - + .../selftests/kvm/x86_64/fix_hypercall_test.c | 4 +- + tools/testing/selftests/kvm/x86_64/hyperv_clock.c | 2 +- + .../kvm/x86_64/hyperv_extended_hypercalls.c | 97 + + .../testing/selftests/kvm/x86_64/hyperv_features.c | 339 +- + .../selftests/kvm/x86_64/mmio_warning_test.c | 2 +- + .../selftests/kvm/x86_64/pmu_event_filter_test.c | 385 +- + tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c | 16 +- + .../vmx_exception_with_invalid_guest_state.c | 2 +- + .../selftests/kvm/x86_64/xapic_state_test.c | 55 + + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 15 +- + tools/testing/selftests/powerpc/dscr/dscr.h | 34 +- + .../selftests/powerpc/dscr/dscr_sysfs_test.c | 25 +- + tools/testing/selftests/powerpc/include/utils.h | 20 +- + .../testing/selftests/powerpc/nx-gzip/gzfht_test.c | 52 +- + tools/testing/selftests/powerpc/pmu/lib.c | 34 +- + tools/testing/selftests/powerpc/ptrace/Makefile | 2 +- + tools/testing/selftests/powerpc/ptrace/core-pkey.c | 28 +- + tools/testing/selftests/powerpc/security/Makefile | 2 +- + .../selftests/powerpc/security/entry_flush.c | 12 +- + .../testing/selftests/powerpc/security/rfi_flush.c | 12 +- + .../selftests/powerpc/security/uaccess_flush.c | 18 +- + tools/testing/selftests/powerpc/syscalls/Makefile | 4 +- + .../selftests/powerpc/syscalls/rtas_filter.c | 81 +- + tools/testing/selftests/powerpc/tm/Makefile | 2 +- + tools/testing/selftests/powerpc/utils.c | 412 +- + tools/virtio/Makefile | 2 +- + virt/kvm/Kconfig | 3 + + virt/kvm/coalesced_mmio.c | 8 +- + virt/kvm/kvm_main.c | 297 +- + 2009 files changed, 83842 insertions(+), 52214 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-event_source-devices-iommu + create mode 100644 Documentation/ABI/testing/sysfs-class-power-rt9467 + create mode 100644 Documentation/ABI/testing/sysfs-class-power-rt9471 + delete mode 100644 Documentation/admin-guide/media/cpia2.rst + delete mode 100644 Documentation/admin-guide/media/meye.rst + delete mode 100644 Documentation/admin-guide/media/tm6000-cardlist.rst + delete mode 100644 Documentation/admin-guide/media/zr364xx.rst + create mode 100644 Documentation/devicetree/bindings/clock/loongson,ls2k-clk.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,gpucc-sm8350.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,msm8996-cbf.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sa8775p-gcc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,spmi-clkdiv.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,spmi-clkdiv.yaml + rename Documentation/devicetree/bindings/{arm => cpu}/cpu-capacity.txt (98%) + create mode 100644 Documentation/devicetree/bindings/display/bridge/sil,sii8620.yaml + delete mode 100644 Documentation/devicetree/bindings/display/bridge/sil-sii8620.txt + create mode 100644 Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml + create mode 100644 Documentation/devicetree/bindings/dma/fsl,mxs-dma.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt + delete mode 100644 Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt + create mode 100644 Documentation/devicetree/bindings/i2c/hpe,gxp-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-st.txt + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-synquacer.txt + create mode 100644 Documentation/devicetree/bindings/i2c/loongson,ls2x-i2c.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/socionext,synquacer-i2c.yaml + create mode 100644 Documentation/devicetree/bindings/i2c/st,sti-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/st,stmfts.txt + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/st,stmfts.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/loongson,ls1x-intc.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/loongson,ls1x-intc.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/socionext,synquacer-exiu.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/socionext,synquacer-exiu.yaml + create mode 100644 Documentation/devicetree/bindings/mailbox/st,sti-mailbox.yaml + delete mode 100644 Documentation/devicetree/bindings/mailbox/sti-mailbox.txt + delete mode 100644 Documentation/devicetree/bindings/media/cec-gpio.txt + delete mode 100644 Documentation/devicetree/bindings/media/cec.txt + rename Documentation/devicetree/bindings/media/{ => cec}/amlogic,meson-gx-ao-cec.yaml (86%) + create mode 100644 Documentation/devicetree/bindings/media/cec/cec-common.yaml + create mode 100644 Documentation/devicetree/bindings/media/cec/cec-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/media/cec/nvidia,tegra114-cec.yaml + create mode 100644 Documentation/devicetree/bindings/media/cec/samsung,s5p-cec.yaml + create mode 100644 Documentation/devicetree/bindings/media/cec/st,stih-cec.yaml + create mode 100644 Documentation/devicetree/bindings/media/cec/st,stm32-cec.yaml + create mode 100644 Documentation/devicetree/bindings/media/fsl,imx6ull-pxp.yaml + delete mode 100644 Documentation/devicetree/bindings/media/fsl-pxp.txt + delete mode 100644 Documentation/devicetree/bindings/media/i2c/ak7375.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/asahi-kasei,ak7375.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov5670.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov5675.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov8858.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx296.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx415.yaml + delete mode 100644 Documentation/devicetree/bindings/media/s5p-cec.txt + delete mode 100644 Documentation/devicetree/bindings/media/stih-cec.txt + delete mode 100644 Documentation/devicetree/bindings/media/tegra-cec.txt + rename Documentation/devicetree/bindings/{bus => memory-controllers}/intel,ixp4xx-expansion-bus-controller.yaml (57%) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/intel,ixp4xx-expansion-peripheral-props.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/mediatek,mtk-nfc.yaml + create mode 100644 Documentation/devicetree/bindings/mtd/mediatek,nand-ecc-engine.yaml + delete mode 100644 Documentation/devicetree/bindings/mtd/mtk-nand.txt + create mode 100644 Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie-common.yaml + create mode 100644 Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie-ep.yaml + create mode 100644 Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/rockchip-pcie-ep.txt + delete mode 100644 Documentation/devicetree/bindings/pci/rockchip-pcie-host.txt + create mode 100644 Documentation/devicetree/bindings/perf/riscv,pmu.yaml + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,suniv-f1c100s-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-gxl-usb2-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/meson-gxl-usb2-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.yaml + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra186-xusb-padctl.yaml + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra194-xusb-padctl.yaml + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra210-xusb-padctl.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,pcie2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,snps-eusb2-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,snps-eusb2-repeater.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hsic-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hsic-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom-pcie2-phy.txt + create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt9467-charger.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/richtek,rt9471.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/mps,mpq7932.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,glink-rpm-edge.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,msm8996-mss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,qcs404-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7280-adsp-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc8180x-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc8280xp-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sdx55-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm6115-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm6350-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm8150-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm8350-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml + delete mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/ti,pru-consumer.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,glink.txt + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-adamv.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-ahci-glue.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-dwc3-glue.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-mioctrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-perictrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-sdctrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-soc-glue-debug.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-soc-glue.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-sysctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/fcs,fusb302.txt + create mode 100644 Documentation/devicetree/bindings/usb/fcs,fusb302.yaml + delete mode 100644 Documentation/driver-api/media/drivers/cpia2_devel.rst + create mode 100644 Documentation/driver-api/virtio/index.rst + create mode 100644 Documentation/driver-api/virtio/virtio.rst + create mode 100644 Documentation/driver-api/virtio/writing_virtio_drivers.rst + delete mode 100644 Documentation/userspace-api/media/drivers/meye-uapi.rst + create mode 100644 Documentation/userspace-api/media/v4l/vidioc-subdev-g-routing.rst + delete mode 100644 arch/alpha/include/asm/asm-offsets.h + delete mode 100644 arch/alpha/include/asm/div64.h + delete mode 100644 arch/alpha/include/asm/irq_regs.h + delete mode 100644 arch/alpha/include/asm/kdebug.h + create mode 100644 arch/arm64/include/asm/kvm_nested.h + create mode 100644 arch/arm64/kvm/emulate-nested.c + create mode 100644 arch/arm64/kvm/nested.c + delete mode 100644 arch/mips/kvm/callback.c + create mode 100644 arch/powerpc/include/asm/papr-sysparm.h + create mode 100644 arch/powerpc/include/asm/plpks.h + create mode 100644 arch/powerpc/include/asm/rtas-work-area.h + create mode 100644 arch/powerpc/platforms/pseries/papr-sysparm.c + create mode 100644 arch/powerpc/platforms/pseries/plpks-secvar.c + delete mode 100644 arch/powerpc/platforms/pseries/plpks.h + create mode 100644 arch/powerpc/platforms/pseries/rtas-work-area.c + create mode 100644 arch/riscv/include/asm/insn.h + create mode 100644 arch/riscv/include/asm/kvm_vcpu_pmu.h + delete mode 100644 arch/riscv/include/asm/parse_asm.h + create mode 100644 arch/riscv/kvm/vcpu_pmu.c + create mode 100644 arch/riscv/kvm/vcpu_sbi_pmu.c + create mode 100644 arch/riscv/lib/strcmp.S + create mode 100644 arch/riscv/lib/strlen.S + create mode 100644 arch/riscv/lib/strncmp.S + create mode 100644 arch/s390/include/asm/msi.h + create mode 100644 drivers/clk/imx/clk-gpr-mux.c + create mode 100644 drivers/clk/mediatek/clk-mt7981-apmixed.c + create mode 100644 drivers/clk/mediatek/clk-mt7981-eth.c + create mode 100644 drivers/clk/mediatek/clk-mt7981-infracfg.c + create mode 100644 drivers/clk/mediatek/clk-mt7981-topckgen.c + create mode 100644 drivers/clk/mediatek/clk-mt8173-apmixedsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8173-img.c + create mode 100644 drivers/clk/mediatek/clk-mt8173-infracfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8173-pericfg.c + create mode 100644 drivers/clk/mediatek/clk-mt8173-topckgen.c + create mode 100644 drivers/clk/mediatek/clk-mt8173-vdecsys.c + create mode 100644 drivers/clk/mediatek/clk-mt8173-vencsys.c + delete mode 100644 drivers/clk/mediatek/clk-mt8173.c + create mode 100644 drivers/clk/qcom/apcs-msm8996.c + create mode 100644 drivers/clk/qcom/camcc-sm6350.c + create mode 100644 drivers/clk/qcom/clk-cbf-8996.c + create mode 100644 drivers/clk/qcom/dispcc-sm8550.c + create mode 100644 drivers/clk/qcom/gcc-qdu1000.c + create mode 100644 drivers/clk/qcom/gcc-sa8775p.c + create mode 100644 drivers/clk/qcom/tcsrcc-sm8550.c + create mode 100644 drivers/cxl/core/trace.c + create mode 100644 drivers/cxl/core/trace.h + create mode 100644 drivers/dax/cxl.c + create mode 100644 drivers/dma/ti/k3-psil-am62a.c + create mode 100644 drivers/dma/xilinx/xdma-regs.h + create mode 100644 drivers/dma/xilinx/xdma.c + create mode 100644 drivers/i2c/busses/i2c-gxp.c + create mode 100644 drivers/i2c/busses/i2c-ls2x.c + create mode 100644 drivers/iommu/intel/perfmon.c + create mode 100644 drivers/iommu/intel/perfmon.h + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/Kconfig (100%) + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/Makefile (100%) + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/saa7146_core.c (99%) + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/saa7146_fops.c (99%) + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/saa7146_hlp.c (99%) + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/saa7146_i2c.c (99%) + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/saa7146_vbi.c (99%) + rename drivers/{staging/media/deprecated/saa7146/common => media/common/saa7146}/saa7146_video.c (99%) + create mode 100644 drivers/media/i2c/imx296.c + create mode 100644 drivers/media/i2c/imx415.c + create mode 100644 drivers/media/i2c/ov8858.c + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/saa7146/Kconfig (67%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/saa7146/Makefile (100%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/saa7146/hexium_gemini.c (99%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/saa7146/hexium_orion.c (99%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/saa7146/mxb.c (99%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/ttpci/Kconfig (83%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/ttpci/Makefile (100%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/ttpci/budget-av.c (99%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/ttpci/budget-ci.c (100%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/ttpci/budget-core.c (100%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/ttpci/budget.c (100%) + rename drivers/{staging/media/deprecated/saa7146 => media/pci}/ttpci/budget.h (98%) + delete mode 100644 drivers/mtd/nand/raw/tmio_nand.c + create mode 100644 drivers/mtd/nand/spi/alliancememory.c + create mode 100644 drivers/of/unittest-data/tests-lifecycle.dtsi + create mode 100644 drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6_20.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v2.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6_20.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-ln-shrd-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-ufs-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrx-v6_20.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-snps-eusb2.c + create mode 100644 drivers/power/reset/odroid-go-ultra-poweroff.c + create mode 100644 drivers/power/supply/rt9467-charger.c + create mode 100644 drivers/power/supply/rt9471.c + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/Kconfig (82%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/Makefile (78%) + create mode 100644 drivers/staging/media/av7110/TODO + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-bilingual-channel-select.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-channel-select.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-clear-buffer.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-continue.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-fclose.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-fopen.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-fwrite.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-get-capabilities.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-get-status.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-pause.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-play.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-select-source.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-set-av-sync.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-set-bypass-mode.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-set-id.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-set-mixer.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-set-mute.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-set-streamtype.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio-stop.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio_data_types.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/audio_function_calls.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110.h (99%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_av.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_av.h (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_ca.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_ca.h (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_hw.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_hw.h (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_ipack.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_ipack.h (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_ir.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/av7110_v4l.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/budget-patch.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/dvb_filter.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/dvb_filter.h (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/sp8870.c (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/sp8870.h (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-clear-buffer.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-command.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-continue.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-fast-forward.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-fclose.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-fopen.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-freeze.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-fwrite.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-get-capabilities.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-get-event.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-get-frame-count.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-get-pts.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-get-size.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-get-status.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-play.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-select-source.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-set-blank.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-set-display-format.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-set-format.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-set-streamtype.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-slowmotion.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-stillpicture.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-stop.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video-try-command.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video_function_calls.rst (100%) + rename drivers/staging/media/{deprecated/saa7146 => }/av7110/video_types.rst (100%) + delete mode 100644 drivers/staging/media/deprecated/cpia2/Kconfig + delete mode 100644 drivers/staging/media/deprecated/cpia2/Makefile + delete mode 100644 drivers/staging/media/deprecated/cpia2/TODO + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2.h + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2_core.c + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2_registers.h + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2_usb.c + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2_v4l.c + delete mode 100644 drivers/staging/media/deprecated/fsl-viu/Kconfig + delete mode 100644 drivers/staging/media/deprecated/fsl-viu/Makefile + delete mode 100644 drivers/staging/media/deprecated/fsl-viu/TODO + delete mode 100644 drivers/staging/media/deprecated/fsl-viu/fsl-viu.c + delete mode 100644 drivers/staging/media/deprecated/meye/Kconfig + delete mode 100644 drivers/staging/media/deprecated/meye/Makefile + delete mode 100644 drivers/staging/media/deprecated/meye/TODO + delete mode 100644 drivers/staging/media/deprecated/meye/meye.c + delete mode 100644 drivers/staging/media/deprecated/meye/meye.h + delete mode 100644 drivers/staging/media/deprecated/saa7146/Kconfig + delete mode 100644 drivers/staging/media/deprecated/saa7146/Makefile + delete mode 100644 drivers/staging/media/deprecated/saa7146/av7110/TODO + delete mode 100644 drivers/staging/media/deprecated/saa7146/saa7146/TODO + delete mode 100644 drivers/staging/media/deprecated/saa7146/ttpci/TODO + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/Kconfig + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/Makefile + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/TODO + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/stk-sensor.c + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/stk-webcam.c + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/stk-webcam.h + delete mode 100644 drivers/staging/media/deprecated/tm6000/Kconfig + delete mode 100644 drivers/staging/media/deprecated/tm6000/Makefile + delete mode 100644 drivers/staging/media/deprecated/tm6000/TODO + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-alsa.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-cards.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-core.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-dvb.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-i2c.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-input.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-regs.h + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-stds.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-usb-isoc.h + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-video.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000.h + delete mode 100644 drivers/staging/media/deprecated/zr364xx/Kconfig + delete mode 100644 drivers/staging/media/deprecated/zr364xx/Makefile + delete mode 100644 drivers/staging/media/deprecated/zr364xx/TODO + delete mode 100644 drivers/staging/media/deprecated/zr364xx/zr364xx.c + create mode 100644 drivers/vdpa/mlx5/net/debug.c + create mode 100644 drivers/vdpa/mlx5/net/mlx5_vnet.h + create mode 100644 drivers/vdpa/solidrun/Makefile + create mode 100644 drivers/vdpa/solidrun/snet_hwmon.c + create mode 100644 drivers/vdpa/solidrun/snet_main.c + create mode 100644 drivers/vdpa/solidrun/snet_vdpa.h + create mode 100644 include/dt-bindings/clock/loongson,ls2k-clk.h + create mode 100644 include/dt-bindings/clock/mediatek,mt7981-clk.h + create mode 100644 include/dt-bindings/clock/qcom,sa8775p-gcc.h + delete mode 100644 include/dt-bindings/clock/stih416-clks.h + create mode 100644 include/linux/dma/amd_xdma.h + delete mode 100644 include/linux/intel-svm.h + create mode 100644 include/linux/platform_data/amd_xdma.h + create mode 100644 include/linux/remoteproc/pruss.h + delete mode 100644 include/media/davinci/ccdc_types.h + rename {drivers/staging/media/deprecated/saa7146/common => include/media/drv-intf}/saa7146.h (100%) + rename {drivers/staging/media/deprecated/saa7146/common => include/media/drv-intf}/saa7146_vv.h (99%) + delete mode 100644 include/media/i2c/s5c73m3.h + create mode 100644 include/media/ov_16bit_addr_reg_helpers.h + delete mode 100644 include/trace/events/cxl.h + delete mode 100644 include/uapi/linux/meye.h + create mode 100644 samples/vfio-mdev/README.rst + delete mode 100644 scripts/bin2c.c + create mode 100644 scripts/list-gitignored.c + create mode 100755 scripts/misc-check + create mode 100755 scripts/package/deb-build-option + create mode 100644 tools/testing/cxl/cxl_acpi_test.c + create mode 100644 tools/testing/cxl/cxl_core_test.c + create mode 100644 tools/testing/cxl/cxl_mem_test.c + create mode 100644 tools/testing/cxl/cxl_pmem_test.c + create mode 100644 tools/testing/cxl/cxl_port_test.c + create mode 100644 tools/testing/cxl/watermark.h + create mode 100644 tools/testing/selftests/kvm/x86_64/hyperv_extended_hypercalls.c +Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (2b1a3d3def5f ocfs2: fix non-auto defrag path not working issue) +$ 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 .mailmap +Auto-merging include/linux/rmap.h +Auto-merging mm/memory-failure.c +Auto-merging mm/page_alloc.c +Auto-merging mm/rmap.c +Merge made by the 'ort' strategy. + .mailmap | 1 + + fs/ocfs2/move_extents.c | 34 +++++++++++++--------------------- + include/linux/rmap.h | 2 +- + mm/memory-failure.c | 8 ++++---- + mm/rmap.c | 2 +- + 5 files changed, 20 insertions(+), 27 deletions(-) +Merging kbuild-current/fixes (22e46f6480e8 kbuild: modinst: Fix build error when CONFIG_MODULE_SIG_KEY is a PKCS#11 URI) +$ 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 (30a0b95b1335 Linux 6.1-rc3) +$ 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 (2f62847cf6ae ARM: 9287/1: Reduce __thumb2__ definition to crypto files that require it) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (853e2dac25c1 arm64: perf: reject CHAIN events at creation time) +$ 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 (afeff81765c6 Merge tag 'davinci-fixes-for-v6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 7 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) +Merging davinci-current/davinci/for-current (1b929c02afd3 Linux 6.2-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 (cb8fd6f75775 memory: mvebu-devbus: Fix missing clk_disable_unprepare in mvebu_devbus_probe()) +$ 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 tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (1e5b5df65af9 m68k: /proc/hardware should depend on PROC_FS) +$ 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 (c9c3395d5e3d Linux 6.2) +$ 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 (bcf5470eb4a1 Merge tag 's390-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Auto-merging arch/sparc/mm/srmmu.c +Merge made by the 'ort' strategy. +Merging fscrypt-current/for-current (31e1be62abde MAINTAINERS: update fscrypt git repo) +$ 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 (ef7592e466ef MAINTAINERS: update fsverity git repo, list, and patchwork) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging net/main (aaa3c08ee065 qede: avoid uninitialized entries in coal_entry array) +$ 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/netdev.yaml | 2 +- + Documentation/networking/msg_zerocopy.rst | 6 +- + drivers/net/ethernet/ibm/ibmvnic.c | 4 +- + drivers/net/ethernet/intel/Kconfig | 4 +- + drivers/net/ethernet/intel/ice/Makefile | 2 +- + drivers/net/ethernet/intel/ice/ice_gnss.h | 4 +- + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 2 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 76 ++++++++++++----- + drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 4 + + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 25 +++++- + .../net/ethernet/mellanox/mlx5/core/en/rep/tc.c | 3 +- + .../ethernet/mellanox/mlx5/core/en/tc/act_stats.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 4 +- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 59 ------------- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/lib/geneve.c | 1 + + .../mellanox/mlx5/core/lib/ipsec_fs_roce.c | 13 +-- + drivers/net/ethernet/mellanox/mlx5/core/sriov.c | 4 + + drivers/net/ethernet/qlogic/qede/qede_main.c | 21 ++--- + drivers/net/ethernet/sun/sunhme.c | 6 +- + drivers/net/phy/phy-c45.c | 54 +++++++++--- + drivers/net/phy/phy_device.c | 21 ++++- + drivers/nfc/st-nci/se.c | 6 ++ + drivers/nfc/st21nfca/se.c | 6 ++ + drivers/ptp/ptp_private.h | 2 +- + drivers/ptp/ptp_vclock.c | 44 +++++----- + include/linux/netfilter.h | 5 ++ + include/linux/phy.h | 6 ++ + include/net/netns/conntrack.h | 1 - + include/net/sctp/structs.h | 1 + + include/uapi/linux/netdev.h | 2 +- + net/bridge/netfilter/ebtables.c | 2 +- + net/core/dev.c | 4 +- + net/ipv4/netfilter/arp_tables.c | 4 + + net/ipv4/netfilter/ip_tables.c | 7 +- + net/ipv6/netfilter/ip6_tables.c | 7 +- + net/ipv6/netfilter/ip6t_rpfilter.c | 4 +- + net/ipv6/route.c | 11 +-- + net/netfilter/core.c | 3 + + net/netfilter/nf_conntrack_bpf.c | 1 - + net/netfilter/nf_conntrack_core.c | 25 +++--- + net/netfilter/nf_conntrack_ecache.c | 2 +- + net/netfilter/nf_conntrack_netlink.c | 8 +- + net/netfilter/nf_tables_api.c | 2 +- + net/netfilter/nfnetlink.c | 9 +- + net/netfilter/xt_length.c | 3 +- + net/nfc/netlink.c | 4 + + net/sched/cls_api.c | 2 +- + net/sctp/stream_sched_prio.c | 52 +++++------- + tools/include/uapi/linux/netdev.h | 2 +- + tools/net/ynl/lib/.gitignore | 1 + + tools/net/ynl/lib/nlspec.py | 4 +- + tools/net/ynl/ynl-gen-c.py | 2 +- + tools/testing/selftests/net/fib_tests.sh | 96 +++++++++++++++++++++- + tools/testing/selftests/netfilter/rpath.sh | 32 ++++++-- + 57 files changed, 445 insertions(+), 237 deletions(-) + create mode 100644 tools/net/ynl/lib/.gitignore +Merging bpf/master (5b7c4cabbb65 Merge tag 'net-next-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Already up to date. +Merging ipsec/master (8222d5910dae xfrm: Zero padding when dumping algos and encap) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/xfrm/xfrm_user.c | 45 +++++++++++++++++++++++++++++++++++++++++---- + 1 file changed, 41 insertions(+), 4 deletions(-) +Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (fd2a55e74a99 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless/for-next (52fd90638a72 wifi: wext: warn about usage only once) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath11k/pci.c | 2 +- + drivers/net/wireless/mediatek/mt76/usb.c | 1 + + net/wireless/wext-core.c | 4 ++-- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging rdma-fixes/for-rc (ceaa837f96ad Linux 6.2-rc8) +$ 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 (e97fc9cffbb9 Merge tag 'asoc-fix-v6.2-rc8-2' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (54bc59d18178 Merge remote-tracking branch 'asoc/for-6.2' 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. + .../devicetree/bindings/sound/apple,mca.yaml | 1 + + sound/soc/amd/yc/acp6x-mach.c | 7 +++ + sound/soc/apple/mca.c | 31 ++++++++--- + sound/soc/codecs/adau7118.c | 19 +------ + sound/soc/codecs/da7219-aad.c | 41 +++++++++++--- + sound/soc/codecs/da7219-aad.h | 4 ++ + sound/soc/codecs/sma1303.c | 2 +- + sound/soc/intel/boards/sof_rt5682.c | 23 ++++++++ + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 12 ++++ + sound/soc/mediatek/mt8188/mt8188-dai-etdm.c | 8 --- + sound/soc/sh/rcar/adg.c | 64 +++++++++++----------- + 11 files changed, 138 insertions(+), 74 deletions(-) +Merging regmap-fixes/for-linus (697c3892d825 regmap: apply reg_base and reg_downshift for single register ops) +$ 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 (c361e8d45e52 Merge remote-tracking branch 'regulator/for-6.2' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/regulator/core.c | 6 +++--- + drivers/regulator/max597x-regulator.c | 2 +- + 2 files changed, 4 insertions(+), 4 deletions(-) +Merging spi-fixes/for-linus (4822fc06d054 Merge remote-tracking branch 'spi/for-6.2' 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 +Merge made by the 'ort' strategy. + drivers/spi/spi-cadence-quadspi.c | 2 +- + drivers/spi/spi-sn-f-ospi.c | 2 +- + drivers/spi/spi-tegra210-quad.c | 3 ++- + 3 files changed, 4 insertions(+), 3 deletions(-) +Merging pci-current/for-linus (1b929c02afd3 Linux 6.2-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 (0c058fb94ae0 driver core: fw_devlink: Print full path and name of fwnode) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Merge made by the 'ort' strategy. + drivers/base/bus.c | 2 +- + drivers/base/core.c | 12 ++++++------ + 2 files changed, 7 insertions(+), 7 deletions(-) +Merging tty.current/tty-linus (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ 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 (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ 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 (4ec5183ec486 Linux 6.2-rc7) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ 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 (03fada47311a iio: accel: kionix-kx022a: Get the timestamp from the driver's private data in the trigger_handler) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Auto-merging drivers/iio/adc/qcom-spmi-adc5.c +Auto-merging drivers/iio/light/vcnl4000.c +Merge made by the 'ort' strategy. + drivers/iio/accel/kionix-kx022a.c | 2 +- + drivers/iio/adc/ad7791.c | 2 +- + drivers/iio/adc/ltc2497.c | 6 ++---- + drivers/iio/adc/qcom-spmi-adc5.c | 10 +++++++++- + drivers/iio/imu/Kconfig | 1 + + drivers/iio/industrialio-buffer.c | 21 ++++++++++++--------- + drivers/iio/light/vcnl4000.c | 3 ++- + 7 files changed, 28 insertions(+), 17 deletions(-) +Merging counter-current/counter-current (1b929c02afd3 Linux 6.2-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 (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ 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 (ceaa837f96ad Linux 6.2-rc8) +$ 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 (7ae9fb1b7ecb Merge branch 'next' into for-linus) +$ 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 (8b8447531864 crypto: x86/aria-avx - Do not use avx2 instructions) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (51cdc8bc120e kvm/vfio: Fix potential deadlock on vfio group_lock) +$ 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 (a49fb7218ed8 selftests: amd-pstate: Don't delete source files via Makefile) +$ 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 modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) +$ 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 (c0f7ae27539f MAINTAINERS: Update email of Tudor Ambarus) +$ 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 (88603b6dc419 Linux 6.2-rc2) +$ 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 (3e62aba8284d media: imx-mipi-csis: Check csis_fmt validity before use) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref) +$ 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 (88603b6dc419 Linux 6.2-rc2) +$ 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 (9bfa2544dbd1 ARM: dts: at91: sam9x60: fix the ddr clock for sam9x60) +$ 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 (2a906db2824b Merge branch 'am5748-fix' into fixes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (2c10b61421a2 kvm: initialize all of the kvm_debugregs structure before sending it to userspace) +$ 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 (0dd4cdccdab3 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field) +$ 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 (58326709e8f8 hwmon: (nzxt-smart2) add another USB ID) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + drivers/hwmon/adt7475.c | 8 ++++---- + drivers/hwmon/nzxt-smart2.c | 3 ++- + 2 files changed, 6 insertions(+), 5 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (c91d71363084 nvdimm: Support sizeof(struct page) > MAX_STRUCT_PAGE_SIZE) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (711442e29f16 cxl/region: Fix passthrough-decoder detection) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (000f66519f1a Merge branch 'misc-6.2' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (cd2dbcc75947 sparc: fix livelock in uaccess) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Auto-merging arch/riscv/mm/fault.c +Merge made by the 'ort' strategy. + arch/alpha/mm/fault.c | 5 ++++- + arch/hexagon/mm/vm_fault.c | 5 ++++- + arch/ia64/mm/fault.c | 5 ++++- + arch/m68k/mm/fault.c | 5 ++++- + arch/microblaze/mm/fault.c | 5 ++++- + arch/nios2/mm/fault.c | 5 ++++- + arch/openrisc/mm/fault.c | 5 ++++- + arch/parisc/mm/fault.c | 5 ++++- + arch/riscv/mm/fault.c | 5 ++++- + arch/sparc/mm/fault_32.c | 5 ++++- + arch/sparc/mm/fault_64.c | 7 ++++++- + 11 files changed, 46 insertions(+), 11 deletions(-) +Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted()) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging drivers-x86-fixes/fixes (eb4b55f2f26f platform/x86/intel/vsec: Add support for Meteor Lake) +$ 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 (a3583e92d188 ARM: dts: exynos: correct TMU phandle in Odroid XU3 family) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Auto-merging arch/arm/boot/dts/exynos4210.dtsi +Auto-merging arch/arm/boot/dts/exynos5250.dtsi +Auto-merging arch/arm/boot/dts/exynos5410-odroidxu.dts +Merge made by the 'ort' strategy. + arch/arm/boot/dts/exynos4-cpu-thermal.dtsi | 2 +- + arch/arm/boot/dts/exynos4210.dtsi | 1 - + arch/arm/boot/dts/exynos5250.dtsi | 2 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 1 - + arch/arm/boot/dts/exynos5422-odroidhc1.dts | 10 +++++----- + arch/arm/boot/dts/exynos5422-odroidxu3-common.dtsi | 10 +++++----- + 6 files changed, 12 insertions(+), 14 deletions(-) +Merging pinctrl-samsung-fixes/fixes (1b929c02afd3 Linux 6.2-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 (707344c8a188 dt-bindings: interrupt-controller: arm,gic-v3: Fix typo in description of msi-controller property) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (1b929c02afd3 Linux 6.2-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 (15600159bcc6 scsi: Revert "scsi: core: map PQ=1, PDT=other values to SCSI_SCAN_TARGET_PRESENT") +$ 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 (c9c3395d5e3d Linux 6.2) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (c9c3395d5e3d Linux 6.2) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (3f18c5046e63 mmc: jz4740: Work around bug on JZ4760(B)) +$ 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 (08279468a294 rtc: sunplus: fix format string for printing resource) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (25c94b051592 Drivers: hv: vmbus: fix possible memory leak in vmbus_device_register()) +$ 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 soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (950b879b7f02 riscv: Fixup race condition on PG_dcache_clean in flush_icache_pte) +$ 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 (43d5f5d63699 riscv: dts: sifive: fu740: fix size of pcie 32bit memory) +$ 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 (730892135b7d soc: microchip: mpfs: handle failed system service requests) +$ 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 +Merge made by the 'ort' strategy. + drivers/soc/microchip/mpfs-sys-controller.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging fpga-fixes/fixes (1b929c02afd3 Linux 6.2-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 (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ 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 (c9c3395d5e3d Linux 6.2) +$ 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 (a69982c37cd0 gpiolib: acpi: Add a ignore wakeup quirk for Clevo NH5xAx) +$ 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 (ceaa837f96ad Linux 6.2-rc8) +$ 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 erofs-fixes/fixes (e02ac3e7329f erofs: clean up parsing of fscache related options) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (254c71374a70 kunit: fix kunit_test_init_section_suites(...)) +$ 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 ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (647037adcad0 Revert "mm: Always release pages to the buddy allocator in memblock_free_late().") +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (4102db175b5d nfsd: don't destroy global nfs4_file table in per-net shutdown) +$ 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 irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) +$ 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 broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (3ef9fec011d4 tools arch x86: Sync the msr-index.h copy with the kernel sources) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Merge made by the 'ort' strategy. + tools/arch/x86/include/asm/msr-index.h | 20 ++++++++++++++++++++ + tools/perf/util/bpf_skel/off_cpu.bpf.c | 2 +- + 2 files changed, 21 insertions(+), 1 deletion(-) +Merging efi-fixes/urgent (190233164cd7 arm64: efi: Force the use of SetVirtualAddressMap() on eMAG and Altra Max machines) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (7f18d6eececb lib: zstd: Backport fix for in-place decompression) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + lib/zstd/decompress/huf_decompress.c | 2 +- + lib/zstd/decompress/zstd_decompress.c | 25 ++++++++++++++++++++++--- + 2 files changed, 23 insertions(+), 4 deletions(-) +Merging battery-fixes/fixes (d137900f237a power: supply: axp288_fuel_gauge: Added check for negative values) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Merge made by the 'ort' strategy. + drivers/power/supply/axp288_fuel_gauge.c | 2 ++ + drivers/power/supply/cros_usbpd-charger.c | 2 +- + drivers/power/supply/rk817_charger.c | 4 ---- + 3 files changed, 3 insertions(+), 5 deletions(-) +Merging uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executable to fix a binutils warning) +$ 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 asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'asahi-soc/fixes' of https://github.com/AsahiLinux/linux.git asahi-soc-fixes/asahi-soc/fixes +Already up to date. +Merging iommufd-fixes/for-rc (88603b6dc419 Linux 6.2-rc2) +$ 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 (2a02b7a19794 rust: kernel: Mark rust_fmt_argument as extern "C") +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Merge made by the 'ort' strategy. + rust/kernel/print.rs | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +Merging drm-misc-fixes/for-linux-next-fixes (1b9b4f922f96 drm/nouveau/fb/gp102-: cache scrubber binary on first load) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/gpu/drm/tiny/cirrus.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/nouveau/dispnv50/wndw.h | 5 +-- + drivers/gpu/drm/nouveau/include/nvkm/subdev/fb.h | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/base.c | 8 +++-- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/ga102.c | 21 +++++------- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gp102.c | 41 ++++++++---------------- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/gv100.c | 4 +-- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/priv.h | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/fb/tu102.c | 4 +-- + drivers/gpu/drm/tiny/cirrus.c | 2 +- + 10 files changed, 40 insertions(+), 53 deletions(-) +Merging mm-stable/mm-stable (f9366f4c2a29 include/linux/migrate.h: remove unneeded externs) +$ 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 (817013880a68 Update CREDITS file entry for Jesper Juhl) +$ 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 +Already up to date. +Merging mm/mm-everything (c8044dd04874 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging Documentation/admin-guide/mm/ksm.rst +Auto-merging Documentation/translations/zh_CN/accounting/delay-accounting.rst +CONFLICT (content): Merge conflict in Documentation/translations/zh_CN/accounting/delay-accounting.rst +Auto-merging arch/x86/mm/pat/memtype.c +Auto-merging drivers/block/zram/zram_drv.c +Auto-merging fs/proc/base.c +Auto-merging include/linux/mm_types.h +Auto-merging mm/hugetlb_vmemmap.c +Auto-merging mm/internal.h +Auto-merging mm/shmem.c +CONFLICT (content): Merge conflict in mm/shmem.c +Resolved 'Documentation/translations/zh_CN/accounting/delay-accounting.rst' using previous resolution. +Resolved 'mm/shmem.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3146c9b90a6b] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/accounting/delay-accounting.rst | 14 +- + Documentation/admin-guide/blockdev/zram.rst | 1 + + Documentation/admin-guide/mm/ksm.rst | 7 + + .../zh_CN/accounting/delay-accounting.rst | 14 +- + arch/ia64/kernel/salinfo.c | 2 +- + arch/ia64/mm/contig.c | 2 +- + arch/x86/mm/pat/memtype.c | 12 +- + drivers/block/zram/zram_drv.c | 5 +- + fs/proc/base.c | 1 + + include/linux/mm_types.h | 7 +- + include/linux/pgtable.h | 7 +- + include/linux/zsmalloc.h | 2 + + include/trace/events/huge_memory.h | 3 +- + lib/zlib_deflate/defutil.h | 4 +- + mm/Kconfig | 9 + + mm/Makefile | 1 + + mm/cma_sysfs.c | 2 +- + mm/damon/paddr.c | 7 +- + mm/dmapool.c | 402 ++++++++++----------- + mm/dmapool_test.c | 147 ++++++++ + mm/fadvise.c | 11 +- + mm/hugetlb_vmemmap.c | 14 +- + mm/internal.h | 21 ++ + mm/khugepaged.c | 266 ++++++++++---- + mm/ksm.c | 185 ++++++++-- + mm/memory.c | 1 + + mm/mmap.c | 2 +- + mm/mremap.c | 2 +- + mm/page_alloc.c | 175 +++------ + mm/shmem.c | 116 ++++++ + mm/userfaultfd.c | 41 ++- + mm/zsmalloc.c | 365 ++++++++++--------- + tools/accounting/getdelays.c | 24 +- + tools/testing/selftests/mm/ksm_functional_tests.c | 96 ++++- + 34 files changed, 1259 insertions(+), 709 deletions(-) + create mode 100644 mm/dmapool_test.c +Merging kbuild/for-next (7adf14d8aca1 kbuild: rpm-pkg: remove unneeded KERNELRELEASE from modules/headers_install) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Already up to date. +Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) +$ 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/core (f9fa0778ee73 perf tests stat_all_metrics: Change true workload to sleep workload for system wide check) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Already up to date. +Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attributes: Introduce __access_*() function attribute) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Auto-merging include/linux/compiler_attributes.h +Merge made by the 'ort' strategy. + include/linux/compiler_attributes.h | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) +Merging dma-mapping/for-next (9b07d27d0fbb swiotlb: mark swiotlb_memblock_alloc() as __init) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Merge made by the 'ort' strategy. + include/linux/swiotlb.h | 5 ----- + kernel/dma/swiotlb.c | 11 ++--------- + 2 files changed, 2 insertions(+), 14 deletions(-) +Merging asm-generic/master (a13408c20526 char/agp: introduce asm-generic/agp.h) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date. +Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (ba07b4efc989 Merge branches 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (1b561d3949f8 arm64: acpi: Fix possible memory leak of ffh_ctxt) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/kernel/fpsimd.c +Auto-merging arch/arm64/kernel/traps.c +Merge made by the 'ort' strategy. + arch/arm64/Kconfig | 1 - + arch/arm64/kernel/acpi.c | 8 ++++---- + arch/arm64/kernel/fpsimd.c | 3 --- + arch/arm64/kernel/traps.c | 2 +- + arch/arm64/mm/copypage.c | 3 ++- + 5 files changed, 7 insertions(+), 10 deletions(-) +Merging arm-perf/for-next/perf (e8a709dc2a91 perf: arm_spe: Print the version of SPE detected) +$ 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 (1eebd1aaa62b soc: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging Documentation/devicetree/bindings/riscv/sifive,ccache0.yaml +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/cpuidle/cpuidle-qcom-spm.c +Auto-merging drivers/firmware/arm_scmi/bus.c +Auto-merging drivers/gpu/drm/msm/adreno/adreno_gpu.c +Auto-merging drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c +Auto-merging drivers/iommu/arm/arm-smmu/qcom_iommu.c +Auto-merging drivers/media/platform/qcom/venus/firmware.c +Auto-merging drivers/misc/fastrpc.c +Auto-merging drivers/net/ipa/ipa_main.c +Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c +Auto-merging drivers/power/supply/Kconfig +Auto-merging drivers/power/supply/Makefile +Auto-merging drivers/remoteproc/qcom_q6v5_mss.c +Auto-merging drivers/remoteproc/qcom_q6v5_pas.c +Auto-merging drivers/remoteproc/qcom_wcnss.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 966d13124aee] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/debugfs-driver-dcc | 127 ++ + Documentation/ABI/testing/debugfs-scmi | 70 + + Documentation/ABI/testing/debugfs-scmi-raw | 117 ++ + .../bindings/arm/mediatek/mediatek,mmsys.yaml | 4 + + .../bindings/firmware/amlogic,meson-gxbb-sm.yaml | 39 + + .../bindings/firmware/meson/meson_sm.txt | 15 - + .../devicetree/bindings/firmware/qcom,scm.yaml | 68 +- + .../bindings/input/mediatek,pmic-keys.yaml | 1 + + .../devicetree/bindings/leds/leds-mt6323.txt | 2 +- + .../devicetree/bindings/mfd/mediatek,mt6357.yaml | 111 ++ + Documentation/devicetree/bindings/mfd/mt6397.txt | 2 +- + Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 283 ---- + .../bindings/phy/samsung,dp-video-phy.yaml | 5 +- + .../bindings/phy/samsung,mipi-video-phy.yaml | 11 +- + .../bindings/power/allwinner,sun20i-d1-ppu.yaml | 54 + + .../bindings/power/amlogic,meson-gx-pwrc.txt | 4 +- + .../bindings/power/mediatek,power-controller.yaml | 2 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 +- + .../bindings/power/starfive,jh7110-pmu.yaml | 45 + + .../bindings/reserved-memory/qcom,rmtfs-mem.yaml | 6 +- + .../devicetree/bindings/riscv/sifive,ccache0.yaml | 9 +- + .../bindings/soc/mediatek/mediatek,mutex.yaml | 1 + + .../bindings/soc/mediatek/mediatek,pwrap.yaml | 147 ++ + .../devicetree/bindings/soc/mediatek/pwrap.txt | 75 - + .../devicetree/bindings/soc/qcom/qcom,dcc.yaml | 44 + + .../soc/qcom/qcom,msm8976-ramp-controller.yaml | 36 + + .../bindings/soc/qcom/qcom,pmic-glink.yaml | 95 ++ + .../devicetree/bindings/soc/qcom/qcom,rpm.yaml | 101 ++ + .../bindings/soc/qcom/qcom,rpmh-rsc.yaml | 3 +- + .../devicetree/bindings/soc/qcom/qcom,smd-rpm.yaml | 1 + + MAINTAINERS | 16 +- + arch/arm/arm-soc-for-next-contents.txt | 313 +++++ + arch/arm/mach-qcom/platsmp.c | 2 +- + drivers/bus/imx-weim.c | 4 +- + drivers/cpuidle/cpuidle-qcom-spm.c | 2 +- + drivers/firmware/arm_scmi/Kconfig | 32 + + drivers/firmware/arm_scmi/Makefile | 9 +- + drivers/firmware/arm_scmi/bus.c | 395 ++++-- + drivers/firmware/arm_scmi/common.h | 100 +- + drivers/firmware/arm_scmi/driver.c | 1223 +++++++++++------ + drivers/firmware/arm_scmi/mailbox.c | 6 +- + drivers/firmware/arm_scmi/optee.c | 6 +- + drivers/firmware/arm_scmi/protocols.h | 7 + + drivers/firmware/arm_scmi/raw_mode.c | 1443 ++++++++++++++++++++ + drivers/firmware/arm_scmi/raw_mode.h | 31 + + drivers/firmware/arm_scmi/smc.c | 6 +- + drivers/firmware/arm_scmi/virtio.c | 4 +- + drivers/firmware/meson/meson_sm.c | 2 +- + drivers/firmware/qcom_scm-legacy.c | 2 +- + drivers/firmware/qcom_scm-smc.c | 88 +- + drivers/firmware/qcom_scm.c | 92 +- + drivers/firmware/qcom_scm.h | 8 + + drivers/firmware/xilinx/zynqmp.c | 27 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 2 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_hdcp.c | 2 +- + drivers/input/keyboard/mtk-pmic-keys.c | 17 + + drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c | 2 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 +- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 2 +- + drivers/media/platform/qcom/venus/firmware.c | 2 +- + drivers/memory/renesas-rpc-if.c | 155 ++- + drivers/memory/ti-emif-pm.c | 7 +- + drivers/misc/fastrpc.c | 2 +- + drivers/mmc/host/sdhci-msm.c | 2 +- + drivers/mtd/hyperbus/rpc-if.c | 18 +- + drivers/net/ipa/ipa_main.c | 2 +- + drivers/net/wireless/ath/ath10k/qmi.c | 2 +- + drivers/phy/samsung/phy-exynos-dp-video.c | 7 +- + drivers/phy/samsung/phy-exynos-mipi-video.c | 7 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 2 +- + drivers/power/supply/Kconfig | 9 + + drivers/power/supply/Makefile | 1 + + drivers/power/supply/qcom_battmgr.c | 1411 +++++++++++++++++++ + drivers/remoteproc/qcom_q6v5_mss.c | 2 +- + drivers/remoteproc/qcom_q6v5_pas.c | 2 +- + drivers/remoteproc/qcom_wcnss.c | 2 +- + drivers/soc/Kconfig | 2 + + drivers/soc/Makefile | 4 +- + drivers/soc/amlogic/meson-ee-pwrc.c | 17 + + drivers/soc/apple/apple-pmgr-pwrstate.c | 11 +- + drivers/soc/apple/rtkit-crashlog.c | 93 ++ + drivers/soc/apple/rtkit.c | 36 +- + drivers/soc/bcm/bcm2835-power.c | 6 - + drivers/soc/imx/Kconfig | 11 + + drivers/soc/imx/Makefile | 6 +- + drivers/soc/imx/imx8m-blk-ctrl.c | 27 +- + drivers/soc/imx/imx8mp-blk-ctrl.c | 108 ++ + drivers/soc/imx/imx93-pd.c | 1 - + drivers/soc/imx/imx93-src.c | 1 - + drivers/soc/mediatek/Kconfig | 7 +- + drivers/soc/mediatek/Makefile | 1 + + drivers/soc/mediatek/mt8186-pm-domains.h | 4 +- + drivers/soc/mediatek/mt8188-mmsys.h | 149 ++ + drivers/soc/mediatek/mt8188-pm-domains.h | 623 +++++++++ + drivers/soc/mediatek/mt8195-mmsys.h | 146 ++ + drivers/soc/mediatek/mtk-devapc.c | 11 +- + drivers/soc/mediatek/mtk-mmsys.c | 200 ++- + drivers/soc/mediatek/mtk-mmsys.h | 2 + + drivers/soc/mediatek/mtk-mutex.c | 113 +- + drivers/soc/mediatek/mtk-pm-domains.c | 13 + + drivers/soc/mediatek/mtk-pm-domains.h | 5 + + drivers/soc/mediatek/mtk-regulator-coupler.c | 159 +++ + drivers/soc/mediatek/mtk-svs.c | 155 ++- + drivers/soc/nuvoton/Kconfig | 11 + + drivers/soc/nuvoton/Makefile | 2 + + drivers/soc/nuvoton/wpcm450-soc.c | 109 ++ + drivers/soc/qcom/Kconfig | 27 + + drivers/soc/qcom/Makefile | 3 + + drivers/soc/qcom/mdt_loader.c | 2 +- + drivers/soc/qcom/ocmem.c | 2 +- + drivers/soc/qcom/pmic_glink.c | 336 +++++ + drivers/soc/qcom/pmic_glink_altmode.c | 478 +++++++ + drivers/soc/qcom/qcom_stats.c | 10 +- + drivers/soc/qcom/ramp_controller.c | 343 +++++ + drivers/soc/qcom/rmtfs_mem.c | 31 +- + drivers/soc/qcom/rpmhpd.c | 34 + + drivers/soc/qcom/rpmpd.c | 18 - + drivers/soc/qcom/smd-rpm.c | 1 + + drivers/soc/qcom/socinfo.c | 112 +- + drivers/soc/renesas/Kconfig | 4 + + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/pwc-rzv2m.c | 141 ++ + drivers/soc/renesas/r8a779g0-sysc.c | 1 + + drivers/soc/sifive/Kconfig | 2 +- + drivers/soc/starfive/Kconfig | 12 + + drivers/soc/starfive/Makefile | 3 + + drivers/soc/starfive/jh71xx_pmu.c | 383 ++++++ + drivers/soc/sunxi/Kconfig | 9 + + drivers/soc/sunxi/Makefile | 1 + + drivers/soc/sunxi/sun20i-ppu.c | 207 +++ + drivers/soc/sunxi/sunxi_sram.c | 3 + + drivers/soc/xilinx/xlnx_event_manager.c | 4 +- + drivers/soc/xilinx/zynqmp_pm_domains.c | 2 +- + drivers/spi/spi-rpc-if.c | 14 +- + drivers/thermal/qcom/lmh.c | 2 +- + drivers/ufs/host/ufs-qcom-ice.c | 2 +- + fs/debugfs/file.c | 1 + + include/dt-bindings/arm/qcom,ids.h | 83 ++ + include/dt-bindings/firmware/qcom,scm.h | 16 + + .../dt-bindings/power/allwinner,sun20i-d1-ppu.h | 10 + + include/dt-bindings/power/mediatek,mt8188-power.h | 44 + + include/dt-bindings/power/qcom-rpmpd.h | 30 +- + include/dt-bindings/power/r8a779g0-sysc.h | 1 + + include/dt-bindings/power/starfive,jh7110-pmu.h | 17 + + include/dt-bindings/reset/mt8195-resets.h | 45 + + include/linux/{ => firmware/qcom}/qcom_scm.h | 6 +- + include/linux/firmware/xlnx-zynqmp.h | 4 + + include/linux/scmi_protocol.h | 5 - + include/linux/soc/apple/rtkit.h | 26 + + include/linux/soc/mediatek/infracfg.h | 121 ++ + include/linux/soc/mediatek/mtk-mmsys.h | 25 + + include/linux/soc/qcom/apr.h | 2 +- + include/linux/soc/qcom/pmic_glink.h | 32 + + include/memory/renesas-rpc-if.h | 34 +- + include/trace/events/scmi.h | 18 +- + sound/soc/qcom/qdsp6/q6core.c | 4 +- + 157 files changed, 10368 insertions(+), 1337 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-driver-dcc + create mode 100644 Documentation/ABI/testing/debugfs-scmi + create mode 100644 Documentation/ABI/testing/debugfs-scmi-raw + create mode 100644 Documentation/devicetree/bindings/firmware/amlogic,meson-gxbb-sm.yaml + delete mode 100644 Documentation/devicetree/bindings/firmware/meson/meson_sm.txt + create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt6357.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/qcom-rpm.txt + create mode 100644 Documentation/devicetree/bindings/power/allwinner,sun20i-d1-ppu.yaml + create mode 100644 Documentation/devicetree/bindings/power/starfive,jh7110-pmu.yaml + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/mediatek/pwrap.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,dcc.yaml + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,msm8976-ramp-controller.yaml + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,pmic-glink.yaml + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,rpm.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 drivers/firmware/arm_scmi/raw_mode.c + create mode 100644 drivers/firmware/arm_scmi/raw_mode.h + create mode 100644 drivers/power/supply/qcom_battmgr.c + create mode 100644 drivers/soc/mediatek/mt8188-mmsys.h + create mode 100644 drivers/soc/mediatek/mt8188-pm-domains.h + create mode 100644 drivers/soc/mediatek/mtk-regulator-coupler.c + create mode 100644 drivers/soc/nuvoton/Kconfig + create mode 100644 drivers/soc/nuvoton/Makefile + create mode 100644 drivers/soc/nuvoton/wpcm450-soc.c + create mode 100644 drivers/soc/qcom/pmic_glink.c + create mode 100644 drivers/soc/qcom/pmic_glink_altmode.c + create mode 100644 drivers/soc/qcom/ramp_controller.c + create mode 100644 drivers/soc/renesas/pwc-rzv2m.c + create mode 100644 drivers/soc/starfive/Kconfig + create mode 100644 drivers/soc/starfive/Makefile + create mode 100644 drivers/soc/starfive/jh71xx_pmu.c + create mode 100644 drivers/soc/sunxi/sun20i-ppu.c + create mode 100644 include/dt-bindings/firmware/qcom,scm.h + create mode 100644 include/dt-bindings/power/allwinner,sun20i-d1-ppu.h + create mode 100644 include/dt-bindings/power/mediatek,mt8188-power.h + create mode 100644 include/dt-bindings/power/starfive,jh7110-pmu.h + rename include/linux/{ => firmware/qcom}/qcom_scm.h (96%) + create mode 100644 include/linux/soc/qcom/pmic_glink.h +Merging amlogic/for-next (b6520fc7ee57 Merge branch 'v6.2/fixes' 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 (22991d8d5725 soc: apple: rtkit: Add register dump decoding to crashlog) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Already up to date. +Merging aspeed/for-next (52dfcf784bbf soc: nuvoton: Add SoC info driver for WPCM450) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging drivers/soc/Kconfig +Auto-merging drivers/soc/Makefile +Merge made by the 'ort' strategy. +Merging at91/at91-next (05ccf9c9c2fc Merge branch 'at91-dt' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. +Merging broadcom/next (b691373a1bec Merge branch 'devicetree/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm47622.dtsi | 18 ++++++++++++++++++ + arch/arm/boot/dts/bcm63138.dtsi | 18 ++++++++++++++++++ + arch/arm/boot/dts/bcm63148.dtsi | 18 ++++++++++++++++++ + arch/arm/boot/dts/bcm63178.dtsi | 19 +++++++++++++++++++ + arch/arm/boot/dts/bcm6756.dtsi | 19 +++++++++++++++++++ + arch/arm/boot/dts/bcm6846.dtsi | 18 ++++++++++++++++++ + arch/arm/boot/dts/bcm6855.dtsi | 19 +++++++++++++++++++ + arch/arm/boot/dts/bcm6878.dtsi | 19 +++++++++++++++++++ + arch/arm/boot/dts/bcm947622.dts | 4 ++++ + arch/arm/boot/dts/bcm963138.dts | 4 ++++ + arch/arm/boot/dts/bcm963138dvt.dts | 4 ++++ + arch/arm/boot/dts/bcm963148.dts | 4 ++++ + arch/arm/boot/dts/bcm963178.dts | 4 ++++ + arch/arm/boot/dts/bcm96756.dts | 4 ++++ + arch/arm/boot/dts/bcm96846.dts | 4 ++++ + arch/arm/boot/dts/bcm96855.dts | 4 ++++ + arch/arm/boot/dts/bcm96878.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm4908.dtsi | 18 ++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm4912.dtsi | 20 ++++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm63146.dtsi | 19 +++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm63158.dtsi | 19 +++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm6813.dtsi | 20 ++++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm6856.dtsi | 18 ++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm6858.dtsi | 18 ++++++++++++++++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm94908.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm94912.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm963146.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm963158.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm96813.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm96856.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/bcmbca/bcm96858.dts | 4 ++++ + arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 2 +- + drivers/bus/brcmstb_gisb.c | 4 +--- + 33 files changed, 346 insertions(+), 4 deletions(-) +Merging davinci/davinci/for-next (c9c3395d5e3d Linux 6.2) +$ 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 (957b573ea840 Merge branch 'mem-ctrl-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. +Merging imx-mxs/for-next (fd5368f6f08b 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 (74ba8bb2bfb2 Merge branch 'v6.2-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (b80b042da860 Merge branch 'mvebu/fixes' 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 (f68a6fc58073 Merge branch 'omap-for-v6.3/cleanup' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (e34ca36eb310 Merge branches 'arm64-defconfig-for-6.3', 'arm64-for-6.3', 'clk-for-6.3', 'drivers-for-6.3' and 'dts-for-6.3' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Merge made by the 'ort' strategy. +Merging renesas/next (8dd3dae1705b Merge branches 'renesas-arm-defconfig-for-v6.3', 'renesas-drivers-for-v6.3', 'renesas-dt-bindings-for-v6.3' and 'renesas-dts-for-v6.3' 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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (cc2b5be472c0 Merge branch 'v6.3-armsoc/dts32' 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. + drivers/clk/rockchip/clk-rk3399.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging samsung-krzk/for-next (dd3d835d31ed Merge branch 'fixes' 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 (6d796c50f84c Linux 6.2-rc6) +$ 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 stm32/stm32-next (4e74ad9f3af6 ARM: configs: multi_v7: enable NVMEM driver for STM32) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'ort' strategy. +Merging sunxi/sunxi/for-next (caea0128c038 Merge branch 'sunxi/dt-for-6.3' 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 (816477edfba6 mm: Remove get_kernel_pages()) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Already up to date. +Merging tegra/for-next (de98d45290c7 Merge branch for-6.3/arm64/dt into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. +Merging ti/ti-next (47d72bbb6c0f arm64: dts: ti: Makefile: Rearrange entries alphabetically) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date. +Merging xilinx/for-next (a18426505c2b Merge remote-tracking branch 'git/zynqmp/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. +Merging clk/clk-next (b64baafa24d2 Merge branches 'clk-loongson' and 'clk-qcom' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (4e197ee880c2 clk: imx6ul: add ethernet refclock mux support) +$ 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 (b1dec4e78599 clk: renesas: rcar-gen3: Disable R-Car H3 ES1.*) +$ 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 clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (4a3ec00957fd csky: delay: Add function alignment) +$ 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/lib/delay.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging loongarch/loongarch-next (8883bf83127d selftests/ftrace: Add LoongArch kprobe args string tests support) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging arch/loongarch/kernel/vmlinux.lds.S +Auto-merging include/uapi/linux/elf.h +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Merge made by the 'ort' strategy. + arch/loongarch/Kconfig | 65 ++- + arch/loongarch/Makefile | 14 +- + arch/loongarch/configs/loongson3_defconfig | 1 + + arch/loongarch/include/asm/addrspace.h | 2 + + arch/loongarch/include/asm/asm.h | 10 + + arch/loongarch/include/asm/asmmacro.h | 17 + + arch/loongarch/include/asm/cpu.h | 2 +- + arch/loongarch/include/asm/hw_breakpoint.h | 145 ++++++ + arch/loongarch/include/asm/inst.h | 58 +++ + arch/loongarch/include/asm/kprobes.h | 61 +++ + arch/loongarch/include/asm/loongarch.h | 35 +- + arch/loongarch/include/asm/processor.h | 16 +- + arch/loongarch/include/asm/ptrace.h | 39 ++ + arch/loongarch/include/asm/setup.h | 16 + + arch/loongarch/include/asm/stackframe.h | 13 +- + arch/loongarch/include/asm/switch_to.h | 1 + + arch/loongarch/include/asm/uaccess.h | 1 - + arch/loongarch/include/uapi/asm/ptrace.h | 9 + + arch/loongarch/kernel/Makefile | 9 +- + arch/loongarch/kernel/entry.S | 91 ++-- + arch/loongarch/kernel/ftrace_dyn.c | 64 +++ + arch/loongarch/kernel/genex.S | 8 +- + arch/loongarch/kernel/head.S | 33 +- + arch/loongarch/kernel/hw_breakpoint.c | 548 +++++++++++++++++++++ + arch/loongarch/kernel/inst.c | 123 +++++ + arch/loongarch/kernel/kprobes.c | 406 +++++++++++++++ + arch/loongarch/kernel/kprobes_trampoline.S | 96 ++++ + arch/loongarch/kernel/process.c | 7 + + arch/loongarch/kernel/ptrace.c | 472 ++++++++++++++++++ + arch/loongarch/kernel/relocate.c | 242 +++++++++ + arch/loongarch/kernel/setup.c | 14 +- + arch/loongarch/kernel/time.c | 11 +- + arch/loongarch/kernel/traps.c | 68 ++- + arch/loongarch/kernel/vmlinux.lds.S | 20 +- + arch/loongarch/lib/memcpy.S | 3 + + arch/loongarch/lib/memmove.S | 4 + + arch/loongarch/lib/memset.S | 3 + + arch/loongarch/mm/fault.c | 3 + + arch/loongarch/mm/tlbex.S | 17 +- + arch/loongarch/power/suspend_asm.S | 5 +- + include/uapi/linux/elf.h | 2 + + samples/kprobes/kprobe_example.c | 8 + + .../arch/loongarch/include/uapi/asm/bitsperlong.h | 9 + + tools/scripts/Makefile.arch | 11 +- + .../ftrace/test.d/kprobe/kprobe_args_string.tc | 3 + + .../ftrace/test.d/kprobe/kprobe_args_syntax.tc | 4 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 6 + + 47 files changed, 2665 insertions(+), 130 deletions(-) + create mode 100644 arch/loongarch/include/asm/hw_breakpoint.h + create mode 100644 arch/loongarch/include/asm/kprobes.h + create mode 100644 arch/loongarch/kernel/hw_breakpoint.c + create mode 100644 arch/loongarch/kernel/kprobes.c + create mode 100644 arch/loongarch/kernel/kprobes_trampoline.S + create mode 100644 arch/loongarch/kernel/relocate.c + create mode 100644 tools/arch/loongarch/include/uapi/asm/bitsperlong.h +Merging m68k/for-next (1e5b5df65af9 m68k: /proc/hardware should depend on PROC_FS) +$ 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 (5aa52ccf692b m68k: nommu: Fix misspellings of "DragonEngine") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/68000/dragen2.c | 2 +- + arch/m68k/Kconfig.machine | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging microblaze/next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (91dc288f4edf MIPS: vpe-mt: drop physical_memsize) +$ 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 (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (3125e3b8f24c parisc: update kbuild doc. aliases for parisc64) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Auto-merging Documentation/kbuild/kbuild.rst +Auto-merging arch/Kconfig +Merge made by the 'ort' strategy. + Documentation/kbuild/kbuild.rst | 1 + + arch/Kconfig | 10 ++++++++++ + arch/parisc/include/asm/cacheflush.h | 3 +++ + arch/parisc/include/asm/kgdb.h | 2 ++ + arch/parisc/kernel/cache.c | 7 ++++++- + fs/readdir.c | 18 ++++++++++++++++++ + 6 files changed, 40 insertions(+), 1 deletion(-) +Merging powerpc/next (f82cdc37c4bd powerpc/pseries: Avoid hcall in plpks_is_available() on non-pseries) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +Merging soc-fsl/next (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (eb9be8310c58 RISC-V: add a spin_shadow_stack declaration) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging riscv-dt/riscv-dt-for-next (d9c36d016f61 Merge patch series "Add a devicetree for the Aldec PolarFire SoC TySoM") +$ 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 (f3460326e38d Merge patch series "JH7110 PMU Support") +$ 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 (bcf5470eb4a1 Merge tag 's390-6.3-1' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Already up to date. +Merging uml/next (04df97e150c8 Documentation: rust: Fix arch support table) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Auto-merging arch/x86/Makefile.um +Auto-merging fs/hostfs/hostfs_kern.c +Merge made by the 'ort' strategy. + Documentation/rust/arch-support.rst | 2 + + arch/um/Kconfig | 7 ++ + arch/um/Makefile | 7 +- + arch/um/drivers/Kconfig | 2 + + arch/um/drivers/pcap_kern.c | 4 +- + arch/um/drivers/vector_kern.c | 1 + + arch/um/drivers/vector_user.h | 2 - + arch/um/drivers/virt-pci.c | 139 ++++++++++++++++++++++++++++++-- + arch/um/drivers/virtio_uml.c | 20 ++++- + arch/um/include/asm/processor-generic.h | 2 +- + arch/um/kernel/exec.c | 4 +- + arch/um/kernel/tlb.c | 6 +- + arch/um/kernel/um_arch.c | 2 +- + arch/um/kernel/vmlinux.lds.S | 2 +- + arch/um/os-Linux/irq.c | 4 +- + arch/um/os-Linux/skas/mem.c | 19 ++--- + arch/um/os-Linux/skas/process.c | 121 ++++++++++++++------------- + arch/x86/Makefile.um | 6 ++ + arch/x86/um/vdso/Makefile | 2 +- + arch/x86/um/vdso/um_vdso.c | 12 ++- + fs/hostfs/hostfs_kern.c | 15 ++-- + 21 files changed, 268 insertions(+), 111 deletions(-) +Merging xtensa/xtensa-for-next (4414c1f5c7a3 xtensa: drop unused members of struct thread_struct) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (2372745ea25a selftests: add tests for prctl(SET_HIDE_SELF_EXE)) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Auto-merging fs/exec.c +Auto-merging fs/proc/base.c +Auto-merging include/linux/sched.h +Auto-merging include/uapi/linux/prctl.h +Auto-merging kernel/sys.c +Merge made by the 'ort' strategy. + fs/exec.c | 1 + + fs/proc/base.c | 4 + + include/linux/sched.h | 5 ++ + include/uapi/linux/prctl.h | 3 + + kernel/sys.c | 9 ++ + tools/include/uapi/linux/prctl.h | 3 + + tools/testing/selftests/prctl/Makefile | 2 +- + tools/testing/selftests/prctl/hide-self-exe.c | 114 ++++++++++++++++++++++++++ + 8 files changed, 140 insertions(+), 1 deletion(-) + create mode 100644 tools/testing/selftests/prctl/hide-self-exe.c +$ git am -3 ../patches/0001-mm-fixup-for-mm-implement-memory-deny-write-execute-.patch +Applying: mm: fixup for "mm: implement memory-deny-write-execute as a prctl" +$ git reset HEAD^ +Unstaged changes after reset: +M include/uapi/linux/prctl.h +$ git add -A . +$ git commit -v -a --amend +[master 97c704057560] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git + Date: Mon Feb 27 09:18:29 2023 +1100 +Merging vfs-idmapping/for-next (9db35c4c2bc4 Merge branch 'fs.misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Merge made by the 'ort' strategy. +Merging fscrypt/for-next (097d7c1fcb8d fscrypt: clean up fscrypt_add_test_dummy_key()) +$ 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 fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +Merging afs/afs-next (a9eb558a5bea afs: Stop implementing ->writepage()) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (80d1eec6927a Merge branch 'for-next-current-v6.2-20230221' into for-next-20230221) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. +Merging ceph/master (f7c4d9b133c7 rbd: avoid use-after-free in do_rbd_add() when rbd_dev_create() fails) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Auto-merging drivers/block/rbd.c +Auto-merging fs/ceph/file.c +Merge made by the 'ort' strategy. + drivers/block/rbd.c | 20 +++++++++----------- + fs/ceph/file.c | 8 ++++++++ + 2 files changed, 17 insertions(+), 11 deletions(-) +Merging cifs/for-next (fe3130bc4df0 cifs: reuse cifs_match_ipaddr for comparison of dstaddr too) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging fs/cifs/file.c +Merge made by the 'ort' strategy. + fs/cifs/connect.c | 31 ++++--------------------------- + fs/cifs/file.c | 6 ++++++ + fs/cifs/smbdirect.c | 2 +- + 3 files changed, 11 insertions(+), 28 deletions(-) +Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (c1cc2db21607 ecryptfs: keystore: Fix typo 'the the' in comment) +$ 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 +Merge made by the 'ort' strategy. + fs/ecryptfs/crypto.c | 8 ++++---- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/read_write.c | 8 ++++---- + 3 files changed, 9 insertions(+), 9 deletions(-) +Merging erofs/dev (8d1b80a79452 erofs: fix an error code in z_erofs_init_zip_subsystem()) +$ 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 (5742d6a467d1 exfat: handle unreconized benign secondary entries) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Auto-merging fs/exfat/exfat_fs.h +Auto-merging fs/exfat/file.c +Auto-merging fs/exfat/namei.c +Merge made by the 'ort' strategy. + fs/exfat/dir.c | 90 ++++++++++++++++++++++++++++++++++------------------ + fs/exfat/exfat_fs.h | 4 ++- + fs/exfat/exfat_raw.h | 21 ++++++++++++ + fs/exfat/file.c | 3 +- + fs/exfat/inode.c | 6 ++-- + fs/exfat/namei.c | 2 +- + fs/exfat/super.c | 3 +- + 7 files changed, 89 insertions(+), 40 deletions(-) +Merging ext3/for_next (90e4f9e49826 Pull udf fixup for syzbot allocation failure handling bug.) +$ 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 (2c2dec1e86cc ext4: fix incorrect options show of original mount_opt and extend mount_opt2) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/file.c +Auto-merging fs/ext4/inode.c +CONFLICT (content): Merge conflict in fs/ext4/inode.c +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/super.c +Auto-merging fs/ext4/xattr.c +Recorded preimage for 'fs/ext4/inode.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git merge --abort +$ git diff -M --stat --summary HEAD^.. + +Merging f2fs/dev (ddf1eca4fc5a f2fs: drop unnecessary arg for f2fs_ioc_*()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging MAINTAINERS +Auto-merging fs/f2fs/checkpoint.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +CONFLICT (content): Merge conflict in fs/f2fs/file.c +Auto-merging fs/f2fs/namei.c +CONFLICT (content): Merge conflict in fs/f2fs/namei.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/f2fs/verity.c +Resolved 'fs/f2fs/file.c' using previous resolution. +Resolved 'fs/f2fs/namei.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cdf29352c04a] Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-fs-f2fs | 80 +++- + Documentation/filesystems/f2fs.rst | 2 +- + MAINTAINERS | 1 + + fs/f2fs/checkpoint.c | 37 +- + fs/f2fs/compress.c | 24 +- + fs/f2fs/data.c | 624 ++++++++++++++++---------------- + fs/f2fs/debug.c | 64 +++- + fs/f2fs/dir.c | 4 +- + fs/f2fs/extent_cache.c | 60 ++- + fs/f2fs/f2fs.h | 128 +++---- + fs/f2fs/file.c | 173 ++++----- + fs/f2fs/gc.c | 22 +- + fs/f2fs/gc.h | 2 +- + fs/f2fs/inline.c | 14 +- + fs/f2fs/inode.c | 78 ++-- + fs/f2fs/iostat.c | 186 +++++----- + fs/f2fs/iostat.h | 19 +- + fs/f2fs/namei.c | 5 +- + fs/f2fs/node.c | 9 +- + fs/f2fs/segment.c | 225 ++++++------ + fs/f2fs/segment.h | 41 ++- + fs/f2fs/super.c | 63 ++-- + fs/f2fs/sysfs.c | 49 ++- + fs/f2fs/verity.c | 2 +- + include/linux/f2fs_fs.h | 2 +- + include/trace/events/f2fs.h | 104 ++++-- + 26 files changed, 1090 insertions(+), 928 deletions(-) +Merging fsverity/for-next (51e4e3153ebc fscrypt: support decrypting data from large folios) +$ 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 (1cc4606d19e3 fuse: add inode/permission checks to fileattr_get/fileattr_set) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/file.c +CONFLICT (content): Merge conflict in fs/fuse/file.c +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/ioctl.c +Resolved 'fs/fuse/file.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0d1983b60e1c] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git +$ git diff -M --stat --summary HEAD^.. + fs/fuse/cuse.c | 2 +- + fs/fuse/dev.c | 4 +- + fs/fuse/dir.c | 126 +++++++++++++++++++++++++++++++++++----------- + fs/fuse/file.c | 91 +++++++++++++++++++++++---------- + fs/fuse/fuse_i.h | 9 +++- + fs/fuse/inode.c | 4 +- + fs/fuse/ioctl.c | 6 +++ + include/uapi/linux/fuse.h | 45 ++++++++++++++++- + 8 files changed, 225 insertions(+), 62 deletions(-) +Merging gfs2/for-next (c1b0c3cfcbad gfs2: Convert gfs2_page_add_databufs to folios) +$ 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 (a60dca73a1a8 jfs: makes diUnmount/diMount in jfs_mount_rw atomic) +$ 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 (25ac8c12ff78 Merge tag '6.3-rc-ksmbd-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 (c9c3395d5e3d Linux 6.2) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (1683ed16ff1a fs/nfs: Replace kmap_atomic() with kmap_local_page() in dir.c) +$ 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 (4b471a8b847b NFSD: Clean up nfsd_symlink()) +$ 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 (2024476646ed fs/ntfs3: Fix root inode checking) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/file.c +CONFLICT (content): Merge conflict in fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +CONFLICT (content): Merge conflict in fs/ntfs3/inode.c +Auto-merging fs/ntfs3/namei.c +Auto-merging fs/ntfs3/ntfs_fs.h +CONFLICT (content): Merge conflict in fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/xattr.c +CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c +Resolved 'fs/ntfs3/file.c' using previous resolution. +Resolved 'fs/ntfs3/inode.c' using previous resolution. +Resolved 'fs/ntfs3/ntfs_fs.h' using previous resolution. +Resolved 'fs/ntfs3/xattr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6dc35f4eb457] Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ntfs3.rst | 11 -- + fs/ntfs3/attrib.c | 17 +- + fs/ntfs3/bitmap.c | 25 +-- + fs/ntfs3/file.c | 50 +++--- + fs/ntfs3/frecord.c | 46 +++--- + fs/ntfs3/fslog.c | 83 +++++----- + fs/ntfs3/fsntfs.c | 84 +++++----- + fs/ntfs3/index.c | 81 +++++++--- + fs/ntfs3/inode.c | 134 +++++++++------- + fs/ntfs3/lznt.c | 10 +- + fs/ntfs3/namei.c | 19 ++- + fs/ntfs3/ntfs.h | 3 - + fs/ntfs3/ntfs_fs.h | 17 +- + fs/ntfs3/record.c | 15 +- + fs/ntfs3/run.c | 6 +- + fs/ntfs3/super.c | 312 +++++++++++++++++++++--------------- + fs/ntfs3/xattr.c | 70 +++----- + 17 files changed, 527 insertions(+), 456 deletions(-) +Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) +$ 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 (4f11ada10d0a ovl: fail on invalid uid/gid mapping at copy up) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (8fcf2d012c86 ubi: block: Fix a possible use-after-free bug in ubiblock_create()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging fs/jffs2/fs.c +Auto-merging fs/ubifs/dir.c +Auto-merging fs/ubifs/file.c +Auto-merging fs/ubifs/ubifs.h +Merge made by the 'ort' strategy. + drivers/mtd/ubi/block.c | 109 ++++++++++++++----------------------------- + drivers/mtd/ubi/build.c | 32 +++++++++++-- + drivers/mtd/ubi/debug.c | 19 ++++---- + drivers/mtd/ubi/eba.c | 2 +- + drivers/mtd/ubi/fastmap-wl.c | 12 +++-- + drivers/mtd/ubi/fastmap.c | 2 +- + drivers/mtd/ubi/kapi.c | 1 + + drivers/mtd/ubi/misc.c | 2 +- + drivers/mtd/ubi/vmt.c | 18 +++---- + drivers/mtd/ubi/wl.c | 27 +++++++++-- + fs/jffs2/compr.c | 50 +++++++++++--------- + fs/jffs2/compr.h | 26 ++++++++--- + fs/jffs2/file.c | 15 +++--- + fs/jffs2/fs.c | 2 +- + fs/ubifs/budget.c | 9 ++-- + fs/ubifs/dir.c | 18 ++++++- + fs/ubifs/file.c | 31 ++++++++---- + fs/ubifs/io.c | 6 +-- + fs/ubifs/journal.c | 8 +++- + fs/ubifs/super.c | 17 +++++-- + fs/ubifs/sysfs.c | 6 ++- + fs/ubifs/tnc.c | 24 +++++++++- + fs/ubifs/ubifs.h | 5 ++ + include/linux/mtd/ubi.h | 1 + + 24 files changed, 274 insertions(+), 168 deletions(-) +Merging v9fs/9p-next (4ec5183ec486 Linux 6.2-rc7) +$ 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 (89c58cb395ec fs/9p: fix error reporting in v9fs_dir_release) +$ 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 +Auto-merging fs/9p/vfs_file.c +Auto-merging fs/9p/vfs_inode.c +Auto-merging fs/9p/vfs_inode_dotl.c +Auto-merging net/9p/trans_xen.c +Merge made by the 'ort' strategy. + fs/9p/v9fs.c | 2 +- + fs/9p/vfs_addr.c | 2 -- + fs/9p/vfs_dir.c | 7 ++++--- + fs/9p/vfs_file.c | 7 ++++--- + fs/9p/vfs_inode.c | 3 +-- + fs/9p/vfs_inode_dotl.c | 7 ++++--- + net/9p/client.c | 8 ++++++-- + net/9p/trans_rdma.c | 15 ++++++++++++--- + net/9p/trans_xen.c | 48 +++++++++++++++++++++++++++++++----------------- + 9 files changed, 63 insertions(+), 36 deletions(-) +Merging xfs/for-next (60b730a40c43 xfs: fix uninitialized variable access) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/xfs_inode.c +Merge made by the 'ort' strategy. + fs/xfs/libxfs/xfs_ag.c | 93 ++++- + fs/xfs/libxfs/xfs_ag.h | 111 +++++- + fs/xfs/libxfs/xfs_ag_resv.c | 2 +- + fs/xfs/libxfs/xfs_alloc.c | 683 +++++++++++++++++++++++-------------- + fs/xfs/libxfs/xfs_alloc.h | 61 ++-- + fs/xfs/libxfs/xfs_alloc_btree.c | 2 +- + fs/xfs/libxfs/xfs_bmap.c | 664 +++++++++++++++++------------------ + fs/xfs/libxfs/xfs_bmap.h | 7 + + fs/xfs/libxfs/xfs_bmap_btree.c | 64 ++-- + fs/xfs/libxfs/xfs_btree.c | 2 +- + fs/xfs/libxfs/xfs_ialloc.c | 241 ++++++------- + fs/xfs/libxfs/xfs_ialloc.h | 5 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 47 ++- + fs/xfs/libxfs/xfs_ialloc_btree.h | 20 +- + fs/xfs/libxfs/xfs_refcount_btree.c | 10 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 2 +- + fs/xfs/libxfs/xfs_sb.c | 3 +- + fs/xfs/scrub/agheader_repair.c | 35 +- + fs/xfs/scrub/bmap.c | 2 +- + fs/xfs/scrub/common.c | 21 +- + fs/xfs/scrub/fscounters.c | 13 +- + fs/xfs/scrub/repair.c | 7 +- + fs/xfs/xfs_bmap_util.c | 2 +- + fs/xfs/xfs_discard.c | 50 ++- + fs/xfs/xfs_filestream.c | 455 ++++++++++++------------ + fs/xfs/xfs_filestream.h | 6 +- + fs/xfs/xfs_fsmap.c | 5 +- + fs/xfs/xfs_icache.c | 8 +- + fs/xfs/xfs_inode.c | 2 +- + fs/xfs/xfs_iwalk.c | 10 +- + fs/xfs/xfs_mount.h | 3 +- + fs/xfs/xfs_reflink.c | 4 +- + fs/xfs/xfs_super.c | 47 +-- + fs/xfs/xfs_trace.h | 81 ++--- + fs/xfs/xfs_trans.c | 8 +- + fs/xfs/xfs_trans.h | 2 +- + 36 files changed, 1535 insertions(+), 1243 deletions(-) +Merging zonefs/for-next (2b188a2cfc4d zonefs: make kobj_type structure constant) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (471859f57d42 iomap: Rename page_ops to folio_ops) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (eca3a04f140a Merge tag 'dlm-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging iversion/iversion-next (eca3a04f140a Merge tag 'dlm-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm) +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Already up to date. +Merging vfs/for-next (e9f33f8668ab Merge branches 'work.misc', 'work.namespace', 'work.alpha', 'work.minix' and 'work.sysv' 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 +Merge made by the 'ort' strategy. +Merging printk/for-next (10d639febe56 Merge branch 'for-6.3' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. +Merging pci/next (3eb5d0f26f4e 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 +Already up to date. +Merging pstore/for-next/pstore (88603b6dc419 Linux 6.2-rc2) +$ 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 +Already up to date. +Merging hid/for-next (10635598711e Merge branch 'for-6.3/upstream-fixes' 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. + drivers/hid/hid-core.c | 32 +++++++++++++++++++++++++------- + drivers/hid/hid-cp2112.c | 1 + + drivers/hid/uhid.c | 1 + + include/linux/hid.h | 3 +++ + tools/testing/selftests/hid/config | 1 + + 5 files changed, 31 insertions(+), 7 deletions(-) +Merging i2c/i2c/for-next (dc67b2d90438 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 i3c/i3c/next (07eac9c306a0 i3c: update dw-i3c-master i3c_clk_cfg function) +$ 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 drivers/i3c/master.c +Merge made by the 'ort' strategy. + drivers/i3c/master.c | 1 + + drivers/i3c/master/dw-i3c-master.c | 5 +++-- + 2 files changed, 4 insertions(+), 2 deletions(-) +Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) +$ 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 (58326709e8f8 hwmon: (nzxt-smart2) add another USB ID) +$ 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 (27a6e6b25016 Merge branch 'docs-mw' into docs-next) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/process/submitting-patches.rst +Merge made by the 'ort' strategy. + Documentation/index.rst | 17 +++---- + Documentation/locking/locktorture.rst | 4 +- + Documentation/process/5.Posting.rst | 3 +- + Documentation/process/submitting-patches.rst | 9 ++-- + Documentation/translations/sp_SP/process/index.rst | 1 + + .../sp_SP/process/programming-language.rst | 53 ++++++++++++++++++++++ + 6 files changed, 72 insertions(+), 15 deletions(-) + create mode 100644 Documentation/translations/sp_SP/process/programming-language.rst +Merging v4l-dvb/master (3e62aba8284d media: imx-mipi-csis: Check csis_fmt validity before use) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Already up to date. +Merging v4l-dvb-next/master (3e62aba8284d media: imx-mipi-csis: Check csis_fmt validity before use) +$ 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 (243d50840e68 Merge branches 'pm-cpufreq' and 'powercap' 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. + drivers/acpi/resource.c | 7 +++++++ + drivers/cpufreq/amd-pstate.c | 3 +-- + drivers/cpufreq/intel_pstate.c | 1 + + drivers/powercap/intel_rapl_msr.c | 2 ++ + kernel/sched/cpufreq_schedutil.c | 2 +- + 5 files changed, 12 insertions(+), 3 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (ba38f3cbe7db dt-bindings: opp: opp-v2-kryo-cpu: enlarge opp-supported-hw maximum) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (497e92ab8c8e PM / devfreq: Remove "select SRCU") +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/Kconfig | 1 - + 1 file changed, 1 deletion(-) +Merging opp/opp/linux-next (eca4c0eea534 OPP: fix error checking in opp_migrate_dentry()) +$ 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 (6828e402d06f thermal/drivers/st: Remove syscfg based driver) +$ 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 dlm/next (723b197bbdf1 fs: dlm: remove unnecessary waker_up() calls) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (66fb1d5df6ac IB/mlx5: Extend debug control for CC parameters) +$ 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 (5b7c4cabbb65 Merge tag 'net-next-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (5b7c4cabbb65 Merge tag 'net-next-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Already up to date. +Merging ipsec-next/master (75da437a2f17 Merge branch '40GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) +$ 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 (22551e77e550 net/mlx5: Configure IPsec steering for egress RoCEv2 traffic) +$ 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/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/master (3fcdf2dfefb6 net: bcmgenet: Support wake-up from s2idle) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging bluetooth/master (fbfd2d6d43f8 Bluetooth: btrtl: Add support for RTL8852BS) +$ 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. + .../devicetree/bindings/net/marvell-bluetooth.yaml | 20 ++++- + drivers/bluetooth/btrtl.c | 10 +++ + drivers/bluetooth/btusb.c | 10 +-- + drivers/bluetooth/hci_mrvl.c | 90 +++++++++++++++++++--- + include/net/bluetooth/mgmt.h | 80 +++++++++---------- + net/bluetooth/hci_sync.c | 64 ++++++++++----- + 6 files changed, 196 insertions(+), 78 deletions(-) +Merging wireless-next/for-next (38ae31922969 wifi: rtl8xxxu: add LEDS_CLASS dependency) +$ 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 mtd/mtd/next (84549c816dc3 mtd: parsers: ofpart: add workaround for #size-cells 0) +$ 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 (ef3e6327ff04 mtd: rawnand: sunxi: Precompute the ECC_CTL register value) +$ 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 (f047382519ca Merge tag 'mtd/fixes-for-6.2-rc4' into spi-nor/next) +$ 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 (8b8447531864 crypto: x86/aria-avx - Do not use avx2 instructions) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (a48bba98380c msm/fbdev: fix unused variable warning with clang.) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (e034b8a18d4b drm/msm: Fix possible uninitialized access in fbdev) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/msm/msm_fbdev.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/msm/msm_fbdev.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging amdgpu/drm-next (4f101d5710a8 drm/amd/display: Remove unused local variables and function) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_events.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/Kconfig | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 11 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 23 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 23 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 83 ++++++--- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 207 ++++++++++++++++++--- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 26 +-- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v11.c | 15 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 8 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 10 +- + drivers/gpu/drm/amd/display/Kconfig | 1 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 10 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 6 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn201/dcn201_dpp.c | 7 - + .../gpu/drm/amd/display/dc/dcn201/dcn201_hwseq.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_afmt.c | 2 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 4 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 3 - + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_apg.c | 41 ---- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 5 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 4 - + .../display/dc/dml/dcn31/display_rq_dlg_calc_31.c | 2 - + .../gpu/drm/amd/display/dc/link/link_detection.c | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 15 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/smu_v12_0.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 25 ++- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 1 + + drivers/gpu/drm/radeon/atombios_encoders.c | 5 +- + include/uapi/drm/amdgpu_drm.h | 11 ++ + 47 files changed, 419 insertions(+), 210 deletions(-) +Merging drm-intel/for-linux-next (5d2fdb255c52 Merge tag 'gvt-next-fixes-2023-02-23' of https://github.com/intel/gvt-linux into drm-intel-next-fixes) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/Kconfig +Auto-merging drivers/gpu/drm/i915/gvt/firmware.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/Kconfig | 6 +++--- + drivers/gpu/drm/i915/display/intel_quirks.c | 2 ++ + drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 5 ++++- + drivers/gpu/drm/i915/gt/intel_ring.c | 6 +++--- + drivers/gpu/drm/i915/gvt/debugfs.c | 16 ++++++++-------- + drivers/gpu/drm/i915/gvt/firmware.c | 2 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- + drivers/gpu/drm/i915/gvt/vgpu.c | 2 +- + 8 files changed, 23 insertions(+), 18 deletions(-) +Merging drm-tegra/for-next (b9930311641c gpu: host1x: Fix uninitialized variable use) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Merge made by the 'ort' strategy. + drivers/gpu/host1x/dev.c | 5 ++--- + 1 file changed, 2 insertions(+), 3 deletions(-) +Merging drm-msm/msm-next (dbd7a2a941b8 PM / devfreq: Fix build issues with devfreq disabled) +$ 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 (1d233b1cb149 drm/msm/dpu: set pdpu->is_rt_pipe early in dpu_plane_sspp_atomic_update()) +$ 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 imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (4c22c61e429f drm/etnaviv: show number of NN cores in GPU debugfs info) +$ 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 (822242608545 fbdev: omapfb: cleanup inconsistent indentation) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Merge made by the 'ort' strategy. + drivers/video/fbdev/omap/omapfb_main.c | 30 +- + drivers/video/logo/pnmtologo.c | 674 ++++++++++++++++----------------- + 2 files changed, 353 insertions(+), 351 deletions(-) +Merging regmap/for-next (40f4b0586810 Merge remote-tracking branch 'regmap/for-6.3' 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 +Already up to date. +Merging sound/for-next (7933b90b4289 Merge branch 'for-linus' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging sound-asoc/for-next (54bc59d18178 Merge remote-tracking branch 'asoc/for-6.2' 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 (d6f55bb48579 module: make module_ktype structure constant) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging arch/alpha/kernel/module.c +CONFLICT (content): Merge conflict in arch/alpha/kernel/module.c +Auto-merging arch/x86/kernel/module.c +Auto-merging include/linux/module.h +Auto-merging kernel/module/kallsyms.c +Recorded preimage for 'arch/alpha/kernel/module.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/alpha/kernel/module.c'. +[master 9ab467426480] Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/arc/kernel/unwind.c | 12 +- + arch/arm/kernel/module-plts.c | 9 +- + arch/arm64/kernel/module-plts.c | 13 +- + arch/ia64/kernel/module.c | 24 +-- + arch/mips/kernel/vpe.c | 11 +- + arch/parisc/kernel/module.c | 51 ++---- + arch/powerpc/kernel/module_32.c | 7 +- + arch/s390/kernel/module.c | 26 +-- + arch/x86/kernel/callthunks.c | 4 +- + arch/x86/kernel/module.c | 4 +- + include/linux/module.h | 91 +++++++--- + kernel/module/internal.h | 40 ++--- + kernel/module/kallsyms.c | 58 +++--- + kernel/module/kdb.c | 17 +- + kernel/module/main.c | 380 ++++++++++++++++++++-------------------- + kernel/module/procfs.c | 16 +- + kernel/module/strict_rwx.c | 99 ++--------- + kernel/module/tree_lookup.c | 39 ++--- + kernel/params.c | 2 +- + 19 files changed, 429 insertions(+), 474 deletions(-) +Merging input/next (d5f7638eb5fe Input: matrix_keypad - replace header inclusions by forward declarations) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging arch/arm/mach-pxa/spitz.c +Merge made by the 'ort' strategy. + .../bindings/input/google,cros-ec-keyb.yaml | 2 +- + arch/arm/mach-pxa/spitz.c | 1 + + drivers/input/keyboard/gpio_keys.c | 3 + + drivers/input/misc/Kconfig | 11 ++ + drivers/input/misc/Makefile | 1 + + drivers/input/misc/hp_sdc_rtc.c | 2 +- + drivers/input/misc/nxp-bbnsm-pwrkey.c | 193 +++++++++++++++++++++ + include/linux/input/matrix_keypad.h | 5 +- + 8 files changed, 214 insertions(+), 4 deletions(-) + create mode 100644 drivers/input/misc/nxp-bbnsm-pwrkey.c +Merging block/for-next (e19493205f53 Merge branch 'io_uring-6.3' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging block/bio.c +Auto-merging block/blk-core.c +Auto-merging block/genhd.c +Auto-merging include/linux/blkdev.h +Auto-merging io_uring/io_uring.c +Merge made by the 'ort' strategy. + block/bio.c | 1 + + block/blk-core.c | 10 ++++++-- + block/blk-zoned.c | 10 -------- + block/blk.h | 2 +- + block/genhd.c | 37 ++++++++++++++++++++------- + block/ioctl.c | 13 +++++----- + block/sed-opal.c | 2 ++ + drivers/block/loop.c | 8 +++--- + drivers/block/ublk_drv.c | 3 --- + include/linux/blk-mq.h | 4 +-- + include/linux/blkdev.h | 7 +---- + include/linux/io_uring_types.h | 2 +- + include/uapi/linux/sed-opal.h | 1 + + io_uring/io_uring.c | 30 +++++++++++----------- + io_uring/kbuf.c | 2 +- + io_uring/net.c | 2 +- + io_uring/poll.c | 14 ++++++++-- + io_uring/poll.h | 1 + + io_uring/rsrc.c | 58 ++++++++++++++++++++++++++++++++---------- + io_uring/slist.h | 22 ---------------- + io_uring/tctx.c | 2 +- + kernel/trace/blktrace.c | 6 +---- + 22 files changed, 132 insertions(+), 105 deletions(-) +Merging device-mapper/for-next (d695e44157c8 dm: remove unnecessary (void*) conversion in event_callback()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (8844f0aa8dc4 ata: pata_parport: Fix ida_alloc return value error check) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Already up to date. +Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver) +$ 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 (571f235163ac mmc: meson-gx: Use devm_platform_get_and_ioremap_resource()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/mmc/host/Kconfig +Auto-merging drivers/mmc/host/Makefile +Resolved 'Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml' using previous resolution. +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2bbbf29cc663] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 2 +- + .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 76 +++++++++ + .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 39 ----- + .../bindings/mmc/amlogic,meson-mx-sdhc.yaml | 2 +- + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 6 +- + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 25 +-- + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 21 ++- + .../devicetree/bindings/mmc/fsl-imx-mmc.yaml | 2 +- + .../bindings/mmc/microchip,dw-sparx5-sdhci.yaml | 4 +- + .../devicetree/bindings/mmc/mmc-pwrseq-emmc.yaml | 2 +- + .../devicetree/bindings/mmc/mmc-pwrseq-sd8787.yaml | 2 +- + .../devicetree/bindings/mmc/mmc-pwrseq-simple.yaml | 2 +- + .../devicetree/bindings/mmc/mmc-spi-slot.yaml | 2 +- + Documentation/devicetree/bindings/mmc/mxs-mmc.yaml | 2 +- + .../bindings/mmc/nvidia,tegra20-sdhci.yaml | 34 ++-- + Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 2 +- + .../devicetree/bindings/mmc/renesas,mmcif.yaml | 2 +- + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 8 +- + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 3 +- + .../bindings/mmc/samsung,exynos-dw-mshc.yaml | 2 +- + .../devicetree/bindings/mmc/sdhci-msm.yaml | 4 + + .../devicetree/bindings/mmc/sdhci-pxa.yaml | 19 ++- + .../bindings/mmc/socionext,uniphier-sd.yaml | 10 ++ + .../bindings/mmc/starfive,jh7110-mmc.yaml | 77 +++++++++ + .../devicetree/bindings/mmc/sunplus,mmc.yaml | 2 +- + .../bindings/mmc/synopsys-dw-mshc-common.yaml | 2 +- + MAINTAINERS | 6 + + drivers/memstick/core/Kconfig | 2 + + drivers/mmc/core/Kconfig | 3 +- + drivers/mmc/core/block.c | 25 ++- + drivers/mmc/core/host.c | 26 +++ + drivers/mmc/core/mmc_ops.c | 1 + + drivers/mmc/core/pwrseq_simple.c | 4 +- + drivers/mmc/core/sdio_io.c | 2 +- + drivers/mmc/core/slot-gpio.c | 17 +- + drivers/mmc/host/Kconfig | 11 ++ + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/atmel-mci.c | 3 - + drivers/mmc/host/dw_mmc-starfive.c | 186 +++++++++++++++++++++ + drivers/mmc/host/jz4740_mmc.c | 38 ++++- + drivers/mmc/host/meson-gx-mmc.c | 92 +++------- + drivers/mmc/host/moxart-mmc.c | 9 + + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 11 ++ + drivers/mmc/host/sdhci-brcmstb.c | 8 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 66 +++++++- + drivers/mmc/host/sdhci-iproc.c | 14 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 19 ++- + drivers/mmc/host/sdhci-pci-core.c | 8 +- + drivers/mmc/host/sdhci-pxav2.c | 154 +++++++++++++++-- + drivers/mmc/host/sdhci-pxav3.c | 4 +- + drivers/mmc/host/sdhci-sprd.c | 6 +- + drivers/mmc/host/sdhci.c | 3 - + drivers/mmc/host/sdhci.h | 2 - + drivers/mmc/host/uniphier-sd.c | 83 ++++++++- + include/linux/mmc/host.h | 1 + + include/linux/mmc/slot-gpio.h | 1 + + 56 files changed, 922 insertions(+), 236 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt + create mode 100644 Documentation/devicetree/bindings/mmc/starfive,jh7110-mmc.yaml + create mode 100644 drivers/mmc/host/dw_mmc-starfive.c +Merging mfd/for-mfd-next (59c54c599746 dt-bindings: mfd: qcom,tcsr: Add compatible for IPQ5332) +$ 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 +Already up to date. +Merging backlight/for-backlight-next (ad614f81d2e8 backlight: ktz8866: Convert to i2c's .probe_new()) +$ 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 (13af134bdc6a dt-bindings: power: supply: Revise Richtek RT9467 compatible name) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-power | 3 ++- + .../supply/{richtek,rt9467-charger.yaml => richtek,rt9467.yaml} | 6 +++--- + drivers/power/supply/power_supply_core.c | 6 +++--- + 3 files changed, 8 insertions(+), 7 deletions(-) + rename Documentation/devicetree/bindings/power/supply/{richtek,rt9467-charger.yaml => richtek,rt9467.yaml} (92%) +Merging regulator/for-next (c361e8d45e52 Merge remote-tracking branch 'regulator/for-6.2' into regulator-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Already up to date. +Merging security/next (88603b6dc419 Linux 6.2-rc2) +$ 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 (cb60752f0c37 apparmor: fix use of strcpy in policy_unpack_test) +$ 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/domain.c +Auto-merging security/apparmor/file.c +Merge made by the 'ort' strategy. + security/apparmor/domain.c | 2 +- + security/apparmor/file.c | 2 +- + security/apparmor/include/task.h | 2 +- + security/apparmor/policy.c | 7 ++----- + security/apparmor/policy_unpack_test.c | 13 ++++++------- + security/apparmor/secid.c | 3 +-- + security/apparmor/task.c | 5 +---- + 7 files changed, 13 insertions(+), 21 deletions(-) +Merging integrity/next-integrity (4958db3245fa ima: Introduce MMAP_CHECK_REQPROT hook) +$ 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 keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (c0e48d3f7722 smackfs: Added check catlen) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + security/smack/smack_lsm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging tomoyo/master (5fc44ba8be52 workqueue: Emit runtime message when flush_scheduled_work() is called) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Auto-merging include/linux/workqueue.h +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 2 ++ + kernel/workqueue.c | 2 ++ + 2 files changed, 4 insertions(+) +Merging tpmdd/next (5b7c4cabbb65 Merge tag 'net-next-6.3' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ 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 (4443f6ce0d12 watchdog: at91rm9200: Only warn once about problems in .remove()) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Auto-merging drivers/watchdog/Kconfig +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-watchdog | 13 +++ + .../devicetree/bindings/timer/qcom,msm-timer.txt | 47 -------- + .../bindings/watchdog/amlogic,meson6-wdt.yaml | 50 +++++++++ + .../devicetree/bindings/watchdog/fsl-imx-wdt.yaml | 37 ++++++- + .../devicetree/bindings/watchdog/gpio-wdt.yaml | 55 ++++++++++ + .../bindings/watchdog/mediatek,mt7621-wdt.yaml | 7 ++ + .../bindings/watchdog/mediatek,mtk-wdt.yaml | 6 + + .../devicetree/bindings/watchdog/meson-wdt.txt | 21 ---- + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 96 ++++++++++++++-- + .../devicetree/bindings/watchdog/renesas,wdt.yaml | 2 +- + .../devicetree/bindings/watchdog/watchdog.yaml | 7 +- + drivers/watchdog/Kconfig | 4 +- + drivers/watchdog/apple_wdt.c | 18 +-- + drivers/watchdog/armada_37xx_wdt.c | 15 +-- + drivers/watchdog/aspeed_wdt.c | 1 + + drivers/watchdog/at91rm9200_wdt.c | 2 +- + drivers/watchdog/at91sam9_wdt.c | 7 +- + drivers/watchdog/bcm7038_wdt.c | 15 +-- + drivers/watchdog/cadence_wdt.c | 17 +-- + drivers/watchdog/da9062_wdt.c | 15 ++- + drivers/watchdog/da9063_wdt.c | 15 ++- + drivers/watchdog/davinci_wdt.c | 18 +-- + drivers/watchdog/dw_wdt.c | 1 + + drivers/watchdog/iTCO_wdt.c | 4 +- + drivers/watchdog/imgpdc_wdt.c | 31 +----- + drivers/watchdog/imx2_wdt.c | 55 +++++++++- + drivers/watchdog/imx7ulp_wdt.c | 15 +-- + drivers/watchdog/lpc18xx_wdt.c | 30 +---- + drivers/watchdog/meson_gxbb_wdt.c | 16 +-- + drivers/watchdog/mt7621_wdt.c | 122 ++++++++++++++------- + drivers/watchdog/mtk_wdt.c | 7 ++ + drivers/watchdog/of_xilinx_wdt.c | 16 +-- + drivers/watchdog/pcwd_usb.c | 6 +- + drivers/watchdog/pic32-dmt.c | 15 +-- + drivers/watchdog/pic32-wdt.c | 17 +-- + drivers/watchdog/pnx4008_wdt.c | 15 +-- + drivers/watchdog/qcom-wdt.c | 16 +-- + drivers/watchdog/realtek_otto_wdt.c | 17 +-- + drivers/watchdog/rtd119x_wdt.c | 16 +-- + drivers/watchdog/rzg2l_wdt.c | 45 +++++++- + drivers/watchdog/rzn1_wdt.c | 18 +-- + drivers/watchdog/sbsa_gwdt.c | 1 + + drivers/watchdog/visconti_wdt.c | 17 +-- + drivers/watchdog/watchdog_dev.c | 23 +++- + drivers/watchdog/wdat_wdt.c | 6 +- + drivers/watchdog/ziirave_wdt.c | 5 +- + 46 files changed, 527 insertions(+), 455 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/timer/qcom,msm-timer.txt + create mode 100644 Documentation/devicetree/bindings/watchdog/amlogic,meson6-wdt.yaml + create mode 100644 Documentation/devicetree/bindings/watchdog/gpio-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/meson-wdt.txt +Merging iommu/next (bedd29d793da Merge branches 'apple/dart', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Already up to date. +Merging audit/next (6c6cd913accd audit: update the mailing list in MAINTAINERS) +$ 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 (1ba7dfb905b3 dt-bindings: regulator: Add mps,mpq7932 power-management IC) +$ 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 (825475539974 Merge branch 'next/qcom-pinctrl' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. +Merging mailbox/mailbox-for-next (6ccbe33a3952 dt-bindings: mailbox: qcom-ipcc: Add compatible for QDU1000/QRU1000) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (4822fc06d054 Merge remote-tracking branch 'spi/for-6.2' 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 (7fa08de735e4 Merge branch into tip/master: 'irq/urgent') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging kernel/irq/irqdomain.c +Auto-merging kernel/irq/msi.c +Auto-merging tools/objtool/check.c +Merge made by the 'ort' strategy. + arch/x86/entry/entry_64.S | 9 +- + arch/x86/include/asm/nospec-branch.h | 2 +- + arch/x86/include/asm/orc_types.h | 4 +- + arch/x86/include/asm/unwind_hints.h | 10 +- + arch/x86/kernel/unwind_orc.c | 5 +- + drivers/pci/msi/api.c | 4 +- + include/linux/objtool.h | 11 +- + kernel/irq/ipi.c | 8 +- + kernel/irq/irqdesc.c | 4 +- + kernel/irq/irqdomain.c | 3 +- + kernel/irq/msi.c | 9 +- + tools/arch/x86/include/asm/orc_types.h | 4 +- + tools/include/linux/objtool.h | 11 +- + tools/objtool/.gitignore | 1 + + tools/objtool/Build | 2 - + tools/objtool/Documentation/objtool.txt | 8 + + tools/objtool/Makefile | 66 ++++-- + tools/objtool/arch/powerpc/decode.c | 22 +- + tools/objtool/arch/x86/decode.c | 107 +++++---- + tools/objtool/builtin-check.c | 2 +- + tools/objtool/check.c | 375 ++++++++++++++++++++------------ + tools/objtool/elf.c | 42 ++-- + tools/objtool/include/objtool/arch.h | 6 +- + tools/objtool/include/objtool/builtin.h | 2 - + tools/objtool/include/objtool/cfi.h | 1 + + tools/objtool/include/objtool/check.h | 61 +++--- + tools/objtool/include/objtool/elf.h | 9 +- + tools/objtool/include/objtool/objtool.h | 1 - + tools/objtool/include/objtool/special.h | 2 +- + tools/objtool/objtool.c | 1 - + tools/objtool/orc_dump.c | 4 +- + tools/objtool/orc_gen.c | 1 + + tools/objtool/special.c | 6 +- + 33 files changed, 473 insertions(+), 330 deletions(-) +Merging clockevents/timers/drivers/next (ab407a1919d2 Merge tag 'clocksource.2023.02.06b' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu into timers/core) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (feac08675023 Merge ras/edac-drivers into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Merge made by the 'ort' strategy. +Merging irqchip/irq/irqchip-next (a83bf176fed4 Merge branch irq/bcm-l2-fixes into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (ca6cbe8c481a Merge tools/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging Documentation/trace/kprobetrace.rst +CONFLICT (content): Merge conflict in Documentation/trace/kprobetrace.rst +Auto-merging init/Kconfig +Auto-merging init/main.c +Auto-merging kernel/trace/trace.c +Auto-merging kernel/trace/trace_probe.c +Auto-merging kernel/trace/trace_probe.h +Resolved 'Documentation/trace/kprobetrace.rst' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8948f8a4e9a7] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git +$ git diff -M --stat --summary HEAD^.. + +Merging rcu/rcu/next (690ae0037d5b Merge branch 'kcsan.2023.02.22a' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging arch/arm64/kvm/Kconfig +Auto-merging arch/mips/kvm/Kconfig +Auto-merging arch/riscv/kvm/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/kvm/Kconfig +Auto-merging mm/Kconfig +Merge made by the 'ort' strategy. + arch/arm64/kvm/Kconfig | 1 - + arch/mips/kvm/Kconfig | 1 - + arch/powerpc/kvm/Kconfig | 1 - + arch/riscv/kvm/Kconfig | 1 - + arch/s390/kvm/Kconfig | 1 - + arch/x86/Kconfig | 2 -- + arch/x86/kvm/Kconfig | 1 - + kernel/rcu/Kconfig | 3 --- + mm/Kconfig | 1 - + tools/testing/selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 4 ---- + 10 files changed, 16 deletions(-) +Merging kvm/next (45dd9bc75d9a KVM: SVM: hyper-v: placate modpost section mismatch error) +$ 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 (96a4627dbbd4 Merge tag ' https://github.com/oupton/linux tags/kvmarm-6.3' from into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (5fc5b94a2736 s390/virtio: sort out physical vs virtual pointers usage) +$ 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-x86/next (62ef199250cd Merge branches 'apic', 'generic', 'misc', 'mmu', 'pmu', 'selftests', 'svm' and 'vmx' into next) +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Merge made by the 'ort' strategy. +Merging xen-tip/linux-next (99a7bcafbd0d x86/xen/time: cleanup xen_tsc_safe_clocksource) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging arch/x86/xen/time.c +Merge made by the 'ort' strategy. + arch/x86/include/asm/xen/cpuid.h | 22 ++++++++++++++++++---- + arch/x86/xen/time.c | 7 ++----- + 2 files changed, 20 insertions(+), 9 deletions(-) +Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (c63a2e52d5e0 workqueue: Fold rebind_worker() within rebind_workers()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (0d9bdd8a5501 platform/x86: nvidia-wmi-ec-backlight: Add force module parameter) +$ 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 (b0d8a67715da platform/chrome: cros_ec_typec: Fix spelling mistake) +$ 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 hsi/for-next (1b929c02afd3 Linux 6.2-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/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging leds-lj/for-leds-next (056f65c3938b leds: Remove ide-disk trigger) +$ 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 (befb28f2676a ipmi: ipmb: Fix the MODULE_PARM_DESC associated to 'retry_time_ms') +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (a93e884edf61 Merge tag 'driver-core-6.3-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Already up to date. +Merging usb/usb-next (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ 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 (06cbcbfaa651 thunderbolt: Add missing kernel-doc comment to tb_tunnel_maximum_bandwidth()) +$ 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 (617c331d9107 USB: serial: option: add support for VW/Skoda "Carstick LTE") +$ 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 (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ 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 (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ 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 (f96b302a6b46 habanalabs/gaudi2: remove unneeded irq_handler variable) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Auto-merging drivers/accel/habanalabs/common/memory.c +Auto-merging drivers/accel/habanalabs/gaudi/gaudi.c +Auto-merging drivers/accel/habanalabs/gaudi2/gaudi2.c +Auto-merging drivers/accel/habanalabs/goya/goya.c +Merge made by the 'ort' strategy. + .../accel/habanalabs/common/command_submission.c | 73 +- + drivers/accel/habanalabs/common/debugfs.c | 129 +- + drivers/accel/habanalabs/common/device.c | 290 +- + drivers/accel/habanalabs/common/habanalabs.h | 94 +- + drivers/accel/habanalabs/common/habanalabs_drv.c | 8 +- + drivers/accel/habanalabs/common/habanalabs_ioctl.c | 52 + + drivers/accel/habanalabs/common/irq.c | 65 +- + drivers/accel/habanalabs/common/memory.c | 109 +- + drivers/accel/habanalabs/common/security.c | 6 +- + drivers/accel/habanalabs/common/security.h | 2 +- + drivers/accel/habanalabs/gaudi/gaudi.c | 25 +- + drivers/accel/habanalabs/gaudi2/gaudi2.c | 810 +-- + drivers/accel/habanalabs/gaudi2/gaudi2P.h | 2 + + drivers/accel/habanalabs/gaudi2/gaudi2_security.c | 1 + + drivers/accel/habanalabs/goya/goya.c | 6 +- + .../include/gaudi2/gaudi2_async_ids_map_extended.h | 5294 ++++++++++---------- + include/uapi/drm/habanalabs_accel.h | 51 +- + 17 files changed, 3697 insertions(+), 3320 deletions(-) +Merging coresight/next (669c4614236a coresight: tmc: Don't enable TMC when it's not ready.) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fpga/for-next (ffa562d00072 fpga: bridge: return errors in the show() method of the "state" attribute) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Auto-merging drivers/fpga/dfl.c +Auto-merging drivers/tty/serial/8250/Kconfig +Auto-merging drivers/tty/serial/8250/Makefile +Merge made by the 'ort' strategy. +Merging icc/icc-next (7bf0008a5293 Merge branch 'icc-dt' 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 (91ba2700aa75 staging: iio: meter: Drop ade7854 driver) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging drivers/iio/accel/kionix-kx022a.c +Merge made by the 'ort' strategy. + .../bindings/iio/adc/renesas,rcar-gyroadc.yaml | 60 ++- + drivers/iio/accel/kionix-kx022a.c | 1 - + drivers/iio/chemical/sps30_i2c.c | 6 +- + drivers/iio/dac/ad5592r-base.c | 5 + + drivers/iio/proximity/sx_common.h | 1 - + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/meter/Kconfig | 37 -- + drivers/staging/iio/meter/Makefile | 8 - + drivers/staging/iio/meter/ade7854-i2c.c | 153 ------ + drivers/staging/iio/meter/ade7854-spi.c | 160 ------ + drivers/staging/iio/meter/ade7854.c | 556 --------------------- + drivers/staging/iio/meter/ade7854.h | 173 ------- + drivers/staging/iio/meter/meter.h | 398 --------------- + 14 files changed, 37 insertions(+), 1523 deletions(-) + delete mode 100644 drivers/staging/iio/meter/Kconfig + delete mode 100644 drivers/staging/iio/meter/Makefile + delete mode 100644 drivers/staging/iio/meter/ade7854-i2c.c + delete mode 100644 drivers/staging/iio/meter/ade7854-spi.c + delete mode 100644 drivers/staging/iio/meter/ade7854.c + delete mode 100644 drivers/staging/iio/meter/ade7854.h + delete mode 100644 drivers/staging/iio/meter/meter.h +Merging phy-next/next (3584f6392f09 phy: qcom: phy-qcom-snps-eusb2: Add support for eUSB2 repeater) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (66f95de7c13b soundwire: cadence: further simplify low-level xfer_msg_defer() callback) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (2e85d0a0201d extcon: qcom-spmi: Switch to platform_get_irq_byname_optional) +$ 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/qcom,pm8941-misc.yaml | 14 +++++++++----- + drivers/extcon/extcon-axp288.c | 2 +- + drivers/extcon/extcon-qcom-spmi-misc.c | 4 ++-- + 3 files changed, 12 insertions(+), 8 deletions(-) +Merging gnss/gnss-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (d649c34cb916 vfio: Fix NULL pointer dereference caused by uninitialized group->iommufd) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (489fa31ea873 Merge branch 'work.misc' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ 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 (01f714ee022e counter: fix dependency references for config MICROCHIP_TCB_CAPTURE) +$ 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 mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on COMPILE_TEST) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Merge made by the 'ort' strategy. + drivers/mux/Kconfig | 2 +- + drivers/mux/mmio.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging dmaengine/next (e922bbf37564 dmaengine: idma64: Update bytes_transferred field) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (14fffd51f902 Merge branch 'for-6.2-fixes' 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 (81dab59be6ee 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 drivers/scsi/ipr.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/sd.c +Merge made by the 'ort' strategy. + drivers/s390/scsi/zfcp_dbf.c | 46 ++++++++++++++++- + drivers/s390/scsi/zfcp_def.h | 6 +-- + drivers/s390/scsi/zfcp_ext.h | 5 +- + drivers/s390/scsi/zfcp_fsf.c | 22 ++++---- + drivers/s390/scsi/zfcp_qdio.h | 2 +- + drivers/s390/scsi/zfcp_reqlist.h | 26 +++++----- + drivers/s390/scsi/zfcp_scsi.c | 2 +- + drivers/scsi/cxgbi/libcxgbi.h | 1 - + drivers/scsi/hosts.c | 4 +- + drivers/scsi/ipr.c | 54 +++++++++----------- + drivers/scsi/lpfc/lpfc_attr.c | 10 ++-- + drivers/scsi/lpfc/lpfc_els.c | 4 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 2 +- + drivers/scsi/lpfc/lpfc_init.c | 4 +- + drivers/scsi/lpfc/lpfc_mbox.c | 4 +- + drivers/scsi/lpfc/lpfc_nvmet.c | 2 +- + drivers/scsi/lpfc/lpfc_sli.c | 2 +- + drivers/scsi/mpi3mr/mpi3mr.h | 11 +--- + drivers/scsi/mpi3mr/mpi3mr_app.c | 28 ++++------- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 75 ++++++++++++--------------- + drivers/scsi/mpi3mr/mpi3mr_os.c | 4 ++ + drivers/scsi/mpi3mr/mpi3mr_transport.c | 2 +- + drivers/scsi/qedi/qedi_dbg.h | 1 - + drivers/scsi/qla2xxx/qla_isr.c | 2 +- + drivers/scsi/scsi_lib.c | 1 + + drivers/scsi/scsi_transport_fc.c | 10 ++-- + drivers/scsi/sd.c | 29 +++-------- + drivers/scsi/sd_dif.c | 10 ++-- + drivers/scsi/ses.c | 64 ++++++++++++++++------- + drivers/ufs/core/ufshcd.c | 92 +++++++++++++++++----------------- + drivers/ufs/host/Kconfig | 2 +- + drivers/ufs/host/ufs-mediatek.c | 2 + + include/scsi/scsi_device.h | 1 + + include/scsi/scsi_transport_fc.h | 4 +- + include/uapi/scsi/scsi_bsg_mpi3mr.h | 8 +-- + include/ufs/ufshcd.h | 1 + + 36 files changed, 291 insertions(+), 252 deletions(-) +Merging scsi-mkp/for-next (901b894af5b9 scsi: zfcp: Trace when request remove fails after qdio send fails) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (0d0a7dda9cdf vp_vdpa: fix the crash in hot unplug with vp_vdpa) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Merge made by the 'ort' strategy. + drivers/vdpa/virtio_pci/vp_vdpa.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rpmsg/for-next (c7d00a6f6e4c Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. +$ git am -3 ../patches/0001-remoteproc-fix-for-iommu-Add-a-gfp-parameter-to-iomm.patch +Applying: remoteproc: fix for "iommu: Add a gfp parameter to iommu_map()" +Using index info to reconstruct a base tree... +M drivers/remoteproc/qcom_q6v5_adsp.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (4827aae06133 gpio: sim: Use %pfwP specifier instead of calling fwnode API directly) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (099f37a539e6 pinctrl: qcom: Add support for i2c specific pull feature) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +Merging pinctrl-intel/for-next (88f8ac47bddc pinctrl: Proofreading and updating the documentation (part 2)) +$ 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 (698485cd875b pinctrl: renesas: r8a77950: Add VIN[45] pins, groups, and functions) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ 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/for-next (cf70d01a62c7 pwm: dwc: Use devm_pwmchip_add()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Merge made by the 'ort' strategy. + .../bindings/pwm/mediatek,mt2712-pwm.yaml | 93 +++++++++++++++++ + .../devicetree/bindings/pwm/pwm-mediatek.txt | 52 ---------- + .../bindings/pwm/snps,dw-apb-timers-pwm2.yaml | 68 +++++++++++++ + drivers/pwm/pwm-ab8500.c | 112 +++++++++++++++++++-- + drivers/pwm/pwm-dwc.c | 38 +++---- + drivers/pwm/pwm-iqs620a.c | 4 +- + drivers/pwm/pwm-lp3943.c | 1 - + drivers/pwm/pwm-sifive.c | 8 +- + drivers/pwm/pwm-stm32-lp.c | 2 +- + include/linux/pwm.h | 14 +-- + 10 files changed, 302 insertions(+), 90 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pwm/mediatek,mt2712-pwm.yaml + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-mediatek.txt + create mode 100644 Documentation/devicetree/bindings/pwm/snps,dw-apb-timers-pwm2.yaml +Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++--- + ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++-- + ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++ + kernel/ucount.c | 16 ++++++------- + 4 files changed, 89 insertions(+), 14 deletions(-) +Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie) +$ 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 (0eb15a47bf43 selftests/user_events: add a note about user_events.h dependency) +$ 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 (1b929c02afd3 Linux 6.2-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 (82649c7c0da4 kunit: Add printf attribute to fail_current_test_impl) +$ 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 (b2e118419db3 Merge branch 'for-6.3/cleanup-relocations' 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 (3ca04951b004 rtc: pm8xxx: add support for nvmem offset) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Merge made by the 'ort' strategy. + .../bindings/rtc/amlogic,meson-vrtc.yaml | 44 ++ + .../bindings/rtc/brcm,brcmstb-waketimer.yaml | 21 +- + .../devicetree/bindings/rtc/ingenic,rtc.yaml | 29 ++ + .../bindings/rtc/microcrystal,rv3028.yaml | 54 +++ + .../devicetree/bindings/rtc/moxa,moxart-rtc.txt | 12 +- + .../devicetree/bindings/rtc/nxp,pcf2127.yaml | 5 +- + .../devicetree/bindings/rtc/nxp,pcf85363.yaml | 60 +++ + .../devicetree/bindings/rtc/nxp,pcf8563.yaml | 2 - + .../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 12 + + .../devicetree/bindings/rtc/rtc-meson-vrtc.txt | 22 - + .../devicetree/bindings/rtc/trivial-rtc.yaml | 6 +- + drivers/rtc/Kconfig | 14 +- + drivers/rtc/Makefile | 1 + + drivers/rtc/interface.c | 2 +- + drivers/rtc/rtc-ab-eoz9.c | 7 +- + drivers/rtc/rtc-abx80x.c | 77 +++ + drivers/rtc/rtc-brcmstb-waketimer.c | 152 ++++-- + drivers/rtc/rtc-ds1307.c | 6 +- + drivers/rtc/rtc-efi.c | 2 +- + drivers/rtc/rtc-hym8563.c | 7 +- + drivers/rtc/rtc-isl12022.c | 93 ++-- + drivers/rtc/rtc-jz4740.c | 94 +++- + drivers/rtc/rtc-m41t80.c | 7 +- + drivers/rtc/rtc-max8907.c | 1 - + drivers/rtc/rtc-moxart.c | 89 ++-- + drivers/rtc/rtc-nxp-bbnsm.c | 226 +++++++++ + drivers/rtc/rtc-pcf2123.c | 7 +- + drivers/rtc/rtc-pcf85063.c | 7 +- + drivers/rtc/rtc-pcf8523.c | 7 +- + drivers/rtc/rtc-pcf85363.c | 44 +- + drivers/rtc/rtc-pcf8563.c | 7 +- + drivers/rtc/rtc-pm8xxx.c | 533 ++++++++++----------- + drivers/rtc/rtc-rv3028.c | 7 + + drivers/rtc/rtc-rv3029c2.c | 7 +- + drivers/rtc/rtc-rv3032.c | 14 +- + drivers/rtc/rtc-rv8803.c | 52 +- + drivers/rtc/rtc-rx6110.c | 1 - + drivers/rtc/rtc-rx8010.c | 8 +- + drivers/rtc/rtc-sun6i.c | 16 +- + include/linux/bcd.h | 4 + + 40 files changed, 1228 insertions(+), 531 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,meson-vrtc.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/microcrystal,rv3028.yaml + create mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf85363.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson-vrtc.txt + create mode 100644 drivers/rtc/rtc-nxp-bbnsm.c +Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) +$ 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 (1b929c02afd3 Linux 6.2-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 (0310a30a9395 NTB: ntb_transport: fix possible memory leak while device_register() fails) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/pci/endpoint/functions/pci-epf-vntb.c +Merge made by the 'ort' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 7 ++++++- + drivers/ntb/hw/idt/ntb_hw_idt.c | 7 ++++++- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 7 ++++++- + drivers/ntb/ntb_transport.c | 2 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + + 5 files changed, 20 insertions(+), 4 deletions(-) +Merging seccomp/for-next/seccomp (0fb0624b15d2 seccomp: fix kernel-doc function name warning) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (1b929c02afd3 Linux 6.2-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 (fa7876365ad2 nvmem: stm32: fix OPTEE dependency) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging drivers/of/property.c +Auto-merging include/linux/of.h +Merge made by the 'ort' strategy. +Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Merge made by the 'ort' strategy. + lib/idr.c | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) +Merging hyperv/hyperv-next (b14033a3e6ba x86/hyperv: Fix hv_get/set_register for nested bringup) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (ddf75a86aba2 auxdisplay: hd44780: Fix potential memory leak in hd44780_remove()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Merge made by the 'ort' strategy. + drivers/auxdisplay/hd44780.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ 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 (1b929c02afd3 Linux 6.2-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 (312310928417 Linux 5.18-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 trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (3c54a3ff0a2c bus: mhi: ep: Fix off by one in mhi_ep_process_cmd_ring()) +$ 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 (2fe03412e2e1 memblock: Avoid useless checks in memblock_merge_regions().) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Auto-merging mm/memblock.c +Merge made by the 'ort' strategy. + mm/memblock.c | 41 +++++++++++++++++++++++++++-------------- + 1 file changed, 27 insertions(+), 14 deletions(-) +Merging cxl/next (e686c32590f4 dax/kmem: Fix leak of memory-hotplug resources) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (e1d447157f23 firmware/efi sysfb_efi: Add quirk for Lenovo IdeaPad Duet 3) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/for-next (603c592a005a Merge branch 'slab/for-6.3/fixes' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Merge made by the 'ort' strategy. +Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (ed35e2f2f0de landlock: Clarify documentation for the LANDLOCK_ACCESS_FS_REFER right) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Merge made by the 'ort' strategy. + include/uapi/linux/landlock.h | 46 +++++++++++++++++++++++++++++-------------- + 1 file changed, 31 insertions(+), 15 deletions(-) +Merging rust/rust-next (7ea01d3169a2 rust: delete rust-project.json when running make clean) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging sysctl/sysctl-next (f1aa2eb5ea05 sysctl: fix proc_dobool() usability) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (88603b6dc419 Linux 6.2-rc2) +$ 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 (18e93f4dc099 bitmap: switch from inline to __always_inline) +$ 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 include/linux/find.h +Auto-merging include/linux/nodemask.h +Merge made by the 'ort' strategy. + include/linux/bitmap.h | 46 +++++++-------- + include/linux/cpumask.h | 142 +++++++++++++++++++++++------------------------ + include/linux/find.h | 40 ++++++------- + include/linux/nodemask.h | 86 ++++++++++++++-------------- + 4 files changed, 157 insertions(+), 157 deletions(-) +Merging hte/for-next (1b929c02afd3 Linux 6.2-rc1) +$ 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 (78f7a3fd6dc6 randstruct: disable Clang 15 support) +$ 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 kspp-gustavo/for-next/kspp (b942a520d9e4 bcache: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging iommufd/for-next (939204e4df96 Merge tag 'v6.2' into iommufd.git for-next) +$ 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. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..d966ff3cb121 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230227 |