diff options
| -rw-r--r-- | Next/SHA1s | 436 | ||||
| -rw-r--r-- | Next/Trees | 436 | ||||
| -rw-r--r-- | Next/merge.log | 22389 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 23262 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ce02ccbc761d --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,436 @@ +Name SHA1 +---- ---- +origin 4056b3c9d3c92ea45955641dbafeb9b960e146ef +ext4-fixes 3e78d7b063230d39ffc42e80ee665b6c32a6adeb +vfs-brauner-fixes 6e1ed4690110a546ea699792ff1307decce7611c +fscrypt-current cee9395acd8043be0644b25c34bfa86623f2b935 +fsverity-current e58c3805ed325fe2d4ae2dd467c0486cc860b733 +btrfs-fixes 0fa3769cd09cb78cd601ed2042e505cc28c37e2d +vfs-fixes 49c5d168a3a8f4eb27d44a2a22b7e8a856ca601f +erofs-fixes 135d84c66f85426299db01a09d93a79a87af18ba +nfsd-fixes f76017a7663c4ce5e379f8a8d39f032bdb1fd865 +v9fs-fixes 028ef9c96e96197026887c0f092424679298aae8 +overlayfs-fixes 4549871118cf616eecdd2d939f78e3b9e1dddc48 +fscrypt a63883d2c3d47ce6d41918c2453a4513b921eaaa +btrfs ac19d0101f4ada9e5866da95ca92726f81ea83fd +ceph dc173b37415e8f738fc4de477490056b479ddc9f +cifs 8667061cf99394526dd9c0ea2662e6bbc7ae7848 +configfs 620938e7da8943970ec25e1c8cdbf44ba1d44fa1 +configfs-rust e84c9b64df615e658e47561b835c1364dc48f0c0 +ecryptfs 5b00bf0f3b7ad05eff79b84e3bacf3f98ac67dc6 +dlm 82bcb7b05ad90de126e9c09a7b46a81be799620e +erofs 9b637385b210cd7c403e309ad9e08ec521cf8848 +exfat 8e431c3bce0bb51802fc79b10225cc90a15f15d1 +ext3 782654a3e9c4065dea2e9f10539899d348b7a1fc +ext4 35aefefd7aba0801bab635b11943f932626be3b2 +f2fs a605d5d71a6d280c43c7ede9778dda63fb5c3f22 +fsverity f9e450420da2624c93ce9585deebfabb87932774 +fuse b776cbe24cc1b79c7f5101762b0069b3f48b6a4b +gfs2 d0c4bce31a579216780b990a09250f15e00f38ff +jfs dad98c5b2a05ef744af4c884c97066a3c8cdad61 +ksmbd bf3465919b0337dfef8798da01469145887c4ef5 +nfs 18a80121193c6d19519e218434c9acf90e8d0e5c +nfs-anna 9ee534a75912361308b1f956bc3e7895a082a422 +nfsd eafb6de800781f0a1be5cdd98d150620041d8b27 +ntfs 04fb910da2c857cdf99a331c576c3e5e7197c6dd +ntfs3 80218408836fa6fc91a9c26a9c014f81abf9e41f +orangefs 2bc09cb0e9e44c7e622b956332ebfb9b638fd5f7 +overlayfs 1f6ee9be92f8df85a8c9a5a78c20fd39c0c21a95 +ubifs a5e0055eac837a1168c781653943d4a0d9920af3 +v9fs c60ae98c5aa64021751b38ab1313b19d620bf640 +v9fs-ericvh 028ef9c96e96197026887c0f092424679298aae8 +xfs ec8f62cc109a3f596b3c65dc0f1011c209239051 +zonefs 3a8389d42bdf4213730f4067f8bfa78bae6564ef +vfs-brauner ac311bf4f20e614d8e94cae4c62f075f2e5ef16c +vfs 4dda01b67c8662c5d0c53034974cb8280c575a5d +mm-fixes 8c80684cfd065b1c434dbee64c382220ffa9c7c0 +fs-current 60ba0601fd51a23878e4296f1d52f48a7950eb42 +kbuild-current fd73f4a6659897191fa0d40695fe370925dd3780 +clang-fixes-current df2908090cda368b01ff43709f51890076c56157 +arc-current f050c3e61d2a1aaece3170d459e4ce5fa2486c12 +arm-current 1039bffd6ae9c75b42b7d148d6c1106134107b66 +arm64-fixes a9cd14bfb0c113f1cd77be4349784663bec71bb4 +arm-soc-fixes 59f522f5a0ece96ce051a27d15533667a1d0dee8 +davinci-current cee9395acd8043be0644b25c34bfa86623f2b935 +realtek-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +drivers-memory-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +sophgo-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +sophgo-soc-fixes 0af2f6be1b4281385b618cb86ad946eded089ac8 +m68k-current 2f8e3cad53b5c36ab0ed5d3195bfc55c59ea61a5 +powerpc-fixes 93f51579e7df248780214094418f205253383cc5 +s390-fixes 5b76268dac968612f7283d59b539036de955b7d9 +net 513444cc62e231a11c9b15ea88de0890da9b2b4f +bpf ff47652a4b66c067c765a7ad464d930b5a9367cc +ipsec f9a11716c8445b496e9fafeec7e8412d384d02e2 +netfilter ab699d296e066eb64f51d2a8a1d42237a3b186c8 +ipvs 6dc989ea46b96ce170840174b4a38c4a387fb005 +bluetooth-fixes 23ad91f6a21a830b67f5eee790caa0053bd6537d +wireless af32da41b0327b9c6a37856ba82b6760d6c8d10e +ath 08a3f02fea636e97a7422d1512f76dacdb5b0887 +iwlwifi 1e7e30fb650b8327534f65b2213a794c04975fa4 +wpan 2b4707a149a55e8fa75c9ef32b359d60f470a566 +rdma-fixes 72d3fcf802c45d00b300f25b848a93c3a2bd7c7e +sound-current 07c75552f7fe636a0695baae506a7d72fabd3be4 +sound-asoc-fixes 2a31b5378c6db9c4a8d399e5d10d32cd4b732bef +regmap-fixes 2e42cade8ff1ff579e77976d9869db4df1feaf74 +regulator-fixes 28c2388ee24cdbefbcc458fa41ef7bffaaa1cc83 +spi-fixes 00765a3467b992d0eb56704a28887256317eb4bd +pci-current 4e9f69d08253471d92bcc46b363fbada06bd59c4 +driver-core.current 72d3fcf802c45d00b300f25b848a93c3a2bd7c7e +tty.current a90ee4305c4a5df72c11b31dacfdc76e00fcf78a +usb.current a90ee4305c4a5df72c11b31dacfdc76e00fcf78a +usb-serial-fixes a90ee4305c4a5df72c11b31dacfdc76e00fcf78a +phy 93f51579e7df248780214094418f205253383cc5 +staging.current df2908090cda368b01ff43709f51890076c56157 +iio-fixes ceb05f22e5cdc3f8bd3f7d5dcfc57843942191dd +watchdog-fixes 2686e13649a9e846f6c08cf4ada0256ca19c3475 +counter-current fd73f4a6659897191fa0d40695fe370925dd3780 +char-misc.current a90ee4305c4a5df72c11b31dacfdc76e00fcf78a +soundwire-fixes 93f51579e7df248780214094418f205253383cc5 +thunderbolt-fixes 96a8479804e3f7af43e639e9df39f562f1a75fd5 +input-current 41363c27b8509bd4efcba244803edac9ba25d1b5 +crypto-current 10396a2d6d41d594975b6ece712278570c3c970c +libcrypto-fixes 7b817748bf083ad715a8d70de63f2184178cc372 +vfio-fixes e242e974e812e7a47e3088860c80d9492fac314f +kselftest-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +dmaengine-fixes 93f51579e7df248780214094418f205253383cc5 +backlight-fixes dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mtd-fixes 1c1a342aceec79528b3ba51f376eca2be5928fe7 +mfd-fixes d5d2d7a8d8be18681a0864f58e3875f1c639e11c +v4l-dvb-fixes 2579cbe68005f46fc7f8f95364f6b101b07b9d1c +reset-fixes 71827776667f4e4677a4fa806bcfb24d4b8dd9d7 +mips-fixes 93f51579e7df248780214094418f205253383cc5 +at91-fixes afb1ecfeda3fc31d6300a176f4854cc62e289bf3 +omap-fixes 2fabd2f406d0cf787be47b3bbeea99b30004033d +tegra-fixes 6c143432a14dbf5e455f5bf08bfa90fb69f39b90 +kvm-fixes e90ab3669181c6469e3647ef2b30ae408275f496 +kvms390-fixes f47190b08b71e8482072978373ee88cb2dfbdaf4 +kvm-arm-fixes 71cc2c67fb8f8d5aa8154eb482e9846d2214f11b +hwmon-fixes 61406e9cac695b19b979b002d790d346b9f07887 +nvdimm-fixes a8aec14230322ed8f1e8042b6d656c1631d41163 +cxl-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +dma-mapping-fixes 911655ab1dfb9d526978a75df3b210132620d30a +drivers-x86-fixes d144a494d81fcf2d1c5cf58b01c655bb8bafc701 +samsung-krzk-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +pinctrl-samsung-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +pinctrl-qcom-fixes 1df7f369075d7e8f7794981995a5103f1963bab7 +devicetree-fixes 30724547b221e0e670ddfef140fc7d816b2aaec6 +dt-krzk-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +scsi-fixes 11bffcd9cb346732eab2914ef44fe777a3f0b585 +drm-fixes 24a19b953e2a3d0ea5a8c4951a0ab8f32720c907 +drm-intel-fixes 24a19b953e2a3d0ea5a8c4951a0ab8f32720c907 +mmc-fixes c96ca94425b076dc398d929366e378d1e22ec794 +rtc-fixes 055ef5ce9f67a6a3a1363fa663007f8196cc0fb8 +gnss-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +hyperv-fixes ca039df94983c441fdee0e2488263fc744e8ecb6 +risc-v-fixes d4f25b097e46d82718bb737d4540c99b7ab0a408 +riscv-dt-fixes 0f70fd6f4c1d6c1f2ea298d8dd07c4a4d5dff9af +riscv-soc-fixes 3a25c1c77dc3769cb83c236ab33f7aa1fa17726c +fpga-fixes 19272b37aa4f83ca52bdf9c16d5d81bdd1354494 +spdx cee9395acd8043be0644b25c34bfa86623f2b935 +gpio-brgl-fixes 52336337f1a01ad803c7f3ddb23f40222e9ad58d +gpio-intel-fixes 3fd4bf93d586cb07304cdcb5e8b3c51ac1d8284f +pinctrl-intel-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +auxdisplay-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +kunit-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +renesas-fixes 8dc2615d5702059b2b71fca6f93c0d7d10ae54cb +perf-current aadea57f532882d8bab444646863c7ef8a778ff1 +efi-fixes d8809f6931065cbbf3554647a50a65a471ab5983 +battery-fixes 5b4bd13e0552926648a46c2c9a12a24dfaee3715 +iommufd-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +rust-fixes 4056b3c9d3c92ea45955641dbafeb9b960e146ef +w1-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +pmdomain-fixes 4c66c423593e26273ea0d644906ed007630c6f6d +i2c-andi-fixes 195f3d74b5de98969dc4fad956393bb00787efd1 +i2c-rust-fixes 4eb422482ca5d924d7212ad2ca1cb7ea6f5b524d +sparc-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +clk-fixes 81493c1dd1b1ebecb2843a7815973a5bd9a37e5a +thead-clk-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +tenstorrent-clk-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +fustini-config-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +pwrseq-fixes dbd674ccf30f66f5eccf637964a93910df8dbf84 +thead-dt-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +ftrace-fixes 1650a1b6cb1ae6cb99bb4fce21b30ebdf9fc238e +ring-buffer-fixes 057caace5214da3b457bbd295e1a2ad34d3685ea +trace-fixes d860c67c051685abb0460b593b193f0f45f4fa92 +tracefs-fixes 07004a8c4b572171934390148ee48c4175c77eed +spacemit-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +tip-fixes eb4c2a1ff4869699c80e0a166d7b6ac1098f6fcb +kexec-fixes a901b0778ae82d46084b55237e65d3a7bb5f0c86 +liveupdate-fixes 3a0b8fa2eb36afc88b62a95f33f0c77c71fa5ded +drm-msm-fixes a15fac810c76397ec9f62a6fc26c4d7ab6e238a7 +uml-fixes af421e9aed3920c7ac88c24daa48606c7112feca +fwctl-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +devsec-tsm-fixes c3fd16c3b98ed726294feab2f94f876290bf7b61 +drm-rust-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +tenstorrent-dt-fixes cee9395acd8043be0644b25c34bfa86623f2b935 +nfc-fixes b61732f47316d45f27706db7812950145d3327b5 +mm-nonmm-hotfixes-stable ff47652a4b66c067c765a7ad464d930b5a9367cc +mm-nonmm-hotfixes-unstable ff47652a4b66c067c765a7ad464d930b5a9367cc +drm-misc-fixes 8907eb42c08b8eebe0f81fee256b34b5675d0e5a +rust 3132a951a7e4ec2e18bc314877137deee96ab83e +rust-interop 05f7e89ab9731565d8a62e3b5d1ec206485eeb0b +rust-alloc 6e8339118040f24ebcc21db22c9c1b7398b7e39e +rust-io 86731a2a651e58953fc949573895f2fa6d456841 +rust-pin-init b7218f1996f8491dbe28632b70f444cb73f554df +rust-timekeeping 2ea0119f72dba597aa8a98cbdb72c564bfc5cb38 +rust-xarray c455f19bbe6104debd980bb15515faf716bd81b8 +rust-analyzer 0024f3311f6f54f10dc778802da3fea0522ade66 +mm 3f947e72419e99c7f164ead9bd59cbb6b3d3a6e6 +mm-nonmm-stable be9f9add2032f1370fec166e4e91ade5b5cc1042 +mm-nonmm-unstable ddc1b4197a839721a407389af7e0cef003479084 +kbuild 56a62bca21c960b1222e39e184e550bbf1c9683a +clang-fixes 0bb666d5f5a2339a5692afb312c2161df9620503 +clang-format 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +perf 3b05843302202598a6d25f3e2543c8182e6a930c +compiler-attributes 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +dma-mapping 3faa52b77c912a8e9bb0cea39af4204153a22fea +asm-generic adbbd9714f8058730f93c8df5c5bf1679456424b +alpha d58041d2c63e09a1c9083e0e9f4151e487c4e16a +arm 1a89abc009cb5035d0cb4e5ba48d32b94f30e8e4 +arm64 b9a2d373a5ca366b27bb62e454102b0a995f1325 +arm-perf 652ab8ee0d27f21a5f402a0b6ac227c8bbfdd64c +arm-soc 54cab8582737924aabb913079cfa9b4aee8ddbfb +amlogic 8610d31587e139380db9cb8708f4263833b482d0 +asahi-soc 9378cd5ddcebc06fdd803373487ed1a376532391 +at91 bd49a1c72abbdddbc7b3d691d926623e33a7c1a0 +bmc c895734d0ec6c3e94f1fb3a0575b9a7076201d9e +broadcom c0f2033a9ce4b843ca3e947536a0607ecf982be1 +cix a0cffbd8878c55b12dc4555f883adf3372cecd91 +davinci cee9395acd8043be0644b25c34bfa86623f2b935 +drivers-memory a22355280361d2a376a2020059a2bae11e6cea10 +fsl a7831c657c90e8f9165f6bbe0cc56262fee075e8 +imx-mxs 31f9ec9f38735f42e1f0ba57347c420e56b99824 +mediatek 4bfec57314396c8c816ee78f4803987882b668a7 +mvebu 43cb5b5bd349a2b5f5ad2abd3abedaa5d69ca7a9 +omap 7cdd46c9d6c5a7f4800195af82bb718081e7c84d +qcom f5672a3dff0291d6a45eb0c258b9d2baeb4dc577 +realtek 3c778f0c9fa36b6b9a26bd2146df24ed4e830ba4 +renesas fb050251fd4fe3b4d0231495651901626c2a1464 +reset d373605cd514837d8a6de3d00c786d4bae6dbaf8 +rockchip d2abcbb905b0e4b2e06b257fa1e5bcf4faa6dbda +samsung-krzk 993e1bec85faedf90c5d27480793084e54357c09 +nomadik ff1501cbb825de117267124ecb8898112b4051c5 +integrator 5bf1bb010712bba28eda926ed453db3cab91381a +scmi 403e062cebf956b8e3aeac768db25806446aef8c +sophgo 60e4cafd30908e7d8cdfdb4fa1a74dabed9f47b5 +sophgo-soc c8754c7deab4cbfa947fa2d656cbaf83771828ef +spacemit d5eefaf546eb83f98206137a5784b6b8510e4fe5 +stm32 f831584128ac2a36fb4fa62fe106793d08c2dbf1 +sunxi 5243bd55dfe63a5f806622878f6fbdd78172fac9 +tee b0adf8e5e1ebf416abfe055475f08ae6a72fc2f7 +tegra 016e9c7ec4d13322c2544ad17a02fbbabeec4d68 +tenstorrent-dt cee9395acd8043be0644b25c34bfa86623f2b935 +fustini-config cee9395acd8043be0644b25c34bfa86623f2b935 +thead-dt 2414ca8f5a0cafdfdb2b5899fd173adc09b5adf1 +ti 9e2716807275dd86dbbc86d1b0a2ca957d9a37c1 +xilinx ac01278339e890bd1edf777c186506d2de8481fc +socfpga fd26798a69439d6693a1f83b0763031b306cfb4f +clk a5929cbf1406eb3da217d4a182ff6c5b73f3ed91 +clk-imx 52d4d1b26a5bc64de95099d0a3dd8b90dba1f3a3 +clk-renesas 21cbd7ec29930f8e7e156e18b81736f099f03849 +thead-clk cee9395acd8043be0644b25c34bfa86623f2b935 +tenstorrent-clk c64b54ddb692c30b8fb139a2ead32eb4db7faef5 +csky abb81e5ce7d995baa41556b8125fa59e28ba3be8 +loongarch 34f4ce22cf25802d8026c60c13c2db81f8c8e3a0 +m68k af32c3cb72529b14bfb2685bbdaa2b1514496b58 +m68knommu cffad6e71539bc00d5a76c0c1057dc067d42715c +microblaze 6b125c73aaa0dab9ce625437c63b176afe453776 +mips bfe97f12a0a64c3682be21a02404238e3b91e945 +openrisc 6620f5e8c11c4f7e41222a86f5c97150cc5f84a5 +parisc-hd a5f6df25261b31eb75f61047a890515671d95a29 +powerpc 129f5d395fd66b6587a5ac156b232cca060d6512 +risc-v a5ae1bf65cee84bcc121d659e7e22a767853f5f5 +riscv-dt 2186ec5f59c23fcf0bf896ca0543b6a1135d7bb5 +riscv-soc 3160b4a8aeea997f9b494db8c9e14a4d287a7381 +s390 2906e5c9e5a47b5937bde3ea0be29794c55b5333 +sh f3b8138e148b86c74dad6adf209ae61c7d958f2f +sparc a9e88d617a25306fa7e532b0b8be08df778872cc +uml 4ad423aa2108485f8bc5dde51fdf9c1ed979ee4b +xtensa 28722ed2527aa63ac1454013defe718c56032886 +fs-next b594b4c367cfbd0036e7000eb7eeee415308c717 +printk d3145c36346ebac7bb81a3606c6fe2bd9fd8adc8 +pci 0e724d5d2c4a5bf05c02ab75958dfaf38ce0db43 +pstore 7c756181175d50200be487affa905e973f6cbaf5 +hid 145c2b2e9a5c0f794fb4009bcb072ab19f8ccfcd +i2c 8cd9520d35a6c38db6567e97dd93b1f11f185dc6 +i2c-andi d5b634bccdf9ad917dac96c67da25b9ecabe25c8 +i2c-rust 61ddec70c9bcc3d4b0471c8683e57d3b03cecf0a +i3c fc5eb1b0631aa3b34c530ae962d01699ed22a0ae +dmi 1afafbaf749d8e8ec53f8e38efdc731131902b5b +hwmon-staging 4781ca52761e666cf18b591e6bb0478396c90320 +jc_docs 8fdbd353e6928492fdc46c359aabd2bfb7630fba +v4l-dvb d7e7bca7169873b46e857c025c10f3336c1258d8 +v4l-dvb-next adc218676eef25575469234709c2d87185ca223a +pm cd79045dd0398dee88f9b9f2e26749da9696d782 +cpufreq-arm 71245acb8c937382fc31806572314d36667b17f6 +cpupower cee9395acd8043be0644b25c34bfa86623f2b935 +devfreq 9a222650d9e70d0027126e4df5b00b1b5b678a97 +pmdomain 6d318db9ffcb611f9b3b6b3201c963690541a943 +opp 706081c6b9327dd611dd72b20130a77f0f059b6e +thermal 2dc1f296b5754dd2441fc8b6613a362a47f6b98f +rdma d37e98844afea39a9614cac0de837701263c90f7 +net-next 05b5019b01fb9443b09ae4ed34af1135a80a84c8 +bpf-next 763187dbbf83764a57d5811168ef9de7b9a60e2d +ipsec-next 014d795c73837ea2339a4ea8e8f82c6e959b845d +mlx5-next 41de84543574f2923776790f608c56389aed972e +netfilter-next a5e7d8e446af9803e37a3b6a4d416fb41178348f +ipvs-next 87b80c2f6b05cad9f0ff9136709c62a0f59923e3 +bluetooth 609a23989d637e2f90522a37c62e65c8c9b8b0ff +wireless-next a4190accbf7e05496754004bb701fb3e7d04e57f +ath-next cd026e68fdbf88b9cc522b76c7a9d92c9a41f709 +iwlwifi-next 3627924ed81fd7783394fb2555ea179c6606a231 +wpan-next a6bfdfcc6711d1d5a92e98644359dedc67c0c858 +wpan-staging a6bfdfcc6711d1d5a92e98644359dedc67c0c858 +mtd 2f7fa8d90694d21dce68ceabd8383252b111cfea +nand 30daaf3e7897b4a8d9b72e5b0c86dd6e2a4d7d85 +spi-nor 68d7115d77a873c28d8c7d2f239c3d9ca83bf39f +crypto 666d66df25253070cb297cb920b0bcfcfe5eb871 +libcrypto 40f47fa10a1d19c74f48a13d97b2eb19d5fb938d +drm a56b45995b1e6b9ee671485b1fe68b0c7f754a67 +drm-exynos 3a8660878839faadb4f1a6dd72c3179c1df56787 +drm-misc 1b15fa434b4b49cdf276fc0bc88264605661fdf6 +amdgpu c54e4d10507722398dc90cf3c532e50b86cf425a +drm-intel 1b15fa434b4b49cdf276fc0bc88264605661fdf6 +drm-msm d024361c631b3f020a26c07d683e5103404b0fbf +drm-msm-lumag 6b93e8b453fa27a1b6a1d472f3ff8663e6811fae +drm-xe f7f8e453bef8ea29ae3615e5308eb2d4c250545d +drm-rust d511064b2e732b7152a542d589d07a4814c1b674 +drm-nova 93296e9d9528f0d87f2cf3fee494599060a0f14a +etnaviv 6bde14ba5f7ef59e103ac317df6cc5ac4291ff4a +fbdev b40e7ffea066935d125d71c763c21e4d8c320060 +regmap 9f19c8a019d7c1fb720133ca86154be1ccff39b5 +sound a68a688ce220f1b359bec53fa38d1504314dc70f +ieee1394 82d59eb7f5431771cfc6fb074b74f466cd4e3353 +sound-asoc 54940f76f33c54c03d41d3997112e45b9fbec6f6 +modules 08abfa5a161e1b6e6244cb2090b0530bc0920798 +input 68a0deade76c01da05f434df9094c2d4cefce1ef +block e8b704b323f93c6b860b955d9f19c3a8877a163e +device-mapper 334714e4bdf8868c17a7650a7502ba1c90a8721f +libata 21d333ab2be2a9967319e652239c7193c1202a14 +pcmcia b3c26ea81ccc522e77ed0b1707add61fc9206216 +mmc fd9af27f6c2319713bb23832066585f8a59a1771 +mfd 319633b06ff2bfc2a7a60d2cfcab2e681a343b27 +backlight 5e1631df673f3d5355acd06263a884e00d8d007b +battery 5c1c602463d597c5189ddc5a73dece588ba2c57a +regulator 8c3ce6554a5b995599b84388347b301553e9efd5 +security 881f19c2ffbc73f351b257e09c71e6059939b770 +apparmor cee9395acd8043be0644b25c34bfa86623f2b935 +integrity 1dc317438308c79cf90a6f14d3e4116347ea3716 +selinux 12802add29de8a556006f144f4000fc1fcffd5a2 +smack fedc88e38ce979a720cd2de042578cb5df3dc8de +tomoyo 72d3fcf802c45d00b300f25b848a93c3a2bd7c7e +tpmdd-tpm cf507674f8f73bf85902530942e2e22ebeb79442 +tpmdd-keys a626e44fd64c456d373ae8c28b939197b9446a02 +watchdog 8b5a9f09037e3c372c4e9f2fbda85fcfbf5ea5f0 +iommu c233d59828627bfaab750ec5546e81970475f951 +audit e35ae53e5b6da800bc02c6c8fc6e88c406c91a14 +devicetree e2c8975e89ebd674ca86cefaaa96a2bd35ad8e55 +dt-krzk dfcea1641506d7ba096a9e6ead5d15f5573206ec +mailbox 134ef0278d4e48bcc325a7699250dfe861c11953 +spi 85b0e19de168d82cbd879a4c8e13fabad5ef4dd8 +tip 6ff90f554839bbf0356f9486b01d30cb447d4079 +kexec cc092886b9ce077cf2954ea46663648a2cc390c1 +liveupdate e1fe7daedae7a4a23aca6dbd58e1746750b632dc +clockevents 36790ef57803400339d8ea4081d85483264dbd6c +edac 0489f2176209b710890096699c4b869f1db91df4 +ftrace f973b1ca0bb34a85fa99588424b2df7d5f5e667a +rcu d9011419496a3dc6b455b5308846684c63c18de5 +paulmck ea0ffa26d4da5ff8af317b6030649e74e400e969 +kvm d4b7fb647204f0c81dfeae2d1a708e4d858e0c94 +kvm-arm dd0bc00e3e9201fd49b62ff9cc07890c89003afe +kvms390 ef7078796fd14476a370c5d26909e5627c2cf55d +kvm-ppc 93f51579e7df248780214094418f205253383cc5 +kvm-riscv 41e81f7e3ef96594fb840445343c0ee7723aa550 +kvm-x86 dea4f6380f4ec96e8f3b0aaf2343764bd0d25ef4 +xen-tip 61b6d1df1d6234c38a6ea7e4f58e7da035ef6ab4 +percpu 8f0b4cce4481fb22653697cced8d0d04027cb1e8 +workqueues 92b542db38bf7cb4de583b2ca37febc549db0ce4 +sched-ext 8ef2c4fe917a5a72d40bc6730f6954cc9ea1c2ec +drivers-x86 98f039265e580291d5e76a11b2072541fbb1c393 +chrome-platform 2d3ee0bdb321ad84d9cf18d4bfd2b839293a695d +chrome-platform-firmware f2e05ce9763feb1dd7da15afd2cc61df227ee85a +hsi e81250ec6b69248b00d38c523dc6a13efaf38aab +leds-lj 05b4738b0078f7d6f154f68068a11c8a0635e9df +ipmi 921fcdb737891cb527e0cc4786713dc00cf32409 +driver-core d4ffc4896b3e709c6a5d7e5a78a1fddfc774fa25 +usb bbf6b99a57b2479bf51c3c8ad0946f4b8c33ed69 +thunderbolt a93a8e3200002f0c345fec4c340390e9a60aabc7 +usb-serial e7daa54802c566ed3f22e81513f84c8c9197c5d1 +tty 36844ea19656fb41278799ef3d5cd52120d89149 +char-misc 7e170600b36298cba2ba7a0c63d1cebea7970708 +coresight 343cfcbb3ecfdb80aa576a428cfa3b65ad783842 +fastrpc ef071c4906eb45d16b60f09154cf0bc6ec8f5435 +fpga 093da48782df3d50953c520626b345ca70af8cbd +icc 3fd56a2833c22f62eb84297d0dbd47739632f1a0 +iio a3b3580713f3ac5a32dc2874ee546828977a1d68 +nfc fd73f4a6659897191fa0d40695fe370925dd3780 +phy-next 8f56fdf3d8cb9f1dbdc93bf9ac816698aa6f70b7 +soundwire 2e9eff8847a46530ab937696f340b9d5bea2e4ef +extcon 8d3ae59288f1e7d58d76558a6ee96d533bc5019f +gnss cee9395acd8043be0644b25c34bfa86623f2b935 +vfio 6a5f427bee12c82beaf13efbd133416da1541c39 +w1 813a5b9a3c9f6cee830b1e23343fbd2359683557 +spmi 8cdeaa50eae8dad34885515f62559ee83e7e8dda +staging dbc2fa996f44602af72ea56efa68c043407eaaac +counter-next edac5cf35699492027fb54e348dc6234b2661617 +mux ac7bde3c53166656d80e3aacc7d274d3c60a6de4 +dmaengine 42c31fec1ca76b8b5f7759def122d418dff2cd4b +cgroup 9c012be0980afba569b0bc0c6d71befae8740fc1 +scsi 2b1060a8368e0d393e0aefa455c16403f41ed12c +scsi-mkp 9621cbd332862eb6651e2aba24ed18f66560de66 +vhost c69023b5e16e5ffe9368603dca76d85bd544ee57 +rpmsg a101347c14c48a6ea60f9af11df8ad3b2f4a602e +gpio-brgl 39225ea01d82c85045ab0272edaf550abce7330a +gpio-intel 0fc424b6a8ef447450f6087db42abce3a6feb328 +pinctrl 6e648fe0b51f9cc15dbc63391bb723ac037d686c +pinctrl-intel c016587866e573fa8dff50c3bdae9734c4418099 +pinctrl-renesas 0cd4a7b3a4883970df3ae8814d9aabdecf65a81e +pinctrl-samsung cee9395acd8043be0644b25c34bfa86623f2b935 +pinctrl-qcom 9bcd1725b0cc7954525e3d0d02fecaec7c7aab33 +pwm 00e917df050d79ac26ec700717680ad6421d2808 +ktest 932cdaf3e273a2727e77af97f79f12577174c5a0 +kselftest 829a017fefe0cbcea36be46ae9ab688de2f21abd +kunit cee9395acd8043be0644b25c34bfa86623f2b935 +kunit-next e38f53f0482468efd04397f66bda4648b70ac9fa +livepatching f663062d717eac2c01f77eaf321fa630528e672d +rtc 8a017ab98412c997b9ce6b57a6941e229bf7f89a +nvdimm 855a46681e0ba601952c346e5b62d867e51ecb23 +at24 dc59e4fea9d83f03bad6bddf3fa2e52491777482 +ntb dc59e4fea9d83f03bad6bddf3fa2e52491777482 +seccomp e32008340585a12783045c4426fbb963cfa11b7e +slimbus 4350d705466992dce4a21c382985553bfb568f65 +nvmem 41f42ff4ae134eba8dbe3424cf2ca1824c652edd +hyperv be0cfab740e58b70047ef6e7e3d578f00ed5d258 +auxdisplay f63dc0eea92d07c5bb799a406571b555cd2bbd97 +kgdb fdbdd0ccb30af18d3b29e714ac8d5ab6163279e0 +hmm cee9395acd8043be0644b25c34bfa86623f2b935 +cfi dc59e4fea9d83f03bad6bddf3fa2e52491777482 +mhi 0b1883ca75c0005ab5ca52c7bc1a26329bc39746 +cxl d304df5f329302fff4658cd6ed8f93aec4b94d27 +zstd 65d1f5507ed2c78c64fce40e44e5574a9419eb09 +efi 191c12e9a71687b61d3298ac1e0d0d7298d103f0 +unicode a511442085c140da9cdbe60e3f0fab1c71480801 +random eb13a1ff271b0d180687eebb30611b0b276d5193 +landlock 62e09fcc4f1d254de6d06c58da521854d8e7c32c +sysctl 4991c8b72b564cd16cb48124f880617fd49f1013 +execve df2908090cda368b01ff43709f51890076c56157 +bitmap a73b4d1fa7d334a5f7de5bb0a14726530f66196e +hte 30167fadbf87fa901a2fee49c30a5c5a506a43e8 +kspp ef16259088f99c5997e198561bdcbb89ab70fd0f +nolibc 5f81ffdf26072fd262093c4127e656276564395f +iommufd 54dadb030c7e2350957855d3995de05ae02c2e66 +turbostat f31adc690d6834db65d8683b6b835497606f5e6c +pwrseq 09baa2f4caab013160eed975db47235e6c930af4 +capabilities-next 507adb6448378155ec89495fed8c3c09d8c83920 +ipe 48f936e302a9c48cfc032eb5944c3a6246bc9043 +kcsan bd3cc16d1d7d584911f856adc458f242b1c7e85f +crc cee9395acd8043be0644b25c34bfa86623f2b935 +keys-next 965e9a2cf23b066d8bdeb690dff9cd7089c5f667 +fwctl cee9395acd8043be0644b25c34bfa86623f2b935 +devsec-tsm 3177779ae17db4c66c851f799505fb95c7530c03 +hisilicon a5db65458a911daa6f8927264366dab501715dc0 +device-id 995832b2cebe6969d1b42635db698803ee31294d +kthread fa39ec4f89f2637ed1cdbcde3656825951787668 +kapi ef777ef05ebcc5ea5393b4bd5af6fc3ad1b3aec9 +pagemap-headers e02cb91d4644dfff593146f89e70d2008cc6ac16 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..4514ed3beffc --- /dev/null +++ b/Next/Trees @@ -0,0 +1,436 @@ +Trees included into this release: + +Name Url +---- --- +origin https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +ext4-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#fixes +vfs-brauner-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.fixes +fscrypt-current https://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +btrfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +erofs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +nfsd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +v9fs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +overlayfs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes +fscrypt https://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-next +btrfs https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph https://github.com/ceph/ceph-client.git#master +cifs https://git.manguebit.org/linux.git#cifs-next +configfs https://git.kernel.org/pub/scm/linux/kernel/git/leitao/linux.git#configfs-next +configfs-rust https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git#configfs-next +ecryptfs https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +dlm https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +erofs https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity https://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs https://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/smb.git#ksmbd-for-next +nfs git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +ntfs https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git#ntfs-next +ntfs3 https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git#for-next +overlayfs https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#overlayfs-next +ubifs https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs https://github.com/martinetd/linux#9p-next +v9fs-ericvh https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +vfs-brauner https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +mm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mm/linux.git#for-next-fixes +kbuild-current https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-fixes-for-next +clang-fixes-current https://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux.git#clang-fixes-for-current +arc-current https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#fixes +arm64-fixes https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +realtek-fixes https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git#fixes +drivers-memory-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +sophgo-fixes https://github.com/sophgo/linux.git#fixes +sophgo-soc-fixes https://github.com/sophgo/linux.git#soc-fixes +m68k-current https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +net https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/#master +ipsec https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main +ipvs https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +bluetooth-fixes https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git#master +wireless https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +ath https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-current +iwlwifi https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#fixes +wpan https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-linus +tty.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +watchdog-fixes https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#watchdog +counter-current https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +libcrypto-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-fixes +vfio-fixes https://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +dmaengine-fixes https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git://linuxtv.org/media-ci/media-pending.git#fixes +reset-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux#reset/fixes +mips-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#fixes +tegra-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#fixes +kvm-fixes git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +kvm-arm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#fixes +hwmon-fixes https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +dma-mapping-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-fixes +drivers-x86-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +pinctrl-qcom-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pinctrl-qcom/for-current +devicetree-fixes https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes https://gitlab.freedesktop.org/drm/kernel.git#drm-fixes +drm-intel-fixes https://gitlab.freedesktop.org/drm/i915/kernel.git#for-linux-next-fixes +mmc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +risc-v-fixes https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +auxdisplay-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#fixes +kunit-fixes https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +renesas-fixes https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +perf-current https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git#perf-tools +efi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +battery-fixes https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +iommufd-fixes https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes https://github.com/Rust-for-Linux/linux.git#rust-fixes +w1-fixes https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +i2c-andi-fixes https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-fixes +i2c-rust-fixes https://github.com/ikrtn/rust-for-linux#rust-i2c-fixes +sparc-fixes https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-linus +clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-fixes +thead-clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-fixes +tenstorrent-clk-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-clk-fixes +fustini-config-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#riscv-config-fixes +pwrseq-fixes https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-current +thead-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-fixes +ftrace-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ftrace/fixes +ring-buffer-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#ring-buffer/fixes +trace-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#trace/fixes +tracefs-fixes https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#tracefs/fixes +spacemit-fixes https://git.kernel.org/pub/scm/linux/kernel/git/spacemit/linux#fixes +tip-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#tip/urgent +kexec-fixes https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#kexec-fixes +liveupdate-fixes https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#fixes +drm-msm-fixes https://gitlab.freedesktop.org/drm/msm.git#msm-fixes +uml-fixes https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +fwctl-fixes https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-rc +devsec-tsm-fixes https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#fixes +drm-rust-fixes https://gitlab.freedesktop.org/drm/rust/kernel.git#for-linux-next-fixes +tenstorrent-dt-fixes https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-dt-fixes +nfc-fixes https://codeberg.org/linux-nfc/linux.git#for-linus +mm-nonmm-hotfixes-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-hotfixes-stable +mm-nonmm-hotfixes-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-hotfixes-unstable +drm-misc-fixes https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next-fixes +rust https://github.com/Rust-for-Linux/linux.git#rust-next +rust-interop https://github.com/Rust-for-Linux/linux.git#interop-next +rust-alloc https://github.com/Rust-for-Linux/linux.git#alloc-next +rust-io https://github.com/Rust-for-Linux/linux.git#io-next +rust-pin-init https://github.com/Rust-for-Linux/linux.git#pin-init-next +rust-timekeeping https://github.com/Rust-for-Linux/linux.git#timekeeping-next +rust-xarray https://github.com/Rust-for-Linux/linux.git#xarray-next +rust-analyzer https://github.com/Rust-for-Linux/linux.git#rust-analyzer-next +mm https://git.kernel.org/pub/scm/linux/kernel/git/mm/linux.git#for-next +mm-nonmm-stable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm-nonmm-unstable https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-unstable +kbuild https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git#kbuild-for-next +clang-fixes https://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux.git#clang-fixes-for-next +clang-format https://github.com/ojeda/linux.git#clang-format +perf https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +compiler-attributes https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git#dma-mapping-for-next +asm-generic https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic#master +alpha https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git#alpha-next +arm https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git#for-next +arm64 https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +at91 https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +bmc https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git#for-next +broadcom https://github.com/Broadcom/stblinux.git#next +cix https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git#for-next +davinci https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +fsl https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git#soc_fsl +imx-mxs https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git#for-next +mediatek https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git#for-next +mvebu https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git#for-next +qcom https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +realtek https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git#for-next +renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux#reset/next +rockchip https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +nomadik https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git#for-next +integrator https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git#for-next +scmi https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +sophgo https://github.com/sophgo/linux.git#for-next +sophgo-soc https://github.com/sophgo/linux.git#soc-for-next +spacemit https://git.kernel.org/pub/scm/linux/kernel/git/spacemit/linux#for-next +stm32 https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git#next +tegra https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +tenstorrent-dt https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-dt-for-next +fustini-config https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#riscv-config-for-next +thead-dt https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-dt-for-next +ti https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx https://github.com/Xilinx/linux-xlnx.git#for-next +socfpga https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git#for-next +clk https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +thead-clk https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git#thead-clk-for-next +tenstorrent-clk https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git#tenstorrent-clk-for-next +csky https://github.com/c-sky/csky-linux.git#linux-next +loongarch https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git://git.monstr.eu/linux-2.6-microblaze.git#next +mips https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc https://github.com/openrisc/linux.git#for-next +parisc-hd https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +risc-v https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git#for-next +sparc https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git#for-next +uml https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa https://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +printk https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i2c-andi https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git#i2c/i2c-next +i2c-rust https://github.com/ikrtn/rust-for-linux#rust-i2c-next +i3c https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git://git.lwn.net/linux.git#docs-next +v4l-dvb git://linuxtv.org/media-ci/media-pending.git#next +v4l-dvb-next git://linuxtv.org/mchehab/media-next.git#master +pm https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +pmdomain https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next +opp https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +rdma https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main +ipvs-next https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +bluetooth https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +ath-next https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git#for-next +iwlwifi-next https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git#next +wpan-next https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +wpan-staging https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +mtd https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +libcrypto https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#libcrypto-next +drm https://gitlab.freedesktop.org/drm/kernel.git#drm-next +drm-exynos https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git#for-linux-next +drm-misc https://gitlab.freedesktop.org/drm/misc/kernel.git#for-linux-next +amdgpu https://gitlab.freedesktop.org/agd5f/linux.git#drm-next +drm-intel https://gitlab.freedesktop.org/drm/i915/kernel.git#for-linux-next +drm-msm https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +drm-xe https://gitlab.freedesktop.org/drm/xe/kernel.git#drm-xe-next +drm-rust https://gitlab.freedesktop.org/drm/rust/kernel.git#for-linux-next +drm-nova https://gitlab.freedesktop.org/drm/nova.git#nova-next +etnaviv https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +ieee1394 https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +sound-asoc https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git#modules-next +input https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git#for-next +device-mapper https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux#for-next +pcmcia https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +selinux https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack https://github.com/cschaufler/smack-next#next +tomoyo git://git.code.sf.net/p/tomoyo/tomoyo.git#master +tpmdd-tpm https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#for-next-tpm +tpmdd-keys https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#for-next-keys +watchdog https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#watchdog-next +iommu https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git#next +audit https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git#for-next +spi https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +kexec https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#kexec-next +liveupdate https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git#next +clockevents https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git#timers/drivers/next +edac https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +ftrace https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux#next +paulmck https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#non-rcu/next +kvm git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +kvm-ppc https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm +kvm-riscv https://github.com/kvm-riscv/linux.git#riscv_kvm_next +kvm-x86 https://github.com/kvm-x86/linux.git#next +xen-tip https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +sched-ext https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git#for-next +drivers-x86 https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +chrome-platform-firmware https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-next +hsi https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds-lj https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi https://github.com/cminyard/linux-ipmi.git#for-next +driver-core https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git#driver-core-next +usb https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +coresight https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fastrpc https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-next +fpga https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +nfc https://codeberg.org/linux-nfc/linux.git#for-next +phy-next https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio https://github.com/awilliam/linux-vfio.git#next +w1 https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-next +spmi https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git#spmi-next +staging https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux https://gitlab.com/peda-linux/mux.git#for-next +dmaengine https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio-brgl https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pinctrl-qcom https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pinctrl-qcom/for-next +pwm https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#pwm/for-next +ktest https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git#for-next +rtc https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb https://github.com/jonmason/ntb.git#ntb-next +seccomp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +slimbus https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +hyperv https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git#for-next +kgdb https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +mhi https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +cxl https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd https://github.com/terrelln/linux.git#zstd-next +efi https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +random https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +sysctl https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git#sysctl-next +execve https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap https://github.com/norov/linux.git#bitmap-for-next +hte https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +nolibc https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git#for-next +iommufd https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +turbostat https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git#next +pwrseq https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#pwrseq/for-next +capabilities-next https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git#caps-next +ipe https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git#next +kcsan https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git#next +crc https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git#crc-next +keys-next https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +fwctl https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git#for-next +devsec-tsm https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git#next +hisilicon https://github.com/hisilicon/linux-hisi.git#for-next +device-id https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git#device-id-rework +kthread https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git#for-next +kapi https://git.kernel.org/pub/scm/linux/kernel/git/sashal/kapi.git#spec +pagemap-headers git://git.infradead.org/users/willy/pagecache.git#headers diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..04a06c996480 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,22389 @@ +$ date -R +Wed, 14 Oct 2026 12:15:02 +0100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 24a19b953e2a3 Linux 7.3-rc7 +Merging origin/master (4056b3c9d3c92 Merge tag 'nios2_update_for_v7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 24a19b953e2a3..4056b3c9d3c92 +Fast-forward (no commit created; -m option ignored) + arch/nios2/include/asm/checksum.h | 2 +- + arch/x86/kvm/mmu.h | 16 ++++-- + arch/x86/kvm/mmu/paging_tmpl.h | 3 +- + arch/x86/kvm/svm/avic.c | 22 +++++--- + arch/x86/kvm/svm/sev.c | 2 +- + arch/x86/kvm/svm/svm.c | 6 ++- + arch/x86/kvm/svm/svm.h | 1 + + arch/x86/kvm/x86.h | 4 +- + drivers/power/supply/ds2780_battery.c | 2 +- + drivers/power/supply/generic-adc-battery.c | 9 +++- + drivers/power/supply/max17042_battery.c | 2 +- + drivers/power/supply/power_supply_core.c | 26 ++++++++- + include/linux/power_supply.h | 16 ++++-- + tools/bootconfig/main.c | 3 +- + tools/power/x86/turbostat/turbostat.c | 86 +++++++++++++++++++----------- + 15 files changed, 142 insertions(+), 58 deletions(-) +Merging ext4-fixes/fixes (3e78d7b063230 ext4: mark data=journal as deprecated and will be removed in January 2028.) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4-fixes/fixes +Already up to date. +Merging vfs-brauner-fixes/vfs.fixes (6e1ed4690110a Merge patch series "fs: don't let idle threads pin the initramfs") +$ git merge -m Merge branch 'vfs.fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner-fixes/vfs.fixes +Merge made by the 'ort' strategy. + Documentation/filesystems/path-lookup.rst | 8 ++++- + fs/9p/v9fs.h | 1 + + fs/9p/vfs_super.c | 4 +-- + fs/afs/internal.h | 2 ++ + fs/afs/super.c | 2 +- + fs/autofs/waitq.c | 25 ++++++++++++---- + fs/ext4/ext4.h | 2 ++ + fs/ext4/extents-test.c | 2 ++ + fs/ext4/extents.c | 1 + + fs/ext4/extents_status.c | 7 ++++- + fs/ext4/extents_status.h | 1 + + fs/ext4/super.c | 13 ++++++-- + fs/namei.c | 30 ++++++++++++++++--- + fs/namespace.c | 14 ++++----- + fs/notify/mark.c | 11 +++++++ + fs/ntfs3/dir.c | 13 ++++++-- + fs/ntfs3/ntfs_fs.h | 3 ++ + fs/ntfs3/super.c | 49 +++++++++++++++++++++++-------- + fs/ocfs2/dlm/dlmcommon.h | 2 ++ + fs/ocfs2/dlm/dlmdebug.c | 5 +++- + fs/ocfs2/dlm/dlmrecovery.c | 2 +- + fs/overlayfs/params.c | 3 ++ + fs/pipe.c | 6 ++-- + fs/tracefs/event_inode.c | 10 ++++++- + fs/unicode/utf8-core.c | 21 ++++++++++--- + include/linux/fsnotify_backend.h | 1 + + include/linux/sched/signal.h | 4 +-- + include/linux/unicode.h | 1 + + ipc/namespace.c | 2 +- + kernel/exit.c | 2 +- + kernel/fork.c | 20 +++++++++---- + kernel/pid_namespace.c | 2 +- + kernel/watch_queue.c | 11 ++++--- + samples/pidfd/Makefile | 2 +- + 34 files changed, 218 insertions(+), 64 deletions(-) +Merging fscrypt-current/for-current (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (e58c3805ed325 fsverity: RCU-delay the freeing of struct fsverity_info) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging btrfs-fixes/next-fixes (0fa3769cd09cb Merge branch 'misc-7.3' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of https://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 (49c5d168a3a8f udf: fix nls leak on udf_fill_super() failure) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Auto-merging fs/udf/super.c +Merge made by the 'ort' strategy. +Merging erofs-fixes/fixes (135d84c66f854 erofs: add missing buf->off in erofs_bread()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging nfsd-fixes/nfsd-fixes (f76017a7663c4 nfsd: fix handling of NFSEXP_PNFS in the netlink codepath) +$ git merge -m Merge branch 'nfsd-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Already up to date. +Merging v9fs-fixes/fixes/next (028ef9c96e961 Linux 7.0) +$ git merge -m Merge branch 'fixes/next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging overlayfs-fixes/ovl-fixes (4549871118cf6 Linux 7.1-rc7) +$ git merge -m Merge branch 'ovl-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging fscrypt/for-next (a63883d2c3d47 MAINTAINERS: List the fscrypt branches) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 3 ++- + fs/crypto/Kconfig | 2 +- + fs/crypto/crypto.c | 5 +++++ + fs/crypto/fscrypt_private.h | 27 --------------------------- + fs/crypto/hooks.c | 9 +++++++++ + fs/crypto/keyring.c | 13 +++++++++++++ + fs/crypto/keysetup_v1.c | 5 ++--- + 7 files changed, 32 insertions(+), 32 deletions(-) +Merging btrfs/for-next (ac19d0101f4ad Merge branch 'for-next-next-v7.3-20261012' into for-next-20261012) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. + fs/btrfs/Kconfig | 1 + + fs/btrfs/accessors.c | 2 +- + fs/btrfs/backref.c | 2 +- + fs/btrfs/bio.c | 163 ++--- + fs/btrfs/bio.h | 9 +- + fs/btrfs/block-group.c | 556 +++------------- + fs/btrfs/block-group.h | 16 +- + fs/btrfs/block-rsv.c | 12 +- + fs/btrfs/block-rsv.h | 6 +- + fs/btrfs/btrfs_inode.h | 28 +- + fs/btrfs/compression.c | 61 +- + fs/btrfs/ctree.c | 4 +- + fs/btrfs/ctree.h | 2 +- + fs/btrfs/defrag.c | 8 +- + fs/btrfs/delalloc-space.c | 13 +- + fs/btrfs/delayed-inode.c | 118 +++- + fs/btrfs/delayed-inode.h | 22 +- + fs/btrfs/dev-replace.c | 10 +- + fs/btrfs/dir-item.c | 50 +- + fs/btrfs/dir-item.h | 5 +- + fs/btrfs/direct-io.c | 7 + + fs/btrfs/disk-io.c | 248 +++---- + fs/btrfs/extent-io-tree.c | 2 +- + fs/btrfs/extent-tree.c | 21 +- + fs/btrfs/extent_io.c | 247 ++++--- + fs/btrfs/extent_map.c | 8 + + fs/btrfs/file-item.c | 46 +- + fs/btrfs/free-space-cache.c | 1344 +------------------------------------- + fs/btrfs/free-space-cache.h | 29 +- + fs/btrfs/fs.c | 2 +- + fs/btrfs/fs.h | 5 +- + fs/btrfs/inode.c | 339 ++++------ + fs/btrfs/ioctl.c | 14 +- + fs/btrfs/messages.c | 28 +- + fs/btrfs/ordered-data.c | 27 +- + fs/btrfs/props.c | 3 +- + fs/btrfs/qgroup.c | 212 +++--- + fs/btrfs/qgroup.h | 20 +- + fs/btrfs/raid56.c | 68 +- + fs/btrfs/reflink.c | 51 +- + fs/btrfs/relocation.c | 15 +- + fs/btrfs/root-tree.c | 3 +- + fs/btrfs/send.c | 2 +- + fs/btrfs/space-info.c | 6 +- + fs/btrfs/space-info.h | 4 - + fs/btrfs/super.c | 79 +-- + fs/btrfs/sysfs.c | 134 +--- + fs/btrfs/tests/btrfs-tests.c | 9 - + fs/btrfs/tests/btrfs-tests.h | 2 - + fs/btrfs/tests/extent-io-tests.c | 129 ++-- + fs/btrfs/transaction.c | 171 ++--- + fs/btrfs/transaction.h | 58 +- + fs/btrfs/tree-checker.c | 83 ++- + fs/btrfs/tree-log.c | 11 +- + fs/btrfs/tree-mod-log.c | 13 +- + fs/btrfs/verity.c | 31 +- + fs/btrfs/volumes.c | 67 +- + fs/btrfs/volumes.h | 4 +- + fs/btrfs/zlib.c | 10 +- + fs/btrfs/zoned.c | 29 +- + fs/btrfs/zstd.c | 73 ++- + include/uapi/linux/btrfs_tree.h | 25 +- + 62 files changed, 1490 insertions(+), 3277 deletions(-) +Merging ceph/master (dc173b37415e8 ceph: apply nearfull_sync option on remount) +$ git merge -m Merge branch 'master' of https://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/cifs-next (8667061cf9939 smb: client: require stable pages for SMB compression) +$ git merge -m Merge branch 'cifs-next' of https://git.manguebit.org/linux.git cifs/cifs-next +Merge made by the 'ort' strategy. + fs/smb/client/asn1.c | 2 - + fs/smb/client/cifs_debug.c | 1 - + fs/smb/client/cifsencrypt.c | 31 +++-- + fs/smb/client/cifsfs.c | 11 +- + fs/smb/client/cifsfs.h | 5 +- + fs/smb/client/cifsglob.h | 26 ++--- + fs/smb/client/cifsproto.h | 18 +-- + fs/smb/client/cifssmb.c | 183 +++++++++++++++++------------ + fs/smb/client/connect.c | 52 ++++++--- + fs/smb/client/dfs.c | 6 +- + fs/smb/client/dir.c | 1 - + fs/smb/client/file.c | 7 +- + fs/smb/client/inode.c | 36 +++--- + fs/smb/client/ioctl.c | 165 ++++++++++++-------------- + fs/smb/client/link.c | 273 ++++++++++++++++++++++++++++++++------------ + fs/smb/client/misc.c | 4 +- + fs/smb/client/netmisc.c | 3 - + fs/smb/client/ntlmssp.h | 11 +- + fs/smb/client/readdir.c | 80 +++++++++---- + fs/smb/client/sess.c | 37 +++--- + fs/smb/client/smb1ops.c | 14 +-- + fs/smb/client/smb1proto.h | 21 ++-- + fs/smb/client/smb1session.c | 120 +++++++++---------- + fs/smb/client/smb2glob.h | 8 ++ + fs/smb/client/smb2inode.c | 7 +- + fs/smb/client/smb2ops.c | 29 +++-- + fs/smb/client/smb2pdu.c | 66 +++++------ + fs/smb/client/smb2pdu.h | 3 + + fs/smb/client/smb2proto.h | 17 ++- + fs/smb/client/trace.h | 2 + + fs/smb/client/transport.c | 33 ++++++ + fs/smb/client/xattr.c | 2 +- + 32 files changed, 730 insertions(+), 544 deletions(-) +Merging configfs/configfs-next (620938e7da894 samples: configfs: constify the configfs_attribute structures) +$ git merge -m Merge branch 'configfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/leitao/linux.git configfs/configfs-next +Auto-merging MAINTAINERS +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/acpi/acpi_configfs.c | 2 +- + drivers/gpu/drm/xe/xe_configfs.c | 4 +- + drivers/virt/coco/guest/report.c | 6 +- + fs/configfs/configfs_internal.h | 10 +- + fs/configfs/dir.c | 10 +- + fs/configfs/file.c | 6 +- + fs/configfs/inode.c | 2 +- + include/linux/configfs.h | 73 ++-- + rust/kernel/configfs.rs | 20 +- + samples/configfs/configfs_sample.c | 137 +++++- + tools/testing/selftests/Makefile | 1 + + .../selftests/filesystems/configfs/.gitignore | 2 + + .../selftests/filesystems/configfs/Makefile | 8 + + .../testing/selftests/filesystems/configfs/config | 5 + + .../selftests/filesystems/configfs/configfs_test.c | 481 +++++++++++++++++++++ + 16 files changed, 697 insertions(+), 71 deletions(-) + create mode 100644 tools/testing/selftests/filesystems/configfs/.gitignore + create mode 100644 tools/testing/selftests/filesystems/configfs/Makefile + create mode 100644 tools/testing/selftests/filesystems/configfs/config + create mode 100644 tools/testing/selftests/filesystems/configfs/configfs_test.c +Merging configfs-rust/configfs-next (e84c9b64df615 rust: configfs: fix data offset calculation for subsystem callbacks) +$ git merge -m Merge branch 'configfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/a.hindborg/linux.git configfs-rust/configfs-next +Auto-merging rust/kernel/configfs.rs +Merge made by the 'ort' strategy. + rust/kernel/configfs.rs | 110 ++++++++++++++++++++++++++++++++---------------- + 1 file changed, 74 insertions(+), 36 deletions(-) +Merging ecryptfs/next (5b00bf0f3b7ad fs/ecryptfs: fix slab-out-of-bounds read in ecryptfs_verify_auth_tok_from_key) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Merge made by the 'ort' strategy. + fs/ecryptfs/ecryptfs_kernel.h | 3 +++ + 1 file changed, 3 insertions(+) +Merging dlm/next (82bcb7b05ad90 dlm: fix typos in comments) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'ort' strategy. + fs/dlm/ast.c | 2 +- + fs/dlm/config.c | 39 ++++++++++++++++++++++++++++++++++++--- + fs/dlm/debug_fs.c | 3 ++- + fs/dlm/dlm_internal.h | 5 +++++ + fs/dlm/lock.c | 20 ++++++++++++++------ + fs/dlm/lock.h | 4 ++-- + fs/dlm/lowcomms.c | 1 + + fs/dlm/member.c | 17 +++++++++++------ + fs/dlm/midcomms.c | 1 + + fs/dlm/plock.c | 14 +++++++++++++- + fs/dlm/user.c | 23 +++++++++++++++++++++++ + 11 files changed, 109 insertions(+), 20 deletions(-) +Merging erofs/dev (9b637385b210c erofs: use on-disk blkszbits for lz4 max pcluster bound) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Auto-merging .mailmap +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .mailmap | 1 + + Documentation/filesystems/erofs.rst | 7 +++++ + MAINTAINERS | 4 +-- + fs/erofs/data.c | 5 +++- + fs/erofs/decompressor.c | 2 +- + fs/erofs/internal.h | 1 + + fs/erofs/super.c | 56 +++++++++++++++++++++++++++++++++++-- + fs/super.c | 19 ++++++++++--- + include/linux/fs_context.h | 4 +++ + 9 files changed, 88 insertions(+), 11 deletions(-) +Merging exfat/dev (8e431c3bce0bb exfat: free clusters beyond EOF when a write fails or is short) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/filesystems/exfat.rst | 117 ++++++++++++++++ + Documentation/filesystems/index.rst | 1 + + MAINTAINERS | 1 + + fs/exfat/dir.c | 52 +++++++- + fs/exfat/exfat_fs.h | 61 ++++++++- + fs/exfat/fatent.c | 46 +++++-- + fs/exfat/file.c | 258 ++++++++++++++++++++---------------- + fs/exfat/inode.c | 16 ++- + fs/exfat/iomap.c | 81 +++++++++-- + fs/exfat/namei.c | 11 +- + fs/exfat/super.c | 30 ++++- + 11 files changed, 515 insertions(+), 159 deletions(-) + create mode 100644 Documentation/filesystems/exfat.rst +Merging ext3/for_next (782654a3e9c40 Pull fix for handling of long filenames in fsnotify) +$ git merge -m Merge branch 'for_next' of https://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + fs/ext2/Makefile | 2 + + fs/ext2/balloc.c | 4 ++ + fs/ext2/ext2.h | 19 ++++++---- + fs/ext2/file.c | 7 ++++ + fs/ext2/inode.c | 7 ++++ + fs/ext2/super.c | 33 +++++++++------- + fs/isofs/compress.c | 77 +++++++++++++++++++++----------------- + fs/isofs/dir.c | 14 +++++-- + fs/isofs/inode.c | 70 ++++++++++++++-------------------- + fs/isofs/isofs.h | 16 +++++++- + fs/isofs/joliet.c | 27 +++++++++---- + fs/isofs/namei.c | 8 ++-- + fs/isofs/rock.c | 19 ++++++++-- + fs/notify/fanotify/fanotify.c | 7 +++- + fs/notify/fanotify/fanotify.h | 21 ++++++----- + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/ocfs2/quota_local.c | 4 ++ + fs/quota/dquot.c | 16 ++++++++ + fs/udf/inode.c | 61 +++++++++++++++++++++++++++--- + fs/udf/misc.c | 15 ++++---- + fs/udf/super.c | 5 ++- + include/linux/once_lite.h | 8 ++-- + mm/shmem_quota.c | 5 +++ + 24 files changed, 302 insertions(+), 146 deletions(-) +Merging ext4/dev (35aefefd7aba0 ext4: introduce a mount option for iomap buffered I/O path) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/extents.c +Auto-merging fs/ext4/super.c +Merge made by the 'ort' strategy. + fs/ext4/balloc.c | 2 +- + fs/ext4/ext4.h | 96 +++- + fs/ext4/ext4_jbd2.c | 8 +- + fs/ext4/ext4_jbd2.h | 7 +- + fs/ext4/extents.c | 77 ++- + fs/ext4/file.c | 20 +- + fs/ext4/ialloc.c | 1 + + fs/ext4/indirect.c | 17 + + fs/ext4/inode.c | 1182 ++++++++++++++++++++++++++++++++++++++----- + fs/ext4/ioctl.c | 3 +- + fs/ext4/mballoc.c | 6 +- + fs/ext4/migrate.c | 2 + + fs/ext4/move_extent.c | 11 + + fs/ext4/namei.c | 11 +- + fs/ext4/page-io.c | 201 ++++++++ + fs/ext4/resize.c | 19 +- + fs/ext4/super.c | 67 ++- + fs/jbd2/journal.c | 2 +- + include/linux/jbd2.h | 2 +- + include/trace/events/ext4.h | 207 ++++++++ + 20 files changed, 1747 insertions(+), 194 deletions(-) +Merging f2fs/dev (a605d5d71a6d2 f2fs: fix to use bio_in_atomic() in f2fs_read_end_io()) +$ git merge -m Merge branch 'dev' of https://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 41 +- + MAINTAINERS | 2 +- + fs/f2fs/Makefile | 2 +- + fs/f2fs/acl.c | 26 +- + fs/f2fs/acl.h | 8 +- + fs/f2fs/cache.c | 894 +++++++++++++++++++++ + fs/f2fs/cache.h | 252 ++++++ + fs/f2fs/checkpoint.c | 568 +++++++------- + fs/f2fs/compress.c | 183 ++--- + fs/f2fs/data.c | 661 +++++++++++----- + fs/f2fs/debug.c | 94 ++- + fs/f2fs/dir.c | 221 +++--- + fs/f2fs/extent_cache.c | 25 +- + fs/f2fs/f2fs.h | 512 +++++++----- + fs/f2fs/file.c | 225 +++--- + fs/f2fs/gc.c | 222 +++--- + fs/f2fs/inline.c | 293 +++---- + fs/f2fs/inode.c | 242 +++--- + fs/f2fs/iostat.h | 11 + + fs/f2fs/namei.c | 114 +-- + fs/f2fs/node.c | 1292 +++++++++++++++---------------- + fs/f2fs/node.h | 193 +++-- + fs/f2fs/recovery.c | 255 +++--- + fs/f2fs/segment.c | 438 ++++++----- + fs/f2fs/segment.h | 87 ++- + fs/f2fs/shrinker.c | 16 +- + fs/f2fs/super.c | 343 ++++---- + fs/f2fs/sysfs.c | 42 +- + fs/f2fs/verity.c | 6 +- + fs/f2fs/xattr.c | 133 ++-- + fs/f2fs/xattr.h | 23 +- + include/linux/f2fs_fs.h | 140 ++-- + include/trace/events/f2fs.h | 71 ++ + 33 files changed, 4715 insertions(+), 2920 deletions(-) + create mode 100644 fs/f2fs/cache.c + create mode 100644 fs/f2fs/cache.h +Merging fsverity/for-next (f9e450420da26 fsverity: hoist statx reporting of fs-verity flag) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Auto-merging MAINTAINERS +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/verity.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/verity.c +Auto-merging fs/verity/open.c +Merge made by the 'ort' strategy. + MAINTAINERS | 3 ++- + fs/btrfs/inode.c | 3 --- + fs/btrfs/verity.c | 6 +++++- + fs/ext4/inode.c | 5 +---- + fs/ext4/verity.c | 36 ++++++------------------------------ + fs/f2fs/file.c | 5 +---- + fs/f2fs/verity.c | 34 ++++------------------------------ + fs/file_attr.c | 11 ++++++++--- + fs/stat.c | 6 +++++- + fs/verity/enable.c | 4 +++- + fs/verity/open.c | 26 ++++++++++++++++++++++++-- + fs/verity/pagecache.c | 33 +++++++++++++++++++++++++++++++++ + fs/verity/verify.c | 4 ++++ + include/linux/fsverity.h | 10 +++++++++- + 14 files changed, 105 insertions(+), 81 deletions(-) +Merging fuse/for-next (b776cbe24cc1b fuse: make fuse_backing_get() static) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/file.c +Merge made by the 'ort' strategy. + fs/fuse/Kconfig | 8 +- + fs/fuse/Makefile | 2 +- + fs/fuse/backing.c | 2 +- + fs/fuse/dax.c | 215 +++++++++++---------- + fs/fuse/dev.c | 50 +++-- + fs/fuse/dev.h | 2 +- + fs/fuse/dev_uring.c | 6 + + fs/fuse/dir.c | 4 +- + fs/fuse/file.c | 129 ++++++++----- + fs/fuse/fuse_i.h | 96 +++++---- + fs/fuse/inode.c | 82 +++++--- + fs/fuse/ioctl.c | 3 - + fs/fuse/iomode.c | 4 +- + fs/fuse/notify.c | 4 +- + fs/fuse/passthrough.c | 15 +- + fs/fuse/req.c | 7 +- + fs/fuse/virtio_fs.c | 28 +-- + include/uapi/linux/fuse.h | 12 +- + .../testing/selftests/filesystems/fuse/.gitignore | 1 + + tools/testing/selftests/filesystems/fuse/Makefile | 2 +- + 20 files changed, 380 insertions(+), 292 deletions(-) +Merging gfs2/for-next (d0c4bce31a579 gfs2: gfs2_create_inode excl cleanup) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Merge made by the 'ort' strategy. + fs/gfs2/acl.c | 11 +++-- + fs/gfs2/aops.c | 17 +++---- + fs/gfs2/bmap.c | 93 ++++++++++++++++++++---------------- + fs/gfs2/dentry.c | 6 +-- + fs/gfs2/dir.c | 61 +++++++++++++++--------- + fs/gfs2/export.c | 7 +-- + fs/gfs2/file.c | 72 ++++++++++++++++------------ + fs/gfs2/glock.c | 60 +++++++++++++++-------- + fs/gfs2/glops.c | 13 +++-- + fs/gfs2/incore.h | 8 ++-- + fs/gfs2/inode.c | 132 ++++++++++++++++++++++++++++----------------------- + fs/gfs2/lock_dlm.c | 4 +- + fs/gfs2/log.c | 3 +- + fs/gfs2/lops.c | 18 ++++--- + fs/gfs2/meta_io.c | 7 +-- + fs/gfs2/ops_fstype.c | 26 +++++----- + fs/gfs2/quota.c | 57 ++++++++++++---------- + fs/gfs2/recovery.c | 19 ++++---- + fs/gfs2/rgrp.c | 129 +++++++++++++++++++++++++------------------------ + fs/gfs2/super.c | 98 +++++++++++++++++++++++--------------- + fs/gfs2/trace_gfs2.h | 6 +-- + fs/gfs2/util.c | 8 ++-- + fs/gfs2/xattr.c | 69 ++++++++++++++++----------- + 23 files changed, 528 insertions(+), 396 deletions(-) +Merging jfs/jfs-next (dad98c5b2a05e jfs: avoid -Wtautological-constant-out-of-range-compare warning again) +$ git merge -m Merge branch 'jfs-next' of https://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (bf3465919b033 smb: smbdirect: don't WARN on an unexpected receive opcode) +$ git merge -m Merge branch 'ksmbd-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/smb.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + Documentation/filesystems/smb/ksmbd.rst | 14 +- + fs/smb/common/compress/compress.c | 16 +- + fs/smb/common/fscc.h | 5 +- + fs/smb/common/smbglob.h | 1 + + fs/smb/server/Kconfig | 2 + + fs/smb/server/Makefile | 1 + + fs/smb/server/auth.c | 3 +- + fs/smb/server/compress.c | 1 + + fs/smb/server/connection.c | 3 +- + fs/smb/server/connection.h | 3 + + fs/smb/server/ksmbd_work.c | 3 - + fs/smb/server/ksmbd_work.h | 5 +- + fs/smb/server/mgmt/share_config.c | 43 +- + fs/smb/server/mgmt/share_config.h | 2 + + fs/smb/server/mgmt/user_session.c | 4 +- + fs/smb/server/oplock.c | 20 +- + fs/smb/server/server.c | 21 + + fs/smb/server/smb2ops.c | 33 + + fs/smb/server/smb2pdu.c | 1130 ++++++++++++++++++++----------- + fs/smb/server/smb2pdu.h | 23 +- + fs/smb/server/smb_common.c | 4 +- + fs/smb/server/smb_common.h | 98 +++ + fs/smb/server/smbacl.c | 7 +- + fs/smb/server/tests/Kconfig | 15 + + fs/smb/server/tests/Makefile | 4 + + fs/smb/server/tests/smbacl_kunit.c | 301 ++++++++ + fs/smb/server/transport_tcp.c | 8 +- + fs/smb/server/vfs.c | 106 ++- + fs/smb/server/vfs.h | 8 +- + fs/smb/server/vfs_cache.c | 151 +++-- + fs/smb/server/vfs_cache.h | 16 +- + fs/smb/smbdirect/accept.c | 229 +++++-- + fs/smb/smbdirect/connect.c | 2 +- + fs/smb/smbdirect/connection.c | 14 +- + fs/smb/smbdirect/internal.h | 2 + + fs/smb/smbdirect/listen.c | 137 +++- + fs/smb/smbdirect/socket.c | 113 +++- + fs/smb/smbdirect/socket.h | 42 ++ + 38 files changed, 1920 insertions(+), 670 deletions(-) + create mode 100644 fs/smb/server/tests/Kconfig + create mode 100644 fs/smb/server/tests/Makefile + create mode 100644 fs/smb/server/tests/smbacl_kunit.c +$ git am -3 ../patches/0001-ntfs3-Fix-up-merge-with-Linus.patch +Applying: ntfs3: Fix up merge with Linus +Using index info to reconstruct a base tree... +M fs/ntfs3/file.c +Falling back to patching base and 3-way merge... +Auto-merging fs/ntfs3/file.c +No changes -- Patch already applied. +Merging nfs/linux-next (18a80121193c6 XFS: Remove unused variables) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Merge made by the 'ort' strategy. + fs/nfs/delegation.c | 3 +-- + fs/nfs/dir.c | 2 ++ + fs/nfs/fs_context.c | 1 + + fs/xfs/scrub/stats.c | 3 +-- + fs/xfs/scrub/tempfile.c | 3 +-- + net/sunrpc/xprtrdma/rpc_rdma.c | 14 ++++++++++++-- + 6 files changed, 18 insertions(+), 8 deletions(-) +Merging nfs-anna/linux-next (9ee534a759123 xprtrdma: trim head iovec when the payload arrives via a Write chunk) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfs/fs_context.c +Auto-merging net/sunrpc/xprtrdma/rpc_rdma.c +CONFLICT (content): Merge conflict in net/sunrpc/xprtrdma/rpc_rdma.c +Resolved 'net/sunrpc/xprtrdma/rpc_rdma.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next d0caabfd027da] Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/nfs/index.rst | 1 + + Documentation/filesystems/nfs/keyring.rst | 69 +++++ + fs/nfs/Kconfig | 17 +- + fs/nfs/blocklayout/Makefile | 3 +- + fs/nfs/blocklayout/blocklayout.c | 119 +++++--- + fs/nfs/blocklayout/dev.c | 32 +- + fs/nfs/callback_proc.c | 23 +- + fs/nfs/callback_xdr.c | 9 +- + fs/nfs/client.c | 15 +- + fs/nfs/dir.c | 13 +- + fs/nfs/direct.c | 139 ++++----- + fs/nfs/filelayout/filelayout.c | 17 +- + fs/nfs/filelayout/filelayoutdev.c | 19 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 473 ++++++++++++++++++++---------- + fs/nfs/flexfilelayout/flexfilelayout.h | 48 +-- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 214 ++++++++------ + fs/nfs/fs_context.c | 1 + + fs/nfs/inode.c | 211 +++++++++---- + fs/nfs/internal.h | 33 ++- + fs/nfs/localio.c | 31 +- + fs/nfs/netns.h | 14 +- + fs/nfs/nfs3client.c | 10 +- + fs/nfs/nfs3proc.c | 8 + + fs/nfs/nfs4_fs.h | 3 + + fs/nfs/nfs4client.c | 9 +- + fs/nfs/nfs4proc.c | 141 +++++++++ + fs/nfs/nfs4state.c | 7 +- + fs/nfs/nfs4xdr.c | 5 +- + fs/nfs/nfstrace.h | 5 +- + fs/nfs/pagelist.c | 66 ++++- + fs/nfs/pnfs.c | 388 ++++++++++++++++++++++-- + fs/nfs/pnfs.h | 102 ++++++- + fs/nfs/pnfs_dev.c | 30 +- + fs/nfs/pnfs_nfs.c | 108 +++++-- + fs/nfs/proc.c | 8 + + fs/nfs/read.c | 2 +- + fs/nfs/write.c | 2 +- + include/linux/nfs_fs_sb.h | 8 + + include/linux/nfs_page.h | 8 +- + include/linux/nfs_xdr.h | 2 + + include/linux/sunrpc/xprt.h | 1 + + net/sunrpc/xprtrdma/rpc_rdma.c | 25 +- + net/sunrpc/xprtrdma/verbs.c | 9 +- + net/sunrpc/xprtsock.c | 70 ++--- + 44 files changed, 1931 insertions(+), 587 deletions(-) + create mode 100644 Documentation/filesystems/nfs/keyring.rst +Merging nfsd/nfsd-next (eafb6de800781 SUNRPC: use assign_bit() where applicable) +$ git merge -m Merge branch 'nfsd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging MAINTAINERS +Auto-merging fs/namei.c +Auto-merging fs/nfs/netns.h +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + Documentation/admin-guide/nfs/pnfs-scsi-server.rst | 2 +- + Documentation/netlink/specs/nfsd.yaml | 55 +- + Documentation/sunrpc/xdr/nfs2.x | 254 +++ + MAINTAINERS | 4 +- + fs/lockd/svc.c | 1 - + fs/lockd/svclock.c | 33 +- + fs/lockd/trace.h | 1 - + fs/lockd/xdr.h | 2 +- + fs/namei.c | 2 + + fs/nfs/blocklayout/blocklayout.h | 5 - + fs/nfs/blocklayout/rpc_pipefs.c | 79 +- + fs/nfs/netns.h | 5 +- + fs/nfs/nfs4file.c | 1 + + fs/nfs/super.c | 25 - + fs/nfs_common/common.c | 5 +- + fs/nfs_common/nfs_ssc.c | 126 +- + fs/nfsd/Makefile | 15 +- + fs/nfsd/blocklayout.c | 1 + + fs/nfsd/blocklayoutxdr.c | 11 + + fs/nfsd/export.c | 8 +- + fs/nfsd/export.h | 3 +- + fs/nfsd/filecache.c | 5 +- + fs/nfsd/flexfilelayout.c | 24 +- + fs/nfsd/flexfilelayoutxdr.c | 9 +- + fs/nfsd/flexfilelayoutxdr.h | 8 +- + fs/nfsd/localio.c | 10 +- + fs/nfsd/lockd.c | 5 +- + fs/nfsd/netlink.c | 5 +- + fs/nfsd/netns.h | 17 +- + fs/nfsd/nfs2acl.c | 66 +- + fs/nfsd/nfs2xdr_gen.c | 1079 ++++++++++++ + fs/nfsd/nfs2xdr_gen.h | 46 + + fs/nfsd/nfs3acl.c | 16 + + fs/nfsd/nfs3proc.c | 79 +- + fs/nfsd/nfs3xdr.c | 6 + + fs/nfsd/nfs4acl.c | 1 + + fs/nfsd/nfs4callback.c | 8 +- + fs/nfsd/nfs4ctl.h | 83 + + fs/nfsd/nfs4idmap.c | 5 +- + fs/nfsd/nfs4layouts.c | 5 +- + fs/nfsd/nfs4proc.c | 475 +++--- + fs/nfsd/nfs4recover.c | 92 +- + fs/nfsd/nfs4state.c | 587 ++++++- + fs/nfsd/nfs4xdr.c | 227 ++- + fs/nfsd/nfscache.c | 1 + + fs/nfsd/nfsctl.c | 323 +++- + fs/nfsd/nfsd.h | 243 +-- + fs/nfsd/nfserr.h | 159 ++ + fs/nfsd/nfsfh.c | 73 +- + fs/nfsd/nfsfh.h | 33 +- + fs/nfsd/nfsproc.c | 1597 ++++++++++++------ + fs/nfsd/nfssvc.c | 74 +- + fs/nfsd/nfsxdr.c | 606 ++----- + fs/nfsd/state.h | 46 +- + fs/nfsd/trace.h | 45 +- + fs/nfsd/vfs.c | 537 +++--- + fs/nfsd/vfs.h | 79 +- + fs/nfsd/xdr.h | 173 +- + fs/nfsd/xdr3.h | 5 +- + fs/nfsd/xdr4.h | 156 +- + fs/nfsd/xdr4cb.h | 20 +- + include/linux/nfs.h | 55 +- + include/linux/nfs3.h | 43 + + include/linux/nfs4.h | 6 + + include/linux/nfs_common.h | 4 +- + include/linux/nfs_fh.h | 63 + + include/linux/nfs_ssc.h | 69 +- + include/linux/nfsd_ssc.h | 38 + + include/linux/nfslocalio.h | 11 +- + include/linux/sunrpc/clnt.h | 3 +- + include/linux/sunrpc/svc.h | 95 +- + include/linux/sunrpc/svc_rdma.h | 2 +- + include/linux/sunrpc/svc_xprt.h | 5 +- + include/linux/sunrpc/xdr.h | 1 + + include/linux/sunrpc/xdrgen/_defs.h | 34 + + include/linux/sunrpc/xdrgen/nfs2.h | 298 ++++ + include/trace/misc/nfs.h | 13 +- + include/uapi/linux/nfsd_netlink.h | 20 + + net/sunrpc/auth_gss/svcauth_gss.c | 29 +- + net/sunrpc/rpcb_clnt.c | 34 +- + net/sunrpc/svc.c | 72 +- + net/sunrpc/svc_xprt.c | 83 +- + net/sunrpc/svcauth_unix.c | 9 + + net/sunrpc/svcsock.c | 508 +++--- + net/sunrpc/xdr.c | 3 + + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 18 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +- + tools/net/sunrpc/xdrgen/README | 154 +- + tools/net/sunrpc/xdrgen/generators/pointer.py | 68 +- + tools/net/sunrpc/xdrgen/generators/struct.py | 203 ++- + tools/net/sunrpc/xdrgen/generators/union.py | 69 +- + tools/net/sunrpc/xdrgen/grammars/xdr.lark | 2 + + tools/net/sunrpc/xdrgen/subcmds/source.py | 19 +- + .../templates/C/pointer/decoder/pages_opaque.j2 | 6 + + .../templates/C/pointer/definition/pages_opaque.j2 | 5 + + .../templates/C/pointer/encoder/pages_opaque.j2 | 10 + + .../C/struct/declaration/aggregate_hooks.j2 | 14 + + .../templates/C/struct/decoder/aggregate_array.j2 | 33 + + .../C/struct/decoder/aggregate_optional.j2 | 10 + + .../templates/C/struct/decoder/pages_opaque.j2 | 6 + + .../templates/C/struct/definition/pages_opaque.j2 | 5 + + .../templates/C/struct/encoder/aggregate_array.j2 | 37 + + .../C/struct/encoder/aggregate_optional.j2 | 29 + + .../templates/C/struct/encoder/pages_opaque.j2 | 10 + + .../templates/C/union/encoder/pages_opaque.j2 | 10 + + tools/net/sunrpc/xdrgen/xdr_ast.py | 506 ++++++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/nfsd/.gitignore | 1 + + tools/testing/selftests/nfsd/Makefile | 6 + + tools/testing/selftests/nfsd/config | 14 + + .../testing/selftests/nfsd/nfsd_netlink_listener.c | 1721 ++++++++++++++++++++ + tools/testing/selftests/nfsd/settings | 1 + + 112 files changed, 9312 insertions(+), 2813 deletions(-) + create mode 100644 Documentation/sunrpc/xdr/nfs2.x + create mode 100644 fs/nfsd/nfs2xdr_gen.c + create mode 100644 fs/nfsd/nfs2xdr_gen.h + create mode 100644 fs/nfsd/nfs4ctl.h + create mode 100644 fs/nfsd/nfserr.h + create mode 100644 include/linux/nfs_fh.h + create mode 100644 include/linux/nfsd_ssc.h + create mode 100644 include/linux/sunrpc/xdrgen/nfs2.h + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/pages_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/pages_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/pages_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/declaration/aggregate_hooks.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/aggregate_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/aggregate_optional.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/pages_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/pages_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/aggregate_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/aggregate_optional.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/pages_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/pages_opaque.j2 + create mode 100644 tools/testing/selftests/nfsd/.gitignore + create mode 100644 tools/testing/selftests/nfsd/Makefile + create mode 100644 tools/testing/selftests/nfsd/config + create mode 100644 tools/testing/selftests/nfsd/nfsd_netlink_listener.c + create mode 100644 tools/testing/selftests/nfsd/settings +$ git am -3 ../patches/0001-Revert-smb-client-implement-fileattr_get-to-support-.patch +Applying: Revert "smb: client: implement fileattr_get to support FS_IOC_GETFLAGS" +Using index info to reconstruct a base tree... +M fs/smb/client/cifsfs.c +M fs/smb/client/cifsfs.h +M fs/smb/client/inode.c +Falling back to patching base and 3-way merge... +Auto-merging fs/smb/client/inode.c +Auto-merging fs/smb/client/cifsfs.h +Auto-merging fs/smb/client/cifsfs.c +No changes -- Patch already applied. +Merging ntfs/ntfs-next (04fb910da2c85 ntfs: fix NULL dereference on index allocation open failure) +$ git merge -m Merge branch 'ntfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/ntfs.git ntfs/ntfs-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/filesystems/ntfs.rst | 60 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + MAINTAINERS | 1 + + fs/ntfs/Makefile | 2 +- + fs/ntfs/aops.c | 7 +- + fs/ntfs/attrib.c | 328 ++-- + fs/ntfs/attrib.h | 2 +- + fs/ntfs/attrlist.c | 22 +- + fs/ntfs/bitmap.c | 72 +- + fs/ntfs/bitmap.h | 2 + + fs/ntfs/collate.c | 8 +- + fs/ntfs/compress.c | 4 +- + fs/ntfs/dir.c | 30 +- + fs/ntfs/ea.c | 496 +++--- + fs/ntfs/ea.h | 9 + + fs/ntfs/file.c | 454 ++++- + fs/ntfs/index.c | 7 +- + fs/ntfs/index.h | 2 +- + fs/ntfs/inode.c | 431 +++-- + fs/ntfs/inode.h | 21 + + fs/ntfs/iomap.c | 215 ++- + fs/ntfs/layout.h | 19 +- + fs/ntfs/lcnalloc.c | 35 +- + fs/ntfs/logfile.c | 11 +- + fs/ntfs/mft.c | 980 +++++++---- + fs/ntfs/mft.h | 19 +- + fs/ntfs/mst.c | 4 +- + fs/ntfs/named_stream.c | 1821 ++++++++++++++++++++ + fs/ntfs/namei.c | 208 ++- + fs/ntfs/ntfs.h | 11 +- + fs/ntfs/reparse.c | 2 +- + fs/ntfs/runlist.c | 103 +- + fs/ntfs/runlist.h | 3 + + fs/ntfs/stream.h | 81 + + fs/ntfs/super.c | 607 ++++++- + fs/ntfs/unistr.c | 29 +- + fs/ntfs/volume.h | 20 + + fs/ntfs/wof.c | 6 +- + include/uapi/linux/ntfs.h | 130 ++ + 39 files changed, 5102 insertions(+), 1161 deletions(-) + create mode 100644 fs/ntfs/named_stream.c + create mode 100644 fs/ntfs/stream.h + create mode 100644 include/uapi/linux/ntfs.h +Merging ntfs3/master (80218408836fa fs/ntfs3: do not mark frame pages uptodate on read error) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/dir.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/super.c +Merge made by the 'ort' strategy. + Documentation/filesystems/ntfs3.rst | 23 +++++ + fs/ntfs3/attrib.c | 175 ++++++++++++++++++++++-------------- + fs/ntfs3/dir.c | 47 +++++----- + fs/ntfs3/file.c | 3 + + fs/ntfs3/frecord.c | 16 ++-- + fs/ntfs3/fslog.c | 7 +- + fs/ntfs3/fsntfs.c | 3 + + fs/ntfs3/index.c | 32 +++++-- + fs/ntfs3/inode.c | 30 +++++-- + fs/ntfs3/namei.c | 6 +- + fs/ntfs3/ntfs_fs.h | 5 +- + fs/ntfs3/record.c | 16 +++- + fs/ntfs3/super.c | 33 ++++++- + fs/ntfs3/xattr.c | 39 ++++++-- + 14 files changed, 305 insertions(+), 130 deletions(-) +Merging orangefs/for-next (2bc09cb0e9e44 orangefs: don't continue on to gpf if client dies on write.) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux.git orangefs/for-next +Merge made by the 'ort' strategy. + fs/orangefs/inode.c | 21 ++++++++++++++++++++- + fs/orangefs/orangefs-debugfs.c | 10 ++++++---- + fs/orangefs/super.c | 18 ++++++++++++++++++ + 3 files changed, 44 insertions(+), 5 deletions(-) +Merging overlayfs/overlayfs-next (1f6ee9be92f8d ovl: make fsync after metadata copy-up opt-in mount option) +$ git merge -m Merge branch 'overlayfs-next' of https://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (a5e0055eac837 UBI: support per-device wear-leveling threshold) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (c60ae98c5aa64 9p: Fix v9fs_issue_write() to update i_size and remote_i_size) +$ git merge -m Merge branch '9p-next' of https://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (028ef9c96e961 Linux 7.0) +$ git merge -m Merge branch 'ericvh/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Already up to date. +Merging xfs/for-next (ec8f62cc109a3 xfs: don't limit software atomic writes by the group alignment) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/libxfs/xfs_exchmaps.c +Auto-merging fs/xfs/scrub/stats.c +Auto-merging fs/xfs/xfs_exchrange.c +Merge made by the 'ort' strategy. + .../filesystems/xfs/xfs-online-fsck-design.rst | 13 +- + block/bio-integrity-fs.c | 15 +- + block/bio-integrity.c | 1 + + block/bio.c | 219 ++++------- + block/blk-map.c | 2 +- + block/blk-settings.c | 6 + + block/fops.c | 3 +- + block/partitions/efi.h | 8 +- + fs/iomap/bio.c | 4 +- + fs/iomap/direct-io.c | 44 +-- + fs/iomap/ioend.c | 122 +++++- + fs/xfs/libxfs/xfs_alloc.c | 106 ++++-- + fs/xfs/libxfs/xfs_alloc.h | 7 +- + fs/xfs/libxfs/xfs_attr.c | 14 +- + fs/xfs/{ => libxfs}/xfs_attr_item.h | 2 - + fs/xfs/libxfs/xfs_attr_leaf.c | 25 +- + fs/xfs/libxfs/xfs_bmap.c | 16 +- + fs/xfs/libxfs/xfs_bmap.h | 8 +- + fs/xfs/{ => libxfs}/xfs_bmap_item.h | 2 - + fs/xfs/libxfs/xfs_btree.c | 10 +- + fs/xfs/libxfs/xfs_btree_mem.c | 6 +- + fs/xfs/{ => libxfs}/xfs_buf_item.h | 2 - + fs/xfs/libxfs/xfs_da_btree.c | 14 + + fs/xfs/libxfs/xfs_defer.c | 1 - + fs/xfs/libxfs/xfs_dir2_sf.c | 68 ++-- + fs/xfs/libxfs/xfs_dquot_buf.c | 13 +- + fs/xfs/{ => libxfs}/xfs_dquot_item.h | 0 + fs/xfs/libxfs/xfs_errortag.h | 6 +- + fs/xfs/libxfs/xfs_exchmaps.c | 1 - + fs/xfs/libxfs/xfs_exchmaps.h | 3 +- + fs/xfs/{ => libxfs}/xfs_exchmaps_item.h | 2 - + fs/xfs/{ => libxfs}/xfs_extfree_item.h | 2 - + fs/xfs/libxfs/xfs_format.h | 6 +- + fs/xfs/libxfs/xfs_ialloc.c | 48 ++- + fs/xfs/libxfs/xfs_ialloc_btree.c | 1 - + fs/xfs/libxfs/xfs_ialloc_btree.h | 5 +- + fs/xfs/{ => libxfs}/xfs_icreate_item.h | 0 + fs/xfs/libxfs/xfs_inode_buf.c | 7 +- + fs/xfs/libxfs/xfs_inode_fork.c | 4 +- + fs/xfs/{ => libxfs}/xfs_inode_item.h | 2 - + fs/xfs/libxfs/xfs_inode_util.c | 3 +- + fs/xfs/{ => libxfs}/xfs_iunlink_item.h | 0 + fs/xfs/libxfs/xfs_metadir.c | 32 +- + fs/xfs/libxfs/xfs_metadir.h | 5 +- + fs/xfs/libxfs/xfs_parent.h | 1 - + fs/xfs/libxfs/xfs_refcount.c | 1 - + fs/xfs/libxfs/xfs_refcount_btree.c | 16 +- + fs/xfs/libxfs/xfs_refcount_btree.h | 26 ++ + fs/xfs/{ => libxfs}/xfs_refcount_item.h | 2 - + fs/xfs/libxfs/xfs_rmap.c | 13 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 16 +- + fs/xfs/libxfs/xfs_rmap_btree.h | 26 ++ + fs/xfs/{ => libxfs}/xfs_rmap_item.h | 2 - + fs/xfs/libxfs/xfs_rtbitmap.c | 80 ++-- + fs/xfs/libxfs/xfs_rtbitmap.h | 45 +-- + fs/xfs/libxfs/xfs_rtgroup.c | 1 - + fs/xfs/libxfs/xfs_rtrefcount_btree.c | 121 +----- + fs/xfs/libxfs/xfs_rtrefcount_btree.h | 5 +- + fs/xfs/libxfs/xfs_rtrmap_btree.c | 236 +----------- + fs/xfs/libxfs/xfs_rtrmap_btree.h | 3 +- + fs/xfs/libxfs/xfs_sb.c | 41 -- + fs/xfs/libxfs/xfs_sb.h | 1 - + fs/xfs/libxfs/xfs_symlink_remote.c | 8 +- + fs/xfs/libxfs/xfs_symlink_remote.h | 2 +- + fs/xfs/{ => libxfs}/xfs_trans.h | 11 +- + fs/xfs/libxfs/xfs_trans_inode.c | 2 - + fs/xfs/libxfs/xfs_trans_resv.c | 45 +-- + fs/xfs/libxfs/xfs_trans_space.c | 6 +- + fs/xfs/libxfs/xfs_types.c | 7 +- + fs/xfs/libxfs/xfs_types.h | 7 +- + fs/xfs/libxfs/xfs_zones.h | 6 + + fs/xfs/scrub/agheader.c | 64 +++- + fs/xfs/scrub/agheader_repair.c | 44 ++- + fs/xfs/scrub/alloc_repair.c | 30 +- + fs/xfs/scrub/attr.c | 119 ++++-- + fs/xfs/scrub/attr_repair.c | 53 +-- + fs/xfs/scrub/bitmap.c | 20 + + fs/xfs/scrub/bmap.c | 31 +- + fs/xfs/scrub/bmap_repair.c | 19 +- + fs/xfs/scrub/btree.c | 20 +- + fs/xfs/scrub/common.c | 57 +-- + fs/xfs/scrub/common.h | 46 +-- + fs/xfs/scrub/cow_repair.c | 96 +++-- + fs/xfs/scrub/dabtree.c | 27 +- + fs/xfs/scrub/dir.c | 130 ++++++- + fs/xfs/scrub/dir_repair.c | 125 ++++-- + fs/xfs/scrub/dirtree.c | 4 +- + fs/xfs/scrub/dirtree_repair.c | 76 +++- + fs/xfs/scrub/dqiterate.c | 1 + + fs/xfs/scrub/fscounters.c | 42 +- + fs/xfs/scrub/ialloc_repair.c | 12 +- + fs/xfs/scrub/inode.c | 8 +- + fs/xfs/scrub/inode_repair.c | 197 +++++++++- + fs/xfs/scrub/iscan.c | 2 +- + fs/xfs/scrub/metapath.c | 17 +- + fs/xfs/scrub/newbt.c | 19 +- + fs/xfs/scrub/newbt.h | 1 - + fs/xfs/scrub/orphanage.c | 2 +- + fs/xfs/scrub/parent_repair.c | 4 + + fs/xfs/scrub/quota.c | 10 +- + fs/xfs/scrub/quota_repair.c | 76 +++- + fs/xfs/scrub/quotacheck_repair.c | 54 ++- + fs/xfs/scrub/readdir.c | 2 +- + fs/xfs/scrub/reap.c | 65 +++- + fs/xfs/scrub/refcount.c | 44 +-- + fs/xfs/scrub/refcount.h | 56 +++ + fs/xfs/scrub/refcount_repair.c | 7 +- + fs/xfs/scrub/repair.c | 72 +++- + fs/xfs/scrub/repair.h | 14 +- + fs/xfs/scrub/rgsuper.c | 37 +- + fs/xfs/scrub/rmap_repair.c | 8 +- + fs/xfs/scrub/rtbitmap.c | 4 +- + fs/xfs/scrub/rtbitmap_repair.c | 21 +- + fs/xfs/scrub/rtrefcount.c | 273 +------------ + fs/xfs/scrub/rtrefcount_repair.c | 50 +-- + fs/xfs/scrub/rtrmap.c | 4 +- + fs/xfs/scrub/rtrmap_repair.c | 14 +- + fs/xfs/scrub/rtsummary.c | 13 +- + fs/xfs/scrub/rtsummary.h | 1 + + fs/xfs/scrub/rtsummary_repair.c | 17 +- + fs/xfs/scrub/scrub.c | 6 +- + fs/xfs/scrub/stats.c | 5 +- + fs/xfs/scrub/symlink.c | 17 +- + fs/xfs/scrub/symlink_repair.c | 16 +- + fs/xfs/scrub/trace.c | 13 + + fs/xfs/scrub/trace.h | 10 +- + fs/xfs/scrub/xfarray.c | 205 +++++----- + fs/xfs/scrub/xfarray.h | 9 +- + fs/xfs/xfs_aops.c | 13 +- + fs/xfs/xfs_bmap_item.c | 2 +- + fs/xfs/xfs_buf.c | 11 + + fs/xfs/xfs_dquot.c | 20 +- + fs/xfs/xfs_dquot.h | 2 +- + fs/xfs/xfs_error.c | 16 +- + fs/xfs/xfs_error.h | 9 +- + fs/xfs/xfs_exchmaps_item.c | 13 +- + fs/xfs/xfs_exchrange.c | 2 +- + fs/xfs/xfs_file.c | 36 +- + fs/xfs/xfs_handle.c | 2 +- + fs/xfs/xfs_inode.c | 20 +- + fs/xfs/xfs_inode.h | 11 +- + fs/xfs/xfs_inode_item.c | 3 +- + fs/xfs/xfs_inode_item_recover.c | 20 +- + fs/xfs/xfs_ioctl.c | 421 +++++++++++++-------- + fs/xfs/xfs_ioctl.h | 4 +- + fs/xfs/xfs_ioctl32.c | 188 +++++---- + fs/xfs/xfs_ioend.c | 222 +++++++++-- + fs/xfs/xfs_ioend.h | 2 + + fs/xfs/xfs_iomap.c | 55 ++- + fs/xfs/xfs_iops.c | 30 +- + fs/xfs/xfs_log.c | 86 ++++- + fs/xfs/xfs_log_cil.c | 9 +- + fs/xfs/xfs_log_priv.h | 10 +- + fs/xfs/xfs_log_recover.c | 3 +- + fs/xfs/xfs_mount.c | 44 ++- + fs/xfs/xfs_mount.h | 10 + + fs/xfs/xfs_platform.h | 1 + + fs/xfs/xfs_pnfs.c | 19 +- + fs/xfs/xfs_qm.c | 42 +- + fs/xfs/xfs_quota.h | 9 + + fs/xfs/xfs_rmap_item.c | 2 +- + fs/xfs/xfs_rtalloc.h | 49 ++- + fs/xfs/xfs_super.c | 3 +- + fs/xfs/xfs_symlink.c | 4 +- + fs/xfs/xfs_sysfs.c | 78 +++- + fs/xfs/xfs_trace.h | 29 +- + fs/xfs/xfs_trans.c | 8 +- + fs/xfs/xfs_trans_dquot.c | 6 +- + fs/xfs/xfs_verify_media.c | 87 ++--- + fs/xfs/xfs_zone_alloc.c | 40 +- + include/linux/bio-integrity.h | 3 +- + include/linux/bio.h | 11 +- + include/linux/blkdev.h | 8 +- + include/linux/iomap.h | 38 +- + 174 files changed, 3363 insertions(+), 2315 deletions(-) + rename fs/xfs/{ => libxfs}/xfs_attr_item.h (97%) + rename fs/xfs/{ => libxfs}/xfs_bmap_item.h (98%) + rename fs/xfs/{ => libxfs}/xfs_buf_item.h (98%) + rename fs/xfs/{ => libxfs}/xfs_dquot_item.h (100%) + rename fs/xfs/{ => libxfs}/xfs_exchmaps_item.h (98%) + rename fs/xfs/{ => libxfs}/xfs_extfree_item.h (98%) + rename fs/xfs/{ => libxfs}/xfs_icreate_item.h (100%) + rename fs/xfs/{ => libxfs}/xfs_inode_item.h (98%) + rename fs/xfs/{ => libxfs}/xfs_iunlink_item.h (100%) + rename fs/xfs/{ => libxfs}/xfs_refcount_item.h (98%) + rename fs/xfs/{ => libxfs}/xfs_rmap_item.h (98%) + rename fs/xfs/{ => libxfs}/xfs_trans.h (98%) + create mode 100644 fs/xfs/scrub/refcount.h +Merging zonefs/for-next (3a8389d42bdf4 zonefs: handle integer overflow in zonefs_fname_to_fno) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging vfs-brauner/vfs.all (ac311bf4f20e6 bfs: remove leftover dir.c) +$ git merge -m Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging Documentation/filesystems/index.rst +Auto-merging MAINTAINERS +Auto-merging fs/btrfs/btrfs_inode.h +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/configfs/configfs_internal.h +Auto-merging fs/configfs/dir.c +Auto-merging fs/configfs/inode.c +Auto-merging fs/erofs/internal.h +Auto-merging fs/exfat/exfat_fs.h +Auto-merging fs/exfat/file.c +Auto-merging fs/exfat/namei.c +Auto-merging fs/ext2/ext2.h +Auto-merging fs/ext2/inode.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/ext4_jbd2.c +Auto-merging fs/ext4/ialloc.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/ioctl.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/f2fs/acl.c +Auto-merging fs/f2fs/acl.h +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/namei.c +Auto-merging fs/f2fs/xattr.c +Auto-merging fs/file_attr.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/ioctl.c +Auto-merging fs/fuse/req.c +Auto-merging fs/gfs2/acl.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/gfs2/log.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/gfs2/xattr.c +Auto-merging fs/jbd2/journal.c +Auto-merging fs/namei.c +Auto-merging fs/nfs/Kconfig +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/ntfs/ea.c +Auto-merging fs/ntfs/ea.h +Auto-merging fs/ntfs/file.c +Auto-merging fs/ntfs/inode.h +Auto-merging fs/ntfs/namei.c +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/namei.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/xattr.c +Auto-merging fs/orangefs/inode.c +Auto-merging fs/quota/dquot.c +Auto-merging fs/smb/client/cifsfs.c +Auto-merging fs/smb/client/cifsfs.h +Auto-merging fs/smb/client/cifsglob.h +Auto-merging fs/smb/client/cifsproto.h +Auto-merging fs/smb/client/dir.c +Auto-merging fs/smb/client/inode.c +Auto-merging fs/smb/client/link.c +Auto-merging fs/smb/client/smb2ops.c +Auto-merging fs/smb/client/transport.c +CONFLICT (content): Merge conflict in fs/smb/client/transport.c +Auto-merging fs/smb/client/xattr.c +Auto-merging fs/smb/server/oplock.c +Auto-merging fs/smb/server/smb2pdu.c +CONFLICT (content): Merge conflict in fs/smb/server/smb2pdu.c +Auto-merging fs/smb/server/smb_common.c +Auto-merging fs/smb/server/smbacl.c +Auto-merging fs/smb/server/vfs.c +CONFLICT (content): Merge conflict in fs/smb/server/vfs.c +Auto-merging fs/smb/server/vfs.h +CONFLICT (content): Merge conflict in fs/smb/server/vfs.h +Auto-merging fs/smb/smbdirect/connection.c +Auto-merging fs/stat.c +Auto-merging fs/xfs/xfs_handle.c +Auto-merging fs/xfs/xfs_inode.c +Auto-merging fs/xfs/xfs_inode.h +Auto-merging fs/xfs/xfs_ioctl.c +Auto-merging fs/xfs/xfs_ioctl.h +Auto-merging fs/xfs/xfs_iops.c +Auto-merging fs/xfs/xfs_symlink.c +Auto-merging tools/testing/selftests/Makefile +Resolved 'fs/smb/client/transport.c' using previous resolution. +Resolved 'fs/smb/server/smb2pdu.c' using previous resolution. +Resolved 'fs/smb/server/vfs.c' using previous resolution. +Resolved 'fs/smb/server/vfs.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[fs-next c0361eb51cb4e] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + CREDITS | 2 +- + Documentation/admin-guide/binfmt-misc.rst | 3 + + Documentation/admin-guide/kernel-parameters.txt | 16 + + Documentation/bpf/kfuncs.rst | 74 + + Documentation/bpf/signing.rst | 283 ++- + Documentation/core-api/folio_queue.rst | 209 --- + Documentation/core-api/index.rst | 1 - + Documentation/filesystems/befs.rst | 4 +- + Documentation/filesystems/bfs.rst | 60 - + Documentation/filesystems/index.rst | 1 - + Documentation/filesystems/locking.rst | 24 +- + Documentation/filesystems/netfs_library.rst | 9 +- + Documentation/filesystems/porting.rst | 25 +- + Documentation/filesystems/proc.rst | 4 + + Documentation/filesystems/squashfs.rst | 6 +- + Documentation/filesystems/vfs.rst | 30 +- + Documentation/security/keys/core.rst | 13 + + MAINTAINERS | 8 +- + arch/alpha/include/uapi/asm/socket.h | 4 + + arch/arm64/net/bpf_jit_comp.c | 5 + + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/maltaup_xpa_defconfig | 1 - + arch/mips/configs/rm200_defconfig | 1 - + arch/mips/include/uapi/asm/socket.h | 4 + + arch/parisc/include/uapi/asm/socket.h | 4 + + arch/powerpc/Kconfig | 1 - + arch/powerpc/configs/fsl-emb-nonhw.config | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/include/asm/elf.h | 6 - + arch/powerpc/include/asm/spu.h | 3 - + arch/powerpc/platforms/cell/Kconfig | 1 - + arch/powerpc/platforms/cell/spu_syscalls.c | 20 - + arch/powerpc/platforms/cell/spufs/Makefile | 1 - + arch/powerpc/platforms/cell/spufs/coredump.c | 183 -- + arch/powerpc/platforms/cell/spufs/file.c | 114 -- + arch/powerpc/platforms/cell/spufs/inode.c | 14 +- + arch/powerpc/platforms/cell/spufs/spufs.h | 12 - + arch/powerpc/platforms/cell/spufs/syscalls.c | 4 - + arch/riscv/net/bpf_jit.h | 4 + + arch/riscv/net/bpf_jit_comp64.c | 109 +- + arch/riscv/net/bpf_jit_core.c | 7 + + arch/riscv/net/bpf_timed_may_goto.S | 8 +- + arch/sparc/include/uapi/asm/socket.h | 4 + + arch/x86/Kconfig | 1 + + arch/x86/net/bpf_jit_comp.c | 295 ++- + drivers/android/binder/rust_binderfs.c | 2 +- + drivers/android/binderfs.c | 2 +- + drivers/base/devtmpfs.c | 108 +- + drivers/gpio/gpiolib-cdev.c | 18 +- + drivers/gpu/drm/msm/msm_perfcntr.c | 4 +- + drivers/md/dm-verity-verify-sig.c | 3 + + drivers/media/mc/mc-request.c | 8 +- + drivers/misc/ntsync.c | 6 +- + fs/9p/acl.c | 4 +- + fs/9p/acl.h | 4 +- + fs/9p/v9fs.h | 2 +- + fs/9p/v9fs_vfs.h | 2 +- + fs/9p/vfs_addr.c | 1 - + fs/9p/vfs_inode.c | 14 +- + fs/9p/vfs_inode_dotl.c | 14 +- + fs/9p/xattr.c | 2 +- + fs/Kconfig | 9 +- + fs/Makefile | 1 - + fs/adfs/adfs.h | 2 +- + fs/adfs/dir.c | 2 +- + fs/adfs/inode.c | 2 +- + fs/affs/affs.h | 10 +- + fs/affs/inode.c | 2 +- + fs/affs/namei.c | 8 +- + fs/afs/dir.c | 52 +- + fs/afs/dir_edit.c | 43 +- + fs/afs/dir_search.c | 33 +- + fs/afs/file.c | 8 +- + fs/afs/inode.c | 6 +- + fs/afs/internal.h | 14 +- + fs/afs/security.c | 2 +- + fs/afs/symlink.c | 38 +- + fs/afs/xattr.c | 4 +- + fs/aio.c | 11 +- + fs/anon_inodes.c | 4 +- + fs/attr.c | 16 +- + fs/autofs/root.c | 12 +- + fs/backing-file.c | 2 +- + fs/bad_inode.c | 20 +- + fs/bfs/Kconfig | 21 - + fs/bfs/Makefile | 8 - + fs/bfs/bfs.h | 69 - + fs/bfs/dir.c | 356 ---- + fs/bfs/file.c | 203 -- + fs/bfs/inode.c | 538 ------ + fs/binfmt_elf.c | 18 +- + fs/binfmt_elf_fdpic.c | 14 +- + fs/binfmt_misc.c | 12 +- + fs/bpf_fs_kfuncs.c | 4 +- + fs/btrfs/acl.c | 2 +- + fs/btrfs/acl.h | 2 +- + fs/btrfs/btrfs_inode.h | 2 +- + fs/btrfs/inode.c | 24 +- + fs/btrfs/ioctl.c | 16 +- + fs/btrfs/ioctl.h | 2 +- + fs/btrfs/xattr.c | 6 +- + fs/buffer.c | 131 +- + fs/cachefiles/Kconfig | 2 +- + fs/cachefiles/interface.c | 96 +- + fs/cachefiles/internal.h | 18 +- + fs/cachefiles/io.c | 474 +++-- + fs/cachefiles/namei.c | 34 +- + fs/cachefiles/xattr.c | 82 +- + fs/ceph/Kconfig | 1 + + fs/ceph/acl.c | 2 +- + fs/ceph/addr.c | 4 +- + fs/ceph/dir.c | 10 +- + fs/ceph/file.c | 2 +- + fs/ceph/inode.c | 10 +- + fs/ceph/mds_client.h | 2 +- + fs/ceph/super.h | 10 +- + fs/ceph/xattr.c | 2 +- + fs/char_dev.c | 4 +- + fs/coda/coda_linux.h | 6 +- + fs/coda/dir.c | 10 +- + fs/coda/inode.c | 4 +- + fs/coda/pioctl.c | 4 +- + fs/configfs/configfs_internal.h | 4 +- + fs/configfs/dir.c | 2 +- + fs/configfs/inode.c | 2 +- + fs/configfs/symlink.c | 2 +- + fs/coredump.c | 580 ++++-- + fs/dax.c | 26 +- + fs/dcache.c | 206 +- + fs/debugfs/inode.c | 2 +- + fs/devpts/inode.c | 2 + + fs/ecryptfs/inode.c | 26 +- + fs/efivarfs/inode.c | 6 +- + fs/erofs/inode.c | 2 +- + fs/erofs/internal.h | 2 +- + fs/eventfd.c | 4 +- + fs/eventpoll.c | 6 +- + fs/exec.c | 28 +- + fs/exfat/exfat_fs.h | 4 +- + fs/exfat/file.c | 6 +- + fs/exfat/misc.c | 2 +- + fs/exfat/namei.c | 6 +- + fs/ext2/acl.c | 2 +- + fs/ext2/acl.h | 2 +- + fs/ext2/ext2.h | 6 +- + fs/ext2/inode.c | 4 +- + fs/ext2/ioctl.c | 2 +- + fs/ext2/namei.c | 12 +- + fs/ext2/xattr.c | 2 +- + fs/ext2/xattr_security.c | 2 +- + fs/ext2/xattr_trusted.c | 2 +- + fs/ext2/xattr_user.c | 2 +- + fs/ext4/acl.c | 2 +- + fs/ext4/acl.h | 2 +- + fs/ext4/ext4.h | 10 +- + fs/ext4/ext4_jbd2.c | 2 +- + fs/ext4/ialloc.c | 2 +- + fs/ext4/inode.c | 6 +- + fs/ext4/ioctl.c | 6 +- + fs/ext4/mmp.c | 2 +- + fs/ext4/namei.c | 16 +- + fs/ext4/symlink.c | 2 +- + fs/ext4/xattr_hurd.c | 2 +- + fs/ext4/xattr_security.c | 2 +- + fs/ext4/xattr_trusted.c | 2 +- + fs/ext4/xattr_user.c | 2 +- + fs/f2fs/acl.c | 6 +- + fs/f2fs/acl.h | 2 +- + fs/f2fs/f2fs.h | 8 +- + fs/f2fs/file.c | 14 +- + fs/f2fs/namei.c | 24 +- + fs/f2fs/xattr.c | 4 +- + fs/failfs.c | 4 +- + fs/fat/fat.h | 4 +- + fs/fat/file.c | 6 +- + fs/fat/misc.c | 2 +- + fs/fat/namei_msdos.c | 6 +- + fs/fat/namei_vfat.c | 6 +- + fs/fhandle.c | 2 +- + fs/file.c | 321 +++- + fs/file_attr.c | 6 +- + fs/fs-writeback.c | 23 +- + fs/fs_pin.c | 9 +- + fs/fuse/acl.c | 4 +- + fs/fuse/dir.c | 51 +- + fs/fuse/file.c | 2 +- + fs/fuse/fuse_i.h | 12 +- + fs/fuse/ioctl.c | 2 +- + fs/fuse/req.c | 8 +- + fs/fuse/xattr.c | 2 +- + fs/gfs2/acl.c | 2 +- + fs/gfs2/acl.h | 2 +- + fs/gfs2/file.c | 2 +- + fs/gfs2/inode.c | 16 +- + fs/gfs2/inode.h | 4 +- + fs/gfs2/log.c | 4 +- + fs/gfs2/lops.c | 4 +- + fs/gfs2/xattr.c | 2 +- + fs/hfs/attr.c | 2 +- + fs/hfs/dir.c | 6 +- + fs/hfs/hfs_fs.h | 2 +- + fs/hfs/inode.c | 2 +- + fs/hfsplus/dir.c | 10 +- + fs/hfsplus/hfsplus_fs.h | 4 +- + fs/hfsplus/inode.c | 6 +- + fs/hfsplus/xattr.c | 2 +- + fs/hfsplus/xattr_security.c | 2 +- + fs/hfsplus/xattr_trusted.c | 2 +- + fs/hfsplus/xattr_user.c | 2 +- + fs/hostfs/hostfs_kern.c | 14 +- + fs/hpfs/hpfs_fn.h | 2 +- + fs/hpfs/inode.c | 2 +- + fs/hpfs/namei.c | 10 +- + fs/hugetlbfs/inode.c | 14 +- + fs/inode.c | 14 +- + fs/internal.h | 30 +- + fs/iomap/bio.c | 46 +- + fs/iomap/buffered-io.c | 8 +- + fs/iomap/direct-io.c | 52 +- + fs/iomap/fiemap.c | 8 +- + fs/iomap/ioend.c | 58 +- + fs/iomap/iter.c | 1 + + fs/jbd2/commit.c | 22 +- + fs/jbd2/journal.c | 31 +- + fs/jbd2/transaction.c | 2 +- + fs/jffs2/acl.c | 2 +- + fs/jffs2/acl.h | 2 +- + fs/jffs2/dir.c | 20 +- + fs/jffs2/fs.c | 2 +- + fs/jffs2/os-linux.h | 2 +- + fs/jffs2/security.c | 2 +- + fs/jffs2/xattr_trusted.c | 2 +- + fs/jffs2/xattr_user.c | 2 +- + fs/jfs/acl.c | 2 +- + fs/jfs/file.c | 2 +- + fs/jfs/ioctl.c | 2 +- + fs/jfs/jfs_acl.h | 2 +- + fs/jfs/jfs_inode.h | 4 +- + fs/jfs/namei.c | 10 +- + fs/jfs/xattr.c | 4 +- + fs/kernfs/dir.c | 231 ++- + fs/kernfs/file.c | 47 +- + fs/kernfs/inode.c | 10 +- + fs/kernfs/kernfs-internal.h | 24 +- + fs/kernfs/mount.c | 34 +- + fs/kernfs/symlink.c | 17 +- + fs/libfs.c | 8 +- + fs/minix/file.c | 2 +- + fs/minix/inode.c | 2 +- + fs/minix/minix.h | 2 +- + fs/minix/namei.c | 12 +- + fs/mnt_idmapping.c | 33 +- + fs/namei.c | 153 +- + fs/namespace.c | 40 +- + fs/netfs/Kconfig | 3 + + fs/netfs/Makefile | 3 +- + fs/netfs/buffered_read.c | 251 ++- + fs/netfs/buffered_write.c | 69 +- + fs/netfs/bvecq.c | 344 ++++ + fs/netfs/direct_read.c | 14 +- + fs/netfs/direct_write.c | 8 +- + fs/netfs/fscache_cookie.c | 8 +- + fs/netfs/fscache_internal.h | 14 - + fs/netfs/fscache_io.c | 10 +- + fs/netfs/internal.h | 78 +- + fs/netfs/iterator.c | 35 +- + fs/netfs/main.c | 14 +- + fs/netfs/misc.c | 106 +- + fs/netfs/objects.c | 7 +- + fs/netfs/read_collect.c | 62 +- + fs/netfs/read_pgpriv2.c | 39 +- + fs/netfs/read_retry.c | 36 +- + fs/netfs/read_single.c | 50 +- + fs/netfs/rolling_buffer.c | 193 +- + fs/netfs/stats.c | 10 +- + fs/netfs/write_collect.c | 183 +- + fs/netfs/write_issue.c | 331 +--- + fs/netfs/write_retry.c | 8 +- + fs/nfs/Kconfig | 1 + + fs/nfs/dir.c | 12 +- + fs/nfs/inode.c | 4 +- + fs/nfs/internal.h | 10 +- + fs/nfs/namespace.c | 4 +- + fs/nfs/nfs3_fs.h | 2 +- + fs/nfs/nfs3acl.c | 2 +- + fs/nfs/nfs4proc.c | 10 +- + fs/nfs/unlink.c | 3 + + fs/nfsd/vfs.c | 13 +- + fs/nilfs2/inode.c | 4 +- + fs/nilfs2/ioctl.c | 2 +- + fs/nilfs2/namei.c | 10 +- + fs/nilfs2/nilfs.h | 6 +- + fs/nls/nls_iso8859-14.c | 26 +- + fs/nsfs.c | 4 +- + fs/ntfs/ea.c | 10 +- + fs/ntfs/ea.h | 6 +- + fs/ntfs/file.c | 4 +- + fs/ntfs/inode.h | 4 +- + fs/ntfs/namei.c | 12 +- + fs/ntfs3/file.c | 6 +- + fs/ntfs3/inode.c | 2 +- + fs/ntfs3/namei.c | 10 +- + fs/ntfs3/ntfs_fs.h | 16 +- + fs/ntfs3/xattr.c | 12 +- + fs/nullfs.c | 4 +- + fs/ocfs2/acl.c | 2 +- + fs/ocfs2/acl.h | 2 +- + fs/ocfs2/buffer_head_io.c | 12 +- + fs/ocfs2/dlmfs/dlmfs.c | 6 +- + fs/ocfs2/file.c | 6 +- + fs/ocfs2/file.h | 6 +- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/ioctl.h | 2 +- + fs/ocfs2/journal.c | 25 +- + fs/ocfs2/namei.c | 10 +- + fs/ocfs2/xattr.c | 6 +- + fs/omfs/dir.c | 6 +- + fs/omfs/file.c | 2 +- + fs/omfs/inode.c | 4 +- + fs/open.c | 50 +- + fs/orangefs/acl.c | 2 +- + fs/orangefs/inode.c | 8 +- + fs/orangefs/namei.c | 8 +- + fs/orangefs/orangefs-kernel.h | 8 +- + fs/orangefs/xattr.c | 2 +- + fs/overlayfs/dir.c | 14 +- + fs/overlayfs/file.c | 2 +- + fs/overlayfs/inode.c | 16 +- + fs/overlayfs/overlayfs.h | 14 +- + fs/overlayfs/ovl_entry.h | 2 +- + fs/overlayfs/util.c | 4 +- + fs/overlayfs/xattrs.c | 4 +- + fs/pidfs.c | 33 +- + fs/pipe.c | 2 +- + fs/posix_acl.c | 26 +- + fs/proc/base.c | 53 +- + fs/proc/fd.c | 6 +- + fs/proc/fd.h | 2 +- + fs/proc/generic.c | 4 +- + fs/proc/internal.h | 4 +- + fs/proc/proc_net.c | 2 +- + fs/proc/proc_sysctl.c | 6 +- + fs/proc/root.c | 2 +- + fs/proc/vmcore.c | 20 + + fs/quota/dquot.c | 2 +- + fs/ramfs/file-nommu.c | 4 +- + fs/ramfs/inode.c | 10 +- + fs/read_write.c | 8 +- + fs/remap_range.c | 2 +- + fs/smb/client/cifsacl.c | 4 +- + fs/smb/client/cifsfs.c | 2 +- + fs/smb/client/cifsfs.h | 16 +- + fs/smb/client/cifsglob.h | 2 +- + fs/smb/client/cifsproto.h | 4 +- + fs/smb/client/dir.c | 6 +- + fs/smb/client/inode.c | 8 +- + fs/smb/client/link.c | 2 +- + fs/smb/client/smb2ops.c | 78 +- + fs/smb/client/transport.c | 13 +- + fs/smb/client/xattr.c | 2 +- + fs/smb/server/ndr.c | 2 +- + fs/smb/server/ndr.h | 2 +- + fs/smb/server/oplock.c | 2 +- + fs/smb/server/smb2pdu.c | 22 +- + fs/smb/server/smb_common.c | 2 +- + fs/smb/server/smbacl.c | 20 +- + fs/smb/server/smbacl.h | 8 +- + fs/smb/server/vfs.c | 44 +- + fs/smb/server/vfs.h | 32 +- + fs/smb/smbdirect/connection.c | 135 +- + fs/splice.c | 70 +- + fs/stat.c | 4 +- + fs/tests/.kunitconfig | 2 + + fs/tests/fdtable_kunit.c | 72 + + fs/tracefs/event_inode.c | 2 +- + fs/tracefs/inode.c | 8 +- + fs/ubifs/dir.c | 14 +- + fs/ubifs/file.c | 4 +- + fs/ubifs/ioctl.c | 2 +- + fs/ubifs/ubifs.h | 6 +- + fs/ubifs/xattr.c | 2 +- + fs/udf/file.c | 2 +- + fs/udf/namei.c | 12 +- + fs/udf/symlink.c | 2 +- + fs/ufs/dir.c | 2 +- + fs/ufs/inode.c | 2 +- + fs/ufs/namei.c | 10 +- + fs/ufs/ufs.h | 2 +- + fs/vboxsf/dir.c | 8 +- + fs/vboxsf/utils.c | 4 +- + fs/vboxsf/vfsmod.h | 4 +- + fs/verity/signature.c | 2 + + fs/xattr.c | 30 +- + fs/xfs/libxfs/xfs_errortag.h | 6 +- + fs/xfs/libxfs/xfs_inode_util.h | 2 +- + fs/xfs/xfs_acl.c | 2 +- + fs/xfs/xfs_acl.h | 2 +- + fs/xfs/xfs_handle.c | 6 +- + fs/xfs/xfs_inode.c | 4 +- + fs/xfs/xfs_inode.h | 2 +- + fs/xfs/xfs_ioctl.c | 2 +- + fs/xfs/xfs_ioctl.h | 2 +- + fs/xfs/xfs_iops.c | 24 +- + fs/xfs/xfs_iops.h | 2 +- + fs/xfs/xfs_itable.c | 2 +- + fs/xfs/xfs_itable.h | 2 +- + fs/xfs/xfs_reflink.c | 5 + + fs/xfs/xfs_symlink.c | 2 +- + fs/xfs/xfs_symlink.h | 2 +- + fs/xfs/xfs_xattr.c | 2 +- + fs/zonefs/super.c | 2 +- + include/linux/binfmts.h | 3 +- + include/linux/bpf.h | 21 +- + include/linux/bpf_verifier.h | 32 + + include/linux/btf.h | 1 + + include/linux/buffer_head.h | 86 +- + include/linux/bvec.h | 18 + + include/linux/bvecq.h | 166 ++ + include/linux/capability.h | 8 +- + include/linux/cleanup.h | 7 - + include/linux/coredump.h | 41 +- + include/linux/dax.h | 12 - + include/linux/dcache.h | 38 +- + include/linux/fdtable.h | 16 +- + include/linux/file.h | 130 +- + include/linux/fileattr.h | 2 +- + include/linux/filter.h | 1 + + include/linux/folio_queue.h | 282 --- + include/linux/fs.h | 127 +- + include/linux/fscache-cache.h | 2 +- + include/linux/fscache.h | 53 +- + include/linux/iov_iter.h | 87 +- + include/linux/key.h | 4 + + include/linux/lsm_hook_defs.h | 25 +- + include/linux/mnt_idmapping.h | 24 +- + include/linux/mount.h | 4 +- + include/linux/namei.h | 19 +- + include/linux/netfs.h | 128 +- + include/linux/nfs_fs.h | 6 +- + include/linux/pid.h | 64 +- + include/linux/pid_types.h | 8 + + include/linux/pidfs.h | 5 + + include/linux/posix_acl.h | 24 +- + include/linux/quotaops.h | 6 +- + include/linux/rolling_buffer.h | 42 +- + include/linux/sched.h | 2 +- + include/linux/sched/signal.h | 51 +- + include/linux/security.h | 61 +- + include/linux/socket.h | 9 +- + include/linux/splice.h | 4 +- + include/linux/uidgid.h | 12 +- + include/linux/uio.h | 17 +- + include/linux/user_namespace.h | 11 +- + include/linux/wait_bit.h | 26 + + include/linux/xattr.h | 20 +- + include/net/scm.h | 10 +- + include/net/sock.h | 8 +- + include/trace/events/cachefiles.h | 81 +- + include/trace/events/fscache.h | 10 +- + include/trace/events/landlock.h | 2 +- + include/trace/events/netfs.h | 182 +- + include/uapi/asm-generic/socket.h | 4 + + include/uapi/linux/close_range.h | 31 +- + include/uapi/linux/coredump.h | 149 +- + include/uapi/linux/fs.h | 2 +- + include/uapi/linux/keyctl.h | 3 + + include/uapi/linux/mount.h | 1 + + init/Kconfig | 11 + + init/initramfs.c | 11 +- + io_uring/io-wq.c | 2 + + io_uring/mock_file.c | 8 +- + ipc/mqueue.c | 9 +- + kernel/Makefile | 1 + + kernel/bpf/Kconfig | 17 + + kernel/bpf/Makefile | 3 + + kernel/bpf/backtrack.c | 32 +- + kernel/bpf/bpf_iter.c | 6 +- + kernel/bpf/btf.c | 111 +- + kernel/bpf/cnum_defs.h | 37 +- + kernel/bpf/core.c | 5 + + kernel/bpf/fixups.c | 33 +- + kernel/bpf/inode.c | 6 +- + kernel/bpf/keys.c | 73 + + kernel/bpf/liveness.c | 20 +- + kernel/bpf/queue_stack_maps.c | 3 + + kernel/bpf/stream.c | 55 +- + kernel/bpf/token.c | 6 +- + kernel/bpf/verifier.c | 442 ++++- + kernel/capability.c | 4 +- + kernel/exit.c | 15 +- + kernel/fork.c | 68 +- + kernel/kthread.c | 2 +- + kernel/pid.c | 2 +- + kernel/pid_namespace.c | 3 +- + kernel/ptrace.c | 6 + + kernel/signal.c | 14 + + kernel/tests/.kunitconfig | 4 + + kernel/tests/user_ns_map_kunit.c | 98 + + kernel/user_namespace.c | 89 +- + kernel/utsname.c | 1 - + lib/iov_iter.c | 532 ++++-- + lib/scatterlist.c | 82 +- + lib/tests/kunit_iov_iter.c | 131 +- + mm/secretmem.c | 2 +- + mm/shmem.c | 30 +- + mm/userfaultfd.c | 6 +- + net/bluetooth/af_bluetooth.c | 6 +- + net/bluetooth/hci_sock.c | 8 +- + net/bluetooth/l2cap_sock.c | 2 +- + net/core/scm.c | 48 +- + net/core/sock.c | 108 +- + net/handshake/netlink.c | 8 +- + net/kcm/kcmsock.c | 6 +- + net/socket.c | 6 +- + net/unix/af_unix.c | 68 +- + net/unix/af_unix.h | 3 +- + security/apparmor/apparmorfs.c | 2 +- + security/apparmor/lsm.c | 4 +- + security/commoncap.c | 10 +- + security/integrity/evm/evm_main.c | 26 +- + security/integrity/ima/ima.h | 10 +- + security/integrity/ima/ima_api.c | 2 +- + security/integrity/ima/ima_appraise.c | 12 +- + security/integrity/ima/ima_main.c | 6 +- + security/integrity/ima/ima_policy.c | 4 +- + security/keys/process_keys.c | 83 + + security/security.c | 49 +- + security/selinux/hooks.c | 45 +- + security/selinux/selinuxfs.c | 2 +- + security/smack/smack_lsm.c | 14 +- + tools/bpf/bpftool/btf.c | 6 +- + tools/bpf/bpftool/main.c | 30 +- + tools/bpf/bpftool/main.h | 2 +- + tools/bpf/bpftool/prog.c | 2 +- + tools/bpf/bpftool/sign.c | 24 +- + tools/include/uapi/linux/coredump.h | 149 +- + tools/lib/bpf/btf.c | 14 +- + tools/lib/bpf/libbpf.c | 22 +- + tools/lib/bpf/libbpf_internal.h | 4 +- + tools/lib/bpf/libbpf_probes.c | 11 +- + tools/lib/bpf/usdt.c | 4 + + tools/lib/python/kdoc/xforms_lists.py | 1 + + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/bpf/.gitignore | 1 - + tools/testing/selftests/bpf/Makefile | 31 +- + tools/testing/selftests/bpf/bench.c | 6 + + .../testing/selftests/bpf/benchs/bench_libarena.c | 210 +++ + .../selftests/bpf/benchs/run_bench_libarena.sh | 31 + + .../selftests/bpf/bpftool_btf_dump_sorted.expected | 48 + + .../bpf/bpftool_btf_dump_unsorted.expected | 48 + + tools/testing/selftests/bpf/bpftool_helpers.c | 7 +- + tools/testing/selftests/bpf/config | 2 + + tools/testing/selftests/bpf/libarena/Makefile | 31 +- + .../bpf/libarena/benchs/bench_malloc.bpf.c | 51 + + .../bpf/libarena/include/bpf_arena_spin_lock.h | 2 +- + .../selftests/bpf/libarena/include/bpf_atomic.h | 2 +- + .../selftests/bpf/libarena/include/bpf_may_goto.h | 1 + + .../bpf/libarena/include/libarena/bitmap.h | 30 +- + .../bpf/libarena/include/libarena/common.h | 71 + + .../bpf/libarena/selftests/test_bitmap.bpf.c | 3 + + .../testing/selftests/bpf/libarena/src/asan.bpf.c | 21 +- + .../selftests/bpf/libarena/src/bitmap.bpf.c | 18 - + .../testing/selftests/bpf/libarena/src/buddy.bpf.c | 44 +- + .../selftests/bpf/libarena/src/common.bpf.c | 27 +- + tools/testing/selftests/bpf/network_helpers.c | 46 +- + .../selftests/bpf/prog_tests/aggregate_ret.c | 53 + + .../selftests/bpf/prog_tests/attach_probe.c | 6 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 2 +- + .../selftests/bpf/prog_tests/bpftool_btf_dump.c | 178 ++ + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 127 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 10 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 16 + + .../selftests/bpf/prog_tests/global_data_init.c | 96 +- + tools/testing/selftests/bpf/prog_tests/kasan.c | 479 +++++ + .../testing/selftests/bpf/prog_tests/kernel_flag.c | 3 + + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 2 +- + .../testing/selftests/bpf/prog_tests/lirc_mode2.c | 334 ++++ + .../bpf/prog_tests/prog_tests_framework.c | 23 + + .../selftests/bpf/prog_tests/queue_stack_map.c | 29 + + .../selftests/bpf/prog_tests/signed_loader.c | 600 +++++- + tools/testing/selftests/bpf/prog_tests/stream.c | 67 + + tools/testing/selftests/bpf/prog_tests/usdt.c | 54 + + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + .../selftests/bpf/prog_tests/verify_pkcs7_sig.c | 4 +- + .../selftests/bpf/prog_tests/xdp_adjust_frags.c | 3 + + .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 5 + + .../selftests/bpf/prog_tests/xdp_metadata.c | 4 +- + .../selftests/bpf/progs/aggregate_ret_func.c | 383 ++++ + .../selftests/bpf/progs/aggregate_ret_kfunc.c | 203 ++ + .../bpf/progs/aggregate_ret_kfunc_arena.c | 121 ++ + .../selftests/bpf/progs/aggregate_ret_target.c | 29 + + tools/testing/selftests/bpf/progs/arena_kfunc.c | 3 +- + tools/testing/selftests/bpf/progs/bpf_misc.h | 10 +- + .../selftests/bpf/progs/btf__stack_arg_precision.c | 3 +- + .../bpf/progs/btf__verifier_stack_arg_order.c | 3 +- + .../selftests/bpf/progs/compute_live_registers.c | 36 + + .../testing/selftests/bpf/progs/exceptions_fail.c | 2 +- + .../selftests/bpf/progs/freplace_ret_pair.c | 12 + + tools/testing/selftests/bpf/progs/kasan.c | 502 +++++ + tools/testing/selftests/bpf/progs/kasan_harden.c | 52 + + tools/testing/selftests/bpf/progs/lirc_mode2.c | 32 + + tools/testing/selftests/bpf/progs/stack_arg.c | 3 +- + tools/testing/selftests/bpf/progs/stack_arg_fail.c | 3 +- + .../testing/selftests/bpf/progs/stack_arg_kfunc.c | 3 +- + .../selftests/bpf/progs/stack_arg_precision.c | 4 +- + tools/testing/selftests/bpf/progs/stream.c | 28 + + .../selftests/bpf/progs/test_global_percpu_data.c | 10 +- + .../selftests/bpf/progs/test_lirc_mode2_kern.c | 26 - + .../selftests/bpf/progs/verifier_aggregate_ret.c | 179 ++ + tools/testing/selftests/bpf/progs/verifier_arena.c | 48 + + tools/testing/selftests/bpf/progs/verifier_bswap.c | 3 +- + tools/testing/selftests/bpf/progs/verifier_gotol.c | 1 + + .../selftests/bpf/progs/verifier_jit_inline.c | 2 +- + tools/testing/selftests/bpf/progs/verifier_ldsx.c | 36 +- + .../selftests/bpf/progs/verifier_load_acquire.c | 1 + + tools/testing/selftests/bpf/progs/verifier_movsx.c | 3 +- + .../selftests/bpf/progs/verifier_percpu_addr.c | 1 + + .../selftests/bpf/progs/verifier_private_stack.c | 1 + + tools/testing/selftests/bpf/progs/verifier_sdiv.c | 3 +- + .../selftests/bpf/progs/verifier_stack_arg.c | 4 +- + .../selftests/bpf/progs/verifier_stack_arg_order.c | 4 +- + .../selftests/bpf/progs/verifier_store_release.c | 1 + + tools/testing/selftests/bpf/test_btf.h | 2 +- + .../testing/selftests/bpf/test_kmods/bpf_testmod.c | 182 ++ + .../selftests/bpf/test_kmods/bpf_testmod_kfunc.h | 101 + + tools/testing/selftests/bpf/test_lirc_mode2.sh | 41 - + tools/testing/selftests/bpf/test_lirc_mode2_user.c | 177 -- + tools/testing/selftests/bpf/test_loader.c | 9 + + tools/testing/selftests/bpf/testing_helpers.c | 43 + + tools/testing/selftests/bpf/testing_helpers.h | 3 + + tools/testing/selftests/bpf/unpriv_helpers.c | 19 +- + tools/testing/selftests/bpf/unpriv_helpers.h | 2 + + tools/testing/selftests/bpf/usdt_2.c | 16 + + tools/testing/selftests/bpf/verify_sig_setup.sh | 63 +- + tools/testing/selftests/bpf/vmtest.sh | 16 +- + tools/testing/selftests/bpf/xdp_hw_metadata.c | 2 +- + .../selftests/clone3/clone3_clear_sighand.c | 6 +- + tools/testing/selftests/core/close_range_test.c | 951 ++++++++++ + tools/testing/selftests/coredump/.gitignore | 2 + + tools/testing/selftests/coredump/Makefile | 11 +- + .../selftests/coredump/coredump_notify_signal.h | 29 + + .../coredump/coredump_notify_signal_helper.c | 46 + + .../coredump/coredump_notify_signal_test.c | 245 +++ + .../selftests/coredump/coredump_signal_test.c | 238 +++ + .../coredump/coredump_socket_protocol_test.c | 1983 +++++++++++++++----- + .../selftests/coredump/coredump_socket_test.c | 175 ++ + tools/testing/selftests/coredump/coredump_test.h | 32 +- + .../selftests/coredump/coredump_test_helpers.c | 1788 +++++++++++++++++- + .../selftests/coredump/coredump_test_helpers.h | 81 + + .../selftests/coredump/coredump_worker_test.c | 447 +++++ + tools/testing/selftests/exec/Makefile | 4 + + tools/testing/selftests/exec/binfmt_misc_delim.c | 127 ++ + tools/testing/selftests/filesystems/.gitignore | 1 - + tools/testing/selftests/filesystems/Makefile | 2 +- + tools/testing/selftests/filesystems/config | 8 + + .../selftests/filesystems/file_stressor/.gitignore | 2 + + .../selftests/filesystems/file_stressor/Makefile | 6 + + .../{ => file_stressor}/file_stressor.c | 0 + .../selftests/filesystems/file_stressor/settings | 3 + + .../selftests/filesystems/fscontext_ns/.gitignore | 2 + + .../selftests/filesystems/idmapped_tmpfile.c | 7 + + tools/testing/selftests/filesystems/kernfs_test.c | 1203 +++++++++++- + .../filesystems/open_tree_ns/open_tree_ns_test.c | 198 ++ + .../selftests/filesystems/openat2/openat2_test.c | 10 +- + .../selftests/filesystems/openat2/resolve_test.c | 7 +- + .../filesystems/statmount/statmount_test.c | 2 +- + tools/testing/selftests/namespaces/.gitignore | 1 + + tools/testing/selftests/namespaces/Makefile | 3 +- + .../selftests/namespaces/ns_active_ref_test.c | 29 + + .../selftests/namespaces/uid_map_range_test.c | 299 +++ + tools/testing/selftests/net/af_unix/Makefile | 2 + + tools/testing/selftests/net/af_unix/scm_pidfd.c | 602 ++++++ + tools/testing/selftests/pid_namespace/.gitignore | 1 + + tools/testing/selftests/pid_namespace/Makefile | 2 +- + .../selftests/pid_namespace/pidns_dead_ancestor.c | 174 ++ + tools/testing/selftests/pidfd/pidfd_open_test.c | 2 +- + virt/kvm/guest_memfd.c | 2 +- + 678 files changed, 21142 insertions(+), 7936 deletions(-) + delete mode 100644 Documentation/core-api/folio_queue.rst + delete mode 100644 Documentation/filesystems/bfs.rst + delete mode 100644 arch/powerpc/platforms/cell/spufs/coredump.c + delete mode 100644 fs/bfs/Kconfig + delete mode 100644 fs/bfs/Makefile + delete mode 100644 fs/bfs/bfs.h + delete mode 100644 fs/bfs/dir.c + delete mode 100644 fs/bfs/file.c + delete mode 100644 fs/bfs/inode.c + create mode 100644 fs/netfs/bvecq.c + delete mode 100644 fs/netfs/fscache_internal.h + create mode 100644 fs/tests/.kunitconfig + create mode 100644 fs/tests/fdtable_kunit.c + create mode 100644 include/linux/bvecq.h + delete mode 100644 include/linux/folio_queue.h + create mode 100644 kernel/bpf/keys.c + create mode 100644 kernel/tests/.kunitconfig + create mode 100644 kernel/tests/user_ns_map_kunit.c + create mode 100644 tools/testing/selftests/bpf/benchs/bench_libarena.c + create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_libarena.sh + create mode 100644 tools/testing/selftests/bpf/bpftool_btf_dump_sorted.expected + create mode 100644 tools/testing/selftests/bpf/bpftool_btf_dump_unsorted.expected + create mode 100644 tools/testing/selftests/bpf/libarena/benchs/bench_malloc.bpf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/aggregate_ret.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpftool_btf_dump.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/kasan.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/lirc_mode2.c + create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_func.c + create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_kfunc.c + create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_kfunc_arena.c + create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_target.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_ret_pair.c + create mode 100644 tools/testing/selftests/bpf/progs/kasan.c + create mode 100644 tools/testing/selftests/bpf/progs/kasan_harden.c + create mode 100644 tools/testing/selftests/bpf/progs/lirc_mode2.c + delete mode 100644 tools/testing/selftests/bpf/progs/test_lirc_mode2_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_aggregate_ret.c + delete mode 100755 tools/testing/selftests/bpf/test_lirc_mode2.sh + delete mode 100644 tools/testing/selftests/bpf/test_lirc_mode2_user.c + create mode 100644 tools/testing/selftests/coredump/coredump_notify_signal.h + create mode 100644 tools/testing/selftests/coredump/coredump_notify_signal_helper.c + create mode 100644 tools/testing/selftests/coredump/coredump_notify_signal_test.c + create mode 100644 tools/testing/selftests/coredump/coredump_signal_test.c + create mode 100644 tools/testing/selftests/coredump/coredump_test_helpers.h + create mode 100644 tools/testing/selftests/coredump/coredump_worker_test.c + create mode 100644 tools/testing/selftests/exec/binfmt_misc_delim.c + create mode 100644 tools/testing/selftests/filesystems/config + create mode 100644 tools/testing/selftests/filesystems/file_stressor/.gitignore + create mode 100644 tools/testing/selftests/filesystems/file_stressor/Makefile + rename tools/testing/selftests/filesystems/{ => file_stressor}/file_stressor.c (100%) + create mode 100644 tools/testing/selftests/filesystems/file_stressor/settings + create mode 100644 tools/testing/selftests/filesystems/fscontext_ns/.gitignore + create mode 100644 tools/testing/selftests/namespaces/uid_map_range_test.c + create mode 100644 tools/testing/selftests/pid_namespace/pidns_dead_ancestor.c +$ git am -3 ../patches/0001-ksmbd-Fix-removal-of-type-parameter-from-vfs_path_pa.patch +Applying: ksmbd: Fix removal of type parameter from vfs_path_parent_lookup() +Using index info to reconstruct a base tree... +M fs/smb/server/vfs.c +Falling back to patching base and 3-way merge... +Auto-merging fs/smb/server/vfs.c +No changes -- Patch already applied. +$ git am -3 ../patches/0001-ksmbd-Fix-up-missing-idmap-const.patch +Applying: ksmbd: Fix up missing idmap const +$ git reset HEAD^ +Unstaged changes after reset: +M fs/smb/server/vfs.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[fs-next bdcd6ba6ce8aa] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git + Date: Wed Oct 14 12:45:30 2026 +0100 +$ git am -3 ../patches/0001-ntfs-Fix-up-semantic-conflict-with-const-mnt_idmap-c.patch +Applying: ntfs: Fix up semantic conflict with const mnt_idmap changes +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ntfs/named_stream.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[fs-next d2cf3ca14c747] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git + Date: Wed Oct 14 12:45:30 2026 +0100 +$ git am -3 ../patches/0001-cifs-Fix-semantic-conflict-with-const-mnt_idmap.patch +Applying: cifs: Fix semantic conflict with const mnt_idmap +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ntfs/named_stream.c +M fs/ntfs/stream.h +M fs/smb/client/cifsfs.h +M fs/smb/client/ioctl.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[fs-next d2c30070abc39] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git + Date: Wed Oct 14 12:45:30 2026 +0100 +$ git am -3 ../patches/0001-ntfs-Yet-more-const-struct-mnt_idmap.patch +Applying: ntfs: Yet more const struct mnt_idmap +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ntfs/named_stream.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[fs-next 0d5d0ec4ab0ef] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git + Date: Wed Oct 14 12:45:30 2026 +0100 +$ git am -3 ../patches/0001-ntfs-Yet-more-mnt_idmap.patch +Applying: ntfs: Yet more mnt_idmap +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ntfs/file.c +M fs/ntfs/ntfs.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[fs-next 2eecf3633aa5b] Merge branch 'vfs.all' of https://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git + Date: Wed Oct 14 12:45:30 2026 +0100 +Merging vfs/for-next (4dda01b67c866 Merge branches 'work.dcache', 'work.dcache-d_add' and 'work.configfs' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Merge made by the 'ort' strategy. +Merging mm-fixes/for-next-fixes (8c80684cfd065 Merge https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-hotfixes-unstable into for-next-fixes) +$ git merge -m Merge branch 'for-next-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mm/linux.git mm-fixes/for-next-fixes +Updating 4056b3c9d3c92..8c80684cfd065 +Fast-forward (no commit created; -m option ignored) + lib/assoc_array.c | 36 ++++++++++++++--------- + lib/base64.c | 3 ++ + lib/test_xarray.c | 70 ++++++++++++++++++++++++++++++++++++++++++++ + lib/xarray.c | 8 ++++-- + mm/hugetlb.c | 25 +++++++++++----- + mm/khugepaged.c | 10 +++++-- + mm/memory.c | 29 +++++++++++++------ + mm/userfaultfd.c | 1 + + mm/vmalloc.c | 86 +++++++++++++++++++++++++++++++++++++------------------ + 9 files changed, 204 insertions(+), 64 deletions(-) +Merging fs-current (60ba0601fd51a Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-current' of linux-next fs-current +Merge made by the 'ort' strategy. + Documentation/filesystems/path-lookup.rst | 8 ++++- + fs/9p/v9fs.h | 1 + + fs/9p/vfs_super.c | 4 +-- + fs/afs/internal.h | 2 ++ + fs/afs/super.c | 2 +- + fs/autofs/waitq.c | 25 ++++++++++++---- + fs/ext4/ext4.h | 2 ++ + fs/ext4/extents-test.c | 2 ++ + fs/ext4/extents.c | 1 + + fs/ext4/extents_status.c | 7 ++++- + fs/ext4/extents_status.h | 1 + + fs/ext4/super.c | 13 ++++++-- + fs/namei.c | 30 ++++++++++++++++--- + fs/namespace.c | 14 ++++----- + fs/notify/mark.c | 11 +++++++ + fs/ntfs3/dir.c | 13 ++++++-- + fs/ntfs3/ntfs_fs.h | 3 ++ + fs/ntfs3/super.c | 49 +++++++++++++++++++++++-------- + fs/ocfs2/dlm/dlmcommon.h | 2 ++ + fs/ocfs2/dlm/dlmdebug.c | 5 +++- + fs/ocfs2/dlm/dlmrecovery.c | 2 +- + fs/overlayfs/params.c | 3 ++ + fs/pipe.c | 6 ++-- + fs/tracefs/event_inode.c | 10 ++++++- + fs/unicode/utf8-core.c | 21 ++++++++++--- + include/linux/fsnotify_backend.h | 1 + + include/linux/sched/signal.h | 4 +-- + include/linux/unicode.h | 1 + + ipc/namespace.c | 2 +- + kernel/exit.c | 2 +- + kernel/fork.c | 20 +++++++++---- + kernel/pid_namespace.c | 2 +- + kernel/watch_queue.c | 11 ++++--- + samples/pidfd/Makefile | 2 +- + 34 files changed, 218 insertions(+), 64 deletions(-) +Merging kbuild-current/kbuild-fixes-for-next (fd73f4a665989 Linux 7.3-rc3) +$ git merge -m Merge branch 'kbuild-fixes-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild-current/kbuild-fixes-for-next +Already up to date. +Merging clang-fixes-current/clang-fixes-for-current (df2908090cda3 Linux 7.3-rc2) +$ git merge -m Merge branch 'clang-fixes-for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux.git clang-fixes-current/clang-fixes-for-current +Already up to date. +Merging arc-current/for-curr (f050c3e61d2a1 ARC: arch_cmpxchg_relaxed to use size of pointed type not pointer) +$ git merge -m Merge branch 'for-curr' of https://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (1039bffd6ae9c ARM: 9485/1: mm: acquire mmap write lock around show_pte() for user faults) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (a9cd14bfb0c11 arm64: irq: exclude the softirq stack switch from KCOV) +$ git merge -m Merge branch 'for-next/fixes' of https://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 (59f522f5a0ece Merge tag 'at91-fixes-7.3' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/ti/omap/dra7xx-clocks.dtsi | 2 +- + arch/arm/configs/sama5_defconfig | 4 +- + .../boot/dts/nvidia/tegra264-p4071-0000+p3834.dtsi | 13 ++ + arch/arm64/boot/dts/nvidia/tegra264.dtsi | 180 ++++++++++++++++++--- + .../riscv/boot/dts/microchip/mpfs-beaglev-fire.dts | 18 --- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 2 +- + drivers/soc/tegra/pmc.c | 1 + + 7 files changed, 174 insertions(+), 46 deletions(-) +Merging davinci-current/davinci/for-current (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'davinci/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging realtek-fixes/fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git realtek-fixes/fixes +Already up to date. +Merging drivers-memory-fixes/fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging sophgo-fixes/fixes (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/sophgo/linux.git sophgo-fixes/fixes +Already up to date. +Merging sophgo-soc-fixes/soc-fixes (0af2f6be1b428 Linux 6.15-rc1) +$ git merge -m Merge branch 'soc-fixes' of https://github.com/sophgo/linux.git sophgo-soc-fixes/soc-fixes +Already up to date. +Merging m68k-current/for-linus (2f8e3cad53b5c m68k: nfcon: Do not call console_is_registered() in nfcon_device()) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (93f51579e7df2 Linux 7.3-rc4) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (5b76268dac968 s390/cio: Fix NULL pointer dereference in ccw_device_get_util_str()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging net/main (513444cc62e23 Merge branch 'net-mlx5-hws-fix-reformat-release-and-meter-offset') +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + .../mellanox/mlx5/core/steering/hws/fs_hws.c | 5 +-- + net/netlink/af_netlink.c | 4 +++ + net/rds/rdma_transport.c | 38 +++++++++++++++++++--- + net/sctp/socket.c | 33 ++++++++++++------- + net/vmw_vsock/af_vsock.c | 17 +++++----- + 5 files changed, 69 insertions(+), 28 deletions(-) +Merging bpf/master (ff47652a4b66c Merge tag 'cifs-fixes-7.3-rc6' of https://git.manguebit.org/linux) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git/ bpf/master +Already up to date. +Merging ipsec/master (f9a11716c8445 xfrm: espintcp: reorder operations within espintcp_init_sk) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + include/net/espintcp.h | 5 +++-- + net/xfrm/espintcp.c | 43 +++++++++++++++++++++++++----------------- + net/xfrm/xfrm_interface_core.c | 8 ++++++++ + net/xfrm/xfrm_policy.c | 11 +++++++++-- + net/xfrm/xfrm_replay.c | 6 +++--- + 5 files changed, 49 insertions(+), 24 deletions(-) +Merging netfilter/main (ab699d296e066 Merge branch 'net-always-dissect-gso-packets-in-__virtio_net_hdr_to_skb') +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (6dc989ea46b96 Merge branch 'intel-wired-lan-driver-updates-2026-09-28-idpf-ice-iavf') +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging bluetooth-fixes/master (23ad91f6a21a8 Bluetooth: MSFT: Serialize handle map cleanup with event processing) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth.git bluetooth-fixes/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btintel.c | 1 + + drivers/bluetooth/btmtk.c | 8 +-- + drivers/bluetooth/hci_vhci.c | 4 ++ + drivers/bluetooth/virtio_bt.c | 4 +- + include/net/bluetooth/bluetooth.h | 4 +- + include/net/bluetooth/hci_sync.h | 1 + + net/bluetooth/6lowpan.c | 4 +- + net/bluetooth/hci_core.c | 4 +- + net/bluetooth/hci_debugfs.c | 9 +++ + net/bluetooth/hci_event.c | 58 ++++++++++++++---- + net/bluetooth/hci_sync.c | 53 +++++++++++++++-- + net/bluetooth/iso.c | 3 + + net/bluetooth/l2cap_sock.c | 6 ++ + net/bluetooth/mgmt.c | 122 ++++++++++++++++++++++++++++++++------ + net/bluetooth/msft.c | 6 ++ + net/bluetooth/selftest.c | 1 + + net/bluetooth/smp.c | 1 + + 17 files changed, 241 insertions(+), 48 deletions(-) +Merging wireless/for-next (af32da41b0327 Merge tag 'net-7.3-rc7' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging ath/for-current (08a3f02fea636 wifi: brcmfmac: fix P2P device removal race in brcmf_detach()) +$ git merge -m Merge branch 'for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath/for-current +Already up to date. +Merging iwlwifi/fixes (1e7e30fb650b8 wifi: iwlwifi: mvm: fix VHT NSS reporting on pre-MQ devices) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi/fixes +Merge made by the 'ort' strategy. + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 6 +++--- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 7 +++++-- + drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 1 - + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 5 ++++- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 3 +++ + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 4 ++-- + .../net/wireless/intel/iwlwifi/tests/nvm_parse.c | 24 ++++++++++++++++++---- + 7 files changed, 37 insertions(+), 13 deletions(-) +Merging wpan/master (2b4707a149a55 net: mctp: i3c: serialize probe with bus removal) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (72d3fcf802c45 Linux 7.3-rc5) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (07c75552f7fe6 Merge tag 'asoc-fix-v7.3-rc6' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge -m Merge branch 'for-linus' of https://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 (2a31b5378c6db ASoC: amd: yc: disable MSI on resume) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/amd/yc/pci-acp6x.c | 38 ++++++++++++++++++++++++++++++++++++-- + sound/soc/codecs/cs42l52.c | 2 +- + sound/soc/codecs/cs42l56.c | 2 +- + sound/soc/codecs/max98371.c | 2 +- + sound/soc/codecs/nau8822.c | 4 ++-- + sound/soc/codecs/pcm3168a.c | 2 +- + sound/soc/codecs/wm8978.c | 4 ++-- + sound/soc/intel/avs/pcm.c | 2 +- + sound/soc/sof/ipc4-topology.c | 9 ++++++--- + sound/soc/sof/sof-client.c | 6 +++--- + sound/soc/stm/stm32_spdifrx.c | 2 +- + 11 files changed, 55 insertions(+), 18 deletions(-) +Merging regmap-fixes/for-linus (2e42cade8ff1f regmap: irq: Free the irqdomain we create) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/base/regmap/regmap-irq.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging regulator-fixes/for-linus (28c2388ee24cd regulator: ltc3676: don't read the write-only HRST and CLIRQ registers) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (00765a3467b99 spi: dt-bindings: snps,dw-apb-ssi: Add Synaptics sl2610 spi) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Already up to date. +Merging pci-current/for-linus (4e9f69d082534 PCI: dw-rockchip: Move INTx IRQ setup to probe) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Auto-merging drivers/pci/pcie/aer.c +Merge made by the 'ort' strategy. + drivers/pci/controller/dwc/pcie-dw-rockchip.c | 27 +++++++++++++-------------- + drivers/pci/pcie/aer.c | 3 ++- + drivers/pci/quirks.c | 11 +++++++++++ + include/linux/pci.h | 1 + + 4 files changed, 27 insertions(+), 15 deletions(-) +Merging driver-core.current/driver-core-linus (72d3fcf802c45 Linux 7.3-rc5) +$ git merge -m Merge branch 'driver-core-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (a90ee4305c4a5 Linux 7.3-rc6) +$ git merge -m Merge branch 'tty-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (a90ee4305c4a5 Linux 7.3-rc6) +$ git merge -m Merge branch 'usb-linus' of https://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 (a90ee4305c4a5 Linux 7.3-rc6) +$ git merge -m Merge branch 'usb-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (93f51579e7df2 Linux 7.3-rc4) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (df2908090cda3 Linux 7.3-rc2) +$ git merge -m Merge branch 'staging-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (ceb05f22e5cdc iio: imu: kmx61: reject duplicate event disable) +$ git merge -m Merge branch 'fixes-togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/gyro/bmg160_core.c | 2 +- + drivers/iio/imu/kmx61.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging watchdog-fixes/watchdog (2686e13649a9e watchdog: mediatek: Apply the driver's mode to a watchdog left running) +$ git merge -m Merge branch 'watchdog' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog-fixes/watchdog +Merge made by the 'ort' strategy. + drivers/watchdog/mtk_wdt.c | 43 ++++++++++++++++++++++++------------------- + 1 file changed, 24 insertions(+), 19 deletions(-) +Merging counter-current/counter-current (fd73f4a665989 Linux 7.3-rc3) +$ git merge -m Merge branch 'counter-current' of https://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 (a90ee4305c4a5 Linux 7.3-rc6) +$ git merge -m Merge branch 'char-misc-linus' of https://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 (93f51579e7df2 Linux 7.3-rc4) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (96a8479804e3f thunderbolt: Do not RPM complete unrelated subtrees on unplug) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Merge made by the 'ort' strategy. + drivers/thunderbolt/icm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging input-current/for-linus (41363c27b8509 Input: xpad - add support for 8BitDo Pro 2 Wired Controller for Xbox) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (10396a2d6d41d crypto: s390/hmac - Generate intermediate CV for API partial block handling) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging libcrypto-fixes/libcrypto-fixes (7b817748bf083 lib/crypto: tests: Add Poly1305 split-update carry regression test) +$ git merge -m Merge branch 'libcrypto-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto-fixes/libcrypto-fixes +Merge made by the 'ort' strategy. + lib/crypto/arm64/poly1305-armv8.pl | 2 +- + lib/crypto/poly1305.c | 2 +- + lib/crypto/tests/poly1305_kunit.c | 97 ++++++++++++++++++++++++++++++++++---- + 3 files changed, 90 insertions(+), 11 deletions(-) +Merging vfio-fixes/for-linus (e242e974e812e vfio: selftests: Add luuid to libvfio.mk's list of libraries, not to the Makefile) +$ git merge -m Merge branch 'for-linus' of https://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging dmaengine-fixes/fixes (93f51579e7df2 Linux 7.3-rc4) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'for-backlight-fixes' of https://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 (1c1a342aceec7 mtd: spinand: Do not update the QE bit on devices without one) +$ git merge -m Merge branch 'mtd/fixes' of https://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 (d5d2d7a8d8be1 MAINTAINERS: Add a mailing list entry to MFD) +$ git merge -m Merge branch 'for-mfd-fixes' of https://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 (2579cbe68005f media: em28xx: use video_unregister_device for radio_dev) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (71827776667f4 reset: imx7: Correct polarity of MIPI CSI resets on i.MX8MQ) +$ git merge -m Merge branch 'reset/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (93f51579e7df2 Linux 7.3-rc4) +$ git merge -m Merge branch 'mips-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (afb1ecfeda3fc ARM: configs: sama5: enable current Microchip KSZ DSA symbols) +$ git merge -m Merge branch 'at91-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (2fabd2f406d0c ARM: dts: ti/omap: dra7: fix PCIe PHY clock divider definition) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap-fixes/fixes +Already up to date. +Merging tegra-fixes/fixes (6c143432a14db Merge branch for-7.3/arm64/dt-fixes into fixes) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra-fixes/fixes +Merge made by the 'ort' strategy. +Merging kvm-fixes/master (e90ab3669181c KVM: x86/mmu: Cope with the SS bit being set in #NPF exit codes) +$ 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 (f47190b08b71e s390/uv: Prevent potential out-of-bounds read) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging kvm-arm-fixes/fixes (71cc2c67fb8f8 KVM: arm64: Use stage-1 leaf size for VM_PFNMAP) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm-fixes/fixes +Already up to date. +Merging hwmon-fixes/hwmon (61406e9cac695 hwmon: (sht4x) Fix jiffies wraparound in heater-ready check) +$ git merge -m Merge branch 'hwmon' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + Documentation/hwmon/k10temp.rst | 8 +++----- + drivers/hwmon/coretemp.c | 5 +++++ + drivers/hwmon/k10temp.c | 5 ++--- + drivers/hwmon/lm70.c | 8 ++++---- + drivers/hwmon/lm95245.c | 6 +++--- + drivers/hwmon/sht4x.c | 18 +++++++++--------- + drivers/hwmon/tmp102.c | 8 ++++---- + drivers/hwmon/tmp108.c | 8 ++++---- + 8 files changed, 34 insertions(+), 32 deletions(-) +Merging nvdimm-fixes/libnvdimm-fixes (a8aec14230322 nvdimm/bus: Fix potential use after free in asynchronous initialization) +$ git merge -m Merge branch 'libnvdimm-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/dma-mapping-fixes (911655ab1dfb9 swiotlb: fix default_swiotlb_limit() for non-growable default pool) +$ git merge -m Merge branch 'dma-mapping-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping-fixes/dma-mapping-fixes +Already up to date. +Merging drivers-x86-fixes/fixes (d144a494d81fc MAINTAINERS: fix sysfs-platform-ayaneo-ec documentation path) +$ git merge -m Merge branch 'fixes' of https://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 (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging pinctrl-qcom-fixes/pinctrl-qcom/for-current (1df7f369075d7 pinctrl: qcom: kaanapali: add the I2C strong pull-up bit) +$ git merge -m Merge branch 'pinctrl-qcom/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pinctrl-qcom-fixes/pinctrl-qcom/for-current +Merge made by the 'ort' strategy. + drivers/pinctrl/qcom/pinctrl-hawi.c | 1 + + drivers/pinctrl/qcom/pinctrl-ipq5018.c | 20 ++++++++--------- + drivers/pinctrl/qcom/pinctrl-kaanapali.c | 1 + + drivers/pinctrl/qcom/pinctrl-maili.c | 1 + + drivers/pinctrl/qcom/pinctrl-nord.c | 1 + + drivers/pinctrl/qcom/pinctrl-qcs8300.c | 1 + + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 37 +++++++++++++++++++++++++------- + 7 files changed, 44 insertions(+), 18 deletions(-) +Merging devicetree-fixes/dt/linus (30724547b221e of/irq: Fix remaining refcount leaks in of_irq_init()) +$ git merge -m Merge branch 'dt/linus' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (11bffcd9cb346 scsi: libiscsi: Validate the task named by a management response) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + drivers/scsi/libiscsi.c | 14 ++++++++------ + drivers/scsi/st.c | 18 ++++++++++++------ + drivers/scsi/xen-scsifront.c | 1 + + drivers/target/iscsi/iscsi_target_configfs.c | 26 +++++++++++++++++++------- + drivers/target/target_core_transport.c | 8 ++++---- + 5 files changed, 44 insertions(+), 23 deletions(-) +Merging drm-fixes/drm-fixes (24a19b953e2a3 Linux 7.3-rc7) +$ git merge -m Merge branch 'drm-fixes' of https://gitlab.freedesktop.org/drm/kernel.git drm-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (24a19b953e2a3 Linux 7.3-rc7) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (c96ca94425b07 memstick: rtsx_usb_ms: complete requests after eject instead of dropping them) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (055ef5ce9f67a rtc: spear: initialize IRQ state before requesting alarm IRQ) +$ git merge -m Merge branch 'rtc-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'gnss-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (ca039df94983c PCI: hv: Warn when wait_for_response() waits indefinitely) +$ git merge -m Merge branch 'hyperv-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 -- + arch/x86/hyperv/hv_init.c | 7 +++--- + drivers/hv/channel.c | 2 +- + drivers/hv/channel_mgmt.c | 12 ++++++--- + drivers/hv/connection.c | 1 - + drivers/hv/mshv_vtl_main.c | 3 +++ + drivers/hv/vmbus_drv.c | 19 ++++++-------- + drivers/pci/controller/pci-hyperv.c | 49 +++++++++++++++++++++++++++++-------- + tools/hv/hv_get_dns_info.sh | 2 +- + 9 files changed, 64 insertions(+), 33 deletions(-) +Merging risc-v-fixes/fixes (d4f25b097e46d riscv: fix load_unaligned_zeropad() fixup for RV32) +$ git merge -m Merge branch 'fixes' of https://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 (0f70fd6f4c1d6 riscv: dts: microchip: beaglev-fire: remove double definition of gpio interrupts) +$ git merge -m Merge branch 'riscv-dt-fixes' of https://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 (3a25c1c77dc37 soc: mpfs: use kref cleanup on probe failure) +$ git merge -m Merge branch 'riscv-soc-fixes' of https://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 | 7 ++++--- + lib/cache_maint.c | 4 ++-- + 2 files changed, 6 insertions(+), 5 deletions(-) +Merging fpga-fixes/fixes (19272b37aa4f8 Linux 6.16-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'spdx-linus' of https://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 (52336337f1a01 tools: gpio: fix building from the top level with O=) +$ git merge -m Merge branch 'gpio/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Merge made by the 'ort' strategy. + drivers/gpio/gpio-nct6694.c | 2 +- + tools/gpio/Makefile | 6 ++++++ + 2 files changed, 7 insertions(+), 1 deletion(-) +Merging gpio-intel-fixes/fixes (3fd4bf93d586c gpiolib: acpi: Fix GPIO lookup using relative path) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Merge made by the 'ort' strategy. + drivers/gpio/gpio-crystalcove.c | 1 + + drivers/gpio/gpiolib-acpi-core.c | 10 ++++++---- + drivers/gpio/gpiolib-acpi-quirks.c | 29 +++++++++++++++++++++++++++++ + 3 files changed, 36 insertions(+), 4 deletions(-) +Merging pinctrl-intel-fixes/fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging auxdisplay-fixes/fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'kunit-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging renesas-fixes/fixes (8dc2615d57020 arm64: dts: renesas: r8a779f0: Set UFS lane count) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging perf-current/perf-tools (aadea57f53288 perf powerpc-vpadtl: Fix raw_size of DTL samples) +$ git merge -m Merge branch 'perf-tools' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools.git perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (d8809f6931065 efi: sysfb_efi: Extend quirk to cover IdeaPad Duet 3 10IGL5-LTE) +$ git merge -m Merge branch 'urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging battery-fixes/fixes (5b4bd13e05529 power: supply: core: prevent unregistering a power supply while a callback runs) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging iommufd-fixes/for-rc (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (4056b3c9d3c92 Merge tag 'nios2_update_for_v7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging w1-fixes/fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (4c66c423593e2 pmdomain: rockchip: don't ignore clock lookup errors on attach) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging i2c-andi-fixes/i2c/i2c-fixes (195f3d74b5de9 i2c: qcom-cci: Fix HALT_ACK reset request being dropped) +$ git merge -m Merge branch 'i2c/i2c-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-andi-fixes/i2c/i2c-fixes +Merge made by the 'ort' strategy. + drivers/i2c/busses/i2c-qcom-cci.c | 4 ++-- + drivers/i2c/busses/i2c-qcom-geni.c | 37 ++++++++++++++++++++----------------- + drivers/i2c/busses/i2c-viai2c-wmt.c | 2 +- + 3 files changed, 23 insertions(+), 20 deletions(-) +Merging i2c-rust-fixes/rust-i2c-fixes (4eb422482ca5d rust: i2c: fix I2cAdapter refcounts double increment) +$ git merge -m Merge branch 'rust-i2c-fixes' of https://github.com/ikrtn/rust-for-linux i2c-rust-fixes/rust-i2c-fixes +Already up to date. +Merging sparc-fixes/for-linus (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'for-linus' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc-fixes/for-linus +Already up to date. +Merging clk-fixes/clk-fixes (81493c1dd1b1e Merge tag 'tags/spacemit-clk-fixes-for-7.3-1' into clk-fixes) +$ git merge -m Merge branch 'clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk-fixes/clk-fixes +Already up to date. +Merging thead-clk-fixes/thead-clk-fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'thead-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk-fixes/thead-clk-fixes +Already up to date. +Merging tenstorrent-clk-fixes/tenstorrent-clk-fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'tenstorrent-clk-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-clk-fixes/tenstorrent-clk-fixes +Already up to date. +Merging fustini-config-fixes/riscv-config-fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'riscv-config-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git fustini-config-fixes/riscv-config-fixes +Already up to date. +Merging pwrseq-fixes/pwrseq/for-current (dbd674ccf30f6 power: sequencing: qcom-wcn: power off WLAN at probe) +$ git merge -m Merge branch 'pwrseq/for-current' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq-fixes/pwrseq/for-current +Merge made by the 'ort' strategy. + drivers/power/sequencing/pwrseq-qcom-wcn.c | 16 +--------------- + 1 file changed, 1 insertion(+), 15 deletions(-) +Merging thead-dt-fixes/thead-dt-fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'thead-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt-fixes/thead-dt-fixes +Already up to date. +Merging ftrace-fixes/ftrace/fixes (1650a1b6cb1ae fgraph: Check ftrace_pids_enabled on registration for early filtering) +$ git merge -m Merge branch 'ftrace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace-fixes/ftrace/fixes +Already up to date. +Merging ring-buffer-fixes/ring-buffer/fixes (057caace5214d tracing: Create output file from cmd_check_undefined) +$ git merge -m Merge branch 'ring-buffer/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ring-buffer-fixes/ring-buffer/fixes +Already up to date. +Merging trace-fixes/trace/fixes (d860c67c05168 ring-buffer: Check resize_disabled before publishing the new subbuf order) +$ git merge -m Merge branch 'trace/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git trace-fixes/trace/fixes +Already up to date. +Merging tracefs-fixes/tracefs/fixes (07004a8c4b572 eventfs: Hold eventfs_mutex and SRCU when remount walks events) +$ git merge -m Merge branch 'tracefs/fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git tracefs-fixes/tracefs/fixes +Already up to date. +Merging spacemit-fixes/fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/spacemit/linux spacemit-fixes/fixes +Already up to date. +Merging tip-fixes/tip/urgent (eb4c2a1ff4869 Merge branch into tip/master: 'x86/mm') +$ git merge -m Merge branch 'tip/urgent' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip-fixes/tip/urgent +Merge made by the 'ort' strategy. + arch/x86/include/asm/pgtable.h | 6 +++++- + arch/x86/kernel/cfi.c | 14 +++++++------- + arch/x86/mm/init_64.c | 3 ++- + arch/x86/mm/pat/set_memory.c | 23 +++++++++++++++++++---- + 4 files changed, 33 insertions(+), 13 deletions(-) +Merging kexec-fixes/kexec-fixes (a901b0778ae82 Merge patch series "kexec: fix probe error codes and error propagation") +$ git merge -m Merge branch 'kexec-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git kexec-fixes/kexec-fixes +Merge made by the 'ort' strategy. + arch/arm64/kernel/kexec_image.c | 4 ++-- + arch/loongarch/kernel/kexec_efi.c | 4 ++-- + arch/riscv/kernel/kexec_image.c | 4 ++-- + kernel/kexec_elf.c | 4 ++-- + kernel/kexec_file.c | 12 +++++++----- + 5 files changed, 15 insertions(+), 13 deletions(-) +Merging liveupdate-fixes/fixes (3a0b8fa2eb36a kho: fix size calculation in kho_preserved_memory_reserve()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git liveupdate-fixes/fixes +Already up to date. +Merging drm-msm-fixes/msm-fixes (a15fac810c763 dt-bindings: display/msm: Use consistent indentation in the example) +$ git merge -m Merge branch 'msm-fixes' of https://gitlab.freedesktop.org/drm/msm.git drm-msm-fixes/msm-fixes +Already up to date. +Merging uml-fixes/fixes (af421e9aed392 um: vector: fix use-after-free in vector_mmsg_rx()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging fwctl-fixes/for-rc (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'for-rc' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl-fixes/for-rc +Already up to date. +Merging devsec-tsm-fixes/fixes (c3fd16c3b98ed virt: tdx-guest: Fix handling of host controlled 'quote' buffer length) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm-fixes/fixes +Already up to date. +Merging drm-rust-fixes/for-linux-next-fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust-fixes/for-linux-next-fixes +Already up to date. +Merging tenstorrent-dt-fixes/tenstorrent-dt-fixes (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'tenstorrent-dt-fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-dt-fixes/tenstorrent-dt-fixes +Already up to date. +Merging nfc-fixes/for-linus (b61732f47316d nfc: pn533: fix OOB read in pn533_acr122_is_rx_frame_valid()) +$ git merge -m Merge branch 'for-linus' of https://codeberg.org/linux-nfc/linux.git nfc-fixes/for-linus +Already up to date. +Merging mm-nonmm-hotfixes-stable/mm-nonmm-hotfixes-stable (ff47652a4b66c Merge tag 'cifs-fixes-7.3-rc6' of https://git.manguebit.org/linux) +$ git merge -m Merge branch 'mm-nonmm-hotfixes-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-hotfixes-stable/mm-nonmm-hotfixes-stable +Already up to date. +Merging mm-nonmm-hotfixes-unstable/mm-nonmm-hotfixes-unstable (ff47652a4b66c Merge tag 'cifs-fixes-7.3-rc6' of https://git.manguebit.org/linux) +$ git merge -m Merge branch 'mm-nonmm-hotfixes-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-hotfixes-unstable/mm-nonmm-hotfixes-unstable +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (8907eb42c08b8 drm/virtio: Reset device before deleting virtqueues on freeze) +$ git merge -m Merge branch 'for-linux-next-fixes' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc-fixes/for-linux-next-fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 7 ++++--- + drivers/accel/amdxdna/Kconfig | 1 + + drivers/accel/rocket/rocket_device.c | 2 ++ + drivers/accel/rocket/rocket_device.h | 1 + + drivers/accel/rocket/rocket_drv.c | 7 +++++-- + drivers/accel/rocket/rocket_job.c | 2 +- + drivers/dma-buf/Kconfig | 2 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 20 +++++++++++--------- + drivers/gpu/drm/virtio/virtgpu_drv.c | 1 + + drivers/gpu/drm/virtio/virtgpu_plane.c | 13 ------------- + 10 files changed, 27 insertions(+), 29 deletions(-) +Merging rust/rust-next (3132a951a7e4e rust: id_pool: add contiguous ID reservation) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging drivers/android/binder/node.rs +Auto-merging drivers/android/binder/thread.rs +Auto-merging init/Kconfig +Merge made by the 'ort' strategy. + Documentation/rust/general-information.rst | 4 +- + MAINTAINERS | 11 + + Makefile | 2 + + drivers/android/binder/allocation.rs | 4 +- + drivers/android/binder/context.rs | 6 +- + drivers/android/binder/debug.rs | 4 +- + drivers/android/binder/freeze.rs | 2 +- + drivers/android/binder/node.rs | 4 +- + drivers/android/binder/page_range.rs | 12 +- + drivers/android/binder/process.rs | 22 +- + drivers/android/binder/range_alloc/tree.rs | 26 +- + drivers/android/binder/thread.rs | 48 +- + drivers/android/binder/transaction.rs | 6 +- + include/linux/spinlock_types_raw.h | 4 + + init/Kconfig | 3 - + rust/.gitignore | 1 - + rust/Makefile | 12 +- + rust/bindgen_parameters | 2 +- + rust/bindings/bindings_helper.h | 2 +- + rust/bindings/lib.rs | 30 + + rust/helpers/helpers.c | 2 + + rust/helpers/math.c | 8 + + rust/helpers/ratelimit.c | 14 + + rust/kernel/Kconfig.test | 21 + + rust/kernel/alloc.rs | 6 + + rust/kernel/alloc/kbox.rs | 7 +- + rust/kernel/bitfield.rs | 1 - + rust/kernel/bitmap.rs | 336 ++++- + rust/kernel/bug.rs | 39 +- + rust/kernel/id_pool.rs | 32 + + rust/kernel/kunit.rs | 12 +- + rust/kernel/lib.rs | 2 + + rust/kernel/mem.rs | 70 ++ + rust/kernel/miscdevice.rs | 35 +- + rust/kernel/num.rs | 149 +++ + rust/kernel/num/bounded.rs | 16 + + rust/kernel/prelude.rs | 9 + + rust/kernel/ptr.rs | 12 +- + rust/kernel/ratelimit.rs | 201 +++ + rust/kernel/sizes.rs | 47 +- + rust/kernel/str.rs | 2 +- + rust/kernel/sync.rs | 138 +-- + rust/kernel/sync/lock/spinlock.rs | 28 + + rust/kernel/sync/lockdep.rs | 161 +++ + rust/kernel/time.rs | 173 ++- + rust/kernel/time/delay.rs | 17 +- + rust/kernel/time/hrtimer.rs | 93 +- + rust/macros/helpers.rs | 16 - + rust/macros/kunit.rs | 5 +- + rust/macros/lib.rs | 48 +- + rust/macros/module.rs | 2 +- + rust/macros/vtable.rs | 43 +- + rust/pin-init/examples/selfref.rs | 60 + + rust/pin-init/internal/src/diagnostics.rs | 169 ++- + rust/pin-init/internal/src/init.rs | 683 +++++++--- + rust/pin-init/internal/src/lib.rs | 41 +- + rust/pin-init/internal/src/pin_data.rs | 1859 +++++++++++++++++++++++++--- + rust/pin-init/internal/src/util.rs | 500 ++++++++ + rust/pin-init/src/__internal.rs | 417 ++++++- + rust/pin-init/src/lib.rs | 83 +- + rust/proc-macro2/README.md | 3 +- + rust/proc-macro2/probe/proc_macro_span.rs | 9 - + scripts/remove-stale-files | 2 + + scripts/rustdoc_test_builder.rs | 7 + + scripts/rustdoc_test_gen.rs | 73 +- + 65 files changed, 5007 insertions(+), 849 deletions(-) + create mode 100644 rust/helpers/math.c + create mode 100644 rust/helpers/ratelimit.c + create mode 100644 rust/kernel/mem.rs + create mode 100644 rust/kernel/ratelimit.rs + create mode 100644 rust/kernel/sync/lockdep.rs + create mode 100644 rust/pin-init/examples/selfref.rs + create mode 100644 rust/pin-init/internal/src/util.rs +Merging rust-interop/interop-next (05f7e89ab9731 Linux 6.19) +$ git merge -m Merge branch 'interop-next' of https://github.com/Rust-for-Linux/linux.git rust-interop/interop-next +Already up to date. +Merging rust-alloc/alloc-next (6e8339118040f rust: alloc: add `NumaNode::id()` accessor) +$ git merge -m Merge branch 'alloc-next' of https://github.com/Rust-for-Linux/linux.git rust-alloc/alloc-next +Already up to date. +Merging rust-io/io-next (86731a2a651e5 Linux 6.16-rc3) +$ git merge -m Merge branch 'io-next' of https://github.com/Rust-for-Linux/linux.git rust-io/io-next +Already up to date. +Merging rust-pin-init/pin-init-next (b7218f1996f84 rust: pin-init: internal: suppress `explicit_outlives_requirements`) +$ git merge -m Merge branch 'pin-init-next' of https://github.com/Rust-for-Linux/linux.git rust-pin-init/pin-init-next +Already up to date. +Merging rust-timekeeping/timekeeping-next (2ea0119f72dba rust: hrtimer: document handle based design rationale) +$ git merge -m Merge branch 'timekeeping-next' of https://github.com/Rust-for-Linux/linux.git rust-timekeeping/timekeeping-next +Already up to date. +Merging rust-xarray/xarray-next (c455f19bbe610 rust: xarray: add __rust_helper to helpers) +$ git merge -m Merge branch 'xarray-next' of https://github.com/Rust-for-Linux/linux.git rust-xarray/xarray-next +Already up to date. +Merging rust-analyzer/rust-analyzer-next (0024f3311f6f5 scripts: generate_rust_analyzer.py: pass cfg to macros crate) +$ git merge -m Merge branch 'rust-analyzer-next' of https://github.com/Rust-for-Linux/linux.git rust-analyzer/rust-analyzer-next +Merge made by the 'ort' strategy. + scripts/generate_rust_analyzer.py | 1 + + 1 file changed, 1 insertion(+) +Merging mm/for-next (3f947e72419e9 Merge https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm.git mm-unstable into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mm/linux.git mm/for-next +Auto-merging MAINTAINERS +Auto-merging arch/x86/include/asm/pgtable.h +Auto-merging arch/x86/mm/pat/set_memory.c +Auto-merging drivers/android/binder/page_range.rs +Auto-merging init/Kconfig +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + .clang-format | 2 +- + Documentation/ABI/testing/sysfs-kernel-mm-damon | 35 +- + Documentation/admin-guide/cgroup-v2.rst | 4 + + Documentation/admin-guide/kdump/vmcoreinfo.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 3 + + Documentation/admin-guide/mm/damon/usage.rst | 41 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 6 +- + Documentation/admin-guide/mm/ksm.rst | 8 +- + Documentation/arch/powerpc/vmemmap_dedup.rst | 88 +- + Documentation/core-api/memory-allocation.rst | 32 +- + Documentation/core-api/mm-api.rst | 9 + + Documentation/core-api/pin_user_pages.rst | 9 - + Documentation/dev-tools/kmemleak.rst | 24 +- + Documentation/dev-tools/kselftest.rst | 18 + + Documentation/filesystems/mmap_prepare.rst | 81 ++ + Documentation/filesystems/vfs.rst | 6 +- + Documentation/mm/damon/design.rst | 64 +- + Documentation/mm/damon/maintainer-profile.rst | 19 +- + Documentation/mm/index.rst | 1 + + Documentation/mm/kernel-page-tables.rst | 410 +++++++++ + Documentation/mm/ksm.rst | 2 +- + Documentation/mm/page_owner.rst | 8 +- + Documentation/mm/physical_memory.rst | 6 + + Documentation/mm/process_addrs.rst | 11 + + Documentation/mm/vmemmap_dedup.rst | 32 +- + MAINTAINERS | 13 +- + arch/Kconfig | 8 - + arch/alpha/Kconfig | 1 - + arch/alpha/include/asm/pgtable.h | 7 - + arch/arc/include/asm/pgalloc.h | 6 +- + arch/arc/include/asm/pgtable-levels.h | 11 - + arch/arm/Kconfig | 2 - + arch/arm/Kconfig.debug | 2 +- + arch/arm/configs/aspeed_g4_defconfig | 2 +- + arch/arm/configs/aspeed_g5_defconfig | 2 +- + arch/arm/configs/shmobile_defconfig | 2 +- + arch/arm/include/asm/pgtable.h | 7 - + arch/arm/include/asm/ptdump.h | 6 +- + arch/arm/kernel/traps.c | 17 - + arch/arm/mm/init.c | 2 +- + arch/arm64/Kconfig | 4 +- + arch/arm64/include/asm/mte.h | 2 - + arch/arm64/include/asm/pgtable.h | 64 +- + arch/arm64/include/asm/set_memory.h | 5 +- + arch/arm64/kvm/mmu.c | 2 +- + arch/arm64/mm/fault.c | 16 +- + arch/arm64/mm/mmu.c | 51 +- + arch/arm64/mm/mteswap.c | 32 +- + arch/arm64/mm/pageattr.c | 24 +- + arch/csky/include/asm/pgtable.h | 4 - + arch/hexagon/include/asm/pgtable.h | 3 - + arch/loongarch/Kconfig | 2 - + arch/loongarch/include/asm/pgtable.h | 14 +- + arch/loongarch/include/asm/set_memory.h | 5 +- + arch/loongarch/mm/init.c | 4 +- + arch/loongarch/mm/pageattr.c | 27 +- + arch/m68k/Kconfig | 1 + + arch/m68k/include/asm/mcf_pgalloc.h | 5 +- + arch/m68k/include/asm/mcf_pgtable.h | 6 - + arch/m68k/include/asm/motorola_pgalloc.h | 9 +- + arch/m68k/include/asm/motorola_pgtable.h | 8 - + arch/m68k/include/asm/sun3_pgtable.h | 7 - + arch/m68k/mm/motorola.c | 119 ++- + arch/microblaze/include/asm/pgalloc.h | 2 +- + arch/microblaze/include/asm/pgtable.h | 7 - + arch/mips/Kconfig | 1 - + arch/mips/include/asm/pgtable-32.h | 10 - + arch/mips/include/asm/pgtable-64.h | 13 - + arch/nios2/include/asm/pgtable.h | 7 - + arch/openrisc/include/asm/pgtable.h | 7 - + arch/parisc/Kconfig | 1 - + arch/parisc/include/asm/pgtable.h | 9 - + arch/parisc/kernel/pci-dma.c | 6 +- + arch/powerpc/Kconfig | 3 +- + arch/powerpc/configs/ppc64_defconfig | 2 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 2 - + arch/powerpc/include/asm/book3s/64/pgtable.h | 7 - + arch/powerpc/include/asm/nohash/32/pgtable.h | 2 - + arch/powerpc/include/asm/nohash/64/pgtable-4k.h | 3 - + arch/powerpc/include/asm/nohash/64/pgtable.h | 5 - + arch/powerpc/mm/book3s64/radix_pgtable.c | 135 +-- + arch/powerpc/mm/book3s64/radix_tlb.c | 6 +- + arch/powerpc/mm/nohash/e500_hugetlbpage.c | 2 +- + arch/powerpc/mm/nohash/tlb.c | 2 +- + arch/powerpc/mm/ptdump/ptdump.c | 2 +- + arch/powerpc/platforms/powernv/Kconfig | 1 - + arch/powerpc/platforms/pseries/Kconfig | 1 - + arch/riscv/Kconfig | 4 +- + arch/riscv/include/asm/page.h | 6 - + arch/riscv/include/asm/pgtable-64.h | 9 - + arch/riscv/include/asm/pgtable.h | 4 - + arch/riscv/include/asm/set_memory.h | 5 +- + arch/riscv/kvm/mmu.c | 2 +- + arch/riscv/mm/init.c | 1 + + arch/riscv/mm/pageattr.c | 23 +- + arch/riscv/mm/tlbflush.c | 2 +- + arch/s390/Kconfig | 4 +- + arch/s390/configs/debug_defconfig | 2 +- + arch/s390/configs/defconfig | 2 +- + arch/s390/include/asm/pgtable.h | 11 - + arch/s390/include/asm/set_memory.h | 5 +- + arch/s390/mm/dump_pagetables.c | 2 +- + arch/s390/mm/gmap_helpers.c | 6 +- + arch/s390/mm/pageattr.c | 20 +- + arch/sh/Kconfig | 13 +- + arch/sh/configs/migor_defconfig | 1 - + arch/sh/configs/sdk7786_defconfig | 1 - + arch/sh/configs/se7722_defconfig | 1 - + arch/sh/configs/shx3_defconfig | 1 - + arch/sh/configs/ul2_defconfig | 1 - + arch/sh/include/asm/mmu.h | 2 + + arch/sh/include/asm/mmzone.h | 42 - + arch/sh/include/asm/pgalloc.h | 6 +- + arch/sh/include/asm/pgtable-3level.h | 3 - + arch/sh/include/asm/pgtable_32.h | 13 - + arch/sh/include/asm/setup.h | 3 + + arch/sh/include/asm/sparsemem.h | 12 - + arch/sh/include/asm/topology.h | 13 - + arch/sh/kernel/cpu/sh4a/setup-sh7366.c | 5 - + arch/sh/kernel/cpu/sh4a/setup-sh7722.c | 7 - + arch/sh/kernel/cpu/sh4a/setup-sh7723.c | 1 - + arch/sh/kernel/cpu/sh4a/setup-sh7724.c | 1 - + arch/sh/kernel/cpu/sh4a/setup-sh7757.c | 5 - + arch/sh/kernel/cpu/sh4a/setup-sh7785.c | 7 - + arch/sh/kernel/cpu/sh4a/setup-sh7786.c | 5 - + arch/sh/kernel/cpu/sh4a/setup-shx3.c | 18 - + arch/sh/kernel/setup.c | 7 - + arch/sh/kernel/topology.c | 12 - + arch/sh/kernel/vmcore_info.c | 4 - + arch/sh/mm/Kconfig | 29 - + arch/sh/mm/Makefile | 1 - + arch/sh/mm/init.c | 40 +- + arch/sh/mm/numa.c | 53 -- + arch/sh/mm/pgtable.c | 20 + + arch/sh/mm/sram.c | 3 +- + arch/sparc/Kconfig | 4 +- + arch/sparc/include/asm/pgalloc_32.h | 7 +- + arch/sparc/include/asm/pgalloc_64.h | 8 - + arch/sparc/include/asm/pgtable_32.h | 3 - + arch/sparc/include/asm/pgtable_64.h | 10 - + arch/sparc/include/asm/tlb_64.h | 2 - + arch/sparc/lib/bitext.c | 14 +- + arch/sparc/mm/init_64.c | 2 +- + arch/sparc/mm/srmmu.c | 32 +- + arch/um/Kconfig | 1 - + arch/um/include/asm/pgtable-2level.h | 7 - + arch/um/include/asm/pgtable-4level.h | 13 - + arch/x86/Kconfig | 6 +- + arch/x86/configs/x86_64_defconfig | 2 +- + arch/x86/entry/vdso/vdso32/fake_32bit_build.h | 2 +- + arch/x86/events/intel/bts.c | 3 - + arch/x86/events/intel/pt.c | 6 +- + arch/x86/include/asm/pgtable-2level.h | 5 - + arch/x86/include/asm/pgtable-3level.h | 11 - + arch/x86/include/asm/pgtable.h | 6 +- + arch/x86/include/asm/pgtable_64.h | 18 - + arch/x86/include/asm/set_memory.h | 5 +- + arch/x86/include/asm/string_64.h | 85 +- + arch/x86/kernel/uprobes.c | 2 +- + arch/x86/mm/pat/set_memory.c | 20 +- + arch/x86/mm/pti.c | 2 +- + arch/xtensa/include/asm/pgtable.h | 4 - + arch/xtensa/include/asm/tlb.h | 2 +- + drivers/android/binder/page_range.rs | 19 +- + drivers/android/binder_alloc.c | 63 +- + drivers/base/memory.c | 9 +- + drivers/block/zram/zcomp.c | 23 +- + drivers/block/zram/zcomp.h | 4 +- + drivers/block/zram/zram_drv.c | 192 +++-- + drivers/char/Makefile | 2 +- + drivers/gpu/drm/drm_gpusvm.c | 5 +- + drivers/gpu/drm/sti/sti_cursor.c | 4 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- + drivers/gpu/ipu-v3/ipu-image-convert.c | 2 +- + drivers/hid/hid-core.c | 4 +- + drivers/hsi/clients/cmt_speech.c | 35 +- + drivers/infiniband/hw/hfi1/file_ops.c | 83 +- + drivers/md/md-bitmap.c | 18 +- + drivers/media/platform/nxp/imx7-media-csi.c | 2 +- + .../media/platform/nxp/imx8-isi/imx8-isi-video.c | 2 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- + drivers/nvdimm/pmem.c | 2 +- + drivers/nvdimm/pmem.h | 12 - + drivers/scsi/sg.c | 115 ++- + drivers/spi/spi-atmel.c | 4 +- + drivers/spi/spi-ti-qspi.c | 2 +- + drivers/staging/media/imx/imx-media-utils.c | 2 +- + drivers/usb/cdns3/cdns3-gadget.c | 2 +- + drivers/usb/gadget/udc/cdns2/cdns2-gadget.c | 2 +- + drivers/usb/gadget/udc/lpc32xx_udc.c | 2 +- + drivers/usb/mon/mon_bin.c | 98 ++- + drivers/video/fbdev/core/fb_defio.c | 6 +- + drivers/video/fbdev/fsl-diu-fb.c | 2 +- + drivers/video/fbdev/ssd1307fb.c | 2 + + drivers/xen/grant-table.c | 11 +- + fs/Kconfig | 2 +- + fs/buffer.c | 8 - + fs/ceph/addr.c | 8 +- + fs/coredump.c | 2 +- + fs/crypto/crypto.c | 2 - + fs/erofs/data.c | 16 +- + fs/erofs/zdata.c | 13 +- + fs/f2fs/compress.c | 35 +- + fs/f2fs/data.c | 2 +- + fs/f2fs/f2fs.h | 99 +-- + fs/f2fs/segment.c | 2 +- + fs/fuse/dax.c | 2 +- + fs/hugetlbfs/inode.c | 10 +- + fs/iomap/buffered-io.c | 3 +- + fs/nfs/file.c | 4 +- + fs/nfs/write.c | 2 - + fs/proc/base.c | 3 +- + fs/proc/internal.h | 2 - + fs/proc/page.c | 8 +- + fs/proc/task_mmu.c | 455 ++++------ + fs/proc/vmcore.c | 27 +- + fs/ubifs/file.c | 8 +- + fs/xfs/libxfs/xfs_btree.c | 18 +- + fs/xfs/xfs_platform.h | 4 - + include/asm-generic/pgtable-nop4d.h | 1 - + include/asm-generic/pgtable-nopmd.h | 1 - + include/asm-generic/pgtable-nopud.h | 1 - + include/asm-generic/tlb.h | 70 +- + include/crypto/acompress.h | 13 + + include/linux/buffer_head.h | 8 +- + include/linux/cache.h | 1 + + include/linux/cgroup.h | 3 + + include/linux/compaction.h | 11 +- + include/linux/compiler.h | 5 + + include/linux/damon.h | 102 ++- + include/linux/gfp_types.h | 2 +- + include/linux/hugetlb.h | 50 +- + include/linux/hugetlb_cgroup.h | 2 +- + include/linux/hugetlb_inline.h | 28 - + include/linux/idr.h | 5 +- + include/linux/kernel-page-flags.h | 1 - + include/linux/maple_tree.h | 4 +- + include/linux/memblock.h | 4 - + include/linux/memcontrol.h | 464 ++++++----- + include/linux/mm.h | 383 +++++++-- + include/linux/mm_inline.h | 115 ++- + include/linux/mm_types.h | 64 +- + include/linux/mmap_lock.h | 106 +-- + include/linux/mmzone.h | 224 ++--- + include/linux/page-flags.h | 64 +- + include/linux/page_counter.h | 3 +- + include/linux/pagemap.h | 68 +- + include/linux/pgtable.h | 24 +- + include/linux/ptdump.h | 4 +- + include/linux/rmap.h | 2 +- + include/linux/sched.h | 4 +- + include/linux/set_memory.h | 120 ++- + include/linux/shmem_fs.h | 12 +- + include/linux/string.h | 13 + + include/linux/swap.h | 61 +- + include/linux/swapops.h | 9 - + include/linux/userfaultfd_k.h | 1 - + include/linux/vmalloc.h | 4 + + include/linux/vmemmap-optimization.h | 115 +++ + include/linux/zsmalloc.h | 4 - + include/linux/zswap.h | 8 +- + include/net/mana/mana.h | 4 +- + include/trace/events/huge_memory.h | 18 +- + include/trace/events/mmflags.h | 45 +- + include/trace/events/pagemap.h | 2 +- + include/trace/events/vmscan.h | 14 - + init/Kconfig | 7 - + init/main.c | 2 +- + ipc/msgutil.c | 3 +- + kernel/bpf/arena.c | 3 +- + kernel/bpf/stackmap.c | 17 +- + kernel/bpf/task_iter.c | 2 +- + kernel/cgroup/cgroup-internal.h | 1 - + kernel/configs/debug.config | 2 +- + kernel/events/core.c | 2 +- + kernel/events/ring_buffer.c | 7 +- + kernel/events/uprobes.c | 4 +- + kernel/fork.c | 2 - + kernel/power/snapshot.c | 4 +- + kernel/power/user.c | 17 +- + kernel/sched/fair.c | 3 +- + kernel/vmcore_info.c | 2 +- + lib/interval_tree_test.c | 2 +- + lib/region_alloc_benchmark.c | 8 +- + lib/test_hmm.c | 2 + + mm/Kconfig | 82 +- + mm/Kconfig.debug | 40 - + mm/Makefile | 3 +- + mm/alloc_tag.c | 2 +- + drivers/char/mem.c => mm/char-mem.c | 21 +- + mm/cma.h | 23 +- + mm/compaction.c | 11 +- + mm/damon/core.c | 423 +++++++--- + mm/damon/lru_sort.c | 17 +- + mm/damon/ops-common.c | 202 ++++- + mm/damon/ops-common.h | 12 + + mm/damon/paddr.c | 83 +- + mm/damon/reclaim.c | 13 +- + mm/damon/sysfs-schemes.c | 81 +- + mm/damon/sysfs.c | 364 +++++++- + mm/damon/tests/core-kunit.h | 928 ++++++++++++++++++++- + mm/damon/vaddr.c | 305 +++++-- + mm/debug.c | 4 - + mm/execmem.c | 148 ++-- + mm/filemap.c | 34 +- + mm/folio.c | 21 +- + mm/gup.c | 215 ++--- + mm/gup_test.c | 11 +- + mm/huge_memory.c | 756 +++++++++-------- + mm/hugetlb.c | 357 +++++--- + mm/hugetlb_cgroup.c | 33 + + mm/hugetlb_sysfs.c | 15 +- + mm/hugetlb_vmemmap.c | 130 +-- + mm/hugetlb_vmemmap.h | 15 +- + mm/init-mm.c | 2 - + mm/internal.h | 138 +-- + mm/interval_tree.c | 101 +++ + mm/kfence/core.c | 2 +- + mm/khugepaged.c | 72 +- + mm/kmemleak.c | 72 +- + mm/kmsan/core.c | 8 +- + mm/kmsan/hooks.c | 86 +- + mm/ksm.c | 28 +- + mm/list_lru.c | 13 +- + mm/madvise.c | 65 +- + mm/memblock.c | 129 ++- + mm/memcontrol-v1.c | 413 +-------- + mm/memcontrol-v1.h | 31 +- + mm/memcontrol.c | 648 ++++++++++---- + mm/memfd.c | 31 +- + mm/memory-failure.c | 31 +- + mm/memory-tiers.c | 7 +- + mm/memory.c | 283 ++++--- + mm/memory_hotplug.c | 155 ++-- + mm/mempolicy.c | 188 +++-- + mm/migrate.c | 21 +- + mm/migrate_device.c | 18 +- + mm/mincore.c | 31 +- + mm/mlock.c | 61 +- + mm/mm_init.c | 273 +++--- + mm/mm_init.h | 11 +- + mm/mmap.c | 8 +- + mm/mmap_lock.c | 61 +- + mm/mmu_gather.c | 32 +- + mm/mprotect.c | 11 +- + mm/mremap.c | 21 +- + mm/nommu.c | 6 +- + mm/oom_kill.c | 15 +- + mm/page-writeback.c | 2 +- + mm/page_alloc.c | 207 ++--- + mm/page_alloc.h | 4 +- + mm/page_counter.c | 41 +- + mm/page_io.c | 59 +- + mm/page_isolation.c | 40 +- + mm/page_owner.c | 6 +- + mm/page_table_check.c | 6 +- + mm/page_vma_mapped.c | 11 +- + mm/pagewalk.c | 4 +- + mm/percpu.c | 9 +- + mm/pgtable-generic.c | 37 +- + mm/rmap.c | 52 +- + mm/secretmem.c | 8 +- + mm/shmem.c | 426 +++++++--- + mm/slab.h | 28 +- + mm/slab_common.c | 6 +- + mm/slub.c | 330 +++++--- + mm/sparse-vmemmap.c | 523 +++++------- + mm/sparse.c | 238 ++---- + mm/sparse.h | 32 +- + mm/swap.h | 17 +- + mm/swap_state.c | 86 +- + mm/swapfile.c | 214 +++-- + mm/truncate.c | 131 ++- + mm/userfaultfd.c | 121 +-- + mm/util.c | 51 +- + mm/vma.c | 472 +++++++---- + mm/vma.h | 65 +- + mm/vma_internal.h | 1 - + mm/vmalloc.c | 248 +++--- + mm/vmalloc.h | 3 +- + mm/vmpressure.c | 3 - + mm/vmscan.c | 628 ++++++++------ + mm/vmstat.c | 17 +- + mm/workingset.c | 7 +- + mm/zpdesc.h | 2 +- + mm/zsmalloc.c | 101 +-- + mm/zswap.c | 516 +++++++----- + net/ipv4/tcp.c | 31 +- + rust/kernel/mm.rs | 58 +- + samples/damon/mtier.c | 10 +- + samples/damon/prcl.c | 5 +- + samples/damon/wsse.c | 5 +- + scripts/gdb/linux/mm.py | 22 +- + security/selinux/selinuxfs.c | 11 +- + sound/core/pcm_native.c | 48 +- + tools/cgroup/memcg_shrinker.py | 2 +- + tools/include/linux/compiler.h | 5 + + tools/include/linux/mm.h | 6 +- + tools/lib/mm/file_utils.c | 106 +++ + tools/lib/mm/file_utils.h | 13 + + .../selftests => lib}/mm/hugepage_settings.c | 186 ++++- + .../selftests => lib}/mm/hugepage_settings.h | 12 + + tools/mm/.gitignore | 1 + + tools/mm/Makefile | 11 +- + .../selftests/mm/gup_test.c => mm/gup_bench.c} | 192 ++--- + tools/mm/page-types.c | 2 - + tools/mm/page_owner_sort.c | 134 ++- + tools/sched_ext/include/scx/common.bpf.h | 2 - + tools/testing/memblock/Makefile | 3 +- + tools/testing/memblock/README | 12 +- + tools/testing/memblock/TODO | 5 - + tools/testing/memblock/asm/dma.h | 6 + + tools/testing/memblock/main.c | 2 + + tools/testing/memblock/tests/alloc_exact_nid_api.c | 454 +--------- + tools/testing/memblock/tests/alloc_low_api.c | 148 ++++ + tools/testing/memblock/tests/alloc_low_api.h | 9 + + tools/testing/memblock/tests/alloc_nid_api.c | 20 - + tools/testing/memblock/tests/alloc_nid_api.h | 1 - + tools/testing/memblock/tests/basic_api.c | 20 +- + tools/testing/memblock/tests/common.c | 12 +- + tools/testing/memblock/tests/common.h | 2 - + tools/testing/radix-tree/idr-test.c | 20 +- + tools/testing/radix-tree/maple.c | 12 +- + tools/testing/selftests/cgroup/test_zswap.c | 24 +- + tools/testing/selftests/damon/.gitignore | 1 + + tools/testing/selftests/damon/_damon_sysfs.py | 161 +++- + tools/testing/selftests/damon/damon_nr_regions.py | 3 + + .../selftests/damon/damos_apply_interval.py | 3 + + tools/testing/selftests/damon/damos_quota.py | 3 + + tools/testing/selftests/damon/damos_quota_goal.py | 3 + + .../testing/selftests/damon/damos_tried_regions.py | 3 + + .../selftests/damon/drgn_dump_damon_status.py | 32 + + tools/testing/selftests/damon/sysfs.py | 39 +- + tools/testing/selftests/damon/sysfs.sh | 31 + + .../selftests/damon/sysfs_memcg_path_leak.sh | 7 + + .../selftests/damon/sysfs_no_op_commit_break.py | 35 +- + .../sysfs_update_schemes_tried_regions_hang.py | 3 + + ..._update_schemes_tried_regions_wss_estimation.py | 3 + + tools/testing/selftests/kselftest/runner.sh | 11 +- + tools/testing/selftests/mm/.gitignore | 2 + + tools/testing/selftests/mm/Makefile | 21 +- + tools/testing/selftests/mm/compaction_test.c | 2 +- + tools/testing/selftests/mm/cow.c | 1 - + tools/testing/selftests/mm/folio_order_check.c | 122 +++ + tools/testing/selftests/mm/folio_split_race_test.c | 5 +- + tools/testing/selftests/mm/guard-regions.c | 15 +- + tools/testing/selftests/mm/gup.c | 262 ++++++ + tools/testing/selftests/mm/gup_longterm.c | 1 - + tools/testing/selftests/mm/hmm-tests.c | 7 +- + tools/testing/selftests/mm/hugetlb-madvise.c | 1 - + tools/testing/selftests/mm/hugetlb-mmap.c | 1 - + tools/testing/selftests/mm/hugetlb-mremap.c | 1 - + tools/testing/selftests/mm/hugetlb-read-hwpoison.c | 8 + + tools/testing/selftests/mm/hugetlb-shm.c | 1 - + tools/testing/selftests/mm/hugetlb-soft-offline.c | 59 +- + tools/testing/selftests/mm/hugetlb_dio.c | 1 - + .../selftests/mm/hugetlb_fault_after_madv.c | 1 - + tools/testing/selftests/mm/hugetlb_madv_vs_map.c | 145 +++- + tools/testing/selftests/mm/khugepaged.c | 580 +++++++++++-- + tools/testing/selftests/mm/khugepaged_race.c | 538 ++++++++++++ + tools/testing/selftests/mm/khugepaged_sync_check.c | 179 ++++ + tools/testing/selftests/mm/ksm_tests.c | 1 - + tools/testing/selftests/mm/memfd_secret.c | 3 +- + tools/testing/selftests/mm/memory-failure.c | 114 ++- + tools/testing/selftests/mm/merge.c | 95 +++ + tools/testing/selftests/mm/migration.c | 3 +- + tools/testing/selftests/mm/mlock-random-test.c | 1 - + tools/testing/selftests/mm/mlock2-tests.c | 2 +- + tools/testing/selftests/mm/mlock2.h | 8 +- + tools/testing/selftests/mm/mrelease_test.c | 2 +- + tools/testing/selftests/mm/mremap_dontunmap.c | 63 +- + tools/testing/selftests/mm/mremap_test.c | 44 +- + tools/testing/selftests/mm/pagemap_ioctl.c | 95 +-- + tools/testing/selftests/mm/pkey-helpers.h | 7 - + tools/testing/selftests/mm/pkey_sighandler_tests.c | 4 +- + tools/testing/selftests/mm/prctl_thp_disable.c | 1 - + tools/testing/selftests/mm/protection_keys.c | 2 +- + tools/testing/selftests/mm/run_vmtests.sh | 90 +- + tools/testing/selftests/mm/soft-dirty.c | 1 - + tools/testing/selftests/mm/split_huge_page_test.c | 87 +- + tools/testing/selftests/mm/thuge-gen.c | 1 - + tools/testing/selftests/mm/transhuge-stress.c | 1 - + tools/testing/selftests/mm/uffd-common.c | 4 +- + tools/testing/selftests/mm/uffd-common.h | 1 - + tools/testing/selftests/mm/uffd-unit-tests.c | 5 + + tools/testing/selftests/mm/uffd-wp-mremap.c | 4 +- + tools/testing/selftests/mm/va_high_addr_switch.c | 1 - + tools/testing/selftests/mm/vm_util.c | 392 ++++++--- + tools/testing/selftests/mm/vm_util.h | 19 +- + tools/testing/selftests/nommu/Makefile | 7 + + tools/testing/selftests/nommu/nommu.h | 33 + + tools/testing/selftests/nommu/nommu_mmap_test.c | 264 ++++++ + tools/testing/selftests/nommu/nommu_mremap_test.c | 356 ++++++++ + tools/testing/selftests/proc/proc-maps-race.c | 186 ++++- + .../selftests/proc/proc-self-map-files-001.c | 2 +- + .../selftests/proc/proc-self-map-files-002.c | 2 +- + tools/testing/vma/include/dup.h | 123 ++- + tools/testing/vma/include/stubs.h | 32 +- + tools/testing/vma/shared.c | 9 + + tools/testing/vma/tests/merge.c | 10 +- + tools/testing/vma/tests/mmap.c | 105 +++ + tools/testing/vma/vma_internal.h | 1 - + 502 files changed, 15608 insertions(+), 8853 deletions(-) + create mode 100644 Documentation/mm/kernel-page-tables.rst + delete mode 100644 arch/sh/include/asm/mmzone.h + delete mode 100644 arch/sh/include/asm/sparsemem.h + delete mode 100644 arch/sh/mm/numa.c + delete mode 100644 include/linux/hugetlb_inline.h + create mode 100644 include/linux/vmemmap-optimization.h + rename drivers/char/mem.c => mm/char-mem.c (97%) + create mode 100644 tools/lib/mm/file_utils.c + create mode 100644 tools/lib/mm/file_utils.h + rename tools/{testing/selftests => lib}/mm/hugepage_settings.c (76%) + rename tools/{testing/selftests => lib}/mm/hugepage_settings.h (90%) + rename tools/{testing/selftests/mm/gup_test.c => mm/gup_bench.c} (50%) + delete mode 100644 tools/testing/memblock/TODO + create mode 100644 tools/testing/memblock/tests/alloc_low_api.c + create mode 100644 tools/testing/memblock/tests/alloc_low_api.h + create mode 100644 tools/testing/selftests/mm/folio_order_check.c + create mode 100644 tools/testing/selftests/mm/gup.c + create mode 100644 tools/testing/selftests/mm/khugepaged_race.c + create mode 100644 tools/testing/selftests/mm/khugepaged_sync_check.c + create mode 100644 tools/testing/selftests/nommu/Makefile + create mode 100644 tools/testing/selftests/nommu/nommu.h + create mode 100644 tools/testing/selftests/nommu/nommu_mmap_test.c + create mode 100644 tools/testing/selftests/nommu/nommu_mremap_test.c +Merging mm-nonmm-stable/mm-nonmm-stable (be9f9add2032f tmpfs: fix unicode_map leaks in casefold option handling) +$ git merge -m Merge branch 'mm-nonmm-stable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/Kconfig +Auto-merging fs/proc/base.c +Auto-merging init/main.c +Auto-merging kernel/fork.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/shmem.c +Auto-merging tools/bootconfig/main.c +Merge made by the 'ort' strategy. + .mailmap | 3 + + CREDITS | 181 +++++------ + Documentation/admin-guide/sysctl/kernel.rst | 5 +- + MAINTAINERS | 2 + + Makefile | 22 +- + arch/Kconfig | 8 - + arch/s390/kernel/traps.c | 7 + + arch/sparc/kernel/setup.c | 9 + + drivers/infiniband/hw/hfi1/fault.c | 1 - + drivers/rapidio/devices/rio_mport_cdev.c | 9 +- + drivers/usb/gadget/legacy/inode.c | 4 +- + drivers/watchdog/hpwdt.c | 2 +- + fs/fat/fat.h | 2 +- + fs/fat/fatent.c | 21 +- + fs/fat/file.c | 3 +- + fs/fat/inode.c | 23 +- + fs/fat/misc.c | 6 +- + fs/ocfs2/alloc.c | 36 ++- + fs/ocfs2/cluster/heartbeat.c | 12 +- + fs/ocfs2/dir.c | 55 ++++ + fs/ocfs2/dlmglue.c | 33 +- + fs/ocfs2/dlmglue.h | 5 +- + fs/ocfs2/export.c | 10 +- + fs/ocfs2/inode.c | 58 +++- + fs/ocfs2/journal.c | 3 +- + fs/ocfs2/journal.h | 1 - + fs/ocfs2/namei.c | 6 +- + fs/ocfs2/ocfs2.h | 17 ++ + fs/ocfs2/quota_local.c | 33 +- + fs/ocfs2/refcounttree.c | 27 ++ + fs/ocfs2/suballoc.c | 235 ++++++++++++-- + fs/ocfs2/suballoc.h | 2 +- + fs/ocfs2/super.c | 32 +- + fs/ocfs2/xattr.c | 337 ++++++++++++++++----- + fs/ocfs2/xattr.h | 12 +- + fs/proc/base.c | 8 +- + include/linux/fault-inject.h | 10 +- + include/linux/kdev_t.h | 2 +- + include/linux/minmax.h | 6 +- + include/linux/panic.h | 5 +- + init/Makefile | 6 +- + init/main.c | 12 +- + init/version.c | 11 +- + ipc/mqueue.c | 7 + + kernel/fork.c | 3 +- + kernel/gcov/fs.c | 2 +- + kernel/hung_task.c | 55 +++- + kernel/kcov.c | 43 ++- + kernel/panic.c | 104 +++---- + kernel/resource.c | 16 +- + kernel/resource_kunit.c | 3 + + kernel/taskstats.c | 50 +-- + kernel/watchdog_perf.c | 4 +- + lib/Kconfig | 14 +- + lib/Kconfig.debug | 16 +- + lib/bootconfig.c | 46 ++- + lib/decompress_bunzip2.c | 6 +- + lib/decompress_unlz4.c | 4 + + lib/decompress_unxz.c | 12 +- + lib/fault-inject.c | 7 +- + lib/klist.c | 16 +- + lib/percpu_counter.c | 10 +- + lib/plist.c | 7 + + lib/raid/Kconfig | 2 + + lib/raid/raid6/x86/avx2.c | 6 + + lib/raid/raid6/x86/avx512.c | 6 + + lib/raid/raid6/x86/recov_avx2.c | 2 + + lib/raid/raid6/x86/recov_avx512.c | 2 + + lib/raid/xor/x86/xor-avx.c | 1 + + lib/tests/Makefile | 1 + + lib/tests/errseq_kunit.c | 237 +++++++++++++++ + mm/shmem.c | 7 + + scripts/Makefile.gcov | 21 ++ + scripts/checkpatch.pl | 38 ++- + scripts/checkstack.pl | 6 +- + scripts/spelling.txt | 4 +- + tools/bootconfig/main.c | 104 +++---- + tools/bootconfig/test-bootconfig.sh | 12 + + tools/testing/selftests/core/unshare_test.c | 19 +- + tools/testing/selftests/filelock/ofdlocks.c | 2 +- + .../filesystems/epoll/epoll_wakeup_test.c | 32 +- + .../selftests/membarrier/membarrier_test_impl.h | 17 +- + 82 files changed, 1674 insertions(+), 552 deletions(-) + create mode 100644 lib/tests/errseq_kunit.c + create mode 100644 scripts/Makefile.gcov +Merging mm-nonmm-unstable/mm-nonmm-unstable (ddc1b4197a839 fat: allocate multiple clusters in fallocate) +$ git merge -m Merge branch 'mm-nonmm-unstable' of https://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-unstable/mm-nonmm-unstable +Merge made by the 'ort' strategy. + drivers/media/v4l2-core/v4l2-vp9.c | 30 ++--- + fs/fat/fat.h | 3 +- + fs/fat/fatent.c | 62 ++++++--- + fs/fat/file.c | 10 +- + fs/fat/inode.c | 8 +- + fs/fat/misc.c | 1 + + fs/fat/namei_msdos.c | 22 +++- + fs/fat/namei_vfat.c | 22 +++- + fs/ocfs2/cluster/heartbeat.c | 12 +- + fs/ocfs2/cluster/tcp.c | 8 +- + fs/ocfs2/dir.c | 76 +++++++++-- + fs/ocfs2/filecheck.c | 5 +- + fs/ocfs2/xattr.c | 153 ++++++++++++++++++---- + fs/squashfs/fragment.c | 6 +- + fs/squashfs/squashfs_fs.h | 2 +- + lib/cmdline.c | 13 +- + lib/dynamic_debug.c | 15 ++- + lib/group_cpus.c | 87 +++++++++++- + lib/kstrtox.c | 2 +- + lib/lz4/lz4_decompress.c | 21 +++ + lib/tests/cmdline_kunit.c | 39 ++++++ + scripts/gdb/linux/radixtree.py | 72 ++++++---- + scripts/gdb/linux/stackdepot.py | 2 +- + tools/testing/selftests/proc/proc-pid-vm.c | 14 +- + tools/testing/selftests/uevent/uevent_filtering.c | 8 -- + 25 files changed, 540 insertions(+), 153 deletions(-) +Merging kbuild/kbuild-for-next (56a62bca21c96 Merge tag 'v7.3-rc6' into kbuild-for-next) +$ git merge -m Merge branch 'kbuild-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git kbuild/kbuild-for-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/x86/Kconfig +Auto-merging init/Kconfig +CONFLICT (content): Merge conflict in init/Kconfig +Auto-merging scripts/remove-stale-files +CONFLICT (content): Merge conflict in scripts/remove-stale-files +Resolved 'init/Kconfig' using previous resolution. +Resolved 'scripts/remove-stale-files' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2e292f8568f31] Merge branch 'kbuild-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/kbuild/linux.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 3 +- + Documentation/dev-tools/container.rst | 118 ++++++- + .../early-userspace/early_userspace_support.rst | 16 +- + .../filesystems/ramfs-rootfs-initramfs.rst | 10 +- + Documentation/kbuild/kbuild.rst | 17 + + Documentation/kbuild/kconfig-language.rst | 13 +- + Documentation/kbuild/kconfig-macro-language.rst | 8 +- + Documentation/kbuild/makefiles.rst | 7 +- + Documentation/process/changes.rst | 8 + + MAINTAINERS | 2 + + Makefile | 76 ++-- + arch/alpha/boot/Makefile | 4 +- + arch/arc/boot/Makefile | 2 +- + arch/arm/boot/compressed/Makefile | 2 +- + arch/arm64/boot/Makefile | 2 +- + arch/arm64/kernel/pi/Makefile | 2 +- + arch/csky/boot/Makefile | 2 +- + arch/microblaze/boot/Makefile | 2 +- + arch/mips/boot/Makefile | 2 +- + arch/mips/boot/compressed/Makefile | 2 +- + arch/nios2/boot/Makefile | 2 +- + arch/parisc/boot/compressed/Makefile | 2 +- + arch/riscv/boot/Makefile | 2 +- + arch/riscv/kernel/pi/Makefile | 2 +- + arch/s390/boot/Makefile | 2 +- + arch/sh/boot/Makefile | 2 +- + arch/sh/boot/compressed/Makefile | 2 +- + arch/sparc/boot/Makefile | 4 +- + arch/x86/Kconfig | 17 + + arch/x86/Makefile | 12 +- + arch/x86/boot/Makefile | 2 +- + arch/x86/boot/compressed/Makefile | 4 +- + arch/xtensa/boot/Makefile | 2 +- + drivers/firmware/efi/libstub/Makefile | 2 +- + drivers/firmware/efi/libstub/Makefile.zboot | 2 +- + drivers/firmware/qcom/Kconfig | 26 +- + drivers/firmware/qcom/qcom_tzmem.c | 4 +- + fs/erofs/Kconfig | 8 +- + include/asm-generic/vmlinux.lds.h | 2 +- + init/Kconfig | 199 +---------- + kernel/Makefile | 6 +- + scripts/.gitignore | 1 + + scripts/Kconfig.include | 29 +- + scripts/Kconfig.toolchain | 277 +++++++++++++++ + scripts/Makefile | 8 +- + scripts/Makefile.build | 21 ++ + scripts/Makefile.gcc-plugins | 4 + + scripts/Makefile.lib | 4 +- + scripts/Makefile.package | 2 +- + scripts/Makefile.vmlinux | 20 +- + scripts/Makefile.vmlinux_o | 2 +- + scripts/Makefile.warn | 28 +- + scripts/check-function-names.sh | 3 +- + scripts/checkkconfigsymbols.py | 2 +- + scripts/clang-tools/run-clang-tools.py | 1 + + scripts/container | 86 ++++- + scripts/elf-parse.c | 103 +++++- + scripts/elf-parse.h | 54 +++ + {usr => scripts}/gen_init_cpio.c | 1 + + {usr => scripts}/gen_initramfs.sh | 4 +- + scripts/jobserver-exec | 3 +- + scripts/kallsyms-sysmap.c | 248 ++++++++++++++ + scripts/kallsyms.c | 381 +++++++++++++++------ + scripts/kallsyms.h | 44 +++ + scripts/kconfig/conf.c | 19 +- + scripts/kconfig/confdata.c | 6 + + scripts/kconfig/kconfig-sym-check.pl | 2 +- + scripts/kconfig/lexer.l | 3 + + scripts/kconfig/lkc.h | 2 +- + scripts/kconfig/lkc_proto.h | 1 + + scripts/kconfig/lxdialog/textbox.c | 2 - + scripts/kconfig/menu.c | 64 +++- + scripts/kconfig/parser.y | 8 +- + scripts/kconfig/streamline_config.pl | 20 +- + scripts/kconfig/symbol.c | 118 +++++-- + scripts/kconfig/tests/conftest.py | 27 +- + scripts/kconfig/tests/def_type/Kconfig | 28 ++ + scripts/kconfig/tests/def_type/__init__.py | 18 + + scripts/kconfig/tests/def_type/expected_guard_n | 9 + + scripts/kconfig/tests/def_type/expected_guard_y | 11 + + scripts/kconfig/tests/def_type/guard_n.config | 1 + + scripts/kconfig/tests/def_type/guard_y.config | 1 + + scripts/kconfig/tests/err_num_bounds/Kconfig | 79 +++++ + scripts/kconfig/tests/err_num_bounds/__init__.py | 12 + + .../kconfig/tests/err_num_bounds/expected_stderr | 10 + + scripts/kconfig/tests/err_num_mismatch/Kconfig | 38 ++ + scripts/kconfig/tests/err_num_mismatch/__init__.py | 9 + + .../kconfig/tests/err_num_mismatch/expected_stderr | 4 + + .../kconfig/tests/err_num_non_numeric_ref/Kconfig | 75 ++++ + .../tests/err_num_non_numeric_ref/__init__.py | 9 + + .../tests/err_num_non_numeric_ref/expected_stderr | 16 + + scripts/kconfig/tests/err_recursive_dep/Kconfig | 24 ++ + .../tests/err_recursive_dep/expected_stderr | 13 + + .../kconfig/tests/randconfig_probability/Kconfig | 12 + + .../tests/randconfig_probability/__init__.py | 130 +++++++ + scripts/kconfig/tests/savedefconfig_range/Kconfig | 67 ++++ + .../kconfig/tests/savedefconfig_range/__init__.py | 8 + + scripts/kconfig/tests/savedefconfig_range/config | 8 + + .../tests/savedefconfig_range/expected_defconfig | 0 + scripts/kconfig/tests/warn_changed_input/Kconfig | 5 + + .../kconfig/tests/warn_changed_input/__init__.py | 21 +- + .../tests/warn_changed_input/expected_config | 1 + + scripts/kconfig/tests/warn_num_bounds/Kconfig | 24 ++ + scripts/kconfig/tests/warn_num_bounds/__init__.py | 25 ++ + scripts/kconfig/tests/warn_num_bounds/config | 7 + + .../kconfig/tests/warn_num_bounds/expected_config | 11 + + .../tests/warn_num_bounds/expected_config_stderr | 3 + + .../tests/warn_num_bounds/expected_frontend_config | 11 + + .../tests/warn_num_bounds/expected_frontend_stderr | 0 + scripts/link-vmlinux.sh | 24 +- + scripts/make_fit.py | 3 +- + scripts/mkcompile_h | 2 +- + scripts/mksysmap | 94 ----- + scripts/remove-stale-files | 2 + + .../sbom/tests/cmd_graph/test_savedcmd_parser.py | 2 +- + scripts/setlocalversion | 3 +- + scripts/sorttable.c | 15 +- + scripts/ver_linux | 1 + + tools/lib/python/jobserver.py | 13 + + tools/testing/selftests/kho/vmtest.sh | 2 +- + tools/testing/selftests/liveupdate/vmtest.sh | 4 +- + tools/testing/selftests/nolibc/Makefile.nolibc | 2 +- + usr/.gitignore | 4 +- + usr/Kconfig | 2 +- + usr/Makefile | 6 +- + 125 files changed, 2384 insertions(+), 685 deletions(-) + create mode 100644 scripts/Kconfig.toolchain + rename {usr => scripts}/gen_init_cpio.c (99%) + rename {usr => scripts}/gen_initramfs.sh (97%) + create mode 100644 scripts/kallsyms-sysmap.c + create mode 100644 scripts/kallsyms.h + create mode 100644 scripts/kconfig/tests/def_type/Kconfig + create mode 100644 scripts/kconfig/tests/def_type/__init__.py + create mode 100644 scripts/kconfig/tests/def_type/expected_guard_n + create mode 100644 scripts/kconfig/tests/def_type/expected_guard_y + create mode 100644 scripts/kconfig/tests/def_type/guard_n.config + create mode 100644 scripts/kconfig/tests/def_type/guard_y.config + create mode 100644 scripts/kconfig/tests/err_num_bounds/Kconfig + create mode 100644 scripts/kconfig/tests/err_num_bounds/__init__.py + create mode 100644 scripts/kconfig/tests/err_num_bounds/expected_stderr + create mode 100644 scripts/kconfig/tests/err_num_mismatch/Kconfig + create mode 100644 scripts/kconfig/tests/err_num_mismatch/__init__.py + create mode 100644 scripts/kconfig/tests/err_num_mismatch/expected_stderr + create mode 100644 scripts/kconfig/tests/err_num_non_numeric_ref/Kconfig + create mode 100644 scripts/kconfig/tests/err_num_non_numeric_ref/__init__.py + create mode 100644 scripts/kconfig/tests/err_num_non_numeric_ref/expected_stderr + create mode 100644 scripts/kconfig/tests/randconfig_probability/Kconfig + create mode 100644 scripts/kconfig/tests/randconfig_probability/__init__.py + create mode 100644 scripts/kconfig/tests/savedefconfig_range/Kconfig + create mode 100644 scripts/kconfig/tests/savedefconfig_range/__init__.py + create mode 100644 scripts/kconfig/tests/savedefconfig_range/config + create mode 100644 scripts/kconfig/tests/savedefconfig_range/expected_defconfig + create mode 100644 scripts/kconfig/tests/warn_num_bounds/Kconfig + create mode 100644 scripts/kconfig/tests/warn_num_bounds/__init__.py + create mode 100644 scripts/kconfig/tests/warn_num_bounds/config + create mode 100644 scripts/kconfig/tests/warn_num_bounds/expected_config + create mode 100644 scripts/kconfig/tests/warn_num_bounds/expected_config_stderr + create mode 100644 scripts/kconfig/tests/warn_num_bounds/expected_frontend_config + create mode 100644 scripts/kconfig/tests/warn_num_bounds/expected_frontend_stderr + delete mode 100755 scripts/mksysmap +Merging clang-fixes/clang-fixes-for-next (0bb666d5f5a23 once_lite: Simplify condition handling and fix context analysis) +$ git merge -m Merge branch 'clang-fixes-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nathan/linux.git clang-fixes/clang-fixes-for-next +Merge made by the 'ort' strategy. + include/linux/once_lite.h | 8 +++++--- + 1 file changed, 5 insertions(+), 3 deletions(-) +Merging clang-format/clang-format (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf-tools-next (3b05843302202 perf test attr: Source setup_python.sh instead of calling python) +$ git merge -m Merge branch 'perf-tools-next' of https://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + tools/arch/x86/include/asm/msr-index.h | 7 + + tools/arch/x86/include/uapi/asm/perf_regs.h | 53 + + tools/build/Makefile.feature | 8 +- + tools/build/feature/Makefile | 42 +- + tools/build/feature/test-all.c | 6 +- + tools/build/feature/test-gettid.c | 1 + + tools/build/feature/test-gtk2-infobar.c | 12 - + tools/build/feature/{test-gtk2.c => test-gtk4.c} | 4 +- + tools/build/feature/test-libdw.c | 10 +- + tools/build/feature/test-libperl.c | 10 - + tools/build/feature/test-libpython.c | 10 - + tools/build/feature/test-python-module.c | 13 + + tools/build/feature/test-timerfd.c | 2 +- + tools/include/tools/dis-asm-compat.h | 1 + + tools/include/uapi/linux/perf_event.h | 49 +- + tools/lib/api/fd/array.c | 4 + + tools/lib/perf/evlist.c | 5 +- + tools/lib/perf/include/internal/evsel.h | 2 + + tools/perf/.clang-format | 1 + + tools/perf/Build | 17 +- + tools/perf/Documentation/build-docdep.perl | 2 +- + tools/perf/Documentation/db-export.txt | 20 +- + tools/perf/Documentation/perf-annotate.txt | 3 + + tools/perf/Documentation/perf-c2c.txt | 14 +- + tools/perf/Documentation/perf-check.txt | 3 +- + tools/perf/Documentation/perf-config.txt | 10 + + tools/perf/Documentation/perf-list.txt | 10 + + tools/perf/Documentation/perf-mem.txt | 4 + + tools/perf/Documentation/perf-record.txt | 27 +- + tools/perf/Documentation/perf-report.txt | 32 +- + tools/perf/Documentation/perf-sched.txt | 6 +- + tools/perf/Documentation/perf-script-perl.txt | 216 - + tools/perf/Documentation/perf-script-python.txt | 752 +-- + tools/perf/Documentation/perf-script.txt | 82 +- + tools/perf/Documentation/perf-stat.txt | 12 +- + tools/perf/Documentation/perf-timechart.txt | 8 + + tools/perf/Documentation/perf-top.txt | 11 + + tools/perf/Documentation/perf-trace.txt | 6 + + tools/perf/Documentation/perf.data-file-format.txt | 13 + + tools/perf/Documentation/tips.txt | 3 +- + tools/perf/Makefile | 51 +- + tools/perf/Makefile.config | 106 +- + tools/perf/Makefile.perf | 197 +- + tools/perf/arch/arm/tests/dwarf-unwind.c | 1 + + tools/perf/arch/arm64/tests/dwarf-unwind.c | 1 + + tools/perf/arch/loongarch/util/header.c | 2 +- + tools/perf/arch/powerpc/tests/dwarf-unwind.c | 1 + + tools/perf/arch/powerpc/util/skip-callchain-idx.c | 4 +- + tools/perf/arch/riscv/Build | 1 + + tools/perf/arch/riscv/include/arch-tests.h | 9 + + tools/perf/arch/riscv/include/perf_regs.h | 2 + + tools/perf/arch/riscv/tests/Build | 4 + + tools/perf/arch/riscv/tests/arch-tests.c | 10 + + tools/perf/arch/riscv/tests/dwarf-unwind.c | 64 + + tools/perf/arch/riscv/tests/regs_load.S | 58 + + tools/perf/arch/x86/tests/dwarf-unwind.c | 4 + + tools/perf/arch/x86/tests/topdown.c | 30 + + tools/perf/arch/x86/util/mem-events.c | 17 + + tools/perf/arch/x86/util/mem-events.h | 2 + + tools/perf/arch/x86/util/pmu.c | 226 +- + tools/perf/arch/x86/util/topdown.c | 3 +- + tools/perf/bench/futex.h | 11 + + tools/perf/bench/numa.c | 2 + + tools/perf/bench/sched-messaging.c | 4 +- + tools/perf/builtin-annotate.c | 96 +- + tools/perf/builtin-buildid-list.c | 17 +- + tools/perf/builtin-c2c.c | 229 +- + tools/perf/builtin-check.c | 3 +- + tools/perf/builtin-config.c | 88 +- + tools/perf/builtin-ftrace.c | 28 +- + tools/perf/builtin-help.c | 30 +- + tools/perf/builtin-inject.c | 4 + + tools/perf/builtin-kmem.c | 3 +- + tools/perf/builtin-kvm.c | 1 + + tools/perf/builtin-list.c | 36 +- + tools/perf/builtin-mem.c | 7 +- + tools/perf/builtin-record.c | 15 + + tools/perf/builtin-report.c | 52 +- + tools/perf/builtin-sched.c | 202 +- + tools/perf/builtin-script.c | 1124 +++-- + tools/perf/builtin-stat.c | 4 +- + tools/perf/builtin-timechart.c | 49 +- + tools/perf/builtin-top.c | 38 +- + tools/perf/builtin-trace.c | 712 +-- + tools/perf/builtin.h | 3 + + tools/perf/perf.c | 120 +- + tools/perf/pmu-events/Build | 72 +- + tools/perf/pmu-events/amd_metrics.py | 16 +- + .../perf/pmu-events/arch/x86/alderlake/cache.json | 4 +- + .../perf/pmu-events/arch/x86/alderlake/memory.json | 13 + + .../perf/pmu-events/arch/x86/alderlake/other.json | 10 + + .../pmu-events/arch/x86/alderlake/pipeline.json | 6 +- + .../perf/pmu-events/arch/x86/alderlaken/cache.json | 4 +- + .../perf/pmu-events/arch/x86/arrowlake/cache.json | 1 + + .../perf/pmu-events/arch/x86/arrowlake/other.json | 19 + + .../pmu-events/arch/x86/arrowlake/pipeline.json | 10 +- + .../pmu-events/arch/x86/broadwell/bdw-metrics.json | 51 +- + .../arch/x86/broadwell/metricgroups.json | 3 +- + .../arch/x86/broadwellde/bdwde-metrics.json | 49 +- + .../arch/x86/broadwellde/metricgroups.json | 3 +- + .../arch/x86/broadwellx/bdx-metrics.json | 63 +- + .../arch/x86/broadwellx/metricgroups.json | 3 +- + .../arch/x86/cascadelakex/clx-metrics.json | 94 +- + .../arch/x86/cascadelakex/metricgroups.json | 3 +- + .../arch/x86/cascadelakex/uncore-interconnect.json | 6 + + .../arch/x86/clearwaterforest/pipeline.json | 3 +- + .../arch/x86/clearwaterforest/uncore-cache.json | 5 + + .../x86/clearwaterforest/uncore-interconnect.json | 2 + + .../pmu-events/arch/x86/emeraldrapids/cache.json | 2 +- + .../pmu-events/arch/x86/emeraldrapids/memory.json | 35 + + .../pmu-events/arch/x86/emeraldrapids/other.json | 9 + + .../arch/x86/emeraldrapids/pipeline.json | 10 +- + .../arch/x86/emeraldrapids/uncore-cache.json | 42 + + .../x86/emeraldrapids/uncore-interconnect.json | 12 + + .../arch/x86/emeraldrapids/uncore-io.json | 54 +- + .../arch/x86/emeraldrapids/uncore-memory.json | 10 + + .../pmu-events/arch/x86/graniterapids/other.json | 9 + + .../arch/x86/graniterapids/pipeline.json | 6 +- + .../arch/x86/graniterapids/uncore-cache.json | 15 + + .../x86/graniterapids/uncore-interconnect.json | 2 + + .../arch/x86/graniterapids/uncore-io.json | 12 + + .../pmu-events/arch/x86/haswell/hsw-metrics.json | 49 +- + .../pmu-events/arch/x86/haswell/metricgroups.json | 3 +- + .../pmu-events/arch/x86/haswellx/hsx-metrics.json | 61 +- + .../pmu-events/arch/x86/haswellx/metricgroups.json | 3 +- + .../pmu-events/arch/x86/icelake/icl-metrics.json | 84 +- + tools/perf/pmu-events/arch/x86/icelake/memory.json | 24 + + .../pmu-events/arch/x86/icelake/metricgroups.json | 2 +- + tools/perf/pmu-events/arch/x86/icelake/other.json | 9 + + .../perf/pmu-events/arch/x86/icelake/pipeline.json | 9 +- + .../pmu-events/arch/x86/icelakex/icx-metrics.json | 101 +- + .../perf/pmu-events/arch/x86/icelakex/memory.json | 24 + + .../pmu-events/arch/x86/icelakex/metricgroups.json | 2 +- + tools/perf/pmu-events/arch/x86/icelakex/other.json | 9 + + .../pmu-events/arch/x86/icelakex/pipeline.json | 7 +- + .../pmu-events/arch/x86/icelakex/uncore-cache.json | 79 + + .../arch/x86/icelakex/uncore-interconnect.json | 22 + + .../pmu-events/arch/x86/ivybridge/ivb-metrics.json | 51 +- + .../arch/x86/ivybridge/metricgroups.json | 3 +- + .../pmu-events/arch/x86/ivytown/ivt-metrics.json | 63 +- + .../pmu-events/arch/x86/ivytown/metricgroups.json | 3 +- + .../pmu-events/arch/x86/jaketown/jkt-metrics.json | 41 +- + .../pmu-events/arch/x86/jaketown/metricgroups.json | 3 +- + .../perf/pmu-events/arch/x86/lunarlake/cache.json | 3 + + .../pmu-events/arch/x86/lunarlake/pipeline.json | 2 + + tools/perf/pmu-events/arch/x86/mapfile.csv | 26 +- + .../perf/pmu-events/arch/x86/meteorlake/other.json | 10 + + .../pmu-events/arch/x86/meteorlake/pipeline.json | 6 +- + tools/perf/pmu-events/arch/x86/novalake/cache.json | 500 +- + .../arch/x86/novalake/floating-point.json | 423 ++ + .../pmu-events/arch/x86/novalake/frontend.json | 147 +- + .../perf/pmu-events/arch/x86/novalake/memory.json | 24 + + tools/perf/pmu-events/arch/x86/novalake/other.json | 213 + + .../pmu-events/arch/x86/novalake/pipeline.json | 508 +- + .../arch/x86/novalake/virtual-memory.json | 173 + + .../pmu-events/arch/x86/pantherlake/cache.json | 3 + + .../pmu-events/arch/x86/pantherlake/other.json | 10 + + .../pmu-events/arch/x86/pantherlake/pipeline.json | 10 +- + .../pmu-events/arch/x86/rocketlake/memory.json | 24 + + .../arch/x86/rocketlake/metricgroups.json | 2 +- + .../perf/pmu-events/arch/x86/rocketlake/other.json | 9 + + .../pmu-events/arch/x86/rocketlake/pipeline.json | 9 +- + .../arch/x86/rocketlake/rkl-metrics.json | 84 +- + .../arch/x86/sandybridge/metricgroups.json | 3 +- + .../arch/x86/sandybridge/snb-metrics.json | 35 +- + .../pmu-events/arch/x86/sapphirerapids/cache.json | 2 +- + .../pmu-events/arch/x86/sapphirerapids/memory.json | 35 + + .../arch/x86/sapphirerapids/metricgroups.json | 2 +- + .../pmu-events/arch/x86/sapphirerapids/other.json | 9 + + .../arch/x86/sapphirerapids/pipeline.json | 10 +- + .../arch/x86/sapphirerapids/spr-metrics.json | 93 +- + .../arch/x86/sapphirerapids/uncore-cache.json | 42 + + .../x86/sapphirerapids/uncore-interconnect.json | 12 + + .../arch/x86/sapphirerapids/uncore-io.json | 54 +- + .../arch/x86/sapphirerapids/uncore-memory.json | 10 + + .../arch/x86/sierraforest/uncore-cache.json | 5 + + .../arch/x86/sierraforest/uncore-interconnect.json | 2 + + .../pmu-events/arch/x86/skylake/metricgroups.json | 3 +- + .../pmu-events/arch/x86/skylake/skl-metrics.json | 59 +- + .../pmu-events/arch/x86/skylakex/metricgroups.json | 3 +- + .../pmu-events/arch/x86/skylakex/skx-metrics.json | 94 +- + .../arch/x86/skylakex/uncore-interconnect.json | 6 + + .../arch/x86/snowridgex/uncore-cache.json | 68 + + .../arch/x86/snowridgex/uncore-interconnect.json | 10 + + .../arch/x86/tigerlake/metricgroups.json | 2 +- + .../perf/pmu-events/arch/x86/tigerlake/other.json | 9 + + .../pmu-events/arch/x86/tigerlake/pipeline.json | 7 +- + .../pmu-events/arch/x86/tigerlake/tgl-metrics.json | 82 +- + tools/perf/pmu-events/intel_metrics.py | 268 +- + tools/perf/pmu-events/jevents.py | 112 +- + tools/perf/pmu-events/make_legacy_cache.py | 34 +- + tools/perf/pmu-events/metric.py | 60 +- + tools/perf/python/SchedGui.py | 246 + + tools/perf/python/arm-cs-trace-disasm.py | 440 ++ + tools/perf/python/check-perf-trace.py | 223 + + tools/perf/python/compaction-times.py | 362 ++ + tools/perf/python/counting.py | 1 + + tools/perf/python/event_analyzing_sample.py | 317 ++ + tools/perf/python/export-to-postgresql.py | 1328 +++++ + tools/perf/python/export-to-sqlite.py | 946 ++++ + tools/perf/python/exported-sql-viewer.py | 5103 ++++++++++++++++++++ + tools/perf/python/failed-syscalls-by-pid.py | 161 + + tools/perf/python/failed-syscalls.py | 94 + + tools/perf/python/flamegraph.py | 283 ++ + tools/perf/python/futex-contention.py | 107 + + tools/perf/python/gecko.py | 411 ++ + tools/perf/python/ilist.py | 86 +- + tools/perf/python/intel-pt-events.py | 632 +++ + tools/perf/python/libxed.py | 123 + + tools/perf/python/mem-phys-addr.py | 136 + + tools/perf/python/net_dropmonitor.py | 173 + + tools/perf/python/netdev-times.py | 494 ++ + tools/perf/python/parallel-perf.py | 1250 +++++ + tools/perf/python/perf.pyi | 122 +- + tools/perf/python/perf_live.py | 10 +- + tools/perf/{scripts => }/python/powerpc-hcalls.py | 213 +- + tools/perf/python/rw-by-file.py | 113 + + tools/perf/python/rw-by-pid.py | 205 + + tools/perf/python/rwtop.py | 256 + + tools/perf/python/sched-migration.py | 496 ++ + tools/perf/python/sctop.py | 253 + + tools/perf/python/stackcollapse.py | 145 + + tools/perf/python/stat-cpi.py | 231 + + tools/perf/python/syscall-counts-by-pid.py | 112 + + tools/perf/python/syscall-counts.py | 95 + + tools/perf/python/task-analyzer.py | 908 ++++ + tools/perf/python/tracepoint.py | 5 +- + tools/perf/python/treport.py | 806 ++++ + tools/perf/python/ttimechart.py | 1807 +++++++ + tools/perf/python/twatch.py | 77 +- + tools/perf/python/wakeup-latency.py | 103 + + tools/perf/scripts/Build | 30 - + tools/perf/scripts/install-build-deps.sh | 8 +- + tools/perf/scripts/perl/Perf-Trace-Util/Build | 9 - + tools/perf/scripts/perl/Perf-Trace-Util/Context.c | 122 - + tools/perf/scripts/perl/Perf-Trace-Util/Context.xs | 42 - + .../perf/scripts/perl/Perf-Trace-Util/Makefile.PL | 18 - + tools/perf/scripts/perl/Perf-Trace-Util/README | 59 - + .../perl/Perf-Trace-Util/lib/Perf/Trace/Context.pm | 55 - + .../perl/Perf-Trace-Util/lib/Perf/Trace/Core.pm | 192 - + .../perl/Perf-Trace-Util/lib/Perf/Trace/Util.pm | 94 - + tools/perf/scripts/perl/Perf-Trace-Util/typemap | 1 - + .../perf/scripts/perl/bin/check-perf-trace-record | 2 - + tools/perf/scripts/perl/bin/failed-syscalls-record | 3 - + tools/perf/scripts/perl/bin/failed-syscalls-report | 10 - + tools/perf/scripts/perl/bin/rw-by-file-record | 3 - + tools/perf/scripts/perl/bin/rw-by-file-report | 10 - + tools/perf/scripts/perl/bin/rw-by-pid-record | 2 - + tools/perf/scripts/perl/bin/rw-by-pid-report | 3 - + tools/perf/scripts/perl/bin/rwtop-record | 2 - + tools/perf/scripts/perl/bin/rwtop-report | 20 - + tools/perf/scripts/perl/bin/wakeup-latency-record | 6 - + tools/perf/scripts/perl/bin/wakeup-latency-report | 3 - + tools/perf/scripts/perl/check-perf-trace.pl | 106 - + tools/perf/scripts/perl/failed-syscalls.pl | 47 - + tools/perf/scripts/perl/rw-by-file.pl | 106 - + tools/perf/scripts/perl/rw-by-pid.pl | 184 - + tools/perf/scripts/perl/rwtop.pl | 203 - + tools/perf/scripts/perl/wakeup-latency.pl | 107 - + tools/perf/scripts/python/Perf-Trace-Util/Build | 4 - + .../perf/scripts/python/Perf-Trace-Util/Context.c | 225 - + .../python/Perf-Trace-Util/lib/Perf/Trace/Core.py | 116 - + .../Perf-Trace-Util/lib/Perf/Trace/EventClass.py | 97 - + .../Perf-Trace-Util/lib/Perf/Trace/SchedGui.py | 184 - + .../python/Perf-Trace-Util/lib/Perf/Trace/Util.py | 92 - + tools/perf/scripts/python/arm-cs-trace-disasm.py | 356 -- + .../scripts/python/bin/compaction-times-record | 2 - + .../scripts/python/bin/compaction-times-report | 4 - + .../python/bin/event_analyzing_sample-record | 8 - + .../python/bin/event_analyzing_sample-report | 3 - + .../scripts/python/bin/export-to-postgresql-record | 8 - + .../scripts/python/bin/export-to-postgresql-report | 29 - + .../scripts/python/bin/export-to-sqlite-record | 8 - + .../scripts/python/bin/export-to-sqlite-report | 29 - + .../python/bin/failed-syscalls-by-pid-record | 3 - + .../python/bin/failed-syscalls-by-pid-report | 10 - + tools/perf/scripts/python/bin/flamegraph-record | 2 - + tools/perf/scripts/python/bin/flamegraph-report | 3 - + .../scripts/python/bin/futex-contention-record | 2 - + .../scripts/python/bin/futex-contention-report | 4 - + tools/perf/scripts/python/bin/gecko-record | 2 - + tools/perf/scripts/python/bin/gecko-report | 7 - + .../perf/scripts/python/bin/intel-pt-events-record | 13 - + .../perf/scripts/python/bin/intel-pt-events-report | 3 - + tools/perf/scripts/python/bin/mem-phys-addr-record | 19 - + tools/perf/scripts/python/bin/mem-phys-addr-report | 3 - + .../perf/scripts/python/bin/net_dropmonitor-record | 2 - + .../perf/scripts/python/bin/net_dropmonitor-report | 4 - + tools/perf/scripts/python/bin/netdev-times-record | 8 - + tools/perf/scripts/python/bin/netdev-times-report | 5 - + .../perf/scripts/python/bin/powerpc-hcalls-record | 2 - + .../perf/scripts/python/bin/powerpc-hcalls-report | 2 - + .../perf/scripts/python/bin/sched-migration-record | 2 - + .../perf/scripts/python/bin/sched-migration-report | 3 - + tools/perf/scripts/python/bin/sctop-record | 3 - + tools/perf/scripts/python/bin/sctop-report | 24 - + tools/perf/scripts/python/bin/stackcollapse-record | 8 - + tools/perf/scripts/python/bin/stackcollapse-report | 3 - + .../python/bin/syscall-counts-by-pid-record | 3 - + .../python/bin/syscall-counts-by-pid-report | 10 - + .../perf/scripts/python/bin/syscall-counts-record | 3 - + .../perf/scripts/python/bin/syscall-counts-report | 10 - + tools/perf/scripts/python/bin/task-analyzer-record | 2 - + tools/perf/scripts/python/bin/task-analyzer-report | 3 - + tools/perf/scripts/python/check-perf-trace.py | 84 - + tools/perf/scripts/python/compaction-times.py | 311 -- + .../perf/scripts/python/event_analyzing_sample.py | 192 - + tools/perf/scripts/python/export-to-postgresql.py | 1114 ----- + tools/perf/scripts/python/export-to-sqlite.py | 799 --- + tools/perf/scripts/python/exported-sql-viewer.py | 5030 ------------------- + .../perf/scripts/python/failed-syscalls-by-pid.py | 79 - + tools/perf/scripts/python/flamegraph.py | 267 - + tools/perf/scripts/python/futex-contention.py | 57 - + tools/perf/scripts/python/gecko.py | 395 -- + tools/perf/scripts/python/intel-pt-events.py | 494 -- + tools/perf/scripts/python/libxed.py | 107 - + tools/perf/scripts/python/mem-phys-addr.py | 127 - + tools/perf/scripts/python/net_dropmonitor.py | 78 - + tools/perf/scripts/python/netdev-times.py | 473 -- + tools/perf/scripts/python/parallel-perf.py | 989 ---- + tools/perf/scripts/python/sched-migration.py | 462 -- + tools/perf/scripts/python/sctop.py | 89 - + tools/perf/scripts/python/stackcollapse.py | 127 - + tools/perf/scripts/python/stat-cpi.py | 79 - + tools/perf/scripts/python/syscall-counts-by-pid.py | 75 - + tools/perf/scripts/python/syscall-counts.py | 65 - + tools/perf/scripts/python/task-analyzer.py | 934 ---- + tools/perf/tests/Build | 19 +- + tools/perf/tests/builtin-test.c | 54 +- + tools/perf/tests/code-reading.c | 12 +- + tools/perf/tests/demangle-java-test.c | 1 + + tools/perf/tests/demangle-rust-v0-test.c | 1 + + tools/perf/tests/fdarray.c | 32 + + tools/perf/tests/hists_cumulate.c | 2 +- + tools/perf/tests/hists_filter.c | 2 +- + tools/perf/tests/hists_link.c | 2 +- + tools/perf/tests/hists_output.c | 2 +- + tools/perf/tests/hybrid-merge.c | 206 + + tools/perf/tests/make | 114 +- + tools/perf/tests/sample-parsing.c | 109 + + tools/perf/tests/shell/annotate.sh | 1 - + tools/perf/tests/shell/annotate_weight.sh | 63 + + tools/perf/tests/shell/attr.sh | 7 +- + tools/perf/tests/shell/attr/base-record | 2 +- + tools/perf/tests/shell/attr/base-stat | 2 +- + tools/perf/tests/shell/attr/system-wide-dummy | 2 +- + tools/perf/tests/shell/attr/test-record-dummy-C0 | 2 +- + .../tests/shell/base_probe/test_adding_kernel.sh | 1 - + tools/perf/tests/shell/c2c.sh | 114 + + tools/perf/tests/shell/common/init.sh | 21 +- + tools/perf/tests/shell/coresight/callchain.sh | 7 +- + .../shell/coresight/test_arm_coresight_disasm.sh | 15 +- + tools/perf/tests/shell/data_type_profiling.sh | 55 +- + tools/perf/tests/shell/diff.sh | 1 - + tools/perf/tests/shell/inject_aslr.sh | 1 - + tools/perf/tests/shell/jitdump-python.sh | 1 - + tools/perf/tests/shell/lib/attr.py | 119 +- + tools/perf/tests/shell/lib/perf_brstack_max.py | 40 + + .../perf/tests/shell/lib/perf_json_output_lint.py | 36 +- + .../perf/tests/shell/lib/perf_metric_validation.py | 53 +- + tools/perf/tests/shell/lib/perf_record.sh | 2 +- + tools/perf/tests/shell/lib/probe_vfs_getname.sh | 33 +- + tools/perf/tests/shell/lib/setup_python.sh | 29 +- + tools/perf/tests/shell/lib/waiting.sh | 34 +- + tools/perf/tests/shell/list.sh | 1 - + tools/perf/tests/shell/pipe_test.sh | 1 - + tools/perf/tests/shell/probe_vfs_getname.sh | 5 +- + tools/perf/tests/shell/python-use.sh | 1 - + .../tests/shell/record+probe_libc_inet_pton.sh | 87 +- + .../tests/shell/record+script_probe_vfs_getname.sh | 18 +- + tools/perf/tests/shell/record.sh | 278 +- + tools/perf/tests/shell/record_weak_term.sh | 1 - + tools/perf/tests/shell/report_hybrid_merge.sh | 121 + + tools/perf/tests/shell/schedstat_snapshots.sh | 155 + + tools/perf/tests/shell/script.sh | 46 +- + tools/perf/tests/shell/script_dlfilter.sh | 1 - + tools/perf/tests/shell/script_perl.sh | 102 - + tools/perf/tests/shell/script_python.sh | 113 - + tools/perf/tests/shell/stat+csv_output.sh | 1 - + tools/perf/tests/shell/stat+json_output.sh | 1 - + tools/perf/tests/shell/stat+std_output.sh | 1 - + tools/perf/tests/shell/stat.sh | 5 + + tools/perf/tests/shell/stat_metrics_cgrp.sh | 7 + + tools/perf/tests/shell/stat_metrics_values.sh | 1 - + tools/perf/tests/shell/test_arm_callgraph_fp.sh | 1 - + tools/perf/tests/shell/test_brstack.sh | 1 - + .../tests/shell/test_check_perf_trace_python.sh | 87 + + .../tests/shell/test_compaction_times_python.sh | 129 + + tools/perf/tests/shell/test_data_symbol.sh | 7 +- + .../shell/test_event_analyzing_sample_python.sh | 70 + + tools/perf/tests/shell/test_event_open_fallback.sh | 2 - + .../shell/test_export_to_postgresql_python.sh | 129 + + .../tests/shell/test_export_to_sqlite_python.sh | 115 + + .../shell/test_failed_syscalls_by_pid_python.sh | 106 + + .../tests/shell/test_failed_syscalls_python.sh | 90 + + tools/perf/tests/shell/test_flamegraph_python.sh | 123 + + .../tests/shell/test_futex_contention_python.sh | 116 + + tools/perf/tests/shell/test_gecko_python.sh | 96 + + tools/perf/tests/shell/test_ilist_python.sh | 181 + + tools/perf/tests/shell/test_intel_pt.sh | 46 +- + .../tests/shell/test_intel_pt_events_python.sh | 74 + + .../perf/tests/shell/test_mem_phys_addr_python.sh | 105 + + .../tests/shell/test_net_dropmonitor_python.sh | 103 + + tools/perf/tests/shell/test_netdev_times_python.sh | 104 + + .../tests/shell/test_perf_data_converter_json.sh | 1 - + .../perf/tests/shell/test_powerpc_hcalls_python.sh | 95 + + tools/perf/tests/shell/test_rw_by_file_python.sh | 69 + + tools/perf/tests/shell/test_rw_by_pid_python.sh | 75 + + tools/perf/tests/shell/test_rwtop_python.sh | 74 + + .../tests/shell/test_sched_migration_python.sh | 72 + + tools/perf/tests/shell/test_sctop_python.sh | 78 + + .../perf/tests/shell/test_stackcollapse_python.sh | 78 + + tools/perf/tests/shell/test_stat_cpi_python.sh | 121 + + .../shell/test_syscall_counts_by_pid_python.sh | 93 + + .../perf/tests/shell/test_syscall_counts_python.sh | 82 + + tools/perf/tests/shell/test_task_analyzer.sh | 93 +- + tools/perf/tests/shell/test_test_junit_output.sh | 1 - + tools/perf/tests/shell/test_treport_python.sh | 247 + + tools/perf/tests/shell/test_ttimechart_python.sh | 237 + + .../tests/shell/test_uprobe_from_different_cu.sh | 8 +- + .../perf/tests/shell/test_wakeup_latency_python.sh | 83 + + tools/perf/tests/shell/top.sh | 73 +- + tools/perf/tests/shell/trace+probe_vfs_getname.sh | 6 +- + tools/perf/tests/shell/trace_btf_enum.sh | 1 - + tools/perf/tests/shell/trace_btf_general.sh | 9 +- + tools/perf/tests/shell/trace_exit_race.sh | 1 - + tools/perf/tests/shell/trace_ksym_beautifier.sh | 38 + + tools/perf/tests/shell/trace_record_replay.sh | 2 - + tools/perf/tests/shell/trace_summary.sh | 16 +- + tools/perf/tests/symbols.c | 96 +- + tools/perf/tests/tests.h | 2 + + tools/perf/tests/thread-maps-share.c | 3 +- + tools/perf/tests/tool_pmu.c | 79 + + tools/perf/tests/workloads/Build | 2 + + tools/perf/tests/workloads/code_with_type.c | 2 +- + tools/perf/tests/workloads/false_sharing.c | 251 + + tools/perf/trace/beauty/arch_errno_names.sh | 4 +- + tools/perf/trace/beauty/beauty.h | 20 + + tools/perf/trace/beauty/include/uapi/linux/fs.h | 2 +- + tools/perf/trace/beauty/perf_event_open.c | 31 +- + tools/perf/trace/beauty/sockaddr.c | 49 +- + tools/perf/trace/beauty/syscalltbl.sh | 2 +- + tools/perf/trace/beauty/timespec.c | 2 +- + tools/perf/ui/Build | 1 + + tools/perf/ui/browsers/annotate-data.c | 12 +- + tools/perf/ui/browsers/annotate.c | 21 +- + tools/perf/ui/browsers/hists.c | 8 +- + tools/perf/ui/browsers/scripts.c | 218 +- + tools/perf/ui/gtk/annotate.c | 36 +- + tools/perf/ui/gtk/browser.c | 96 +- + tools/perf/ui/gtk/gtk.h | 16 +- + tools/perf/ui/gtk/hists.c | 72 +- + tools/perf/ui/gtk/progress.c | 40 +- + tools/perf/ui/gtk/setup.c | 5 +- + tools/perf/ui/gtk/util.c | 97 +- + tools/perf/ui/hist.c | 248 +- + tools/perf/ui/libslang.h | 2 + + tools/perf/ui/progress.c | 6 + + tools/perf/ui/progress.h | 4 + + tools/perf/ui/setup.c | 2 +- + tools/perf/ui/stdio/progress.c | 170 + + tools/perf/util/Build | 18 +- + tools/perf/util/addr2line.c | 42 +- + tools/perf/util/annotate-arch/Build | 1 + + tools/perf/util/annotate-arch/annotate-alpha.c | 185 + + tools/perf/util/annotate-arch/annotate-arm64.c | 435 +- + tools/perf/util/annotate-arch/annotate-loongarch.c | 4 + + tools/perf/util/annotate-arch/annotate-powerpc.c | 9 + + tools/perf/util/annotate-arch/annotate-x86.c | 79 + + tools/perf/util/annotate-data.c | 303 +- + tools/perf/util/annotate-data.h | 17 +- + tools/perf/util/annotate.c | 240 +- + tools/perf/util/annotate.h | 121 +- + tools/perf/util/arm-spe.c | 17 +- + tools/perf/util/aslr.c | 41 +- + tools/perf/util/aslr.h | 2 + + tools/perf/util/auxtrace.c | 19 +- + tools/perf/util/auxtrace.h | 7 +- + tools/perf/util/bpf-filter.c | 29 +- + tools/perf/util/bpf-filter.l | 1 + + .../util/bpf_skel/augmented_raw_syscalls.bpf.c | 220 +- + tools/perf/util/bpf_skel/perf_trace_u.h | 14 + + tools/perf/util/bpf_skel/vmlinux/vmlinux.h | 9 + + tools/perf/util/bpf_trace_augment.c | 91 +- + tools/perf/util/build-id.c | 12 +- + tools/perf/util/c2c-function.c | 9 +- + tools/perf/util/c2c.h | 2 + + tools/perf/util/cache.h | 31 - + tools/perf/util/capstone.c | 186 +- + tools/perf/util/config.c | 220 +- + tools/perf/util/config.h | 2 + + tools/perf/util/cs-etm.c | 2 +- + tools/perf/util/debug.c | 2 +- + tools/perf/util/debuginfo.c | 51 +- + tools/perf/util/debuginfo.h | 13 +- + tools/perf/util/disasm.c | 28 +- + tools/perf/util/disasm.h | 6 + + tools/perf/util/dso.c | 194 +- + tools/perf/util/dso.h | 59 +- + tools/perf/util/dwarf-aux.c | 247 +- + tools/perf/util/dwarf-aux.h | 16 + + tools/perf/util/dwarf-regs-arch/dwarf-regs-arm64.c | 25 + + tools/perf/util/dwarf-regs-arch/dwarf-regs-csky.c | 2 +- + .../perf/util/dwarf-regs-arch/dwarf-regs-powerpc.c | 2 +- + tools/perf/util/dwarf-regs-arch/dwarf-regs-s390.c | 2 +- + tools/perf/util/dwarf-regs-arch/dwarf-regs-x86.c | 140 +- + tools/perf/util/dwarf-regs.c | 11 +- + tools/perf/util/env.c | 1 + + tools/perf/util/env.h | 10 + + tools/perf/util/evlist.c | 236 +- + tools/perf/util/evlist.h | 3 + + tools/perf/util/evsel.c | 277 +- + tools/perf/util/evsel.h | 9 + + tools/perf/util/expr.c | 5 +- + tools/perf/util/genelf_debug.c | 28 +- + tools/perf/util/header.c | 336 +- + tools/perf/util/header.h | 1 + + tools/perf/util/help-unknown-cmd.c | 19 +- + tools/perf/util/help-unknown-cmd.h | 0 + tools/perf/util/hist.h | 21 +- + tools/perf/util/hwmon_pmu.c | 2 +- + tools/perf/util/include/dwarf-regs.h | 8 +- + tools/perf/util/intel-bts.c | 2 +- + tools/perf/util/intel-pt.c | 3 +- + tools/perf/util/jitdump.c | 204 +- + tools/perf/util/libbfd.c | 94 +- + tools/perf/util/libbfd.h | 9 + + tools/perf/util/libdw.c | 39 +- + tools/perf/util/llvm.c | 56 +- + tools/perf/util/machine.c | 4 +- + tools/perf/util/machine.h | 10 +- + tools/perf/util/mem-events.c | 94 +- + tools/perf/util/mem-events.h | 5 +- + tools/perf/util/metricgroup.c | 37 +- + tools/perf/util/mutex.h | 36 + + tools/perf/util/ordered-events.c | 16 +- + tools/perf/util/parse-events.c | 5 +- + tools/perf/util/parse-regs-options.c | 211 +- + tools/perf/util/path.c | 10 +- + tools/perf/util/path.h | 6 +- + tools/perf/util/perf-regs-arch/perf_regs_x86.c | 438 +- + tools/perf/util/perf_event_attr_fprintf.c | 13 + + tools/perf/util/perf_regs.c | 84 +- + tools/perf/util/perf_regs.h | 21 +- + tools/perf/util/pmu.c | 48 +- + tools/perf/util/pmu.h | 3 + + tools/perf/util/pmus.c | 21 +- + tools/perf/util/powerpc-vpadtl.c | 2 +- + tools/perf/util/probe-event.c | 4 +- + tools/perf/util/python.c | 2011 ++++++-- + tools/perf/util/record.h | 7 + + tools/perf/util/sample.h | 5 + + tools/perf/util/scripting-engines/Build | 9 - + .../perf/util/scripting-engines/trace-event-perl.c | 770 --- + .../util/scripting-engines/trace-event-python.c | 2224 --------- + tools/perf/util/session.c | 139 +- + tools/perf/util/setup.py | 1 + + tools/perf/util/srcline.c | 66 +- + tools/perf/util/strbuf.c | 14 +- + tools/perf/util/symbol.c | 34 +- + tools/perf/util/symbol_conf.h | 16 +- + tools/perf/util/synthetic-events.c | 56 +- + tools/perf/util/thread.c | 18 +- + tools/perf/util/thread_map.c | 26 + + tools/perf/util/thread_map.h | 1 + + tools/perf/util/tool_pmu.c | 2 +- + tools/perf/util/tp_pmu.c | 8 +- + tools/perf/util/trace-event-parse.c | 65 - + tools/perf/util/trace-event-scripting.c | 407 -- + tools/perf/util/trace-event.c | 90 +- + tools/perf/util/trace-event.h | 73 +- + tools/perf/util/trace_augment.h | 35 +- + tools/perf/util/unwind-libdw.c | 59 +- + tools/perf/util/unwind-libunwind.c | 62 +- + tools/perf/util/usage.c | 34 - + tools/perf/util/util.h | 4 - + 577 files changed, 38073 insertions(+), 24711 deletions(-) + delete mode 100644 tools/build/feature/test-gtk2-infobar.c + rename tools/build/feature/{test-gtk2.c => test-gtk4.c} (76%) + delete mode 100644 tools/build/feature/test-libperl.c + delete mode 100644 tools/build/feature/test-libpython.c + create mode 100644 tools/build/feature/test-python-module.c + delete mode 100644 tools/perf/Documentation/perf-script-perl.txt + create mode 100644 tools/perf/arch/riscv/include/arch-tests.h + create mode 100644 tools/perf/arch/riscv/tests/Build + create mode 100644 tools/perf/arch/riscv/tests/arch-tests.c + create mode 100644 tools/perf/arch/riscv/tests/dwarf-unwind.c + create mode 100644 tools/perf/arch/riscv/tests/regs_load.S + create mode 100755 tools/perf/python/SchedGui.py + create mode 100755 tools/perf/python/arm-cs-trace-disasm.py + create mode 100755 tools/perf/python/check-perf-trace.py + create mode 100755 tools/perf/python/compaction-times.py + create mode 100755 tools/perf/python/event_analyzing_sample.py + create mode 100755 tools/perf/python/export-to-postgresql.py + create mode 100755 tools/perf/python/export-to-sqlite.py + create mode 100755 tools/perf/python/exported-sql-viewer.py + create mode 100755 tools/perf/python/failed-syscalls-by-pid.py + create mode 100755 tools/perf/python/failed-syscalls.py + create mode 100755 tools/perf/python/flamegraph.py + create mode 100755 tools/perf/python/futex-contention.py + create mode 100755 tools/perf/python/gecko.py + create mode 100755 tools/perf/python/intel-pt-events.py + create mode 100755 tools/perf/python/libxed.py + create mode 100755 tools/perf/python/mem-phys-addr.py + create mode 100755 tools/perf/python/net_dropmonitor.py + create mode 100755 tools/perf/python/netdev-times.py + create mode 100755 tools/perf/python/parallel-perf.py + rename tools/perf/{scripts => }/python/powerpc-hcalls.py (54%) + mode change 100644 => 100755 + create mode 100755 tools/perf/python/rw-by-file.py + create mode 100755 tools/perf/python/rw-by-pid.py + create mode 100755 tools/perf/python/rwtop.py + create mode 100755 tools/perf/python/sched-migration.py + create mode 100755 tools/perf/python/sctop.py + create mode 100755 tools/perf/python/stackcollapse.py + create mode 100755 tools/perf/python/stat-cpi.py + create mode 100755 tools/perf/python/syscall-counts-by-pid.py + create mode 100755 tools/perf/python/syscall-counts.py + create mode 100755 tools/perf/python/task-analyzer.py + create mode 100755 tools/perf/python/treport.py + create mode 100755 tools/perf/python/ttimechart.py + create mode 100755 tools/perf/python/wakeup-latency.py + delete mode 100644 tools/perf/scripts/Build + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Build + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Context.c + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Context.xs + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/Makefile.PL + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/README + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Context.pm + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Core.pm + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/lib/Perf/Trace/Util.pm + delete mode 100644 tools/perf/scripts/perl/Perf-Trace-Util/typemap + delete mode 100644 tools/perf/scripts/perl/bin/check-perf-trace-record + delete mode 100644 tools/perf/scripts/perl/bin/failed-syscalls-record + delete mode 100644 tools/perf/scripts/perl/bin/failed-syscalls-report + delete mode 100644 tools/perf/scripts/perl/bin/rw-by-file-record + delete mode 100644 tools/perf/scripts/perl/bin/rw-by-file-report + delete mode 100644 tools/perf/scripts/perl/bin/rw-by-pid-record + delete mode 100644 tools/perf/scripts/perl/bin/rw-by-pid-report + delete mode 100644 tools/perf/scripts/perl/bin/rwtop-record + delete mode 100644 tools/perf/scripts/perl/bin/rwtop-report + delete mode 100644 tools/perf/scripts/perl/bin/wakeup-latency-record + delete mode 100644 tools/perf/scripts/perl/bin/wakeup-latency-report + delete mode 100644 tools/perf/scripts/perl/check-perf-trace.pl + delete mode 100644 tools/perf/scripts/perl/failed-syscalls.pl + delete mode 100644 tools/perf/scripts/perl/rw-by-file.pl + delete mode 100644 tools/perf/scripts/perl/rw-by-pid.pl + delete mode 100644 tools/perf/scripts/perl/rwtop.pl + delete mode 100644 tools/perf/scripts/perl/wakeup-latency.pl + delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/Build + delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/Context.c + delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Core.py + delete mode 100755 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/EventClass.py + delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/SchedGui.py + delete mode 100644 tools/perf/scripts/python/Perf-Trace-Util/lib/Perf/Trace/Util.py + delete mode 100755 tools/perf/scripts/python/arm-cs-trace-disasm.py + delete mode 100644 tools/perf/scripts/python/bin/compaction-times-record + delete mode 100644 tools/perf/scripts/python/bin/compaction-times-report + delete mode 100644 tools/perf/scripts/python/bin/event_analyzing_sample-record + delete mode 100644 tools/perf/scripts/python/bin/event_analyzing_sample-report + delete mode 100644 tools/perf/scripts/python/bin/export-to-postgresql-record + delete mode 100644 tools/perf/scripts/python/bin/export-to-postgresql-report + delete mode 100644 tools/perf/scripts/python/bin/export-to-sqlite-record + delete mode 100644 tools/perf/scripts/python/bin/export-to-sqlite-report + delete mode 100644 tools/perf/scripts/python/bin/failed-syscalls-by-pid-record + delete mode 100644 tools/perf/scripts/python/bin/failed-syscalls-by-pid-report + delete mode 100755 tools/perf/scripts/python/bin/flamegraph-record + delete mode 100755 tools/perf/scripts/python/bin/flamegraph-report + delete mode 100644 tools/perf/scripts/python/bin/futex-contention-record + delete mode 100644 tools/perf/scripts/python/bin/futex-contention-report + delete mode 100644 tools/perf/scripts/python/bin/gecko-record + delete mode 100755 tools/perf/scripts/python/bin/gecko-report + delete mode 100644 tools/perf/scripts/python/bin/intel-pt-events-record + delete mode 100644 tools/perf/scripts/python/bin/intel-pt-events-report + delete mode 100644 tools/perf/scripts/python/bin/mem-phys-addr-record + delete mode 100644 tools/perf/scripts/python/bin/mem-phys-addr-report + delete mode 100755 tools/perf/scripts/python/bin/net_dropmonitor-record + delete mode 100755 tools/perf/scripts/python/bin/net_dropmonitor-report + delete mode 100644 tools/perf/scripts/python/bin/netdev-times-record + delete mode 100644 tools/perf/scripts/python/bin/netdev-times-report + delete mode 100644 tools/perf/scripts/python/bin/powerpc-hcalls-record + delete mode 100644 tools/perf/scripts/python/bin/powerpc-hcalls-report + delete mode 100644 tools/perf/scripts/python/bin/sched-migration-record + delete mode 100644 tools/perf/scripts/python/bin/sched-migration-report + delete mode 100644 tools/perf/scripts/python/bin/sctop-record + delete mode 100644 tools/perf/scripts/python/bin/sctop-report + delete mode 100755 tools/perf/scripts/python/bin/stackcollapse-record + delete mode 100755 tools/perf/scripts/python/bin/stackcollapse-report + delete mode 100644 tools/perf/scripts/python/bin/syscall-counts-by-pid-record + delete mode 100644 tools/perf/scripts/python/bin/syscall-counts-by-pid-report + delete mode 100644 tools/perf/scripts/python/bin/syscall-counts-record + delete mode 100644 tools/perf/scripts/python/bin/syscall-counts-report + delete mode 100755 tools/perf/scripts/python/bin/task-analyzer-record + delete mode 100755 tools/perf/scripts/python/bin/task-analyzer-report + delete mode 100644 tools/perf/scripts/python/check-perf-trace.py + delete mode 100644 tools/perf/scripts/python/compaction-times.py + delete mode 100644 tools/perf/scripts/python/event_analyzing_sample.py + delete mode 100644 tools/perf/scripts/python/export-to-postgresql.py + delete mode 100644 tools/perf/scripts/python/export-to-sqlite.py + delete mode 100755 tools/perf/scripts/python/exported-sql-viewer.py + delete mode 100644 tools/perf/scripts/python/failed-syscalls-by-pid.py + delete mode 100755 tools/perf/scripts/python/flamegraph.py + delete mode 100644 tools/perf/scripts/python/futex-contention.py + delete mode 100644 tools/perf/scripts/python/gecko.py + delete mode 100644 tools/perf/scripts/python/intel-pt-events.py + delete mode 100644 tools/perf/scripts/python/libxed.py + delete mode 100644 tools/perf/scripts/python/mem-phys-addr.py + delete mode 100755 tools/perf/scripts/python/net_dropmonitor.py + delete mode 100644 tools/perf/scripts/python/netdev-times.py + delete mode 100755 tools/perf/scripts/python/parallel-perf.py + delete mode 100644 tools/perf/scripts/python/sched-migration.py + delete mode 100644 tools/perf/scripts/python/sctop.py + delete mode 100755 tools/perf/scripts/python/stackcollapse.py + delete mode 100644 tools/perf/scripts/python/stat-cpi.py + delete mode 100644 tools/perf/scripts/python/syscall-counts-by-pid.py + delete mode 100644 tools/perf/scripts/python/syscall-counts.py + delete mode 100755 tools/perf/scripts/python/task-analyzer.py + create mode 100644 tools/perf/tests/hybrid-merge.c + create mode 100755 tools/perf/tests/shell/annotate_weight.sh + create mode 100644 tools/perf/tests/shell/lib/perf_brstack_max.py + create mode 100755 tools/perf/tests/shell/report_hybrid_merge.sh + create mode 100755 tools/perf/tests/shell/schedstat_snapshots.sh + delete mode 100755 tools/perf/tests/shell/script_perl.sh + delete mode 100755 tools/perf/tests/shell/script_python.sh + create mode 100755 tools/perf/tests/shell/test_check_perf_trace_python.sh + create mode 100755 tools/perf/tests/shell/test_compaction_times_python.sh + create mode 100755 tools/perf/tests/shell/test_event_analyzing_sample_python.sh + create mode 100755 tools/perf/tests/shell/test_export_to_postgresql_python.sh + create mode 100755 tools/perf/tests/shell/test_export_to_sqlite_python.sh + create mode 100755 tools/perf/tests/shell/test_failed_syscalls_by_pid_python.sh + create mode 100755 tools/perf/tests/shell/test_failed_syscalls_python.sh + create mode 100755 tools/perf/tests/shell/test_flamegraph_python.sh + create mode 100755 tools/perf/tests/shell/test_futex_contention_python.sh + create mode 100755 tools/perf/tests/shell/test_gecko_python.sh + create mode 100755 tools/perf/tests/shell/test_ilist_python.sh + create mode 100755 tools/perf/tests/shell/test_intel_pt_events_python.sh + create mode 100755 tools/perf/tests/shell/test_mem_phys_addr_python.sh + create mode 100755 tools/perf/tests/shell/test_net_dropmonitor_python.sh + create mode 100755 tools/perf/tests/shell/test_netdev_times_python.sh + create mode 100755 tools/perf/tests/shell/test_powerpc_hcalls_python.sh + create mode 100755 tools/perf/tests/shell/test_rw_by_file_python.sh + create mode 100755 tools/perf/tests/shell/test_rw_by_pid_python.sh + create mode 100755 tools/perf/tests/shell/test_rwtop_python.sh + create mode 100755 tools/perf/tests/shell/test_sched_migration_python.sh + create mode 100755 tools/perf/tests/shell/test_sctop_python.sh + create mode 100755 tools/perf/tests/shell/test_stackcollapse_python.sh + create mode 100755 tools/perf/tests/shell/test_stat_cpi_python.sh + create mode 100755 tools/perf/tests/shell/test_syscall_counts_by_pid_python.sh + create mode 100755 tools/perf/tests/shell/test_syscall_counts_python.sh + create mode 100755 tools/perf/tests/shell/test_treport_python.sh + create mode 100755 tools/perf/tests/shell/test_ttimechart_python.sh + create mode 100755 tools/perf/tests/shell/test_wakeup_latency_python.sh + create mode 100755 tools/perf/tests/shell/trace_ksym_beautifier.sh + create mode 100644 tools/perf/tests/workloads/false_sharing.c + create mode 100644 tools/perf/ui/stdio/progress.c + create mode 100644 tools/perf/util/annotate-arch/annotate-alpha.c + create mode 100644 tools/perf/util/bpf_skel/perf_trace_u.h + delete mode 100644 tools/perf/util/cache.h + delete mode 100644 tools/perf/util/help-unknown-cmd.h + delete mode 100644 tools/perf/util/scripting-engines/Build + delete mode 100644 tools/perf/util/scripting-engines/trace-event-perl.c + delete mode 100644 tools/perf/util/scripting-engines/trace-event-python.c + delete mode 100644 tools/perf/util/trace-event-scripting.c + delete mode 100644 tools/perf/util/usage.c +Merging compiler-attributes/compiler-attributes (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/dma-mapping-for-next (3faa52b77c912 dma-debug: Skip cacheline tracking for MMIO mappings) +$ git merge -m Merge branch 'dma-mapping-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mszyprowski/linux.git dma-mapping/dma-mapping-for-next +Auto-merging MAINTAINERS +Auto-merging arch/riscv/mm/init.c +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging kernel/dma/swiotlb.c +Auto-merging mm/page_alloc.c +Merge made by the 'ort' strategy. + Documentation/core-api/dma-api.rst | 2 +- + MAINTAINERS | 1 + + arch/arm/xen/mm.c | 2 +- + arch/arm64/mm/init.c | 2 +- + arch/riscv/mm/init.c | 2 +- + arch/x86/include/asm/crash_reserve.h | 4 +-- + drivers/iommu/dma-iommu.c | 12 ++++---- + drivers/nvme/host/pci.c | 2 +- + drivers/scsi/scsi_transport_sas.c | 12 ++++---- + include/linux/dma-map-ops.h | 4 +-- + include/linux/dma-mapping.h | 4 +-- + include/linux/gfp.h | 2 +- + include/linux/iommu-dma.h | 2 +- + include/linux/swiotlb.h | 2 +- + kernel/dma/contiguous.c | 6 ++-- + kernel/dma/debug.c | 7 +++-- + kernel/dma/direct.c | 30 +++++++++++++++----- + kernel/dma/mapping.c | 10 +++---- + kernel/dma/ops_helpers.c | 11 +++++--- + kernel/dma/swiotlb.c | 54 +++++++++++++++++------------------- + mm/page_alloc.c | 2 +- + tools/dma/Makefile | 10 +++++-- + 22 files changed, 106 insertions(+), 77 deletions(-) +Merging asm-generic/master (adbbd9714f805 scripts: headers_install.sh: Remove config leak ignore machinery) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic asm-generic/master +Already up to date. +Merging alpha/alpha-next (d58041d2c63e0 MAINTAINERS: Add Magnus Lindholm as maintainer for alpha port) +$ git merge -m Merge branch 'alpha-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mattst88/alpha.git alpha/alpha-next +Already up to date. +Merging arm/for-next (1a89abc009cb5 Merge branches 'fixes' and 'misc' into for-linus) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rmk/linux.git arm/for-next +Already up to date. +Merging arm64/for-next/core (b9a2d373a5ca3 Merge branch 'for-next/smccc-bus' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/arch/arm64/booting.rst +Auto-merging Documentation/arch/arm64/silicon-errata.rst +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/io.h +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/kernel/Makefile +Auto-merging arch/arm64/kernel/cpu_errata.c +Auto-merging arch/arm64/kernel/cpufeature.c +Auto-merging arch/arm64/kernel/kexec_image.c +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/arm64/mm/init.c +Auto-merging arch/arm64/mm/pageattr.c +CONFLICT (content): Merge conflict in arch/arm64/mm/pageattr.c +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging arch/arm64/tools/cpucaps +Auto-merging kernel/power/hibernate.c +Resolved 'arch/arm64/mm/pageattr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 31c66285a2984] Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-firmware-cca | 7 + + Documentation/admin-guide/kernel-parameters.txt | 3 +- + Documentation/arch/arm64/booting.rst | 2 +- + Documentation/arch/arm64/mpam.rst | 26 + + Documentation/arch/arm64/silicon-errata.rst | 2 + + MAINTAINERS | 10 + + arch/arm/include/asm/archrandom.h | 2 +- + arch/arm64/Kconfig | 58 +- + arch/arm64/Makefile | 12 +- + arch/arm64/crypto/aes-ce-ccm-core.S | 4 +- + arch/arm64/crypto/aes-neonbs-core.S | 4 +- + arch/arm64/crypto/ghash-ce-core.S | 6 +- + arch/arm64/crypto/sm4-ce-cipher-core.S | 4 +- + arch/arm64/include/asm/alternative-macros.h | 30 +- + arch/arm64/include/asm/archrandom.h | 2 +- + arch/arm64/include/asm/assembler.h | 36 +- + arch/arm64/include/asm/atomic_ll_sc.h | 27 +- + arch/arm64/include/asm/atomic_lse.h | 4 +- + arch/arm64/include/asm/compat.h | 14 - + arch/arm64/include/asm/cpucaps.h | 2 + + arch/arm64/include/asm/cpufeature.h | 24 + + arch/arm64/include/asm/elf.h | 12 - + arch/arm64/include/asm/gpr-num.h | 9 + + arch/arm64/include/asm/io.h | 2 +- + arch/arm64/include/asm/kvm_host.h | 2 + + arch/arm64/include/asm/mem_encrypt.h | 5 +- + arch/arm64/include/asm/mte-kasan.h | 10 +- + arch/arm64/include/asm/page.h | 13 +- + arch/arm64/include/asm/percpu.h | 462 ++++++-- + arch/arm64/include/asm/pgtable-prot.h | 4 +- + arch/arm64/include/asm/preempt.h | 31 +- + arch/arm64/include/asm/processor.h | 2 - + arch/arm64/include/asm/ptrace.h | 18 +- + arch/arm64/include/asm/rsi.h | 70 -- + arch/arm64/include/asm/stage2_pgtable.h | 2 +- + arch/arm64/include/asm/sysreg.h | 52 +- + arch/arm64/include/asm/thread_info.h | 6 +- + arch/arm64/include/asm/tlbflush.h | 62 +- + arch/arm64/include/asm/word-at-a-time.h | 6 - + arch/arm64/include/asm/xwreg.h | 16 + + arch/arm64/include/uapi/asm/byteorder.h | 4 - + arch/arm64/include/uapi/asm/ptrace.h | 4 +- + arch/arm64/kernel/Makefile | 2 +- + arch/arm64/kernel/asm-offsets.c | 2 + + arch/arm64/kernel/cpu_errata.c | 40 +- + arch/arm64/kernel/cpufeature.c | 14 +- + arch/arm64/kernel/efi.c | 8 +- + arch/arm64/kernel/entry-common.c | 38 + + arch/arm64/kernel/entry.S | 41 +- + arch/arm64/kernel/fpsimd.c | 24 +- + arch/arm64/kernel/head.S | 3 +- + arch/arm64/kernel/hibernate.c | 14 + + arch/arm64/kernel/image-vars.h | 1 - + arch/arm64/kernel/image.h | 18 +- + arch/arm64/kernel/kexec_image.c | 5 +- + arch/arm64/kernel/kgdb.c | 6 +- + arch/arm64/kernel/machine_kexec.c | 11 + + arch/arm64/kernel/ptrace.c | 8 +- + arch/arm64/kernel/setup.c | 2 +- + arch/arm64/kernel/signal32.c | 13 - + arch/arm64/kernel/sys32.c | 5 - + arch/arm64/kernel/traps.c | 2 + + arch/arm64/kernel/vdso32/Makefile | 4 - + arch/arm64/kvm/arm.c | 5 + + arch/arm64/kvm/hyp/include/nvhe/spinlock.h | 4 - + arch/arm64/kvm/hyp/nvhe/Makefile | 2 +- + arch/arm64/kvm/hyp/nvhe/gen-hyprel.c | 16 - + arch/arm64/kvm/sys_regs.c | 2 + + arch/arm64/lib/Makefile | 2 +- + arch/arm64/lib/clear_page.S | 53 - + arch/arm64/lib/csum.c | 17 - + arch/arm64/lib/memchr.S | 2 +- + arch/arm64/lib/memcmp.S | 2 - + arch/arm64/lib/strcmp.S | 34 +- + arch/arm64/lib/strlen.S | 26 - + arch/arm64/lib/strncmp.S | 93 +- + arch/arm64/lib/strnlen.S | 16 +- + arch/arm64/mm/extable.c | 5 - + arch/arm64/mm/fault.c | 40 +- + arch/arm64/mm/init.c | 3 +- + arch/arm64/mm/pageattr.c | 4 +- + arch/arm64/net/bpf_jit_comp.c | 11 - + arch/arm64/tools/cpucaps | 1 + + drivers/acpi/arm64/mpam.c | 6 +- + drivers/char/hw_random/arm_smccc_trng.c | 32 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 2 +- + drivers/firmware/Kconfig | 1 + + drivers/firmware/Makefile | 1 + + drivers/firmware/arm_rmm/Kconfig | 39 + + drivers/firmware/arm_rmm/Makefile | 3 + + drivers/firmware/arm_rmm/rmi.c | 1135 ++++++++++++++++++++ + .../kernel => drivers/firmware/arm_rmm}/rsi.c | 79 +- + drivers/firmware/smccc/Makefile | 2 +- + drivers/firmware/smccc/bus.c | 158 +++ + drivers/firmware/smccc/smccc.c | 65 +- + drivers/hv/Kconfig | 3 +- + drivers/misc/vmw_vmci/Kconfig | 2 +- + drivers/net/ethernet/google/Kconfig | 2 +- + drivers/net/ethernet/microsoft/Kconfig | 2 +- + drivers/resctrl/Kconfig | 2 + + drivers/resctrl/Makefile | 2 +- + drivers/resctrl/mpam_devices.c | 1052 +++++++++++++----- + drivers/resctrl/mpam_fb.c | 258 +++++ + drivers/resctrl/mpam_internal.h | 71 +- + drivers/resctrl/mpam_resctrl.c | 13 +- + drivers/soc/tegra/Kconfig | 5 - + drivers/virt/coco/arm-cca-guest/Kconfig | 3 +- + drivers/virt/coco/arm-cca-guest/Makefile | 2 + + .../coco/arm-cca-guest/{arm-cca-guest.c => main.c} | 52 +- + include/linux/arm-rmi-cmds.h | 581 ++++++++++ + .../asm/rsi_cmds.h => include/linux/arm-rsi-cmds.h | 76 +- + include/linux/arm-smccc-bus.h | 48 + + include/linux/arm-smccc-rmi.h | 516 +++++++++ + .../asm/rsi_smc.h => include/linux/arm-smccc-rsi.h | 8 +- + include/linux/arm_mpam.h | 2 +- + include/linux/device-id/arm_smccc.h | 19 + + include/linux/mod_devicetable.h | 1 + + include/linux/suspend.h | 1 + + kernel/power/hibernate.c | 8 +- + scripts/mod/devicetable-offsets.c | 3 + + scripts/mod/file2alias.c | 8 + + tools/testing/selftests/arm64/fp/fp-ptrace.c | 19 +- + tools/testing/selftests/arm64/gcs/gcs-locking.c | 15 + + .../selftests/arm64/mte/check_buffer_fill.c | 10 +- + .../selftests/arm64/mte/check_child_memory.c | 6 +- + .../selftests/arm64/mte/check_hugetlb_options.c | 4 +- + .../selftests/arm64/mte/check_mmap_options.c | 10 +- + .../selftests/arm64/mte/check_tags_inclusion.c | 4 +- + .../testing/selftests/arm64/mte/mte_common_util.h | 4 + + tools/testing/selftests/arm64/mte/mte_helper.S | 44 + + .../testcases/fake_sigreturn_sve_change_vl.c | 2 +- + tools/testing/selftests/rseq/rseq-arm64.h | 5 - + 132 files changed, 4817 insertions(+), 1239 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-firmware-cca + delete mode 100644 arch/arm64/include/asm/rsi.h + create mode 100644 arch/arm64/include/asm/xwreg.h + delete mode 100644 arch/arm64/lib/clear_page.S + create mode 100644 drivers/firmware/arm_rmm/Kconfig + create mode 100644 drivers/firmware/arm_rmm/Makefile + create mode 100644 drivers/firmware/arm_rmm/rmi.c + rename {arch/arm64/kernel => drivers/firmware/arm_rmm}/rsi.c (71%) + create mode 100644 drivers/firmware/smccc/bus.c + create mode 100644 drivers/resctrl/mpam_fb.c + rename drivers/virt/coco/arm-cca-guest/{arm-cca-guest.c => main.c} (82%) + create mode 100644 include/linux/arm-rmi-cmds.h + rename arch/arm64/include/asm/rsi_cmds.h => include/linux/arm-rsi-cmds.h (69%) + create mode 100644 include/linux/arm-smccc-bus.h + create mode 100644 include/linux/arm-smccc-rmi.h + rename arch/arm64/include/asm/rsi_smc.h => include/linux/arm-smccc-rsi.h (97%) + create mode 100644 include/linux/device-id/arm_smccc.h +$ git am -3 ../patches/0001-arm64-fixup-merge-with-dropped-copy-of-code-getting-.patch +Applying: arm64: fixup merge with dropped copy of code getting kept +$ git reset HEAD^ +Unstaged changes after reset: +M arch/arm64/mm/pageattr.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master bbc9e9bf604b6] Merge branch 'for-next/core' of https://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux + Date: Wed Oct 14 13:32:24 2026 +0100 +Merging arm-perf/for-next/perf (652ab8ee0d27f drivers/perf: apple_m1: Add macOS 27 M2 Event) +$ git merge -m Merge branch 'for-next/perf' of https://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Auto-merging kernel/events/core.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/perf/hisi-pmu.rst | 16 + + drivers/cxl/pci.c | 11 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 2 + + drivers/perf/apple_m1_cpu_pmu.c | 4 +- + drivers/perf/arm_spe_pmu.c | 2 + + drivers/perf/cxl_pmu.c | 107 +++++-- + drivers/perf/dwc_pcie_pmu.c | 11 +- + drivers/perf/hisilicon/Makefile | 2 +- + drivers/perf/hisilicon/hisi_uncore_cpa_pmu.c | 34 +- + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 34 +- + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 34 +- + drivers/perf/hisilicon/hisi_uncore_its_pmu.c | 385 +++++++++++++++++++++++ + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 21 +- + drivers/perf/hisilicon/hisi_uncore_mn_pmu.c | 98 +++--- + drivers/perf/hisilicon/hisi_uncore_noc_pmu.c | 35 +-- + drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 34 +- + drivers/perf/hisilicon/hisi_uncore_pmu.c | 25 ++ + drivers/perf/hisilicon/hisi_uncore_pmu.h | 2 + + drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c | 34 +- + drivers/perf/hisilicon/hisi_uncore_uc_pmu.c | 36 +-- + drivers/perf/marvell_cn10k_ddr_pmu.c | 85 ++--- + drivers/perf/marvell_cn10k_tad_pmu.c | 1 + + drivers/perf/xgene_pmu.c | 4 +- + include/linux/cpuhotplug.h | 6 - + kernel/events/core.c | 1 + + 25 files changed, 675 insertions(+), 349 deletions(-) + create mode 100644 drivers/perf/hisilicon/hisi_uncore_its_pmu.c +Merging arm-soc/for-next (54cab85827379 soc: document merges) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/configs/shmobile_defconfig +Auto-merging arch/arm64/Kconfig +Auto-merging drivers/firmware/qcom/Kconfig +Auto-merging drivers/firmware/qcom/qcom_tzmem.c +Auto-merging include/linux/mod_devicetable.h +CONFLICT (content): Merge conflict in include/linux/mod_devicetable.h +Auto-merging scripts/mod/devicetable-offsets.c +Auto-merging scripts/mod/file2alias.c +Resolved 'include/linux/mod_devicetable.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 82afd5b18ccee] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/cpus.yaml | 1 + + .../devicetree/bindings/arm/mediatek.yaml | 1 + + .../bindings/arm/qcom,coresight-ctcu.yaml | 1 + + .../devicetree/bindings/arm/qcom-soc.yaml | 4 +- + Documentation/devicetree/bindings/arm/qcom.yaml | 15 + + .../devicetree/bindings/arm/rockchip.yaml | 7 + + .../devicetree/bindings/cache/qcom,llcc.yaml | 55 +- + .../bindings/clock/qcom,milos-camcc.yaml | 39 +- + .../bindings/clock/qcom,milos-videocc.yaml | 29 +- + .../bindings/clock/qcom,sm8450-gpucc.yaml | 3 + + .../devicetree/bindings/firmware/qcom,scm.yaml | 4 + + .../bindings/hwinfo/samsung,exynos-chipid.yaml | 1 + + .../devicetree/bindings/input/omap-keypad.txt | 28 - + .../bindings/input/samsung,s3c6410-keypad.yaml | 53 +- + .../devicetree/bindings/input/ti,omap4-keypad.yaml | 63 + + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 1 + + .../bindings/mailbox/qcom,cpucp-mbox.yaml | 1 + + .../memory-controllers/mediatek,smi-common.yaml | 21 +- + .../memory-controllers/mediatek,smi-larb.yaml | 3 + + Documentation/devicetree/bindings/mfd/syscon.yaml | 1 + + .../devicetree/bindings/mmc/qcom,sdhci-msm.yaml | 1 + + .../bindings/net/bluetooth/qcom,wcn6750-bt.yaml | 10 +- + .../bindings/net/wireless/qcom,ath11k.yaml | 16 +- + .../soc/amlogic/amlogic,meson-gx-clk-measure.yaml | 16 +- + .../devicetree/bindings/soc/qcom/qcom,apr.yaml | 4 +- + .../devicetree/bindings/soc/qcom/qcom-stats.yaml | 25 +- + .../bindings/spmi/qcom,glymur-spmi-pmic-arb.yaml | 1 + + .../devicetree/bindings/sram/qcom,imem.yaml | 1 - + Documentation/devicetree/bindings/sram/sram.yaml | 3 + + MAINTAINERS | 5 +- + arch/arm/arm-soc-for-next-contents.txt | 117 + + arch/arm/boot/dts/gemini/gemini.dtsi | 4 +- + arch/arm/boot/dts/mediatek/Makefile | 1 + + arch/arm/boot/dts/mediatek/mt8127-amazon-ford.dts | 54 + + arch/arm/boot/dts/mediatek/mt8127.dtsi | 7 + + arch/arm/boot/dts/renesas/r7s72100-gr-peach.dts | 2 + + .../boot/dts/renesas/r8a7740-armadillo800eva.dts | 2 + + arch/arm/boot/dts/renesas/r8a7743-sk-rzg1m.dts | 2 + + arch/arm/boot/dts/renesas/r8a7743.dtsi | 6 +- + arch/arm/boot/dts/renesas/r8a7744.dtsi | 6 +- + arch/arm/boot/dts/renesas/r8a7745-sk-rzg1e.dts | 2 + + arch/arm/boot/dts/renesas/r8a7745.dtsi | 6 +- + arch/arm/boot/dts/renesas/r8a77470.dtsi | 6 +- + arch/arm/boot/dts/renesas/r8a7790-lager.dts | 28 +- + arch/arm/boot/dts/renesas/r8a7790-stout.dts | 4 +- + arch/arm/boot/dts/renesas/r8a7790.dtsi | 4 +- + arch/arm/boot/dts/renesas/r8a7791-koelsch.dts | 2 + + arch/arm/boot/dts/renesas/r8a7791-porter.dts | 2 + + arch/arm/boot/dts/renesas/r8a7791.dtsi | 4 +- + arch/arm/boot/dts/renesas/r8a7792.dtsi | 4 +- + arch/arm/boot/dts/renesas/r8a7793-gose.dts | 2 + + arch/arm/boot/dts/renesas/r8a7793.dtsi | 4 +- + arch/arm/boot/dts/renesas/r8a7794-alt.dts | 2 + + arch/arm/boot/dts/renesas/r8a7794-silk.dts | 2 + + arch/arm/boot/dts/renesas/r8a7794.dtsi | 4 +- + .../arm/boot/dts/renesas/r9a06g032-rzn1d400-db.dts | 1 - + .../arm/boot/dts/renesas/r9a06g032-rzn1d400-eb.dts | 14 +- + arch/arm/boot/dts/renesas/r9a06g032.dtsi | 2 - + arch/arm/boot/dts/st/ste-ab8500.dtsi | 35 +- + arch/arm/boot/dts/st/ste-ab8505.dtsi | 35 +- + arch/arm/boot/dts/st/ste-dbx5x0.dtsi | 9 +- + arch/arm/boot/dts/st/ste-href-ab8500.dtsi | 104 + + arch/arm/boot/dts/st/ste-href-ab8505.dtsi | 118 +- + arch/arm/boot/dts/st/ste-href-stuib.dtsi | 8 +- + arch/arm/boot/dts/st/ste-href-tvk1281618-r2.dtsi | 14 +- + arch/arm/boot/dts/st/ste-href-tvk1281618-r3.dtsi | 10 +- + arch/arm/boot/dts/st/ste-href.dtsi | 2 +- + arch/arm/boot/dts/st/ste-snowball.dts | 10 +- + .../boot/dts/st/ste-ux500-samsung-codina-tmo.dts | 1 + + arch/arm/boot/dts/st/ste-ux500-samsung-codina.dts | 25 +- + arch/arm/boot/dts/st/ste-ux500-samsung-gavini.dts | 61 +- + arch/arm/boot/dts/st/ste-ux500-samsung-golden.dts | 11 +- + arch/arm/boot/dts/st/ste-ux500-samsung-janice.dts | 59 +- + arch/arm/boot/dts/st/ste-ux500-samsung-kyle.dts | 5 +- + arch/arm/boot/dts/st/ste-ux500-samsung-skomer.dts | 5 +- + arch/arm/boot/dts/st/ste-ux500-samsung.dtsi | 77 + + .../boot/dts/ti/omap/am335x-boneblack-hdmi.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/am335x-bonegreen-eco.dts | 2 +- + arch/arm/boot/dts/ti/omap/am335x-shc.dts | 4 - + arch/arm/boot/dts/ti/omap/am437x-l4.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/am57-pruss.dtsi | 11 + + arch/arm/boot/dts/ti/omap/am571x-idk.dts | 65 +- + arch/arm/boot/dts/ti/omap/am5729-beagleboneai.dts | 2 +- + .../boot/dts/ti/omap/am57xx-beagle-x15-common.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/am57xx-idk-common.dtsi | 3 +- + arch/arm/boot/dts/ti/omap/dra7-l4.dtsi | 2 +- + .../boot/dts/ti/omap/motorola-mapphone-common.dtsi | 8 +- + .../dts/ti/omap/motorola-mapphone-mz607-mz617.dtsi | 2 + + arch/arm/boot/dts/ti/omap/omap3-igep.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/omap3-n9.dts | 5 +- + arch/arm/boot/dts/ti/omap/omap3-n900.dts | 3 +- + arch/arm/boot/dts/ti/omap/omap3-n950.dts | 5 +- + arch/arm/boot/dts/ti/omap/omap3-tao3530.dtsi | 8 +- + .../boot/dts/ti/omap/omap4-droid-bionic-xt875.dts | 2 + + arch/arm/boot/dts/ti/omap/omap4-droid4-xt894.dts | 2 + + arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts | 2 + + arch/arm/boot/dts/ti/omap/omap4-l4.dtsi | 1 + + .../dts/ti/omap/omap4-samsung-espresso-common.dtsi | 6 +- + arch/arm/boot/dts/ti/omap/omap4-sdp.dts | 2 + + arch/arm/boot/dts/ti/omap/omap4.dtsi | 6 +- + arch/arm/boot/dts/ti/omap/omap5-l4.dtsi | 1 + + arch/arm/boot/dts/ti/omap/omap5.dtsi | 2 +- + arch/arm/configs/multi_v7_defconfig | 10 +- + arch/arm/configs/omap2plus_defconfig | 3 + + arch/arm/configs/qcom_defconfig | 14 - + arch/arm/configs/shmobile_defconfig | 3 +- + arch/arm/include/asm/linkage.h | 29 + + arch/arm/mach-at91/pm.h | 2 +- + arch/arm/mach-exynos/smc.h | 4 +- + arch/arm/mach-imx/hardware.h | 2 +- + arch/arm/mach-imx/mach-imx6q.c | 30 - + arch/arm/mach-imx/mxc.h | 2 +- + arch/arm/mach-imx/pm-imx6.c | 26 +- + arch/arm/mach-imx/suspend-imx6.S | 6 +- + arch/arm/mach-mvebu/Kconfig | 4 +- + arch/arm/mach-omap2/control.h | 8 +- + arch/arm/mach-omap2/ctrl_module_wkup_44xx.h | 89 - + arch/arm/mach-omap2/soc.h | 4 +- + arch/arm/mach-omap2/sram.h | 4 +- + arch/arm/mach-s3c/Kconfig | 5 - + arch/arm/mach-s3c/Kconfig.s3c64xx | 7 - + arch/arm/mach-s3c/Makefile.s3c64xx | 1 - + arch/arm/mach-s3c/devs.c | 27 - + arch/arm/mach-s3c/devs.h | 1 - + arch/arm/mach-s3c/gpio-core.h | 3 + + arch/arm/mach-s3c/gpio-samsung-s3c64xx.h | 5 + + arch/arm/mach-s3c/gpio-samsung.c | 72 +- + arch/arm/mach-s3c/keypad.h | 27 - + arch/arm/mach-s3c/mach-crag6410.c | 135 +- + arch/arm/mach-s3c/setup-keypad-s3c64xx.c | 20 - + arch/arm/mach-tegra/sleep.S | 2 +- + arch/arm/mach-versatile/platsmp-vexpress.c | 4 +- + arch/arm/mach-versatile/v2m.c | 4 +- + arch/arm64/Kconfig | 1 + + arch/arm64/Kconfig.platforms | 1 - + arch/arm64/boot/dts/arm/fvp-base-revc.dts | 42 +- + arch/arm64/boot/dts/mediatek/mt6878-pinfunc.h | 2 +- + arch/arm64/boot/dts/mediatek/mt6893-pinfunc.h | 2 +- + .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts | 13 + + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 1 + + .../mediatek/mt7988a-bananapi-bpi-r4-pro-cn13.dtso | 1 + + .../mediatek/mt7988a-bananapi-bpi-r4-pro-cn14.dtso | 1 + + .../mediatek/mt7988a-bananapi-bpi-r4-pro-cn15.dtso | 1 + + .../mediatek/mt7988a-bananapi-bpi-r4-pro-cn18.dtso | 1 + + .../dts/mediatek/mt7988a-bananapi-bpi-r4-pro.dtsi | 18 + + .../boot/dts/mediatek/mt7988a-bananapi-bpi-r4.dtsi | 13 + + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 5 + + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 35 +- + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 5 + + arch/arm64/boot/dts/mediatek/mt8186-corsola.dtsi | 5 + + arch/arm64/boot/dts/mediatek/mt8188-geralt.dtsi | 7 +- + arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 5 + + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 5 + + arch/arm64/boot/dts/qcom/Makefile | 27 + + arch/arm64/boot/dts/qcom/agatti.dtsi | 76 +- + arch/arm64/boot/dts/qcom/eliza-cqs-som.dtsi | 15 + + arch/arm64/boot/dts/qcom/eliza-evk.dtsi | 243 ++ + arch/arm64/boot/dts/qcom/eliza-mtp.dts | 34 + + arch/arm64/boot/dts/qcom/eliza.dtsi | 774 +++- + .../dts/qcom/glymur-asus-zenbook-a14-ux3407na.dts | 1140 +++++ + .../dts/qcom/glymur-asus-zenbook-a16-ux3607oa.dts | 2 +- + arch/arm64/boot/dts/qcom/glymur-crd.dts | 8 + + arch/arm64/boot/dts/qcom/glymur-crd.dtsi | 13 +- + .../boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts | 940 ++++ + .../boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts | 1221 ++++++ + arch/arm64/boot/dts/qcom/glymur.dtsi | 396 +- + arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts | 134 +- + arch/arm64/boot/dts/qcom/hamoa-iot-som.dtsi | 21 + + .../qcom/hamoa-lenovo-ideacentre-mini-01q8x10.dts | 21 + + arch/arm64/boot/dts/qcom/hamoa-pmics.dtsi | 1 + + arch/arm64/boot/dts/qcom/hamoa.dtsi | 40 +- + arch/arm64/boot/dts/qcom/ipq5018-rdp432-c2.dts | 10 + + arch/arm64/boot/dts/qcom/ipq5018.dtsi | 21 +- + arch/arm64/boot/dts/qcom/kodiak.dtsi | 1413 +++--- + .../boot/dts/qcom/lemans-evk-ifp-mezzanine.dtso | 12 +- + arch/arm64/boot/dts/qcom/lemans-pmics.dtsi | 116 + + arch/arm64/boot/dts/qcom/mahua-crd.dts | 5 + + arch/arm64/boot/dts/qcom/mahua.dtsi | 89 + + arch/arm64/boot/dts/qcom/milos-fairphone-fp6.dts | 191 + + arch/arm64/boot/dts/qcom/milos.dtsi | 86 +- + arch/arm64/boot/dts/qcom/monaco-ac-evk.dts | 938 ++++ + .../boot/dts/qcom/monaco-evk-ifp-mezzanine.dtso | 12 +- + arch/arm64/boot/dts/qcom/monaco-pmics.dtsi | 62 + + arch/arm64/boot/dts/qcom/monaco.dtsi | 1 - + arch/arm64/boot/dts/qcom/msm8917-xiaomi-riva.dts | 35 + + arch/arm64/boot/dts/qcom/nord-embedded.dtsi | 1820 ++++++++ + arch/arm64/boot/dts/qcom/nord-gearvm.dtsi | 2848 ++++++++++++ + arch/arm64/boot/dts/qcom/nord-ride.dts | 254 ++ + arch/arm64/boot/dts/qcom/nord-rrd.dts | 424 ++ + arch/arm64/boot/dts/qcom/nord.dtsi | 4605 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/purwa-iot-evk.dts | 133 +- + arch/arm64/boot/dts/qcom/purwa-iot-som.dtsi | 21 + + .../qcom/qcs6490-rb3gen2-industrial-mezzanine.dtso | 24 +- + .../dts/qcom/qcs6490-rb3gen2-vision-mezzanine.dtso | 13 +- + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 12 +- + .../dts/qcom/qcs6490-thundercomm-minipc-g1iot.dts | 12 +- + .../qcs6490-thundercomm-rubikpi3-cam1-imx219.dtso | 115 + + .../qcs6490-thundercomm-rubikpi3-cam2-imx219.dtso | 115 + + .../boot/dts/qcom/qcs6490-thundercomm-rubikpi3.dts | 23 + + arch/arm64/boot/dts/qcom/qcs8550-rb5gen2.dts | 12 +- + arch/arm64/boot/dts/qcom/sar2130p.dtsi | 1 - + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 3 + + .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 3 + + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 37 + + .../boot/dts/qcom/sc8280xp-microsoft-arcata.dts | 3 + + .../boot/dts/qcom/sc8280xp-microsoft-blackrock.dts | 3 + + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 574 ++- + arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi | 42 + + arch/arm64/boot/dts/qcom/sdm845-google-common.dtsi | 36 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 1 - + .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 2 + + arch/arm64/boot/dts/qcom/sdx75.dtsi | 2 - + arch/arm64/boot/dts/qcom/shikra-cqm-som.dtsi | 1 - + arch/arm64/boot/dts/qcom/shikra-evk.dtsi | 18 + + arch/arm64/boot/dts/qcom/shikra-iqs-som.dtsi | 1 - + arch/arm64/boot/dts/qcom/shikra.dtsi | 1490 ++++++- + arch/arm64/boot/dts/qcom/sm4450.dtsi | 1 - + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 4 + + .../boot/dts/qcom/sm7325-nothing-spacewar.dts | 2 + + arch/arm64/boot/dts/qcom/sm8250.dtsi | 1 - + .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 17 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 1 - + arch/arm64/boot/dts/qcom/sm8450.dtsi | 1 - + arch/arm64/boot/dts/qcom/sm8550.dtsi | 2 - + .../boot/dts/qcom/sm8650-ayaneo-pocket-s2.dts | 232 +- + arch/arm64/boot/dts/qcom/sm8650.dtsi | 2 - + arch/arm64/boot/dts/qcom/sm8750.dtsi | 70 +- + .../boot/dts/qcom/talos-evk-rpi-display-2-5in.dtso | 88 + + arch/arm64/boot/dts/qcom/talos-evk-som.dtsi | 4 + + arch/arm64/boot/dts/qcom/talos.dtsi | 1 - + arch/arm64/boot/dts/qcom/x1-asus-vivobook-s15.dtsi | 21 + + arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi | 21 + + arch/arm64/boot/dts/qcom/x1-crd.dtsi | 21 + + arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 21 + + arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi | 21 + + arch/arm64/boot/dts/qcom/x1-microsoft-denali.dtsi | 89 +- + arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 21 + + .../dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 21 + + arch/arm64/boot/dts/qcom/x1e80100-crd.dts | 119 + + .../boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 21 + + .../dts/qcom/x1e80100-honor-magicbook-art-14.dts | 21 + + .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 21 + + .../dts/qcom/x1e80100-medion-sprchrgd-14-s1.dts | 25 +- + .../boot/dts/qcom/x1e80100-microsoft-romulus.dtsi | 21 + + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 21 + + .../boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts | 21 + + .../boot/dts/qcom/x1p42100-microsoft-sp12in.dts | 21 + + arch/arm64/boot/dts/renesas/Makefile | 9 + + .../dts/renesas/aistarvision-mipi-adapter-2.1.dtsi | 2 +- + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 6 +- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 12 +- + arch/arm64/boot/dts/renesas/cat875.dtsi | 2 + + arch/arm64/boot/dts/renesas/condor-common.dtsi | 2 +- + arch/arm64/boot/dts/renesas/draak.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ebisu.dtsi | 6 +- + arch/arm64/boot/dts/renesas/gray-hawk-single.dtsi | 8 +- + arch/arm64/boot/dts/renesas/hihope-common.dtsi | 4 +- + arch/arm64/boot/dts/renesas/hihope-rev2.dtsi | 8 +- + arch/arm64/boot/dts/renesas/hihope-rev4.dtsi | 4 +- + arch/arm64/boot/dts/renesas/hihope-rzg2-ex.dtsi | 6 +- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 14 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 12 +- + arch/arm64/boot/dts/renesas/r8a774c0-cat874.dts | 4 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 12 +- + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 14 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 14 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 14 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 14 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 12 +- + .../renesas/r8a77970-eagle-function-expansion.dtso | 2 +- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77970-v3msk.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77970.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77980-v3hsk.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77980.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 10 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 6 +- + .../boot/dts/renesas/r8a779a0-falcon-cpu.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a779a0-falcon.dts | 4 +- + arch/arm64/boot/dts/renesas/r8a779a0.dtsi | 2 +- + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 36 +- + arch/arm64/boot/dts/renesas/r8a779f4-s4sk.dts | 2 +- + .../arm64/boot/dts/renesas/r8a779g0-white-hawk.dts | 94 + + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 69 +- + .../renesas/r8a779g3-sparrow-hawk-fan-argon40.dtso | 1 - + .../r8a779g3-sparrow-hawk-ws-2ch-canfd.dtso | 135 + + .../boot/dts/renesas/r8a779g3-sparrow-hawk.dts | 19 +- + arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 26 +- + arch/arm64/boot/dts/renesas/r8a779md-geist.dts | 12 +- + arch/arm64/boot/dts/renesas/r8a78000.dtsi | 300 +- + .../arm64/boot/dts/renesas/r9a07g044l2-remi-pi.dts | 2 +- + arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 5 +- + arch/arm64/boot/dts/renesas/r9a08g046.dtsi | 265 ++ + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 27 +- + arch/arm64/boot/dts/renesas/r9a09g056.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r9a09g057.dtsi | 2 +- + .../boot/dts/renesas/r9a09g057h44-rzv2h-evk.dts | 6 +- + arch/arm64/boot/dts/renesas/r9a09g077.dtsi | 65 +- + .../dts/renesas/r9a09g077m44-evk-cn15-lcdc.dtso | 53 + + .../boot/dts/renesas/r9a09g077m44-rzt2h-evk.dts | 18 +- + arch/arm64/boot/dts/renesas/r9a09g087.dtsi | 65 +- + .../dts/renesas/r9a09g087m44-evk-cn20-lcdc.dtso | 63 + + .../boot/dts/renesas/r9a09g087m44-rzn2h-evk.dts | 32 +- + arch/arm64/boot/dts/renesas/renesas-smarc2.dtsi | 13 +- + .../boot/dts/renesas/rzg2l-smarc-pinfunction.dtsi | 16 +- + arch/arm64/boot/dts/renesas/rzg2l-smarc-som.dtsi | 20 +- + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 2 +- + .../boot/dts/renesas/rzg2lc-smarc-pinfunction.dtsi | 16 +- + arch/arm64/boot/dts/renesas/rzg2lc-smarc-som.dtsi | 20 +- + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 2 +- + .../boot/dts/renesas/rzg2ul-smarc-pinfunction.dtsi | 16 +- + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 20 +- + arch/arm64/boot/dts/renesas/rzg3l-smarc-som.dtsi | 14 + + arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 25 +- + arch/arm64/boot/dts/renesas/rzg3s-smarc-switches.h | 4 + + arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 1 - + .../boot/dts/renesas/rzt2h-n2h-evk-common.dtsi | 7 + + .../boot/dts/renesas/rzt2h-n2h-evk-du-adv7513.dtsi | 72 + + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 14 +- + arch/arm64/boot/dts/renesas/salvator-xs.dtsi | 2 +- + .../ulcb-kf-audio-graph-card2-mix+split.dtsi | 18 +- + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 8 +- + .../boot/dts/renesas/white-hawk-cpu-common.dtsi | 6 +- + arch/arm64/boot/dts/rockchip/Makefile | 6 + + .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 2 + + .../boot/dts/rockchip/rk3576-armsom-cm5-io.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3576.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 39 + + .../rockchip/rk3588-jaguar-can1-can2-uart4.dtso | 26 + + arch/arm64/boot/dts/rockchip/rk3588-jaguar.dts | 16 + + .../boot/dts/rockchip/rk3588-lubancat-5-btb.dtsi | 534 +++ + .../boot/dts/rockchip/rk3588-lubancat-5io.dts | 1032 +++++ + .../boot/dts/rockchip/rk3588-nanopc-t6-lts.dts | 17 - + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 175 +- + .../boot/dts/rockchip/rk3588-tiger-haikou.dts | 4 + + arch/arm64/boot/dts/rockchip/rk3588-tiger.dtsi | 5 + + .../boot/dts/rockchip/rk3588s-gameforce-ace.dts | 7 +- + arch/arm64/configs/defconfig | 151 +- + drivers/bus/arm-cci.c | 6 +- + drivers/bus/fsl-mc/fsl-mc-bus.c | 64 +- + drivers/bus/fsl-mc/fsl-mc-msi.c | 2 +- + drivers/firmware/arm_scmi/bus.c | 109 +- + drivers/firmware/arm_scmi/common.h | 61 +- + drivers/firmware/arm_scmi/driver.c | 262 +- + drivers/firmware/arm_scmi/protocols.h | 9 +- + drivers/firmware/arm_scmi/raw_mode.c | 30 +- + drivers/firmware/arm_scmi/reset.c | 36 +- + drivers/firmware/arm_scmi/transports/Kconfig | 12 + + drivers/firmware/arm_scmi/transports/Makefile | 2 + + drivers/firmware/arm_scmi/transports/mailbox.c | 7 +- + drivers/firmware/arm_scmi/transports/optee.c | 7 +- + drivers/firmware/arm_scmi/transports/pcc.c | 875 ++++ + drivers/firmware/arm_scmi/transports/smc.c | 10 +- + drivers/firmware/arm_scmi/transports/virtio.c | 3 +- + drivers/firmware/imx/imx-dsp.c | 6 +- + drivers/firmware/qcom/Kconfig | 5 +- + drivers/firmware/qcom/qcom_scm-legacy.c | 2 +- + drivers/firmware/qcom/qcom_scm.c | 187 +- + drivers/firmware/qcom/qcom_tzmem.c | 3 +- + drivers/firmware/ti_sci.c | 6 +- + drivers/input/keyboard/samsung-keypad.c | 200 +- + drivers/memory/brcmstb_dpfe.c | 41 +- + drivers/memory/emif.c | 6 +- + drivers/memory/emif.h | 4 +- + drivers/memory/mtk-smi.c | 45 + + drivers/memory/renesas-rpc-if.c | 87 +- + drivers/memory/samsung/exynos5422-dmc.c | 11 +- + drivers/memory/stm32_omm.c | 2 + + drivers/memory/tegra/tegra264.c | 392 +- + drivers/platform/cznic/turris-omnia-mcu-base.c | 1 + + drivers/soc/amlogic/meson-clk-measure.c | 927 +++- + drivers/soc/apple/rtkit-crashlog.c | 141 +- + drivers/soc/atmel/soc.c | 4 +- + drivers/soc/fsl/dpio/dpio-driver.c | 9 +- + drivers/soc/fsl/qe/gpio.c | 67 +- + drivers/soc/fsl/qe/tsa.c | 16 +- + drivers/soc/mediatek/mt8167-mmsys.h | 183 +- + drivers/soc/mediatek/mtk-regulator-coupler.c | 1 + + drivers/soc/qcom/Kconfig | 1 - + drivers/soc/qcom/apr.c | 75 +- + drivers/soc/qcom/llcc-qcom.c | 199 +- + drivers/soc/qcom/pmic_glink.c | 3 +- + drivers/soc/qcom/pmic_glink_altmode.c | 4 +- + drivers/soc/qcom/pmic_pdcharger_ulog.c | 2 +- + drivers/soc/qcom/qcom-geni-se.c | 69 +- + drivers/soc/qcom/qcom_aoss.c | 4 +- + drivers/soc/qcom/qcom_stats.c | 9 + + drivers/soc/qcom/rpmh-internal.h | 16 +- + drivers/soc/qcom/rpmh-rsc.c | 4 +- + drivers/soc/qcom/rpmh.c | 40 +- + drivers/soc/qcom/smem_dramc.c | 81 +- + drivers/soc/qcom/smp2p.c | 22 +- + drivers/soc/qcom/smsm.c | 36 +- + drivers/soc/qcom/socinfo.c | 3 + + drivers/soc/qcom/ubwc_config.c | 12 + + drivers/soc/renesas/Kconfig | 22 +- + drivers/soc/renesas/r9a08g046-sysc.c | 1 + + drivers/soc/renesas/rcar-mfis.c | 62 +- + drivers/soc/renesas/rcar-rst.c | 1 + + drivers/soc/renesas/renesas-soc.c | 3 + + drivers/soc/renesas/rz-sysc.c | 5 + + drivers/soc/renesas/rz-sysc.h | 2 + + drivers/soc/samsung/exynos-chipid.c | 1 + + drivers/soc/samsung/exynos-pmu.c | 84 +- + drivers/soc/tegra/cbb/tegra194-cbb.c | 2 +- + drivers/soc/tegra/flowctrl.c | 7 +- + drivers/soc/tegra/fuse/fuse-tegra.c | 12 +- + drivers/soc/tegra/fuse/fuse-tegra30.c | 168 +- + drivers/soc/tegra/fuse/fuse.h | 7 +- + drivers/soc/tegra/fuse/speedo-tegra210.c | 22 +- + drivers/soc/tegra/fuse/tegra-apbmisc.c | 51 +- + drivers/soc/tegra/pmc.c | 165 +- + drivers/soc/ti/knav_qmss_queue.c | 4 +- + drivers/usb/host/fhci-hcd.c | 2 +- + include/dt-bindings/arm/qcom,ids.h | 3 + + .../dt-bindings/clock/qcom,eliza-cambistmclkcc.h | 32 + + include/dt-bindings/clock/qcom,eliza-camcc.h | 151 + + include/dt-bindings/clock/qcom,eliza-gpucc.h | 51 + + include/dt-bindings/clock/qcom,eliza-videocc.h | 37 + + include/linux/device-id/apr.h | 21 - + include/linux/device-id/scmi.h | 17 + + include/linux/firmware/qcom/qcom_scm.h | 29 - + include/linux/fsl/mc.h | 2 +- + include/linux/input/samsung-keypad.h | 39 - + include/linux/micrel_phy.h | 5 - + include/linux/mod_devicetable.h | 1 - + include/linux/scmi_protocol.h | 20 +- + include/linux/soc/qcom/apr.h | 4 +- + include/linux/soc/qcom/geni-se.h | 2 +- + include/linux/soc/qcom/llcc-qcom.h | 6 + + include/linux/soc/qcom/ubwc.h | 3 + + include/linux/soc/ti/k3-ringacc.h | 31 +- + include/soc/fsl/qe/qe.h | 6 +- + include/soc/imx/cpu.h | 2 +- + include/soc/tegra/fuse.h | 1 + + include/trace/events/scmi.h | 8 +- + include/uapi/linux/tee.h | 40 +- + scripts/mod/devicetable-offsets.c | 5 + + scripts/mod/file2alias.c | 12 + + 443 files changed, 29950 insertions(+), 3327 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/omap-keypad.txt + create mode 100644 Documentation/devicetree/bindings/input/ti,omap4-keypad.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/mediatek/mt8127-amazon-ford.dts + create mode 100644 arch/arm/boot/dts/st/ste-ux500-samsung.dtsi + delete mode 100644 arch/arm/mach-omap2/ctrl_module_wkup_44xx.h + delete mode 100644 arch/arm/mach-s3c/keypad.h + delete mode 100644 arch/arm/mach-s3c/setup-keypad-s3c64xx.c + create mode 100644 arch/arm64/boot/dts/qcom/glymur-asus-zenbook-a14-ux3407na.dts + create mode 100644 arch/arm64/boot/dts/qcom/glymur-hp-elitebook-x-g2q.dts + create mode 100644 arch/arm64/boot/dts/qcom/glymur-lenovo-yoga-slim7x.dts + create mode 100644 arch/arm64/boot/dts/qcom/monaco-ac-evk.dts + create mode 100644 arch/arm64/boot/dts/qcom/nord-embedded.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/nord-gearvm.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/nord-ride.dts + create mode 100644 arch/arm64/boot/dts/qcom/nord-rrd.dts + create mode 100644 arch/arm64/boot/dts/qcom/nord.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcs6490-thundercomm-rubikpi3-cam1-imx219.dtso + create mode 100644 arch/arm64/boot/dts/qcom/qcs6490-thundercomm-rubikpi3-cam2-imx219.dtso + create mode 100644 arch/arm64/boot/dts/qcom/talos-evk-rpi-display-2-5in.dtso + create mode 100644 arch/arm64/boot/dts/renesas/r8a779g3-sparrow-hawk-ws-2ch-canfd.dtso + create mode 100644 arch/arm64/boot/dts/renesas/r9a09g077m44-evk-cn15-lcdc.dtso + create mode 100644 arch/arm64/boot/dts/renesas/r9a09g087m44-evk-cn20-lcdc.dtso + create mode 100644 arch/arm64/boot/dts/renesas/rzt2h-n2h-evk-du-adv7513.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-jaguar-can1-can2-uart4.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-lubancat-5-btb.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-lubancat-5io.dts + create mode 100644 drivers/firmware/arm_scmi/transports/pcc.c + create mode 100644 include/dt-bindings/clock/qcom,eliza-cambistmclkcc.h + create mode 100644 include/dt-bindings/clock/qcom,eliza-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,eliza-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,eliza-videocc.h + delete mode 100644 include/linux/device-id/apr.h + create mode 100644 include/linux/device-id/scmi.h + delete mode 100644 include/linux/input/samsung-keypad.h +Merging amlogic/for-next (8610d31587e13 Merge branch 'v7.4/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/amlogic/amlogic-a4.dtsi | 5 +++++ + arch/arm64/boot/dts/amlogic/amlogic-a5.dtsi | 5 +++++ + arch/arm64/boot/dts/amlogic/amlogic-a9.dtsi | 5 +++++ + arch/arm64/boot/dts/amlogic/amlogic-s6.dtsi | 5 +++++ + arch/arm64/boot/dts/amlogic/amlogic-s7.dtsi | 5 +++++ + arch/arm64/boot/dts/amlogic/amlogic-s7d.dtsi | 5 +++++ + .../dts/amlogic/amlogic-t7-a311d2-khadas-vim4.dts | 13 +++++++++++ + arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 25 ++++++++++++++++------ + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 9 ++++++++ + .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 2 +- + .../boot/dts/amlogic/meson-gxbb-nanopi-k2.dts | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxbb.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +- + .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 4 ++-- + 14 files changed, 77 insertions(+), 12 deletions(-) +Merging asahi-soc/asahi-soc/for-next (9378cd5ddcebc Merge branch 'apple-soc/drivers-7.4' into asahi-soc/for-next) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/apple.yaml | 32 + + .../devicetree/bindings/arm/apple/apple,pmgr.yaml | 2 + + Documentation/devicetree/bindings/arm/cpus.yaml | 4 + + .../devicetree/bindings/i2c/apple,i2c.yaml | 1 + + .../bindings/interrupt-controller/apple,aic2.yaml | 2 + + .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 1 + + .../bindings/power/apple,pmgr-pwrstate.yaml | 2 + + .../devicetree/bindings/pwm/apple,s5l-fpwm.yaml | 1 + + arch/arm64/boot/dts/apple/Makefile | 7 + + arch/arm64/boot/dts/apple/t6001.dtsi | 11 +- + arch/arm64/boot/dts/apple/t6002.dtsi | 18 +- + arch/arm64/boot/dts/apple/t600x-die0.dtsi | 3 +- + arch/arm64/boot/dts/apple/t600x-dieX.dtsi | 2 + + arch/arm64/boot/dts/apple/t600x-nvme.dtsi | 2 + + arch/arm64/boot/dts/apple/t6021.dtsi | 10 +- + arch/arm64/boot/dts/apple/t6022.dtsi | 18 +- + arch/arm64/boot/dts/apple/t602x-common.dtsi | 2 +- + arch/arm64/boot/dts/apple/t602x-die0.dtsi | 2 + + arch/arm64/boot/dts/apple/t602x-dieX.dtsi | 2 + + arch/arm64/boot/dts/apple/t602x-nvme.dtsi | 2 + + arch/arm64/boot/dts/apple/t6030-pmgr.dtsi | 1 - + arch/arm64/boot/dts/apple/t6030.dtsi | 277 ++--- + arch/arm64/boot/dts/apple/t6031-base.dtsi | 191 ++-- + arch/arm64/boot/dts/apple/t6031-die0.dtsi | 63 +- + arch/arm64/boot/dts/apple/t6031-dieX.dtsi | 94 +- + arch/arm64/boot/dts/apple/t6031-gpio-pins.dtsi | 18 +- + arch/arm64/boot/dts/apple/t6031-pmgr.dtsi | 6 + + arch/arm64/boot/dts/apple/t6031.dtsi | 16 +- + arch/arm64/boot/dts/apple/t6032-j575d.dts | 10 +- + arch/arm64/boot/dts/apple/t6032.dtsi | 193 ++-- + arch/arm64/boot/dts/apple/t603x-j514-j516.dtsi | 15 +- + arch/arm64/boot/dts/apple/t8122-j504.dts | 10 +- + arch/arm64/boot/dts/apple/t8122-j613.dts | 9 +- + arch/arm64/boot/dts/apple/t8122-j615.dts | 9 +- + arch/arm64/boot/dts/apple/t8122-jxxx.dtsi | 5 +- + arch/arm64/boot/dts/apple/t8122-pmgr.dtsi | 1 - + arch/arm64/boot/dts/apple/t8122.dtsi | 256 +++-- + arch/arm64/boot/dts/apple/t8132-j604.dts | 35 + + arch/arm64/boot/dts/apple/t8132-j623.dts | 18 + + arch/arm64/boot/dts/apple/t8132-j624.dts | 18 + + arch/arm64/boot/dts/apple/t8132-j713.dts | 35 + + arch/arm64/boot/dts/apple/t8132-j715.dts | 35 + + arch/arm64/boot/dts/apple/t8132-j773g.dts | 25 + + arch/arm64/boot/dts/apple/t8132-jxxx.dtsi | 48 + + arch/arm64/boot/dts/apple/t8132-pmgr.dtsi | 1130 ++++++++++++++++++++ + arch/arm64/boot/dts/apple/t8132.dtsi | 467 ++++++++ + arch/arm64/boot/dts/apple/t8140-j700.dts | 54 + + arch/arm64/boot/dts/apple/t8140-pmgr.dtsi | 777 ++++++++++++++ + arch/arm64/boot/dts/apple/t8140.dtsi | 207 ++++ + 49 files changed, 3595 insertions(+), 552 deletions(-) + create mode 100644 arch/arm64/boot/dts/apple/t8132-j604.dts + create mode 100644 arch/arm64/boot/dts/apple/t8132-j623.dts + create mode 100644 arch/arm64/boot/dts/apple/t8132-j624.dts + create mode 100644 arch/arm64/boot/dts/apple/t8132-j713.dts + create mode 100644 arch/arm64/boot/dts/apple/t8132-j715.dts + create mode 100644 arch/arm64/boot/dts/apple/t8132-j773g.dts + create mode 100644 arch/arm64/boot/dts/apple/t8132-jxxx.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t8132-pmgr.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t8132.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t8140-j700.dts + create mode 100644 arch/arm64/boot/dts/apple/t8140-pmgr.dtsi + create mode 100644 arch/arm64/boot/dts/apple/t8140.dtsi +Merging at91/at91-next (bd49a1c72abbd Merge branch 'microchip-dt64' into at91-next) +$ git merge -m Merge branch 'at91-next' of https://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/microchip/lan9696-ev23x71a.dts | 13 +++++++++++++ + drivers/clk/at91/clk-main.c | 2 +- + 2 files changed, 14 insertions(+), 1 deletion(-) +Merging bmc/for-next (c895734d0ec6c arm64: dts: nuvoton: npcm845-evb: Add peripheral nodes) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bmc/linux.git bmc/for-next +Merge made by the 'ort' strategy. + .../boot/dts/nuvoton/nuvoton-common-npcm8xx.dtsi | 700 ++++++++++++++++++++- + .../arm64/boot/dts/nuvoton/nuvoton-npcm845-evb.dts | 439 ++++++++++++- + arch/arm64/boot/dts/nuvoton/nuvoton-npcm845.dtsi | 7 + + 3 files changed, 1141 insertions(+), 5 deletions(-) +Merging broadcom/next (c0f2033a9ce4b Merge branch 'devicetree-arm64/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/bcm/bcm2835.yaml | 6 ++ + arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 13 +++ + .../dts/broadcom/bcm4708-linksys-ea6300-v1.dts | 4 + + .../boot/dts/broadcom/bcm4708-smartrg-sr400ac.dts | 18 ++++ + .../boot/dts/broadcom/bcm4709-linksys-ea9200.dts | 62 +++++++++++ + .../boot/dts/broadcom/bcm4709-netgear-r8000.dts | 12 +++ + .../boot/dts/broadcom/bcm47094-dlink-dir-890l.dts | 6 +- + .../dts/broadcom/bcm47094-linksys-panamera.dts | 2 +- + arch/arm/boot/dts/broadcom/bcm47189-tenda-ac9.dts | 20 ++++ + arch/arm/boot/dts/broadcom/bcm53573.dtsi | 9 +- + arch/arm/boot/dts/broadcom/bcm7445.dtsi | 2 +- + arch/arm64/boot/dts/broadcom/bcm2712-d-rpi-5-b.dts | 5 + + .../boot/dts/broadcom/bcm2712-rpi-5-b-base.dtsi | 41 +++++++ + arch/arm64/boot/dts/broadcom/bcm2712.dtsi | 77 +++++++++++++ + arch/arm64/boot/dts/broadcom/rp1-common.dtsi | 119 +++++++++++++++++++++ + 15 files changed, 392 insertions(+), 4 deletions(-) +Merging cix/for-next (a0cffbd8878c5 Merge remote-tracking branch 'cix/dt' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/peter.chen/cix.git cix/for-next +Merge made by the 'ort' strategy. +Merging davinci/davinci/for-next (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'davinci/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (a22355280361d memory: stm32_omm: fix child clock leak on set_amcr() error path) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merging fsl/soc_fsl (a7831c657c90e soc: fsl: dpio: Free the IRQ before releasing the I/O object) +$ git merge -m Merge branch 'soc_fsl' of https://git.kernel.org/pub/scm/linux/kernel/git/chleroy/linux.git fsl/soc_fsl +Already up to date. +Merging imx-mxs/for-next (31f9ec9f38735 Merge branches 'imx/dt' and 'imx/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frank.li/linux.git imx-mxs/for-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/se-cdev | 45 + + Documentation/devicetree/bindings/arm/fsl.yaml | 70 +- + .../bindings/display/bridge/fsl,ldb.yaml | 23 +- + .../devicetree/bindings/display/fsl,lcdif.yaml | 1 + + .../devicetree/bindings/firmware/fsl,imx-se.yaml | 91 + + .../devicetree/bindings/mfd/st,stmpe.yaml | 25 +- + .../bindings/soc/imx/fsl,imx-iomuxc-gpr.yaml | 62 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../driver-api/firmware/other_interfaces.rst | 238 ++ + arch/arm/boot/dts/nxp/imx/Makefile | 51 + + arch/arm/boot/dts/nxp/imx/e60k02.dtsi | 8 +- + arch/arm/boot/dts/nxp/imx/e70k02.dtsi | 8 +- + arch/arm/boot/dts/nxp/imx/imx50-amazon-yoshi.dts | 59 + + arch/arm/boot/dts/nxp/imx/imx50-kobo-aura.dts | 7 +- + arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx53-m53.dtsi | 3 - + arch/arm/boot/dts/nxp/imx/imx53-qsb.dts | 2 +- + .../arm/boot/dts/nxp/imx/imx53-voipac-dmm-668.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6dl-b125pv2.dts | 2 + + arch/arm/boot/dts/nxp/imx/imx6dl-b125v2.dts | 2 + + arch/arm/boot/dts/nxp/imx/imx6dl-mamoj.dts | 2 +- + .../dts/nxp/imx/imx6dl-phytec-mira-rdk-emmc.dts | 75 + + .../dts/nxp/imx/imx6dl-phytec-mira-rdk-nand.dts | 2 +- + .../dts/nxp/imx/imx6dl-phytec-phycore-som.dtsi | 23 + + arch/arm/boot/dts/nxp/imx/imx6dl-plym2m.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6dl-prtvt7.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6dl-victgo.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6dl.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6q-bosch-acc.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6q-novena.dts | 3 - + .../dts/nxp/imx/imx6q-phytec-mira-rdk-emmc.dts | 2 +- + .../dts/nxp/imx/imx6q-phytec-mira-rdk-nand.dts | 2 +- + .../boot/dts/nxp/imx/imx6q-phytec-phycore-som.dtsi | 75 + + arch/arm/boot/dts/nxp/imx/imx6qdl-apalis.dtsi | 3 - + arch/arm/boot/dts/nxp/imx/imx6qdl-colibri.dtsi | 3 - + arch/arm/boot/dts/nxp/imx/imx6qdl-emcon.dtsi | 1 - + arch/arm/boot/dts/nxp/imx/imx6qdl-gw560x.dtsi | 20 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-pico.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-skov-cpu.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-wandboard.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-zii-rdu2.dtsi | 10 +- + arch/arm/boot/dts/nxp/imx/imx6qdl.dtsi | 10 +- + arch/arm/boot/dts/nxp/imx/imx6sl-kobo-aura2.dts | 8 +- + .../boot/dts/nxp/imx/imx6sl-tolino-shine2hd.dts | 8 +- + arch/arm/boot/dts/nxp/imx/imx6sll-evk.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx6sll.dtsi | 11 - + arch/arm/boot/dts/nxp/imx/imx6ul-14x14-evk.dtsi | 1 - + .../boot/dts/nxp/imx/imx6ul-kontron-bl-common.dtsi | 38 +- + arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6ull-colibri.dtsi | 1 + + .../arm/boot/dts/nxp/imx/imx7-colibri-iris-v2.dtsi | 1 - + arch/arm/boot/dts/nxp/imx/imx7-colibri.dtsi | 1 + + arch/arm/boot/dts/nxp/imx/imx7-tqma7.dtsi | 52 +- + ...nel-cap-touch-7inch-parallel-touch-adapter.dtso | 58 + + ...olibri-emmc-panel-cap-touch-7inch-parallel.dtso | 43 + + ...olibri-emmc-panel-res-touch-7inch-parallel.dtso | 32 + + .../boot/dts/nxp/imx/imx7d-colibri-emmc-vga.dtso | 59 + + arch/arm/boot/dts/nxp/imx/imx7d-meerkat96.dts | 2 +- + arch/arm/boot/dts/nxp/imx/imx7d-nitrogen7.dts | 1 - + .../nxp/imx/imx7d-var-som-emmc-mx7customboard.dts | 23 + + .../imx7d-var-som-emmc-wm8731-mx7customboard.dts | 23 + + arch/arm/boot/dts/nxp/imx/imx7d-var-som-emmc.dtsi | 56 + + .../dts/nxp/imx/imx7d-var-som-mx7customboard.dtsi | 358 +++ + .../nxp/imx/imx7d-var-som-nand-mx7customboard.dts | 23 + + .../imx7d-var-som-nand-wm8731-mx7customboard.dts | 23 + + arch/arm/boot/dts/nxp/imx/imx7d-var-som-nand.dtsi | 73 + + .../imx/imx7d-var-som-v2-emmc-mx7customboard.dts | 24 + + .../imx/imx7d-var-som-v2-nand-mx7customboard.dts | 24 + + arch/arm/boot/dts/nxp/imx/imx7d-var-som-v2.dtsi | 66 + + .../arm/boot/dts/nxp/imx/imx7d-var-som-wm8731.dtsi | 102 + + .../arm/boot/dts/nxp/imx/imx7d-var-som-wm8904.dtsi | 118 + + arch/arm/boot/dts/nxp/imx/imx7d-var-som.dtsi | 533 +++++ + arch/arm/boot/dts/nxp/imx/imx7s-warp.dts | 2 +- + arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi | 36 +- + arch/arm/boot/dts/nxp/ls/ls1021a.dtsi | 10 +- + arch/arm/boot/dts/nxp/vf/Makefile | 2 + + arch/arm/boot/dts/nxp/vf/vf-colibri-iris.dtsi | 126 + + arch/arm/boot/dts/nxp/vf/vf-colibri.dtsi | 56 + + arch/arm/boot/dts/nxp/vf/vf500-colibri-iris.dts | 14 + + arch/arm/boot/dts/nxp/vf/vf500.dtsi | 6 + + arch/arm/boot/dts/nxp/vf/vf610-colibri-iris.dts | 14 + + arch/arm/boot/dts/nxp/vf/vf610.dtsi | 3 + + arch/arm/mach-imx/mach-imx6q.c | 2 - + arch/arm64/boot/dts/freescale/Makefile | 267 ++- + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 2 +- + .../arm64/boot/dts/freescale/fsl-lx2160a-nbxv3.dts | 34 + + .../boot/dts/freescale/fsl-lx2160a-nbxv3.dtsi | 330 +++ + arch/arm64/boot/dts/freescale/fsl-lx216x.dtsi | 1 + + .../arm64/boot/dts/freescale/imx8-apalis-eval.dtsi | 6 +- + .../boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi | 6 +- + .../boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi | 6 +- + .../arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi | 16 +- + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 14 +- + arch/arm64/boot/dts/freescale/imx8dxl-sr-som.dtsi | 14 +- + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 2 +- + .../imx8mm-data-modul-edm-sbc-overlay-cm4.dtso | 56 + + ...odul-edm-sbc-overlay-edm-mod-imx8mm-common.dtsi | 59 + + ...-edm-sbc-overlay-edm-mod-imx8mm-fio1-audio.dtsi | 99 + + ...-edm-sbc-overlay-edm-mod-imx8mm-fio1-audio.dtso | 79 + + ...-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1.dtsi | 69 + + ...-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1.dtso | 59 + + ...-modul-edm-sbc-overlay-edm-mod-imx8mm-hdmi.dtsi | 94 + + ...-modul-edm-sbc-overlay-edm-mod-imx8mm-hdmi.dtso | 17 + + ...edm-sbc-overlay-edm-mod-imx8mm-lvds-common.dtsi | 118 + + ...l-edm-sbc-overlay-edm-mod-imx8mm-lvds-dual.dtsi | 32 + + ...sbc-overlay-edm-mod-imx8mm-lvds-g070y2-l01.dtsi | 12 + + ...sbc-overlay-edm-mod-imx8mm-lvds-g070y2-l01.dtso | 7 + + ...bc-overlay-edm-mod-imx8mm-lvds-g101ice-l01.dtsi | 12 + + ...bc-overlay-edm-mod-imx8mm-lvds-g101ice-l01.dtso | 7 + + ...bc-overlay-edm-mod-imx8mm-lvds-g121xce-l01.dtsi | 12 + + ...bc-overlay-edm-mod-imx8mm-lvds-g121xce-l01.dtso | 7 + + ...bc-overlay-edm-mod-imx8mm-lvds-g156hce-l01.dtsi | 12 + + ...bc-overlay-edm-mod-imx8mm-lvds-g156hce-l01.dtso | 7 + + ...sbc-overlay-edm-mod-imx8mm-lvds-g215hvn011.dtsi | 12 + + ...sbc-overlay-edm-mod-imx8mm-lvds-g215hvn011.dtso | 7 + + ...c-overlay-edm-mod-imx8mm-lvds-mi0700a2t-30.dtsi | 12 + + ...c-overlay-edm-mod-imx8mm-lvds-mi0700a2t-30.dtso | 7 + + ...verlay-edm-mod-imx8mm-lvds-mi1010z1t-1cp11.dtsi | 12 + + ...verlay-edm-mod-imx8mm-lvds-mi1010z1t-1cp11.dtso | 7 + + ...edm-sbc-overlay-edm-mod-imx8mm-lvds-single.dtsi | 20 + + ...-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds.dtsi | 22 + + ...odul-edm-sbc-overlay-edm-sbc-imx8mm-rev900.dtso | 18 + + ...imx8mm-data-modul-edm-sbc-overlay-lvds-3v3.dtsi | 19 + + ...imx8mm-data-modul-edm-sbc-overlay-lvds-5v0.dtsi | 19 + + ...mx8mm-data-modul-edm-sbc-overlay-lvds-dual.dtsi | 29 + + ...data-modul-edm-sbc-overlay-lvds-g070y2-l01.dtsi | 31 + + ...ata-modul-edm-sbc-overlay-lvds-g101ice-l01.dtsi | 31 + + ...ata-modul-edm-sbc-overlay-lvds-g121xce-l01.dtsi | 31 + + ...ata-modul-edm-sbc-overlay-lvds-g156hce-l01.dtsi | 31 + + ...data-modul-edm-sbc-overlay-lvds-g215hvn011.dtsi | 30 + + ...ta-modul-edm-sbc-overlay-lvds-mi0700a2t-30.dtsi | 31 + + ...modul-edm-sbc-overlay-lvds-mi1010z1t-1cp11.dtsi | 31 + + ...8mm-data-modul-edm-sbc-overlay-lvds-single.dtsi | 13 + + .../dts/freescale/imx8mm-data-modul-edm-sbc.dts | 64 +- + .../arm64/boot/dts/freescale/imx8mm-kontron-bl.dts | 107 +- + .../imx8mm-tx8m-1610-moduline-iv-306-d.dts | 1 - + .../imx8mm-tx8m-1610-moduline-mini-111.dts | 1 - + arch/arm64/boot/dts/freescale/imx8mm-var-dart.dtsi | 21 +- + .../boot/dts/freescale/imx8mm-verdin-ivy.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 2 +- + .../dts/freescale/imx8mn-solidsense-n8-compact.dts | 2 - + .../freescale/imx8mn-vhip4-evalboard-common.dtsi | 3 +- + .../dts/freescale/imx8mn-vhip4-evalboard-v1.dts | 8 + + .../dts/freescale/imx8mn-vhip4-evalboard-v2.dts | 28 +- + .../imx8mn-vhip4-overlay-eeprom-1000.dtso | 103 + + .../imx8mn-vhip4-overlay-eeprom-1100.dtso | 103 + + .../imx8mn-vhip4-overlay-eeprom-2000.dtso | 107 + + .../imx8mp-data-modul-edm-sbc-overlay-cm7.dtso | 57 + + ...-edm-sbc-overlay-edm-mod-imx8mm-fio1-audio.dtso | 67 + + ...-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1.dtso | 46 + + ...-modul-edm-sbc-overlay-edm-mod-imx8mm-hdmi.dtso | 17 + + ...sbc-overlay-edm-mod-imx8mm-lvds-g070y2-l01.dtso | 7 + + ...bc-overlay-edm-mod-imx8mm-lvds-g101ice-l01.dtso | 7 + + ...bc-overlay-edm-mod-imx8mm-lvds-g121xce-l01.dtso | 7 + + ...bc-overlay-edm-mod-imx8mm-lvds-g156hce-l01.dtso | 7 + + ...sbc-overlay-edm-mod-imx8mm-lvds-g215hvn011.dtso | 11 + + ...c-overlay-edm-mod-imx8mm-lvds-mi0700a2t-30.dtso | 7 + + ...verlay-edm-mod-imx8mm-lvds-mi1010z1t-1cp11.dtso | 7 + + ...-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds.dtsi | 35 + + ...sbc-overlay-edm-sbc-imx8mp-lvds-g070y2-l01.dtso | 24 + + ...bc-overlay-edm-sbc-imx8mp-lvds-g101ice-l01.dtso | 24 + + ...bc-overlay-edm-sbc-imx8mp-lvds-g121xce-l01.dtso | 24 + + ...bc-overlay-edm-sbc-imx8mp-lvds-g156hce-l01.dtso | 32 + + ...sbc-overlay-edm-sbc-imx8mp-lvds-g215hvn011.dtso | 36 + + ...c-overlay-edm-sbc-imx8mp-lvds-mi0700a2t-30.dtso | 24 + + ...verlay-edm-sbc-imx8mp-lvds-mi1010z1t-1cp11.dtso | 24 + + ...edm-sbc-overlay-edm-sbc-imx8mp-lvds-rev900.dtso | 41 + + ...edm-sbc-overlay-edm-sbc-imx8mp-lvds-rev902.dtso | 14 + + ...-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds.dtsi | 79 + + ...odul-edm-sbc-overlay-edm-sbc-imx8mp-rev900.dtso | 97 + + ...odul-edm-sbc-overlay-edm-sbc-imx8mp-rev902.dtso | 69 + + .../dts/freescale/imx8mp-data-modul-edm-sbc.dts | 176 +- + .../dts/freescale/imx8mp-icore-mx8mp-edimm2.2.dts | 2 +- + .../boot/dts/freescale/imx8mp-icore-mx8mp.dtsi | 2 +- + .../boot/dts/freescale/imx8mp-kontron-dl.dtso | 11 + + .../imx8mp-phyboard-pollux-peb-av-10.dtsi | 5 +- + .../imx8mp-phyboard-pollux-peb-wlbt-07.dtso | 76 + + .../boot/dts/freescale/imx8mp-toradex-smarc.dtsi | 2 +- + ...8mp-tqma8mpqs-mb-smarc-2-lvds0-tm070jvhg33.dtso | 2 +- + ...8mp-tqma8mpqs-mb-smarc-2-lvds1-tm070jvhg33.dtso | 2 +- + .../imx8mp-tx8p-ml81-moduline-display-106.dts | 1 - + .../boot/dts/freescale/imx8mp-verdin-ivy.dtsi | 4 +- + .../boot/dts/freescale/imx8mp-verdin-yavia.dtsi | 7 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 6 + + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts | 2 +- + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 16 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 168 +- + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 32 +- + arch/arm64/boot/dts/freescale/imx8qm-ss-conn.dtsi | 39 + + .../boot/dts/freescale/imx8qm-var-som-symphony.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8qm-var-som.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 20 +- + arch/arm64/boot/dts/freescale/imx8ulp-evk.dts | 7 +- + .../arm64/boot/dts/freescale/imx8ulp-firmware.dtsi | 31 + + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 12 +- + arch/arm64/boot/dts/freescale/imx9-mqs.dtso | 57 + + arch/arm64/boot/dts/freescale/imx91-11x11-evk.dts | 55 +- + .../boot/dts/freescale/imx91-11x11-frdm-s.dts | 2 - + arch/arm64/boot/dts/freescale/imx91-11x11-frdm.dts | 2 - + .../freescale/imx91-9x9-qsb-tianma-tm050rdh03.dtso | 104 + + arch/arm64/boot/dts/freescale/imx91-9x9-qsb.dts | 52 + + .../dts/freescale/imx91-lino-verdin-dahlia.dts | 24 + + .../boot/dts/freescale/imx91-lino-verdin-dev.dts | 24 + + arch/arm64/boot/dts/freescale/imx91-lino.dtsi | 305 +++ + .../boot/dts/freescale/imx91-toradex-osm-dev.dts | 22 + + .../boot/dts/freescale/imx91-toradex-osm.dtsi | 303 +++ + arch/arm64/boot/dts/freescale/imx91.dtsi | 11 + + arch/arm64/boot/dts/freescale/imx91_93_common.dtsi | 6 + + .../boot/dts/freescale/imx93-11x11-evk-common.dtsi | 5 +- + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 54 +- + .../dts/freescale/imx93-11x11-frdm-common.dtsi | 681 ++++++ + arch/arm64/boot/dts/freescale/imx93-11x11-frdm.dts | 682 +----- + arch/arm64/boot/dts/freescale/imx93-14x14-evk.dts | 59 +- + arch/arm64/boot/dts/freescale/imx93-9x9-qsb.dts | 7 +- + .../dts/freescale/imx93-imx91-lino-common.dtsi | 536 +++++ + .../freescale/imx93-imx91-lino-verdin-common.dtsi | 175 ++ + .../imx93-imx91-lino-verdin-dahlia-common.dtsi | 198 ++ + .../imx93-imx91-lino-verdin-dev-common.dtsi | 216 ++ + .../freescale/imx93-imx91-toradex-osm-common.dtsi | 526 +++++ + .../imx93-imx91-toradex-osm-dev-common.dtsi | 324 +++ + .../boot/dts/freescale/imx93-kontron-bl-osm-s.dts | 6 +- + .../boot/dts/freescale/imx93-kontron-osm-s.dtsi | 32 +- + .../dts/freescale/imx93-lino-verdin-dahlia.dts | 24 + + .../boot/dts/freescale/imx93-lino-verdin-dev.dts | 24 + + arch/arm64/boot/dts/freescale/imx93-lino.dtsi | 359 +++ + .../boot/dts/freescale/imx93-toradex-osm-dev.dts | 22 + + .../boot/dts/freescale/imx93-toradex-osm.dtsi | 357 +++ + arch/arm64/boot/dts/freescale/imx93w-frdm.dts | 23 + + arch/arm64/boot/dts/freescale/imx94.dtsi | 5 +- + .../boot/dts/freescale/imx943-evk-sdwifi.dtso | 25 + + arch/arm64/boot/dts/freescale/imx943-evk.dts | 138 +- + arch/arm64/boot/dts/freescale/imx943.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx95-15x15-evk.dts | 48 +- + arch/arm64/boot/dts/freescale/imx95-15x15-frdm.dts | 38 +- + arch/arm64/boot/dts/freescale/imx95-19x19-evk.dts | 55 +- + .../boot/dts/freescale/imx95-19x19-frdm-pro.dts | 2 - + .../boot/dts/freescale/imx95-aquila-clover.dts | 23 + + arch/arm64/boot/dts/freescale/imx95-aquila-dev.dts | 18 + + arch/arm64/boot/dts/freescale/imx95-aquila.dtsi | 15 +- + arch/arm64/boot/dts/freescale/imx95-navq.dts | 228 ++ + .../boot/dts/freescale/imx95-toradex-osm-dev.dts | 404 ++++ + .../boot/dts/freescale/imx95-toradex-osm.dtsi | 1032 +++++++++ + .../boot/dts/freescale/imx95-toradex-smarc-dev.dts | 8 + + .../boot/dts/freescale/imx95-toradex-smarc.dtsi | 8 + + .../dts/freescale/imx95-tqma9596sa-mb-smarc-2.dts | 2 + + .../arm64/boot/dts/freescale/imx95-tqma9596sa.dtsi | 75 + + .../boot/dts/freescale/imx95-var-dart-sonata.dts | 2 +- + arch/arm64/boot/dts/freescale/imx95.dtsi | 18 +- + arch/arm64/boot/dts/freescale/imx952-evk.dts | 77 +- + arch/arm64/boot/dts/freescale/imx952-frdm.dts | 9 + + arch/arm64/boot/dts/freescale/imx952-frdm.dtsi | 726 ++++++ + arch/arm64/boot/dts/freescale/imx952.dtsi | 19 +- + arch/arm64/boot/dts/freescale/s32g2.dtsi | 2 +- + arch/arm64/boot/dts/freescale/s32g3.dtsi | 2 +- + drivers/firmware/imx/Kconfig | 12 + + drivers/firmware/imx/Makefile | 2 + + drivers/firmware/imx/ele_base_msg.c | 395 ++++ + drivers/firmware/imx/ele_base_msg.h | 119 + + drivers/firmware/imx/ele_common.c | 1012 ++++++++ + drivers/firmware/imx/ele_common.h | 147 ++ + drivers/firmware/imx/ele_fw_api.c | 406 ++++ + drivers/firmware/imx/ele_fw_api.h | 104 + + drivers/firmware/imx/ele_msg_addr_field.c | 619 +++++ + drivers/firmware/imx/se_ctrl.c | 2434 ++++++++++++++++++++ + drivers/firmware/imx/se_ctrl.h | 309 +++ + include/linux/firmware/imx/se_api.h | 14 + + include/uapi/linux/se_ioctl.h | 97 + + 270 files changed, 19505 insertions(+), 1243 deletions(-) + create mode 100644 Documentation/ABI/testing/se-cdev + create mode 100644 Documentation/devicetree/bindings/firmware/fsl,imx-se.yaml + create mode 100644 arch/arm/boot/dts/nxp/imx/imx50-amazon-yoshi.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-phytec-mira-rdk-emmc.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6dl-phytec-phycore-som.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-phytec-phycore-som.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-panel-cap-touch-7inch-parallel-touch-adapter.dtso + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-panel-cap-touch-7inch-parallel.dtso + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-panel-res-touch-7inch-parallel.dtso + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-colibri-emmc-vga.dtso + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-var-som-emmc-mx7customboard.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-var-som-emmc-wm8731-mx7customboard.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-var-som-emmc.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-var-som-mx7customboard.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-var-som-nand-mx7customboard.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-var-som-nand-wm8731-mx7customboard.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-var-som-nand.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-var-som-v2-emmc-mx7customboard.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-var-som-v2-nand-mx7customboard.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-var-som-v2.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-var-som-wm8731.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-var-som-wm8904.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx7d-var-som.dtsi + create mode 100644 arch/arm/boot/dts/nxp/vf/vf-colibri-iris.dtsi + create mode 100644 arch/arm/boot/dts/nxp/vf/vf500-colibri-iris.dts + create mode 100644 arch/arm/boot/dts/nxp/vf/vf610-colibri-iris.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-nbxv3.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2160a-nbxv3.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-cm4.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1-audio.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1-audio.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-hdmi.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-hdmi.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-dual.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g070y2-l01.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g070y2-l01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g101ice-l01.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g101ice-l01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g121xce-l01.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g121xce-l01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g156hce-l01.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g156hce-l01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g215hvn011.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g215hvn011.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-mi0700a2t-30.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-mi0700a2t-30.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-mi1010z1t-1cp11.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-mi1010z1t-1cp11.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-single.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-edm-sbc-imx8mm-rev900.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-3v3.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-5v0.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-dual.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-g070y2-l01.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-g101ice-l01.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-g121xce-l01.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-g156hce-l01.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-g215hvn011.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-mi0700a2t-30.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-mi1010z1t-1cp11.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-data-modul-edm-sbc-overlay-lvds-single.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-vhip4-overlay-eeprom-1000.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-vhip4-overlay-eeprom-1100.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-vhip4-overlay-eeprom-2000.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-cm7.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1-audio.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-fio1.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-hdmi.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g070y2-l01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g101ice-l01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g121xce-l01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g156hce-l01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-g215hvn011.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-mi0700a2t-30.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds-mi1010z1t-1cp11.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-mod-imx8mm-lvds.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-g070y2-l01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-g101ice-l01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-g121xce-l01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-g156hce-l01.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-g215hvn011.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-mi0700a2t-30.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-mi1010z1t-1cp11.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-rev900.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds-rev902.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-lvds.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-rev900.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-data-modul-edm-sbc-overlay-edm-sbc-imx8mp-rev902.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-phyboard-pollux-peb-wlbt-07.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8ulp-firmware.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx9-mqs.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx91-9x9-qsb-tianma-tm050rdh03.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx91-lino-verdin-dahlia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx91-lino-verdin-dev.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx91-lino.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx91-toradex-osm-dev.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx91-toradex-osm.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-11x11-frdm-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-imx91-lino-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-imx91-lino-verdin-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-imx91-lino-verdin-dahlia-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-imx91-lino-verdin-dev-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-imx91-toradex-osm-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-imx91-toradex-osm-dev-common.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-lino-verdin-dahlia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93-lino-verdin-dev.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93-lino.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93-toradex-osm-dev.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx93-toradex-osm.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx93w-frdm.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-navq.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-toradex-osm-dev.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx95-toradex-osm.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx952-frdm.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx952-frdm.dtsi + create mode 100644 drivers/firmware/imx/ele_base_msg.c + create mode 100644 drivers/firmware/imx/ele_base_msg.h + create mode 100644 drivers/firmware/imx/ele_common.c + create mode 100644 drivers/firmware/imx/ele_common.h + create mode 100644 drivers/firmware/imx/ele_fw_api.c + create mode 100644 drivers/firmware/imx/ele_fw_api.h + create mode 100644 drivers/firmware/imx/ele_msg_addr_field.c + create mode 100644 drivers/firmware/imx/se_ctrl.c + create mode 100644 drivers/firmware/imx/se_ctrl.h + create mode 100644 include/linux/firmware/imx/se_api.h + create mode 100644 include/uapi/linux/se_ioctl.h +Merging mediatek/for-next (4bfec57314396 Merge branches 'v7.3-next/dts32', 'v7.3-next/dts64' and 'v7.3-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mediatek/linux.git mediatek/for-next +Merge made by the 'ort' strategy. +Merging mvebu/for-next (43cb5b5bd349a Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + .../bindings/arm/marvell/armada-7k-8k.yaml | 7 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../boot/dts/marvell/armada-385-clearfog-gtr.dtsi | 2 +- + arch/arm/boot/dts/marvell/armada-388-helios4.dts | 27 ++- + arch/arm/boot/dts/marvell/armada-38x.dtsi | 1 + + arch/arm/boot/dts/marvell/armada-395-gp.dts | 1 - + arch/arm/boot/dts/marvell/armada-39x.dtsi | 1 + + arch/arm/boot/dts/marvell/dove.dtsi | 22 +-- + arch/arm/boot/dts/marvell/kirkwood-6282.dtsi | 15 +- + .../dts/marvell/kirkwood-guruplug-server-plus.dts | 4 +- + arch/arm/boot/dts/marvell/kirkwood-lsxl.dtsi | 4 +- + arch/arm/boot/dts/marvell/kirkwood-synology.dtsi | 12 +- + .../arm/boot/dts/marvell/orion5x-rd88f5182-nas.dts | 2 +- + arch/arm64/boot/dts/marvell/Makefile | 1 + + .../boot/dts/marvell/cn9130-sophos-xgs107w.dts | 188 +++++++++++++++++++++ + 15 files changed, 242 insertions(+), 47 deletions(-) + create mode 100644 arch/arm64/boot/dts/marvell/cn9130-sophos-xgs107w.dts +Merging omap/for-next (7cdd46c9d6c5a Merge branch 'omap-for-v7.4/soc' into tmp/omap-next-20260921.091322) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/khilman/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (f5672a3dff029 Merge branches 'arm32-for-7.4', 'arm64-defconfig-for-7.4', 'arm64-fixes-for-7.3', 'arm64-for-7.4', 'clk-fixes-for-7.3', 'clk-for-7.4', 'drivers-fixes-for-7.3' and 'drivers-for-7.4' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 3 + + Documentation/devicetree/bindings/arm/qcom.yaml | 45 + + .../bindings/clock/qcom,gcc-msm8952.yaml | 65 + + .../devicetree/bindings/clock/qcom,gcc-sdm845.yaml | 6 +- + .../devicetree/bindings/clock/qcom,gcc-sm6350.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sm8150.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sm8250.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sm8450.yaml | 7 + + .../devicetree/bindings/clock/qcom,hawi-gpucc.yaml | 80 + + .../bindings/clock/qcom,ipq9574-cmn-pll.yaml | 1 + + .../bindings/clock/qcom,kaanapali-gxclkctl.yaml | 23 +- + .../devicetree/bindings/clock/qcom,kuno-gcc.yaml | 52 + + .../devicetree/bindings/clock/qcom,qcs615-gcc.yaml | 7 + + .../bindings/clock/qcom,qcs8300-gcc.yaml | 7 + + .../devicetree/bindings/clock/qcom,rpmcc.yaml | 5 + + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 + + .../devicetree/bindings/clock/qcom,sdx75-gcc.yaml | 7 + + .../devicetree/bindings/clock/qcom,sm4450-gcc.yaml | 7 + + .../devicetree/bindings/clock/qcom,sm6375-gcc.yaml | 9 +- + .../devicetree/bindings/clock/qcom,sm7150-gcc.yaml | 53 - + .../bindings/clock/qcom,sm8450-camcc.yaml | 47 +- + .../bindings/clock/qcom,sm8450-videocc.yaml | 2 + + .../devicetree/bindings/clock/qcom,sm8550-gcc.yaml | 7 + + .../bindings/clock/qcom,sm8550-tcsr.yaml | 1 - + .../devicetree/bindings/clock/qcom,sm8650-gcc.yaml | 7 + + .../devicetree/bindings/clock/qcom,sm8750-gcc.yaml | 7 + + .../bindings/clock/qcom,x1e80100-tcsr.yaml | 114 + + .../embedded-controller/qcom,hamoa-crd-ec.yaml | 3 + + .../devicetree/bindings/usb/qcom,snps-dwc3.yaml | 3 + + .../devicetree/bindings/vendor-prefixes.yaml | 8 + + MAINTAINERS | 1 + + .../boot/dts/qcom/qcom-msm8960-sony-huashan.dts | 15 + + arch/arm/boot/dts/qcom/qcom-msm8960.dtsi | 169 +- + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 3 + + arch/arm/boot/dts/qcom/qcom-sdx55-t55.dts | 2 +- + arch/arm64/boot/dts/qcom/Makefile | 23 + + arch/arm64/boot/dts/qcom/agatti.dtsi | 13 +- + arch/arm64/boot/dts/qcom/apq8096-db820c.dtsi | 15 +- + .../dts/qcom/glymur-asus-zenbook-a16-ux3607oa.dts | 1 - + arch/arm64/boot/dts/qcom/glymur-crd.dtsi | 23 + + arch/arm64/boot/dts/qcom/glymur-qcb.dts | 699 ++ + arch/arm64/boot/dts/qcom/glymur.dtsi | 100 +- + .../boot/dts/qcom/hamoa-advantech-som-6820.dtsi | 54 + + .../boot/dts/qcom/hamoa-advantech-som-db5830.dts | 119 + + arch/arm64/boot/dts/qcom/hamoa-iot-evk.dts | 131 +- + arch/arm64/boot/dts/qcom/hamoa.dtsi | 4 +- + arch/arm64/boot/dts/qcom/hawi-ipcc.h | 61 + + arch/arm64/boot/dts/qcom/hawi-mtp.dts | 997 +++ + arch/arm64/boot/dts/qcom/hawi.dtsi | 6844 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/ipq5332-rdp-common.dtsi | 2 + + arch/arm64/boot/dts/qcom/ipq5424-rdp466.dts | 2 + + arch/arm64/boot/dts/qcom/ipq5424.dtsi | 16 + + arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi | 2 + + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 3 +- + arch/arm64/boot/dts/qcom/ipq9650-rdp488.dts | 119 + + arch/arm64/boot/dts/qcom/ipq9650.dtsi | 666 +- + arch/arm64/boot/dts/qcom/kaanapali-mtp.dts | 10 +- + arch/arm64/boot/dts/qcom/kaanapali-qrd.dts | 8 + + arch/arm64/boot/dts/qcom/kaanapali.dtsi | 472 +- + arch/arm64/boot/dts/qcom/kodiak.dtsi | 31 +- + arch/arm64/boot/dts/qcom/lemans-el2.dtso | 4 +- + .../boot/dts/qcom/lemans-evk-ifp-mezzanine.dtso | 3 +- + arch/arm64/boot/dts/qcom/lemans-evk.dts | 16 +- + arch/arm64/boot/dts/qcom/lemans-ride-common.dtsi | 21 +- + arch/arm64/boot/dts/qcom/lemans.dtsi | 24 +- + .../qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts | 1272 ++++ + arch/arm64/boot/dts/qcom/milos.dtsi | 393 ++ + arch/arm64/boot/dts/qcom/monaco-arduino-monza.dts | 201 +- + arch/arm64/boot/dts/qcom/monaco-evk.dts | 69 +- + arch/arm64/boot/dts/qcom/monaco.dtsi | 15 + + arch/arm64/boot/dts/qcom/msm8939-asus-z00t.dts | 8 + + .../boot/dts/qcom/msm8939-longcheer-l9100.dts | 8 + + arch/arm64/boot/dts/qcom/msm8939.dtsi | 26 + + arch/arm64/boot/dts/qcom/msm8953-motorola-deen.dts | 440 ++ + arch/arm64/boot/dts/qcom/msm8976-leeco-s2.dts | 442 ++ + arch/arm64/boot/dts/qcom/msm8976.dtsi | 2 +- + .../boot/dts/qcom/msm8996-oneplus-common.dtsi | 5 +- + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 7 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 6 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 45 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 6 +- + arch/arm64/boot/dts/qcom/nord-embedded.dtsi | 108 + + arch/arm64/boot/dts/qcom/nord.dtsi | 45 + + arch/arm64/boot/dts/qcom/pm4125.dtsi | 104 + + arch/arm64/boot/dts/qcom/pm8005.dtsi | 35 + + arch/arm64/boot/dts/qcom/pmh0104-hawi.dtsi | 103 + + arch/arm64/boot/dts/qcom/pmi8996.dtsi | 12 +- + arch/arm64/boot/dts/qcom/purwa-iot-evk.dts | 91 +- + arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 54 + + arch/arm64/boot/dts/qcom/qcm6490-idp.dts | 6 + + .../boot/dts/qcom/qcm6490-particle-tachyon.dts | 3 +- + arch/arm64/boot/dts/qcom/qcs404-evb.dtsi | 6 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 7 +- + arch/arm64/boot/dts/qcom/qcs615-ride.dts | 5 +- + .../boot/dts/qcom/qcs6490-radxa-dragon-q6a.dts | 4 +- + .../qcom/qcs6490-rb3gen2-industrial-mezzanine.dtso | 6 +- + arch/arm64/boot/dts/qcom/qcs6490-rb3gen2.dts | 12 +- + .../dts/qcom/qcs6490-thundercomm-minipc-g1iot.dts | 4 +- + .../boot/dts/qcom/qcs6490-thundercomm-rubikpi3.dts | 2 +- + .../boot/dts/qcom/qcs6490-vicharak-axon-mini.dts | 16 +- + arch/arm64/boot/dts/qcom/qcs8300-ride.dts | 8 +- + arch/arm64/boot/dts/qcom/qcs8550-aim300.dtsi | 16 +- + .../boot/dts/qcom/qcs8550-ayaneo-pocket-ds.dts | 1742 +++++ + .../arm64/boot/dts/qcom/qcs8550-ayntec-common.dtsi | 1819 ++++++ + .../boot/dts/qcom/qcs8550-ayntec-odin2mini.dts | 44 + + .../boot/dts/qcom/qcs8550-ayntec-odin2portal.dts | 99 + + arch/arm64/boot/dts/qcom/qcs8550-ayntec-thor.dts | 250 + + arch/arm64/boot/dts/qcom/qcs8550-imdt-sbc.dts | 401 ++ + arch/arm64/boot/dts/qcom/qcs8550-imdt-som.dtsi | 315 + + arch/arm64/boot/dts/qcom/qcs8550-rb5gen2.dts | 12 +- + .../boot/dts/qcom/qcs8550-retroidpocket-nova.dts | 116 + + .../boot/dts/qcom/qcs8550-retroidpocket-rp6.dts | 120 + + arch/arm64/boot/dts/qcom/qdu1000.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 4 +- + arch/arm64/boot/dts/qcom/sar2130p-qar2130p.dts | 6 +- + arch/arm64/boot/dts/qcom/sar2130p.dtsi | 13 +- + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 2 +- + .../qcom/sc7180-trogdor-lazor-limozeen-nots-r4.dts | 2 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 4 +- + .../boot/dts/qcom/sc7180-trogdor-pompom-r1.dts | 4 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 4 +- + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 7 +- + arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 7 +- + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 24 +- + .../boot/dts/qcom/sc8280xp-huawei-gaokun3.dts | 10 +- + .../boot/dts/qcom/sc8280xp-microsoft-arcata.dts | 2 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 116 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 16 +- + arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi | 8 +- + arch/arm64/boot/dts/qcom/sdm670.dtsi | 272 + + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 13 +- + arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 13 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 12 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 6 +- + .../boot/dts/qcom/sdm845-oneplus-enchilada.dts | 5 + + arch/arm64/boot/dts/qcom/sdm845-oneplus-fajita.dts | 1 + + .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 6 + + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 6 + + arch/arm64/boot/dts/qcom/sdm845.dtsi | 20 +- + arch/arm64/boot/dts/qcom/sdx75.dtsi | 1 + + .../dts/qcom/shikra-cqm-cqs-evk-imx577-camera.dtso | 72 + + arch/arm64/boot/dts/qcom/shikra-cqm-evk.dts | 56 + + arch/arm64/boot/dts/qcom/shikra-cqm-som.dtsi | 161 + + arch/arm64/boot/dts/qcom/shikra-cqs-evk.dts | 52 + + arch/arm64/boot/dts/qcom/shikra-evk.dtsi | 23 + + .../dts/qcom/shikra-iqs-evk-imx577-camera.dtso | 72 + + arch/arm64/boot/dts/qcom/shikra-iqs-evk.dts | 32 + + arch/arm64/boot/dts/qcom/shikra-iqs-som.dtsi | 115 +- + arch/arm64/boot/dts/qcom/shikra.dtsi | 548 +- + arch/arm64/boot/dts/qcom/sm4450.dtsi | 1 + + arch/arm64/boot/dts/qcom/sm6115-xiaomi-lemon.dts | 497 ++ + arch/arm64/boot/dts/qcom/sm6115.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 234 + + arch/arm64/boot/dts/qcom/sm7325-xiaomi-lisa.dts | 1108 ++++ + arch/arm64/boot/dts/qcom/sm8150.dtsi | 26 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 49 +- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 18 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 15 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 25 +- + arch/arm64/boot/dts/qcom/sm8550-hdk.dts | 28 +- + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 16 +- + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 20 +- + arch/arm64/boot/dts/qcom/sm8550-samsung-q5q.dts | 7 +- + .../dts/qcom/sm8550-sony-xperia-yodo-pdx234.dts | 8 +- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 63 +- + .../boot/dts/qcom/sm8650-ayaneo-pocket-s2.dts | 11 +- + arch/arm64/boot/dts/qcom/sm8650-hdk.dts | 22 +- + arch/arm64/boot/dts/qcom/sm8650-mtp.dts | 16 +- + arch/arm64/boot/dts/qcom/sm8650-qrd.dts | 14 +- + arch/arm64/boot/dts/qcom/sm8650-valve-deckard.dts | 1288 ++++ + arch/arm64/boot/dts/qcom/sm8650.dtsi | 18 +- + arch/arm64/boot/dts/qcom/sm8750-mtp.dts | 10 +- + arch/arm64/boot/dts/qcom/sm8750-qrd.dts | 8 + + arch/arm64/boot/dts/qcom/sm8750.dtsi | 339 +- + arch/arm64/boot/dts/qcom/talos-evk-som.dtsi | 5 +- + arch/arm64/boot/dts/qcom/talos-evk.dts | 2 +- + arch/arm64/boot/dts/qcom/talos.dtsi | 12 +- + arch/arm64/boot/dts/qcom/x1-asus-vivobook-s15.dtsi | 1 + + arch/arm64/boot/dts/qcom/x1-asus-zenbook-a14.dtsi | 1 + + arch/arm64/boot/dts/qcom/x1-crd.dtsi | 1 + + arch/arm64/boot/dts/qcom/x1-dell-thena.dtsi | 3 +- + arch/arm64/boot/dts/qcom/x1-hp-omnibook-x14.dtsi | 1 + + arch/arm64/boot/dts/qcom/x1e001de-devkit.dts | 3 +- + .../dts/qcom/x1e78100-lenovo-thinkpad-t14s.dtsi | 1 + + .../qcom/x1e80100-dell-inspiron-14-plus-7441.dts | 31 +- + .../boot/dts/qcom/x1e80100-dell-xps13-9345.dts | 1 + + .../dts/qcom/x1e80100-honor-magicbook-art-14.dts | 3 +- + .../boot/dts/qcom/x1e80100-lenovo-yoga-slim7x.dts | 23 + + .../dts/qcom/x1e80100-medion-sprchrgd-14-s1.dts | 1 + + arch/arm64/boot/dts/qcom/x1e80100-qcp.dts | 1 + + .../boot/dts/qcom/x1p42100-lenovo-thinkbook-16.dts | 1 + + drivers/clk/qcom/Kconfig | 167 +- + drivers/clk/qcom/Makefile | 9 + + drivers/clk/qcom/cambistmclkcc-eliza.c | 464 ++ + drivers/clk/qcom/cambistmclkcc-kaanapali.c | 7 + + drivers/clk/qcom/cambistmclkcc-sm8750.c | 7 + + drivers/clk/qcom/camcc-eliza.c | 2803 ++++++++ + drivers/clk/qcom/camcc-glymur.c | 7 + + drivers/clk/qcom/camcc-hawi.c | 3152 +++++++++ + drivers/clk/qcom/camcc-nord.c | 2941 +++++++++ + drivers/clk/qcom/camcc-sa8775p.c | 36 +- + drivers/clk/qcom/camcc-sc8280xp.c | 13 +- + drivers/clk/qcom/camcc-sm7150.c | 13 +- + drivers/clk/qcom/camcc-sm8150.c | 13 +- + drivers/clk/qcom/clk-alpha-pll.c | 9 + + drivers/clk/qcom/clk-rcg2.c | 35 +- + drivers/clk/qcom/clk-regmap-divider.c | 16 +- + drivers/clk/qcom/clk-regmap-divider.h | 1 + + drivers/clk/qcom/clk-rpmh.c | 44 + + drivers/clk/qcom/dispcc-sc7280.c | 13 +- + drivers/clk/qcom/dispcc-sc8280xp.c | 18 +- + drivers/clk/qcom/dispcc-sm4450.c | 15 +- + drivers/clk/qcom/dispcc-sm6115.c | 13 +- + drivers/clk/qcom/dispcc-sm7150.c | 13 +- + drivers/clk/qcom/dispcc-sm8250.c | 13 +- + drivers/clk/qcom/dispcc-sm8450.c | 40 +- + drivers/clk/qcom/dispcc-sm8550.c | 13 +- + drivers/clk/qcom/dispcc-sm8750.c | 19 +- + drivers/clk/qcom/dispcc-x1e80100.c | 27 +- + drivers/clk/qcom/dispcc0-sa8775p.c | 15 +- + drivers/clk/qcom/dispcc1-sa8775p.c | 15 +- + drivers/clk/qcom/gcc-eliza.c | 13 +- + drivers/clk/qcom/gcc-glymur.c | 81 +- + drivers/clk/qcom/gcc-hawi.c | 12 +- + drivers/clk/qcom/gcc-ipq5018.c | 10 + + drivers/clk/qcom/gcc-ipq5210.c | 1 + + drivers/clk/qcom/gcc-ipq5332.c | 1 + + drivers/clk/qcom/gcc-ipq5424.c | 4 +- + drivers/clk/qcom/gcc-ipq9650.c | 22 + + drivers/clk/qcom/gcc-kaanapali.c | 13 +- + drivers/clk/qcom/gcc-kuno.c | 1473 +++++ + drivers/clk/qcom/gcc-milos.c | 12 +- + drivers/clk/qcom/gcc-msm8939.c | 4 + + drivers/clk/qcom/gcc-msm8952.c | 3548 ++++++++++ + drivers/clk/qcom/gcc-nord.c | 12 +- + drivers/clk/qcom/gcc-qcm2290.c | 12 +- + drivers/clk/qcom/gcc-qcs615.c | 69 +- + drivers/clk/qcom/gcc-qcs8300.c | 167 +- + drivers/clk/qcom/gcc-qdu1000.c | 12 +- + drivers/clk/qcom/gcc-sa8775p.c | 56 +- + drivers/clk/qcom/gcc-sar2130p.c | 58 +- + drivers/clk/qcom/gcc-sc7180.c | 60 +- + drivers/clk/qcom/gcc-sc7280.c | 67 +- + drivers/clk/qcom/gcc-sc8280xp.c | 47 +- + drivers/clk/qcom/gcc-sdx55.c | 43 +- + drivers/clk/qcom/gcc-sdx65.c | 43 +- + drivers/clk/qcom/gcc-sdx75.c | 44 +- + drivers/clk/qcom/gcc-shikra.c | 12 +- + drivers/clk/qcom/gcc-sm4450.c | 77 +- + drivers/clk/qcom/gcc-sm6115.c | 12 +- + drivers/clk/qcom/gcc-sm6125.c | 12 +- + drivers/clk/qcom/gcc-sm6375.c | 12 +- + drivers/clk/qcom/gcc-sm7150.c | 72 +- + drivers/clk/qcom/gcc-sm8150.c | 12 +- + drivers/clk/qcom/gcc-sm8250.c | 69 +- + drivers/clk/qcom/gcc-sm8350.c | 65 +- + drivers/clk/qcom/gcc-sm8450.c | 64 +- + drivers/clk/qcom/gcc-sm8550.c | 70 +- + drivers/clk/qcom/gcc-sm8650.c | 72 +- + drivers/clk/qcom/gcc-sm8750.c | 89 +- + drivers/clk/qcom/gcc-x1e80100.c | 80 +- + drivers/clk/qcom/gpucc-eliza.c | 606 ++ + drivers/clk/qcom/gpucc-hawi.c | 477 ++ + drivers/clk/qcom/gpucc-sar2130p.c | 13 +- + drivers/clk/qcom/gpucc-sc7280.c | 22 +- + drivers/clk/qcom/gpucc-sc8280xp.c | 15 +- + drivers/clk/qcom/gpucc-sm4450.c | 17 +- + drivers/clk/qcom/gpucc-sm8550.c | 15 +- + drivers/clk/qcom/gpucc-x1e80100.c | 13 +- + drivers/clk/qcom/gpucc-x1p42100.c | 17 +- + drivers/clk/qcom/ipq-cmn-pll.c | 538 +- + drivers/clk/qcom/lpasscc-sc7280.c | 12 +- + drivers/clk/qcom/lpasscc-sdm845.c | 12 +- + drivers/clk/qcom/lpasscc-sm6115.c | 4 +- + drivers/clk/qcom/lpasscorecc-sc7180.c | 31 +- + drivers/clk/qcom/mmcc-msm8960.c | 3 +- + drivers/clk/qcom/mmcc-msm8996.c | 4 +- + drivers/clk/qcom/mmcc-sdm660.c | 2 +- + drivers/clk/qcom/negcc-nord.c | 5 +- + drivers/clk/qcom/nwgcc-nord.c | 5 +- + drivers/clk/qcom/segcc-nord.c | 40 +- + drivers/clk/qcom/tcsrcc-eliza.c | 12 +- + drivers/clk/qcom/tcsrcc-glymur.c | 12 +- + drivers/clk/qcom/tcsrcc-kaanapali.c | 12 +- + drivers/clk/qcom/tcsrcc-sm8550.c | 12 +- + drivers/clk/qcom/tcsrcc-sm8650.c | 12 +- + drivers/clk/qcom/tcsrcc-sm8750.c | 12 +- + drivers/clk/qcom/tcsrcc-x1e80100.c | 349 +- + drivers/clk/qcom/videocc-eliza.c | 404 ++ + drivers/clk/qcom/videocc-glymur.c | 38 + + drivers/clk/qcom/videocc-sa8775p.c | 17 +- + drivers/clk/qcom/videocc-sm6350.c | 13 +- + drivers/clk/qcom/videocc-sm7150.c | 13 +- + drivers/clk/qcom/videocc-sm8250.c | 15 +- + drivers/clk/qcom/videocc-sm8350.c | 31 +- + drivers/clk/qcom/videocc-sm8750.c | 12 +- + drivers/clk/renesas/r9a06g032-clocks.c | 8 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 7 +- + drivers/clk/renesas/rzg2l-cpg.c | 7 +- + drivers/clk/renesas/rzv2h-cpg.c | 7 +- + drivers/soc/qcom/rpmh-rsc.c | 14 +- + include/dt-bindings/clock/qcom,gcc-msm8952.h | 215 + + include/dt-bindings/clock/qcom,hawi-camcc.h | 165 + + include/dt-bindings/clock/qcom,hawi-gpucc.h | 47 + + include/dt-bindings/clock/qcom,ipq5210-cmn-pll.h | 30 + + include/dt-bindings/clock/qcom,kuno-gcc.h | 100 + + include/dt-bindings/clock/qcom,nord-camcc.h | 167 + + include/dt-bindings/clock/qcom,nord-negcc.h | 1 + + include/dt-bindings/clock/qcom,nord-nwgcc.h | 3 + + include/dt-bindings/clock/qcom,nord-segcc.h | 2 + + include/dt-bindings/clock/qcom,qcs8300-gcc.h | 6 + + include/dt-bindings/interconnect/qcom,ipq9650.h | 28 + + include/linux/device/driver.h | 31 + + include/linux/platform_device.h | 30 + + 315 files changed, 43566 insertions(+), 2114 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,gcc-msm8952.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,hawi-gpucc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,kuno-gcc.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,sm7150-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,x1e80100-tcsr.yaml + create mode 100644 arch/arm64/boot/dts/qcom/glymur-qcb.dts + create mode 100644 arch/arm64/boot/dts/qcom/hamoa-advantech-som-6820.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/hamoa-advantech-som-db5830.dts + create mode 100644 arch/arm64/boot/dts/qcom/hawi-ipcc.h + create mode 100644 arch/arm64/boot/dts/qcom/hawi-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/hawi.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/mahua-lenovo-thinkpad-t14s-gen7-lcd.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-motorola-deen.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8976-leeco-s2.dts + create mode 100644 arch/arm64/boot/dts/qcom/pmh0104-hawi.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550-ayaneo-pocket-ds.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550-ayntec-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550-ayntec-odin2mini.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550-ayntec-odin2portal.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550-ayntec-thor.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550-imdt-sbc.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550-imdt-som.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550-retroidpocket-nova.dts + create mode 100644 arch/arm64/boot/dts/qcom/qcs8550-retroidpocket-rp6.dts + create mode 100644 arch/arm64/boot/dts/qcom/shikra-cqm-cqs-evk-imx577-camera.dtso + create mode 100644 arch/arm64/boot/dts/qcom/shikra-iqs-evk-imx577-camera.dtso + create mode 100644 arch/arm64/boot/dts/qcom/sm6115-xiaomi-lemon.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm7325-xiaomi-lisa.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8650-valve-deckard.dts + create mode 100644 drivers/clk/qcom/cambistmclkcc-eliza.c + create mode 100644 drivers/clk/qcom/camcc-eliza.c + create mode 100644 drivers/clk/qcom/camcc-hawi.c + create mode 100644 drivers/clk/qcom/camcc-nord.c + create mode 100644 drivers/clk/qcom/gcc-kuno.c + create mode 100644 drivers/clk/qcom/gcc-msm8952.c + create mode 100644 drivers/clk/qcom/gpucc-eliza.c + create mode 100644 drivers/clk/qcom/gpucc-hawi.c + create mode 100644 drivers/clk/qcom/videocc-eliza.c + create mode 100644 include/dt-bindings/clock/qcom,gcc-msm8952.h + create mode 100644 include/dt-bindings/clock/qcom,hawi-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,hawi-gpucc.h + create mode 100644 include/dt-bindings/clock/qcom,ipq5210-cmn-pll.h + create mode 100644 include/dt-bindings/clock/qcom,kuno-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,nord-camcc.h + create mode 100644 include/dt-bindings/interconnect/qcom,ipq9650.h +Merging realtek/for-next (3c778f0c9fa36 arm64: dts: realtek: Add GPIO support for RTD1625) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/yu_chun/linux.git realtek/for-next +Already up to date. +Merging renesas/next (fb050251fd4fe Merge branches 'renesas-arm-defconfig-for-v7.4', 'renesas-drivers-for-v7.4' and 'renesas-dts-for-v7.4' into renesas-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 + + .../bindings/power/renesas,rcar-sysc.yaml | 7 +- + .../bindings/power/riscv,rpmi-device-power.yaml | 65 +++ + .../power/riscv,rpmi-mpxy-device-power.yaml | 65 +++ + .../devicetree/bindings/soc/renesas/renesas.yaml | 37 ++ + arch/arm64/boot/dts/renesas/Makefile | 74 +++ + .../boot/dts/renesas/r8a774a3-hihope-rzg2m-ex.dts | 14 + + .../boot/dts/renesas/r8a774a3-hihope-rzg2m.dts | 49 ++ + arch/arm64/boot/dts/renesas/r8a774a3.dtsi | 302 +++++++++++ + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 16 +- + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 16 +- + arch/arm64/boot/dts/renesas/r8a779h0.dtsi | 8 +- + arch/arm64/boot/dts/renesas/r8a78000-ironhide.dts | 12 +- + arch/arm64/boot/dts/renesas/r8a78000.dtsi | 216 ++++++++ + .../renesas/r9a07g043u12-hummingboard-ripple.dts | 89 ++++ + .../dts/renesas/r9a07g044c2-hummingboard-iiot.dts | 20 + + .../renesas/r9a07g044c2-hummingboard-ripple.dts | 93 ++++ + .../dts/renesas/r9a07g044l2-hummingboard-iiot.dts | 16 + + .../renesas/r9a07g044l2-hummingboard-ripple.dts | 18 + + .../dts/renesas/r9a07g054l2-hummingboard-iiot.dts | 16 + + .../renesas/r9a07g054l2-hummingboard-ripple.dts | 18 + + arch/arm64/boot/dts/renesas/r9a08g046.dtsi | 70 ++- + arch/arm64/boot/dts/renesas/r9a08g046l48-smarc.dts | 36 ++ + arch/arm64/boot/dts/renesas/r9a09g047.dtsi | 124 +++++ + arch/arm64/boot/dts/renesas/r9a09g047e57-smarc.dts | 31 ++ + arch/arm64/boot/dts/renesas/r9a09g077.dtsi | 24 +- + arch/arm64/boot/dts/renesas/r9a09g087.dtsi | 24 +- + arch/arm64/boot/dts/renesas/renesas-smarc2.dtsi | 25 + + .../renesas/rzg2l-hummingboard-iiot-common.dtsi | 560 +++++++++++++++++++++ + .../renesas/rzg2l-hummingboard-iiot-microsd.dtso | 26 + + ...hummingboard-iiot-panel-dsi-WJ70N3TYJHMNG0.dtso | 79 +++ + .../renesas/rzg2l-hummingboard-iiot-rs485-a.dtso | 17 + + .../renesas/rzg2l-hummingboard-iiot-rs485-b.dtso | 17 + + .../boot/dts/renesas/rzg2l-hummingboard-iiot.dtsi | 49 ++ + .../renesas/rzg2l-hummingboard-pulse-common.dtsi | 116 +++++ + .../rzg2l-hummingboard-pulse-micro-hdmi.dtsi | 79 +++ + .../dts/renesas/rzg2l-hummingboard-ripple.dtsi | 122 +++++ + arch/arm64/boot/dts/renesas/rzg2l-sr-som-emmc.dtso | 44 ++ + arch/arm64/boot/dts/renesas/rzg2l-sr-som.dtsi | 473 +++++++++++++++++ + .../renesas/rzg2lc-hummingboard-pulse-leds.dtso | 48 ++ + arch/arm64/boot/dts/renesas/rzg2lc-sr-som.dtsi | 436 ++++++++++++++++ + .../renesas/rzg2ul-hummingboard-pulse-leds.dtso | 48 ++ + arch/arm64/boot/dts/renesas/rzg2ul-sr-som.dtsi | 418 +++++++++++++++ + arch/arm64/boot/dts/renesas/rzg3l-smarc-som.dtsi | 11 + + .../dt-bindings/clock/renesas,r8a774a3-cpg-mssr.h | 59 +++ + include/dt-bindings/clock/renesas,r8a78000-cpg.h | 2 + + include/dt-bindings/power/qcom,rpmhpd.h | 1 + + include/dt-bindings/power/renesas,r8a774a3-sysc.h | 30 ++ + 48 files changed, 4068 insertions(+), 54 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/riscv,rpmi-device-power.yaml + create mode 100644 Documentation/devicetree/bindings/power/riscv,rpmi-mpxy-device-power.yaml + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a3-hihope-rzg2m-ex.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a3-hihope-rzg2m.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a774a3.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g043u12-hummingboard-ripple.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044c2-hummingboard-iiot.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044c2-hummingboard-ripple.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l2-hummingboard-iiot.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g044l2-hummingboard-ripple.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g054l2-hummingboard-iiot.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a07g054l2-hummingboard-ripple.dts + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-hummingboard-iiot-common.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-hummingboard-iiot-microsd.dtso + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-hummingboard-iiot-panel-dsi-WJ70N3TYJHMNG0.dtso + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-hummingboard-iiot-rs485-a.dtso + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-hummingboard-iiot-rs485-b.dtso + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-hummingboard-iiot.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-hummingboard-pulse-common.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-hummingboard-pulse-micro-hdmi.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-hummingboard-ripple.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-sr-som-emmc.dtso + create mode 100644 arch/arm64/boot/dts/renesas/rzg2l-sr-som.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2lc-hummingboard-pulse-leds.dtso + create mode 100644 arch/arm64/boot/dts/renesas/rzg2lc-sr-som.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg2ul-hummingboard-pulse-leds.dtso + create mode 100644 arch/arm64/boot/dts/renesas/rzg2ul-sr-som.dtsi + create mode 100644 include/dt-bindings/clock/renesas,r8a774a3-cpg-mssr.h + create mode 100644 include/dt-bindings/power/renesas,r8a774a3-sysc.h +Merging reset/reset/next (d373605cd5148 Merge tag 'reset-fixes-for-v7.0-2' into reset/next) +$ git merge -m Merge branch 'reset/next' of https://git.kernel.org/pub/scm/linux/kernel/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (d2abcbb905b0e Merge branch 'v7.4-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 37 +- + .../devicetree/bindings/soc/rockchip/grf.yaml | 1 + + arch/arm/boot/dts/rockchip/rk3066a.dtsi | 2 +- + arch/arm/boot/dts/rockchip/rk3229-xms6.dts | 4 +- + arch/arm/boot/dts/rockchip/rk3288-miqi.dts | 2 +- + arch/arm/boot/dts/rockchip/rk3288-tinker.dtsi | 2 +- + arch/arm/boot/dts/rockchip/rv1103b-omega4.dtsi | 1 - + arch/arm64/boot/dts/rockchip/Makefile | 11 + + .../boot/dts/rockchip/rk3308-unihiker-m10-v1.2.dts | 248 +++++ + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-base.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399-evb-ind.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3399-firefly.dts | 36 +- + .../boot/dts/rockchip/rk3399-kobol-helios64.dts | 82 ++ + .../boot/dts/rockchip/rk3399-pinebook-pro.dts | 4 + + .../boot/dts/rockchip/rk3399-rockpro64-v2.dts | 4 + + arch/arm64/boot/dts/rockchip/rk3399-rockpro64.dts | 4 + + .../boot/dts/rockchip/rk3528-mangopi-m28k.dts | 412 +++++++ + .../arm64/boot/dts/rockchip/rk3528-nanopi-r28s.dts | 160 +++ + .../boot/dts/rockchip/rk3528-nanopi-zero2.dts | 290 +---- + arch/arm64/boot/dts/rockchip/rk3528-nanopi.dtsi | 291 +++++ + arch/arm64/boot/dts/rockchip/rk3562-evb2-v10.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3566-base.dtsi | 4 + + arch/arm64/boot/dts/rockchip/rk3566-nanopi-r3s.dts | 1 - + .../boot/dts/rockchip/rk3568-fastrhino-r66s.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts | 1 - + .../arm64/boot/dts/rockchip/rk3568-nanopi-r5s.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3568-rock-3b.dts | 51 + + arch/arm64/boot/dts/rockchip/rk3568.dtsi | 4 + + arch/arm64/boot/dts/rockchip/rk356x-base.dtsi | 1 - + .../boot/dts/rockchip/rk3576-100ask-dshanpi-a1.dts | 9 - + .../dts/rockchip/rk3576-anbernic-rg-vita-pro.dts | 2 - + .../boot/dts/rockchip/rk3576-armsom-cm5-io.dts | 1 - + .../boot/dts/rockchip/rk3576-armsom-sige5.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3576-evb1-v10.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3576-nanopi-m5.dts | 1 - + .../arm64/boot/dts/rockchip/rk3576-nanopi-r76s.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3576-roc-pc.dts | 1 - + .../dts/rockchip/rk3576-rock-4d-radxa-cam4k.dtso | 105 ++ + arch/arm64/boot/dts/rockchip/rk3576-rock-4d.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3576.dtsi | 177 ++- + arch/arm64/boot/dts/rockchip/rk3582-radxa-e52c.dts | 38 +- + arch/arm64/boot/dts/rockchip/rk3582-radxa-e54c.dts | 1172 ++++++++++++++++++++ + .../boot/dts/rockchip/rk3588-armsom-sige7.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3588-armsom-w3.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3588-base.dtsi | 2 +- + .../boot/dts/rockchip/rk3588-coolpi-cm5-evb.dts | 1 + + .../arm64/boot/dts/rockchip/rk3588-coolpi-cm5.dtsi | 1 - + .../boot/dts/rockchip/rk3588-edgeble-neu6a-io.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3588-extra.dtsi | 2 +- + .../boot/dts/rockchip/rk3588-lubancat-5io.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dtsi | 1 - + arch/arm64/boot/dts/rockchip/rk3588-ok3588-c.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3588-rock-5-itx.dts | 4 +- + .../boot/dts/rockchip/rk3588-rock-5b-5bp-5t.dtsi | 1 - + .../rockchip/rk3588-tiger-displayport-carrier.dts | 110 ++ + .../boot/dts/rockchip/rk3588-vicharak-axon.dts | 1 - + .../boot/dts/rockchip/rk3588-vicharak-vaaman2.dts | 1 - + .../boot/dts/rockchip/rk3588-youyeetoo-yy3588.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3588s-coolpi-4b.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3588s-evb1-v10.dts | 1 - + .../boot/dts/rockchip/rk3588s-gameforce-ace.dts | 1 - + .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 1 - + .../arm64/boot/dts/rockchip/rk3588s-lubancat-4.dts | 1 - + .../arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi | 142 +++ + .../boot/dts/rockchip/rk3588s-nanopi-m6v1.dts | 57 + + .../arm64/boot/dts/rockchip/rk3588s-nanopi-r6.dtsi | 792 +------------ + arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi | 797 +++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588s-odroid-m2.dts | 36 +- + .../boot/dts/rockchip/rk3588s-orangepi-5-pro.dts | 14 +- + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 1 - + arch/arm64/boot/dts/rockchip/rk3588s-rock-5c.dts | 1 - + 72 files changed, 3986 insertions(+), 1160 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3308-unihiker-m10-v1.2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3528-mangopi-m28k.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3528-nanopi-r28s.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3528-nanopi.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3576-rock-4d-radxa-cam4k.dtso + create mode 100644 arch/arm64/boot/dts/rockchip/rk3582-radxa-e54c.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-tiger-displayport-carrier.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-nanopi-m6v1.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-nanopi.dtsi +Merging samsung-krzk/for-next (993e1bec85fae Merge branch 'next/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/google.yaml | 48 +- + .../bindings/arm/samsung/samsung-boards.yaml | 1 + + .../bindings/clock/samsung,exynos5515-cmu.yaml | 145 ++ + .../devicetree/bindings/gpu/arm,mali-bifrost.yaml | 1 + + MAINTAINERS | 1 + + arch/arm/boot/dts/samsung/exynos4210-i9100.dts | 9 +- + arch/arm/boot/dts/samsung/exynos4210-trats.dts | 5 + + .../boot/dts/samsung/exynos4210-universal_c210.dts | 5 + + arch/arm/boot/dts/samsung/exynos4412-midas.dtsi | 5 +- + arch/arm64/Kconfig.platforms | 8 + + arch/arm64/boot/dts/Makefile | 1 + + arch/arm64/boot/dts/exynos/Makefile | 1 + + arch/arm64/boot/dts/exynos/axis/artpec8.dtsi | 36 +- + arch/arm64/boot/dts/exynos/axis/artpec9.dtsi | 36 +- + arch/arm64/boot/dts/exynos/exynos2200-g0s.dts | 8 +- + arch/arm64/boot/dts/exynos/exynos2200-pinctrl.dtsi | 2 - + arch/arm64/boot/dts/exynos/exynos2200.dtsi | 1 - + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 93 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 108 +- + .../arm64/boot/dts/exynos/exynos7870-a2corelte.dts | 39 +- + arch/arm64/boot/dts/exynos/exynos7870-j5y17lte.dts | 34 +- + arch/arm64/boot/dts/exynos/exynos7870-j6lte.dts | 34 +- + arch/arm64/boot/dts/exynos/exynos7870-j7xelte.dts | 35 +- + arch/arm64/boot/dts/exynos/exynos7870-on7xelte.dts | 39 +- + arch/arm64/boot/dts/exynos/exynos7870.dtsi | 108 +- + arch/arm64/boot/dts/exynos/exynos850-a217f.dts | 200 +++ + arch/arm64/boot/dts/exynos/exynos850.dtsi | 29 +- + arch/arm64/boot/dts/exynos/exynos8855-smdk.dts | 2 +- + arch/arm64/boot/dts/exynos/exynosautov920.dtsi | 2 +- + .../boot/dts/exynos/google/gs101-pixel-common.dtsi | 51 +- + arch/arm64/boot/dts/exynos/google/gs101.dtsi | 96 +- + arch/arm64/boot/dts/google/Makefile | 6 + + arch/arm64/boot/dts/google/lga-blazer.dts | 15 + + arch/arm64/boot/dts/google/lga-frankel.dts | 15 + + arch/arm64/boot/dts/google/lga-mustang.dts | 15 + + arch/arm64/boot/dts/google/lga-pixel-common.dtsi | 22 + + arch/arm64/boot/dts/google/lga.dtsi | 411 ++++++ + arch/arm64/boot/dts/tesla/fsd-evb.dts | 10 +- + arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 16 +- + arch/arm64/boot/dts/tesla/fsd.dtsi | 1162 +++++++-------- + arch/arm64/configs/defconfig | 1 + + drivers/clk/samsung/Makefile | 1 + + drivers/clk/samsung/clk-acpm.c | 61 +- + drivers/clk/samsung/clk-exynos5515.c | 1484 ++++++++++++++++++++ + drivers/clk/samsung/clk-pll.c | 1 + + drivers/clk/samsung/clk-pll.h | 1 + + include/dt-bindings/clock/samsung,exynos5515-cmu.h | 191 +++ + 47 files changed, 3619 insertions(+), 976 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/samsung,exynos5515-cmu.yaml + create mode 100644 arch/arm64/boot/dts/exynos/exynos850-a217f.dts + create mode 100644 arch/arm64/boot/dts/google/Makefile + create mode 100644 arch/arm64/boot/dts/google/lga-blazer.dts + create mode 100644 arch/arm64/boot/dts/google/lga-frankel.dts + create mode 100644 arch/arm64/boot/dts/google/lga-mustang.dts + create mode 100644 arch/arm64/boot/dts/google/lga-pixel-common.dtsi + create mode 100644 arch/arm64/boot/dts/google/lga.dtsi + create mode 100644 drivers/clk/samsung/clk-exynos5515.c + create mode 100644 include/dt-bindings/clock/samsung,exynos5515-cmu.h +Merging nomadik/for-next (ff1501cbb825d ARM: dts: ux500: Use AB8505 charger compatible) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-nomadik.git nomadik/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/st/ste-ab8505.dtsi | 17 ++++------------- + 1 file changed, 4 insertions(+), 13 deletions(-) +Merging integrator/for-next (5bf1bb010712b ARM: dts: gemini: Use a level-high interrupt for TVE200) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-integrator.git integrator/for-next +Already up to date. +Merging scmi/for-linux-next (403e062cebf95 Merge branches 'for-next/scmi/fixes' and 'for-next/juno/fixes', tags 'juno-updates-7.4' and 'vexpress-fixes-7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/arm/corstone1000-a320.dtsi | 2 +- + drivers/firmware/arm_scmi/bus.c | 110 +++++++++++++++---------- + drivers/firmware/arm_scmi/transports/Kconfig | 2 +- + drivers/pinctrl/freescale/pinctrl-imx-scmi.c | 2 +- + 4 files changed, 69 insertions(+), 47 deletions(-) +Merging sophgo/for-next (60e4cafd30908 riscv: dts: sophgo: sg2002-milkv-duo256m: drop reserved memory node) +$ git merge -m Merge branch 'for-next' of https://github.com/sophgo/linux.git sophgo/for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sophgo/Makefile | 3 +++ + arch/riscv/boot/dts/sophgo/cv1800b-milkv-duo.dts | 11 ---------- + arch/riscv/boot/dts/sophgo/cv180x.dtsi | 2 +- + .../boot/dts/sophgo/sg2002-milkv-duo256m-eth.dtso | 17 +++++++++++++++ + .../riscv/boot/dts/sophgo/sg2002-milkv-duo256m.dts | 11 ---------- + arch/riscv/boot/dts/sophgo/sg2042-evb-v1.dts | 4 ++-- + arch/riscv/boot/dts/sophgo/sg2042-evb-v2.dts | 2 +- + .../riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts | 4 ++-- + .../boot/dts/sophgo/sg2044-sophgo-srd3-10.dts | 24 ++++++++++++++++++++++ + 9 files changed, 50 insertions(+), 28 deletions(-) + create mode 100644 arch/riscv/boot/dts/sophgo/sg2002-milkv-duo256m-eth.dtso +Merging sophgo-soc/soc-for-next (c8754c7deab4c soc: sophgo: cv1800: rtcsys: New driver (handling RTC only)) +$ git merge -m Merge branch 'soc-for-next' of https://github.com/sophgo/linux.git sophgo-soc/soc-for-next +Already up to date. +Merging spacemit/for-next (d5eefaf546eb8 Merge branch 'spacemit-misc-for-next' into spacemit-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/spacemit/linux spacemit/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../thead,c900-aclint-mswi.yaml | 1 + + .../thead,c900-aclint-sswi.yaml | 5 +- + .../devicetree/bindings/timer/sifive,clint.yaml | 1 - + .../bindings/timer/thead,c900-aclint-mtimer.yaml | 1 + + MAINTAINERS | 9 + + arch/riscv/boot/dts/spacemit/k1-musepi-pro.dts | 35 +++- + arch/riscv/boot/dts/spacemit/k1-orangepi-r2s.dts | 69 ++++++- + arch/riscv/boot/dts/spacemit/k1-orangepi-rv2.dts | 132 +++++++++--- + arch/riscv/boot/dts/spacemit/k3-com260-ifx.dts | 77 +++++++ + arch/riscv/boot/dts/spacemit/k3-com260.dtsi | 18 ++ + arch/riscv/boot/dts/spacemit/k3-pico-itx.dts | 38 ++++ + arch/riscv/boot/dts/spacemit/k3-pinctrl.dtsi | 11 + + arch/riscv/boot/dts/spacemit/k3.dtsi | 229 +++++++++++++++++++-- + drivers/irqchip/irq-aclint-sswi.c | 1 + + 14 files changed, 571 insertions(+), 56 deletions(-) +Merging stm32/stm32-next (f831584128ac2 soc: st: Add STM32MP2 SYSCFG driver) +$ git merge -m Merge branch 'stm32-next' of https://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + .../bindings/arm/stm32/st,stm32-syscon.yaml | 30 +- + .../devicetree/bindings/arm/stm32/stm32.yaml | 39 +- + MAINTAINERS | 3 +- + arch/arm/boot/dts/st/stm32mp131.dtsi | 24 + + arch/arm/boot/dts/st/stm32mp135.dtsi | 44 +- + arch/arm/boot/dts/st/stm32mp135f-dk.dts | 28 +- + arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi | 34 + + arch/arm/boot/dts/st/stm32mp151.dtsi | 20 +- + .../arm/boot/dts/st/stm32mp153c-lxa-fairytux2.dtsi | 2 +- + arch/arm/boot/dts/st/stm32mp157a-dk1-scmi.dts | 8 +- + arch/arm/boot/dts/st/stm32mp157c-dk2-scmi.dts | 8 +- + arch/arm/boot/dts/st/stm32mp157c-ed1-scmi.dts | 8 +- + arch/arm/boot/dts/st/stm32mp157c-ev1-scmi.dts | 8 +- + arch/arm/boot/dts/st/stm32mp157c-ev1.dts | 9 +- + arch/arm/boot/dts/st/stm32mp157c-lxa-mc1.dts | 2 +- + arch/arm/boot/dts/st/stm32mp157f-dk2-scmi.dtsi | 1 + + arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 2 +- + arch/arm/boot/dts/st/stm32mp15xx-dhcom-som.dtsi | 2 + + arch/arm/boot/dts/st/stm32mp15xx-dkx.dtsi | 35 +- + arch/arm64/boot/dts/st/Makefile | 23 + + arch/arm64/boot/dts/st/stm32mp231.dtsi | 105 ++- + arch/arm64/boot/dts/st/stm32mp235f-dk.dts | 75 ++ + arch/arm64/boot/dts/st/stm32mp23xc.dtsi | 7 + + arch/arm64/boot/dts/st/stm32mp23xx-dhcos-bb.dts | 15 + + arch/arm64/boot/dts/st/stm32mp23xx-dhcos-som.dtsi | 51 ++ + arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi | 829 +++++++++++++++++++++ + arch/arm64/boot/dts/st/stm32mp251.dtsi | 67 +- + arch/arm64/boot/dts/st/stm32mp253.dtsi | 16 + + ...stm32mp255c-dhcos-dhsbc-overlay-imx219-x10.dtso | 111 +++ + arch/arm64/boot/dts/st/stm32mp255c-dhcos-dhsbc.dts | 213 ++++++ + .../boot/dts/st/stm32mp257-engicam-microgea.dtsi | 63 ++ + ...microgea-rmm-overlay-am-1280800w8tzqw-t00h.dtso | 67 ++ + ...cam-microgea-rmm-overlay-rk050hr345-ct106a.dtso | 68 ++ + .../dts/st/stm32mp257d-engicam-microgea-rmm.dts | 275 +++++++ + arch/arm64/boot/dts/st/stm32mp257f-dk.dts | 93 +++ + arch/arm64/boot/dts/st/stm32mp257f-ev1.dts | 101 ++- + arch/arm64/boot/dts/st/stm32mp25xc.dtsi | 7 + + arch/arm64/boot/dts/st/stm32mp25xx-dhcos-bb.dts | 15 + + arch/arm64/boot/dts/st/stm32mp25xx-dhcos-som.dtsi | 51 ++ + arch/arm64/boot/dts/st/stm32mp2xxx-dhcos-som.dtsi | 456 ++++++++++++ + arch/arm64/configs/defconfig | 5 + + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/st/Kconfig | 12 + + drivers/soc/st/Makefile | 1 + + drivers/soc/st/stm32mp2-syscfg.c | 33 + + 46 files changed, 2924 insertions(+), 144 deletions(-) + create mode 100644 arch/arm64/boot/dts/st/stm32mp23xc.dtsi + create mode 100644 arch/arm64/boot/dts/st/stm32mp23xx-dhcos-bb.dts + create mode 100644 arch/arm64/boot/dts/st/stm32mp23xx-dhcos-som.dtsi + create mode 100644 arch/arm64/boot/dts/st/stm32mp255c-dhcos-dhsbc-overlay-imx219-x10.dtso + create mode 100644 arch/arm64/boot/dts/st/stm32mp255c-dhcos-dhsbc.dts + create mode 100644 arch/arm64/boot/dts/st/stm32mp257-engicam-microgea.dtsi + create mode 100644 arch/arm64/boot/dts/st/stm32mp257d-engicam-microgea-rmm-overlay-am-1280800w8tzqw-t00h.dtso + create mode 100644 arch/arm64/boot/dts/st/stm32mp257d-engicam-microgea-rmm-overlay-rk050hr345-ct106a.dtso + create mode 100644 arch/arm64/boot/dts/st/stm32mp257d-engicam-microgea-rmm.dts + create mode 100644 arch/arm64/boot/dts/st/stm32mp25xc.dtsi + create mode 100644 arch/arm64/boot/dts/st/stm32mp25xx-dhcos-bb.dts + create mode 100644 arch/arm64/boot/dts/st/stm32mp25xx-dhcos-som.dtsi + create mode 100644 arch/arm64/boot/dts/st/stm32mp2xxx-dhcos-som.dtsi + create mode 100644 drivers/soc/st/Kconfig + create mode 100644 drivers/soc/st/Makefile + create mode 100644 drivers/soc/st/stm32mp2-syscfg.c +Merging sunxi/sunxi/for-next (5243bd55dfe63 Merge branch 'sunxi/dt-for-7.4' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/sunxi.yaml | 10 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/arm/boot/dts/allwinner/sun7i-a20.dtsi | 2 +- + arch/arm64/boot/dts/allwinner/Makefile | 1 + + .../boot/dts/allwinner/sun50i-a133-teclast-p80.dts | 205 +++++++++++++++++++++ + .../boot/dts/allwinner/sun50i-h5-orangepi-pc2.dts | 22 +++ + arch/arm64/boot/dts/allwinner/sun50i-h6.dtsi | 4 +- + arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 12 ++ + drivers/clk/sunxi-ng/ccu-sun55i-a523-r.c | 37 ++-- + drivers/clk/sunxi-ng/ccu-sun55i-a523.c | 128 ++++++------- + drivers/clk/sunxi-ng/ccu_common.c | 2 +- + drivers/clk/sunxi-ng/ccu_div.h | 18 +- + 12 files changed, 344 insertions(+), 99 deletions(-) + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-a133-teclast-p80.dts +Merging tee/next (b0adf8e5e1ebf Merge branches 'optee_fixes_for_v7.3', 'tee_fix_for_v7.3', 'qcomtee_fix_for_v7.3', 'qcomtee_for_v7.4', 'tee_for_v7.4' and 'optee_for_v7.4' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/jenswi/linux-tee.git tee/next +Merge made by the 'ort' strategy. + drivers/tee/optee/Kconfig | 1 + + drivers/tee/optee/Makefile | 4 ++-- + drivers/tee/optee/ffa_abi.c | 8 ++------ + drivers/tee/optee/notif.c | 1 - + drivers/tee/optee/optee_private.h | 39 ++++++++++++++++++++++++++++++++++++++- + 5 files changed, 43 insertions(+), 10 deletions(-) +Merging tegra/for-next (016e9c7ec4d13 Merge branch for-7.4/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-platform-tegra-bpmp | 48 + + Documentation/devicetree/bindings/arm/tegra.yaml | 6 + + .../bindings/fuse/nvidia,tegra20-fuse.yaml | 1 + + .../memory-controllers/nvidia,tegra124-emc.yaml | 10 +- + .../memory-controllers/nvidia,tegra124-mc.yaml | 1 + + .../bindings/soc/tegra/nvidia,tegra20-pmc.yaml | 5 +- + arch/arm/boot/dts/nvidia/Makefile | 2 + + arch/arm/boot/dts/nvidia/tegra114-asus-tf701t.dts | 885 ++++++++++++++- + arch/arm/boot/dts/nvidia/tegra114-dalmore.dts | 4 +- + arch/arm/boot/dts/nvidia/tegra114-roth.dts | 4 +- + arch/arm/boot/dts/nvidia/tegra114-tn7.dts | 4 +- + arch/arm/boot/dts/nvidia/tegra124.dtsi | 16 +- + .../boot/dts/nvidia/tegra20-motorola-daytona.dts | 107 ++ + arch/arm/boot/dts/nvidia/tegra20-motorola-mot.dtsi | 1194 ++++++++++++++++++++ + .../boot/dts/nvidia/tegra20-motorola-olympus.dts | 108 ++ + arch/arm/boot/dts/nvidia/tegra30-lg-p880.dts | 5 +- + arch/arm/boot/dts/nvidia/tegra30-lg-p895.dts | 5 +- + arch/arm/boot/dts/nvidia/tegra30-lg-x3.dtsi | 106 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 22 +- + .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts | 8 +- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 76 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 8 +- + .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 8 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 113 +- + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 1120 ------------------ + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 1011 +---------------- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 1126 +++++++++++++++++- + .../boot/dts/nvidia/tegra234-p3737-0000+p3701.dtsi | 9 +- + .../dts/nvidia/tegra234-p3740-0002+p3701-0008.dts | 45 +- + .../boot/dts/nvidia/tegra234-p3768-0000+p3767.dtsi | 12 +- + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 86 +- + arch/arm64/boot/dts/nvidia/tegra264-p3834.dtsi | 57 + + .../boot/dts/nvidia/tegra264-p4071-0000+p3834.dtsi | 93 ++ + arch/arm64/boot/dts/nvidia/tegra264.dtsi | 614 +++++----- + .../boot/dts/nvidia/thermal/nvidia,tegra264-bpmp.h | 20 + + drivers/firmware/tegra/Makefile | 1 + + drivers/firmware/tegra/bpmp-debugfs.c | 9 + + drivers/firmware/tegra/bpmp-private.h | 39 + + drivers/firmware/tegra/bpmp-sysfs.c | 207 ++++ + drivers/firmware/tegra/bpmp-tegra186.c | 14 + + drivers/firmware/tegra/bpmp-tegra210.c | 17 +- + drivers/firmware/tegra/bpmp.c | 458 +++++++- + include/soc/tegra/bpmp-abi.h | 165 ++- + include/soc/tegra/bpmp.h | 2 + + 44 files changed, 5156 insertions(+), 2695 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-platform-tegra-bpmp + create mode 100644 arch/arm/boot/dts/nvidia/tegra20-motorola-daytona.dts + create mode 100644 arch/arm/boot/dts/nvidia/tegra20-motorola-mot.dtsi + create mode 100644 arch/arm/boot/dts/nvidia/tegra20-motorola-olympus.dts + create mode 100644 arch/arm64/boot/dts/nvidia/thermal/nvidia,tegra264-bpmp.h + create mode 100644 drivers/firmware/tegra/bpmp-sysfs.c +Merging tenstorrent-dt/tenstorrent-dt-for-next (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'tenstorrent-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-dt/tenstorrent-dt-for-next +Already up to date. +Merging fustini-config/riscv-config-for-next (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'riscv-config-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git fustini-config/riscv-config-for-next +Already up to date. +Merging thead-dt/thead-dt-for-next (2414ca8f5a0ca MAINTAINERS: Move RISC-V T-Head SoC tree to kernel.org) +$ git merge -m Merge branch 'thead-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-dt/thead-dt-for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/riscv/thead.yaml | 6 +- + MAINTAINERS | 2 +- + arch/riscv/boot/dts/thead/Makefile | 1 + + arch/riscv/boot/dts/thead/th1520-milkv-meles.dts | 346 +++++++++++++++++++++ + 4 files changed, 352 insertions(+), 3 deletions(-) + create mode 100644 arch/riscv/boot/dts/thead/th1520-milkv-meles.dts +Merging ti/ti-next (9e2716807275d Merge branch 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/ti/k3.yaml | 7 + + .../bindings/clock/ti,am62-audio-refclk.yaml | 8 +- + .../soc/ti/ti,j721e-system-controller.yaml | 6 +- + MAINTAINERS | 1 + + arch/arm/boot/dts/ti/keystone/keystone-k2e.dtsi | 2 +- + arch/arm/boot/dts/ti/keystone/keystone-k2g.dtsi | 28 +- + arch/arm/boot/dts/ti/keystone/keystone-k2hk.dtsi | 16 +- + arch/arm/boot/dts/ti/keystone/keystone-k2l.dtsi | 16 +- + arch/arm/boot/dts/ti/keystone/keystone.dtsi | 4 +- + arch/arm64/boot/dts/ti/Makefile | 12 + + arch/arm64/boot/dts/ti/k3-am62-lp-sk.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am62-phycore-som.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62-pocketbeagle2.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am62-verdin-ivy.dtsi | 41 +- + arch/arm64/boot/dts/ti/k3-am62-verdin-zinnia.dtsi | 41 +- + arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 49 +-- + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 6 +- + arch/arm64/boot/dts/ti/k3-am625-sk-common.dtsi | 3 +- + .../boot/dts/ti/k3-am625-tqma62xx-mba62xx.dts | 4 +- + arch/arm64/boot/dts/ti/k3-am625-tqma62xx.dtsi | 2 +- + .../boot/dts/ti/k3-am625-var-som-symphony.dts | 2 +- + arch/arm64/boot/dts/ti/k3-am625-var-som.dtsi | 4 +- + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62a-phycore-som.dtsi | 31 +- + .../boot/dts/ti/k3-am62a-ti-ipc-firmware.dtsi | 11 +- + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 35 +- + arch/arm64/boot/dts/ti/k3-am62d2-evm.dts | 32 +- + arch/arm64/boot/dts/ti/k3-am62l3-evm.dts | 4 +- + .../boot/dts/ti/k3-am62p-j722s-common-main.dtsi | 12 + + .../boot/dts/ti/k3-am62p-j722s-common-mcu.dtsi | 2 +- + .../boot/dts/ti/k3-am62p-ti-ipc-firmware.dtsi | 11 +- + arch/arm64/boot/dts/ti/k3-am62p-verdin.dtsi | 29 +- + arch/arm64/boot/dts/ti/k3-am62p5-sk.dts | 29 +- + arch/arm64/boot/dts/ti/k3-am62p5-var-som.dtsi | 29 +- + arch/arm64/boot/dts/ti/k3-am62x-phyboard-lyra.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 1 + + arch/arm64/boot/dts/ti/k3-am67-phycore-som.dtsi | 324 ++++++++++++++++ + .../arm64/boot/dts/ti/k3-am6754-phyboard-rigel.dts | 431 +++++++++++++++++++++ + ...uila-dsi-to-lvds-v2-panel-cap-touch-10inch.dtso | 161 ++++++++ + arch/arm64/boot/dts/ti/k3-am69-aquila.dtsi | 2 +- + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 1 + + .../boot/dts/ti/k3-j721s2-common-proc-board.dts | 1 + + arch/arm64/boot/dts/ti/k3-j721s2-evm-audio.dtso | 157 ++++++++ + arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 18 + + arch/arm64/boot/dts/ti/k3-j722s-evm.dts | 26 +- + .../boot/dts/ti/k3-j784s4-j742s2-evm-common.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-pinctrl.h | 10 + + 49 files changed, 1410 insertions(+), 214 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-am67-phycore-som.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am6754-phyboard-rigel.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am69-aquila-dsi-to-lvds-v2-panel-cap-touch-10inch.dtso + create mode 100644 arch/arm64/boot/dts/ti/k3-j721s2-evm-audio.dtso +Merging xilinx/for-next (ac01278339e89 Merge branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/xilinx/zynq-7000.dtsi | 8 ++-- + arch/arm/boot/dts/xilinx/zynq-parallella.dts | 4 +- + drivers/firmware/xilinx/zynqmp-ufs.c | 70 ++++++++++++++++++++++++++-- + drivers/firmware/xilinx/zynqmp.c | 44 ++++++++++++++--- + drivers/ufs/host/ufs-amd-versal2.c | 46 +++++------------- + include/linux/firmware/xlnx-zynqmp-ufs.h | 8 ++-- + include/linux/firmware/xlnx-zynqmp.h | 5 -- + 7 files changed, 126 insertions(+), 59 deletions(-) +Merging socfpga/for-next (fd26798a69439 MAINTAINERS: Drop arm64 dts/intel path from ARM/SOCFPGA ARCHITECTURE) + fd26798a69439 ("MAINTAINERS: Drop arm64 dts/intel path from ARM/SOCFPGA ARCHITECTURE") +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dinguyen/linux.git socfpga/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/altera.yaml | 2 + + .../bindings/firmware/intel,stratix10-svc.yaml | 10 ++ + arch/arm64/boot/dts/altera/Makefile | 14 +- + .../boot/dts/{intel => altera}/socfpga_agilex.dtsi | 2 + + .../{intel => altera}/socfpga_agilex3_socdk.dts | 0 + .../dts/{intel => altera}/socfpga_agilex5.dtsi | 61 +++++++++ + .../boot/dts/altera/socfpga_agilex5_socdk.dts | 146 +++++++++++++++++++++ + .../socfpga_agilex5_socdk_013b.dts | 0 + .../dts/altera/socfpga_agilex5_socdk_debug.dts | 121 +++++++++++++++++ + .../boot/dts/altera/socfpga_agilex5_socdk_emmc.dts | 123 +++++++++++++++++ + .../socfpga_agilex5_socdk_modular.dts | 0 + .../socfpga_agilex5_socdk_nand.dts | 0 + .../socfpga_agilex5_socdk_tsn_cfg2.dts} | 40 ++++-- + .../dts/{intel => altera}/socfpga_agilex72.dtsi | 0 + .../{intel => altera}/socfpga_agilex72_socdk.dts | 0 + .../{intel => altera}/socfpga_agilex7m_socdk.dts | 0 + .../dts/{intel => altera}/socfpga_agilex_n6000.dts | 0 + .../dts/{intel => altera}/socfpga_agilex_socdk.dts | 0 + .../socfpga_agilex_socdk_emmc.dts | 0 + .../socfpga_agilex_socdk_nand.dts | 0 + .../dts/{intel => altera}/socfpga_n5x_socdk.dts | 0 + arch/arm64/boot/dts/altera/socfpga_stratix10.dtsi | 4 + + arch/arm64/boot/dts/intel/Makefile | 12 -- + 23 files changed, 510 insertions(+), 25 deletions(-) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex.dtsi (99%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex3_socdk.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex5.dtsi (93%) + create mode 100644 arch/arm64/boot/dts/altera/socfpga_agilex5_socdk.dts + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex5_socdk_013b.dts (100%) + create mode 100644 arch/arm64/boot/dts/altera/socfpga_agilex5_socdk_debug.dts + create mode 100644 arch/arm64/boot/dts/altera/socfpga_agilex5_socdk_emmc.dts + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex5_socdk_modular.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex5_socdk_nand.dts (100%) + rename arch/arm64/boot/dts/{intel/socfpga_agilex5_socdk.dts => altera/socfpga_agilex5_socdk_tsn_cfg2.dts} (73%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex72.dtsi (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex72_socdk.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex7m_socdk.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex_n6000.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex_socdk.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex_socdk_emmc.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_agilex_socdk_nand.dts (100%) + rename arch/arm64/boot/dts/{intel => altera}/socfpga_n5x_socdk.dts (100%) +Merging clk/clk-next (a5929cbf1406e Merge branch 'clk-qcom' into clk-next) +$ git merge -m Merge branch 'clk-next' of https://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Auto-merging MAINTAINERS +Auto-merging drivers/clk/at91/clk-main.c +Auto-merging drivers/clk/clk-scpi.c +Merge made by the 'ort' strategy. + .../bindings/clock/airoha,en7523-scu.yaml | 24 +- + .../bindings/clock/anlogic,dr1v90-cru.yaml | 62 + + .../bindings/clock/clk-palmas-clk32kg-clocks.txt | 35 - + .../bindings/clock/clock-nexus-node.yaml | 30 + + .../devicetree/bindings/clock/hi3660-clock.txt | 47 - + .../devicetree/bindings/clock/hi3670-clock.txt | 43 - + .../devicetree/bindings/clock/hi6220-clock.txt | 52 - + .../bindings/clock/hisilicon,clocks.yaml | 51 + + .../bindings/clock/hisilicon,hi6220-stub-clk.yaml | 49 + + .../bindings/clock/nuvoton,ma35d1-clk.yaml | 16 +- + .../bindings/clock/starfive,jhb100-per0crg.yaml | 70 + + .../bindings/clock/starfive,jhb100-per1crg.yaml | 70 + + .../bindings/clock/starfive,jhb100-per2crg.yaml | 76 + + .../bindings/clock/starfive,jhb100-per3crg.yaml | 76 + + .../bindings/clock/starfive,jhb100-sys0crg.yaml | 63 + + .../bindings/clock/starfive,jhb100-sys1crg.yaml | 71 + + .../bindings/clock/starfive,jhb100-sys2crg.yaml | 64 + + .../bindings/clock/ti,palmas-clk32kg.yaml | 56 + + .../devicetree/bindings/clock/ti/adpll.txt | 39 - + .../devicetree/bindings/clock/ti/davinci/pll.txt | 96 -- + .../bindings/clock/ti/davinci/ti,da850-pll.yaml | 164 ++ + .../devicetree/bindings/clock/ti/dra7-atl.txt | 94 -- + .../devicetree/bindings/clock/ti/fapll.txt | 31 - + .../bindings/clock/ti/ti,dm814-adpll-clock.yaml | 88 ++ + .../bindings/clock/ti/ti,dm816-fapll-clock.yaml | 71 + + .../bindings/clock/ti/ti,dra7-atl-clock.yaml | 38 + + .../devicetree/bindings/clock/ti/ti,dra7-atl.yaml | 100 ++ + .../bindings/clock/zte,zx297520v3-lspcrm.yaml | 101 ++ + .../bindings/clock/zte,zx297520v3-matrixcrm.yaml | 98 ++ + .../bindings/clock/zte,zx297520v3-topcrm.yaml | 122 ++ + .../soc/starfive/starfive,jhb100-syscon.yaml | 115 ++ + MAINTAINERS | 34 +- + drivers/clk/Kconfig | 15 +- + drivers/clk/Makefile | 9 +- + drivers/clk/actions/owl-composite.h | 1 - + drivers/clk/actions/owl-fixed-factor.h | 2 - + drivers/clk/actions/owl-pll.c | 2 +- + drivers/clk/anlogic/Kconfig | 21 + + drivers/clk/anlogic/Makefile | 7 + + drivers/clk/anlogic/cru-dr1v90.c | 192 +++ + drivers/clk/anlogic/cru_dr1.c | 226 +++ + drivers/clk/anlogic/cru_dr1.h | 117 ++ + drivers/clk/aspeed/Kconfig | 1 + + drivers/clk/aspeed/clk-aspeed.c | 2 +- + drivers/clk/aspeed/clk-ast2600.c | 2 +- + drivers/clk/aspeed/clk-ast2700.c | 2 +- + drivers/clk/at91/clk-audio-pll.c | 4 +- + drivers/clk/at91/clk-h32mx.c | 2 +- + drivers/clk/at91/clk-main.c | 2 +- + drivers/clk/at91/clk-pll.c | 2 +- + drivers/clk/at91/clk-plldiv.c | 2 +- + drivers/clk/at91/clk-slow.c | 2 +- + drivers/clk/at91/clk-smd.c | 2 +- + drivers/clk/at91/clk-usb.c | 6 +- + drivers/clk/at91/sckc.c | 2 +- + drivers/clk/bcm/clk-iproc-armpll.c | 2 +- + drivers/clk/bcm/clk-iproc-asiu.c | 2 +- + drivers/clk/bcm/clk-iproc-pll.c | 2 +- + drivers/clk/bcm/clk-raspberrypi.c | 2 + + drivers/clk/berlin/berlin2-avpll.c | 4 +- + drivers/clk/berlin/berlin2-pll.c | 2 +- + drivers/clk/clk-axi-clkgen.c | 2 +- + drivers/clk/clk-cdce925.c | 2 +- + drivers/clk/clk-conf.c | 12 +- + drivers/clk/clk-cs2000-cp.c | 2 +- + drivers/clk/clk-en7523.c | 218 ++- + drivers/clk/clk-eyeq.c | 31 +- + drivers/clk/clk-fractional-divider.c | 2 +- + drivers/clk/clk-gemini.c | 2 +- + drivers/clk/clk-gpio.c | 2 +- + drivers/clk/clk-highbank.c | 2 +- + drivers/clk/clk-lmk04832.c | 9 +- + drivers/clk/clk-milbeaut.c | 14 +- + drivers/clk/clk-nomadik.c | 4 +- + drivers/clk/clk-npcm7xx.c | 2 +- + drivers/clk/clk-pwm.c | 2 +- + drivers/clk/clk-renesas-pcie.c | 43 +- + drivers/clk/clk-s2mps11.c | 12 +- + drivers/clk/clk-scpi.c | 2 +- + drivers/clk/clk-si514.c | 2 +- + drivers/clk/clk-si521xx.c | 43 +- + drivers/clk/clk-si5341.c | 2 +- + drivers/clk/clk-si5351.c | 20 +- + drivers/clk/clk-si544.c | 2 +- + drivers/clk/clk-si570.c | 2 +- + drivers/clk/clk-stm32f4.c | 4 +- + drivers/clk/clk-stm32h7.c | 2 +- + drivers/clk/clk-versaclock5.c | 12 +- + drivers/clk/clk-vt8500.c | 4 +- + drivers/clk/clk-xgene.c | 6 +- + drivers/clk/clk.c | 75 +- + drivers/clk/clk.h | 5 +- + drivers/clk/clk_kunit_helpers.c | 31 + + drivers/clk/clk_test.c | 151 +- + drivers/clk/clkdev.c | 4 +- + drivers/clk/davinci/Kconfig | 10 + + drivers/clk/davinci/Makefile | 8 +- + drivers/clk/davinci/da8xx-cfgchip.c | 4 +- + drivers/clk/davinci/pll.c | 2 +- + drivers/clk/davinci/psc.c | 2 +- + drivers/clk/hisilicon/clk-hi3559a.c | 2 +- + drivers/clk/hisilicon/clk-hi3620.c | 2 +- + drivers/clk/hisilicon/clk-hi6220-stub.c | 2 +- + drivers/clk/hisilicon/clk-hisi-phase.c | 2 +- + drivers/clk/hisilicon/clk-hix5hd2.c | 2 +- + drivers/clk/hisilicon/clkdivider-hi6220.c | 2 +- + drivers/clk/hisilicon/clkgate-separated.c | 2 +- + drivers/clk/imx/clk-busy.c | 4 +- + drivers/clk/imx/clk-composite-93.c | 11 +- + drivers/clk/imx/clk-cpu.c | 2 +- + drivers/clk/imx/clk-divider-gate.c | 2 +- + drivers/clk/imx/clk-fixup-div.c | 2 +- + drivers/clk/imx/clk-fixup-mux.c | 2 +- + drivers/clk/imx/clk-frac-pll.c | 2 +- + drivers/clk/imx/clk-fracn-gppll.c | 3 +- + drivers/clk/imx/clk-gate-93.c | 2 +- + drivers/clk/imx/clk-gate-exclusive.c | 2 +- + drivers/clk/imx/clk-gate2.c | 2 +- + drivers/clk/imx/clk-lpcg-scu.c | 2 +- + drivers/clk/imx/clk-pfd.c | 2 +- + drivers/clk/imx/clk-pfdv2.c | 2 +- + drivers/clk/imx/clk-pll14xx.c | 2 +- + drivers/clk/imx/clk-pllv1.c | 2 +- + drivers/clk/imx/clk-pllv2.c | 2 +- + drivers/clk/imx/clk-pllv3.c | 2 +- + drivers/clk/imx/clk-pllv4.c | 2 +- + drivers/clk/imx/clk-scu.c | 4 +- + drivers/clk/imx/clk-sscg-pll.c | 2 +- + drivers/clk/imx/clk.c | 15 +- + drivers/clk/ingenic/cgu.c | 2 +- + drivers/clk/keystone/gate.c | 2 +- + drivers/clk/keystone/pll.c | 2 +- + drivers/clk/keystone/syscon-clk.c | 2 +- + drivers/clk/kunit_clk_assigned_rates.h | 4 +- + drivers/clk/kunit_clk_parse_clkspec.dtso | 31 + + drivers/clk/mediatek/Kconfig | 1 + + drivers/clk/mediatek/clk-cpumux.c | 2 +- + drivers/clk/mediatek/reset.h | 6 +- + drivers/clk/meson/t7-peripherals.c | 11 +- + drivers/clk/mmp/Kconfig | 5 + + drivers/clk/mmp/clk-apbc.c | 2 +- + drivers/clk/mmp/clk-apmu.c | 2 +- + drivers/clk/mmp/clk-frac.c | 2 +- + drivers/clk/mmp/clk-gate.c | 2 +- + drivers/clk/mmp/clk-mix.c | 2 +- + drivers/clk/mmp/clk-pll.c | 2 +- + drivers/clk/mstar/clk-msc313-mpll.c | 2 +- + drivers/clk/mvebu/ap-cpu-clk.c | 6 +- + drivers/clk/mvebu/clk-corediv.c | 2 +- + drivers/clk/mvebu/clk-cpu.c | 2 +- + drivers/clk/mxs/clk-div.c | 2 +- + drivers/clk/mxs/clk-frac.c | 2 +- + drivers/clk/mxs/clk-pll.c | 2 +- + drivers/clk/mxs/clk-ref.c | 2 +- + drivers/clk/nuvoton/clk-ma35d1.c | 7 +- + drivers/clk/nxp/clk-lpc18xx-creg.c | 2 +- + drivers/clk/pistachio/clk-pll.c | 2 +- + drivers/clk/pistachio/clk.c | 15 +- + drivers/clk/pistachio/clk.h | 1 + + drivers/clk/renesas/Kconfig | 7 + + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r8a774a3-cpg-mssr.c | 168 ++ + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 6 +- + drivers/clk/renesas/r8a779f0-cpg-mssr.c | 4 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 4 +- + drivers/clk/renesas/r8a779h0-cpg-mssr.c | 8 +- + drivers/clk/renesas/r8a78000-cpg.c | 3 + + drivers/clk/renesas/r9a06g032-clocks.c | 2 +- + drivers/clk/renesas/r9a07g043-cpg.c | 12 +- + drivers/clk/renesas/r9a07g044-cpg.c | 12 +- + drivers/clk/renesas/r9a08g045-cpg.c | 6 +- + drivers/clk/renesas/r9a08g046-cpg.c | 117 +- + drivers/clk/renesas/r9a09g077-cpg.c | 142 ++ + drivers/clk/renesas/rcar-gen3-cpg.c | 15 +- + drivers/clk/renesas/rcar-gen3-cpg.h | 3 +- + drivers/clk/renesas/rcar-gen4-cpg.c | 25 +- + drivers/clk/renesas/rcar-gen4-cpg.h | 14 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 9 + + drivers/clk/renesas/renesas-cpg-mssr.h | 2 + + drivers/clk/renesas/rzg2l-cpg.c | 554 ++++++- + drivers/clk/renesas/rzg2l-cpg.h | 51 +- + drivers/clk/renesas/rzv2h-cpg.c | 164 +- + drivers/clk/rockchip/clk-cpu.c | 2 +- + drivers/clk/rockchip/clk-ddr.c | 2 +- + drivers/clk/rockchip/clk-gate-grf.c | 2 +- + drivers/clk/rockchip/clk-inverter.c | 2 +- + drivers/clk/rockchip/clk-mmc-phase.c | 2 +- + drivers/clk/rockchip/clk-muxgrf.c | 2 +- + drivers/clk/rockchip/clk-pll.c | 2 +- + drivers/clk/rockchip/clk.c | 2 +- + drivers/clk/samsung/clk-cpu.c | 2 +- + drivers/clk/samsung/clk-exynos-clkout.c | 8 +- + drivers/clk/samsung/clk-pll.c | 2 +- + drivers/clk/socfpga/clk-gate-a10.c | 2 +- + drivers/clk/socfpga/clk-gate-s10.c | 6 +- + drivers/clk/socfpga/clk-gate.c | 2 +- + drivers/clk/socfpga/clk-periph-a10.c | 2 +- + drivers/clk/socfpga/clk-periph-s10.c | 8 +- + drivers/clk/socfpga/clk-periph.c | 2 +- + drivers/clk/socfpga/clk-pll-a10.c | 2 +- + drivers/clk/socfpga/clk-pll-s10.c | 8 +- + drivers/clk/socfpga/clk-pll.c | 2 +- + drivers/clk/spear/clk-aux-synth.c | 2 +- + drivers/clk/spear/clk-frac-synth.c | 2 +- + drivers/clk/spear/clk-gpt-synth.c | 2 +- + drivers/clk/spear/clk-vco-pll.c | 2 +- + drivers/clk/st/clk-flexgen.c | 2 +- + drivers/clk/st/clkgen-fsyn.c | 4 +- + drivers/clk/st/clkgen-pll.c | 2 +- + drivers/clk/starfive/clk-starfive-jh7110-isp.c | 2 +- + drivers/clk/starfive/clk-starfive-jh7110-sys.c | 3 + + drivers/clk/starfive/clk-starfive-jh7110-vout.c | 6 +- + drivers/clk/stm32/clk-stm32mp1.c | 4 +- + drivers/clk/stm32/clk-stm32mp21.c | 4 +- + drivers/clk/sunxi/clk-sun4i-tcon-ch1.c | 2 +- + drivers/clk/tegra/clk-audio-sync.c | 2 +- + drivers/clk/tegra/clk-bpmp.c | 12 +- + drivers/clk/tegra/clk-divider.c | 2 +- + drivers/clk/tegra/clk-periph-fixed.c | 2 +- + drivers/clk/tegra/clk-periph-gate.c | 2 +- + drivers/clk/tegra/clk-periph.c | 2 +- + drivers/clk/tegra/clk-pll-out.c | 2 +- + drivers/clk/tegra/clk-pll.c | 2 +- + drivers/clk/tegra/clk-sdmmc-mux.c | 2 +- + drivers/clk/tegra/clk-super.c | 4 +- + drivers/clk/tegra/clk-tegra-super-cclk.c | 2 +- + drivers/clk/tegra/clk-tegra124-emc.c | 2 +- + drivers/clk/tegra/clk-tegra20-emc.c | 2 +- + drivers/clk/tegra/clk-tegra210-emc.c | 2 +- + drivers/clk/tegra/clk.h | 2 +- + drivers/clk/tenstorrent/atlantis-prcm.c | 35 +- + drivers/clk/ti/adpll.c | 1 + + drivers/clk/ti/clockdomain.c | 2 +- + drivers/clk/uniphier/clk-uniphier-cpugear.c | 2 +- + drivers/clk/uniphier/clk-uniphier-fixed-factor.c | 2 +- + drivers/clk/uniphier/clk-uniphier-fixed-rate.c | 2 +- + drivers/clk/uniphier/clk-uniphier-gate.c | 2 +- + drivers/clk/uniphier/clk-uniphier-mux.c | 2 +- + drivers/clk/ux500/clk-prcc.c | 2 +- + drivers/clk/ux500/clk-prcmu.c | 4 +- + drivers/clk/ux500/clk-sysctrl.c | 2 +- + drivers/clk/versatile/clk-icst.c | 6 +- + drivers/clk/versatile/clk-sp810.c | 2 +- + drivers/clk/versatile/clk-vexpress-osc.c | 2 +- + drivers/clk/x86/clk-pmc-atom.c | 2 +- + drivers/clk/xilinx/clk-xlnx-clock-wizard.c | 18 +- + drivers/clk/xilinx/xlnx_vcu.c | 2 +- + drivers/clk/zte/Kconfig | 28 + + drivers/clk/zte/Makefile | 6 + + drivers/clk/zte/clk-regmap.c | 237 +++ + drivers/clk/zte/clk-zx.c | 192 +++ + drivers/clk/zte/clk-zx.h | 137 ++ + drivers/clk/zte/clk-zx297520v3.c | 1657 ++++++++++++++++++++ + drivers/clk/zte/pll-zx.c | 576 +++++++ + drivers/clk/zynqmp/clk-gate-zynqmp.c | 2 +- + drivers/clk/zynqmp/clk-mux-zynqmp.c | 2 +- + drivers/clk/zynqmp/divider.c | 2 +- + drivers/clk/zynqmp/pll.c | 2 +- + drivers/reset/Kconfig | 10 + + drivers/reset/Makefile | 1 + + drivers/reset/reset-dr1v90.c | 140 ++ + include/dt-bindings/clock/amlogic,a9-scmi-clkc.h | 51 + + include/dt-bindings/clock/anlogic,dr1v90-cru.h | 46 + + include/dt-bindings/clock/nuvoton,ma35d1-clk.h | 3 +- + include/dt-bindings/clock/starfive,jhb100-crg.h | 554 +++++++ + include/dt-bindings/clock/zte,zx297520v3-clk.h | 154 ++ + include/dt-bindings/phy/zte,zx297520v3-topcrm.h | 12 + + include/dt-bindings/reset/anlogic,dr1v90-cru.h | 41 + + include/dt-bindings/reset/starfive,jhb100-crg.h | 189 +++ + include/dt-bindings/reset/zte,zx297520v3-reset.h | 62 + + include/dt-bindings/soc/airoha,scu-ssr.h | 11 + + include/kunit/clk.h | 2 + + include/linux/clk-provider.h | 25 +- + include/linux/clk/tegra.h | 2 +- + include/linux/clk/ti.h | 2 +- + rust/kernel/clk.rs | 15 + + 276 files changed, 8459 insertions(+), 1009 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/anlogic,dr1v90-cru.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/clk-palmas-clk32kg-clocks.txt + create mode 100644 Documentation/devicetree/bindings/clock/clock-nexus-node.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/hi3660-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/hi3670-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/hi6220-clock.txt + create mode 100644 Documentation/devicetree/bindings/clock/hisilicon,clocks.yaml + create mode 100644 Documentation/devicetree/bindings/clock/hisilicon,hi6220-stub-clk.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jhb100-per0crg.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jhb100-per1crg.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jhb100-per2crg.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jhb100-per3crg.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jhb100-sys0crg.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jhb100-sys1crg.yaml + create mode 100644 Documentation/devicetree/bindings/clock/starfive,jhb100-sys2crg.yaml + create mode 100644 Documentation/devicetree/bindings/clock/ti,palmas-clk32kg.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/ti/adpll.txt + delete mode 100644 Documentation/devicetree/bindings/clock/ti/davinci/pll.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/davinci/ti,da850-pll.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/ti/dra7-atl.txt + delete mode 100644 Documentation/devicetree/bindings/clock/ti/fapll.txt + create mode 100644 Documentation/devicetree/bindings/clock/ti/ti,dm814-adpll-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/ti/ti,dm816-fapll-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/ti/ti,dra7-atl-clock.yaml + create mode 100644 Documentation/devicetree/bindings/clock/ti/ti,dra7-atl.yaml + create mode 100644 Documentation/devicetree/bindings/clock/zte,zx297520v3-lspcrm.yaml + create mode 100644 Documentation/devicetree/bindings/clock/zte,zx297520v3-matrixcrm.yaml + create mode 100644 Documentation/devicetree/bindings/clock/zte,zx297520v3-topcrm.yaml + create mode 100644 Documentation/devicetree/bindings/soc/starfive/starfive,jhb100-syscon.yaml + create mode 100644 drivers/clk/anlogic/Kconfig + create mode 100644 drivers/clk/anlogic/Makefile + create mode 100644 drivers/clk/anlogic/cru-dr1v90.c + create mode 100644 drivers/clk/anlogic/cru_dr1.c + create mode 100644 drivers/clk/anlogic/cru_dr1.h + create mode 100644 drivers/clk/davinci/Kconfig + create mode 100644 drivers/clk/kunit_clk_parse_clkspec.dtso + create mode 100644 drivers/clk/renesas/r8a774a3-cpg-mssr.c + create mode 100644 drivers/clk/zte/Kconfig + create mode 100644 drivers/clk/zte/Makefile + create mode 100644 drivers/clk/zte/clk-regmap.c + create mode 100644 drivers/clk/zte/clk-zx.c + create mode 100644 drivers/clk/zte/clk-zx.h + create mode 100644 drivers/clk/zte/clk-zx297520v3.c + create mode 100644 drivers/clk/zte/pll-zx.c + create mode 100644 drivers/reset/reset-dr1v90.c + create mode 100644 include/dt-bindings/clock/amlogic,a9-scmi-clkc.h + create mode 100644 include/dt-bindings/clock/anlogic,dr1v90-cru.h + create mode 100644 include/dt-bindings/clock/starfive,jhb100-crg.h + create mode 100644 include/dt-bindings/clock/zte,zx297520v3-clk.h + create mode 100644 include/dt-bindings/phy/zte,zx297520v3-topcrm.h + create mode 100644 include/dt-bindings/reset/anlogic,dr1v90-cru.h + create mode 100644 include/dt-bindings/reset/starfive,jhb100-crg.h + create mode 100644 include/dt-bindings/reset/zte,zx297520v3-reset.h + create mode 100644 include/dt-bindings/soc/airoha,scu-ssr.h +Merging clk-imx/for-next (52d4d1b26a5bc clk: imx: Fix clock reference leak in imx_obtain_fixed_clock_hw()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (21cbd7ec29930 clk: renesas: r8a78000: Add SGASYNCD8_PERW_BUS) +$ git merge -m Merge branch 'renesas-clk' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging thead-clk/thead-clk-for-next (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'thead-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fustini/linux.git thead-clk/thead-clk-for-next +Already up to date. +Merging tenstorrent-clk/tenstorrent-clk-for-next (c64b54ddb692c MAINTAINERS: Update RISC-V Tenstorrent SoC entry) +$ git merge -m Merge branch 'tenstorrent-clk-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tenstorrent/linux.git tenstorrent-clk/tenstorrent-clk-for-next +Already up to date. +Merging csky/linux-next (abb81e5ce7d99 csky: Fix a4/a5 restoration in syscall trace path) +$ git merge -m Merge branch 'linux-next' of https://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (34f4ce22cf258 KVM: LoongArch: selftests: Enable HW PTW by auto detection method) +$ git merge -m Merge branch 'loongarch-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Merge made by the 'ort' strategy. + arch/loongarch/include/asm/kvm_dmsintc.h | 3 +- + arch/loongarch/include/asm/kvm_host.h | 15 ++++- + arch/loongarch/include/asm/kvm_para.h | 3 + + arch/loongarch/include/asm/kvm_pch_pic.h | 2 +- + arch/loongarch/include/asm/loongarch.h | 5 ++ + arch/loongarch/include/uapi/asm/kvm.h | 1 + + arch/loongarch/include/uapi/asm/kvm_para.h | 1 + + arch/loongarch/kernel/asm-offsets.c | 1 + + arch/loongarch/kernel/cpu-probe.c | 4 ++ + arch/loongarch/kvm/exit.c | 11 ++++ + arch/loongarch/kvm/intc/dmsintc.c | 38 +++--------- + arch/loongarch/kvm/intc/ipi.c | 7 +-- + arch/loongarch/kvm/intc/pch_pic.c | 6 +- + arch/loongarch/kvm/irqfd.c | 4 +- + arch/loongarch/kvm/main.c | 71 ++++++++++++++++++++-- + arch/loongarch/kvm/mmu.c | 25 +++++++- + arch/loongarch/kvm/switch.S | 5 +- + arch/loongarch/kvm/tlb.c | 23 ++++++- + arch/loongarch/kvm/vcpu.c | 15 ++++- + arch/loongarch/kvm/vm.c | 2 + + .../selftests/kvm/include/loongarch/processor.h | 3 + + .../selftests/kvm/lib/loongarch/processor.c | 16 ++++- + 22 files changed, 197 insertions(+), 64 deletions(-) +Merging m68k/for-next (af32c3cb72529 m68k: defconfig: Enable ATARI_SVETHLANA and ETHOC) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Merge made by the 'ort' strategy. + arch/m68k/Kconfig.devices | 12 ++++++ + arch/m68k/apollo/dn_ints.c | 6 +++ + arch/m68k/atari/config.c | 75 ++++++++++++++++++++++++++++++++++++ + arch/m68k/configs/amiga_defconfig | 4 ++ + arch/m68k/configs/apollo_defconfig | 3 ++ + arch/m68k/configs/atari_defconfig | 5 +++ + arch/m68k/configs/bvme6000_defconfig | 3 ++ + arch/m68k/configs/hp300_defconfig | 3 ++ + arch/m68k/configs/mac_defconfig | 3 ++ + arch/m68k/configs/multi_defconfig | 6 +++ + arch/m68k/configs/mvme147_defconfig | 3 ++ + arch/m68k/configs/mvme16x_defconfig | 3 ++ + arch/m68k/configs/q40_defconfig | 3 ++ + arch/m68k/configs/sun3_defconfig | 3 ++ + arch/m68k/configs/sun3x_defconfig | 3 ++ + arch/m68k/include/asm/atariints.h | 2 +- + arch/m68k/include/asm/irq.h | 6 +-- + arch/m68k/include/asm/serial.h | 21 +++------- + drivers/zorro/zorro.c | 5 +-- + 19 files changed, 145 insertions(+), 24 deletions(-) +Merging m68knommu/for-next (cffad6e71539b m68k: coldfire: Add RNG support for MCF54418) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/68000/entry.S | 3 +- + arch/m68k/coldfire/device.c | 28 +++++++++++++++++++ + arch/m68k/coldfire/entry.S | 3 +- + arch/m68k/coldfire/m5407.c | 5 ++++ + arch/m68k/coldfire/m5441x.c | 2 +- + arch/m68k/coldfire/reset.c | 2 +- + arch/m68k/configs/stmark2_defconfig | 2 ++ + arch/m68k/include/asm/m53xxacr.h | 2 +- + arch/m68k/include/asm/m5441xsim.h | 16 +++++++++++ + arch/m68k/include/asm/quicc_simple.h | 53 ------------------------------------ + drivers/char/hw_random/Kconfig | 3 +- + drivers/char/hw_random/imx-rngc.c | 7 +++++ + 12 files changed, 67 insertions(+), 59 deletions(-) + delete mode 100644 arch/m68k/include/asm/quicc_simple.h +Merging microblaze/next (6b125c73aaa0d microblaze: Enable xilinx dmas and axi emac drivers) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Merge made by the 'ort' strategy. + arch/microblaze/Kconfig | 9 + + arch/microblaze/Makefile | 8 +- + arch/microblaze/configs/mmu_defconfig | 2 + + arch/microblaze/include/asm/entry.h | 13 + + arch/microblaze/include/asm/processor.h | 2 +- + arch/microblaze/include/asm/uaccess.h | 3 +- + arch/microblaze/kernel/cpu/cpuinfo-pvr-full.c | 2 +- + arch/microblaze/kernel/cpu/cpuinfo-static.c | 2 +- + arch/microblaze/kernel/cpu/cpuinfo.c | 1 + + arch/microblaze/kernel/entry.S | 348 ++++++++++++----------- + arch/microblaze/kernel/hw_exception_handler.S | 5 + + arch/microblaze/kernel/process.c | 5 +- + arch/microblaze/kernel/ptrace.c | 3 + + arch/microblaze/kernel/reset.c | 22 ++ + arch/microblaze/kernel/signal.c | 26 ++ + arch/microblaze/kernel/syscalls/syscall.tbl | 2 +- + tools/testing/kunit/qemu_configs/microblazebe.py | 24 ++ + tools/testing/kunit/qemu_configs/microblazeel.py | 27 ++ + 18 files changed, 328 insertions(+), 176 deletions(-) + create mode 100644 tools/testing/kunit/qemu_configs/microblazebe.py + create mode 100644 tools/testing/kunit/qemu_configs/microblazeel.py +Merging mips/mips-next (bfe97f12a0a64 MIPS: octeon: Add detection of UBNT Edgeroute Lite devices) +$ git merge -m Merge branch 'mips-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-firmware-lefi-boardinfo | 21 +++--- + arch/mips/Makefile | 32 +++++---- + arch/mips/alchemy/common/clock.c | 8 +-- + arch/mips/boot/dts/cavium-octeon/Makefile | 1 + + arch/mips/boot/dts/pic32/pic32mzda.dtsi | 2 - + arch/mips/cavium-octeon/Kconfig | 5 ++ + arch/mips/cavium-octeon/Makefile | 2 + + arch/mips/cavium-octeon/board-ubnt.c | 16 +++++ + arch/mips/cavium-octeon/dma-octeon.c | 2 +- + arch/mips/cavium-octeon/executive/cvmx-helper.c | 20 ++++-- + arch/mips/cavium-octeon/executive/cvmx-l2c.c | 31 ++++---- + arch/mips/cavium-octeon/flash_setup.c | 2 +- + arch/mips/cavium-octeon/octeon-memcpy.S | 2 +- + arch/mips/cavium-octeon/setup.c | 51 ++++++++++--- + arch/mips/configs/decstation_64_defconfig | 44 +++++------- + arch/mips/dec/setup.c | 4 +- + arch/mips/generic/board-jaguar2.its.S | 2 - + arch/mips/generic/board-serval.its.S | 1 - + arch/mips/include/asm/amon.h | 12 ---- + arch/mips/include/asm/cmp.h | 10 --- + arch/mips/include/asm/dec/reset.h | 1 + + arch/mips/include/asm/gt64120.h | 2 - + arch/mips/include/asm/mach-loongson64/boot_param.h | 2 +- + arch/mips/include/asm/mips-boards/sead3-addr.h | 83 ---------------------- + arch/mips/lib/memcpy.S | 2 +- + arch/mips/mm/mmap.c | 6 +- + arch/mips/mm/tlb-r4k.c | 21 ++++-- + arch/mips/n64/init.c | 2 +- + arch/mips/rb532/gpio.c | 7 +- + 29 files changed, 180 insertions(+), 214 deletions(-) + create mode 100644 arch/mips/cavium-octeon/board-ubnt.c + delete mode 100644 arch/mips/include/asm/amon.h + delete mode 100644 arch/mips/include/asm/cmp.h + delete mode 100644 arch/mips/include/asm/mips-boards/sead3-addr.h +Merging openrisc/for-next (6620f5e8c11c4 openrisc: drop unneeded semicolon) +$ git merge -m Merge branch 'for-next' of https://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (a5f6df25261b3 parisc: fix typos in comments in parport.c) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/include/asm/pdcpat.h | 4 ++-- + arch/parisc/include/asm/special_insns.h | 2 +- + arch/parisc/include/uapi/asm/mman.h | 2 +- + arch/parisc/lib/memcpy.c | 2 +- + drivers/parisc/ccio-dma.c | 2 +- + drivers/parisc/dino.c | 2 +- + drivers/parisc/pdc_stable.c | 2 +- + drivers/parisc/sba_iommu.c | 2 +- + drivers/parport/parport_gsc.c | 2 +- + 9 files changed, 10 insertions(+), 10 deletions(-) +Merging powerpc/next (129f5d395fd66 powerpc/numa: Support coregroup on PowerNV) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/powerpc/net/bpf_jit_comp.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/ppc-memtrace | 2 +- + Documentation/arch/powerpc/papr_hcalls.rst | 16 +-- + MAINTAINERS | 2 +- + arch/powerpc/boot/dts/ac14xx.dts | 13 --- + arch/powerpc/boot/dts/mpc5121.dtsi | 6 +- + arch/powerpc/boot/dts/pdm360ng.dts | 8 +- + arch/powerpc/include/asm/hardirq.h | 31 +++--- + arch/powerpc/include/asm/interrupt.h | 7 +- + arch/powerpc/include/asm/kasan.h | 15 --- + arch/powerpc/include/asm/string.h | 21 +--- + arch/powerpc/include/asm/topology.h | 15 ++- + arch/powerpc/kernel/cputable.c | 14 +-- + arch/powerpc/kernel/dbell.c | 2 +- + arch/powerpc/kernel/irq.c | 131 +++++++++++++------------ + arch/powerpc/kernel/prom_init.c | 10 +- + arch/powerpc/kernel/prom_init_check.sh | 15 +-- + arch/powerpc/kernel/syscall.c | 6 +- + arch/powerpc/kernel/sysfs.c | 4 +- + arch/powerpc/kernel/time.c | 6 +- + arch/powerpc/kernel/trace/ftrace_entry.S | 6 ++ + arch/powerpc/kernel/traps.c | 11 +-- + arch/powerpc/kernel/watchdog.c | 2 +- + arch/powerpc/kvm/book3s_hv.c | 76 +++++++------- + arch/powerpc/kvm/book3s_paired_singles.c | 7 +- + arch/powerpc/kvm/book3s_xive.c | 4 +- + arch/powerpc/kvm/guest-state-buffer.c | 2 +- + arch/powerpc/kvm/trace_book3s.h | 4 +- + arch/powerpc/lib/copy_32.S | 10 +- + arch/powerpc/lib/mem_64.S | 7 +- + arch/powerpc/lib/memcpy_64.S | 4 +- + arch/powerpc/lib/sstep.c | 111 +++++++++++---------- + arch/powerpc/mm/numa.c | 85 ++++++++++++---- + arch/powerpc/net/bpf_jit.h | 20 +++- + arch/powerpc/net/bpf_jit_comp.c | 100 ++++++++++++++----- + arch/powerpc/net/bpf_jit_comp32.c | 7 +- + arch/powerpc/net/bpf_jit_comp64.c | 15 +-- + arch/powerpc/platforms/512x/Kconfig | 3 +- + arch/powerpc/platforms/512x/Makefile | 1 - + arch/powerpc/platforms/512x/mpc512x_generic.c | 1 + + arch/powerpc/platforms/512x/pdm360ng.c | 126 ------------------------ + arch/powerpc/platforms/ps3/interrupt.c | 22 ++--- + arch/powerpc/platforms/pseries/iommu.c | 67 ++++++++----- + arch/powerpc/platforms/pseries/plpks-sysfs.c | 20 +++- + arch/powerpc/platforms/pseries/plpks.c | 51 +++++----- + arch/powerpc/platforms/pseries/plpks_sed_ops.c | 12 ++- + arch/powerpc/platforms/pseries/rtas-fadump.c | 18 +++- + 46 files changed, 544 insertions(+), 572 deletions(-) + delete mode 100644 arch/powerpc/platforms/512x/pdm360ng.c +Merging risc-v/for-next (a5ae1bf65cee8 riscv: mm: unexport _pgtable_l4_enabled and _pgtable_l5_enabled) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/Kconfig.errata +Auto-merging arch/riscv/boot/dts/spacemit/k3.dtsi +Auto-merging arch/riscv/include/asm/pgtable-64.h +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/riscv/mm/init.c +Merge made by the 'ort' strategy. + Documentation/arch/riscv/hwprobe.rst | 8 + + .../devicetree/bindings/riscv/extensions.yaml | 54 +++++ + arch/riscv/Kconfig | 51 ++--- + arch/riscv/Kconfig.errata | 18 +- + arch/riscv/boot/dts/sophgo/sg2044-cpus.dtsi | 128 ++++++------ + arch/riscv/boot/dts/spacemit/k1.dtsi | 80 ++++---- + arch/riscv/boot/dts/spacemit/k3.dtsi | 48 ++--- + arch/riscv/errata/mips/Makefile | 6 + + arch/riscv/errata/mips/errata.c | 55 +++-- + arch/riscv/include/asm/alternative-macros.h | 24 --- + arch/riscv/include/asm/alternative.h | 12 +- + arch/riscv/include/asm/cpufeature-macros.h | 10 +- + arch/riscv/include/asm/cpufeature.h | 8 +- + arch/riscv/include/asm/errata_list.h | 37 ++++ + arch/riscv/include/asm/errata_list_vendors.h | 5 +- + arch/riscv/include/asm/hwcap.h | 4 + + arch/riscv/include/asm/insn.h | 2 +- + arch/riscv/include/asm/jump_label.h | 26 +++ + arch/riscv/include/asm/kexec.h | 13 ++ + arch/riscv/include/asm/kvm_nacl.h | 4 +- + arch/riscv/include/asm/pci.h | 5 + + arch/riscv/include/asm/pgalloc.h | 14 +- + arch/riscv/include/asm/pgtable-32.h | 4 +- + arch/riscv/include/asm/pgtable-64.h | 74 +++++-- + arch/riscv/include/asm/pgtable.h | 4 +- + arch/riscv/include/asm/processor.h | 7 +- + arch/riscv/include/asm/sbi.h | 81 +++++++- + arch/riscv/include/asm/vector.h | 8 +- + arch/riscv/include/asm/vendor_extensions.h | 18 +- + arch/riscv/include/asm/vmalloc.h | 5 +- + arch/riscv/include/uapi/asm/hwcap.h | 1 + + arch/riscv/include/uapi/asm/hwprobe.h | 2 + + arch/riscv/kernel/Makefile | 3 +- + arch/riscv/kernel/alternative.c | 24 ++- + arch/riscv/kernel/cpu.c | 4 +- + arch/riscv/kernel/cpu_ops_sbi.c | 6 +- + arch/riscv/kernel/cpufeature.c | 91 ++++++++- + arch/riscv/kernel/crash.c | 113 +++++++++++ + arch/riscv/kernel/head.S | 4 +- + arch/riscv/kernel/kernel_mode_vector.c | 9 +- + arch/riscv/kernel/paravirt.c | 2 +- + arch/riscv/kernel/process.c | 12 ++ + arch/riscv/kernel/sbi.c | 57 +++--- + arch/riscv/kernel/sbi_ecall.c | 40 ++-- + arch/riscv/kernel/smp.c | 1 - + arch/riscv/kernel/suspend.c | 4 +- + arch/riscv/kernel/sys_hwprobe.c | 2 + + arch/riscv/kernel/usercfi.c | 20 +- + arch/riscv/kvm/nacl.c | 7 +- + arch/riscv/lib/uaccess.S | 61 +++--- + arch/riscv/mm/init.c | 79 +++++--- + arch/riscv/mm/kasan_init.c | 20 +- + arch/riscv/mm/pgtable.c | 4 +- + arch/riscv/mm/ptdump.c | 4 +- + drivers/acpi/riscv/cppc.c | 4 +- + drivers/perf/riscv_pmu_sbi.c | 43 ++-- + tools/testing/selftests/riscv/vector/Makefile | 6 +- + .../selftests/riscv/vector/v_uaccess_stress.c | 221 +++++++++++++++++++++ + 58 files changed, 1171 insertions(+), 486 deletions(-) + create mode 100644 arch/riscv/kernel/crash.c + create mode 100644 tools/testing/selftests/riscv/vector/v_uaccess_stress.c +Merging riscv-dt/riscv-dt-for-next (2186ec5f59c23 riscv: dts: starfive: Correct pwm nodes) +$ git merge -m Merge branch 'riscv-dt-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Auto-merging MAINTAINERS +Auto-merging arch/riscv/boot/dts/starfive/jh7110-common.dtsi +Auto-merging arch/riscv/boot/dts/starfive/jh7110.dtsi +Merge made by the 'ort' strategy. + MAINTAINERS | 3 +- + arch/riscv/boot/dts/starfive/jh7100-common.dtsi | 28 +++++++-- + arch/riscv/boot/dts/starfive/jh7100.dtsi | 67 +++++++++++++++++++++- + arch/riscv/boot/dts/starfive/jh7110-common.dtsi | 27 +++++++-- + arch/riscv/boot/dts/starfive/jh7110-milkv-mars.dts | 6 +- + .../boot/dts/starfive/jh7110-milkv-marscm.dtsi | 6 +- + .../boot/dts/starfive/jh7110-pine64-star64.dts | 6 +- + .../jh7110-starfive-visionfive-2-lite.dtsi | 6 +- + .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 6 +- + arch/riscv/boot/dts/starfive/jh7110.dtsi | 67 +++++++++++++++++++++- + 10 files changed, 200 insertions(+), 22 deletions(-) +Merging riscv-soc/riscv-soc-for-next (3160b4a8aeea9 Merge branches 'riscv-soc-drivers-for-next' and 'cache-for-next' into riscv-soc-for-next) + 6f77194e1147d ("soc: mpfs: use kref cleanup on probe failure") + b2f3a170ae968 ("cache: Make cpu_cache_invalidate_memregion() error out if there are no handlers") +$ git merge -m Merge branch 'riscv-soc-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Auto-merging drivers/soc/Kconfig +CONFLICT (content): Merge conflict in drivers/soc/Kconfig +Auto-merging drivers/soc/Makefile +CONFLICT (content): Merge conflict in drivers/soc/Makefile +Resolved 'drivers/soc/Kconfig' using previous resolution. +Resolved 'drivers/soc/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 633d461fd333b] Merge branch 'riscv-soc-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/cache/hisi_soc_hha.c | 2 +- + drivers/cache/sifive_ccache.c | 2 +- + drivers/firmware/microchip/mpfs-auto-update.c | 4 +- + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/starfive/Kconfig | 6 ++ + drivers/soc/starfive/Makefile | 2 + + drivers/soc/starfive/socinfo/Kconfig | 13 ++++ + drivers/soc/starfive/socinfo/Makefile | 2 + + drivers/soc/starfive/socinfo/jhb100-socinfo.c | 105 ++++++++++++++++++++++++++ + 10 files changed, 134 insertions(+), 4 deletions(-) + create mode 100644 drivers/soc/starfive/Kconfig + create mode 100644 drivers/soc/starfive/Makefile + create mode 100644 drivers/soc/starfive/socinfo/Kconfig + create mode 100644 drivers/soc/starfive/socinfo/Makefile + create mode 100644 drivers/soc/starfive/socinfo/jhb100-socinfo.c +Merging s390/for-next (2906e5c9e5a47 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/s390/configs/debug_defconfig +Auto-merging arch/s390/configs/defconfig +Auto-merging arch/s390/kernel/traps.c +CONFLICT (content): Merge conflict in arch/s390/kernel/traps.c +Auto-merging arch/s390/kvm/s390/gaccess.c +Auto-merging arch/s390/net/bpf_jit_comp.c +Recorded preimage for 'arch/s390/kernel/traps.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/s390/kernel/traps.c'. +[master bdbfc483a54e7] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/s390/appldata/appldata_base.c | 171 +++++---- + arch/s390/boot/ipl_parm.c | 19 +- + arch/s390/boot/pgm_check.c | 14 +- + arch/s390/boot/physmem_info.c | 18 +- + arch/s390/boot/startup.c | 12 +- + arch/s390/configs/debug_defconfig | 14 + + arch/s390/configs/defconfig | 14 + + arch/s390/hypfs/hypfs_vm.c | 6 +- + arch/s390/include/asm/Kbuild | 1 + + arch/s390/include/asm/ap.h | 12 +- + arch/s390/include/asm/asm-extable.h | 28 +- + arch/s390/include/asm/cpu_mf.h | 18 +- + arch/s390/include/asm/diag.h | 5 +- + arch/s390/include/asm/diag288.h | 6 +- + arch/s390/include/asm/ebcdic.h | 6 + + arch/s390/include/asm/entry-percpu.h | 71 +--- + arch/s390/include/asm/extable.h | 25 +- + arch/s390/include/asm/fpu-insn.h | 6 +- + arch/s390/include/asm/futex.h | 17 +- + arch/s390/include/asm/idals.h | 9 +- + arch/s390/include/asm/lowcore.h | 5 +- + arch/s390/include/asm/percpu.h | 401 ++++++++++++++------- + arch/s390/include/asm/ptrace.h | 6 + + arch/s390/include/asm/uaccess.h | 45 +-- + arch/s390/include/asm/vtime.h | 2 + + arch/s390/include/asm/vtimer.h | 30 -- + arch/s390/include/asm/word-at-a-time.h | 5 +- + arch/s390/kernel/cert_store.c | 6 +- + arch/s390/kernel/diag/diag.c | 12 +- + arch/s390/kernel/dis.c | 39 +- + arch/s390/kernel/dumpstack.c | 7 +- + arch/s390/kernel/early.c | 26 +- + arch/s390/kernel/ebcdic.c | 40 +- + arch/s390/kernel/entry.S | 17 +- + arch/s390/kernel/entry.h | 4 + + arch/s390/kernel/hiperdispatch.c | 2 +- + arch/s390/kernel/ipl.c | 6 +- + arch/s390/kernel/irq.c | 10 +- + arch/s390/kernel/kprobes.c | 3 + + arch/s390/kernel/nmi.c | 4 +- + arch/s390/kernel/perf_cpum_cf.c | 19 +- + arch/s390/kernel/process.c | 1 - + arch/s390/kernel/ptrace.c | 9 +- + arch/s390/kernel/smp.c | 2 +- + arch/s390/kernel/text_amode31.S | 34 +- + arch/s390/kernel/time.c | 2 +- + arch/s390/kernel/traps.c | 42 ++- + arch/s390/kernel/uprobes.c | 2 +- + arch/s390/kernel/vtime.c | 212 +---------- + arch/s390/kvm/s390/gaccess.c | 11 +- + arch/s390/lib/spinlock.c | 4 + + arch/s390/lib/uaccess.c | 29 +- + arch/s390/mm/extable.c | 6 +- + arch/s390/mm/pfault.c | 12 +- + arch/s390/net/bpf_jit_comp.c | 78 ++-- + arch/s390/pci/pci_clp.c | 12 +- + arch/s390/pci/pci_insn.c | 36 +- + arch/s390/pci/pci_irq.c | 109 +++--- + arch/s390/pci/pci_mmio.c | 28 +- + arch/s390/tools/.gitignore | 1 + + arch/s390/tools/Makefile | 16 +- + .../s390/tools/{gen_facilities.c => gen_bitmaps.c} | 103 +++++- + arch/s390/tools/gen_opcode_table.c | 23 +- + drivers/s390/block/dasd_diag.c | 6 +- + drivers/s390/char/diag_ftp.c | 6 +- + drivers/s390/char/fs3270.c | 3 + + drivers/s390/char/keyboard.c | 6 +- + drivers/s390/char/sclp.h | 7 +- + drivers/s390/char/sclp_vt220.c | 87 ++++- + drivers/s390/char/vmcp.c | 4 +- + drivers/s390/cio/chsc.c | 20 +- + drivers/s390/cio/chsc_sch.c | 300 ++++++--------- + drivers/s390/cio/cmf.c | 11 +- + drivers/s390/cio/ioasm.c | 24 +- + drivers/s390/cio/qdio.h | 2 +- + drivers/s390/cio/qdio_main.c | 23 +- + drivers/s390/cio/qdio_setup.c | 14 +- + drivers/s390/cio/qdio_thinint.c | 2 +- + drivers/s390/cio/scm.c | 7 +- + drivers/s390/crypto/zcrypt_api.c | 35 +- + drivers/s390/crypto/zcrypt_ccamisc.c | 22 +- + drivers/s390/crypto/zcrypt_msgtype50.c | 95 +++-- + drivers/s390/crypto/zcrypt_msgtype6.c | 208 ++++++++--- + 83 files changed, 1525 insertions(+), 1290 deletions(-) + delete mode 100644 arch/s390/include/asm/vtimer.h + rename arch/s390/tools/{gen_facilities.c => gen_bitmaps.c} (65%) +Merging sh/for-next (f3b8138e148b8 sh: sh7785lcr: Register the PCA9564 controller as I2C bus 0) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Auto-merging arch/sh/configs/migor_defconfig +Auto-merging arch/sh/configs/sdk7786_defconfig +Auto-merging arch/sh/configs/shx3_defconfig +Merge made by the 'ort' strategy. + arch/sh/boards/board-sh7785lcr.c | 2 +- + arch/sh/boards/mach-ecovec24/setup.c | 38 ++---- + arch/sh/boards/mach-x3proto/gpio.c | 15 ++- + arch/sh/boards/mach-x3proto/setup.c | 165 +++++++++++++-------------- + arch/sh/boot/dts/Makefile | 2 +- + arch/sh/configs/migor_defconfig | 2 +- + arch/sh/configs/sdk7786_defconfig | 2 +- + arch/sh/configs/shx3_defconfig | 2 +- + arch/sh/include/asm/uaccess_32.h | 8 +- + arch/sh/include/mach-x3proto/mach/hardware.h | 2 + + drivers/sh/intc/core.c | 11 +- + 11 files changed, 119 insertions(+), 130 deletions(-) +Merging sparc/for-next (a9e88d617a253 sparc32: remove redundant memset in srmmu_nocache_init()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/alarsson/linux-sparc.git sparc/for-next +Auto-merging arch/sparc/Kconfig +Auto-merging arch/sparc/include/asm/pgtable_32.h +Auto-merging arch/sparc/mm/srmmu.c +Merge made by the 'ort' strategy. + arch/sparc/Kconfig | 2 +- + arch/sparc/include/asm/highmem.h | 3 - + arch/sparc/include/asm/leon.h | 2 +- + arch/sparc/include/asm/page_32.h | 16 --- + arch/sparc/include/asm/pgtable_32.h | 3 +- + arch/sparc/include/asm/pgtsrmmu.h | 1 - + arch/sparc/include/asm/seccomp.h | 15 +++ + arch/sparc/include/asm/syscall.h | 11 +- + arch/sparc/include/asm/thread_info_64.h | 15 +-- + arch/sparc/kernel/entry.h | 2 +- + arch/sparc/kernel/head_32.S | 2 +- + arch/sparc/kernel/nmi.c | 2 +- + arch/sparc/kernel/ptrace_64.c | 28 +++-- + arch/sparc/kernel/setup_32.c | 91 +++++++++++--- + arch/sparc/kernel/syscalls.S | 28 ++++- + arch/sparc/kernel/time_64.c | 6 +- + arch/sparc/kernel/tsb.S | 24 +++- + arch/sparc/kernel/urtt_fill.S | 10 ++ + arch/sparc/mm/fault_64.c | 9 ++ + arch/sparc/mm/init_32.c | 167 +------------------------- + arch/sparc/mm/leon_mm.c | 1 + + arch/sparc/mm/srmmu.c | 70 ++++------- + arch/sparc/mm/viking.S | 6 + + arch/sparc/prom/memory.c | 51 ++------ + tools/testing/selftests/seccomp/seccomp_bpf.c | 36 ++++++ + 25 files changed, 262 insertions(+), 339 deletions(-) +Merging uml/next (4ad423aa21084 um: place large BSS inputs in an output section) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Auto-merging arch/um/Kconfig +CONFLICT (content): Merge conflict in arch/um/Kconfig +Auto-merging lib/Kconfig.debug +Resolved 'arch/um/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master dc7bf241c0b57] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/index.rst | 1 + + Documentation/virt/uml/nommu-uml.rst | 54 ++++++++ + arch/um/Kconfig | 38 +++-- + arch/um/Makefile | 7 +- + arch/um/drivers/Kconfig | 3 + + arch/um/drivers/cow_user.c | 34 ++++- + arch/um/drivers/mconsole_kern.c | 14 +- + arch/um/drivers/vector_kern.c | 37 +++-- + arch/um/drivers/vector_user.c | 3 + + arch/um/drivers/virtio_pcidev.c | 19 ++- + arch/um/drivers/virtio_uml.c | 26 ++-- + arch/um/include/asm/common.lds.S | 2 + + arch/um/include/asm/futex.h | 53 +++++++ + arch/um/include/asm/mmu.h | 8 ++ + arch/um/include/asm/mmu_context.h | 2 + + arch/um/include/asm/perf_event.h | 7 + + arch/um/include/asm/pgtable.h | 25 ++-- + arch/um/include/asm/ptrace-generic.h | 6 + + arch/um/include/asm/tlbflush.h | 20 +++ + arch/um/include/asm/uaccess.h | 6 +- + arch/um/include/shared/as-layout.h | 3 +- + arch/um/include/shared/kern_util.h | 3 +- + arch/um/include/shared/longjmp.h | 3 +- + arch/um/include/shared/os.h | 6 +- + arch/um/include/shared/skas/stub-data.h | 9 ++ + arch/um/kernel/Makefile | 6 +- + arch/um/kernel/dyn.lds.S | 9 +- + arch/um/kernel/mem-pgtable.c | 55 ++++++++ + arch/um/kernel/mem.c | 47 ++----- + arch/um/kernel/physmem.c | 7 + + arch/um/kernel/process.c | 23 +++- + arch/um/kernel/skas/Makefile | 16 ++- + arch/um/kernel/skas/mmu.c | 25 ++++ + arch/um/kernel/skas/nommu.c | 91 ++++++++++++ + arch/um/kernel/skas/process.c | 32 +---- + arch/um/kernel/skas/syscall.c | 5 +- + arch/um/kernel/skas/uaccess.c | 134 +++++++----------- + arch/um/kernel/smp.c | 3 +- + arch/um/kernel/sysrq.c | 2 +- + arch/um/kernel/time.c | 3 +- + arch/um/kernel/tlb.c | 7 - + arch/um/kernel/trap-mmu.c | 237 ++++++++++++++++++++++++++++++++ + arch/um/kernel/trap-nommu.c | 13 ++ + arch/um/kernel/trap.c | 219 ----------------------------- + arch/um/kernel/um_arch.c | 11 +- + arch/um/kernel/uml.lds.S | 11 +- + arch/um/os-Linux/main.c | 17 ++- + arch/um/os-Linux/signal.c | 2 +- + arch/um/os-Linux/skas/process.c | 11 +- + arch/x86/um/Makefile | 3 + + arch/x86/um/asm/elf.h | 8 +- + arch/x86/um/asm/required-features.h | 9 -- + arch/x86/um/vdso/vma.c | 13 +- + fs/Kconfig.binfmt | 2 +- + lib/Kconfig.debug | 10 +- + lib/kunit/Kconfig | 2 +- + 56 files changed, 906 insertions(+), 516 deletions(-) + create mode 100644 Documentation/virt/uml/nommu-uml.rst + create mode 100644 arch/um/include/asm/perf_event.h + create mode 100644 arch/um/kernel/mem-pgtable.c + create mode 100644 arch/um/kernel/skas/nommu.c + create mode 100644 arch/um/kernel/trap-mmu.c + create mode 100644 arch/um/kernel/trap-nommu.c + delete mode 100644 arch/x86/um/asm/required-features.h +Merging xtensa/xtensa-for-next (28722ed2527aa xtensa: time: Fix clk reference leak in calibrate_ccount()) +$ git merge -m Merge branch 'xtensa-for-next' of https://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/include/asm/atomic.h | 13 ------------- + arch/xtensa/include/uapi/asm/mman.h | 2 +- + arch/xtensa/kernel/entry.S | 2 +- + arch/xtensa/kernel/time.c | 1 + + arch/xtensa/kernel/vectors.S | 2 +- + arch/xtensa/mm/init.c | 2 +- + 6 files changed, 5 insertions(+), 17 deletions(-) +Merging fs-next (b594b4c367cfb Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git) +$ git merge -m Merge branch 'fs-next' of linux-next fs-next +Auto-merging .mailmap +Auto-merging CREDITS +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging MAINTAINERS +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging fs/Kconfig +Auto-merging fs/buffer.c +Auto-merging fs/ceph/addr.c +Auto-merging fs/coredump.c +CONFLICT (content): Merge conflict in fs/coredump.c +Auto-merging fs/crypto/crypto.c +Auto-merging fs/erofs/data.c +Auto-merging fs/f2fs/compress.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +CONFLICT (content): Merge conflict in fs/f2fs/f2fs.h +Auto-merging fs/f2fs/segment.c +Auto-merging fs/fat/fat.h +Auto-merging fs/fat/file.c +Auto-merging fs/fat/misc.c +Auto-merging fs/fat/namei_msdos.c +Auto-merging fs/fat/namei_vfat.c +Auto-merging fs/fuse/dax.c +CONFLICT (content): Merge conflict in fs/fuse/dax.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/nfs/write.c +Auto-merging fs/ocfs2/journal.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/ocfs2/quota_local.c +Auto-merging fs/ocfs2/xattr.c +Auto-merging fs/proc/base.c +Auto-merging fs/proc/internal.h +Auto-merging fs/proc/vmcore.c +Auto-merging fs/ubifs/file.c +Auto-merging fs/xfs/libxfs/xfs_btree.c +CONFLICT (content): Merge conflict in fs/xfs/libxfs/xfs_btree.c +Auto-merging fs/xfs/xfs_platform.h +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/sched.h +Auto-merging init/Kconfig +Auto-merging ipc/mqueue.c +Auto-merging kernel/Makefile +Auto-merging kernel/fork.c +Auto-merging mm/secretmem.c +Auto-merging mm/shmem.c +Auto-merging mm/userfaultfd.c +Auto-merging net/bluetooth/l2cap_sock.c +Auto-merging security/selinux/selinuxfs.c +Resolved 'fs/coredump.c' using previous resolution. +Resolved 'fs/f2fs/f2fs.h' using previous resolution. +Resolved 'fs/fuse/dax.c' using previous resolution. +Resolved 'fs/xfs/libxfs/xfs_btree.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 21e5802c20143] Merge branch 'fs-next' of linux-next +$ git diff -M --stat --summary HEAD^.. + .mailmap | 1 + + CREDITS | 2 +- + Documentation/ABI/testing/sysfs-fs-f2fs | 41 +- + Documentation/admin-guide/binfmt-misc.rst | 3 + + Documentation/admin-guide/kernel-parameters.txt | 16 + + Documentation/admin-guide/nfs/pnfs-scsi-server.rst | 2 +- + Documentation/bpf/kfuncs.rst | 74 + + Documentation/bpf/signing.rst | 283 ++- + Documentation/core-api/folio_queue.rst | 209 --- + Documentation/core-api/index.rst | 1 - + Documentation/filesystems/befs.rst | 4 +- + Documentation/filesystems/bfs.rst | 60 - + Documentation/filesystems/erofs.rst | 7 + + Documentation/filesystems/exfat.rst | 117 ++ + Documentation/filesystems/index.rst | 2 +- + Documentation/filesystems/locking.rst | 24 +- + Documentation/filesystems/netfs_library.rst | 9 +- + Documentation/filesystems/nfs/index.rst | 1 + + Documentation/filesystems/nfs/keyring.rst | 69 + + Documentation/filesystems/ntfs.rst | 60 + + Documentation/filesystems/ntfs3.rst | 23 + + Documentation/filesystems/porting.rst | 25 +- + Documentation/filesystems/proc.rst | 4 + + Documentation/filesystems/smb/ksmbd.rst | 14 +- + Documentation/filesystems/squashfs.rst | 6 +- + Documentation/filesystems/vfs.rst | 30 +- + .../filesystems/xfs/xfs-online-fsck-design.rst | 13 +- + Documentation/netlink/specs/nfsd.yaml | 55 +- + Documentation/security/keys/core.rst | 13 + + Documentation/sunrpc/xdr/nfs2.x | 254 +++ + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + MAINTAINERS | 28 +- + arch/alpha/include/uapi/asm/socket.h | 4 + + arch/arm64/net/bpf_jit_comp.c | 5 + + arch/mips/configs/malta_defconfig | 1 - + arch/mips/configs/malta_kvm_defconfig | 1 - + arch/mips/configs/maltaup_xpa_defconfig | 1 - + arch/mips/configs/rm200_defconfig | 1 - + arch/mips/include/uapi/asm/socket.h | 4 + + arch/parisc/include/uapi/asm/socket.h | 4 + + arch/powerpc/Kconfig | 1 - + arch/powerpc/configs/fsl-emb-nonhw.config | 1 - + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/powerpc/include/asm/elf.h | 6 - + arch/powerpc/include/asm/spu.h | 3 - + arch/powerpc/platforms/cell/Kconfig | 1 - + arch/powerpc/platforms/cell/spu_syscalls.c | 20 - + arch/powerpc/platforms/cell/spufs/Makefile | 1 - + arch/powerpc/platforms/cell/spufs/coredump.c | 183 -- + arch/powerpc/platforms/cell/spufs/file.c | 114 -- + arch/powerpc/platforms/cell/spufs/inode.c | 14 +- + arch/powerpc/platforms/cell/spufs/spufs.h | 12 - + arch/powerpc/platforms/cell/spufs/syscalls.c | 4 - + arch/riscv/net/bpf_jit.h | 4 + + arch/riscv/net/bpf_jit_comp64.c | 109 +- + arch/riscv/net/bpf_jit_core.c | 7 + + arch/riscv/net/bpf_timed_may_goto.S | 8 +- + arch/sparc/include/uapi/asm/socket.h | 4 + + arch/x86/Kconfig | 1 + + arch/x86/net/bpf_jit_comp.c | 295 ++- + block/bio-integrity-fs.c | 15 +- + block/bio-integrity.c | 1 + + block/bio.c | 219 +-- + block/blk-map.c | 2 +- + block/blk-settings.c | 6 + + block/fops.c | 3 +- + block/partitions/efi.h | 8 +- + drivers/acpi/acpi_configfs.c | 2 +- + drivers/android/binder/rust_binderfs.c | 2 +- + drivers/android/binderfs.c | 2 +- + drivers/base/devtmpfs.c | 108 +- + drivers/gpio/gpiolib-cdev.c | 18 +- + drivers/gpu/drm/msm/msm_perfcntr.c | 4 +- + drivers/gpu/drm/xe/xe_configfs.c | 4 +- + drivers/md/dm-verity-verify-sig.c | 3 + + drivers/media/mc/mc-request.c | 8 +- + drivers/misc/ntsync.c | 6 +- + drivers/virt/coco/guest/report.c | 6 +- + fs/9p/acl.c | 4 +- + fs/9p/acl.h | 4 +- + fs/9p/v9fs.h | 2 +- + fs/9p/v9fs_vfs.h | 2 +- + fs/9p/vfs_addr.c | 1 - + fs/9p/vfs_inode.c | 14 +- + fs/9p/vfs_inode_dotl.c | 14 +- + fs/9p/xattr.c | 2 +- + fs/Kconfig | 9 +- + fs/Makefile | 1 - + fs/adfs/adfs.h | 2 +- + fs/adfs/dir.c | 2 +- + fs/adfs/inode.c | 2 +- + fs/affs/affs.h | 10 +- + fs/affs/inode.c | 2 +- + fs/affs/namei.c | 8 +- + fs/afs/dir.c | 52 +- + fs/afs/dir_edit.c | 43 +- + fs/afs/dir_search.c | 33 +- + fs/afs/file.c | 8 +- + fs/afs/inode.c | 6 +- + fs/afs/internal.h | 14 +- + fs/afs/security.c | 2 +- + fs/afs/symlink.c | 38 +- + fs/afs/xattr.c | 4 +- + fs/aio.c | 11 +- + fs/anon_inodes.c | 4 +- + fs/attr.c | 16 +- + fs/autofs/root.c | 12 +- + fs/backing-file.c | 2 +- + fs/bad_inode.c | 20 +- + fs/bfs/Kconfig | 21 - + fs/bfs/Makefile | 8 - + fs/bfs/bfs.h | 69 - + fs/bfs/dir.c | 356 ---- + fs/bfs/file.c | 203 -- + fs/bfs/inode.c | 538 ------ + fs/binfmt_elf.c | 18 +- + fs/binfmt_elf_fdpic.c | 14 +- + fs/binfmt_misc.c | 12 +- + fs/bpf_fs_kfuncs.c | 4 +- + fs/btrfs/Kconfig | 1 + + fs/btrfs/accessors.c | 2 +- + fs/btrfs/acl.c | 2 +- + fs/btrfs/acl.h | 2 +- + fs/btrfs/backref.c | 2 +- + fs/btrfs/bio.c | 163 +- + fs/btrfs/bio.h | 9 +- + fs/btrfs/block-group.c | 556 +----- + fs/btrfs/block-group.h | 16 +- + fs/btrfs/block-rsv.c | 12 +- + fs/btrfs/block-rsv.h | 6 +- + fs/btrfs/btrfs_inode.h | 30 +- + fs/btrfs/compression.c | 61 +- + fs/btrfs/ctree.c | 4 +- + fs/btrfs/ctree.h | 2 +- + fs/btrfs/defrag.c | 8 +- + fs/btrfs/delalloc-space.c | 13 +- + fs/btrfs/delayed-inode.c | 118 +- + fs/btrfs/delayed-inode.h | 22 +- + fs/btrfs/dev-replace.c | 10 +- + fs/btrfs/dir-item.c | 50 +- + fs/btrfs/dir-item.h | 5 +- + fs/btrfs/direct-io.c | 7 + + fs/btrfs/disk-io.c | 248 +-- + fs/btrfs/extent-io-tree.c | 2 +- + fs/btrfs/extent-tree.c | 21 +- + fs/btrfs/extent_io.c | 247 ++- + fs/btrfs/extent_map.c | 8 + + fs/btrfs/file-item.c | 46 +- + fs/btrfs/free-space-cache.c | 1344 +------------ + fs/btrfs/free-space-cache.h | 29 +- + fs/btrfs/fs.c | 2 +- + fs/btrfs/fs.h | 5 +- + fs/btrfs/inode.c | 366 ++-- + fs/btrfs/ioctl.c | 30 +- + fs/btrfs/ioctl.h | 2 +- + fs/btrfs/messages.c | 28 +- + fs/btrfs/ordered-data.c | 27 +- + fs/btrfs/props.c | 3 +- + fs/btrfs/qgroup.c | 212 ++- + fs/btrfs/qgroup.h | 20 +- + fs/btrfs/raid56.c | 68 +- + fs/btrfs/reflink.c | 51 +- + fs/btrfs/relocation.c | 15 +- + fs/btrfs/root-tree.c | 3 +- + fs/btrfs/send.c | 2 +- + fs/btrfs/space-info.c | 6 +- + fs/btrfs/space-info.h | 4 - + fs/btrfs/super.c | 79 +- + fs/btrfs/sysfs.c | 134 +- + fs/btrfs/tests/btrfs-tests.c | 9 - + fs/btrfs/tests/btrfs-tests.h | 2 - + fs/btrfs/tests/extent-io-tests.c | 129 +- + fs/btrfs/transaction.c | 171 +- + fs/btrfs/transaction.h | 58 +- + fs/btrfs/tree-checker.c | 83 +- + fs/btrfs/tree-log.c | 11 +- + fs/btrfs/tree-mod-log.c | 13 +- + fs/btrfs/verity.c | 37 +- + fs/btrfs/volumes.c | 67 +- + fs/btrfs/volumes.h | 4 +- + fs/btrfs/xattr.c | 6 +- + fs/btrfs/zlib.c | 10 +- + fs/btrfs/zoned.c | 29 +- + fs/btrfs/zstd.c | 73 +- + fs/buffer.c | 131 +- + fs/cachefiles/Kconfig | 2 +- + fs/cachefiles/interface.c | 96 +- + fs/cachefiles/internal.h | 18 +- + fs/cachefiles/io.c | 474 +++-- + fs/cachefiles/namei.c | 34 +- + fs/cachefiles/xattr.c | 82 +- + fs/ceph/Kconfig | 1 + + fs/ceph/acl.c | 2 +- + fs/ceph/addr.c | 4 +- + fs/ceph/dir.c | 10 +- + fs/ceph/file.c | 2 +- + fs/ceph/inode.c | 10 +- + fs/ceph/mds_client.h | 2 +- + fs/ceph/super.h | 10 +- + fs/ceph/xattr.c | 2 +- + fs/char_dev.c | 4 +- + fs/coda/coda_linux.h | 6 +- + fs/coda/dir.c | 10 +- + fs/coda/inode.c | 4 +- + fs/coda/pioctl.c | 4 +- + fs/configfs/configfs_internal.h | 14 +- + fs/configfs/dir.c | 12 +- + fs/configfs/file.c | 6 +- + fs/configfs/inode.c | 4 +- + fs/configfs/symlink.c | 2 +- + fs/coredump.c | 580 ++++-- + fs/crypto/Kconfig | 2 +- + fs/crypto/crypto.c | 5 + + fs/crypto/fscrypt_private.h | 27 - + fs/crypto/hooks.c | 9 + + fs/crypto/keyring.c | 13 + + fs/crypto/keysetup_v1.c | 5 +- + fs/dax.c | 26 +- + fs/dcache.c | 206 +- + fs/debugfs/inode.c | 2 +- + fs/devpts/inode.c | 2 + + fs/dlm/ast.c | 2 +- + fs/dlm/config.c | 39 +- + fs/dlm/debug_fs.c | 3 +- + fs/dlm/dlm_internal.h | 5 + + fs/dlm/lock.c | 20 +- + fs/dlm/lock.h | 4 +- + fs/dlm/lowcomms.c | 1 + + fs/dlm/member.c | 17 +- + fs/dlm/midcomms.c | 1 + + fs/dlm/plock.c | 14 +- + fs/dlm/user.c | 23 + + fs/ecryptfs/ecryptfs_kernel.h | 3 + + fs/ecryptfs/inode.c | 26 +- + fs/efivarfs/inode.c | 6 +- + fs/erofs/data.c | 5 +- + fs/erofs/decompressor.c | 2 +- + fs/erofs/inode.c | 2 +- + fs/erofs/internal.h | 3 +- + fs/erofs/super.c | 56 +- + fs/eventfd.c | 4 +- + fs/eventpoll.c | 6 +- + fs/exec.c | 28 +- + fs/exfat/dir.c | 52 +- + fs/exfat/exfat_fs.h | 65 +- + fs/exfat/fatent.c | 46 +- + fs/exfat/file.c | 264 +-- + fs/exfat/inode.c | 16 +- + fs/exfat/iomap.c | 81 +- + fs/exfat/misc.c | 2 +- + fs/exfat/namei.c | 17 +- + fs/exfat/super.c | 30 +- + fs/ext2/Makefile | 2 + + fs/ext2/acl.c | 2 +- + fs/ext2/acl.h | 2 +- + fs/ext2/balloc.c | 4 + + fs/ext2/ext2.h | 25 +- + fs/ext2/file.c | 7 + + fs/ext2/inode.c | 11 +- + fs/ext2/ioctl.c | 2 +- + fs/ext2/namei.c | 12 +- + fs/ext2/super.c | 33 +- + fs/ext2/xattr.c | 2 +- + fs/ext2/xattr_security.c | 2 +- + fs/ext2/xattr_trusted.c | 2 +- + fs/ext2/xattr_user.c | 2 +- + fs/ext4/acl.c | 2 +- + fs/ext4/acl.h | 2 +- + fs/ext4/balloc.c | 2 +- + fs/ext4/ext4.h | 106 +- + fs/ext4/ext4_jbd2.c | 10 +- + fs/ext4/ext4_jbd2.h | 7 +- + fs/ext4/extents.c | 77 +- + fs/ext4/file.c | 20 +- + fs/ext4/ialloc.c | 3 +- + fs/ext4/indirect.c | 17 + + fs/ext4/inode.c | 1193 ++++++++++-- + fs/ext4/ioctl.c | 9 +- + fs/ext4/mballoc.c | 6 +- + fs/ext4/migrate.c | 2 + + fs/ext4/mmp.c | 2 +- + fs/ext4/move_extent.c | 11 + + fs/ext4/namei.c | 27 +- + fs/ext4/page-io.c | 201 ++ + fs/ext4/resize.c | 19 +- + fs/ext4/super.c | 67 +- + fs/ext4/symlink.c | 2 +- + fs/ext4/verity.c | 36 +- + fs/ext4/xattr_hurd.c | 2 +- + fs/ext4/xattr_security.c | 2 +- + fs/ext4/xattr_trusted.c | 2 +- + fs/ext4/xattr_user.c | 2 +- + fs/f2fs/Makefile | 2 +- + fs/f2fs/acl.c | 32 +- + fs/f2fs/acl.h | 10 +- + fs/f2fs/cache.c | 894 +++++++++ + fs/f2fs/cache.h | 252 +++ + fs/f2fs/checkpoint.c | 568 +++--- + fs/f2fs/compress.c | 183 +- + fs/f2fs/data.c | 661 ++++--- + fs/f2fs/debug.c | 94 +- + fs/f2fs/dir.c | 221 ++- + fs/f2fs/extent_cache.c | 25 +- + fs/f2fs/f2fs.h | 520 +++-- + fs/f2fs/file.c | 244 +-- + fs/f2fs/gc.c | 222 ++- + fs/f2fs/inline.c | 293 +-- + fs/f2fs/inode.c | 242 +-- + fs/f2fs/iostat.h | 11 + + fs/f2fs/namei.c | 138 +- + fs/f2fs/node.c | 1292 +++++++------ + fs/f2fs/node.h | 193 +- + fs/f2fs/recovery.c | 255 +-- + fs/f2fs/segment.c | 438 +++-- + fs/f2fs/segment.h | 87 +- + fs/f2fs/shrinker.c | 16 +- + fs/f2fs/super.c | 343 ++-- + fs/f2fs/sysfs.c | 42 +- + fs/f2fs/verity.c | 40 +- + fs/f2fs/xattr.c | 137 +- + fs/f2fs/xattr.h | 23 +- + fs/failfs.c | 4 +- + fs/fat/fat.h | 4 +- + fs/fat/file.c | 6 +- + fs/fat/misc.c | 2 +- + fs/fat/namei_msdos.c | 6 +- + fs/fat/namei_vfat.c | 6 +- + fs/fhandle.c | 2 +- + fs/file.c | 321 +++- + fs/file_attr.c | 17 +- + fs/fs-writeback.c | 23 +- + fs/fs_pin.c | 9 +- + fs/fuse/Kconfig | 8 +- + fs/fuse/Makefile | 2 +- + fs/fuse/acl.c | 4 +- + fs/fuse/backing.c | 2 +- + fs/fuse/dax.c | 215 +-- + fs/fuse/dev.c | 50 +- + fs/fuse/dev.h | 2 +- + fs/fuse/dev_uring.c | 6 + + fs/fuse/dir.c | 55 +- + fs/fuse/file.c | 131 +- + fs/fuse/fuse_i.h | 108 +- + fs/fuse/inode.c | 82 +- + fs/fuse/ioctl.c | 5 +- + fs/fuse/iomode.c | 4 +- + fs/fuse/notify.c | 4 +- + fs/fuse/passthrough.c | 15 +- + fs/fuse/req.c | 15 +- + fs/fuse/virtio_fs.c | 28 +- + fs/fuse/xattr.c | 2 +- + fs/gfs2/acl.c | 13 +- + fs/gfs2/acl.h | 2 +- + fs/gfs2/aops.c | 17 +- + fs/gfs2/bmap.c | 93 +- + fs/gfs2/dentry.c | 6 +- + fs/gfs2/dir.c | 61 +- + fs/gfs2/export.c | 7 +- + fs/gfs2/file.c | 74 +- + fs/gfs2/glock.c | 60 +- + fs/gfs2/glops.c | 13 +- + fs/gfs2/incore.h | 8 +- + fs/gfs2/inode.c | 148 +- + fs/gfs2/inode.h | 4 +- + fs/gfs2/lock_dlm.c | 4 +- + fs/gfs2/log.c | 7 +- + fs/gfs2/lops.c | 22 +- + fs/gfs2/meta_io.c | 7 +- + fs/gfs2/ops_fstype.c | 26 +- + fs/gfs2/quota.c | 57 +- + fs/gfs2/recovery.c | 19 +- + fs/gfs2/rgrp.c | 129 +- + fs/gfs2/super.c | 98 +- + fs/gfs2/trace_gfs2.h | 6 +- + fs/gfs2/util.c | 8 +- + fs/gfs2/xattr.c | 71 +- + fs/hfs/attr.c | 2 +- + fs/hfs/dir.c | 6 +- + fs/hfs/hfs_fs.h | 2 +- + fs/hfs/inode.c | 2 +- + fs/hfsplus/dir.c | 10 +- + fs/hfsplus/hfsplus_fs.h | 4 +- + fs/hfsplus/inode.c | 6 +- + fs/hfsplus/xattr.c | 2 +- + fs/hfsplus/xattr_security.c | 2 +- + fs/hfsplus/xattr_trusted.c | 2 +- + fs/hfsplus/xattr_user.c | 2 +- + fs/hostfs/hostfs_kern.c | 14 +- + fs/hpfs/hpfs_fn.h | 2 +- + fs/hpfs/inode.c | 2 +- + fs/hpfs/namei.c | 10 +- + fs/hugetlbfs/inode.c | 14 +- + fs/inode.c | 14 +- + fs/internal.h | 30 +- + fs/iomap/bio.c | 50 +- + fs/iomap/buffered-io.c | 8 +- + fs/iomap/direct-io.c | 96 +- + fs/iomap/fiemap.c | 8 +- + fs/iomap/ioend.c | 180 +- + fs/iomap/iter.c | 1 + + fs/isofs/compress.c | 77 +- + fs/isofs/dir.c | 14 +- + fs/isofs/inode.c | 70 +- + fs/isofs/isofs.h | 16 +- + fs/isofs/joliet.c | 27 +- + fs/isofs/namei.c | 8 +- + fs/isofs/rock.c | 19 +- + fs/jbd2/commit.c | 22 +- + fs/jbd2/journal.c | 33 +- + fs/jbd2/transaction.c | 2 +- + fs/jffs2/acl.c | 2 +- + fs/jffs2/acl.h | 2 +- + fs/jffs2/dir.c | 20 +- + fs/jffs2/fs.c | 2 +- + fs/jffs2/os-linux.h | 2 +- + fs/jffs2/security.c | 2 +- + fs/jffs2/xattr_trusted.c | 2 +- + fs/jffs2/xattr_user.c | 2 +- + fs/jfs/acl.c | 2 +- + fs/jfs/file.c | 2 +- + fs/jfs/ioctl.c | 2 +- + fs/jfs/jfs_acl.h | 2 +- + fs/jfs/jfs_inode.h | 4 +- + fs/jfs/namei.c | 10 +- + fs/jfs/xattr.c | 4 +- + fs/kernfs/dir.c | 231 ++- + fs/kernfs/file.c | 47 +- + fs/kernfs/inode.c | 10 +- + fs/kernfs/kernfs-internal.h | 24 +- + fs/kernfs/mount.c | 34 +- + fs/kernfs/symlink.c | 17 +- + fs/libfs.c | 8 +- + fs/lockd/svc.c | 1 - + fs/lockd/svclock.c | 33 +- + fs/lockd/trace.h | 1 - + fs/lockd/xdr.h | 2 +- + fs/minix/file.c | 2 +- + fs/minix/inode.c | 2 +- + fs/minix/minix.h | 2 +- + fs/minix/namei.c | 12 +- + fs/mnt_idmapping.c | 33 +- + fs/namei.c | 155 +- + fs/namespace.c | 40 +- + fs/netfs/Kconfig | 3 + + fs/netfs/Makefile | 3 +- + fs/netfs/buffered_read.c | 251 ++- + fs/netfs/buffered_write.c | 69 +- + fs/netfs/bvecq.c | 344 ++++ + fs/netfs/direct_read.c | 14 +- + fs/netfs/direct_write.c | 8 +- + fs/netfs/fscache_cookie.c | 8 +- + fs/netfs/fscache_internal.h | 14 - + fs/netfs/fscache_io.c | 10 +- + fs/netfs/internal.h | 78 +- + fs/netfs/iterator.c | 35 +- + fs/netfs/main.c | 14 +- + fs/netfs/misc.c | 106 +- + fs/netfs/objects.c | 7 +- + fs/netfs/read_collect.c | 62 +- + fs/netfs/read_pgpriv2.c | 39 +- + fs/netfs/read_retry.c | 36 +- + fs/netfs/read_single.c | 50 +- + fs/netfs/rolling_buffer.c | 193 +- + fs/netfs/stats.c | 10 +- + fs/netfs/write_collect.c | 183 +- + fs/netfs/write_issue.c | 331 +--- + fs/netfs/write_retry.c | 8 +- + fs/nfs/Kconfig | 18 +- + fs/nfs/blocklayout/Makefile | 3 +- + fs/nfs/blocklayout/blocklayout.c | 119 +- + fs/nfs/blocklayout/blocklayout.h | 5 - + fs/nfs/blocklayout/dev.c | 32 +- + fs/nfs/blocklayout/rpc_pipefs.c | 79 +- + fs/nfs/callback_proc.c | 23 +- + fs/nfs/callback_xdr.c | 9 +- + fs/nfs/client.c | 15 +- + fs/nfs/delegation.c | 3 +- + fs/nfs/dir.c | 27 +- + fs/nfs/direct.c | 139 +- + fs/nfs/filelayout/filelayout.c | 17 +- + fs/nfs/filelayout/filelayoutdev.c | 19 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 473 +++-- + fs/nfs/flexfilelayout/flexfilelayout.h | 48 +- + fs/nfs/flexfilelayout/flexfilelayoutdev.c | 214 ++- + fs/nfs/fs_context.c | 2 + + fs/nfs/inode.c | 215 ++- + fs/nfs/internal.h | 43 +- + fs/nfs/localio.c | 31 +- + fs/nfs/namespace.c | 4 +- + fs/nfs/netns.h | 19 +- + fs/nfs/nfs3_fs.h | 2 +- + fs/nfs/nfs3acl.c | 2 +- + fs/nfs/nfs3client.c | 10 +- + fs/nfs/nfs3proc.c | 8 + + fs/nfs/nfs4_fs.h | 3 + + fs/nfs/nfs4client.c | 9 +- + fs/nfs/nfs4file.c | 1 + + fs/nfs/nfs4proc.c | 151 +- + fs/nfs/nfs4state.c | 7 +- + fs/nfs/nfs4xdr.c | 5 +- + fs/nfs/nfstrace.h | 5 +- + fs/nfs/pagelist.c | 66 +- + fs/nfs/pnfs.c | 388 +++- + fs/nfs/pnfs.h | 102 +- + fs/nfs/pnfs_dev.c | 30 +- + fs/nfs/pnfs_nfs.c | 108 +- + fs/nfs/proc.c | 8 + + fs/nfs/read.c | 2 +- + fs/nfs/super.c | 25 - + fs/nfs/unlink.c | 3 + + fs/nfs/write.c | 2 +- + fs/nfs_common/common.c | 5 +- + fs/nfs_common/nfs_ssc.c | 126 +- + fs/nfsd/Makefile | 15 +- + fs/nfsd/blocklayout.c | 1 + + fs/nfsd/blocklayoutxdr.c | 11 + + fs/nfsd/export.c | 8 +- + fs/nfsd/export.h | 3 +- + fs/nfsd/filecache.c | 5 +- + fs/nfsd/flexfilelayout.c | 24 +- + fs/nfsd/flexfilelayoutxdr.c | 9 +- + fs/nfsd/flexfilelayoutxdr.h | 8 +- + fs/nfsd/localio.c | 10 +- + fs/nfsd/lockd.c | 5 +- + fs/nfsd/netlink.c | 5 +- + fs/nfsd/netns.h | 17 +- + fs/nfsd/nfs2acl.c | 66 +- + fs/nfsd/nfs2xdr_gen.c | 1079 +++++++++++ + fs/nfsd/nfs2xdr_gen.h | 46 + + fs/nfsd/nfs3acl.c | 16 + + fs/nfsd/nfs3proc.c | 79 +- + fs/nfsd/nfs3xdr.c | 6 + + fs/nfsd/nfs4acl.c | 1 + + fs/nfsd/nfs4callback.c | 8 +- + fs/nfsd/nfs4ctl.h | 83 + + fs/nfsd/nfs4idmap.c | 5 +- + fs/nfsd/nfs4layouts.c | 5 +- + fs/nfsd/nfs4proc.c | 475 +++-- + fs/nfsd/nfs4recover.c | 92 +- + fs/nfsd/nfs4state.c | 587 +++++- + fs/nfsd/nfs4xdr.c | 227 ++- + fs/nfsd/nfscache.c | 1 + + fs/nfsd/nfsctl.c | 323 +++- + fs/nfsd/nfsd.h | 243 +-- + fs/nfsd/nfserr.h | 159 ++ + fs/nfsd/nfsfh.c | 73 +- + fs/nfsd/nfsfh.h | 33 +- + fs/nfsd/nfsproc.c | 1597 +++++++++++----- + fs/nfsd/nfssvc.c | 74 +- + fs/nfsd/nfsxdr.c | 606 ++---- + fs/nfsd/state.h | 46 +- + fs/nfsd/trace.h | 45 +- + fs/nfsd/vfs.c | 550 +++--- + fs/nfsd/vfs.h | 79 +- + fs/nfsd/xdr.h | 173 +- + fs/nfsd/xdr3.h | 5 +- + fs/nfsd/xdr4.h | 156 +- + fs/nfsd/xdr4cb.h | 20 +- + fs/nilfs2/inode.c | 4 +- + fs/nilfs2/ioctl.c | 2 +- + fs/nilfs2/namei.c | 10 +- + fs/nilfs2/nilfs.h | 6 +- + fs/nls/nls_iso8859-14.c | 26 +- + fs/notify/fanotify/fanotify.c | 7 +- + fs/notify/fanotify/fanotify.h | 21 +- + fs/notify/fanotify/fanotify_user.c | 2 +- + fs/nsfs.c | 4 +- + fs/ntfs/Makefile | 2 +- + fs/ntfs/aops.c | 7 +- + fs/ntfs/attrib.c | 328 ++-- + fs/ntfs/attrib.h | 2 +- + fs/ntfs/attrlist.c | 22 +- + fs/ntfs/bitmap.c | 72 +- + fs/ntfs/bitmap.h | 2 + + fs/ntfs/collate.c | 8 +- + fs/ntfs/compress.c | 4 +- + fs/ntfs/dir.c | 30 +- + fs/ntfs/ea.c | 506 ++--- + fs/ntfs/ea.h | 15 +- + fs/ntfs/file.c | 458 ++++- + fs/ntfs/index.c | 7 +- + fs/ntfs/index.h | 2 +- + fs/ntfs/inode.c | 431 ++++- + fs/ntfs/inode.h | 25 +- + fs/ntfs/iomap.c | 215 ++- + fs/ntfs/layout.h | 19 +- + fs/ntfs/lcnalloc.c | 35 +- + fs/ntfs/logfile.c | 11 +- + fs/ntfs/mft.c | 980 ++++++---- + fs/ntfs/mft.h | 19 +- + fs/ntfs/mst.c | 4 +- + fs/ntfs/named_stream.c | 1821 ++++++++++++++++++ + fs/ntfs/namei.c | 220 ++- + fs/ntfs/ntfs.h | 11 +- + fs/ntfs/reparse.c | 2 +- + fs/ntfs/runlist.c | 103 +- + fs/ntfs/runlist.h | 3 + + fs/ntfs/stream.h | 81 + + fs/ntfs/super.c | 607 +++++- + fs/ntfs/unistr.c | 29 +- + fs/ntfs/volume.h | 20 + + fs/ntfs/wof.c | 6 +- + fs/ntfs3/attrib.c | 175 +- + fs/ntfs3/dir.c | 47 +- + fs/ntfs3/file.c | 9 +- + fs/ntfs3/frecord.c | 16 +- + fs/ntfs3/fslog.c | 7 +- + fs/ntfs3/fsntfs.c | 3 + + fs/ntfs3/index.c | 32 +- + fs/ntfs3/inode.c | 32 +- + fs/ntfs3/namei.c | 16 +- + fs/ntfs3/ntfs_fs.h | 21 +- + fs/ntfs3/record.c | 16 +- + fs/ntfs3/super.c | 33 +- + fs/ntfs3/xattr.c | 51 +- + fs/nullfs.c | 4 +- + fs/ocfs2/acl.c | 2 +- + fs/ocfs2/acl.h | 2 +- + fs/ocfs2/buffer_head_io.c | 12 +- + fs/ocfs2/dlmfs/dlmfs.c | 6 +- + fs/ocfs2/file.c | 6 +- + fs/ocfs2/file.h | 6 +- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/ioctl.h | 2 +- + fs/ocfs2/journal.c | 25 +- + fs/ocfs2/namei.c | 10 +- + fs/ocfs2/quota_local.c | 4 + + fs/ocfs2/xattr.c | 6 +- + fs/omfs/dir.c | 6 +- + fs/omfs/file.c | 2 +- + fs/omfs/inode.c | 4 +- + fs/open.c | 50 +- + fs/orangefs/acl.c | 2 +- + fs/orangefs/inode.c | 29 +- + fs/orangefs/namei.c | 8 +- + fs/orangefs/orangefs-debugfs.c | 10 +- + fs/orangefs/orangefs-kernel.h | 8 +- + fs/orangefs/super.c | 18 + + fs/orangefs/xattr.c | 2 +- + fs/overlayfs/dir.c | 14 +- + fs/overlayfs/file.c | 2 +- + fs/overlayfs/inode.c | 16 +- + fs/overlayfs/overlayfs.h | 14 +- + fs/overlayfs/ovl_entry.h | 2 +- + fs/overlayfs/util.c | 4 +- + fs/overlayfs/xattrs.c | 4 +- + fs/pidfs.c | 33 +- + fs/pipe.c | 2 +- + fs/posix_acl.c | 26 +- + fs/proc/base.c | 53 +- + fs/proc/fd.c | 6 +- + fs/proc/fd.h | 2 +- + fs/proc/generic.c | 4 +- + fs/proc/internal.h | 4 +- + fs/proc/proc_net.c | 2 +- + fs/proc/proc_sysctl.c | 6 +- + fs/proc/root.c | 2 +- + fs/proc/vmcore.c | 20 + + fs/quota/dquot.c | 18 +- + fs/ramfs/file-nommu.c | 4 +- + fs/ramfs/inode.c | 10 +- + fs/read_write.c | 8 +- + fs/remap_range.c | 2 +- + fs/smb/client/asn1.c | 2 - + fs/smb/client/cifs_debug.c | 1 - + fs/smb/client/cifsacl.c | 4 +- + fs/smb/client/cifsencrypt.c | 31 +- + fs/smb/client/cifsfs.c | 13 +- + fs/smb/client/cifsfs.h | 21 +- + fs/smb/client/cifsglob.h | 28 +- + fs/smb/client/cifsproto.h | 22 +- + fs/smb/client/cifssmb.c | 183 +- + fs/smb/client/connect.c | 52 +- + fs/smb/client/dfs.c | 6 +- + fs/smb/client/dir.c | 7 +- + fs/smb/client/file.c | 7 +- + fs/smb/client/inode.c | 44 +- + fs/smb/client/ioctl.c | 165 +- + fs/smb/client/link.c | 275 ++- + fs/smb/client/misc.c | 4 +- + fs/smb/client/netmisc.c | 3 - + fs/smb/client/ntlmssp.h | 11 +- + fs/smb/client/readdir.c | 80 +- + fs/smb/client/sess.c | 37 +- + fs/smb/client/smb1ops.c | 14 +- + fs/smb/client/smb1proto.h | 21 +- + fs/smb/client/smb1session.c | 120 +- + fs/smb/client/smb2glob.h | 8 + + fs/smb/client/smb2inode.c | 7 +- + fs/smb/client/smb2ops.c | 107 +- + fs/smb/client/smb2pdu.c | 66 +- + fs/smb/client/smb2pdu.h | 3 + + fs/smb/client/smb2proto.h | 17 +- + fs/smb/client/trace.h | 2 + + fs/smb/client/transport.c | 46 +- + fs/smb/client/xattr.c | 4 +- + fs/smb/common/compress/compress.c | 16 +- + fs/smb/common/fscc.h | 5 +- + fs/smb/common/smbglob.h | 1 + + fs/smb/server/Kconfig | 2 + + fs/smb/server/Makefile | 1 + + fs/smb/server/auth.c | 3 +- + fs/smb/server/compress.c | 1 + + fs/smb/server/connection.c | 3 +- + fs/smb/server/connection.h | 3 + + fs/smb/server/ksmbd_work.c | 3 - + fs/smb/server/ksmbd_work.h | 5 +- + fs/smb/server/mgmt/share_config.c | 43 +- + fs/smb/server/mgmt/share_config.h | 2 + + fs/smb/server/mgmt/user_session.c | 4 +- + fs/smb/server/ndr.c | 2 +- + fs/smb/server/ndr.h | 2 +- + fs/smb/server/oplock.c | 22 +- + fs/smb/server/server.c | 21 + + fs/smb/server/smb2ops.c | 33 + + fs/smb/server/smb2pdu.c | 1150 +++++++----- + fs/smb/server/smb2pdu.h | 23 +- + fs/smb/server/smb_common.c | 6 +- + fs/smb/server/smb_common.h | 98 + + fs/smb/server/smbacl.c | 27 +- + fs/smb/server/smbacl.h | 8 +- + fs/smb/server/tests/Kconfig | 15 + + fs/smb/server/tests/Makefile | 4 + + fs/smb/server/tests/smbacl_kunit.c | 301 +++ + fs/smb/server/transport_tcp.c | 8 +- + fs/smb/server/vfs.c | 146 +- + fs/smb/server/vfs.h | 36 +- + fs/smb/server/vfs_cache.c | 151 +- + fs/smb/server/vfs_cache.h | 16 +- + fs/smb/smbdirect/accept.c | 229 ++- + fs/smb/smbdirect/connect.c | 2 +- + fs/smb/smbdirect/connection.c | 149 +- + fs/smb/smbdirect/internal.h | 2 + + fs/smb/smbdirect/listen.c | 137 +- + fs/smb/smbdirect/socket.c | 113 +- + fs/smb/smbdirect/socket.h | 42 + + fs/splice.c | 70 +- + fs/stat.c | 10 +- + fs/super.c | 19 +- + fs/tests/.kunitconfig | 2 + + fs/tests/fdtable_kunit.c | 72 + + fs/tracefs/event_inode.c | 2 +- + fs/tracefs/inode.c | 8 +- + fs/ubifs/dir.c | 14 +- + fs/ubifs/file.c | 4 +- + fs/ubifs/ioctl.c | 2 +- + fs/ubifs/ubifs.h | 6 +- + fs/ubifs/xattr.c | 2 +- + fs/udf/file.c | 2 +- + fs/udf/inode.c | 61 +- + fs/udf/misc.c | 15 +- + fs/udf/namei.c | 12 +- + fs/udf/super.c | 5 +- + fs/udf/symlink.c | 2 +- + fs/ufs/dir.c | 2 +- + fs/ufs/inode.c | 2 +- + fs/ufs/namei.c | 10 +- + fs/ufs/ufs.h | 2 +- + fs/vboxsf/dir.c | 8 +- + fs/vboxsf/utils.c | 4 +- + fs/vboxsf/vfsmod.h | 4 +- + fs/verity/enable.c | 4 +- + fs/verity/open.c | 26 +- + fs/verity/pagecache.c | 33 + + fs/verity/signature.c | 2 + + fs/verity/verify.c | 4 + + fs/xattr.c | 30 +- + fs/xfs/libxfs/xfs_alloc.c | 106 +- + fs/xfs/libxfs/xfs_alloc.h | 7 +- + fs/xfs/libxfs/xfs_attr.c | 14 +- + fs/xfs/{ => libxfs}/xfs_attr_item.h | 2 - + fs/xfs/libxfs/xfs_attr_leaf.c | 25 +- + fs/xfs/libxfs/xfs_bmap.c | 16 +- + fs/xfs/libxfs/xfs_bmap.h | 8 +- + fs/xfs/{ => libxfs}/xfs_bmap_item.h | 2 - + fs/xfs/libxfs/xfs_btree_mem.c | 6 +- + fs/xfs/{ => libxfs}/xfs_buf_item.h | 2 - + fs/xfs/libxfs/xfs_da_btree.c | 14 + + fs/xfs/libxfs/xfs_defer.c | 1 - + fs/xfs/libxfs/xfs_dir2_sf.c | 68 +- + fs/xfs/libxfs/xfs_dquot_buf.c | 13 +- + fs/xfs/{ => libxfs}/xfs_dquot_item.h | 0 + fs/xfs/libxfs/xfs_errortag.h | 8 +- + fs/xfs/libxfs/xfs_exchmaps.c | 1 - + fs/xfs/libxfs/xfs_exchmaps.h | 3 +- + fs/xfs/{ => libxfs}/xfs_exchmaps_item.h | 2 - + fs/xfs/{ => libxfs}/xfs_extfree_item.h | 2 - + fs/xfs/libxfs/xfs_format.h | 6 +- + fs/xfs/libxfs/xfs_ialloc.c | 48 +- + fs/xfs/libxfs/xfs_ialloc_btree.c | 1 - + fs/xfs/libxfs/xfs_ialloc_btree.h | 5 +- + fs/xfs/{ => libxfs}/xfs_icreate_item.h | 0 + fs/xfs/libxfs/xfs_inode_buf.c | 7 +- + fs/xfs/libxfs/xfs_inode_fork.c | 4 +- + fs/xfs/{ => libxfs}/xfs_inode_item.h | 2 - + fs/xfs/libxfs/xfs_inode_util.c | 3 +- + fs/xfs/libxfs/xfs_inode_util.h | 2 +- + fs/xfs/{ => libxfs}/xfs_iunlink_item.h | 0 + fs/xfs/libxfs/xfs_metadir.c | 32 +- + fs/xfs/libxfs/xfs_metadir.h | 5 +- + fs/xfs/libxfs/xfs_parent.h | 1 - + fs/xfs/libxfs/xfs_refcount.c | 1 - + fs/xfs/libxfs/xfs_refcount_btree.c | 16 +- + fs/xfs/libxfs/xfs_refcount_btree.h | 26 + + fs/xfs/{ => libxfs}/xfs_refcount_item.h | 2 - + fs/xfs/libxfs/xfs_rmap.c | 13 +- + fs/xfs/libxfs/xfs_rmap_btree.c | 16 +- + fs/xfs/libxfs/xfs_rmap_btree.h | 26 + + fs/xfs/{ => libxfs}/xfs_rmap_item.h | 2 - + fs/xfs/libxfs/xfs_rtbitmap.c | 80 +- + fs/xfs/libxfs/xfs_rtbitmap.h | 45 +- + fs/xfs/libxfs/xfs_rtgroup.c | 1 - + fs/xfs/libxfs/xfs_rtrefcount_btree.c | 121 +- + fs/xfs/libxfs/xfs_rtrefcount_btree.h | 5 +- + fs/xfs/libxfs/xfs_rtrmap_btree.c | 236 +-- + fs/xfs/libxfs/xfs_rtrmap_btree.h | 3 +- + fs/xfs/libxfs/xfs_sb.c | 41 - + fs/xfs/libxfs/xfs_sb.h | 1 - + fs/xfs/libxfs/xfs_symlink_remote.c | 8 +- + fs/xfs/libxfs/xfs_symlink_remote.h | 2 +- + fs/xfs/{ => libxfs}/xfs_trans.h | 11 +- + fs/xfs/libxfs/xfs_trans_inode.c | 2 - + fs/xfs/libxfs/xfs_trans_resv.c | 45 +- + fs/xfs/libxfs/xfs_trans_space.c | 6 +- + fs/xfs/libxfs/xfs_types.c | 7 +- + fs/xfs/libxfs/xfs_types.h | 7 +- + fs/xfs/libxfs/xfs_zones.h | 6 + + fs/xfs/scrub/agheader.c | 64 +- + fs/xfs/scrub/agheader_repair.c | 44 +- + fs/xfs/scrub/alloc_repair.c | 30 +- + fs/xfs/scrub/attr.c | 119 +- + fs/xfs/scrub/attr_repair.c | 53 +- + fs/xfs/scrub/bitmap.c | 20 + + fs/xfs/scrub/bmap.c | 31 +- + fs/xfs/scrub/bmap_repair.c | 19 +- + fs/xfs/scrub/btree.c | 20 +- + fs/xfs/scrub/common.c | 57 +- + fs/xfs/scrub/common.h | 46 +- + fs/xfs/scrub/cow_repair.c | 96 +- + fs/xfs/scrub/dabtree.c | 27 +- + fs/xfs/scrub/dir.c | 130 +- + fs/xfs/scrub/dir_repair.c | 125 +- + fs/xfs/scrub/dirtree.c | 4 +- + fs/xfs/scrub/dirtree_repair.c | 76 +- + fs/xfs/scrub/dqiterate.c | 1 + + fs/xfs/scrub/fscounters.c | 42 +- + fs/xfs/scrub/ialloc_repair.c | 12 +- + fs/xfs/scrub/inode.c | 8 +- + fs/xfs/scrub/inode_repair.c | 197 +- + fs/xfs/scrub/iscan.c | 2 +- + fs/xfs/scrub/metapath.c | 17 +- + fs/xfs/scrub/newbt.c | 19 +- + fs/xfs/scrub/newbt.h | 1 - + fs/xfs/scrub/orphanage.c | 2 +- + fs/xfs/scrub/parent_repair.c | 4 + + fs/xfs/scrub/quota.c | 10 +- + fs/xfs/scrub/quota_repair.c | 76 +- + fs/xfs/scrub/quotacheck_repair.c | 54 +- + fs/xfs/scrub/readdir.c | 2 +- + fs/xfs/scrub/reap.c | 65 +- + fs/xfs/scrub/refcount.c | 44 +- + fs/xfs/scrub/refcount.h | 56 + + fs/xfs/scrub/refcount_repair.c | 7 +- + fs/xfs/scrub/repair.c | 72 +- + fs/xfs/scrub/repair.h | 14 +- + fs/xfs/scrub/rgsuper.c | 37 +- + fs/xfs/scrub/rmap_repair.c | 8 +- + fs/xfs/scrub/rtbitmap.c | 4 +- + fs/xfs/scrub/rtbitmap_repair.c | 21 +- + fs/xfs/scrub/rtrefcount.c | 273 +-- + fs/xfs/scrub/rtrefcount_repair.c | 50 +- + fs/xfs/scrub/rtrmap.c | 4 +- + fs/xfs/scrub/rtrmap_repair.c | 14 +- + fs/xfs/scrub/rtsummary.c | 13 +- + fs/xfs/scrub/rtsummary.h | 1 + + fs/xfs/scrub/rtsummary_repair.c | 17 +- + fs/xfs/scrub/scrub.c | 6 +- + fs/xfs/scrub/stats.c | 8 +- + fs/xfs/scrub/symlink.c | 17 +- + fs/xfs/scrub/symlink_repair.c | 16 +- + fs/xfs/scrub/tempfile.c | 3 +- + fs/xfs/scrub/trace.c | 13 + + fs/xfs/scrub/trace.h | 10 +- + fs/xfs/scrub/xfarray.c | 205 +- + fs/xfs/scrub/xfarray.h | 9 +- + fs/xfs/xfs_acl.c | 2 +- + fs/xfs/xfs_acl.h | 2 +- + fs/xfs/xfs_aops.c | 13 +- + fs/xfs/xfs_bmap_item.c | 2 +- + fs/xfs/xfs_buf.c | 11 + + fs/xfs/xfs_dquot.c | 20 +- + fs/xfs/xfs_dquot.h | 2 +- + fs/xfs/xfs_error.c | 16 +- + fs/xfs/xfs_error.h | 9 +- + fs/xfs/xfs_exchmaps_item.c | 13 +- + fs/xfs/xfs_exchrange.c | 2 +- + fs/xfs/xfs_file.c | 36 +- + fs/xfs/xfs_handle.c | 8 +- + fs/xfs/xfs_inode.c | 24 +- + fs/xfs/xfs_inode.h | 13 +- + fs/xfs/xfs_inode_item.c | 3 +- + fs/xfs/xfs_inode_item_recover.c | 20 +- + fs/xfs/xfs_ioctl.c | 423 +++-- + fs/xfs/xfs_ioctl.h | 6 +- + fs/xfs/xfs_ioctl32.c | 188 +- + fs/xfs/xfs_ioend.c | 222 ++- + fs/xfs/xfs_ioend.h | 2 + + fs/xfs/xfs_iomap.c | 55 +- + fs/xfs/xfs_iops.c | 54 +- + fs/xfs/xfs_iops.h | 2 +- + fs/xfs/xfs_itable.c | 2 +- + fs/xfs/xfs_itable.h | 2 +- + fs/xfs/xfs_log.c | 86 +- + fs/xfs/xfs_log_cil.c | 9 +- + fs/xfs/xfs_log_priv.h | 10 +- + fs/xfs/xfs_log_recover.c | 3 +- + fs/xfs/xfs_mount.c | 44 +- + fs/xfs/xfs_mount.h | 10 + + fs/xfs/xfs_platform.h | 1 + + fs/xfs/xfs_pnfs.c | 19 +- + fs/xfs/xfs_qm.c | 42 +- + fs/xfs/xfs_quota.h | 9 + + fs/xfs/xfs_reflink.c | 5 + + fs/xfs/xfs_rmap_item.c | 2 +- + fs/xfs/xfs_rtalloc.h | 49 +- + fs/xfs/xfs_super.c | 3 +- + fs/xfs/xfs_symlink.c | 6 +- + fs/xfs/xfs_symlink.h | 2 +- + fs/xfs/xfs_sysfs.c | 78 +- + fs/xfs/xfs_trace.h | 29 +- + fs/xfs/xfs_trans.c | 8 +- + fs/xfs/xfs_trans_dquot.c | 6 +- + fs/xfs/xfs_verify_media.c | 87 +- + fs/xfs/xfs_xattr.c | 2 +- + fs/xfs/xfs_zone_alloc.c | 40 +- + fs/zonefs/super.c | 2 +- + include/linux/binfmts.h | 3 +- + include/linux/bio-integrity.h | 3 +- + include/linux/bio.h | 11 +- + include/linux/blkdev.h | 8 +- + include/linux/bpf.h | 21 +- + include/linux/bpf_verifier.h | 32 + + include/linux/btf.h | 1 + + include/linux/buffer_head.h | 86 +- + include/linux/bvec.h | 18 + + include/linux/bvecq.h | 166 ++ + include/linux/capability.h | 8 +- + include/linux/cleanup.h | 7 - + include/linux/configfs.h | 73 +- + include/linux/coredump.h | 41 +- + include/linux/dax.h | 12 - + include/linux/dcache.h | 38 +- + include/linux/f2fs_fs.h | 140 +- + include/linux/fdtable.h | 16 +- + include/linux/file.h | 130 +- + include/linux/fileattr.h | 2 +- + include/linux/filter.h | 1 + + include/linux/folio_queue.h | 282 --- + include/linux/fs.h | 127 +- + include/linux/fs_context.h | 4 + + include/linux/fscache-cache.h | 2 +- + include/linux/fscache.h | 53 +- + include/linux/fsverity.h | 10 +- + include/linux/iomap.h | 38 +- + include/linux/iov_iter.h | 87 +- + include/linux/jbd2.h | 2 +- + include/linux/key.h | 4 + + include/linux/lsm_hook_defs.h | 25 +- + include/linux/mnt_idmapping.h | 24 +- + include/linux/mount.h | 4 +- + include/linux/namei.h | 19 +- + include/linux/netfs.h | 128 +- + include/linux/nfs.h | 55 +- + include/linux/nfs3.h | 43 + + include/linux/nfs4.h | 6 + + include/linux/nfs_common.h | 4 +- + include/linux/nfs_fh.h | 63 + + include/linux/nfs_fs.h | 6 +- + include/linux/nfs_fs_sb.h | 8 + + include/linux/nfs_page.h | 8 +- + include/linux/nfs_ssc.h | 69 +- + include/linux/nfs_xdr.h | 2 + + include/linux/nfsd_ssc.h | 38 + + include/linux/nfslocalio.h | 11 +- + include/linux/pid.h | 64 +- + include/linux/pid_types.h | 8 + + include/linux/pidfs.h | 5 + + include/linux/posix_acl.h | 24 +- + include/linux/quotaops.h | 6 +- + include/linux/rolling_buffer.h | 42 +- + include/linux/sched.h | 2 +- + include/linux/sched/signal.h | 51 +- + include/linux/security.h | 61 +- + include/linux/socket.h | 9 +- + include/linux/splice.h | 4 +- + include/linux/sunrpc/clnt.h | 3 +- + include/linux/sunrpc/svc.h | 95 +- + include/linux/sunrpc/svc_rdma.h | 2 +- + include/linux/sunrpc/svc_xprt.h | 5 +- + include/linux/sunrpc/xdr.h | 1 + + include/linux/sunrpc/xdrgen/_defs.h | 34 + + include/linux/sunrpc/xdrgen/nfs2.h | 298 +++ + include/linux/sunrpc/xprt.h | 1 + + include/linux/uidgid.h | 12 +- + include/linux/uio.h | 17 +- + include/linux/user_namespace.h | 11 +- + include/linux/wait_bit.h | 26 + + include/linux/xattr.h | 20 +- + include/net/scm.h | 10 +- + include/net/sock.h | 8 +- + include/trace/events/cachefiles.h | 81 +- + include/trace/events/ext4.h | 207 ++ + include/trace/events/f2fs.h | 71 + + include/trace/events/fscache.h | 10 +- + include/trace/events/landlock.h | 2 +- + include/trace/events/netfs.h | 182 +- + include/trace/misc/nfs.h | 13 +- + include/uapi/asm-generic/socket.h | 4 + + include/uapi/linux/btrfs_tree.h | 25 +- + include/uapi/linux/close_range.h | 31 +- + include/uapi/linux/coredump.h | 149 +- + include/uapi/linux/fs.h | 2 +- + include/uapi/linux/fuse.h | 12 +- + include/uapi/linux/keyctl.h | 3 + + include/uapi/linux/mount.h | 1 + + include/uapi/linux/nfsd_netlink.h | 20 + + include/uapi/linux/ntfs.h | 130 ++ + init/Kconfig | 11 + + init/initramfs.c | 11 +- + io_uring/io-wq.c | 2 + + io_uring/mock_file.c | 8 +- + ipc/mqueue.c | 2 +- + kernel/Makefile | 1 + + kernel/bpf/Kconfig | 17 + + kernel/bpf/Makefile | 3 + + kernel/bpf/backtrack.c | 32 +- + kernel/bpf/bpf_iter.c | 6 +- + kernel/bpf/btf.c | 111 +- + kernel/bpf/cnum_defs.h | 37 +- + kernel/bpf/core.c | 5 + + kernel/bpf/fixups.c | 33 +- + kernel/bpf/inode.c | 6 +- + kernel/bpf/keys.c | 73 + + kernel/bpf/liveness.c | 20 +- + kernel/bpf/queue_stack_maps.c | 3 + + kernel/bpf/stream.c | 55 +- + kernel/bpf/token.c | 6 +- + kernel/bpf/verifier.c | 442 ++++- + kernel/capability.c | 4 +- + kernel/exit.c | 15 +- + kernel/fork.c | 68 +- + kernel/kthread.c | 2 +- + kernel/pid.c | 2 +- + kernel/pid_namespace.c | 3 +- + kernel/ptrace.c | 6 + + kernel/signal.c | 14 + + kernel/tests/.kunitconfig | 4 + + kernel/tests/user_ns_map_kunit.c | 98 + + kernel/user_namespace.c | 89 +- + kernel/utsname.c | 1 - + lib/iov_iter.c | 532 ++++-- + lib/scatterlist.c | 82 +- + lib/tests/kunit_iov_iter.c | 131 +- + mm/secretmem.c | 2 +- + mm/shmem.c | 30 +- + mm/shmem_quota.c | 5 + + mm/userfaultfd.c | 6 +- + net/bluetooth/af_bluetooth.c | 6 +- + net/bluetooth/hci_sock.c | 8 +- + net/bluetooth/l2cap_sock.c | 2 +- + net/core/scm.c | 48 +- + net/core/sock.c | 108 +- + net/handshake/netlink.c | 8 +- + net/kcm/kcmsock.c | 6 +- + net/socket.c | 6 +- + net/sunrpc/auth_gss/svcauth_gss.c | 29 +- + net/sunrpc/rpcb_clnt.c | 34 +- + net/sunrpc/svc.c | 72 +- + net/sunrpc/svc_xprt.c | 83 +- + net/sunrpc/svcauth_unix.c | 9 + + net/sunrpc/svcsock.c | 508 +++-- + net/sunrpc/xdr.c | 3 + + net/sunrpc/xprtrdma/rpc_rdma.c | 39 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 18 +- + net/sunrpc/xprtrdma/svc_rdma_transport.c | 3 +- + net/sunrpc/xprtrdma/verbs.c | 9 +- + net/sunrpc/xprtsock.c | 70 +- + net/unix/af_unix.c | 68 +- + net/unix/af_unix.h | 3 +- + rust/kernel/configfs.rs | 130 +- + samples/configfs/configfs_sample.c | 137 +- + security/apparmor/apparmorfs.c | 2 +- + security/apparmor/lsm.c | 4 +- + security/commoncap.c | 10 +- + security/integrity/evm/evm_main.c | 26 +- + security/integrity/ima/ima.h | 10 +- + security/integrity/ima/ima_api.c | 2 +- + security/integrity/ima/ima_appraise.c | 12 +- + security/integrity/ima/ima_main.c | 6 +- + security/integrity/ima/ima_policy.c | 4 +- + security/keys/process_keys.c | 83 + + security/security.c | 49 +- + security/selinux/hooks.c | 45 +- + security/selinux/selinuxfs.c | 2 +- + security/smack/smack_lsm.c | 14 +- + tools/bpf/bpftool/btf.c | 6 +- + tools/bpf/bpftool/main.c | 30 +- + tools/bpf/bpftool/main.h | 2 +- + tools/bpf/bpftool/prog.c | 2 +- + tools/bpf/bpftool/sign.c | 24 +- + tools/include/uapi/linux/coredump.h | 149 +- + tools/lib/bpf/btf.c | 14 +- + tools/lib/bpf/libbpf.c | 22 +- + tools/lib/bpf/libbpf_internal.h | 4 +- + tools/lib/bpf/libbpf_probes.c | 11 +- + tools/lib/bpf/usdt.c | 4 + + tools/lib/python/kdoc/xforms_lists.py | 1 + + tools/net/sunrpc/xdrgen/README | 154 +- + tools/net/sunrpc/xdrgen/generators/pointer.py | 68 +- + tools/net/sunrpc/xdrgen/generators/struct.py | 203 +- + tools/net/sunrpc/xdrgen/generators/union.py | 69 +- + tools/net/sunrpc/xdrgen/grammars/xdr.lark | 2 + + tools/net/sunrpc/xdrgen/subcmds/source.py | 19 +- + .../templates/C/pointer/decoder/pages_opaque.j2 | 6 + + .../templates/C/pointer/definition/pages_opaque.j2 | 5 + + .../templates/C/pointer/encoder/pages_opaque.j2 | 10 + + .../C/struct/declaration/aggregate_hooks.j2 | 14 + + .../templates/C/struct/decoder/aggregate_array.j2 | 33 + + .../C/struct/decoder/aggregate_optional.j2 | 10 + + .../templates/C/struct/decoder/pages_opaque.j2 | 6 + + .../templates/C/struct/definition/pages_opaque.j2 | 5 + + .../templates/C/struct/encoder/aggregate_array.j2 | 37 + + .../C/struct/encoder/aggregate_optional.j2 | 29 + + .../templates/C/struct/encoder/pages_opaque.j2 | 10 + + .../templates/C/union/encoder/pages_opaque.j2 | 10 + + tools/net/sunrpc/xdrgen/xdr_ast.py | 506 +++++ + tools/testing/selftests/Makefile | 3 + + tools/testing/selftests/bpf/.gitignore | 1 - + tools/testing/selftests/bpf/Makefile | 31 +- + tools/testing/selftests/bpf/bench.c | 6 + + .../testing/selftests/bpf/benchs/bench_libarena.c | 210 +++ + .../selftests/bpf/benchs/run_bench_libarena.sh | 31 + + .../selftests/bpf/bpftool_btf_dump_sorted.expected | 48 + + .../bpf/bpftool_btf_dump_unsorted.expected | 48 + + tools/testing/selftests/bpf/bpftool_helpers.c | 7 +- + tools/testing/selftests/bpf/config | 2 + + tools/testing/selftests/bpf/libarena/Makefile | 31 +- + .../bpf/libarena/benchs/bench_malloc.bpf.c | 51 + + .../bpf/libarena/include/bpf_arena_spin_lock.h | 2 +- + .../selftests/bpf/libarena/include/bpf_atomic.h | 2 +- + .../selftests/bpf/libarena/include/bpf_may_goto.h | 1 + + .../bpf/libarena/include/libarena/bitmap.h | 30 +- + .../bpf/libarena/include/libarena/common.h | 71 + + .../bpf/libarena/selftests/test_bitmap.bpf.c | 3 + + .../testing/selftests/bpf/libarena/src/asan.bpf.c | 21 +- + .../selftests/bpf/libarena/src/bitmap.bpf.c | 18 - + .../testing/selftests/bpf/libarena/src/buddy.bpf.c | 44 +- + .../selftests/bpf/libarena/src/common.bpf.c | 27 +- + tools/testing/selftests/bpf/network_helpers.c | 46 +- + .../selftests/bpf/prog_tests/aggregate_ret.c | 53 + + .../selftests/bpf/prog_tests/attach_probe.c | 6 +- + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 2 +- + .../selftests/bpf/prog_tests/bpftool_btf_dump.c | 178 ++ + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 127 +- + .../testing/selftests/bpf/prog_tests/core_reloc.c | 10 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 16 + + .../selftests/bpf/prog_tests/global_data_init.c | 96 +- + tools/testing/selftests/bpf/prog_tests/kasan.c | 479 +++++ + .../testing/selftests/bpf/prog_tests/kernel_flag.c | 3 + + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 2 +- + .../testing/selftests/bpf/prog_tests/lirc_mode2.c | 334 ++++ + .../bpf/prog_tests/prog_tests_framework.c | 23 + + .../selftests/bpf/prog_tests/queue_stack_map.c | 29 + + .../selftests/bpf/prog_tests/signed_loader.c | 600 +++++- + tools/testing/selftests/bpf/prog_tests/stream.c | 67 + + tools/testing/selftests/bpf/prog_tests/usdt.c | 54 + + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + .../selftests/bpf/prog_tests/verify_pkcs7_sig.c | 4 +- + .../selftests/bpf/prog_tests/xdp_adjust_frags.c | 3 + + .../selftests/bpf/prog_tests/xdp_devmap_attach.c | 5 + + .../selftests/bpf/prog_tests/xdp_metadata.c | 4 +- + .../selftests/bpf/progs/aggregate_ret_func.c | 383 ++++ + .../selftests/bpf/progs/aggregate_ret_kfunc.c | 203 ++ + .../bpf/progs/aggregate_ret_kfunc_arena.c | 121 ++ + .../selftests/bpf/progs/aggregate_ret_target.c | 29 + + tools/testing/selftests/bpf/progs/arena_kfunc.c | 3 +- + tools/testing/selftests/bpf/progs/bpf_misc.h | 10 +- + .../selftests/bpf/progs/btf__stack_arg_precision.c | 3 +- + .../bpf/progs/btf__verifier_stack_arg_order.c | 3 +- + .../selftests/bpf/progs/compute_live_registers.c | 36 + + .../testing/selftests/bpf/progs/exceptions_fail.c | 2 +- + .../selftests/bpf/progs/freplace_ret_pair.c | 12 + + tools/testing/selftests/bpf/progs/kasan.c | 502 +++++ + tools/testing/selftests/bpf/progs/kasan_harden.c | 52 + + tools/testing/selftests/bpf/progs/lirc_mode2.c | 32 + + tools/testing/selftests/bpf/progs/stack_arg.c | 3 +- + tools/testing/selftests/bpf/progs/stack_arg_fail.c | 3 +- + .../testing/selftests/bpf/progs/stack_arg_kfunc.c | 3 +- + .../selftests/bpf/progs/stack_arg_precision.c | 4 +- + tools/testing/selftests/bpf/progs/stream.c | 28 + + .../selftests/bpf/progs/test_global_percpu_data.c | 10 +- + .../selftests/bpf/progs/test_lirc_mode2_kern.c | 26 - + .../selftests/bpf/progs/verifier_aggregate_ret.c | 179 ++ + tools/testing/selftests/bpf/progs/verifier_arena.c | 48 + + tools/testing/selftests/bpf/progs/verifier_bswap.c | 3 +- + tools/testing/selftests/bpf/progs/verifier_gotol.c | 1 + + .../selftests/bpf/progs/verifier_jit_inline.c | 2 +- + tools/testing/selftests/bpf/progs/verifier_ldsx.c | 36 +- + .../selftests/bpf/progs/verifier_load_acquire.c | 1 + + tools/testing/selftests/bpf/progs/verifier_movsx.c | 3 +- + .../selftests/bpf/progs/verifier_percpu_addr.c | 1 + + .../selftests/bpf/progs/verifier_private_stack.c | 1 + + tools/testing/selftests/bpf/progs/verifier_sdiv.c | 3 +- + .../selftests/bpf/progs/verifier_stack_arg.c | 4 +- + .../selftests/bpf/progs/verifier_stack_arg_order.c | 4 +- + .../selftests/bpf/progs/verifier_store_release.c | 1 + + tools/testing/selftests/bpf/test_btf.h | 2 +- + .../testing/selftests/bpf/test_kmods/bpf_testmod.c | 182 ++ + .../selftests/bpf/test_kmods/bpf_testmod_kfunc.h | 101 + + tools/testing/selftests/bpf/test_lirc_mode2.sh | 41 - + tools/testing/selftests/bpf/test_lirc_mode2_user.c | 177 -- + tools/testing/selftests/bpf/test_loader.c | 9 + + tools/testing/selftests/bpf/testing_helpers.c | 43 + + tools/testing/selftests/bpf/testing_helpers.h | 3 + + tools/testing/selftests/bpf/unpriv_helpers.c | 19 +- + tools/testing/selftests/bpf/unpriv_helpers.h | 2 + + tools/testing/selftests/bpf/usdt_2.c | 16 + + tools/testing/selftests/bpf/verify_sig_setup.sh | 63 +- + tools/testing/selftests/bpf/vmtest.sh | 16 +- + tools/testing/selftests/bpf/xdp_hw_metadata.c | 2 +- + .../selftests/clone3/clone3_clear_sighand.c | 6 +- + tools/testing/selftests/core/close_range_test.c | 951 ++++++++++ + tools/testing/selftests/coredump/.gitignore | 2 + + tools/testing/selftests/coredump/Makefile | 11 +- + .../selftests/coredump/coredump_notify_signal.h | 29 + + .../coredump/coredump_notify_signal_helper.c | 46 + + .../coredump/coredump_notify_signal_test.c | 245 +++ + .../selftests/coredump/coredump_signal_test.c | 238 +++ + .../coredump/coredump_socket_protocol_test.c | 1983 +++++++++++++++----- + .../selftests/coredump/coredump_socket_test.c | 175 ++ + tools/testing/selftests/coredump/coredump_test.h | 32 +- + .../selftests/coredump/coredump_test_helpers.c | 1788 +++++++++++++++++- + .../selftests/coredump/coredump_test_helpers.h | 81 + + .../selftests/coredump/coredump_worker_test.c | 447 +++++ + tools/testing/selftests/exec/Makefile | 4 + + tools/testing/selftests/exec/binfmt_misc_delim.c | 127 ++ + tools/testing/selftests/filesystems/.gitignore | 1 - + tools/testing/selftests/filesystems/Makefile | 2 +- + tools/testing/selftests/filesystems/config | 8 + + .../selftests/filesystems/configfs/.gitignore | 2 + + .../selftests/filesystems/configfs/Makefile | 8 + + .../testing/selftests/filesystems/configfs/config | 5 + + .../selftests/filesystems/configfs/configfs_test.c | 481 +++++ + .../selftests/filesystems/file_stressor/.gitignore | 2 + + .../selftests/filesystems/file_stressor/Makefile | 6 + + .../{ => file_stressor}/file_stressor.c | 0 + .../selftests/filesystems/file_stressor/settings | 3 + + .../selftests/filesystems/fscontext_ns/.gitignore | 2 + + .../testing/selftests/filesystems/fuse/.gitignore | 1 + + tools/testing/selftests/filesystems/fuse/Makefile | 2 +- + .../selftests/filesystems/idmapped_tmpfile.c | 7 + + tools/testing/selftests/filesystems/kernfs_test.c | 1203 +++++++++++- + .../filesystems/open_tree_ns/open_tree_ns_test.c | 198 ++ + .../selftests/filesystems/openat2/openat2_test.c | 10 +- + .../selftests/filesystems/openat2/resolve_test.c | 7 +- + .../filesystems/statmount/statmount_test.c | 2 +- + tools/testing/selftests/namespaces/.gitignore | 1 + + tools/testing/selftests/namespaces/Makefile | 3 +- + .../selftests/namespaces/ns_active_ref_test.c | 29 + + .../selftests/namespaces/uid_map_range_test.c | 299 +++ + tools/testing/selftests/net/af_unix/Makefile | 2 + + tools/testing/selftests/net/af_unix/scm_pidfd.c | 602 ++++++ + tools/testing/selftests/nfsd/.gitignore | 1 + + tools/testing/selftests/nfsd/Makefile | 6 + + tools/testing/selftests/nfsd/config | 14 + + .../testing/selftests/nfsd/nfsd_netlink_listener.c | 1721 +++++++++++++++++ + tools/testing/selftests/nfsd/settings | 1 + + tools/testing/selftests/pid_namespace/.gitignore | 1 + + tools/testing/selftests/pid_namespace/Makefile | 2 +- + .../selftests/pid_namespace/pidns_dead_ancestor.c | 174 ++ + tools/testing/selftests/pidfd/pidfd_open_test.c | 2 +- + virt/kvm/guest_memfd.c | 2 +- + 1282 files changed, 54625 insertions(+), 23792 deletions(-) + delete mode 100644 Documentation/core-api/folio_queue.rst + delete mode 100644 Documentation/filesystems/bfs.rst + create mode 100644 Documentation/filesystems/exfat.rst + create mode 100644 Documentation/filesystems/nfs/keyring.rst + create mode 100644 Documentation/sunrpc/xdr/nfs2.x + delete mode 100644 arch/powerpc/platforms/cell/spufs/coredump.c + delete mode 100644 fs/bfs/Kconfig + delete mode 100644 fs/bfs/Makefile + delete mode 100644 fs/bfs/bfs.h + delete mode 100644 fs/bfs/dir.c + delete mode 100644 fs/bfs/file.c + delete mode 100644 fs/bfs/inode.c + create mode 100644 fs/f2fs/cache.c + create mode 100644 fs/f2fs/cache.h + create mode 100644 fs/netfs/bvecq.c + delete mode 100644 fs/netfs/fscache_internal.h + create mode 100644 fs/nfsd/nfs2xdr_gen.c + create mode 100644 fs/nfsd/nfs2xdr_gen.h + create mode 100644 fs/nfsd/nfs4ctl.h + create mode 100644 fs/nfsd/nfserr.h + create mode 100644 fs/ntfs/named_stream.c + create mode 100644 fs/ntfs/stream.h + create mode 100644 fs/smb/server/tests/Kconfig + create mode 100644 fs/smb/server/tests/Makefile + create mode 100644 fs/smb/server/tests/smbacl_kunit.c + create mode 100644 fs/tests/.kunitconfig + create mode 100644 fs/tests/fdtable_kunit.c + rename fs/xfs/{ => libxfs}/xfs_attr_item.h (97%) + rename fs/xfs/{ => libxfs}/xfs_bmap_item.h (98%) + rename fs/xfs/{ => libxfs}/xfs_buf_item.h (98%) + rename fs/xfs/{ => libxfs}/xfs_dquot_item.h (100%) + rename fs/xfs/{ => libxfs}/xfs_exchmaps_item.h (98%) + rename fs/xfs/{ => libxfs}/xfs_extfree_item.h (98%) + rename fs/xfs/{ => libxfs}/xfs_icreate_item.h (100%) + rename fs/xfs/{ => libxfs}/xfs_inode_item.h (98%) + rename fs/xfs/{ => libxfs}/xfs_iunlink_item.h (100%) + rename fs/xfs/{ => libxfs}/xfs_refcount_item.h (98%) + rename fs/xfs/{ => libxfs}/xfs_rmap_item.h (98%) + rename fs/xfs/{ => libxfs}/xfs_trans.h (98%) + create mode 100644 fs/xfs/scrub/refcount.h + create mode 100644 include/linux/bvecq.h + delete mode 100644 include/linux/folio_queue.h + create mode 100644 include/linux/nfs_fh.h + create mode 100644 include/linux/nfsd_ssc.h + create mode 100644 include/linux/sunrpc/xdrgen/nfs2.h + create mode 100644 include/uapi/linux/ntfs.h + create mode 100644 kernel/bpf/keys.c + create mode 100644 kernel/tests/.kunitconfig + create mode 100644 kernel/tests/user_ns_map_kunit.c + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/decoder/pages_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/definition/pages_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/pointer/encoder/pages_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/declaration/aggregate_hooks.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/aggregate_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/aggregate_optional.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/decoder/pages_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/definition/pages_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/aggregate_array.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/aggregate_optional.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/struct/encoder/pages_opaque.j2 + create mode 100644 tools/net/sunrpc/xdrgen/templates/C/union/encoder/pages_opaque.j2 + create mode 100644 tools/testing/selftests/bpf/benchs/bench_libarena.c + create mode 100755 tools/testing/selftests/bpf/benchs/run_bench_libarena.sh + create mode 100644 tools/testing/selftests/bpf/bpftool_btf_dump_sorted.expected + create mode 100644 tools/testing/selftests/bpf/bpftool_btf_dump_unsorted.expected + create mode 100644 tools/testing/selftests/bpf/libarena/benchs/bench_malloc.bpf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/aggregate_ret.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpftool_btf_dump.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/kasan.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/lirc_mode2.c + create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_func.c + create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_kfunc.c + create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_kfunc_arena.c + create mode 100644 tools/testing/selftests/bpf/progs/aggregate_ret_target.c + create mode 100644 tools/testing/selftests/bpf/progs/freplace_ret_pair.c + create mode 100644 tools/testing/selftests/bpf/progs/kasan.c + create mode 100644 tools/testing/selftests/bpf/progs/kasan_harden.c + create mode 100644 tools/testing/selftests/bpf/progs/lirc_mode2.c + delete mode 100644 tools/testing/selftests/bpf/progs/test_lirc_mode2_kern.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_aggregate_ret.c + delete mode 100755 tools/testing/selftests/bpf/test_lirc_mode2.sh + delete mode 100644 tools/testing/selftests/bpf/test_lirc_mode2_user.c + create mode 100644 tools/testing/selftests/coredump/coredump_notify_signal.h + create mode 100644 tools/testing/selftests/coredump/coredump_notify_signal_helper.c + create mode 100644 tools/testing/selftests/coredump/coredump_notify_signal_test.c + create mode 100644 tools/testing/selftests/coredump/coredump_signal_test.c + create mode 100644 tools/testing/selftests/coredump/coredump_test_helpers.h + create mode 100644 tools/testing/selftests/coredump/coredump_worker_test.c + create mode 100644 tools/testing/selftests/exec/binfmt_misc_delim.c + create mode 100644 tools/testing/selftests/filesystems/config + create mode 100644 tools/testing/selftests/filesystems/configfs/.gitignore + create mode 100644 tools/testing/selftests/filesystems/configfs/Makefile + create mode 100644 tools/testing/selftests/filesystems/configfs/config + create mode 100644 tools/testing/selftests/filesystems/configfs/configfs_test.c + create mode 100644 tools/testing/selftests/filesystems/file_stressor/.gitignore + create mode 100644 tools/testing/selftests/filesystems/file_stressor/Makefile + rename tools/testing/selftests/filesystems/{ => file_stressor}/file_stressor.c (100%) + create mode 100644 tools/testing/selftests/filesystems/file_stressor/settings + create mode 100644 tools/testing/selftests/filesystems/fscontext_ns/.gitignore + create mode 100644 tools/testing/selftests/namespaces/uid_map_range_test.c + create mode 100644 tools/testing/selftests/nfsd/.gitignore + create mode 100644 tools/testing/selftests/nfsd/Makefile + create mode 100644 tools/testing/selftests/nfsd/config + create mode 100644 tools/testing/selftests/nfsd/nfsd_netlink_listener.c + create mode 100644 tools/testing/selftests/nfsd/settings + create mode 100644 tools/testing/selftests/pid_namespace/pidns_dead_ancestor.c +Merging printk/for-next (d3145c36346eb Merge branch 'for-7.3-hotfix' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging kernel/reboot.c +Merge made by the 'ort' strategy. + kernel/printk/printk.c | 130 ++++++++++++++++++++------------------ + kernel/printk/printk_ringbuffer.c | 17 ++--- + kernel/reboot.c | 9 +++ + lib/tests/printf_kunit.c | 1 + + lib/vsprintf.c | 19 +++--- + 5 files changed, 96 insertions(+), 80 deletions(-) +Merging pci/next (0e724d5d2c4a5 Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging MAINTAINERS +Auto-merging drivers/net/wireless/ath/ath12k/pci.c +Auto-merging drivers/pci/controller/dwc/pci-imx6.c +Auto-merging drivers/pci/controller/dwc/pcie-dw-rockchip.c +Auto-merging drivers/pci/endpoint/pci-ep-msi.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pcie/aer.c +CONFLICT (content): Merge conflict in drivers/pci/pcie/aer.c +Auto-merging drivers/pci/quirks.c +Auto-merging include/linux/pci.h +Resolved 'drivers/pci/pcie/aer.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 26c6f43230467] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-bus-pci | 14 +- + Documentation/PCI/controller/index.rst | 1 - + .../PCI/controller/rcar-pcie-firmware.rst | 32 - + .../bindings/pci/nvidia,tegra20-pcie.txt | 670 --------------------- + .../bindings/pci/nvidia,tegra20-pcie.yaml | 532 ++++++++++++++++ + .../devicetree/bindings/pci/rcar-gen4-pci-ep.yaml | 9 +- + .../bindings/pci/rcar-gen4-pci-host.yaml | 81 ++- + .../bindings/pci/renesas,r9a08g045-pcie.yaml | 33 +- + .../devicetree/bindings/pci/toshiba,tc9563.yaml | 14 +- + .../devicetree/bindings/pci/xilinx-versal-cpm.yaml | 38 ++ + Documentation/driver-api/pci/p2pdma.rst | 6 +- + MAINTAINERS | 1 - + drivers/acpi/pci_root.c | 76 ++- + drivers/gpio/Kconfig | 11 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-tc9563.c | 99 +++ + drivers/net/wireless/ath/ath10k/Kconfig | 2 +- + drivers/net/wireless/ath/ath10k/pci.c | 11 +- + drivers/net/wireless/ath/ath10k/pci.h | 5 +- + drivers/net/wireless/ath/ath11k/Kconfig | 2 +- + drivers/net/wireless/ath/ath11k/pci.c | 19 +- + drivers/net/wireless/ath/ath11k/pci.h | 3 +- + drivers/net/wireless/ath/ath12k/Kconfig | 2 +- + drivers/net/wireless/ath/ath12k/pci.c | 19 +- + drivers/net/wireless/ath/ath12k/pci.h | 4 +- + .../pci/controller/cadence/pcie-cadence-debugfs.c | 15 +- + drivers/pci/controller/cadence/pcie-cadence-plat.c | 6 +- + drivers/pci/controller/cadence/pcie-cadence.c | 16 +- + drivers/pci/controller/cadence/pcie-cadence.h | 2 - + drivers/pci/controller/dwc/pci-dra7xx.c | 22 +- + drivers/pci/controller/dwc/pci-imx6.c | 120 +++- + drivers/pci/controller/dwc/pci-keystone.c | 36 +- + drivers/pci/controller/dwc/pcie-designware-ep.c | 18 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 18 +- + drivers/pci/controller/dwc/pcie-designware.c | 176 +++--- + drivers/pci/controller/dwc/pcie-designware.h | 252 ++++---- + drivers/pci/controller/dwc/pcie-dw-rockchip.c | 1 + + drivers/pci/controller/dwc/pcie-fu740.c | 6 +- + drivers/pci/controller/dwc/pcie-histb.c | 1 + + drivers/pci/controller/dwc/pcie-nxp-s32g.c | 18 +- + drivers/pci/controller/dwc/pcie-qcom-common.c | 28 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 1 + + drivers/pci/controller/dwc/pcie-qcom.c | 182 ++++-- + drivers/pci/controller/dwc/pcie-rcar-gen4.c | 347 +++++++++-- + drivers/pci/controller/dwc/pcie-spacemit-k1.c | 3 + + drivers/pci/controller/dwc/pcie-tegra194-acpi.c | 22 +- + drivers/pci/controller/dwc/pcie-tegra194.c | 87 +-- + drivers/pci/controller/dwc/pcie-ultrarisc.c | 10 +- + drivers/pci/controller/pci-aardvark.c | 31 +- + drivers/pci/controller/pci-mvebu.c | 21 +- + drivers/pci/controller/pci-tegra.c | 1 + + drivers/pci/controller/pci-xgene.c | 11 +- + drivers/pci/controller/pcie-aspeed.c | 9 +- + drivers/pci/controller/pcie-mediatek-gen3.c | 15 +- + drivers/pci/controller/pcie-mediatek.c | 4 +- + drivers/pci/controller/pcie-rockchip-ep.c | 13 - + drivers/pci/controller/pcie-rockchip-host.c | 21 +- + drivers/pci/controller/pcie-rockchip.c | 14 +- + drivers/pci/controller/pcie-rockchip.h | 3 - + drivers/pci/controller/pcie-rzg3s-host.c | 76 ++- + drivers/pci/controller/pcie-tegra264.c | 9 +- + drivers/pci/controller/pcie-xilinx-cpm.c | 77 ++- + drivers/pci/controller/plda/pcie-starfive.c | 1 + + drivers/pci/controller/vmd.c | 60 +- + drivers/pci/doe.c | 5 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 93 ++- + drivers/pci/endpoint/pci-ep-msi.c | 40 +- + drivers/pci/hotplug/pciehp_core.c | 4 +- + drivers/pci/iov.c | 25 - + drivers/pci/p2pdma.c | 43 +- + drivers/pci/pci-acpi.c | 3 - + drivers/pci/pci-driver.c | 100 ++- + drivers/pci/pci-label.c | 94 ++- + drivers/pci/pci.c | 39 +- + drivers/pci/pci.h | 13 +- + drivers/pci/pcie/aer.c | 62 +- + drivers/pci/pcie/aer_cxl_rch.c | 2 +- + drivers/pci/pcie/aspm.c | 140 +++-- + drivers/pci/pcie/err.c | 2 +- + drivers/pci/pcie/portdrv.c | 6 +- + drivers/pci/pcie/portdrv.h | 2 - + drivers/pci/probe.c | 25 +- + drivers/pci/pwrctrl/Kconfig | 2 + + drivers/pci/pwrctrl/core.c | 3 + + drivers/pci/pwrctrl/generic.c | 1 + + drivers/pci/pwrctrl/pci-pwrctrl-tc9563.c | 321 ++++++---- + drivers/pci/quirks.c | 161 ++++- + drivers/pci/tph.c | 6 +- + include/linux/pci-epf.h | 3 +- + include/linux/pci.h | 9 +- + include/linux/soc/qcom/tc9563.h | 19 + + 91 files changed, 2894 insertions(+), 1767 deletions(-) + delete mode 100644 Documentation/PCI/controller/rcar-pcie-firmware.rst + delete mode 100644 Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.txt + create mode 100644 Documentation/devicetree/bindings/pci/nvidia,tegra20-pcie.yaml + create mode 100644 drivers/gpio/gpio-tc9563.c + create mode 100644 include/linux/soc/qcom/tc9563.h +$ git am -3 ../patches/0001-pci-Fix-up-extra-in-mismerge.patch +Applying: pci: Fix up extra } in mismerge +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/pci/pcie/aer.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master e031a0bf8390a] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git + Date: Wed Oct 14 13:36:23 2026 +0100 +Merging pstore/for-next/pstore (7c756181175d5 pstore: publish big_oops_buf after max_compressed_size) +$ git merge -m Merge branch 'for-next/pstore' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Merge made by the 'ort' strategy. + fs/pstore/platform.c | 12 +++++++++--- + fs/pstore/ram.c | 1 + + fs/pstore/ram_core.c | 6 ++++++ + 3 files changed, 16 insertions(+), 3 deletions(-) +Merging hid/for-next (145c2b2e9a5c0 Merge branch 'for-7.3/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 6 + + drivers/hid/Kconfig | 21 +- + drivers/hid/Makefile | 2 +- + drivers/hid/amd-sfh-hid/amd_sfh_common.h | 2 + + drivers/hid/amd-sfh-hid/amd_sfh_pcie.c | 10 + + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_desc.c | 13 +- + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.c | 37 +- + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.h | 7 + + .../hid/bpf/progs/Huion__Inspiroy-Frego-M.bpf.c | 11 +- + drivers/hid/hid-appletb-kbd.c | 95 ++- + drivers/hid/hid-asus.c | 14 +- + drivers/hid/hid-google-hammer.c | 2 +- + drivers/hid/hid-ids.h | 12 + + drivers/hid/hid-kysona.c | 292 -------- + drivers/hid/hid-lenovo.c | 14 + + drivers/hid/hid-nintendo.c | 14 +- + drivers/hid/hid-pulsar.c | 765 +++++++++++++++++++++ + drivers/hid/i2c-hid/i2c-hid-acpi.c | 8 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 11 +- + .../intel-thc-hid/intel-quicki2c/pci-quicki2c.c | 4 +- + .../intel-thc-hid/intel-quicki2c/quicki2c-dev.h | 2 + + .../intel-thc-hid/intel-quicki2c/quicki2c-hid.c | 6 +- + .../intel-thc-hid/intel-quicki2c/quicki2c-hid.h | 2 +- + .../intel-thc-hid/intel-quickspi/pci-quickspi.c | 2 + + .../intel-thc-hid/intel-quickspi/quickspi-dev.h | 2 + + .../intel-thc-hid/intel-quickspi/quickspi-hid.c | 6 +- + .../intel-thc-hid/intel-quickspi/quickspi-hid.h | 2 +- + .../intel-quickspi/quickspi-protocol.c | 2 +- + drivers/hid/surface-hid/surface_kbd.c | 4 +- + drivers/hid/usbhid/hiddev.c | 45 +- + drivers/hid/wacom.h | 2 +- + drivers/hid/wacom_sys.c | 196 ++++-- + drivers/hid/wacom_wac.c | 72 +- + drivers/hid/wacom_wac.h | 6 +- + include/linux/hiddev.h | 2 + + 35 files changed, 1219 insertions(+), 472 deletions(-) + delete mode 100644 drivers/hid/hid-kysona.c + create mode 100644 drivers/hid/hid-pulsar.c +Merging i2c/i2c/for-next (8cd9520d35a6c Linux 7.1) +$ git merge -m Merge branch 'i2c/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Already up to date. +$ git am -3 ../patches/0001-i2c-Fix-up-the-rest-of-the-merge.patch +Applying: i2c: Fix up the rest of the merge +Using index info to reconstruct a base tree... +M drivers/i2c/i2c-core-base.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/i2c/i2c-core-base.c +No changes -- Patch already applied. +Merging i2c-andi/i2c/i2c-next (d5b634bccdf9a Merge branch 'i2c/i2c' into i2c/i2c-next) +$ git merge -m Merge branch 'i2c/i2c-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andi.shyti/linux.git i2c-andi/i2c/i2c-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 1 + + .../bindings/i2c/novatek,nt72676-i2c.yaml | 76 +++ + .../devicetree/bindings/i2c/renesas,rcar-i2c.yaml | 4 +- + .../bindings/i2c/snps,designware-i2c.yaml | 16 + + .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 2 +- + Documentation/i2c/writing-clients.rst | 2 +- + MAINTAINERS | 7 + + drivers/i2c/Kconfig | 13 + + drivers/i2c/busses/Kconfig | 12 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-amd-asf-plat.c | 2 +- + drivers/i2c/busses/i2c-amd-mp2-plat.c | 2 +- + drivers/i2c/busses/i2c-bcm2835.c | 2 +- + drivers/i2c/busses/i2c-cros-ec-tunnel.c | 2 +- + drivers/i2c/busses/i2c-designware-master.c | 15 +- + drivers/i2c/busses/i2c-designware-platdrv.c | 42 +- + drivers/i2c/busses/i2c-gpio.c | 2 +- + drivers/i2c/busses/i2c-hisi.c | 2 +- + drivers/i2c/busses/i2c-i801.c | 10 +- + drivers/i2c/busses/i2c-imx-lpi2c.c | 20 +- + drivers/i2c/busses/i2c-imx.c | 2 +- + drivers/i2c/busses/i2c-ljca.c | 9 - + drivers/i2c/busses/i2c-ls2x.c | 2 +- + drivers/i2c/busses/i2c-mlxbf.c | 8 +- + drivers/i2c/busses/i2c-nt72676.c | 725 +++++++++++++++++++++ + drivers/i2c/busses/i2c-qcom-cci.c | 334 ++++++---- + drivers/i2c/busses/i2c-qcom-geni.c | 81 ++- + drivers/i2c/busses/i2c-qup.c | 2 +- + drivers/i2c/busses/i2c-scmi.c | 8 +- + drivers/i2c/busses/i2c-synquacer.c | 4 +- + drivers/i2c/busses/i2c-tegra.c | 8 +- + drivers/i2c/busses/i2c-usbio.c | 12 +- + drivers/i2c/busses/i2c-viai2c-zhaoxin.c | 2 +- + drivers/i2c/busses/i2c-xgene-slimpro.c | 6 +- + drivers/i2c/busses/i2c-xlp9xx.c | 6 +- + drivers/i2c/i2c-core-acpi.c | 20 +- + drivers/i2c/i2c-core-base.c | 46 ++ + drivers/i2c/i2c-core-smbus.c | 24 +- + drivers/i2c/i2c-dev.c | 3 + + drivers/i2c/i2c-mux.c | 98 +-- + drivers/media/i2c/isl7998x.c | 3 +- + include/linux/i2c.h | 36 +- + 42 files changed, 1352 insertions(+), 320 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/novatek,nt72676-i2c.yaml + create mode 100644 drivers/i2c/busses/i2c-nt72676.c +Merging i2c-rust/rust-i2c-next (61ddec70c9bcc i2c: rust: mark I2cAdapter methods as inline) +$ git merge -m Merge branch 'rust-i2c-next' of https://github.com/ikrtn/rust-for-linux i2c-rust/rust-i2c-next +Auto-merging drivers/i2c/busses/i2c-amd-asf-plat.c +Auto-merging drivers/i2c/busses/i2c-hisi.c +Auto-merging drivers/i2c/busses/i2c-imx-lpi2c.c +CONFLICT (content): Merge conflict in drivers/i2c/busses/i2c-imx-lpi2c.c +Auto-merging drivers/i2c/busses/i2c-imx.c +Auto-merging drivers/i2c/busses/i2c-ls2x.c +Auto-merging drivers/i2c/busses/i2c-mlxbf.c +Auto-merging drivers/i2c/busses/i2c-qcom-geni.c +Auto-merging drivers/i2c/busses/i2c-synquacer.c +Auto-merging drivers/i2c/busses/i2c-viai2c-wmt.c +Auto-merging drivers/i2c/busses/i2c-viai2c-zhaoxin.c +Auto-merging drivers/i2c/busses/i2c-xlp9xx.c +Auto-merging rust/kernel/i2c.rs +Resolved 'drivers/i2c/busses/i2c-imx-lpi2c.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b39fbd1cc8c4f] Merge branch 'rust-i2c-next' of https://github.com/ikrtn/rust-for-linux +$ git diff -M --stat --summary HEAD^.. + drivers/i2c/busses/i2c-imx-lpi2c.c | 18 ++++-------------- + 1 file changed, 4 insertions(+), 14 deletions(-) +Merging i3c/i3c/next (fc5eb1b0631aa dt-bindings: i3c: Add Synaptics sl2610 i3c) +$ git merge -m Merge branch 'i3c/next' of https://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Auto-merging MAINTAINERS +Auto-merging drivers/i3c/master/amd-i3c-master.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/i3c/nxp,p3h2840.yaml | 330 ++++++++ + .../bindings/i3c/snps,dw-i3c-master.yaml | 16 +- + MAINTAINERS | 9 + + drivers/i3c/Kconfig | 14 + + drivers/i3c/Makefile | 1 + + drivers/i3c/device.c | 15 +- + drivers/i3c/hub.c | 832 +++++++++++++++++++++ + drivers/i3c/internals.h | 16 + + drivers/i3c/master.c | 476 ++++++++++-- + drivers/i3c/master/adi-i3c-master.c | 4 + + drivers/i3c/master/amd-i3c-master.c | 4 +- + drivers/i3c/master/dw-i3c-master.c | 28 +- + drivers/i3c/master/dw-i3c-master.h | 2 +- + drivers/i3c/master/mipi-i3c-hci/cmd.h | 4 +- + drivers/i3c/master/mipi-i3c-hci/cmd_v1.c | 28 +- + drivers/i3c/master/mipi-i3c-hci/cmd_v2.c | 4 +- + drivers/i3c/master/mipi-i3c-hci/core.c | 112 ++- + drivers/i3c/master/mipi-i3c-hci/dat.h | 2 + + drivers/i3c/master/mipi-i3c-hci/dat_v1.c | 13 +- + drivers/i3c/master/mipi-i3c-hci/dma.c | 136 +++- + drivers/i3c/master/mipi-i3c-hci/hci.h | 9 +- + drivers/i3c/master/mipi-i3c-hci/mipi-i3c-hci-pci.c | 5 +- + include/linux/i3c/device.h | 4 + + include/linux/i3c/hub.h | 92 +++ + include/linux/i3c/master.h | 20 + + include/linux/platform_data/mipi-i3c-hci.h | 4 + + 26 files changed, 2024 insertions(+), 156 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i3c/nxp,p3h2840.yaml + create mode 100644 drivers/i3c/hub.c + create mode 100644 include/linux/i3c/hub.h +Merging dmi/dmi-for-next (1afafbaf749d8 firmware/dmi: Include product_family info to modalias) +$ git merge -m Merge branch 'dmi-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (4781ca52761e6 hwmon:(pmbus/xdpe1a2g7b) Add support for xdpe1a2g7c controller) +$ git merge -m Merge branch 'hwmon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-hwmon | 36 + + .../bindings/hwmon/axiado,ax3000-pwm-fan.yaml | 72 ++ + .../bindings/hwmon/axiado,ax3000-tsadc.yaml | 45 + + .../devicetree/bindings/hwmon/national,lm63.yaml | 55 ++ + .../devicetree/bindings/hwmon/national,lm90.yaml | 28 +- + .../bindings/hwmon/pmbus/adi,max20826.yaml | 102 ++ + .../bindings/hwmon/pmbus/infineon,tda38740.yaml | 55 ++ + .../bindings/hwmon/pmbus/isil,isl68137.yaml | 2 + + .../bindings/hwmon/pmbus/ti,tps25990.yaml | 8 +- + .../devicetree/bindings/hwmon/ti,tmp102.yaml | 16 +- + .../devicetree/bindings/hwmon/ti,tmp401.yaml | 3 + + .../devicetree/bindings/trivial-devices.yaml | 17 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/hwmon/arctic_fan_controller.rst | 26 +- + Documentation/hwmon/asus_ec_sensors.rst | 2 + + Documentation/hwmon/asus_rog_ryujin.rst | 1 + + Documentation/hwmon/axiado-pwm-fan.rst | 38 + + Documentation/hwmon/axiado-tsadc.rst | 41 + + Documentation/hwmon/honor-fmi.rst | 32 + + Documentation/hwmon/index.rst | 6 + + Documentation/hwmon/it87.rst | 8 + + Documentation/hwmon/lm63.rst | 22 + + Documentation/hwmon/max20826.rst | 139 +++ + Documentation/hwmon/max34440.rst | 28 +- + Documentation/hwmon/minisforum-um780xtx.rst | 68 ++ + Documentation/hwmon/nct6683.rst | 4 + + Documentation/hwmon/nct6775.rst | 32 + + Documentation/hwmon/sht4x.rst | 17 +- + Documentation/hwmon/socfpga-hwmon.rst | 52 + + Documentation/hwmon/sysfs-interface.rst | 14 +- + Documentation/hwmon/tda38740.rst | 65 ++ + Documentation/hwmon/tps25990.rst | 15 +- + Documentation/hwmon/tps53679.rst | 39 +- + Documentation/hwmon/vexpress.rst | 2 +- + Documentation/hwmon/yogafan.rst | 46 +- + MAINTAINERS | 45 +- + drivers/hwmon/Kconfig | 57 +- + drivers/hwmon/Makefile | 4 + + drivers/hwmon/abituguru.c | 4 +- + drivers/hwmon/acpi_power_meter.c | 4 +- + drivers/hwmon/adm1177.c | 2 +- + drivers/hwmon/adt7x10.c | 2 +- + drivers/hwmon/arctic_fan_controller.c | 22 +- + drivers/hwmon/asus-ec-sensors.c | 4 + + drivers/hwmon/asus_atk0110.c | 4 +- + drivers/hwmon/asus_rog_ryujin.c | 3 + + drivers/hwmon/asus_wmi_sensors.c | 2 +- + drivers/hwmon/axiado-pwm-fan.c | 416 ++++++++ + drivers/hwmon/axiado-tsadc.c | 275 ++++++ + drivers/hwmon/coretemp.c | 2 +- + drivers/hwmon/dell-smm-hwmon.c | 32 + + drivers/hwmon/emc2103.c | 2 +- + drivers/hwmon/hih6130.c | 4 +- + drivers/hwmon/honor-fmi.c | 178 ++++ + drivers/hwmon/hp-wmi-sensors.c | 2 +- + drivers/hwmon/hwmon.c | 6 + + drivers/hwmon/it87.c | 308 +++++- + drivers/hwmon/k10temp.c | 2 + + drivers/hwmon/lm63.c | 426 ++++++-- + drivers/hwmon/lm85.c | 2 +- + drivers/hwmon/lm90.c | 5 + + drivers/hwmon/minisforum-um780xtx.c | 501 ++++++++++ + drivers/hwmon/nct6775-core.c | 116 +++ + drivers/hwmon/nct6775-platform.c | 33 +- + drivers/hwmon/nct6775.h | 4 +- + drivers/hwmon/pmbus/Kconfig | 41 +- + drivers/hwmon/pmbus/Makefile | 2 + + drivers/hwmon/pmbus/ibm-cffps.c | 4 +- + drivers/hwmon/pmbus/isl68137.c | 4 + + drivers/hwmon/pmbus/ltc4286.c | 96 +- + drivers/hwmon/pmbus/max20826.c | 1044 ++++++++++++++++++++ + drivers/hwmon/pmbus/max34440.c | 2 + + drivers/hwmon/pmbus/mp2888.c | 4 +- + drivers/hwmon/pmbus/pmbus.h | 7 + + drivers/hwmon/pmbus/pmbus_core.c | 29 +- + drivers/hwmon/pmbus/tda38740.c | 64 ++ + drivers/hwmon/pmbus/tps25990.c | 249 +++-- + drivers/hwmon/pmbus/tps53679.c | 146 ++- + drivers/hwmon/pmbus/xdpe1a2g7b.c | 10 +- + drivers/hwmon/pt5161l.c | 4 +- + drivers/hwmon/pwm-fan.c | 2 +- + drivers/hwmon/scmi-hwmon.c | 3 +- + drivers/hwmon/sht4x.c | 66 +- + drivers/hwmon/socfpga-hwmon.c | 22 + + drivers/hwmon/spd5118.c | 67 +- + drivers/hwmon/xgene-hwmon.c | 6 +- + drivers/hwmon/yogafan.c | 48 + + include/linux/hwmon.h | 12 + + 88 files changed, 5146 insertions(+), 391 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/axiado,ax3000-pwm-fan.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/axiado,ax3000-tsadc.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/national,lm63.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/adi,max20826.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/infineon,tda38740.yaml + create mode 100644 Documentation/hwmon/axiado-pwm-fan.rst + create mode 100644 Documentation/hwmon/axiado-tsadc.rst + create mode 100644 Documentation/hwmon/honor-fmi.rst + create mode 100644 Documentation/hwmon/max20826.rst + create mode 100644 Documentation/hwmon/minisforum-um780xtx.rst + create mode 100644 Documentation/hwmon/tda38740.rst + create mode 100644 drivers/hwmon/axiado-pwm-fan.c + create mode 100644 drivers/hwmon/axiado-tsadc.c + create mode 100644 drivers/hwmon/honor-fmi.c + create mode 100644 drivers/hwmon/minisforum-um780xtx.c + create mode 100644 drivers/hwmon/pmbus/max20826.c + create mode 100644 drivers/hwmon/pmbus/tda38740.c +Merging jc_docs/docs-next (8fdbd353e6928 Revert "docs: landlock: fix ENOMSG condition in create_ruleset kernel-doc") +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/ABI/testing/sysfs-bus-pci +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging Documentation/filesystems/locking.rst +Auto-merging Documentation/filesystems/porting.rst +Auto-merging Documentation/filesystems/proc.rst +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging Makefile +Auto-merging tools/lib/python/kdoc/xforms_lists.py +Merge made by the 'ort' strategy. + .../ABI/stable/sysfs-driver-firmware-zynqmp | 70 +- + Documentation/ABI/testing/sysfs-bus-pci | 14 +- + Documentation/ABI/testing/sysfs-bus-usb | 3 +- + .../ABI/testing/sysfs-class-firmware-attributes | 21 +- + .../ABI/testing/sysfs-driver-aspeed-uart-routing | 7 +- + Documentation/ABI/testing/sysfs-driver-xdata | 20 +- + .../ABI/testing/sysfs-driver-xilinx-tmr-manager | 14 +- + Documentation/ABI/testing/sysfs-platform-intel-ifs | 6 +- + Documentation/Makefile | 5 + + Documentation/admin-guide/LSM/LoadPin.rst | 10 +- + Documentation/admin-guide/RAS/main.rst | 12 +- + Documentation/admin-guide/cpu-isolation.rst | 4 +- + Documentation/admin-guide/kernel-parameters.txt | 58 +- + Documentation/admin-guide/parport.rst | 2 +- + Documentation/admin-guide/sysctl/kernel.rst | 19 +- + Documentation/admin-guide/sysctl/vm.rst | 2 +- + .../verify-bugs-and-bisect-regressions.rst | 26 +- + Documentation/arch/powerpc/vas-api.rst | 4 +- + Documentation/core-api/cpu_hotplug.rst | 4 +- + Documentation/core-api/debug-objects.rst | 2 +- + Documentation/core-api/dma-attributes.rst | 2 +- + Documentation/core-api/dma-isa-lpc.rst | 11 +- + Documentation/core-api/housekeeping.rst | 2 +- + Documentation/core-api/irq/irq-affinity.rst | 2 +- + Documentation/core-api/irq/irqflags-tracing.rst | 8 +- + Documentation/core-api/maple_tree.rst | 9 +- + Documentation/core-api/real-time/differences.rst | 10 +- + Documentation/core-api/swiotlb.rst | 2 +- + Documentation/core-api/this_cpu_ops.rst | 6 +- + Documentation/core-api/xarray.rst | 4 +- + Documentation/doc-guide/kernel-doc.rst | 7 +- + Documentation/doc-guide/parse-headers.rst | 15 +- + Documentation/driver-api/reset.rst | 2 +- + Documentation/driver-api/serial/serial-rs485.rst | 5 +- + .../locking/cmpxchg-local/arch-support.txt | 2 +- + Documentation/filesystems/fuse/fuse.rst | 8 +- + Documentation/filesystems/locking.rst | 2 +- + Documentation/filesystems/porting.rst | 2 +- + Documentation/filesystems/proc.rst | 10 +- + Documentation/input/devices/yealink.rst | 7 +- + Documentation/input/notifier.rst | 2 +- + Documentation/livepatch/api.rst | 5 +- + Documentation/misc-devices/spear-pcie-gadget.rst | 10 +- + Documentation/process/1.Intro.rst | 2 +- + Documentation/process/2.Process.rst | 20 +- + Documentation/process/3.Early-stage.rst | 2 +- + Documentation/process/5.Posting.rst | 12 +- + Documentation/process/6.Followthrough.rst | 2 +- + Documentation/process/7.AdvancedTopics.rst | 36 +- + Documentation/process/backporting.rst | 18 +- + .../process/embargoed-hardware-issues.rst | 2 +- + Documentation/process/handling-regressions.rst | 2 +- + Documentation/process/howto.rst | 2 +- + Documentation/process/maintainer-pgp-guide.rst | 38 +- + Documentation/process/submitting-patches.rst | 2 +- + Documentation/scheduler/index.rst | 1 + + Documentation/scheduler/sched-preemption.rst | 87 ++ + Documentation/timers/hpet.rst | 33 +- + Documentation/timers/no_hz.rst | 4 +- + .../translations/pt_BR/admin-guide/README.rst | 382 ++++++ + .../translations/pt_BR/admin-guide/devices.rst | 278 +++++ + .../translations/pt_BR/admin-guide/index.rst | 190 +++ + Documentation/translations/pt_BR/index.rst | 10 + + .../translations/pt_BR/process/2.Process.rst | 14 +- + .../translations/pt_BR/process/3.Early-stage.rst | 10 +- + .../translations/pt_BR/process/4.Coding.rst | 6 +- + .../translations/pt_BR/process/5.Posting.rst | 12 +- + .../translations/pt_BR/process/6.Followthrough.rst | 14 +- + .../translations/pt_BR/process/8.Conclusion.rst | 3 +- + .../translations/pt_BR/process/adding-syscalls.rst | 56 +- + .../pt_BR/process/applying-patches.rst | 6 +- + .../translations/pt_BR/process/backporting.rst | 4 +- + .../process/code-of-conduct-interpretation.rst | 2 + + .../translations/pt_BR/process/code-of-conduct.rst | 4 +- + .../pt_BR/process/coding-assistants.rst | 60 + + .../translations/pt_BR/process/coding-style.rst | 1320 ++++++++++++++++++++ + Documentation/translations/pt_BR/process/cve.rst | 4 +- + .../translations/pt_BR/process/debugging/index.rst | 73 ++ + .../pt_BR/process/development-process.rst | 2 + + .../pt_BR/process/embargoed-hardware-issues.rst | 362 ++++++ + Documentation/translations/pt_BR/process/howto.rst | 19 +- + Documentation/translations/pt_BR/process/index.rst | 10 + + .../translations/pt_BR/process/kernel-docs.rst | 2 + + .../pt_BR/process/kernel-enforcement-statement.rst | 163 +++ + .../translations/pt_BR/process/license-rules.rst | 2 + + .../pt_BR/process/maintainer-devicetree.rst | 76 ++ + .../pt_BR/process/maintainer-handbooks.rst | 4 +- + .../pt_BR/process/maintainer-kvm-x86.rst | 10 +- + .../pt_BR/process/maintainer-soc-clean-dts.rst | 5 +- + .../translations/pt_BR/process/maintainer-tip.rst | 847 +++++++++++++ + .../pt_BR/process/management-style.rst | 9 +- + .../translations/pt_BR/process/security-bugs.rst | 25 +- + .../pt_BR/process/stable-api-nonsense.rst | 208 +++ + .../pt_BR/process/submit-checklist.rst | 4 +- + .../pt_BR/process/submitting-patches.rst | 963 ++++++++++++++ + .../pt_BR/process/volatile-considered-harmful.rst | 130 ++ + .../translations/zh_CN/admin-guide/README.rst | 2 +- + .../zh_CN/admin-guide/mm/damon/index.rst | 15 +- + .../zh_CN/admin-guide/mm/damon/lru_sort.rst | 68 +- + .../zh_CN/admin-guide/mm/damon/reclaim.rst | 82 +- + .../zh_CN/admin-guide/mm/damon/start.rst | 63 +- + .../zh_CN/admin-guide/mm/damon/stat.rst | 94 ++ + .../zh_CN/admin-guide/mm/damon/usage.rst | 521 ++++++-- + .../translations/zh_CN/mm/damon/design.rst | 667 +++++++++- + .../translations/zh_CN/networking/driver.rst | 138 ++ + .../translations/zh_CN/networking/index.rst | 10 +- + .../translations/zh_CN/networking/ipv6.rst | 76 ++ + .../translations/zh_CN/networking/secid.rst | 24 + + .../translations/zh_CN/networking/sriov.rst | 34 + + .../translations/zh_CN/networking/team.rst | 16 + + .../zh_CN/process/applying-patches.rst | 390 ++++++ + Documentation/translations/zh_CN/process/howto.rst | 2 +- + Documentation/translations/zh_CN/process/index.rst | 2 +- + Documentation/translations/zh_TW/glossary.rst | 168 +++ + Documentation/translations/zh_TW/index.rst | 5 +- + .../translations/zh_TW/process/1.Intro.rst | 227 ++-- + .../translations/zh_TW/process/2.Process.rst | 325 +++-- + .../translations/zh_TW/process/5.Posting.rst | 235 ++-- + .../zh_TW/process/7.AdvancedTopics.rst | 106 +- + .../translations/zh_TW/process/8.Conclusion.rst | 58 +- + .../process/code-of-conduct-interpretation.rst | 162 ++- + .../translations/zh_TW/process/coding-style.rst | 610 ++++----- + .../translations/zh_TW/process/email-clients.rst | 185 +-- + .../zh_TW/process/embargoed-hardware-issues.rst | 209 ++-- + Documentation/translations/zh_TW/process/howto.rst | 344 ++--- + Documentation/translations/zh_TW/process/index.rst | 105 +- + .../translations/zh_TW/process/license-rules.rst | 201 +-- + .../zh_TW/process/programming-language.rst | 92 +- + .../zh_TW/process/stable-kernel-rules.rst | 244 +++- + .../zh_TW/process/submitting-patches.rst | 568 +++++---- + Documentation/userspace-api/dma-buf-heaps.rst | 2 +- + Documentation/userspace-api/futex2.rst | 4 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 7 +- + Documentation/userspace-api/iommufd.rst | 2 +- + Documentation/userspace-api/vduse.rst | 33 +- + Documentation/virt/coco/sev-guest.rst | 2 +- + Makefile | 2 +- + include/uapi/linux/gpio.h | 2 +- + tools/lib/python/kdoc/c_lex.py | 2 +- + tools/lib/python/kdoc/kdoc_parser.py | 11 +- + tools/lib/python/kdoc/xforms_lists.py | 3 +- + tools/unittests/test_kdoc_parser.py | 26 + + 142 files changed, 9946 insertions(+), 2186 deletions(-) + create mode 100644 Documentation/scheduler/sched-preemption.rst + create mode 100644 Documentation/translations/pt_BR/admin-guide/README.rst + create mode 100644 Documentation/translations/pt_BR/admin-guide/devices.rst + create mode 100644 Documentation/translations/pt_BR/admin-guide/index.rst + create mode 100644 Documentation/translations/pt_BR/process/coding-assistants.rst + create mode 100644 Documentation/translations/pt_BR/process/coding-style.rst + create mode 100644 Documentation/translations/pt_BR/process/debugging/index.rst + create mode 100644 Documentation/translations/pt_BR/process/embargoed-hardware-issues.rst + create mode 100644 Documentation/translations/pt_BR/process/kernel-enforcement-statement.rst + create mode 100644 Documentation/translations/pt_BR/process/maintainer-devicetree.rst + create mode 100644 Documentation/translations/pt_BR/process/maintainer-tip.rst + create mode 100644 Documentation/translations/pt_BR/process/stable-api-nonsense.rst + create mode 100644 Documentation/translations/pt_BR/process/submitting-patches.rst + create mode 100644 Documentation/translations/pt_BR/process/volatile-considered-harmful.rst + create mode 100644 Documentation/translations/zh_CN/admin-guide/mm/damon/stat.rst + create mode 100644 Documentation/translations/zh_CN/networking/driver.rst + create mode 100644 Documentation/translations/zh_CN/networking/ipv6.rst + create mode 100644 Documentation/translations/zh_CN/networking/secid.rst + create mode 100644 Documentation/translations/zh_CN/networking/sriov.rst + create mode 100644 Documentation/translations/zh_CN/networking/team.rst + create mode 100644 Documentation/translations/zh_CN/process/applying-patches.rst + create mode 100644 Documentation/translations/zh_TW/glossary.rst +Merging v4l-dvb/next (d7e7bca716987 media: i2c: imx576: Fix line length register) +$ git merge -m Merge branch 'next' of git://linuxtv.org/media-ci/media-pending.git v4l-dvb/next +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/nvidia/tegra30-lg-p895.dts +Auto-merging arch/arm/boot/dts/nvidia/tegra30-lg-x3.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi +Auto-merging arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts +Auto-merging arch/arm64/boot/dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts +Auto-merging arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/i2c/i2c-atr.c +Auto-merging drivers/media/i2c/isl7998x.c +Auto-merging drivers/media/pci/intel/ipu-bridge.c +Auto-merging drivers/media/platform/nxp/imx7-media-csi.c +Auto-merging drivers/media/platform/verisilicon/rockchip_vpu981_hw_av1_dec.c +Auto-merging drivers/media/usb/em28xx/em28xx-video.c +Auto-merging drivers/media/v4l2-core/v4l2-ctrls-core.c +Merge made by the 'ort' strategy. + .../admin-guide/media/em28xx-cardlist.rst | 4 + + Documentation/admin-guide/media/vivid.rst | 4 +- + .../bindings/clock/nxp,imx95-blk-ctl.yaml | 71 + + .../media/allwinner,sun4i-a10-video-engine.yaml | 45 +- + .../bindings/media/fsl,imx95-csi-formatter.yaml | 88 + + .../bindings/media/i2c/himax,hm1246.yaml | 121 + + .../devicetree/bindings/media/i2c/hynix,hi846.yaml | 3 +- + .../devicetree/bindings/media/i2c/ite,it6625.yaml | 177 ++ + .../bindings/media/i2c/maxim,max9296a.yaml | 242 ++ + .../bindings/media/i2c/maxim,max96712.yaml | 78 +- + .../bindings/media/i2c/maxim,max96714.yaml | 5 +- + .../bindings/media/i2c/maxim,max96717.yaml | 163 +- + .../bindings/media/i2c/ovti,og0ve1b.yaml | 15 +- + .../bindings/media/i2c/ovti,os02g10.yaml | 94 + + .../bindings/media/i2c/ovti,ov08d10.yaml | 3 +- + .../devicetree/bindings/media/i2c/ovti,ov4689.yaml | 3 +- + .../devicetree/bindings/media/i2c/ovti,ov5675.yaml | 3 +- + .../devicetree/bindings/media/i2c/ovti,ov5693.yaml | 5 +- + .../bindings/media/i2c/ovti,ov64a40.yaml | 3 +- + .../bindings/media/i2c/samsung,s5kjn5.yaml | 117 + + .../devicetree/bindings/media/i2c/sony,imx111.yaml | 3 +- + .../devicetree/bindings/media/i2c/sony,imx355.yaml | 3 +- + .../devicetree/bindings/media/i2c/sony,imx415.yaml | 3 +- + .../devicetree/bindings/media/i2c/sony,imx576.yaml | 114 + + .../devicetree/bindings/media/i2c/st,vd55g1.yaml | 3 +- + .../devicetree/bindings/media/i2c/st,vd56g3.yaml | 3 +- + .../bindings/media/i2c/thine,thp7312.yaml | 3 +- + .../bindings/media/i2c/toshiba,tc358743.txt | 48 - + .../bindings/media/i2c/toshiba,tc358743.yaml | 93 + + .../bindings/media/mediatek-jpeg-decoder.yaml | 50 +- + .../bindings/media/mediatek-jpeg-encoder.yaml | 38 +- + .../bindings/media/nxp,imx8mq-mipi-csi2.yaml | 4 +- + .../bindings/media/qcom,glymur-camss.yaml | 300 ++ + .../bindings/media/qcom,qcm2290-venus.yaml | 26 +- + .../bindings/media/qcom,venus-common.yaml | 5 +- + .../bindings/media/qcom,x1e80100-camss.yaml | 28 +- + .../bindings/media/rockchip,rk3568-mipi-csi2.yaml | 1 + + .../bindings/media/rockchip,rk3568-vicap.yaml | 46 +- + .../devicetree/bindings/media/snps,dw-hdmi-rx.yaml | 13 +- + .../bindings/media/video-interface-devices.yaml | 17 +- + .../bindings/phy/qcom,x1e80100-csi2-phy.yaml | 213 ++ + Documentation/driver-api/media/tx-rx.rst | 6 +- + .../userspace-api/media/drivers/dcmipp.rst | 14 + + .../userspace-api/media/drivers/index.rst | 1 + + .../userspace-api/media/mediactl/media-types.rst | 8 + + MAINTAINERS | 95 +- + .../nvidia/tegra30-asus-nexus7-grouper-common.dtsi | 3 +- + .../nvidia/tegra30-asus-transformer-common.dtsi | 3 +- + arch/arm/boot/dts/nvidia/tegra30-lg-p895.dts | 4 +- + arch/arm/boot/dts/nvidia/tegra30-lg-x3.dtsi | 3 +- + .../imx8mp-tqma8mpql-mba8mp-ras314-imx219.dtso | 3 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 3 +- + arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 3 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 3 +- + arch/arm64/boot/dts/qcom/sdm670-google-common.dtsi | 3 +- + .../r8a779g3-sparrow-hawk-camera-j1-imx219.dtso | 3 +- + .../r8a779g3-sparrow-hawk-camera-j1-imx462.dtso | 3 +- + .../r8a779g3-sparrow-hawk-camera-j2-imx219.dtso | 3 +- + .../r8a779g3-sparrow-hawk-camera-j2-imx462.dtso | 3 +- + arch/arm64/boot/dts/rockchip/px30-pp1516.dtsi | 3 +- + .../rockchip/px30-ringneck-haikou-video-demo.dtso | 3 +- + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 5 +- + .../rk3588-rock-5b-plus-radxa-cam4k-cam0.dtso | 3 +- + .../rk3588-rock-5b-plus-radxa-cam4k-cam1.dtso | 3 +- + arch/arm64/configs/defconfig | 1 - + drivers/gpu/drm/i915/display/intel_display_power.c | 6 +- + drivers/i2c/i2c-atr.c | 12 + + drivers/media/cec/platform/meson/ao-cec-g12a.c | 2 +- + .../extron-da-hd-4k-plus/extron-da-hd-4k-plus.c | 4 +- + drivers/media/common/cypress_firmware.c | 2 + + drivers/media/common/saa7146/saa7146_core.c | 23 +- + drivers/media/common/saa7146/saa7146_video.c | 11 + + drivers/media/dvb-frontends/drxd_map_firm.h | 4 +- + drivers/media/dvb-frontends/stv0900_core.c | 2 + + drivers/media/dvb-frontends/stv090x.c | 2 + + drivers/media/i2c/Kconfig | 117 +- + drivers/media/i2c/Makefile | 11 +- + drivers/media/i2c/adv7170.c | 1 + + drivers/media/i2c/adv7175.c | 3 +- + drivers/media/i2c/adv7180.c | 5 +- + drivers/media/i2c/adv7183.c | 3 +- + drivers/media/i2c/adv7343.c | 10 +- + drivers/media/i2c/adv7393.c | 10 +- + drivers/media/i2c/adv748x/adv748x-afe.c | 1 + + drivers/media/i2c/adv748x/adv748x-core.c | 13 +- + drivers/media/i2c/adv748x/adv748x-csi2.c | 1 + + drivers/media/i2c/adv748x/adv748x-hdmi.c | 1 + + drivers/media/i2c/adv7511-v4l2.c | 1 + + drivers/media/i2c/adv7604.c | 7 +- + drivers/media/i2c/adv7842.c | 11 +- + drivers/media/i2c/ak881x.c | 2 +- + drivers/media/i2c/alvium-csi2.c | 4 + + drivers/media/i2c/ar0521.c | 2 +- + drivers/media/i2c/ccs/ccs-core.c | 12 +- + drivers/media/i2c/ccs/ccs-data.h | 4 +- + drivers/media/i2c/cvs/Kconfig | 1 + + drivers/media/i2c/cvs/core.c | 30 +- + drivers/media/i2c/cvs/v4l2.c | 96 +- + drivers/media/i2c/cx25840/cx25840-core.c | 39 +- + drivers/media/i2c/ds90ub913.c | 1 + + drivers/media/i2c/ds90ub953.c | 1 + + drivers/media/i2c/ds90ub960.c | 1 + + drivers/media/i2c/et8ek8/et8ek8_driver.c | 1 + + drivers/media/i2c/gc0308.c | 1 + + drivers/media/i2c/gc0310.c | 2 +- + drivers/media/i2c/gc05a2.c | 4 +- + drivers/media/i2c/gc08a3.c | 4 +- + drivers/media/i2c/gc2145.c | 2 + + drivers/media/i2c/hi556.c | 2 + + drivers/media/i2c/hi846.c | 2 + + drivers/media/i2c/hi847.c | 3 +- + drivers/media/i2c/hm1246.c | 1287 ++++++++ + drivers/media/i2c/imx111.c | 1 + + drivers/media/i2c/imx208.c | 1 + + drivers/media/i2c/imx214.c | 4 +- + drivers/media/i2c/imx219.c | 42 +- + drivers/media/i2c/imx258.c | 2 + + drivers/media/i2c/imx274.c | 3 + + drivers/media/i2c/imx283.c | 2 + + drivers/media/i2c/imx290.c | 4 +- + drivers/media/i2c/imx296.c | 7 +- + drivers/media/i2c/imx319.c | 1 + + drivers/media/i2c/imx334.c | 135 +- + drivers/media/i2c/imx335.c | 4 +- + drivers/media/i2c/imx355.c | 4 +- + drivers/media/i2c/imx412.c | 3 +- + drivers/media/i2c/imx415.c | 4 +- + drivers/media/i2c/imx471.c | 8 +- + drivers/media/i2c/imx576.c | 1105 +++++++ + drivers/media/i2c/imx678.c | 2 +- + drivers/media/i2c/isl7998x.c | 1 + + drivers/media/i2c/it6625.c | 2459 ++++++++++++++ + drivers/media/i2c/lt6911uxe.c | 5 +- + drivers/media/i2c/max9286.c | 1 + + drivers/media/i2c/max96714.c | 1017 ------ + drivers/media/i2c/max96717.c | 1104 ------- + drivers/media/i2c/maxim-serdes/Kconfig | 63 + + drivers/media/i2c/maxim-serdes/Makefile | 6 + + drivers/media/i2c/maxim-serdes/max9296a.c | 1461 +++++++++ + drivers/media/i2c/maxim-serdes/max96717.c | 1705 ++++++++++ + drivers/media/i2c/maxim-serdes/max96724.c | 1347 ++++++++ + drivers/media/i2c/maxim-serdes/max_des.c | 3352 ++++++++++++++++++++ + drivers/media/i2c/maxim-serdes/max_des.h | 157 + + drivers/media/i2c/maxim-serdes/max_ser.c | 2218 +++++++++++++ + drivers/media/i2c/maxim-serdes/max_ser.h | 147 + + drivers/media/i2c/maxim-serdes/max_serdes.c | 413 +++ + drivers/media/i2c/maxim-serdes/max_serdes.h | 181 ++ + drivers/media/i2c/ml86v7667.c | 1 - + drivers/media/i2c/mt9m001.c | 9 +- + drivers/media/i2c/mt9m111.c | 3 + + drivers/media/i2c/mt9m114.c | 6 + + drivers/media/i2c/mt9p031.c | 3 + + drivers/media/i2c/mt9t112.c | 3 + + drivers/media/i2c/mt9v011.c | 1 + + drivers/media/i2c/mt9v032.c | 3 + + drivers/media/i2c/mt9v111.c | 1 + + drivers/media/i2c/og01a1b.c | 8 +- + drivers/media/i2c/og0ve1b.c | 455 ++- + drivers/media/i2c/os02g10.c | 934 ++++++ + drivers/media/i2c/os05b10.c | 2 + + drivers/media/i2c/ov01a10.c | 3 + + drivers/media/i2c/ov02a10.c | 3 +- + drivers/media/i2c/ov02c10.c | 5 +- + drivers/media/i2c/ov02e10.c | 1 + + drivers/media/i2c/ov05c10.c | 971 ++++++ + drivers/media/i2c/ov08d10.c | 1 + + drivers/media/i2c/ov08x40.c | 1 + + drivers/media/i2c/ov13858.c | 51 + + drivers/media/i2c/ov13b10.c | 1 + + drivers/media/i2c/ov2640.c | 2 + + drivers/media/i2c/ov2659.c | 1 + + drivers/media/i2c/ov2680.c | 3 + + drivers/media/i2c/ov2685.c | 2 + + drivers/media/i2c/ov2732.c | 4 +- + drivers/media/i2c/ov2735.c | 5 +- + drivers/media/i2c/ov2740.c | 1 + + drivers/media/i2c/ov4689.c | 2 + + drivers/media/i2c/ov5640.c | 2 + + drivers/media/i2c/ov5645.c | 4 +- + drivers/media/i2c/ov5647.c | 6 + + drivers/media/i2c/ov5648.c | 5 +- + drivers/media/i2c/ov5670.c | 2 + + drivers/media/i2c/ov5675.c | 2 + + drivers/media/i2c/ov5693.c | 28 + + drivers/media/i2c/ov5695.c | 1 + + drivers/media/i2c/ov6211.c | 3 +- + drivers/media/i2c/ov64a40.c | 2 + + drivers/media/i2c/ov7251.c | 4 +- + drivers/media/i2c/ov7670.c | 1 + + drivers/media/i2c/ov772x.c | 4 +- + drivers/media/i2c/ov7740.c | 1 + + drivers/media/i2c/ov8856.c | 33 +- + drivers/media/i2c/ov8858.c | 11 +- + drivers/media/i2c/ov8865.c | 2 + + drivers/media/i2c/ov9282.c | 4 +- + drivers/media/i2c/ov9640.c | 2 + + drivers/media/i2c/ov9650.c | 1 + + drivers/media/i2c/ov9734.c | 1 + + drivers/media/i2c/rdacm20.c | 1 - + drivers/media/i2c/rdacm21.c | 1 - + drivers/media/i2c/rj54n1cb0c.c | 3 + + drivers/media/i2c/s5c73m3/s5c73m3-core.c | 2 + + drivers/media/i2c/s5k3m5.c | 4 +- + drivers/media/i2c/s5k5baf.c | 3 + + drivers/media/i2c/s5k6a3.c | 1 + + drivers/media/i2c/s5kjn1.c | 4 +- + drivers/media/i2c/s5kjn5.c | 2897 +++++++++++++++++ + drivers/media/i2c/saa6752hs.c | 1 + + drivers/media/i2c/saa7115.c | 1 + + drivers/media/i2c/saa717x.c | 1 + + drivers/media/i2c/st-mipid02.c | 1 + + drivers/media/i2c/t4ka3.c | 4 +- + drivers/media/i2c/tc358743.c | 6 +- + drivers/media/i2c/tc358746.c | 1 + + drivers/media/i2c/tda1997x.c | 3 +- + drivers/media/i2c/thp7312.c | 1 + + drivers/media/i2c/ths7303.c | 10 +- + drivers/media/i2c/ths8200.c | 14 +- + drivers/media/i2c/ths8200_regs.h | 14 +- + drivers/media/i2c/tvp514x.c | 1 + + drivers/media/i2c/tvp5150.c | 3 +- + drivers/media/i2c/tvp7002.c | 1 + + drivers/media/i2c/tw9900.c | 1 + + drivers/media/i2c/tw9910.c | 2 + + drivers/media/i2c/vd55g1.c | 18 +- + drivers/media/i2c/vd56g3.c | 4 +- + drivers/media/i2c/vgxy61.c | 4 +- + drivers/media/i2c/wm8739.c | 2 +- + drivers/media/mc/mc-entity.c | 15 +- + drivers/media/pci/bt8xx/bttv-driver.c | 8 +- + drivers/media/pci/cobalt/cobalt-driver.c | 8 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 10 +- + drivers/media/pci/cx18/cx18-av-core.c | 1 + + drivers/media/pci/cx18/cx18-controls.c | 2 +- + drivers/media/pci/cx18/cx18-driver.c | 9 +- + drivers/media/pci/cx18/cx18-ioctl.c | 2 +- + drivers/media/pci/cx18/cx18-queue.c | 5 +- + drivers/media/pci/cx18/cx23418.h | 2 +- + drivers/media/pci/cx23885/cx23885-core.c | 4 + + drivers/media/pci/cx23885/cx23885-dvb.c | 14 +- + drivers/media/pci/cx23885/cx23885-video.c | 4 +- + drivers/media/pci/cx88/cx88-input.c | 22 +- + drivers/media/pci/cx88/cx88-mpeg.c | 9 +- + drivers/media/pci/cx88/cx88-video.c | 8 +- + drivers/media/pci/hws/hws.h | 4 +- + drivers/media/pci/hws/hws_pci.c | 6 +- + drivers/media/pci/hws/hws_reg.h | 10 +- + drivers/media/pci/hws/hws_v4l2_ioctl.c | 5 +- + drivers/media/pci/hws/hws_video.c | 6 +- + drivers/media/pci/intel/ipu-bridge.c | 184 +- + drivers/media/pci/intel/ipu3/ipu3-cio2.c | 1 + + drivers/media/pci/intel/ipu6/Kconfig | 20 +- + drivers/media/pci/intel/ipu6/Makefile | 10 +- + drivers/media/pci/intel/ipu6/ipu6-bus.h | 6 +- + drivers/media/pci/intel/ipu6/ipu6-buttress.c | 653 +++- + drivers/media/pci/intel/ipu6/ipu6-buttress.h | 52 +- + drivers/media/pci/intel/ipu6/ipu6-cpd.c | 201 +- + drivers/media/pci/intel/ipu6/ipu6-cpd.h | 43 + + drivers/media/pci/intel/ipu6/ipu6-dma.c | 24 +- + drivers/media/pci/intel/ipu6/ipu6-dma.h | 2 + + drivers/media/pci/intel/ipu6/ipu6-fw-isys.c | 618 +++- + drivers/media/pci/intel/ipu6/ipu6-fw-isys.h | 48 +- + drivers/media/pci/intel/ipu6/ipu6-isys-csi2.c | 590 +++- + drivers/media/pci/intel/ipu6/ipu6-isys-csi2.h | 18 +- + drivers/media/pci/intel/ipu6/ipu6-isys-queue.c | 215 +- + drivers/media/pci/intel/ipu6/ipu6-isys-queue.h | 6 +- + drivers/media/pci/intel/ipu6/ipu6-isys-subdev.c | 23 +- + drivers/media/pci/intel/ipu6/ipu6-isys-subdev.h | 3 + + drivers/media/pci/intel/ipu6/ipu6-isys-video.c | 772 ++--- + drivers/media/pci/intel/ipu6/ipu6-isys-video.h | 62 +- + drivers/media/pci/intel/ipu6/ipu6-isys.c | 606 ++-- + drivers/media/pci/intel/ipu6/ipu6-isys.h | 126 +- + drivers/media/pci/intel/ipu6/ipu6-mmu-hw.c | 296 ++ + drivers/media/pci/intel/ipu6/ipu6-mmu.c | 133 +- + drivers/media/pci/intel/ipu6/ipu6-mmu.h | 159 +- + .../pci/intel/ipu6/ipu6-platform-buttress-regs.h | 121 +- + drivers/media/pci/intel/ipu6/ipu6.c | 608 ++-- + drivers/media/pci/intel/ipu6/ipu6.h | 201 +- + drivers/media/pci/intel/ipu6/ipu7-boot.c | 400 +++ + drivers/media/pci/intel/ipu6/ipu7-boot.h | 76 + + drivers/media/pci/intel/ipu6/ipu7-fw-com.c | 74 + + drivers/media/pci/intel/ipu6/ipu7-fw-com.h | 53 + + drivers/media/pci/intel/ipu6/ipu7-fw-isys.c | 874 +++++ + drivers/media/pci/intel/ipu6/ipu7-fw-isys.h | 355 +++ + drivers/media/pci/intel/ipu6/ipu7-isys-csi-phy.c | 1074 +++++++ + drivers/media/pci/intel/ipu6/ipu7-isys-csi-phy.h | 16 + + drivers/media/pci/intel/ipu6/ipu7-isys-csi2-regs.h | 1191 +++++++ + drivers/media/pci/intel/ipu6/ipu7-mmu-hw.c | 1116 +++++++ + drivers/media/pci/intel/ipu6/ipu7-mmu-hw.h | 369 +++ + drivers/media/pci/intel/ipu6/ipu7-platform-regs.h | 44 + + drivers/media/pci/intel/ivsc/mei_ace.c | 4 +- + drivers/media/pci/intel/ivsc/mei_csi.c | 8 +- + drivers/media/pci/ivtv/ivtv-controls.c | 2 +- + drivers/media/pci/ivtv/ivtv-ioctl.c | 2 +- + drivers/media/pci/saa7134/saa7134-core.c | 8 +- + drivers/media/pci/saa7134/saa7134-empress.c | 4 +- + drivers/media/pci/saa7134/saa7134-input.c | 7 +- + drivers/media/pci/saa7146/mxb.c | 4 +- + drivers/media/pci/saa7164/saa7164-core.c | 32 +- + drivers/media/pci/saa7164/saa7164.h | 1 - + drivers/media/pci/tw68/tw68-core.c | 10 +- + drivers/media/pci/tw686x/tw686x-core.c | 10 + + drivers/media/platform/amd/isp4/isp4_subdev.c | 1 + + drivers/media/platform/amd/isp4/isp4_video.c | 2 +- + .../media/platform/amlogic/c3/isp/c3-isp-core.c | 1 + + .../media/platform/amlogic/c3/isp/c3-isp-resizer.c | 3 + + .../amlogic/c3/mipi-adapter/c3-mipi-adap.c | 1 + + .../platform/amlogic/c3/mipi-csi2/c3-mipi-csi2.c | 1 + + drivers/media/platform/amphion/vpu_core.c | 19 +- + drivers/media/platform/amphion/vpu_drv.c | 1 + + .../media/platform/arm/mali-c55/mali-c55-core.c | 32 +- + drivers/media/platform/arm/mali-c55/mali-c55-isp.c | 4 + + .../media/platform/arm/mali-c55/mali-c55-params.c | 3 + + .../media/platform/arm/mali-c55/mali-c55-resizer.c | 15 +- + .../media/platform/arm/mali-c55/mali-c55-stats.c | 18 +- + drivers/media/platform/arm/mali-c55/mali-c55-tpg.c | 1 + + drivers/media/platform/aspeed/aspeed-video.c | 12 +- + drivers/media/platform/atmel/atmel-isi.c | 11 +- + drivers/media/platform/broadcom/bcm2835-unicam.c | 1 + + drivers/media/platform/cadence/cdns-csi2rx.c | 5 + + drivers/media/platform/cadence/cdns-csi2tx.c | 1 + + .../platform/chips-media/wave5/wave5-vpu-dec.c | 8 +- + .../media/platform/chips-media/wave5/wave5-vpu.c | 7 + + .../platform/chips-media/wave5/wave5-vpuapi.c | 15 +- + .../media/platform/imagination/e5010-jpeg-enc.c | 4 +- + drivers/media/platform/intel/pxa_camera.c | 6 +- + drivers/media/platform/m2m-deinterlace.c | 5 +- + drivers/media/platform/marvell/Kconfig | 1 + + drivers/media/platform/marvell/cafe-driver.c | 2 +- + drivers/media/platform/marvell/mcam-core.c | 24 +- + drivers/media/platform/marvell/mmp-driver.c | 5 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_core.c | 65 +- + drivers/media/platform/mediatek/mdp/mtk_mdp_ipi.h | 2 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 14 +- + .../mediatek/vcodec/decoder/mtk_vcodec_dec_drv.c | 2 + + .../mediatek/vcodec/decoder/vdec_ipi_msg.h | 4 +- + drivers/media/platform/mediatek/vpu/mtk_vpu.c | 14 +- + drivers/media/platform/mediatek/vpu/mtk_vpu.h | 4 +- + .../media/platform/microchip/microchip-csi2dc.c | 2 + + .../media/platform/microchip/microchip-isc-base.c | 82 +- + .../media/platform/microchip/microchip-isc-clk.c | 7 +- + .../media/platform/microchip/microchip-isc-regs.h | 16 +- + .../platform/microchip/microchip-isc-scaler.c | 2 + + drivers/media/platform/microchip/microchip-isc.h | 5 +- + .../platform/microchip/microchip-sama5d2-isc.c | 48 +- + .../platform/microchip/microchip-sama7g5-isc.c | 48 +- + drivers/media/platform/nuvoton/npcm-video.c | 18 +- + drivers/media/platform/nxp/Kconfig | 16 + + drivers/media/platform/nxp/Makefile | 1 + + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 23 +- + drivers/media/platform/nxp/imx-mipi-csis.c | 3 +- + drivers/media/platform/nxp/imx7-media-csi.c | 1 + + .../platform/nxp/imx8-isi/imx8-isi-crossbar.c | 1 + + .../media/platform/nxp/imx8-isi/imx8-isi-pipe.c | 3 + + drivers/media/platform/nxp/imx8mq-mipi-csi2.c | 1 + + drivers/media/platform/nxp/imx95-csi-formatter.c | 759 +++++ + drivers/media/platform/qcom/camss/Kconfig | 2 + + drivers/media/platform/qcom/camss/camss-csid.c | 3 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 203 +- + drivers/media/platform/qcom/camss/camss-csiphy.h | 12 +- + drivers/media/platform/qcom/camss/camss-ispif.c | 3 +- + drivers/media/platform/qcom/camss/camss-tpg.c | 3 +- + drivers/media/platform/qcom/camss/camss-vfe-17x.c | 46 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 26 +- + drivers/media/platform/qcom/camss/camss.c | 367 ++- + drivers/media/platform/qcom/camss/camss.h | 3 + + drivers/media/platform/qcom/iris/Makefile | 2 + + drivers/media/platform/qcom/iris/iris_core.c | 6 + + drivers/media/platform/qcom/iris/iris_core.h | 6 + + drivers/media/platform/qcom/iris/iris_ctrls.c | 96 + + drivers/media/platform/qcom/iris/iris_ctrls.h | 1 + + drivers/media/platform/qcom/iris/iris_firmware.c | 121 +- + drivers/media/platform/qcom/iris/iris_hfi_common.c | 7 +- + drivers/media/platform/qcom/iris/iris_hfi_common.h | 1 + + drivers/media/platform/qcom/iris/iris_hfi_gen1.c | 406 ++- + .../platform/qcom/iris/iris_hfi_gen1_command.c | 30 + + .../platform/qcom/iris/iris_hfi_gen1_defines.h | 15 + + .../platform/qcom/iris/iris_hfi_gen1_response.c | 82 + + drivers/media/platform/qcom/iris/iris_hfi_gen2.c | 945 ++++++ + .../platform/qcom/iris/iris_hfi_gen2_defines.h | 2 + + .../platform/qcom/iris/iris_hfi_gen2_packet.c | 3 + + .../platform/qcom/iris/iris_hfi_gen2_response.c | 1 + + drivers/media/platform/qcom/iris/iris_instance.h | 18 +- + .../platform/qcom/iris/iris_platform_common.h | 32 + + .../media/platform/qcom/iris/iris_platform_vpu2.c | 13 +- + .../media/platform/qcom/iris/iris_platform_vpu3x.c | 25 +- + .../platform/qcom/iris/iris_platform_vpu_ar50lt.c | 118 + + drivers/media/platform/qcom/iris/iris_probe.c | 68 +- + drivers/media/platform/qcom/iris/iris_resources.c | 2 + + drivers/media/platform/qcom/iris/iris_utils.c | 6 + + drivers/media/platform/qcom/iris/iris_utils.h | 1 + + drivers/media/platform/qcom/iris/iris_vb2.c | 6 +- + drivers/media/platform/qcom/iris/iris_vdec.c | 44 +- + drivers/media/platform/qcom/iris/iris_venc.c | 33 +- + drivers/media/platform/qcom/iris/iris_vidc.c | 50 +- + drivers/media/platform/qcom/iris/iris_vpu2.c | 30 +- + drivers/media/platform/qcom/iris/iris_vpu3x.c | 6 + + drivers/media/platform/qcom/iris/iris_vpu4x.c | 2 + + drivers/media/platform/qcom/iris/iris_vpu_ar50lt.c | 130 + + drivers/media/platform/qcom/iris/iris_vpu_buffer.c | 370 +++ + drivers/media/platform/qcom/iris/iris_vpu_buffer.h | 38 + + drivers/media/platform/qcom/iris/iris_vpu_common.c | 52 +- + drivers/media/platform/qcom/iris/iris_vpu_common.h | 6 + + .../platform/qcom/iris/iris_vpu_register_defines.h | 1 - + drivers/media/platform/qcom/venus/core.c | 70 +- + drivers/media/platform/qcom/venus/core.h | 6 + + drivers/media/platform/qcom/venus/hfi_msgs.c | 3 + + drivers/media/platform/raspberrypi/rp1-cfe/csi2.c | 1 + + .../media/platform/raspberrypi/rp1-cfe/pisp-fe.c | 1 + + drivers/media/platform/renesas/rcar-csi2.c | 385 ++- + drivers/media/platform/renesas/rcar-isp/core-io.c | 40 +- + drivers/media/platform/renesas/rcar-isp/csisp.c | 228 +- + .../media/platform/renesas/rcar-vin/rcar-core.c | 27 +- + drivers/media/platform/renesas/rcar-vin/rcar-dma.c | 2 +- + .../media/platform/renesas/rcar-vin/rcar-v4l2.c | 70 +- + drivers/media/platform/renesas/rcar_drif.c | 2 +- + drivers/media/platform/renesas/renesas-ceu.c | 7 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-core.c | 3 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-cru.h | 2 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-csi2.c | 3 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-ip.c | 3 +- + .../media/platform/renesas/rzg2l-cru/rzg2l-video.c | 13 +- + .../platform/renesas/rzv2h-ivc/rzv2h-ivc-dev.c | 11 +- + .../platform/renesas/rzv2h-ivc/rzv2h-ivc-subdev.c | 1 + + drivers/media/platform/renesas/sh_vou.c | 6 +- + drivers/media/platform/renesas/vsp1/vsp1_brx.c | 3 + + drivers/media/platform/renesas/vsp1/vsp1_dl.c | 2 +- + drivers/media/platform/renesas/vsp1/vsp1_drm.c | 18 +- + drivers/media/platform/renesas/vsp1/vsp1_entity.c | 4 +- + drivers/media/platform/renesas/vsp1/vsp1_entity.h | 1 + + drivers/media/platform/renesas/vsp1/vsp1_histo.c | 3 + + drivers/media/platform/renesas/vsp1/vsp1_hsit.c | 1 + + drivers/media/platform/renesas/vsp1/vsp1_rwpf.c | 3 + + drivers/media/platform/renesas/vsp1/vsp1_sru.c | 1 + + drivers/media/platform/renesas/vsp1/vsp1_uds.c | 1 + + drivers/media/platform/renesas/vsp1/vsp1_uif.c | 2 + + drivers/media/platform/renesas/vsp1/vsp1_vspx.c | 3 +- + drivers/media/platform/rockchip/rga/rga-hw.c | 8 - + drivers/media/platform/rockchip/rga/rga.c | 13 +- + drivers/media/platform/rockchip/rga/rga.h | 1 + + .../platform/rockchip/rkcif/rkcif-capture-mipi.c | 155 +- + .../platform/rockchip/rkcif/rkcif-capture-mipi.h | 1 + + .../media/platform/rockchip/rkcif/rkcif-common.h | 4 +- + drivers/media/platform/rockchip/rkcif/rkcif-dev.c | 21 + + .../platform/rockchip/rkcif/rkcif-interface.c | 3 + + drivers/media/platform/rockchip/rkcif/rkcif-regs.h | 1 + + .../media/platform/rockchip/rkisp1/rkisp1-csi.c | 1 + + .../media/platform/rockchip/rkisp1/rkisp1-dev.c | 4 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 3 + + .../platform/rockchip/rkisp1/rkisp1-resizer.c | 3 + + drivers/media/platform/rockchip/rkvdec/rkvdec.c | 16 +- + .../platform/samsung/exynos4-is/fimc-capture.c | 8 +- + .../media/platform/samsung/exynos4-is/fimc-isp.c | 1 + + .../media/platform/samsung/exynos4-is/fimc-lite.c | 6 +- + .../media/platform/samsung/exynos4-is/mipi-csis.c | 1 + + .../platform/samsung/s3c-camif/camif-capture.c | 3 + + .../media/platform/samsung/s3c-camif/camif-core.c | 2 +- + drivers/media/platform/samsung/s5p-mfc/s5p_mfc.c | 4 +- + .../media/platform/st/sti/delta/delta-mjpeg-hdr.c | 7 +- + drivers/media/platform/st/stm32/stm32-csi.c | 6 +- + drivers/media/platform/st/stm32/stm32-dcmi.c | 31 +- + .../media/platform/st/stm32/stm32-dcmipp/Makefile | 3 +- + .../st/stm32/stm32-dcmipp/dcmipp-byteproc.c | 30 +- + .../{dcmipp-bytecap.c => dcmipp-capture.c} | 600 +++- + .../platform/st/stm32/stm32-dcmipp/dcmipp-common.h | 99 +- + .../platform/st/stm32/stm32-dcmipp/dcmipp-core.c | 124 +- + .../platform/st/stm32/stm32-dcmipp/dcmipp-input.c | 127 +- + .../platform/st/stm32/stm32-dcmipp/dcmipp-isp.c | 493 +++ + .../st/stm32/stm32-dcmipp/dcmipp-pixelcommon.c | 181 ++ + .../st/stm32/stm32-dcmipp/dcmipp-pixelcommon.h | 42 + + .../st/stm32/stm32-dcmipp/dcmipp-pixelproc.c | 942 ++++++ + .../media/platform/sunxi/sun4i-csi/sun4i_v4l2.c | 1 + + .../platform/sunxi/sun6i-csi/sun6i_csi_bridge.c | 156 +- + .../platform/sunxi/sun6i-csi/sun6i_csi_bridge.h | 9 - + .../platform/sunxi/sun6i-csi/sun6i_csi_capture.c | 27 +- + .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 108 +- + .../sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.h | 2 - + .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 113 +- + .../sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.h | 2 - + drivers/media/platform/synopsys/dw-mipi-csi2rx.c | 1 + + .../media/platform/synopsys/hdmirx/snps_hdmirx.c | 423 ++- + .../media/platform/synopsys/hdmirx/snps_hdmirx.h | 8 + + drivers/media/platform/ti/Kconfig | 11 - + drivers/media/platform/ti/am437x/am437x-vpfe.c | 2 +- + drivers/media/platform/ti/cal/cal-camerarx.c | 1 + + drivers/media/platform/ti/cal/cal-video.c | 19 +- + drivers/media/platform/ti/cal/cal.c | 10 +- + drivers/media/platform/ti/davinci/vpif_capture.c | 5 +- + drivers/media/platform/ti/davinci/vpif_display.c | 3 + + .../media/platform/ti/j721e-csi2rx/j721e-csi2rx.c | 25 + + drivers/media/platform/ti/omap3isp/ispccdc.c | 5 +- + drivers/media/platform/ti/omap3isp/ispccp2.c | 3 +- + drivers/media/platform/ti/omap3isp/ispcsi2.c | 3 +- + drivers/media/platform/ti/omap3isp/isppreview.c | 5 +- + drivers/media/platform/ti/omap3isp/ispresizer.c | 5 +- + drivers/media/platform/ti/omap3isp/ispvideo.c | 4 +- + drivers/media/platform/ti/vpe/vip.c | 4 +- + drivers/media/platform/verisilicon/hantro_drv.c | 86 +- + .../platform/verisilicon/hantro_g1_mpeg2_dec.c | 5 + + .../verisilicon/rockchip_vpu981_hw_av1_dec.c | 68 +- + drivers/media/platform/via/via-camera.c | 4 +- + drivers/media/platform/video-mux.c | 1 + + drivers/media/platform/xilinx/xilinx-csi2rxss.c | 1 + + drivers/media/platform/xilinx/xilinx-tpg.c | 1 + + drivers/media/radio/si4713/radio-usb-si4713.c | 4 +- + drivers/media/radio/si4713/si4713.c | 2 +- + drivers/media/rc/bpf-lirc.c | 18 +- + drivers/media/rc/ene_ir.c | 4 +- + drivers/media/rc/fintek-cir.c | 17 +- + drivers/media/rc/fintek-cir.h | 22 - + drivers/media/rc/imon.c | 180 +- + drivers/media/rc/ir-hix5hd2.c | 5 +- + drivers/media/rc/ir-mce_kbd-decoder.c | 5 +- + drivers/media/rc/ir_toy.c | 4 +- + drivers/media/rc/ite-cir.c | 1 - + drivers/media/rc/ite-cir.h | 1 - + drivers/media/rc/lirc_dev.c | 5 + + drivers/media/rc/mceusb.c | 1 - + drivers/media/rc/meson-ir-tx.c | 20 +- + drivers/media/rc/nuvoton-cir.h | 3 - + drivers/media/rc/rc-ir-raw.c | 86 +- + drivers/media/rc/rc-loopback.c | 5 - + drivers/media/rc/rc-main.c | 206 +- + drivers/media/rc/redrat3.c | 32 +- + drivers/media/rc/serial_ir.c | 2 +- + drivers/media/rc/streamzap.c | 1 + + drivers/media/rc/sunxi-cir.c | 2 +- + drivers/media/spi/Kconfig | 4 - + drivers/media/test-drivers/vicodec/codec-fwht.h | 2 +- + drivers/media/test-drivers/vicodec/vicodec-core.c | 16 +- + drivers/media/test-drivers/vidtv/vidtv_bridge.c | 75 +- + drivers/media/test-drivers/vidtv/vidtv_demod.c | 9 - + drivers/media/test-drivers/vim2m.c | 33 +- + drivers/media/test-drivers/vimc/vimc-debayer.c | 1 + + drivers/media/test-drivers/vimc/vimc-scaler.c | 3 + + drivers/media/test-drivers/vimc/vimc-sensor.c | 9 +- + drivers/media/test-drivers/vivid/vivid-cec.c | 10 +- + drivers/media/test-drivers/vivid/vivid-core.c | 1 + + drivers/media/test-drivers/vivid/vivid-vid-cap.c | 13 + + drivers/media/tuners/tda18250.c | 3 +- + drivers/media/usb/airspy/airspy.c | 6 +- + drivers/media/usb/au0828/au0828-core.c | 4 + + drivers/media/usb/au0828/au0828-dvb.c | 20 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-audio.c | 15 +- + drivers/media/usb/cx231xx/cx231xx-avcore.c | 103 - + drivers/media/usb/cx231xx/cx231xx-cards.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-video.c | 4 +- + drivers/media/usb/cx231xx/cx231xx.h | 2 +- + drivers/media/usb/dvb-usb-v2/mxl111sf-i2c.c | 4 +- + drivers/media/usb/dvb-usb-v2/rtl28xxu.c | 14 +- + drivers/media/usb/dvb-usb/cxusb-analog.c | 6 +- + drivers/media/usb/dvb-usb/dib0700_core.c | 2 +- + drivers/media/usb/dvb-usb/dvb-usb-firmware.c | 2 + + drivers/media/usb/em28xx/em28xx-audio.c | 7 + + drivers/media/usb/em28xx/em28xx-camera.c | 2 +- + drivers/media/usb/em28xx/em28xx-cards.c | 38 + + drivers/media/usb/em28xx/em28xx-core.c | 3 - + drivers/media/usb/em28xx/em28xx-video.c | 46 +- + drivers/media/usb/em28xx/em28xx.h | 2 + + drivers/media/usb/go7007/go7007-driver.c | 5 +- + drivers/media/usb/go7007/go7007-usb.c | 8 + + drivers/media/usb/go7007/go7007-v4l2.c | 2 +- + drivers/media/usb/go7007/s2250-board.c | 1 + + drivers/media/usb/gspca/gspca.c | 3 +- + drivers/media/usb/gspca/ov519.c | 2 +- + drivers/media/usb/gspca/w996Xcf.c | 2 +- + drivers/media/usb/hackrf/hackrf.c | 7 +- + drivers/media/usb/pvrusb2/pvrusb2-hdw.c | 14 +- + drivers/media/usb/pvrusb2/pvrusb2-sysfs.c | 1 + + drivers/media/usb/usbtv/usbtv-core.c | 2 - + drivers/media/usb/usbtv/usbtv-video.c | 4 + + drivers/media/usb/uvc/uvc_ctrl.c | 117 +- + drivers/media/usb/uvc/uvc_driver.c | 45 +- + drivers/media/usb/uvc/uvc_status.c | 2 +- + drivers/media/usb/uvc/uvc_video.c | 4 +- + drivers/media/usb/uvc/uvcvideo.h | 4 +- + drivers/media/v4l2-core/v4l2-common.c | 23 +- + drivers/media/v4l2-core/v4l2-ctrls-core.c | 19 +- + drivers/media/v4l2-core/v4l2-isp.c | 15 +- + drivers/media/v4l2-core/v4l2-mc.c | 5 +- + drivers/media/v4l2-core/v4l2-subdev.c | 163 +- + drivers/phy/phy-core.c | 166 +- + drivers/phy/qualcomm/Kconfig | 15 + + drivers/phy/qualcomm/Makefile | 5 + + drivers/phy/qualcomm/phy-qcom-mipi-csi2-3ph-dphy.c | 385 +++ + drivers/phy/qualcomm/phy-qcom-mipi-csi2-core.c | 463 +++ + drivers/phy/qualcomm/phy-qcom-mipi-csi2.h | 97 + + drivers/platform/x86/intel/atomisp2/pm.c | 6 +- + drivers/platform/x86/intel/int3472/discrete.c | 82 +- + drivers/platform/x86/intel/int3472/tps68470.c | 107 +- + drivers/platform/x86/intel/int3472/tps68470.h | 8 + + .../x86/intel/int3472/tps68470_board_data.c | 181 +- + drivers/staging/media/Kconfig | 2 - + drivers/staging/media/Makefile | 1 - + drivers/staging/media/atomisp/TODO | 36 +- + drivers/staging/media/atomisp/i2c/atomisp-gc2235.c | 5 +- + drivers/staging/media/atomisp/i2c/atomisp-ov2722.c | 5 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 17 +- + .../media/atomisp/pci/atomisp_compat_css20.c | 4 +- + drivers/staging/media/atomisp/pci/atomisp_csi2.c | 1 + + .../media/atomisp/pci/atomisp_gmin_platform.c | 2 +- + .../staging/media/atomisp/pci/atomisp_internal.h | 2 - + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 3 + + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 22 +- + .../media/atomisp/pci/base/refcount/src/refcount.c | 3 +- + .../atomisp/pci/hive_isp_css_common/host/gdc.c | 24 +- + .../pci/isp/kernels/s3a/s3a_1.0/ia_css_s3a_types.h | 4 +- + .../atomisp/pci/runtime/inputfifo/src/inputfifo.c | 16 - + drivers/staging/media/av7110/av7110.c | 2 +- + drivers/staging/media/av7110/av7110_ir.c | 2 - + drivers/staging/media/av7110/sp8870.c | 9 +- + drivers/staging/media/imx/imx-ic-prp.c | 2 +- + drivers/staging/media/imx/imx-ic-prpencvf.c | 4 +- + drivers/staging/media/imx/imx-media-capture.c | 1 - + drivers/staging/media/imx/imx-media-csc-scaler.c | 3 +- + drivers/staging/media/imx/imx-media-csi.c | 3 + + drivers/staging/media/imx/imx-media-dev.c | 1 - + drivers/staging/media/imx/imx-media-vdic.c | 1 + + drivers/staging/media/imx/imx6-mipi-csi2.c | 1 + + drivers/staging/media/ipu3/ipu3-css.c | 1 - + drivers/staging/media/ipu3/ipu3-v4l2.c | 3 + + drivers/staging/media/ipu7/TODO | 28 +- + drivers/staging/media/ipu7/ipu7-isys-csi2.c | 2 + + drivers/staging/media/ipu7/ipu7-isys-subdev.c | 1 + + drivers/staging/media/ipu7/ipu7-isys-subdev.h | 1 + + drivers/staging/media/ipu7/ipu7-isys.c | 1 + + drivers/staging/media/ipu7/ipu7.c | 7 + + drivers/staging/media/max96712/Kconfig | 13 - + drivers/staging/media/max96712/Makefile | 2 - + drivers/staging/media/max96712/max96712.c | 487 --- + drivers/staging/media/meson/vdec/vdec.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 4 + + .../staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c | 1 + + drivers/staging/media/tegra-video/csi.c | 1 + + drivers/staging/media/tegra-video/tegra20.c | 7 +- + drivers/staging/media/tegra-video/vi.c | 113 +- + .../dt-bindings/media/video-interface-devices.h | 13 + + include/linux/pci_ids.h | 2 + + include/linux/phy/phy.h | 13 + + include/linux/platform_data/x86/int3472.h | 2 + + include/linux/property.h | 5 + + include/media/ipu-bridge.h | 53 +- + include/media/ipu6-pci-table.h | 6 + + include/media/rc-map.h | 2 - + include/media/v4l2-common.h | 75 +- + include/media/v4l2-ctrls.h | 6 + + include/media/v4l2-dv-timings.h | 14 + + include/media/v4l2-subdev.h | 34 +- + include/uapi/linux/it6625.h | 25 + + include/uapi/linux/media.h | 7 + + include/uapi/linux/media/arm/mali-c55-config.h | 2 + + include/uapi/linux/media/st/dcmipp_config.h | 16 + + include/uapi/linux/v4l2-controls.h | 21 + + 654 files changed, 44424 insertions(+), 8034 deletions(-) + create mode 100644 Documentation/devicetree/bindings/media/fsl,imx95-csi-formatter.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/himax,hm1246.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ite,it6625.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/maxim,max9296a.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,os02g10.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/samsung,s5kjn5.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/sony,imx576.yaml + delete mode 100644 Documentation/devicetree/bindings/media/i2c/toshiba,tc358743.txt + create mode 100644 Documentation/devicetree/bindings/media/i2c/toshiba,tc358743.yaml + create mode 100644 Documentation/devicetree/bindings/media/qcom,glymur-camss.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml + create mode 100644 Documentation/userspace-api/media/drivers/dcmipp.rst + create mode 100644 drivers/media/i2c/hm1246.c + create mode 100644 drivers/media/i2c/imx576.c + create mode 100644 drivers/media/i2c/it6625.c + delete mode 100644 drivers/media/i2c/max96714.c + delete mode 100644 drivers/media/i2c/max96717.c + create mode 100644 drivers/media/i2c/maxim-serdes/Kconfig + create mode 100644 drivers/media/i2c/maxim-serdes/Makefile + create mode 100644 drivers/media/i2c/maxim-serdes/max9296a.c + create mode 100644 drivers/media/i2c/maxim-serdes/max96717.c + create mode 100644 drivers/media/i2c/maxim-serdes/max96724.c + create mode 100644 drivers/media/i2c/maxim-serdes/max_des.c + create mode 100644 drivers/media/i2c/maxim-serdes/max_des.h + create mode 100644 drivers/media/i2c/maxim-serdes/max_ser.c + create mode 100644 drivers/media/i2c/maxim-serdes/max_ser.h + create mode 100644 drivers/media/i2c/maxim-serdes/max_serdes.c + create mode 100644 drivers/media/i2c/maxim-serdes/max_serdes.h + create mode 100644 drivers/media/i2c/os02g10.c + create mode 100644 drivers/media/i2c/ov05c10.c + create mode 100644 drivers/media/i2c/s5kjn5.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu6-mmu-hw.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu7-boot.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu7-boot.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu7-fw-com.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu7-fw-com.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu7-fw-isys.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu7-fw-isys.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu7-isys-csi-phy.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu7-isys-csi-phy.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu7-isys-csi2-regs.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu7-mmu-hw.c + create mode 100644 drivers/media/pci/intel/ipu6/ipu7-mmu-hw.h + create mode 100644 drivers/media/pci/intel/ipu6/ipu7-platform-regs.h + create mode 100644 drivers/media/platform/nxp/imx95-csi-formatter.c + create mode 100644 drivers/media/platform/qcom/iris/iris_platform_vpu_ar50lt.c + create mode 100644 drivers/media/platform/qcom/iris/iris_vpu_ar50lt.c + rename drivers/media/platform/st/stm32/stm32-dcmipp/{dcmipp-bytecap.c => dcmipp-capture.c} (53%) + create mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-isp.c + create mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-pixelcommon.c + create mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-pixelcommon.h + create mode 100644 drivers/media/platform/st/stm32/stm32-dcmipp/dcmipp-pixelproc.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-mipi-csi2-3ph-dphy.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-mipi-csi2-core.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-mipi-csi2.h + delete mode 100644 drivers/staging/media/max96712/Kconfig + delete mode 100644 drivers/staging/media/max96712/Makefile + delete mode 100644 drivers/staging/media/max96712/max96712.c + create mode 100644 include/dt-bindings/media/video-interface-devices.h + create mode 100644 include/uapi/linux/it6625.h + create mode 100644 include/uapi/linux/media/st/dcmipp_config.h +Merging v4l-dvb-next/master (adc218676eef2 Linux 6.12) +$ 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 (cd79045dd0398 Merge branches 'acpi-dock', 'acpi-pm' and 'acpi-video' into linux-next) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/riscv/cppc.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-devices-system-cpu | 14 +- + Documentation/admin-guide/kernel-parameters.txt | 7 - + Documentation/admin-guide/pm/amd-pstate.rst | 6 - + Documentation/admin-guide/pm/cpuidle.rst | 2 +- + .../driver-api/thermal/cpu-idle-cooling.rst | 2 +- + Documentation/firmware-guide/acpi/apei/einj.rst | 6 +- + Documentation/power/runtime_pm.rst | 477 +---- + Documentation/power/userland-swsusp.rst | 4 +- + MAINTAINERS | 13 +- + arch/arm64/kernel/topology.c | 14 +- + arch/x86/kernel/acpi/cppc.c | 180 +- + arch/x86/power/hibernate.c | 51 +- + drivers/acpi/acpi_extlog.c | 52 +- + drivers/acpi/acpi_mrrm.c | 14 +- + drivers/acpi/acpi_pcc.c | 55 +- + drivers/acpi/acpi_video.c | 43 +- + drivers/acpi/acpica/dsfield.c | 3 +- + drivers/acpi/acpica/exfield.c | 11 +- + drivers/acpi/apei/ghes.c | 85 +- + drivers/acpi/apei/ghes_helpers.c | 18 +- + drivers/acpi/arm64/amba.c | 3 +- + drivers/acpi/battery.c | 131 +- + drivers/acpi/bus.c | 28 +- + drivers/acpi/button.c | 12 + + drivers/acpi/cppc_acpi.c | 2223 +++++++++++++++++--- + drivers/acpi/device_pm.c | 77 +- + drivers/acpi/dock.c | 9 + + drivers/acpi/fan.h | 2 +- + drivers/acpi/fan_core.c | 147 +- + drivers/acpi/fan_hwmon.c | 2 +- + drivers/acpi/glue.c | 145 +- + drivers/acpi/internal.h | 1 + + drivers/acpi/numa/hmat.c | 2 +- + drivers/acpi/numa/srat.c | 2 +- + drivers/acpi/osl.c | 2 +- + drivers/acpi/pci_link.c | 1 + + drivers/acpi/pfr_update.c | 2 +- + drivers/acpi/power.c | 25 + + drivers/acpi/processor_driver.c | 6 +- + drivers/acpi/processor_thermal.c | 80 +- + drivers/acpi/riscv/cppc.c | 26 +- + drivers/acpi/sbs.c | 8 +- + drivers/acpi/scan.c | 54 +- + drivers/acpi/sleep.c | 1 - + drivers/acpi/sysfs.c | 5 +- + drivers/acpi/tables.c | 3 + + drivers/acpi/thermal.c | 19 +- + drivers/acpi/utils.c | 13 +- + drivers/acpi/video_detect.c | 16 + + drivers/acpi/x86/s2idle.c | 29 + + drivers/base/base.h | 2 + + drivers/base/bus.c | 67 +- + drivers/base/power/clock_ops.c | 2 +- + drivers/base/power/main.c | 32 +- + drivers/base/power/runtime-test.c | 57 + + drivers/base/power/runtime.c | 109 +- + drivers/clocksource/timer-ti-dm.c | 9 +- + drivers/cpufreq/acpi-cpufreq.c | 17 +- + drivers/cpufreq/amd-pstate-ut.c | 79 +- + drivers/cpufreq/amd-pstate.c | 345 ++- + drivers/cpufreq/amd-pstate.h | 60 + + drivers/cpufreq/cppc_cpufreq.c | 73 +- + drivers/cpufreq/cpufreq_conservative.c | 8 +- + drivers/cpufreq/cpufreq_governor.c | 29 +- + drivers/cpufreq/cpufreq_governor.h | 2 + + drivers/cpuidle/cpuidle-tegra.c | 2 +- + drivers/cpuidle/governors/menu.c | 8 +- + drivers/cpuidle/governors/teo.c | 11 + + drivers/cxl/core/ras.c | 3 +- + drivers/cxl/core/ras_rch.c | 27 +- + drivers/firmware/efi/cper.c | 51 +- + drivers/firmware/efi/dev-path-parser.c | 4 +- + drivers/idle/intel_idle.c | 12 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 2 +- + drivers/pci/pcie/tlp.c | 88 + + drivers/platform/x86/lenovo/yogabook.c | 4 +- + drivers/platform/x86/serdev_helpers.h | 3 +- + drivers/platform/x86/x86-android-tablets/core.c | 4 +- + drivers/pnp/driver.c | 4 +- + drivers/powercap/intel_rapl_msr.c | 5 +- + drivers/thermal/cpufreq_cooling.c | 14 +- + drivers/thermal/devfreq_cooling.c | 4 +- + drivers/thermal/gov_power_allocator.c | 7 +- + .../int340x_thermal/processor_thermal_device.c | 14 +- + .../int340x_thermal/processor_thermal_soc_slider.c | 28 +- + drivers/thermal/intel/intel_powerclamp.c | 64 +- + drivers/thermal/intel/intel_tcc_cooling.c | 1 + + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 4 +- + drivers/thermal/thermal_core.c | 30 +- + drivers/thermal/thermal_core.h | 3 +- + drivers/thermal/thermal_of.c | 17 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 12 +- + drivers/thunderbolt/acpi.c | 5 +- + include/acpi/acpi_bus.h | 43 +- + include/acpi/actbl2.h | 7 + + include/acpi/cppc_acpi.h | 32 +- + include/acpi/ghes.h | 4 + + include/acpi/processor.h | 6 +- + include/cxl/event.h | 6 +- + include/linux/acpi.h | 37 +- + include/linux/aer.h | 9 + + include/linux/apple-gmux.h | 2 +- + include/linux/device/bus.h | 1 + + include/linux/pm.h | 93 + + include/linux/pm_runtime.h | 409 ++-- + include/linux/thermal.h | 19 +- + include/uapi/linux/thermal.h | 8 +- + kernel/cpu_pm.c | 9 +- + kernel/power/em_netlink.c | 126 +- + kernel/power/em_netlink.h | 8 +- + kernel/power/energy_model.c | 8 +- + sound/hda/codecs/side-codecs/aw88399_hda.c | 3 +- + sound/hda/codecs/side-codecs/cs35l41_hda.c | 3 +- + sound/hda/codecs/side-codecs/tas2781_hda_i2c.c | 3 +- + sound/hda/codecs/side-codecs/tas2781_hda_spi.c | 3 +- + sound/soc/amd/acp-es8336.c | 2 +- + sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c | 2 +- + sound/soc/intel/boards/bytcht_es8316.c | 4 +- + sound/soc/intel/boards/bytcr_rt5640.c | 4 +- + sound/soc/intel/boards/bytcr_rt5651.c | 4 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 5 +- + sound/soc/intel/boards/sof_cirrus_common.c | 2 +- + sound/soc/intel/boards/sof_es8336.c | 4 +- + sound/soc/loongson/loongson_card.c | 3 +- + tools/power/pm-graph/sleepgraph.py | 2 +- + 125 files changed, 4334 insertions(+), 1990 deletions(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (71245acb8c937 arm64: dts: mediatek: mt8173: Mark the lowest CPU OPPs for suspend) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Auto-merging arch/arm64/boot/dts/mediatek/mt8173.dtsi +Auto-merging drivers/cpufreq/cppc_cpufreq.c +CONFLICT (content): Merge conflict in drivers/cpufreq/cppc_cpufreq.c +Resolved 'drivers/cpufreq/cppc_cpufreq.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7339827a246de] Merge branch 'cpufreq/arm/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git +$ git diff -M --stat --summary HEAD^.. + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 2 ++ + drivers/cpufreq/airoha-cpufreq.c | 2 +- + drivers/cpufreq/bmips-cpufreq.c | 4 ++-- + drivers/cpufreq/cppc_cpufreq.c | 4 ++-- + drivers/cpufreq/cpufreq-dt-platdev.c | 2 ++ + drivers/cpufreq/mediatek-cpufreq.c | 2 ++ + drivers/cpufreq/qcom-cpufreq-hw.c | 3 +++ + drivers/cpufreq/qcom-cpufreq-nvmem.c | 9 +++++++++ + drivers/cpufreq/qoriq-cpufreq.c | 3 +-- + drivers/cpufreq/rcpufreq_dt.rs | 1 + + drivers/cpufreq/s3c64xx-cpufreq.c | 5 ++--- + drivers/cpufreq/sparc-us2e-cpufreq.c | 11 +++++------ + drivers/cpufreq/sti-cpufreq.c | 4 ++-- + drivers/cpufreq/tegra194-cpufreq.c | 2 +- + rust/kernel/cpufreq.rs | 22 ++++++++++++++++------ + 15 files changed, 51 insertions(+), 25 deletions(-) +Merging cpupower/cpupower (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'cpupower' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (9a222650d9e70 PM / devfreq: Fix governor_store() failing when device has no current governor) +$ git merge -m Merge branch 'devfreq-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Auto-merging drivers/devfreq/event/rockchip-dfi.c +Merge made by the 'ort' strategy. + drivers/devfreq/devfreq.c | 50 +++++++----------------------------- + drivers/devfreq/event/rockchip-dfi.c | 4 ++- + 2 files changed, 12 insertions(+), 42 deletions(-) +Merging pmdomain/next (6d318db9ffcb6 pmdomain: Merge branch dt into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/ux500/power_domain.txt | 35 -- + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + .../power/stericsson,ux500-pm-domains.yaml | 41 ++ + MAINTAINERS | 9 + + drivers/cpuidle/cpuidle-psci-domain.c | 7 +- + drivers/cpuidle/cpuidle-psci.c | 2 +- + drivers/pmdomain/Kconfig | 1 + + drivers/pmdomain/Makefile | 1 + + drivers/pmdomain/core.c | 163 ++++++- + drivers/pmdomain/core.h | 18 + + drivers/pmdomain/governor.c | 45 ++ + drivers/pmdomain/imx/gpcv2.c | 16 +- + drivers/pmdomain/imx/imx8m-blk-ctrl.c | 15 +- + drivers/pmdomain/imx/imx93-blk-ctrl.c | 3 +- + drivers/pmdomain/imx/scu-pd.c | 10 +- + drivers/pmdomain/qcom/rpmhpd.c | 41 ++ + drivers/pmdomain/renesas/Kconfig | 4 + + drivers/pmdomain/renesas/Makefile | 1 + + drivers/pmdomain/renesas/r8a774a3-sysc.c | 45 ++ + drivers/pmdomain/renesas/r8a7795-sysc.c | 2 +- + drivers/pmdomain/renesas/r8a779a0-sysc.c | 2 +- + drivers/pmdomain/renesas/r8a779f0-sysc.c | 2 +- + drivers/pmdomain/renesas/r8a779g0-sysc.c | 2 +- + drivers/pmdomain/renesas/r8a779h0-sysc.c | 2 +- + drivers/pmdomain/renesas/r8a78000-mdlc.c | 6 +- + drivers/pmdomain/renesas/rcar-sysc.c | 3 + + drivers/pmdomain/renesas/rcar-sysc.h | 13 +- + drivers/pmdomain/riscv/Kconfig | 15 + + drivers/pmdomain/riscv/Makefile | 3 + + drivers/pmdomain/riscv/riscv-rpmi-device-power.c | 485 +++++++++++++++++++++ + drivers/pmdomain/rockchip/pm-domains.c | 4 +- + drivers/pmdomain/st/ste-ux500-pm-domain.c | 2 + + include/dt-bindings/arm/ux500_pm_domains.h | 17 +- + include/linux/mailbox/riscv-rpmi-message.h | 11 + + include/linux/pm_domain.h | 9 + + include/linux/pm_qos.h | 9 + + kernel/power/qos.c | 4 +- + 37 files changed, 945 insertions(+), 104 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/ux500/power_domain.txt + create mode 100644 Documentation/devicetree/bindings/power/stericsson,ux500-pm-domains.yaml + create mode 100644 drivers/pmdomain/core.h + create mode 100644 drivers/pmdomain/renesas/r8a774a3-sysc.c + create mode 100644 drivers/pmdomain/riscv/Kconfig + create mode 100644 drivers/pmdomain/riscv/Makefile + create mode 100644 drivers/pmdomain/riscv/riscv-rpmi-device-power.c +Merging opp/opp/linux-next (706081c6b9327 OPP: Fix the return value in dev_pm_opp_get_of_node() kernel-doc) +$ git merge -m Merge branch 'opp/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Merge made by the 'ort' strategy. + drivers/opp/of.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging thermal/thermal/linux-next (2dc1f296b5754 thermal/drivers/rzg3e: Propagate reset assertion failure from suspend) +$ git merge -m Merge branch 'thermal/linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/thermal/gov_power_allocator.c +Auto-merging drivers/thermal/thermal_of.c +Auto-merging drivers/thermal/ti-soc-thermal/ti-bandgap.c +Merge made by the 'ort' strategy. + .../bindings/arm/airoha,en7581-chip-scu.yaml | 3 +- + .../bindings/thermal/amlogic,thermal.yaml | 29 +- + .../bindings/thermal/google,gs101-tmu-top.yaml | 69 +++ + .../bindings/thermal/qcom,pm8775-mbg-tm.yaml | 7 +- + .../devicetree/bindings/thermal/qcom-tsens.yaml | 1 + + .../bindings/thermal/renesas,r9a08g045-tsu.yaml | 4 +- + .../bindings/thermal/ti,omap-bandgap.yaml | 177 ++++++ + .../devicetree/bindings/thermal/ti_soc_thermal.txt | 88 --- + MAINTAINERS | 8 + + drivers/thermal/airoha_thermal.c | 183 ++++-- + drivers/thermal/amlogic_thermal.c | 14 +- + drivers/thermal/gov_power_allocator.c | 11 +- + drivers/thermal/imx91_thermal.c | 2 +- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 8 +- + drivers/thermal/qcom/tsens-v1.c | 41 ++ + drivers/thermal/qcom/tsens-v2.c | 4 +- + drivers/thermal/qcom/tsens.c | 3 + + drivers/thermal/qcom/tsens.h | 2 +- + drivers/thermal/renesas/rzg3e_thermal.c | 45 +- + drivers/thermal/renesas/rzg3s_thermal.c | 38 +- + drivers/thermal/samsung/Kconfig | 19 + + drivers/thermal/samsung/Makefile | 2 + + drivers/thermal/samsung/acpm-tmu.c | 651 +++++++++++++++++++++ + drivers/thermal/sprd_thermal.c | 6 + + drivers/thermal/thermal_fw.c | 8 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 10 +- + drivers/thermal/ti-soc-thermal/ti-thermal-common.c | 4 + + tools/thermal/tmon/sysfs.c | 2 +- + tools/thermal/tmon/tmon.c | 4 +- + tools/thermal/tmon/tmon.h | 2 +- + tools/thermal/tmon/tui.c | 2 +- + 31 files changed, 1252 insertions(+), 195 deletions(-) + create mode 100644 Documentation/devicetree/bindings/thermal/google,gs101-tmu-top.yaml + create mode 100644 Documentation/devicetree/bindings/thermal/ti,omap-bandgap.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/ti_soc_thermal.txt + create mode 100644 drivers/thermal/samsung/acpm-tmu.c +Merging rdma/for-next (d37e98844afea RDMA/core: Clear driver_udata before destroying objects in rdma_core) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-class-infiniband | 118 --- + MAINTAINERS | 2 +- + drivers/infiniband/core/cma.c | 34 +- + drivers/infiniband/core/cma_trace.h | 1 + + drivers/infiniband/core/device.c | 4 +- + drivers/infiniband/core/ib_core_uverbs.c | 12 - + drivers/infiniband/core/iwcm.c | 2 +- + drivers/infiniband/core/lag.c | 2 +- + drivers/infiniband/core/mad.c | 2 + + drivers/infiniband/core/mad_rmpp.c | 7 +- + drivers/infiniband/core/multicast.c | 7 +- + drivers/infiniband/core/nldev.c | 9 +- + drivers/infiniband/core/rdma_core.c | 2 + + drivers/infiniband/core/rdma_core.h | 17 +- + drivers/infiniband/core/restrack.c | 3 +- + drivers/infiniband/core/umem.c | 77 +- + drivers/infiniband/core/uverbs_std_types_device.c | 1 + + drivers/infiniband/core/uverbs_std_types_wq.c | 2 +- + drivers/infiniband/core/uverbs_uapi.c | 2 +- + drivers/infiniband/core/verbs.c | 5 +- + drivers/infiniband/hw/bnxt_re/bnxt_re.h | 4 + + drivers/infiniband/hw/bnxt_re/hw_counters.c | 6 +- + drivers/infiniband/hw/bnxt_re/ib_verbs.c | 69 +- + drivers/infiniband/hw/bnxt_re/main.c | 26 +- + drivers/infiniband/hw/bnxt_re/qplib_res.c | 9 +- + drivers/infiniband/hw/bnxt_re/qplib_sp.c | 2 +- + drivers/infiniband/hw/cxgb4/cm.c | 5 +- + drivers/infiniband/hw/cxgb4/cq.c | 2 +- + drivers/infiniband/hw/cxgb4/provider.c | 5 + + drivers/infiniband/hw/efa/efa_admin_cmds_defs.h | 5 +- + drivers/infiniband/hw/efa/efa_com_cmd.c | 9 +- + drivers/infiniband/hw/efa/efa_com_cmd.h | 8 +- + drivers/infiniband/hw/efa/efa_verbs.c | 7 +- + drivers/infiniband/hw/erdma/erdma_cq.c | 18 +- + drivers/infiniband/hw/erdma/erdma_main.c | 2 +- + drivers/infiniband/hw/erdma/erdma_qp.c | 38 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 583 ++++++++------- + drivers/infiniband/hw/erdma/erdma_verbs.h | 66 +- + drivers/infiniband/hw/hfi1/affinity.c | 2 +- + drivers/infiniband/hw/hfi1/chip.c | 4 +- + drivers/infiniband/hw/hfi1/firmware.c | 2 +- + drivers/infiniband/hw/hfi1/pcie.c | 14 +- + drivers/infiniband/hw/hfi1/sdma.c | 3 + + drivers/infiniband/hw/hfi1/verbs.c | 4 + + drivers/infiniband/hw/hns/hns_roce_bond.c | 4 +- + drivers/infiniband/hw/hns/hns_roce_cq.c | 3 +- + drivers/infiniband/hw/hns/hns_roce_debugfs.c | 55 ++ + drivers/infiniband/hw/hns/hns_roce_debugfs.h | 1 + + drivers/infiniband/hw/hns/hns_roce_device.h | 6 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 63 +- + drivers/infiniband/hw/hns/hns_roce_mr.c | 22 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_srq.c | 4 +- + drivers/infiniband/hw/ionic/ionic_admin.c | 117 ++- + drivers/infiniband/hw/ionic/ionic_controlpath.c | 830 +++++++++++++++------ + drivers/infiniband/hw/ionic/ionic_datapath.c | 98 +-- + drivers/infiniband/hw/ionic/ionic_fw.h | 76 +- + drivers/infiniband/hw/ionic/ionic_ibdev.c | 24 +- + drivers/infiniband/hw/ionic/ionic_ibdev.h | 85 ++- + drivers/infiniband/hw/ionic/ionic_lif_cfg.c | 3 + + drivers/infiniband/hw/ionic/ionic_lif_cfg.h | 3 + + drivers/infiniband/hw/irdma/ctrl.c | 23 +- + drivers/infiniband/hw/irdma/hw.c | 15 +- + drivers/infiniband/hw/irdma/icrdma_if.c | 9 +- + drivers/infiniband/hw/irdma/main.c | 2 + + drivers/infiniband/hw/irdma/pble.c | 8 +- + drivers/infiniband/hw/irdma/protos.h | 3 +- + drivers/infiniband/hw/irdma/type.h | 7 +- + drivers/infiniband/hw/irdma/verbs.c | 17 +- + drivers/infiniband/hw/mana/cq.c | 396 +++++++--- + drivers/infiniband/hw/mana/device.c | 3 +- + drivers/infiniband/hw/mana/main.c | 43 +- + drivers/infiniband/hw/mana/mana_ib.h | 134 +++- + drivers/infiniband/hw/mana/qp.c | 150 +++- + drivers/infiniband/hw/mana/shadow_queue.h | 61 +- + drivers/infiniband/hw/mana/wq.c | 3 +- + drivers/infiniband/hw/mana/wr.c | 170 +++-- + drivers/infiniband/hw/mlx4/cq.c | 17 +- + drivers/infiniband/hw/mlx4/main.c | 4 + + drivers/infiniband/hw/mlx4/mcg.c | 4 +- + drivers/infiniband/hw/mlx5/Makefile | 1 - + drivers/infiniband/hw/mlx5/cmd.c | 21 - + drivers/infiniband/hw/mlx5/cmd.h | 2 - + drivers/infiniband/hw/mlx5/cq.c | 9 +- + drivers/infiniband/hw/mlx5/data_direct.c | 227 ------ + drivers/infiniband/hw/mlx5/data_direct.h | 23 - + drivers/infiniband/hw/mlx5/fs.c | 45 +- + drivers/infiniband/hw/mlx5/main.c | 198 ++--- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 18 +- + drivers/infiniband/hw/mlx5/mr.c | 7 +- + drivers/infiniband/hw/mlx5/odp.c | 4 +- + drivers/infiniband/hw/mlx5/qp.c | 32 +- + drivers/infiniband/hw/mlx5/qpc.c | 20 +- + drivers/infiniband/hw/mlx5/srq.c | 3 +- + drivers/infiniband/hw/mlx5/std_types.c | 3 +- + drivers/infiniband/hw/mlx5/umr.c | 11 +- + drivers/infiniband/hw/mlx5/wr.c | 1 + + drivers/infiniband/hw/mthca/mthca_cq.c | 3 +- + drivers/infiniband/hw/ocrdma/ocrdma_verbs.c | 6 +- + drivers/infiniband/hw/qedr/verbs.c | 25 +- + drivers/infiniband/hw/usnic/usnic_abi.h | 2 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 2 +- + drivers/infiniband/hw/usnic/usnic_transport.h | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_qp.c | 6 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_srq.c | 3 +- + drivers/infiniband/sw/rdmavt/qp.c | 2 +- + drivers/infiniband/sw/rdmavt/srq.c | 2 +- + drivers/infiniband/sw/rxe/rxe_loc.h | 1 + + drivers/infiniband/sw/rxe/rxe_mr.c | 6 + + drivers/infiniband/sw/rxe/rxe_net.c | 71 +- + drivers/infiniband/sw/rxe/rxe_odp.c | 4 +- + drivers/infiniband/sw/rxe/rxe_req.c | 2 +- + drivers/infiniband/sw/rxe/rxe_resp.c | 6 +- + drivers/infiniband/sw/rxe/rxe_verbs.c | 6 + + drivers/infiniband/sw/siw/siw_main.c | 5 +- + drivers/infiniband/sw/siw/siw_qp_tx.c | 3 +- + drivers/infiniband/ulp/ipoib/ipoib_vlan.c | 2 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 6 +- + drivers/infiniband/ulp/iser/iser_verbs.c | 2 +- + drivers/infiniband/ulp/isert/ib_isert.c | 2 +- + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 100 +-- + drivers/infiniband/ulp/srpt/ib_srpt.c | 2 +- + drivers/infiniband/ulp/srpt/ib_srpt.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + .../net/ethernet/mellanox/mlx5/core/data_direct.c | 400 ++++++++++ + drivers/net/ethernet/mellanox/mlx5/core/main.c | 15 + + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 5 + + drivers/net/ethernet/microsoft/mana/gdma_main.c | 51 +- + drivers/net/ethernet/pensando/ionic/ionic_if.h | 31 +- + include/linux/mlx5/data_direct.h | 47 ++ + include/linux/mlx5/driver.h | 8 + + include/net/mana/gdma.h | 12 +- + include/rdma/ib_umem.h | 2 + + include/rdma/ib_verbs.h | 4 +- + include/rdma/uverbs_ioctl.h | 2 +- + include/uapi/rdma/ionic-abi.h | 11 +- + include/uapi/rdma/mana-abi.h | 12 + + tools/testing/selftests/rdma/config | 12 +- + .../testing/selftests/rdma/rxe_sent_rcvd_bytes.sh | 6 + + 139 files changed, 3388 insertions(+), 1797 deletions(-) + delete mode 100644 drivers/infiniband/hw/mlx5/data_direct.c + delete mode 100644 drivers/infiniband/hw/mlx5/data_direct.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/data_direct.c + create mode 100644 include/linux/mlx5/data_direct.h +Merging net-next/main (05b5019b01fb9 net: alacritech: fix dma_free_coherent() in error path) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging drivers/net/ethernet/microsoft/Kconfig +Auto-merging drivers/net/ethernet/microsoft/mana/gdma_main.c +Auto-merging drivers/net/wireless/ath/ath11k/Kconfig +Auto-merging drivers/net/wireless/ath/ath12k/pci.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/rx.c +Auto-merging fs/dlm/lowcomms.c +Auto-merging include/net/mana/gdma.h +Auto-merging include/net/sock.h +Auto-merging net/core/sock.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/kcm/kcmsock.c +Auto-merging net/netlink/af_netlink.c +Auto-merging net/rds/rdma_transport.c +Auto-merging net/socket.c +Auto-merging net/sunrpc/svcsock.c +Auto-merging net/sunrpc/xprtsock.c +Auto-merging net/unix/af_unix.c +Auto-merging net/vmw_vsock/af_vsock.c +Auto-merging net/xfrm/xfrm_policy.c +Merge made by the 'ort' strategy. + .mailmap | 13 +- + .../ABI/testing/sysfs-devices-platform-soc-ipa | 14 - + Documentation/ABI/testing/sysfs-timecard | 37 +- + Documentation/admin-guide/sysctl/net.rst | 14 + + .../devicetree/bindings/dpll/dpll-device.yaml | 2 +- + .../bindings/net/allwinner,sun8i-a83t-emac.yaml | 13 + + .../bindings/net/altr,socfpga-stmmac.yaml | 2 - + .../devicetree/bindings/net/brcm,asp-v2.0.yaml | 2 +- + .../bindings/net/cortina,gemini-ethernet.yaml | 52 +- + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 1 + + .../bindings/net/dsa/motorcomm,yt921x.yaml | 23 + + .../devicetree/bindings/net/dsa/realtek.yaml | 33 + + .../bindings/net/dsa/renesas,rzn1-a5psw.yaml | 4 +- + .../devicetree/bindings/net/ethernet-phy.yaml | 16 + + .../devicetree/bindings/net/fsl,fman-dtsec.yaml | 4 - + .../bindings/net/hisilicon,hns-dsaf-v1.yaml | 170 + + .../bindings/net/hisilicon,hns-mdio.yaml | 61 + + .../devicetree/bindings/net/hisilicon,hns-nic.yaml | 108 + + .../devicetree/bindings/net/hisilicon-hns-dsaf.txt | 90 - + .../devicetree/bindings/net/hisilicon-hns-mdio.txt | 27 - + .../devicetree/bindings/net/hisilicon-hns-nic.txt | 76 - + .../devicetree/bindings/net/intel,dwmac-plat.yaml | 6 +- + .../devicetree/bindings/net/mdio-gpio.yaml | 16 +- + .../devicetree/bindings/net/microchip,lan8650.yaml | 5 + + .../bindings/net/mscc,vsc7514-switch.yaml | 8 +- + .../bindings/net/nvidia,tegra234-mgbe.yaml | 8 +- + .../devicetree/bindings/net/qcom,ipa.yaml | 10 +- + .../devicetree/bindings/net/realtek,rtl82xx.yaml | 6 +- + .../bindings/net/realtek,rtl9301-mdio.yaml | 76 +- + .../devicetree/bindings/net/renesas,etheravb.yaml | 11 + + .../devicetree/bindings/net/snps,dwmac-common.yaml | 66 + + .../devicetree/bindings/net/snps,dwmac.yaml | 59 +- + .../bindings/net/socionext,uniphier-ave4.yaml | 32 +- + .../devicetree/bindings/net/ti,cpsw-switch.yaml | 70 +- + .../bindings/net/ultrarisc,dp1000-gmac.yaml | 74 + + .../bindings/net/wireless/marvell,sd8787.yaml | 6 + + .../bindings/net/wireless/mediatek,mt76.yaml | 32 +- + .../bindings/net/wireless/qcom,ath10k.yaml | 18 +- + .../bindings/net/wireless/qcom,ath12k-wsi.yaml | 7 - + .../bindings/net/wireless/silabs,wfx.yaml | 3 + + .../devicetree/bindings/net/wireless/ti,wl1251.txt | 64 - + .../bindings/net/wireless/ti,wl1251.yaml | 85 + + .../devicetree/bindings/net/wiznet,w5100.yaml | 88 + + .../devicetree/bindings/net/wiznet,w5x00.txt | 50 - + .../bindings/net/x-powers,acx00-ephy-package.yaml | 170 + + Documentation/netlink/netlink-raw.yaml | 31 +- + Documentation/netlink/specs/conntrack.yaml | 60 +- + Documentation/netlink/specs/devlink.yaml | 171 +- + Documentation/netlink/specs/dpll.yaml | 22 +- + Documentation/netlink/specs/ethtool.yaml | 4 +- + Documentation/netlink/specs/fou.yaml | 4 + + Documentation/netlink/specs/handshake.yaml | 9 +- + Documentation/netlink/specs/netdev.yaml | 5 +- + Documentation/netlink/specs/nl80211.yaml | 4 +- + Documentation/netlink/specs/nlctrl.yaml | 20 +- + Documentation/netlink/specs/psp.yaml | 2 + + Documentation/netlink/specs/rt-link.yaml | 44 +- + Documentation/netlink/specs/tc.yaml | 2 +- + Documentation/netlink/specs/tcp_metrics.yaml | 18 +- + .../networking/device_drivers/ethernet/index.rst | 1 + + .../device_drivers/ethernet/intel/i40e.rst | 2 +- + .../device_drivers/ethernet/intel/iavf.rst | 2 +- + .../device_drivers/ethernet/microsoft/netvsc.rst | 2 - + .../device_drivers/ethernet/nebula-matrix/nbl.rst | 28 + + .../device_drivers/ethernet/stmicro/stmmac.rst | 1 - + Documentation/networking/devlink/index.rst | 1 + + Documentation/networking/devlink/ptp_ocp.rst | 75 + + Documentation/networking/dsa/dsa.rst | 2 +- + Documentation/networking/ethtool-netlink.rst | 2 +- + Documentation/networking/ip-sysctl.rst | 28 +- + Documentation/networking/mctp.rst | 4 +- + .../networking/net_cachelines/net_device.rst | 1 + + .../networking/net_cachelines/tcp_sock.rst | 1 + + Documentation/networking/netconsole.rst | 5 + + Documentation/networking/netdevices.rst | 21 +- + Documentation/networking/nf_conntrack-sysctl.rst | 2 +- + Documentation/networking/oa-tc6-framework.rst | 2 +- + Documentation/networking/page_pool.rst | 2 +- + Documentation/networking/phonet.rst | 2 +- + Documentation/networking/phy.rst | 17 +- + Documentation/networking/proc_net_tcp.rst | 20 +- + Documentation/networking/psp.rst | 8 + + Documentation/networking/radiotap-headers.rst | 2 +- + Documentation/networking/scaling.rst | 9 + + Documentation/networking/strparser.rst | 120 +- + Documentation/process/maintainer-netdev.rst | 32 + + MAINTAINERS | 69 +- + arch/loongarch/configs/loongson32_defconfig | 1 - + arch/loongarch/configs/loongson64_defconfig | 1 - + arch/mips/configs/gpr_defconfig | 1 - + arch/mips/configs/mtx1_defconfig | 1 - + arch/mips/configs/rb532_defconfig | 1 - + arch/parisc/configs/generic-32bit_defconfig | 1 - + drivers/block/drbd/drbd_worker.c | 3 +- + drivers/dibs/dibs_loopback.c | 5 +- + drivers/dpll/dpll_netlink.c | 2 +- + drivers/dpll/dpll_nl.c | 20 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 27 +- + drivers/misc/lan966x_pci.dtso | 5 +- + drivers/mmc/core/quirks.h | 3 + + drivers/net/amt.c | 18 +- + drivers/net/bonding/bond_3ad.c | 1 - + drivers/net/bonding/bond_alb.c | 63 +- + drivers/net/can/bxcan.c | 2 +- + drivers/net/can/c_can/c_can_platform.c | 4 +- + drivers/net/can/flexcan/flexcan-core.c | 2 +- + drivers/net/can/ifi_canfd/ifi_canfd.c | 2 +- + drivers/net/can/m_can/m_can_platform.c | 2 +- + drivers/net/can/sja1000/f81601.c | 2 +- + drivers/net/can/sja1000/sja1000_platform.c | 2 +- + drivers/net/can/slcan/slcan-core.c | 5 +- + drivers/net/dsa/Kconfig | 19 +- + drivers/net/dsa/Makefile | 3 +- + drivers/net/dsa/b53/b53_mdio.c | 2 +- + drivers/net/dsa/b53/b53_srab.c | 2 +- + drivers/net/dsa/bcm_sf2.c | 2 +- + drivers/net/dsa/hirschmann/hellcreek.c | 2 +- + drivers/net/dsa/ks8995.c | 857 ---- + drivers/net/dsa/lan9303_i2c.c | 2 +- + drivers/net/dsa/lan9303_mdio.c | 2 +- + drivers/net/dsa/lantiq/lantiq_gswip.h | 2 + + drivers/net/dsa/lantiq/lantiq_gswip_common.c | 19 +- + drivers/net/dsa/lantiq/mxl-gsw1xx.c | 66 +- + drivers/net/dsa/lantiq/mxl-gsw1xx.h | 2 + + drivers/net/dsa/microchip/Kconfig | 1 + + drivers/net/dsa/microchip/ksz8.c | 254 +- + drivers/net/dsa/microchip/ksz8.h | 2 + + drivers/net/dsa/microchip/ksz8_reg.h | 2 + + drivers/net/dsa/microchip/ksz9477.c | 1 + + drivers/net/dsa/microchip/ksz_common.c | 136 +- + drivers/net/dsa/microchip/ksz_common.h | 18 +- + drivers/net/dsa/microchip/ksz_dcb.c | 68 +- + drivers/net/dsa/microchip/ksz_ptp.c | 514 +- + drivers/net/dsa/microchip/ksz_ptp.h | 9 +- + drivers/net/dsa/microchip/ksz_ptp_reg.h | 16 + + drivers/net/dsa/microchip/ksz_spi.c | 33 +- + drivers/net/dsa/microchip/lan937x_main.c | 1 + + drivers/net/dsa/motorcomm/Kconfig | 17 + + drivers/net/dsa/motorcomm/Makefile | 8 + + drivers/net/dsa/{yt921x.c => motorcomm/chip.c} | 1280 +---- + drivers/net/dsa/{yt921x.h => motorcomm/chip.h} | 245 +- + drivers/net/dsa/motorcomm/leds.c | 655 +++ + drivers/net/dsa/motorcomm/leds.h | 118 + + drivers/net/dsa/motorcomm/mdio_bus.c | 299 ++ + drivers/net/dsa/motorcomm/mdio_bus.h | 54 + + drivers/net/dsa/motorcomm/mib.c | 431 ++ + drivers/net/dsa/motorcomm/mib.h | 167 + + drivers/net/dsa/motorcomm/pcs-921x.c | 245 + + drivers/net/dsa/motorcomm/pcs.h | 13 + + drivers/net/dsa/motorcomm/smi.c | 180 + + drivers/net/dsa/motorcomm/smi.h | 61 + + drivers/net/dsa/mt7530-mdio.c | 14 +- + drivers/net/dsa/mt7530-mmio.c | 2 +- + drivers/net/dsa/mt7530.c | 834 ++-- + drivers/net/dsa/mt7530.h | 221 +- + drivers/net/dsa/mv88e6060.c | 3 +- + drivers/net/dsa/mv88e6xxx/chip.c | 9 +- + drivers/net/dsa/qca/qca8k-8xxx.c | 70 +- + drivers/net/dsa/qca/qca8k-common.c | 15 +- + drivers/net/dsa/realtek/realtek.h | 7 + + drivers/net/dsa/realtek/rtl8365mb_main.c | 313 +- + drivers/net/dsa/realtek/rtl8365mb_vlan.c | 4 +- + drivers/net/dsa/realtek/rtl8366rb.c | 2 +- + drivers/net/dsa/realtek/rtl83xx.c | 43 +- + drivers/net/dsa/rzn1_a5psw.c | 2 +- + drivers/net/dsa/sja1105/sja1105_main.c | 2 +- + drivers/net/dsa/vitesse-vsc73xx-spi.c | 9 +- + drivers/net/ethernet/8390/pcnet_cs.c | 9 +- + drivers/net/ethernet/Kconfig | 1 + + drivers/net/ethernet/Makefile | 1 + + drivers/net/ethernet/adaptec/starfire.c | 6 +- + drivers/net/ethernet/adi/adin1140.c | 4 +- + drivers/net/ethernet/airoha/airoha_eth.c | 363 +- + drivers/net/ethernet/airoha/airoha_eth.h | 29 +- + drivers/net/ethernet/airoha/airoha_regs.h | 23 +- + drivers/net/ethernet/alacritech/slicoss.c | 3 +- + drivers/net/ethernet/alibaba/eea/eea_adminq.c | 35 +- + drivers/net/ethernet/alibaba/eea/eea_ethtool.c | 4 +- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 5 +- + drivers/net/ethernet/aquantia/atlantic/aq_nic.c | 5 +- + .../net/ethernet/aquantia/atlantic/aq_pci_func.c | 2 - + drivers/net/ethernet/atheros/ag71xx.c | 8 +- + drivers/net/ethernet/atheros/alx/main.c | 13 +- + drivers/net/ethernet/atheros/atl1c/atl1c_hw.h | 2 +- + drivers/net/ethernet/atheros/atl1e/atl1e.h | 2 +- + drivers/net/ethernet/atheros/atl1e/atl1e_hw.c | 2 +- + drivers/net/ethernet/atheros/atl1e/atl1e_main.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 2 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 2 +- + drivers/net/ethernet/atheros/atlx/atlx.c | 1 + + drivers/net/ethernet/broadcom/asp2/bcmasp.c | 4 +- + drivers/net/ethernet/broadcom/asp2/bcmasp.h | 5 - + drivers/net/ethernet/broadcom/asp2/bcmasp_intf.c | 69 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 2 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.h | 2 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 25 +- + drivers/net/ethernet/broadcom/bcmsysport.h | 2 +- + drivers/net/ethernet/broadcom/bnge/bnge_netdev.c | 79 +- + drivers/net/ethernet/broadcom/bnge/bnge_resc.c | 2 +- + drivers/net/ethernet/broadcom/bnge/bnge_txrx.c | 6 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x.h | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_dcb.c | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_hsi.h | 2 +- + .../net/ethernet/broadcom/bnx2x/bnx2x_init_ops.h | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_link.c | 8 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_main.c | 2 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_reg.h | 4 +- + drivers/net/ethernet/broadcom/bnx2x/bnx2x_sriov.c | 18 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 11 +- + drivers/net/ethernet/cadence/macb.h | 9 +- + drivers/net/ethernet/cadence/macb_main.c | 224 +- + drivers/net/ethernet/cadence/macb_ptp.c | 62 +- + .../net/ethernet/cavium/liquidio/cn66xx_device.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_core.c | 2 +- + .../net/ethernet/cavium/liquidio/octeon_config.h | 4 +- + drivers/net/ethernet/cavium/liquidio/octeon_iq.h | 2 +- + drivers/net/ethernet/cavium/liquidio/octeon_main.h | 2 +- + drivers/net/ethernet/cavium/liquidio/octeon_nic.h | 2 +- + .../net/ethernet/cavium/liquidio/request_manager.c | 2 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 1 + + drivers/net/ethernet/cavium/thunder/nic.h | 2 +- + drivers/net/ethernet/cavium/thunder/nic_main.c | 2 +- + drivers/net/ethernet/cisco/enic/enic_main.c | 19 +- + drivers/net/ethernet/cortina/gemini.c | 32 +- + drivers/net/ethernet/cortina/gemini.h | 2 +- + drivers/net/ethernet/davicom/dm9000.c | 6 +- + drivers/net/ethernet/dec/tulip/de2104x.c | 2 +- + drivers/net/ethernet/dec/tulip/interrupt.c | 4 +- + drivers/net/ethernet/dec/tulip/media.c | 2 +- + drivers/net/ethernet/dec/tulip/tulip.h | 4 +- + drivers/net/ethernet/dec/tulip/winbond-840.c | 2 +- + .../ethernet/freescale/dpaa2/dpaa2-eth-devlink.c | 45 +- + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.c | 2 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-eth.h | 3 + + drivers/net/ethernet/freescale/dpaa2/dpaa2-ptp.c | 2 + + drivers/net/ethernet/freescale/enetc/Kconfig | 1 + + drivers/net/ethernet/freescale/enetc/enetc.c | 68 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 11 +- + .../net/ethernet/freescale/enetc/enetc4_debugfs.c | 51 +- + drivers/net/ethernet/freescale/enetc/enetc4_hw.h | 1 + + drivers/net/ethernet/freescale/enetc/enetc4_pf.c | 85 +- + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 6 + + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 26 + + .../net/ethernet/freescale/enetc/enetc_mailbox.h | 109 +- + drivers/net/ethernet/freescale/enetc/enetc_mdio.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc_msg.c | 641 ++- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 64 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.h | 21 +- + .../net/ethernet/freescale/enetc/enetc_pf_common.c | 150 +- + .../net/ethernet/freescale/enetc/enetc_pf_common.h | 19 + + drivers/net/ethernet/freescale/enetc/enetc_vf.c | 453 +- + drivers/net/ethernet/freescale/fec.h | 2 +- + drivers/net/ethernet/freescale/fec_main.c | 18 +- + drivers/net/ethernet/freescale/fec_ptp.c | 24 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 1 + + drivers/net/ethernet/google/gve/gve.h | 87 +- + drivers/net/ethernet/google/gve/gve_adminq.c | 376 +- + drivers/net/ethernet/google/gve/gve_adminq.h | 30 +- + drivers/net/ethernet/google/gve/gve_ethtool.c | 5 +- + drivers/net/ethernet/google/gve/gve_flow_rule.c | 15 +- + drivers/net/ethernet/google/gve/gve_main.c | 1091 ++--- + drivers/net/ethernet/google/gve/gve_utils.c | 4 +- + .../net/ethernet/hisilicon/hibmcge/hbg_common.h | 2 +- + drivers/net/ethernet/hisilicon/hibmcge/hbg_hw.c | 4 +- + drivers/net/ethernet/hisilicon/hibmcge/hbg_irq.c | 4 +- + drivers/net/ethernet/hisilicon/hibmcge/hbg_reg.h | 4 +- + drivers/net/ethernet/hisilicon/hibmcge/hbg_txrx.c | 12 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 5 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.c | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 4 +- + drivers/net/ethernet/hisilicon/hns3/hns3_ethtool.c | 10 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 11 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 7 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_tm.c | 2 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- + drivers/net/ethernet/huawei/hinic3/hinic3_hwdev.c | 7 +- + drivers/net/ethernet/i825xx/sni_82596.c | 2 +- + drivers/net/ethernet/intel/e1000e/netdev.c | 19 +- + drivers/net/ethernet/intel/fm10k/fm10k_pci.c | 2 - + drivers/net/ethernet/intel/i40e/i40e_common.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 12 +- + drivers/net/ethernet/intel/i40e/i40e_main.c | 70 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 7 +- + drivers/net/ethernet/intel/i40e/i40e_type.h | 5 + + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 5 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 12 + + drivers/net/ethernet/intel/ice/Makefile | 2 +- + drivers/net/ethernet/intel/ice/ice.h | 17 +- + drivers/net/ethernet/intel/ice/ice_arfs.c | 8 +- + drivers/net/ethernet/intel/ice/ice_arfs.h | 2 +- + drivers/net/ethernet/intel/ice/ice_dcb_nl.c | 2 +- + drivers/net/ethernet/intel/ice/ice_dpll.c | 495 +- + drivers/net/ethernet/intel/ice/ice_dpll.h | 4 + + drivers/net/ethernet/intel/ice/ice_ethtool.c | 14 +- + .../{ice_ethtool_fdir.c => ice_ethtool_ntuple.c} | 145 +- + drivers/net/ethernet/intel/ice/ice_fdir.c | 38 +- + drivers/net/ethernet/intel/ice/ice_fdir.h | 14 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 354 +- + drivers/net/ethernet/intel/ice/ice_main.c | 15 +- + drivers/net/ethernet/intel/ice/ice_parser.c | 2 +- + drivers/net/ethernet/intel/ice/ice_ptp.c | 84 + + drivers/net/ethernet/intel/ice/ice_ptp.h | 11 + + drivers/net/ethernet/intel/ice/ice_sriov.c | 2 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 6 +- + drivers/net/ethernet/intel/ice/ice_trace.h | 18 + + drivers/net/ethernet/intel/ice/ice_tspll.c | 120 +- + drivers/net/ethernet/intel/ice/ice_tspll.h | 6 + + drivers/net/ethernet/intel/ice/ice_txclk.c | 20 +- + drivers/net/ethernet/intel/ice/ice_type.h | 6 +- + drivers/net/ethernet/intel/ice/virt/fdir.c | 28 +- + drivers/net/ethernet/intel/ice/virt/queues.c | 17 +- + drivers/net/ethernet/intel/idpf/idpf.h | 12 + + drivers/net/ethernet/intel/idpf/idpf_lib.c | 19 + + drivers/net/ethernet/intel/idpf/idpf_txrx.c | 71 +- + drivers/net/ethernet/intel/idpf/idpf_txrx.h | 8 +- + drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 60 +- + drivers/net/ethernet/intel/ixgbevf/ixgbevf_main.c | 2 +- + drivers/net/ethernet/marvell/mvmdio.c | 4 +- + drivers/net/ethernet/marvell/mvneta.c | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2.h | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 2 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_prs.c | 8 +- + .../ethernet/marvell/octeon_ep/octep_pfvf_mbox.c | 1 - + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 25 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 2 + + .../net/ethernet/marvell/octeontx2/af/cn20k/npa.c | 1 - + .../net/ethernet/marvell/octeontx2/af/cn20k/npc.c | 5 +- + .../ethernet/marvell/octeontx2/af/lmac_common.h | 2 + + .../net/ethernet/marvell/octeontx2/af/mcs_reg.h | 2 - + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 4 +- + drivers/net/ethernet/marvell/octeontx2/af/rpm.c | 40 +- + drivers/net/ethernet/marvell/octeontx2/af/rpm.h | 2 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 4 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 5 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 12 + + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 8 + + .../ethernet/marvell/octeontx2/af/rvu_devlink.c | 46 +- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 33 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npa.c | 10 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc.c | 5 +- + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 1 - + drivers/net/ethernet/marvell/octeontx2/nic/cn10k.c | 2 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 8 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 3 +- + .../ethernet/marvell/octeontx2/nic/otx2_dcbnl.c | 7 +- + .../ethernet/marvell/octeontx2/nic/otx2_ethtool.c | 18 + + .../ethernet/marvell/octeontx2/nic/otx2_flows.c | 3 - + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 101 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_reg.h | 2 + + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 1 - + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 9 +- + drivers/net/ethernet/marvell/octeontx2/nic/qos.h | 2 - + .../ethernet/marvell/prestera/prestera_router.c | 12 +- + drivers/net/ethernet/marvell/pxa168_eth.c | 4 +- + drivers/net/ethernet/mellanox/mlx4/main.c | 8 +- + drivers/net/ethernet/mellanox/mlx5/core/alloc.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/en/ptp.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/rep/neigh.c | 29 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 14 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 19 +- + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 4 +- + .../net/ethernet/mellanox/mlx5/core/en_ethtool.c | 6 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 75 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 20 +- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.h | 2 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 37 +- + .../net/ethernet/mellanox/mlx5/core/fpga/conn.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/fw_reset.c | 6 +- + .../net/ethernet/mellanox/mlx5/core/lag/debugfs.c | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.c | 154 +- + drivers/net/ethernet/mellanox/mlx5/core/lag/lag.h | 2 +- + .../ethernet/mellanox/mlx5/core/lag/shared_fdb.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/lib/aso.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 8 +- + .../ethernet/mellanox/mlx5/core/steering/hws/bwc.c | 4 +- + .../mellanox/mlx5/core/steering/hws/send.c | 34 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 7 +- + .../ethernet/mellanox/mlxsw/spectrum_nve_vxlan.c | 19 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 83 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 36 +- + .../ethernet/mellanox/mlxsw/spectrum_switchdev.c | 57 +- + drivers/net/ethernet/meta/Kconfig | 13 + + drivers/net/ethernet/meta/Makefile | 1 + + drivers/net/ethernet/meta/fbnic/fbnic.h | 9 +- + drivers/net/ethernet/meta/fbnic/fbnic_csr.h | 34 +- + drivers/net/ethernet/meta/fbnic/fbnic_debugfs.c | 5 +- + drivers/net/ethernet/meta/fbnic/fbnic_devlink.c | 2 + + drivers/net/ethernet/meta/fbnic/fbnic_ethtool.c | 15 +- + drivers/net/ethernet/meta/fbnic/fbnic_fw.c | 87 +- + drivers/net/ethernet/meta/fbnic/fbnic_fw.h | 19 +- + drivers/net/ethernet/meta/fbnic/fbnic_mac.c | 9 +- + drivers/net/ethernet/meta/fbnic/fbnic_netdev.c | 4 + + drivers/net/ethernet/meta/fbnic/fbnic_pci.c | 2 - + drivers/net/ethernet/meta/fbnic/fbnic_rpc.c | 129 +- + drivers/net/ethernet/meta/fbnic/fbnic_tlv.c | 13 +- + drivers/net/ethernet/meta/fbnic/fbnic_txrx.c | 191 +- + drivers/net/ethernet/meta/fbnic/fbnic_txrx.h | 17 + + drivers/net/ethernet/meta/mpnic/Makefile | 16 + + drivers/net/ethernet/meta/mpnic/mpnic.h | 69 + + drivers/net/ethernet/meta/mpnic/mpnic_csr.h | 319 ++ + drivers/net/ethernet/meta/mpnic/mpnic_init.c | 561 +++ + drivers/net/ethernet/meta/mpnic/mpnic_irq.c | 64 + + drivers/net/ethernet/meta/mpnic/mpnic_netdev.c | 189 + + drivers/net/ethernet/meta/mpnic/mpnic_netdev.h | 35 + + drivers/net/ethernet/meta/mpnic/mpnic_pci.c | 208 + + drivers/net/ethernet/meta/mpnic/mpnic_txrx.c | 1426 ++++++ + drivers/net/ethernet/meta/mpnic/mpnic_txrx.h | 158 + + drivers/net/ethernet/microchip/fdma/Makefile | 4 + + drivers/net/ethernet/microchip/fdma/fdma_api.c | 65 +- + drivers/net/ethernet/microchip/fdma/fdma_api.h | 42 +- + drivers/net/ethernet/microchip/fdma/fdma_pci.c | 208 + + drivers/net/ethernet/microchip/fdma/fdma_pci.h | 57 + + drivers/net/ethernet/microchip/lan865x/lan865x.c | 4 +- + drivers/net/ethernet/microchip/lan966x/Makefile | 4 + + .../net/ethernet/microchip/lan966x/lan966x_fdma.c | 97 +- + .../ethernet/microchip/lan966x/lan966x_fdma_pci.c | 731 +++ + .../net/ethernet/microchip/lan966x/lan966x_main.c | 121 +- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 69 + + .../net/ethernet/microchip/lan966x/lan966x_regs.h | 25 + + .../net/ethernet/microchip/lan966x/lan966x_xdp.c | 6 + + drivers/net/ethernet/microchip/sparx5/Makefile | 2 +- + .../ethernet/microchip/sparx5/lan969x/lan969x.c | 2 + + .../microchip/sparx5/lan969x/lan969x_regs.c | 10 + + .../net/ethernet/microchip/sparx5/sparx5_main.c | 2 + + .../net/ethernet/microchip/sparx5/sparx5_main.h | 28 + + .../ethernet/microchip/sparx5/sparx5_main_regs.h | 204 + + drivers/net/ethernet/microchip/sparx5/sparx5_qos.c | 53 +- + drivers/net/ethernet/microchip/sparx5/sparx5_qos.h | 1 - + .../net/ethernet/microchip/sparx5/sparx5_regs.c | 10 + + .../net/ethernet/microchip/sparx5/sparx5_regs.h | 10 + + drivers/net/ethernet/microchip/sparx5/sparx5_tas.c | 806 ++++ + drivers/net/ethernet/microchip/sparx5/sparx5_tc.c | 17 + + drivers/net/ethernet/microchip/vcap/Kconfig | 1 - + drivers/net/ethernet/microsoft/Kconfig | 26 +- + drivers/net/ethernet/microsoft/Makefile | 2 +- + drivers/net/ethernet/microsoft/mana/Makefile | 9 +- + drivers/net/ethernet/microsoft/mana/gdma_cdx.c | 340 ++ + drivers/net/ethernet/microsoft/mana/gdma_main.c | 1067 +---- + drivers/net/ethernet/microsoft/mana/gdma_pci.c | 917 ++++ + drivers/net/ethernet/microsoft/mana/hw_channel.c | 24 +- + drivers/net/ethernet/microsoft/mana/mana_bpf.c | 3 - + drivers/net/ethernet/microsoft/mana/mana_en.c | 18 +- + drivers/net/ethernet/natsemi/xtsonic.c | 2 +- + drivers/net/ethernet/nebula-matrix/Kconfig | 32 + + drivers/net/ethernet/nebula-matrix/Makefile | 6 + + drivers/net/ethernet/nebula-matrix/nbl/Makefile | 7 + + drivers/net/ethernet/nebula-matrix/nbl/nbl_core.h | 31 + + .../nbl/nbl_hw/nbl_hw_leonis/nbl_hw_leonis.c | 153 + + .../nbl/nbl_hw/nbl_hw_leonis/nbl_hw_leonis.h | 15 + + .../ethernet/nebula-matrix/nbl/nbl_hw/nbl_hw_reg.h | 31 + + .../nebula-matrix/nbl/nbl_include/nbl_def_common.h | 31 + + .../nebula-matrix/nbl/nbl_include/nbl_def_hw.h | 17 + + .../nebula-matrix/nbl/nbl_include/nbl_include.h | 23 + + drivers/net/ethernet/nebula-matrix/nbl/nbl_main.c | 192 + + .../net/ethernet/netronome/nfp/flower/conntrack.c | 4 + + .../ethernet/netronome/nfp/flower/tunnel_conf.c | 10 +- + drivers/net/ethernet/oa_tc6.c | 46 +- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_main.c | 10 +- + .../net/ethernet/pensando/ionic/ionic_bus_pci.c | 1 + + .../net/ethernet/pensando/ionic/ionic_ethtool.c | 10 +- + .../net/ethernet/qlogic/netxen/netxen_nic_ctx.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_cxt.c | 2 +- + drivers/net/ethernet/qlogic/qed/qed_mcp.h | 2 +- + drivers/net/ethernet/qlogic/qede/qede_ethtool.c | 6 +- + drivers/net/ethernet/qlogic/qla3xxx.c | 19 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic.h | 2 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_83xx_init.c | 4 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_ctx.c | 2 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_dcb.c | 5 +- + drivers/net/ethernet/qlogic/qlcnic/qlcnic_main.c | 4 +- + .../ethernet/qlogic/qlcnic/qlcnic_sriov_common.c | 6 +- + .../net/ethernet/qlogic/qlcnic/qlcnic_sriov_pf.c | 6 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 75 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 2 +- + .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 34 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 9 +- + .../ethernet/qualcomm/rmnet/rmnet_map_command.c | 9 +- + .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 14 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 13 +- + drivers/net/ethernet/realtek/Kconfig | 2 +- + drivers/net/ethernet/realtek/r8169_main.c | 706 ++- + drivers/net/ethernet/renesas/ravb.h | 35 +- + drivers/net/ethernet/renesas/ravb_main.c | 253 +- + drivers/net/ethernet/renesas/ravb_ptp.c | 38 +- + drivers/net/ethernet/renesas/rswitch_main.c | 7 +- + drivers/net/ethernet/rocker/rocker_main.c | 2 +- + drivers/net/ethernet/rocker/rocker_ofdpa.c | 2 +- + drivers/net/ethernet/sfc/Kconfig | 2 +- + drivers/net/ethernet/sfc/mae.c | 2 + + drivers/net/ethernet/sfc/net_driver.h | 21 +- + drivers/net/ethernet/sfc/ptp.c | 1 - + drivers/net/ethernet/sfc/siena/ptp.c | 1 - + drivers/net/ethernet/sfc/tc_counters.c | 11 +- + drivers/net/ethernet/sfc/tc_encap_actions.c | 4 +- + drivers/net/ethernet/smsc/Kconfig | 3 +- + drivers/net/ethernet/smsc/smc9194.h | 241 - + drivers/net/ethernet/spacemit/k1_emac.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 11 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + drivers/net/ethernet/stmicro/stmmac/common.h | 5 + + .../net/ethernet/stmicro/stmmac/dwmac-eic7700.c | 13 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-intel.c | 44 +- + .../ethernet/stmicro/stmmac/dwmac-renesas-gbeth.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rzn1.c | 7 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sophgo.c | 10 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 77 +- + .../net/ethernet/stmicro/stmmac/dwmac-ultrarisc.c | 52 + + drivers/net/ethernet/stmicro/stmmac/dwmac4.h | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_core.c | 79 +- + drivers/net/ethernet/stmicro/stmmac/dwmac4_dma.c | 2 + + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 18 - + drivers/net/ethernet/stmicro/stmmac/hwif.h | 8 +- + drivers/net/ethernet/stmicro/stmmac/stmmac.h | 16 + + .../net/ethernet/stmicro/stmmac/stmmac_ethtool.c | 14 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_fpe.c | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_hwtstamp.c | 7 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 402 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 37 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 17 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 21 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 116 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_tc.c | 149 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_xdp.c | 2 +- + drivers/net/ethernet/sun/niu.c | 10 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 2 +- + drivers/net/ethernet/ti/cpsw.c | 2 +- + drivers/net/ethernet/ti/cpsw_new.c | 2 +- + drivers/net/ethernet/ti/davinci_mdio.c | 4 +- + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 2 +- + drivers/net/ethernet/wangxun/libwx/wx_ptp.c | 5 +- + drivers/net/ethernet/wangxun/libwx/wx_type.h | 6 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 18 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 6 +- + drivers/net/ethernet/wiznet/w5100.c | 234 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 7 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 47 +- + drivers/net/ethernet/xscale/ptp_ixp46x.c | 1 + + drivers/net/fddi/skfp/cfm.c | 2 +- + drivers/net/fddi/skfp/ecm.c | 2 +- + drivers/net/fddi/skfp/fplustm.c | 4 +- + drivers/net/fddi/skfp/h/hwmtm.h | 2 +- + drivers/net/fddi/skfp/h/sba.h | 2 +- + drivers/net/fddi/skfp/pcmplc.c | 2 +- + drivers/net/fddi/skfp/rmt.c | 2 +- + drivers/net/gtp.c | 2 +- + drivers/net/hyperv/netvsc.c | 10 +- + drivers/net/ieee802154/at86rf230.c | 2 +- + drivers/net/loopback.c | 2 +- + drivers/net/macsec.c | 40 +- + drivers/net/mdio/Kconfig | 4 +- + drivers/net/mdio/mdio-bcm-iproc.c | 2 +- + drivers/net/mdio/mdio-bcm-unimac.c | 2 +- + drivers/net/mdio/mdio-mux-meson-g12a.c | 2 +- + drivers/net/mdio/mdio-realtek-rtl9300.c | 546 ++- + drivers/net/netconsole.c | 132 +- + drivers/net/netdevsim/bus.c | 7 +- + drivers/net/netdevsim/ethtool.c | 53 + + drivers/net/netdevsim/ipsec.c | 10 +- + drivers/net/netdevsim/netdev.c | 10 +- + drivers/net/netdevsim/netdevsim.h | 8 +- + drivers/net/netdevsim/psp.c | 33 - + drivers/net/netkit.c | 17 +- + drivers/net/pcs/pcs-lynx.c | 59 +- + drivers/net/pcs/pcs-xpcs-plat.c | 2 +- + drivers/net/pfcp.c | 6 +- + drivers/net/phy/Kconfig | 11 + + drivers/net/phy/Makefile | 3 +- + drivers/net/phy/air_en8811h.c | 84 +- + drivers/net/phy/broadcom.c | 7 + + drivers/net/phy/dp83848.c | 3 + + drivers/net/phy/dp83867.c | 109 +- + drivers/net/phy/mediatek/mtk-phy-lib.c | 26 +- + drivers/net/phy/microchip_t1.c | 16 +- + drivers/net/phy/motorcomm.c | 84 +- + drivers/net/phy/mxl-gpy.c | 2 +- + drivers/net/phy/nxp-c45-tja11xx.c | 2 +- + drivers/net/phy/phy_device.c | 364 +- + drivers/net/phy/phy_fixup.c | 98 + + drivers/net/phy/phy_led_triggers.c | 11 +- + drivers/net/phy/phylib-internal.h | 1 + + drivers/net/phy/phylink.c | 176 +- + drivers/net/phy/qcom/qca808x.c | 15 +- + drivers/net/phy/realtek/realtek_main.c | 165 +- + drivers/net/phy/sfp.c | 21 +- + drivers/net/phy/xpowers/Makefile | 3 + + drivers/net/phy/xpowers/ac200.c | 314 ++ + drivers/net/phy/xpowers/ac300.c | 387 ++ + drivers/net/phy/xpowers/acx00.c | 633 +++ + drivers/net/phy/xpowers/acx00.h | 28 + + drivers/net/ppp/ppp_synctty.c | 20 +- + drivers/net/tap.c | 8 +- + drivers/net/tun.c | 1 + + drivers/net/usb/asix_common.c | 5 - + drivers/net/usb/ax88172a.c | 3 +- + drivers/net/usb/ax88179_178a.c | 9 +- + drivers/net/usb/ch9200.c | 14 +- + drivers/net/usb/lan78xx.c | 1 + + drivers/net/usb/qmi_wwan.c | 1 + + drivers/net/usb/r8152.c | 51 +- + drivers/net/usb/r8153_ecm.c | 8 +- + drivers/net/usb/rndis_host.c | 21 + + drivers/net/usb/sierra_net.c | 2 +- + drivers/net/usb/smsc95xx.c | 1 + + drivers/net/virtio_net.c | 33 +- + drivers/net/vrf.c | 4 +- + drivers/net/vxlan/vxlan_core.c | 804 ++-- + drivers/net/vxlan/vxlan_mdb.c | 45 +- + drivers/net/vxlan/vxlan_multicast.c | 94 +- + drivers/net/vxlan/vxlan_private.h | 34 +- + drivers/net/vxlan/vxlan_vnifilter.c | 206 +- + drivers/net/wan/slic_ds26522.c | 2 +- + drivers/net/wireguard/noise.c | 2 - + drivers/net/wireless/ath/ath10k/debug.c | 10 +- + drivers/net/wireless/ath/ath10k/snoc.c | 6 +- + drivers/net/wireless/ath/ath11k/Kconfig | 3 + + drivers/net/wireless/ath/ath11k/ahb.c | 16 +- + drivers/net/wireless/ath/ath11k/ce.c | 2 +- + drivers/net/wireless/ath/ath11k/core.c | 10 + + drivers/net/wireless/ath/ath11k/dp.c | 2 + + drivers/net/wireless/ath/ath11k/dp_rx.c | 21 +- + drivers/net/wireless/ath/ath11k/htc.c | 5 +- + drivers/net/wireless/ath/ath11k/wmi.c | 9 + + drivers/net/wireless/ath/ath12k/ahb.c | 166 +- + drivers/net/wireless/ath/ath12k/ahb.h | 9 + + drivers/net/wireless/ath/ath12k/ce.c | 2 +- + drivers/net/wireless/ath/ath12k/core.c | 23 + + drivers/net/wireless/ath/ath12k/core.h | 9 - + drivers/net/wireless/ath/ath12k/debugfs.c | 78 +- + drivers/net/wireless/ath/ath12k/dp.c | 92 +- + drivers/net/wireless/ath/ath12k/dp.h | 114 +- + drivers/net/wireless/ath/ath12k/dp_mon.c | 17 +- + drivers/net/wireless/ath/ath12k/dp_mon.h | 2 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 53 +- + drivers/net/wireless/ath/ath12k/dp_rx.h | 3 - + drivers/net/wireless/ath/ath12k/dp_stats.h | 25 + + drivers/net/wireless/ath/ath12k/htc.c | 5 +- + drivers/net/wireless/ath/ath12k/hw.h | 21 +- + drivers/net/wireless/ath/ath12k/mac.c | 50 +- + drivers/net/wireless/ath/ath12k/pci.c | 55 +- + drivers/net/wireless/ath/ath12k/qmi.c | 106 +- + drivers/net/wireless/ath/ath12k/qmi.h | 4 + + drivers/net/wireless/ath/ath12k/wifi7/ahb.c | 2 + + drivers/net/wireless/ath/ath12k/wifi7/dp_mon.c | 45 +- + drivers/net/wireless/ath/ath12k/wifi7/dp_rx.c | 72 +- + drivers/net/wireless/ath/ath12k/wifi7/dp_rx.h | 12 +- + drivers/net/wireless/ath/ath12k/wifi7/dp_tx.c | 56 +- + drivers/net/wireless/ath/ath12k/wifi7/hal_rx.c | 5 +- + drivers/net/wireless/ath/ath12k/wifi7/hal_tx.c | 2 +- + drivers/net/wireless/ath/ath12k/wifi7/hw.c | 16 +- + drivers/net/wireless/ath/ath12k/wmi.c | 22 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 10 +- + drivers/net/wireless/ath/ath9k/ar9003_calib.c | 5 +- + drivers/net/wireless/ath/ath9k/mci.c | 5 +- + drivers/net/wireless/ath/ath9k/xmit.c | 2 +- + drivers/net/wireless/ath/carl9170/debug.c | 5 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 13 +- + drivers/net/wireless/broadcom/b43/debugfs.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/debugfs.c | 2 +- + drivers/net/wireless/broadcom/b43legacy/dma.c | 24 +- + drivers/net/wireless/broadcom/b43legacy/dma.h | 4 +- + drivers/net/wireless/broadcom/b43legacy/main.c | 3 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 230 +- + .../broadcom/brcm80211/brcmfmac/cfg80211.h | 5 +- + .../broadcom/brcm80211/brcmfmac/cyw/core.c | 6 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.c | 2 + + .../wireless/broadcom/brcm80211/brcmfmac/feature.h | 4 +- + .../broadcom/brcm80211/brcmfmac/firmware.c | 13 +- + .../wireless/broadcom/brcm80211/brcmfmac/fwvid.h | 11 + + .../wireless/broadcom/brcm80211/brcmfmac/pcie.c | 10 +- + .../wireless/broadcom/brcm80211/brcmfmac/sdio.c | 3 +- + .../broadcom/brcm80211/brcmsmac/phy/phy_n.c | 2 +- + drivers/net/wireless/intel/iwlegacy/3945-mac.c | 441 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 121 - + drivers/net/wireless/intel/iwlegacy/debug.c | 3 + + drivers/net/wireless/intel/iwlwifi/mld/agg.c | 17 +- + drivers/net/wireless/intel/iwlwifi/mld/agg.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mld/d3.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mld/iface.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mld/rx.c | 50 +- + drivers/net/wireless/intel/iwlwifi/mld/rx.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mld/tests/agg.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/rx.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 6 +- + drivers/net/wireless/marvell/libertas/cfg.c | 6 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 10 +- + drivers/net/wireless/marvell/libertas/mesh.c | 506 -- + drivers/net/wireless/marvell/libertas/rx.c | 9 + + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 10 +- + .../net/wireless/marvell/mwifiex/11n_rxreorder.c | 20 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 27 +- + drivers/net/wireless/marvell/mwifiex/main.h | 2 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 3 + + drivers/net/wireless/mediatek/mt76/mac80211.c | 25 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 5 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 13 +- + drivers/net/wireless/morsemicro/mm81x/core.h | 7 +- + drivers/net/wireless/morsemicro/mm81x/fw.c | 9 +- + drivers/net/wireless/morsemicro/mm81x/mac.c | 181 +- + drivers/net/wireless/morsemicro/mm81x/sdio.c | 9 +- + drivers/net/wireless/morsemicro/mm81x/skbq.c | 7 +- + drivers/net/wireless/nxp/nxpwifi/11ax.c | 2 + + drivers/net/wireless/nxp/nxpwifi/11n.c | 4 +- + drivers/net/wireless/nxp/nxpwifi/cfg80211.c | 17 +- + drivers/net/wireless/nxp/nxpwifi/debugfs.c | 31 +- + drivers/net/wireless/nxp/nxpwifi/fw.h | 2 + + drivers/net/wireless/nxp/nxpwifi/main.c | 15 +- + drivers/net/wireless/nxp/nxpwifi/scan.c | 18 + + drivers/net/wireless/nxp/nxpwifi/sdio.c | 16 + + drivers/net/wireless/nxp/nxpwifi/sdio.h | 1 + + drivers/net/wireless/nxp/nxpwifi/util.c | 43 +- + drivers/net/wireless/nxp/nxpwifi/util.h | 1 + + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 8 +- + drivers/net/wireless/ralink/rt2x00/rt2x00pci.c | 104 +- + drivers/net/wireless/ralink/rt2x00/rt2x00usb.c | 67 +- + drivers/net/wireless/realtek/rtw88/debug.c | 5 +- + drivers/net/wireless/realtek/rtw89/core.c | 12 +- + drivers/net/wireless/realtek/rtw89/mac.c | 10 +- + drivers/net/wireless/realtek/rtw89/regd.c | 5 +- + drivers/net/wireless/realtek/rtw89/wow.c | 6 +- + drivers/net/wireless/silabs/wfx/bh.c | 6 +- + drivers/net/wireless/silabs/wfx/bus_sdio.c | 1 + + drivers/net/wireless/silabs/wfx/main.c | 37 +- + drivers/net/wireless/st/cw1200/txrx.c | 2 +- + drivers/net/wireless/ti/wlcore/rx.c | 5 +- + drivers/net/wireless/virtual/mac80211_hwsim.h | 5 +- + drivers/net/wireless/virtual/mac80211_hwsim_main.c | 141 +- + drivers/net/wireless/virtual/mac80211_hwsim_nan.c | 267 +- + drivers/net/wireless/virtual/mac80211_hwsim_nan.h | 10 + + drivers/nvme/host/tcp.c | 2 +- + drivers/nvme/target/tcp.c | 2 +- + drivers/ptp/ptp_idt82p33.c | 25 +- + drivers/ptp/ptp_idt82p33.h | 1 + + drivers/ptp/ptp_ocp.c | 939 +++- + drivers/s390/net/ctcm_main.c | 14 +- + drivers/s390/net/fsm.c | 9 +- + drivers/s390/net/ism_drv.c | 3 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 9 +- + drivers/usb/atm/cxacru.c | 18 +- + drivers/usb/atm/speedtch.c | 10 +- + fs/dlm/lowcomms.c | 10 +- + include/linux/bnge/hsi.h | 136 +- + include/linux/dibs.h | 6 +- + include/linux/ethtool.h | 4 +- + include/linux/ieee80211-eht.h | 18 +- + include/linux/ieee80211-nan.h | 28 + + include/linux/ieee80211-uhr.h | 101 +- + include/linux/ieee80211.h | 42 +- + include/linux/if_vlan.h | 18 +- + include/linux/igmp.h | 3 +- + include/linux/llc.h | 5 - + include/linux/mdio-mux.h | 2 +- + include/linux/mlx5/eswitch.h | 3 + + include/linux/mmc/sdio_ids.h | 2 + + include/linux/net.h | 34 +- + include/linux/netdevice.h | 49 +- + include/linux/netpoll.h | 5 - + include/linux/phy.h | 28 +- + include/linux/phylink.h | 2 + + include/linux/platform_data/microchip-ksz.h | 2 + + include/linux/skbuff.h | 7 +- + include/linux/soc/marvell/octeontx2/asm.h | 6 +- + include/linux/stmmac.h | 2 + + include/linux/tcp.h | 3 + + include/linux/usb/rndis_host.h | 5 +- + include/net/arp.h | 26 +- + include/net/bond_3ad.h | 7 - + include/net/bond_alb.h | 14 +- + include/net/cfg80211.h | 79 +- + include/net/cfg802154.h | 9 +- + include/net/dropreason-core.h | 31 +- + include/net/dsa.h | 2 + + include/net/gso.h | 7 +- + include/net/ieee80211_radiotap.h | 113 +- + include/net/inet_connection_sock.h | 1 + + include/net/inet_sock.h | 2 +- + include/net/ip.h | 17 +- + include/net/ip6_route.h | 13 +- + include/net/ip6_tunnel.h | 1 + + include/net/ip_fib.h | 12 +- + include/net/ip_tunnels.h | 17 +- + include/net/llc.h | 108 +- + include/net/llc_c_ac.h | 180 - + include/net/llc_c_ev.h | 217 - + include/net/llc_c_st.h | 46 - + include/net/llc_conn.h | 114 - + include/net/llc_if.h | 63 - + include/net/llc_pdu.h | 379 +- + include/net/llc_s_ac.h | 35 - + include/net/llc_s_ev.h | 61 - + include/net/llc_s_st.h | 32 - + include/net/llc_sap.h | 26 - + include/net/mac80211.h | 83 +- + include/net/mana/gdma.h | 106 +- + include/net/mana/hw_channel.h | 8 +- + include/net/ndisc.h | 39 +- + include/net/neighbour.h | 46 +- + include/net/net_namespace.h | 4 + + include/net/netdev_lock.h | 20 +- + include/net/netdev_queues.h | 56 +- + include/net/netfilter/nf_conntrack_seqadj.h | 1 + + include/net/netmem.h | 30 +- + include/net/netns/netfilter.h | 2 + + include/net/page_pool/helpers.h | 12 +- + include/net/phy/realtek_phy.h | 7 - + include/net/psp/functions.h | 5 - + include/net/psp/types.h | 4 + + include/net/route.h | 13 +- + include/net/seg6_hmac.h | 3 +- + include/net/sock.h | 2 + + include/net/strparser.h | 11 - + include/net/tcp.h | 47 +- + include/net/udp.h | 2 +- + include/net/vxlan.h | 12 +- + include/trace/events/bridge.h | 7 +- + include/trace/events/fib.h | 13 +- + include/trace/events/fib6.h | 8 +- + include/uapi/linux/atm.h | 2 +- + include/uapi/linux/dpll.h | 3 +- + include/uapi/linux/handshake.h | 5 +- + include/uapi/linux/if_link.h | 1 + + include/uapi/linux/mii.h | 2 +- + include/uapi/linux/netdev.h | 2 +- + include/uapi/linux/netfilter/nfnetlink_conntrack.h | 1 + + include/uapi/linux/netlink.h | 14 + + include/uapi/linux/nl80211.h | 99 +- + lib/ref_tracker.c | 2 +- + net/6lowpan/debugfs.c | 10 +- + net/802/garp.c | 4 +- + net/802/psnap.c | 2 +- + net/8021q/vlan.c | 8 +- + net/8021q/vlan.h | 22 +- + net/8021q/vlan_core.c | 2 +- + net/8021q/vlan_dev.c | 37 +- + net/8021q/vlan_netlink.c | 52 +- + net/8021q/vlanproc.c | 18 +- + net/Kconfig | 1 - + net/atm/proc.c | 7 +- + net/batman-adv/bat_iv_ogm.c | 29 +- + net/batman-adv/bat_v.c | 42 +- + net/batman-adv/bridge_loop_avoidance.c | 7 +- + net/batman-adv/distributed-arp-table.c | 16 +- + net/batman-adv/hash.h | 2 +- + net/batman-adv/main.c | 1 + + net/batman-adv/mesh-interface.c | 20 +- + net/batman-adv/multicast.c | 6 +- + net/batman-adv/translation-table.c | 1329 ++++-- + net/batman-adv/translation-table.h | 3 + + net/batman-adv/types.h | 68 +- + net/bridge/br.c | 9 +- + net/bridge/br_arp_nd_proxy.c | 61 +- + net/bridge/br_device.c | 17 +- + net/bridge/br_fdb.c | 285 +- + net/bridge/br_forward.c | 294 +- + net/bridge/br_if.c | 13 +- + net/bridge/br_input.c | 30 +- + net/bridge/br_mrp.c | 6 +- + net/bridge/br_mst.c | 28 +- + net/bridge/br_multicast.c | 18 +- + net/bridge/br_netlink.c | 12 +- + net/bridge/br_netlink_tunnel.c | 14 +- + net/bridge/br_private.h | 251 +- + net/bridge/br_stp_bpdu.c | 3 +- + net/bridge/br_stp_if.c | 2 +- + net/bridge/br_switchdev.c | 2 +- + net/bridge/br_sysfs_if.c | 13 +- + net/bridge/br_vlan.c | 299 +- + net/bridge/br_vlan_options.c | 20 +- + net/bridge/br_vlan_tunnel.c | 2 +- + net/bridge/netfilter/nft_reject_bridge.c | 8 +- + net/ceph/messenger.c | 2 +- + net/core/dev.c | 226 +- + net/core/dev.h | 15 +- + net/core/devmem.c | 235 +- + net/core/devmem.h | 50 +- + net/core/filter.c | 2 +- + net/core/gro_cells.c | 6 +- + net/core/gso.c | 6 +- + net/core/neighbour.c | 439 +- + net/core/net-sysfs.c | 150 +- + net/core/net_test.c | 87 + + net/core/netdev-genl.c | 37 +- + net/core/netdev_config.c | 75 +- + net/core/netdev_queues.c | 31 +- + net/core/netdev_work.c | 19 +- + net/core/netpoll.c | 15 + + net/core/page_pool_priv.h | 14 +- + net/core/page_pool_user.c | 8 +- + net/core/pktgen.c | 17 +- + net/core/rtnetlink.c | 28 +- + net/core/skb_fault_injection.c | 3 + + net/core/skbuff.c | 47 +- + net/core/sock.c | 62 +- + net/core/stream.c | 8 +- + net/core/sysctl_net_core.c | 17 +- + net/devlink/dev.c | 4 +- + net/devlink/netlink_gen.c | 9 +- + net/devlink/netlink_gen.h | 2 +- + net/devlink/port.c | 19 +- + net/dsa/Kconfig | 6 + + net/dsa/Makefile | 1 + + net/dsa/tag_ks8995.c | 180 + + net/dsa/tag_ksz.c | 5 +- + net/ethernet/eth.c | 18 +- + net/ethtool/common.c | 182 + + net/ethtool/common.h | 2 + + net/ethtool/ioctl.c | 33 +- + net/ethtool/netlink.c | 15 +- + net/ethtool/rings.c | 13 +- + net/ethtool/ts.h | 8 +- + net/handshake/genl.c | 4 +- + net/handshake/handshake-test.c | 2 +- + net/handshake/request.c | 2 +- + net/hsr/hsr_device.c | 2 +- + net/hsr/hsr_forward.c | 2 +- + net/hsr/hsr_netlink.c | 37 +- + net/ieee802154/6lowpan/tx.c | 2 +- + net/ieee802154/socket.c | 5 +- + net/ipv4/af_inet.c | 3 - + net/ipv4/arp.c | 147 +- + net/ipv4/bpf_tcp_ca.c | 5 +- + net/ipv4/devinet.c | 38 +- + net/ipv4/fib_frontend.c | 6 +- + net/ipv4/fib_rules.c | 2 +- + net/ipv4/fib_semantics.c | 8 +- + net/ipv4/fib_trie.c | 14 +- + net/ipv4/fou_nl.c | 6 +- + net/ipv4/igmp.c | 23 +- + net/ipv4/inet_connection_sock.c | 1 + + net/ipv4/inet_hashtables.c | 11 + + net/ipv4/inet_timewait_sock.c | 6 +- + net/ipv4/ip_forward.c | 2 +- + net/ipv4/ip_gre.c | 10 +- + net/ipv4/ip_output.c | 15 +- + net/ipv4/ip_sockglue.c | 10 +- + net/ipv4/ip_tunnel.c | 146 +- + net/ipv4/ip_tunnel_core.c | 22 +- + net/ipv4/ip_vti.c | 2 +- + net/ipv4/ipip.c | 2 +- + net/ipv4/ipmr.c | 17 +- + net/ipv4/netfilter/arp_tables.c | 2 +- + net/ipv4/ping.c | 5 +- + net/ipv4/raw.c | 4 +- + net/ipv4/route.c | 29 +- + net/ipv4/tcp.c | 26 +- + net/ipv4/tcp_bbr.c | 13 +- + net/ipv4/tcp_bic.c | 14 +- + net/ipv4/tcp_bpf.c | 12 +- + net/ipv4/tcp_cubic.c | 14 +- + net/ipv4/tcp_hybla.c | 16 +- + net/ipv4/tcp_input.c | 34 +- + net/ipv4/tcp_ipv4.c | 20 +- + net/ipv4/tcp_output.c | 28 +- + net/ipv4/udp.c | 26 +- + net/ipv6/addrconf.c | 17 +- + net/ipv6/af_inet6.c | 6 +- + net/ipv6/ah6.c | 2 +- + net/ipv6/calipso.c | 2 +- + net/ipv6/datagram.c | 5 +- + net/ipv6/exthdrs.c | 8 +- + net/ipv6/ip6_fib.c | 14 +- + net/ipv6/ip6_gre.c | 277 +- + net/ipv6/ip6_output.c | 6 +- + net/ipv6/ip6_vti.c | 2 +- + net/ipv6/ip6mr.c | 5 +- + net/ipv6/ipv6_sockglue.c | 123 +- + net/ipv6/ndisc.c | 221 +- + net/ipv6/route.c | 106 +- + net/ipv6/seg6_hmac.c | 5 +- + net/ipv6/seg6_iptunnel.c | 10 +- + net/ipv6/seg6_local.c | 6 +- + net/ipv6/sit.c | 480 +- + net/ipv6/tcp_ipv6.c | 21 +- + net/ipv6/udp.c | 8 +- + net/iucv/af_iucv.c | 20 +- + net/kcm/kcmproc.c | 2 +- + net/kcm/kcmsock.c | 4 +- + net/key/af_key.c | 5 +- + net/llc/Kconfig | 7 - + net/llc/Makefile | 10 +- + net/llc/af_llc.c | 1304 ------ + net/llc/llc_c_ac.c | 1448 ------ + net/llc/llc_c_ev.c | 742 --- + net/llc/llc_c_st.c | 4940 -------------------- + net/llc/llc_conn.c | 1025 ---- + net/llc/llc_core.c | 28 +- + net/llc/llc_if.c | 151 - + net/llc/llc_input.c | 128 +- + net/llc/llc_output.c | 3 +- + net/llc/llc_pdu.c | 366 -- + net/llc/llc_proc.c | 245 - + net/llc/llc_s_ac.c | 220 - + net/llc/llc_s_ev.c | 109 - + net/llc/llc_s_st.c | 177 - + net/llc/llc_sap.c | 437 -- + net/llc/llc_station.c | 120 - + net/llc/sysctl_net_llc.c | 71 - + net/mac80211/agg-tx.c | 9 +- + net/mac80211/ap.c | 3 - + net/mac80211/cfg.c | 89 +- + net/mac80211/debugfs.c | 2 +- + net/mac80211/debugfs_key.c | 18 +- + net/mac80211/debugfs_netdev.c | 8 +- + net/mac80211/ht.c | 2 +- + net/mac80211/ieee80211_i.h | 38 +- + net/mac80211/iface.c | 38 +- + net/mac80211/key.c | 96 +- + net/mac80211/key.h | 3 +- + net/mac80211/main.c | 20 +- + net/mac80211/mesh_pathtbl.c | 15 +- + net/mac80211/mesh_plink.c | 4 +- + net/mac80211/mlme.c | 155 +- + net/mac80211/nan.c | 33 + + net/mac80211/offchannel.c | 23 +- + net/mac80211/parse.c | 9 +- + net/mac80211/rate.c | 1 - + net/mac80211/rx.c | 476 +- + net/mac80211/s1g.c | 8 - + net/mac80211/scan.c | 10 +- + net/mac80211/sta_info.c | 49 +- + net/mac80211/sta_info.h | 2 + + net/mac80211/tdls.c | 4 +- + net/mac80211/tests/chan-mode.c | 6 +- + net/mac80211/tests/util.c | 6 +- + net/mac80211/tx.c | 433 +- + net/mac80211/util.c | 47 +- + net/mac802154/iface.c | 10 +- + net/mptcp/options.c | 6 +- + net/mptcp/protocol.c | 18 +- + net/mptcp/protocol.h | 45 +- + net/mptcp/subflow.c | 27 +- + net/ncsi/ncsi-rsp.c | 10 +- + net/netfilter/core.c | 18 +- + net/netfilter/ipset/ip_set_core.c | 2 +- + net/netfilter/ipvs/ip_vs_sync.c | 2 +- + net/netfilter/nf_conncount.c | 2 +- + net/netfilter/nf_conntrack_core.c | 5 +- + net/netfilter/nf_conntrack_netlink.c | 19 +- + net/netfilter/nf_conntrack_ovs.c | 2 +- + net/netfilter/nf_conntrack_seqadj.c | 28 +- + net/netfilter/nf_conntrack_standalone.c | 2 +- + net/netfilter/nf_flow_table_core.c | 17 +- + net/netfilter/nf_hooks_lwtunnel.c | 2 +- + net/netfilter/nf_log.c | 2 +- + net/netfilter/nf_nat_core.c | 16 +- + net/netfilter/nf_synproxy_core.c | 6 +- + net/netfilter/nfnetlink_acct.c | 2 +- + net/netfilter/nfnetlink_cthelper.c | 3 +- + net/netfilter/nfnetlink_cttimeout.c | 8 +- + net/netfilter/nfnetlink_hook.c | 74 +- + net/netfilter/nfnetlink_osf.c | 3 +- + net/netfilter/nft_ct.c | 5 +- + net/netfilter/nft_set_pipapo.c | 6 +- + net/netfilter/xt_CT.c | 6 +- + net/netfilter/xt_IDLETIMER.c | 8 +- + net/netfilter/xt_LED.c | 5 +- + net/netfilter/xt_RATEEST.c | 2 +- + net/netfilter/xt_TEE.c | 2 +- + net/netfilter/xt_hashlimit.c | 4 +- + net/netfilter/xt_limit.c | 2 +- + net/netfilter/xt_quota.c | 2 +- + net/netfilter/xt_recent.c | 3 +- + net/netfilter/xt_statistic.c | 2 +- + net/netfilter/xt_string.c | 2 +- + net/netlink/af_netlink.c | 8 +- + net/netlink/policy.c | 16 +- + net/openvswitch/datapath.c | 16 +- + net/openvswitch/datapath.h | 2 +- + net/openvswitch/flow.c | 1 - + net/openvswitch/flow_netlink.c | 2 - + net/openvswitch/flow_table.c | 2 - + net/openvswitch/vport-internal_dev.c | 2 + + net/openvswitch/vport-netdev.c | 1 - + net/packet/af_packet.c | 19 +- + net/phonet/socket.c | 5 +- + net/psp/psp.h | 13 + + net/psp/psp_main.c | 29 +- + net/psp/psp_nl.c | 51 +- + net/psp/psp_sock.c | 127 +- + net/rds/ib.c | 14 +- + net/rds/ib.h | 4 +- + net/rds/ib_cm.c | 41 +- + net/rds/rdma_transport.c | 13 +- + net/rds/tcp_send.c | 5 +- + net/sched/act_api.c | 15 +- + net/sched/act_connmark.c | 6 + + net/sched/act_ct.c | 2 +- + net/sched/act_mirred.c | 3 +- + net/sched/act_mpls.c | 11 + + net/sched/act_nat.c | 6 + + net/sched/act_simple.c | 7 + + net/sched/act_skbmod.c | 9 + + net/sched/cls_flower.c | 39 +- + net/sched/ematch.c | 9 +- + net/sched/sch_api.c | 92 +- + net/sched/sch_fq.c | 71 +- + net/sched/sch_teql.c | 15 +- + net/sctp/proc.c | 6 +- + net/smc/af_smc.c | 14 +- + net/smc/smc_close.c | 18 +- + net/smc/smc_core.c | 4 +- + net/smc/smc_tx.c | 24 +- + net/socket.c | 32 +- + net/strparser/strparser.c | 93 +- + net/sunrpc/svcsock.c | 4 +- + net/sunrpc/xprtsock.c | 4 +- + net/tipc/bearer.c | 6 +- + net/tipc/bearer.h | 17 +- + net/tipc/monitor.c | 3 +- + net/tls/tls_main.c | 2 - + net/tls/tls_sw.c | 2 +- + net/unix/af_unix.c | 3 +- + net/vmw_vsock/af_vsock.c | 35 + + net/vmw_vsock/af_vsock_tap.c | 4 - + net/wireless/ap.c | 7 +- + net/wireless/chan.c | 44 +- + net/wireless/core.c | 99 +- + net/wireless/core.h | 11 +- + net/wireless/ibss.c | 3 +- + net/wireless/nl80211.c | 331 +- + net/wireless/rdev-ops.h | 40 +- + net/wireless/reg.c | 13 +- + net/wireless/scan.c | 9 +- + net/wireless/sme.c | 24 +- + net/wireless/sysfs.c | 12 +- + net/wireless/trace.h | 62 +- + net/wireless/util.c | 40 +- + net/wireless/wext-compat.c | 8 +- + net/x25/af_x25.c | 5 +- + net/xfrm/xfrm_policy.c | 4 +- + rust/kernel/net/netlink.rs | 8 +- + tools/include/uapi/linux/netdev.h | 2 +- + tools/net/ynl/Makefile | 1 + + tools/net/ynl/Makefile.deps | 3 +- + tools/net/ynl/generated/Makefile | 3 +- + tools/net/ynl/lib/Makefile | 3 +- + tools/net/ynl/pyynl/lib/ynl.py | 8 +- + tools/net/ynl/pyynl/ynl_gen_c.py | 15 +- + tools/net/ynl/tests/Makefile | 2 +- + tools/net/ynl/ynltool/Makefile | 10 +- + tools/testing/selftests/bpf/progs/tcp_ca_kfunc.c | 8 +- + tools/testing/selftests/drivers/net/Makefile | 11 +- + tools/testing/selftests/drivers/net/README.rst | 9 + + .../testing/selftests/drivers/net/bonding/Makefile | 3 +- + tools/testing/selftests/drivers/net/dsa/Makefile | 1 + + tools/testing/selftests/drivers/net/gro_hw.py | 13 + + .../selftests/drivers/net/{gro.py => gro_lib.py} | 190 +- + tools/testing/selftests/drivers/net/gro_lro.py | 14 + + tools/testing/selftests/drivers/net/gro_sw.py | 13 + + tools/testing/selftests/drivers/net/hds.py | 29 - + tools/testing/selftests/drivers/net/hw/Makefile | 18 +- + tools/testing/selftests/drivers/net/hw/config | 1 + + .../selftests/drivers/net/hw/devlink_rate_tc_bw.py | 5 +- + .../testing/selftests/drivers/net/hw/devmem_lib.py | 4 +- + .../drivers/net/hw/{gro_hw.py => gro_stats.py} | 0 + tools/testing/selftests/drivers/net/hw/iou-zcrx.c | 422 +- + tools/testing/selftests/drivers/net/hw/iou-zcrx.py | 56 +- + .../selftests/drivers/net/hw/lib/py/__init__.py | 7 +- + tools/testing/selftests/drivers/net/hw/toeplitz.py | 10 +- + tools/testing/selftests/drivers/net/hw/tso.py | 161 + + tools/testing/selftests/drivers/net/hw/vlan.py | 127 + + .../selftests/drivers/net/lib/py/__init__.py | 7 +- + tools/testing/selftests/drivers/net/lib/py/env.py | 19 + + tools/testing/selftests/drivers/net/lib/py/feat.py | 43 + + tools/testing/selftests/drivers/net/macsec.py | 57 +- + .../selftests/drivers/net/netconsole/Makefile | 3 +- + .../selftests/drivers/net/netdevsim/Makefile | 8 + + tools/testing/selftests/drivers/net/pppoe_gro.py | 45 + + tools/testing/selftests/drivers/net/psp.py | 236 +- + .../testing/selftests/drivers/net/ring_reconfig.py | 26 +- + tools/testing/selftests/drivers/net/rss_key.py | 343 ++ + tools/testing/selftests/drivers/net/ruff.toml | 4 + + tools/testing/selftests/drivers/net/settings | 2 +- + tools/testing/selftests/drivers/net/so_txtime.c | 161 +- + tools/testing/selftests/drivers/net/so_txtime.py | 80 +- + tools/testing/selftests/drivers/net/team/Makefile | 4 +- + .../selftests/drivers/net/virtio_net/Makefile | 1 + + tools/testing/selftests/net/.gitignore | 1 + + tools/testing/selftests/net/Makefile | 2 + + tools/testing/selftests/net/big_tcp_tunnels.sh | 3 +- + tools/testing/selftests/net/bind_wildcard.c | 5 + + tools/testing/selftests/net/config | 2 + + tools/testing/selftests/net/cork_fragsize.py | 5 +- + tools/testing/selftests/net/drop_monitor_tests.sh | 13 +- + tools/testing/selftests/net/fcnal-test.sh | 29 +- + tools/testing/selftests/net/fdb_flush.sh | 35 +- + tools/testing/selftests/net/fib-onlink-tests.sh | 18 +- + .../selftests/net/fib_nexthop_multiprefix.sh | 21 +- + tools/testing/selftests/net/fib_nexthop_nongw.sh | 21 +- + tools/testing/selftests/net/fib_rule_tests.sh | 19 +- + tools/testing/selftests/net/fib_tests.sh | 66 +- + tools/testing/selftests/net/forwarding/Makefile | 2 + + tools/testing/selftests/net/fou_mcast_encap.sh | 11 +- + tools/testing/selftests/net/gre_gso.sh | 26 +- + tools/testing/selftests/net/icmp_redirect.sh | 29 +- + tools/testing/selftests/net/ip_local_port_range.c | 52 +- + tools/testing/selftests/net/l2tp.sh | 19 +- + tools/testing/selftests/net/lib.sh | 34 + + tools/testing/selftests/net/lib/csum.c | 55 +- + tools/testing/selftests/net/lib/gro.c | 136 +- + .../selftests/net/lib/ksft_setup_loopback.sh | 2 +- + tools/testing/selftests/net/lib/py/__init__.py | 4 +- + tools/testing/selftests/net/lib/py/utils.py | 22 + + tools/testing/selftests/net/mptcp/config | 2 +- + .../selftests/net/ndisc_unsolicited_na_test.sh | 223 +- + tools/testing/selftests/net/netdev_lock.py | 42 + + tools/testing/selftests/net/netfilter/Makefile | 2 + + tools/testing/selftests/net/netfilter/config | 2 +- + .../selftests/net/netfilter/conntrack_dump_flush.c | 145 +- + .../net/netfilter/conntrack_icmp_related.sh | 2 +- + tools/testing/selftests/net/openvswitch/config | 3 + + .../selftests/net/openvswitch/openvswitch.sh | 202 + + .../packetdrill/tcp_rcv_ssthresh_scaling_ratio.pkt | 46 + + tools/testing/selftests/net/rtnetlink.py | 113 +- + tools/testing/selftests/net/rtnetlink.sh | 8 +- + tools/testing/selftests/net/ruff.toml | 4 + + tools/testing/selftests/net/so_incoming_cpu.c | 7 +- + tools/testing/selftests/net/so_reserve_mem.c | 448 ++ + .../selftests/net/srv6_encap_lookup_l3vpn_test.sh | 19 +- + .../selftests/net/srv6_end_dt46_l3vpn_test.sh | 19 +- + .../selftests/net/srv6_end_dt4_l3vpn_test.sh | 40 +- + .../selftests/net/srv6_end_dt6_l3vpn_test.sh | 40 +- + .../selftests/net/srv6_end_dx4_netfilter_test.sh | 23 +- + .../selftests/net/srv6_end_dx6_netfilter_test.sh | 23 +- + .../testing/selftests/net/srv6_end_flavors_test.sh | 23 +- + .../selftests/net/srv6_end_next_csid_l3vpn_test.sh | 19 +- + .../net/srv6_end_x_next_csid_l3vpn_test.sh | 19 +- + .../selftests/net/srv6_hencap_red_l3vpn_test.sh | 19 +- + .../selftests/net/srv6_hl2encap_red_l2vpn_test.sh | 19 +- + .../selftests/net/test_bridge_backup_port.sh | 32 +- + .../selftests/net/test_bridge_neigh_suppress.sh | 34 +- + tools/testing/selftests/net/test_neigh.sh | 66 +- + tools/testing/selftests/net/test_vxlan_mdb.sh | 32 +- + .../selftests/net/test_vxlan_nolocalbypass.sh | 32 +- + .../selftests/net/test_vxlan_vnifiltering.sh | 26 +- + tools/testing/selftests/net/tun.c | 9 + + tools/testing/selftests/net/vrf-xfrm-tests.sh | 19 +- + tools/testing/selftests/net/vrf_route_leaking.sh | 19 +- + .../testing/selftests/net/vrf_strict_mode_test.sh | 19 +- + tools/testing/selftests/net/xfrm_policy.sh | 2 +- + tools/testing/vsock/util.c | 9 + + tools/testing/vsock/util.h | 1 + + tools/testing/vsock/vsock_uring_test.c | 391 ++ + 1254 files changed, 40585 insertions(+), 29359 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/hisilicon,hns-dsaf-v1.yaml + create mode 100644 Documentation/devicetree/bindings/net/hisilicon,hns-mdio.yaml + create mode 100644 Documentation/devicetree/bindings/net/hisilicon,hns-nic.yaml + delete mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-dsaf.txt + delete mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-mdio.txt + delete mode 100644 Documentation/devicetree/bindings/net/hisilicon-hns-nic.txt + create mode 100644 Documentation/devicetree/bindings/net/snps,dwmac-common.yaml + create mode 100644 Documentation/devicetree/bindings/net/ultrarisc,dp1000-gmac.yaml + delete mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wl1251.txt + create mode 100644 Documentation/devicetree/bindings/net/wireless/ti,wl1251.yaml + create mode 100644 Documentation/devicetree/bindings/net/wiznet,w5100.yaml + delete mode 100644 Documentation/devicetree/bindings/net/wiznet,w5x00.txt + create mode 100644 Documentation/devicetree/bindings/net/x-powers,acx00-ephy-package.yaml + create mode 100644 Documentation/networking/device_drivers/ethernet/nebula-matrix/nbl.rst + create mode 100644 Documentation/networking/devlink/ptp_ocp.rst + delete mode 100644 drivers/net/dsa/ks8995.c + create mode 100644 drivers/net/dsa/motorcomm/Kconfig + create mode 100644 drivers/net/dsa/motorcomm/Makefile + rename drivers/net/dsa/{yt921x.c => motorcomm/chip.c} (77%) + rename drivers/net/dsa/{yt921x.h => motorcomm/chip.h} (87%) + create mode 100644 drivers/net/dsa/motorcomm/leds.c + create mode 100644 drivers/net/dsa/motorcomm/leds.h + create mode 100644 drivers/net/dsa/motorcomm/mdio_bus.c + create mode 100644 drivers/net/dsa/motorcomm/mdio_bus.h + create mode 100644 drivers/net/dsa/motorcomm/mib.c + create mode 100644 drivers/net/dsa/motorcomm/mib.h + create mode 100644 drivers/net/dsa/motorcomm/pcs-921x.c + create mode 100644 drivers/net/dsa/motorcomm/pcs.h + create mode 100644 drivers/net/dsa/motorcomm/smi.c + create mode 100644 drivers/net/dsa/motorcomm/smi.h + rename drivers/net/ethernet/intel/ice/{ice_ethtool_fdir.c => ice_ethtool_ntuple.c} (94%) + create mode 100644 drivers/net/ethernet/meta/mpnic/Makefile + create mode 100644 drivers/net/ethernet/meta/mpnic/mpnic.h + create mode 100644 drivers/net/ethernet/meta/mpnic/mpnic_csr.h + create mode 100644 drivers/net/ethernet/meta/mpnic/mpnic_init.c + create mode 100644 drivers/net/ethernet/meta/mpnic/mpnic_irq.c + create mode 100644 drivers/net/ethernet/meta/mpnic/mpnic_netdev.c + create mode 100644 drivers/net/ethernet/meta/mpnic/mpnic_netdev.h + create mode 100644 drivers/net/ethernet/meta/mpnic/mpnic_pci.c + create mode 100644 drivers/net/ethernet/meta/mpnic/mpnic_txrx.c + create mode 100644 drivers/net/ethernet/meta/mpnic/mpnic_txrx.h + create mode 100644 drivers/net/ethernet/microchip/fdma/fdma_pci.c + create mode 100644 drivers/net/ethernet/microchip/fdma/fdma_pci.h + create mode 100644 drivers/net/ethernet/microchip/lan966x/lan966x_fdma_pci.c + create mode 100644 drivers/net/ethernet/microchip/sparx5/sparx5_tas.c + create mode 100644 drivers/net/ethernet/microsoft/mana/gdma_cdx.c + create mode 100644 drivers/net/ethernet/microsoft/mana/gdma_pci.c + create mode 100644 drivers/net/ethernet/nebula-matrix/Kconfig + create mode 100644 drivers/net/ethernet/nebula-matrix/Makefile + create mode 100644 drivers/net/ethernet/nebula-matrix/nbl/Makefile + create mode 100644 drivers/net/ethernet/nebula-matrix/nbl/nbl_core.h + create mode 100644 drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_hw_leonis/nbl_hw_leonis.c + create mode 100644 drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_hw_leonis/nbl_hw_leonis.h + create mode 100644 drivers/net/ethernet/nebula-matrix/nbl/nbl_hw/nbl_hw_reg.h + create mode 100644 drivers/net/ethernet/nebula-matrix/nbl/nbl_include/nbl_def_common.h + create mode 100644 drivers/net/ethernet/nebula-matrix/nbl/nbl_include/nbl_def_hw.h + create mode 100644 drivers/net/ethernet/nebula-matrix/nbl/nbl_include/nbl_include.h + create mode 100644 drivers/net/ethernet/nebula-matrix/nbl/nbl_main.c + delete mode 100644 drivers/net/ethernet/smsc/smc9194.h + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-ultrarisc.c + create mode 100644 drivers/net/phy/phy_fixup.c + create mode 100644 drivers/net/phy/xpowers/Makefile + create mode 100644 drivers/net/phy/xpowers/ac200.c + create mode 100644 drivers/net/phy/xpowers/ac300.c + create mode 100644 drivers/net/phy/xpowers/acx00.c + create mode 100644 drivers/net/phy/xpowers/acx00.h + create mode 100644 drivers/net/wireless/ath/ath12k/dp_stats.h + delete mode 100644 include/net/llc_c_ac.h + delete mode 100644 include/net/llc_c_ev.h + delete mode 100644 include/net/llc_c_st.h + delete mode 100644 include/net/llc_conn.h + delete mode 100644 include/net/llc_if.h + delete mode 100644 include/net/llc_s_ac.h + delete mode 100644 include/net/llc_s_ev.h + delete mode 100644 include/net/llc_s_st.h + delete mode 100644 include/net/llc_sap.h + delete mode 100644 include/net/phy/realtek_phy.h + create mode 100644 net/dsa/tag_ks8995.c + delete mode 100644 net/llc/af_llc.c + delete mode 100644 net/llc/llc_c_ac.c + delete mode 100644 net/llc/llc_c_ev.c + delete mode 100644 net/llc/llc_c_st.c + delete mode 100644 net/llc/llc_conn.c + delete mode 100644 net/llc/llc_if.c + delete mode 100644 net/llc/llc_pdu.c + delete mode 100644 net/llc/llc_proc.c + delete mode 100644 net/llc/llc_s_ac.c + delete mode 100644 net/llc/llc_s_ev.c + delete mode 100644 net/llc/llc_s_st.c + delete mode 100644 net/llc/llc_sap.c + delete mode 100644 net/llc/llc_station.c + delete mode 100644 net/llc/sysctl_net_llc.c + create mode 100755 tools/testing/selftests/drivers/net/gro_hw.py + rename tools/testing/selftests/drivers/net/{gro.py => gro_lib.py} (74%) + mode change 100755 => 100644 + create mode 100755 tools/testing/selftests/drivers/net/gro_lro.py + create mode 100755 tools/testing/selftests/drivers/net/gro_sw.py + rename tools/testing/selftests/drivers/net/hw/{gro_hw.py => gro_stats.py} (100%) + create mode 100755 tools/testing/selftests/drivers/net/hw/vlan.py + create mode 100644 tools/testing/selftests/drivers/net/lib/py/feat.py + create mode 100755 tools/testing/selftests/drivers/net/pppoe_gro.py + create mode 100755 tools/testing/selftests/drivers/net/rss_key.py + create mode 100644 tools/testing/selftests/drivers/net/ruff.toml + create mode 100755 tools/testing/selftests/net/netdev_lock.py + create mode 100644 tools/testing/selftests/net/packetdrill/tcp_rcv_ssthresh_scaling_ratio.pkt + create mode 100644 tools/testing/selftests/net/ruff.toml + create mode 100644 tools/testing/selftests/net/so_reserve_mem.c +Merging bpf-next/for-next (763187dbbf837 Merge branch 'inline-btf-followups') +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Auto-merging .gitignore +Auto-merging Documentation/networking/net_cachelines/tcp_sock.rst +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging fs/bpf_fs_kfuncs.c +Auto-merging fs/exec.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/tcp.h +Auto-merging include/net/tcp.h +Auto-merging kernel/bpf/arena.c +Auto-merging kernel/bpf/btf.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/internal.h +CONFLICT (content): Merge conflict in mm/internal.h +Auto-merging mm/memory.c +Auto-merging mm/nommu.c +Auto-merging mm/util.c +Auto-merging net/core/filter.c +Auto-merging net/ipv4/af_inet.c +Auto-merging net/ipv4/bpf_tcp_ca.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/ipv4/tcp_bpf.c +Auto-merging net/ipv4/tcp_input.c +Auto-merging net/ipv4/tcp_output.c +Auto-merging scripts/link-vmlinux.sh +Resolved 'mm/internal.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ca3ac9b424f27] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 1 + + Documentation/bpf/bpf_design_QA.rst | 11 +- + Documentation/bpf/btf.rst | 85 +- + Documentation/bpf/clang-notes.rst | 7 +- + Documentation/bpf/kfuncs.rst | 52 +- + Documentation/bpf/linux-notes.rst | 31 +- + .../networking/net_cachelines/tcp_sock.rst | 1 + + MAINTAINERS | 5 +- + Makefile | 1 + + arch/arm64/net/bpf_jit_comp.c | 204 +- + arch/mips/include/asm/uasm.h | 8 + + arch/mips/mm/uasm-mips.c | 12 + + arch/mips/mm/uasm.c | 24 +- + arch/mips/net/bpf_jit_comp.c | 57 +- + arch/mips/net/bpf_jit_comp.h | 6 +- + arch/mips/net/bpf_jit_comp32.c | 109 +- + arch/mips/net/bpf_jit_comp64.c | 139 +- + arch/parisc/net/bpf_jit.h | 2 + + arch/parisc/net/bpf_jit_comp32.c | 29 +- + arch/parisc/net/bpf_jit_comp64.c | 35 +- + arch/parisc/net/bpf_jit_core.c | 14 + + arch/riscv/net/bpf_jit_comp64.c | 31 +- + arch/riscv/net/bpf_jit_core.c | 17 +- + arch/x86/net/bpf_jit_comp.c | 212 +- + arch/x86/net/bpf_timed_may_goto.S | 10 +- + crypto/Makefile | 3 - + crypto/bpf_crypto_skcipher.c | 83 - + drivers/net/ethernet/netronome/nfp/bpf/verifier.c | 2 +- + fs/bpf_fs_kfuncs.c | 99 + + fs/exec.c | 7 +- + include/asm-generic/vmlinux.lds.h | 31 + + include/linux/bpf-cgroup-defs.h | 1 + + include/linux/bpf-cgroup.h | 62 +- + include/linux/bpf.h | 158 +- + include/linux/bpf_crypto.h | 24 - + include/linux/bpf_lsm.h | 11 +- + include/linux/bpf_verifier.h | 472 +- + include/linux/btf.h | 64 +- + include/linux/cnum.h | 3 + + include/linux/filter.h | 45 + + include/linux/ftrace.h | 1 + + include/linux/mm.h | 8 +- + include/linux/module.h | 4 + + include/linux/tcp.h | 7 + + include/linux/tnum.h | 2 + + include/net/tcp.h | 246 +- + include/uapi/linux/bpf.h | 113 +- + include/uapi/linux/btf.h | 83 +- + kernel/bpf/Kconfig | 9 + + kernel/bpf/Makefile | 7 +- + kernel/bpf/arena.c | 233 +- + kernel/bpf/arraymap.c | 2 +- + kernel/bpf/backtrack.c | 126 +- + kernel/bpf/bpf_insn_array.c | 19 +- + kernel/bpf/bpf_local_storage.c | 15 +- + kernel/bpf/bpf_lsm.c | 26 +- + kernel/bpf/bpf_lsm_proto.c | 19 +- + kernel/bpf/bpf_struct_ops.c | 142 +- + kernel/bpf/btf.c | 1154 ++++- + kernel/bpf/btf_vmlinux_inline.c | 29 + + kernel/bpf/cfg.c | 367 +- + kernel/bpf/cgroup.c | 500 +- + kernel/bpf/cnum.c | 36 + + kernel/bpf/cnum_defs.h | 44 + + kernel/bpf/const_fold.c | 8 +- + kernel/bpf/core.c | 143 +- + kernel/bpf/crypto.c | 288 +- + kernel/bpf/diagnostics.c | 71 +- + kernel/bpf/diagnostics.h | 1 + + kernel/bpf/disasm.c | 5 +- + kernel/bpf/fixups.c | 415 +- + kernel/bpf/hashtab.c | 63 +- + kernel/bpf/helpers.c | 259 +- + kernel/bpf/liveness.c | 1061 ++-- + kernel/bpf/log.c | 32 +- + kernel/bpf/loops.c | 616 +++ + kernel/bpf/map_in_map.c | 4 + + kernel/bpf/map_iter.c | 6 + + kernel/bpf/range_tree.c | 52 +- + kernel/bpf/ringbuf.c | 4 +- + kernel/bpf/scev.c | 2762 +++++++++++ + kernel/bpf/states.c | 320 +- + kernel/bpf/stream.c | 220 +- + kernel/bpf/syscall.c | 93 +- + kernel/bpf/sysfs_btf.c | 149 +- + kernel/bpf/tnum.c | 11 + + kernel/bpf/trampoline.c | 29 +- + kernel/bpf/verifier.c | 5172 +++++++++++++------- + kernel/module/main.c | 7 + + kernel/trace/bpf_trace.c | 6 +- + kernel/trace/trace.h | 3 - + lib/Kconfig.debug | 18 + + mm/bpf_memcontrol.c | 65 +- + mm/internal.h | 13 +- + mm/memory.c | 43 +- + mm/nommu.c | 43 +- + mm/util.c | 60 + + net/bpf/test_run.c | 8 +- + net/core/filter.c | 33 +- + net/ipv4/Makefile | 1 + + net/ipv4/af_inet.c | 3 +- + net/ipv4/bpf_tcp_ca.c | 16 + + net/ipv4/bpf_tcp_ops.c | 453 ++ + net/ipv4/tcp.c | 21 +- + net/ipv4/tcp_bpf.c | 1 - + net/ipv4/tcp_fastopen.c | 2 + + net/ipv4/tcp_input.c | 52 +- + net/ipv4/tcp_nv.c | 2 +- + net/ipv4/tcp_output.c | 153 +- + net/ipv4/tcp_timer.c | 7 +- + net/sched/bpf_qdisc.c | 2 - + samples/bpf/Makefile | 1 + + samples/bpf/hash_func01.h | 55 - + scripts/Makefile.btf | 7 + + scripts/gen-btf.sh | 31 +- + scripts/link-vmlinux.sh | 8 +- + scripts/package/kernel.spec | 10 +- + security/bpf/hooks.c | 1 + + tools/bpf/bpftool/Documentation/bpftool-btf.rst | 7 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 25 +- + tools/bpf/bpftool/Documentation/bpftool-map.rst | 14 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 25 +- + tools/bpf/bpftool/bash-completion/bpftool | 65 +- + tools/bpf/bpftool/btf.c | 331 +- + tools/bpf/bpftool/btf_dumper.c | 11 + + tools/bpf/bpftool/cgroup.c | 99 +- + tools/bpf/bpftool/common.c | 40 + + tools/bpf/bpftool/gen.c | 26 +- + tools/bpf/bpftool/link.c | 4 +- + tools/bpf/bpftool/main.c | 31 +- + tools/bpf/bpftool/main.h | 4 + + tools/bpf/bpftool/map.c | 95 +- + tools/bpf/bpftool/map_perf_ring.c | 87 +- + tools/bpf/bpftool/prog.c | 306 +- + tools/bpf/bpftool/skeleton/profiler.bpf.c | 29 +- + tools/bpf/resolve_btfids/Build | 1 + + tools/bpf/resolve_btfids/btf_colors.c | 145 + + tools/bpf/resolve_btfids/btf_colors.h | 24 + + tools/bpf/resolve_btfids/main.c | 427 +- + tools/include/uapi/linux/bpf.h | 113 +- + tools/include/uapi/linux/btf.h | 83 +- + tools/lib/bpf/bpf.c | 21 + + tools/lib/bpf/bpf.h | 27 +- + tools/lib/bpf/bpf_gen_internal.h | 13 +- + tools/lib/bpf/bpf_helpers.h | 18 +- + tools/lib/bpf/btf.c | 412 +- + tools/lib/bpf/btf.h | 50 + + tools/lib/bpf/btf_dump.c | 217 +- + tools/lib/bpf/btf_iter.c | 18 + + tools/lib/bpf/btf_relocate.c | 7 +- + tools/lib/bpf/elf.c | 2 +- + tools/lib/bpf/gen_loader.c | 188 +- + tools/lib/bpf/libbpf.c | 1075 +++- + tools/lib/bpf/libbpf.h | 41 +- + tools/lib/bpf/libbpf.map | 10 + + tools/lib/bpf/libbpf_internal.h | 5 +- + tools/lib/bpf/linker.c | 31 +- + tools/lib/bpf/skel_internal.h | 48 +- + tools/testing/selftests/bpf/DENYLIST.riscv64 | 1 + + tools/testing/selftests/bpf/Makefile | 751 +-- + tools/testing/selftests/bpf/Makefile.buildvars | 187 + + tools/testing/selftests/bpf/Makefile.runner | 125 + + tools/testing/selftests/bpf/Makefile.skel | 156 + + tools/testing/selftests/bpf/README.rst | 2 +- + tools/testing/selftests/bpf/bpf_kfuncs.h | 19 +- + tools/testing/selftests/bpf/bpftool_helpers.c | 2 +- + tools/testing/selftests/bpf/bpftool_helpers.h | 1 + + tools/testing/selftests/bpf/btf_helpers.c | 45 +- + tools/testing/selftests/bpf/cgroup_helpers.c | 67 + + tools/testing/selftests/bpf/cgroup_helpers.h | 4 + + tools/testing/selftests/bpf/config | 5 +- + tools/testing/selftests/bpf/gen_bpf_skel.sh | 99 + + tools/testing/selftests/bpf/network_helpers.h | 15 +- + .../selftests/bpf/prog_tests/aggregate_arg.c | 11 + + .../testing/selftests/bpf/prog_tests/arena_memcg.c | 196 + + .../bpf/prog_tests/arena_scalar_blinded.c | 21 + + .../selftests/bpf/prog_tests/attach_probe.c | 4 +- + .../selftests/bpf/prog_tests/bpf_insn_array.c | 653 ++- + tools/testing/selftests/bpf/prog_tests/bpf_nf.c | 14 +- + tools/testing/selftests/bpf/prog_tests/bpf_qdisc.c | 2 + + .../testing/selftests/bpf/prog_tests/bpf_tcp_ops.c | 560 +++ + .../selftests/bpf/prog_tests/bpf_tcp_ops_hdr.c | 77 + + .../selftests/bpf/prog_tests/bpf_verif_scale.c | 2 +- + .../selftests/bpf/prog_tests/bpftool_btf_dump.c | 127 +- + .../selftests/bpf/prog_tests/bpftool_ringbuf.c | 417 ++ + tools/testing/selftests/bpf/prog_tests/btf.c | 258 +- + .../selftests/bpf/prog_tests/btf_dedup_split.c | 116 + + .../testing/selftests/bpf/prog_tests/btf_distill.c | 106 + + tools/testing/selftests/bpf/prog_tests/btf_dump.c | 285 +- + .../selftests/bpf/prog_tests/btf_field_iter.c | 31 +- + .../testing/selftests/bpf/prog_tests/btf_inline.c | 114 + + .../bpf/prog_tests/btf_module_allowlist.c | 162 + + tools/testing/selftests/bpf/prog_tests/btf_rust.c | 142 + + tools/testing/selftests/bpf/prog_tests/btf_sysfs.c | 87 +- + tools/testing/selftests/bpf/prog_tests/btf_write.c | 34 + + tools/testing/selftests/bpf/prog_tests/call_rcu.c | 275 ++ + .../selftests/bpf/prog_tests/callx_func_ptr_map.c | 208 + + .../selftests/bpf/prog_tests/callx_rodata_lskel.c | 75 + + tools/testing/selftests/bpf/prog_tests/cb_refs.c | 48 - + .../bpf/prog_tests/cgroup_getset_retval.c | 2 +- + .../selftests/bpf/prog_tests/cgroup_mprog_opts.c | 71 +- + .../selftests/bpf/prog_tests/copy_from_user_bprm.c | 65 + + .../selftests/bpf/prog_tests/data_in_arena.c | 216 + + .../testing/selftests/bpf/prog_tests/exceptions.c | 9 +- + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 6 +- + .../testing/selftests/bpf/prog_tests/file_reader.c | 15 + + .../bpf/prog_tests/flow_dissector_classification.c | 2 +- + tools/testing/selftests/bpf/prog_tests/kasan.c | 4 +- + .../testing/selftests/bpf/prog_tests/kernel_flag.c | 21 +- + .../testing/selftests/bpf/prog_tests/kfunc_call.c | 2 +- + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 3 +- + .../selftests/bpf/prog_tests/linked_externs.c | 120 + + .../bpf/prog_tests/lsm_inode_init_xattr.c | 399 ++ + .../selftests/bpf/prog_tests/lwt_ip_encap.c | 53 + + .../selftests/bpf/prog_tests/may_goto_far.c | 92 + + .../selftests/bpf/prog_tests/may_goto_priv_stack.c | 41 + + .../selftests/bpf/prog_tests/skb_csum_complete.c | 39 + + tools/testing/selftests/bpf/prog_tests/snprintf.c | 4 +- + tools/testing/selftests/bpf/prog_tests/stream.c | 486 ++ + .../bpf/prog_tests/struct_ops_private_stack.c | 31 + + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 116 + + .../selftests/bpf/prog_tests/tcp_autolowat.c | 350 ++ + .../bpf/prog_tests/test_struct_ops_multi_args.c | 57 +- + .../selftests/bpf/prog_tests/test_task_work.c | 2 +- + tools/testing/selftests/bpf/prog_tests/timer.c | 33 + + .../selftests/bpf/prog_tests/tracing_multi.c | 99 + + tools/testing/selftests/bpf/prog_tests/verifier.c | 39 + + .../selftests/bpf/prog_tests/xdp_metadata.c | 4 +- + tools/testing/selftests/bpf/prog_tests/xsk.c | 2 +- + .../selftests/bpf/progs/aggregate_arg_func.c | 188 + + .../selftests/bpf/progs/aggregate_arg_kfunc.c | 168 + + tools/testing/selftests/bpf/progs/arena_kfunc.c | 17 +- + tools/testing/selftests/bpf/progs/arena_memcg.c | 23 + + .../selftests/bpf/progs/async_stack_depth.c | 75 + + .../testing/selftests/bpf/progs/bpf_iter_netlink.c | 4 +- + tools/testing/selftests/bpf/progs/bpf_iter_tcp4.c | 11 +- + tools/testing/selftests/bpf/progs/bpf_iter_tcp6.c | 11 +- + tools/testing/selftests/bpf/progs/bpf_iter_udp4.c | 4 +- + tools/testing/selftests/bpf/progs/bpf_iter_udp6.c | 4 +- + tools/testing/selftests/bpf/progs/bpf_iter_unix.c | 7 +- + tools/testing/selftests/bpf/progs/bpf_misc.h | 18 +- + ...bpf_qdisc_fail__invalid_dynptr_returned_slice.c | 76 + + tools/testing/selftests/bpf/progs/bpf_tcp_ops.c | 141 + + .../testing/selftests/bpf/progs/bpf_tcp_ops_hdr.c | 106 + + .../testing/selftests/bpf/progs/bpf_tracing_net.h | 2 + + .../testing/selftests/bpf/progs/bpftool_ringbuf.c | 47 + + .../selftests/bpf/progs/btf_module_allowlist.c | 13 + + tools/testing/selftests/bpf/progs/call_rcu.c | 110 + + tools/testing/selftests/bpf/progs/call_rcu_fail.c | 114 + + tools/testing/selftests/bpf/progs/callx_rodata.c | 75 + + tools/testing/selftests/bpf/progs/cb_refs.c | 5 + + .../bpf/{ => progs}/cgroup_getset_retval_hooks.h | 0 + .../selftests/bpf/progs/cgrp_kfunc_failure.c | 8 +- + .../selftests/bpf/progs/compute_live_registers.c | 46 +- + .../selftests/bpf/progs/copy_from_user_bprm.c | 69 + + .../testing/selftests/bpf/progs/cpumask_failure.c | 4 +- + tools/testing/selftests/bpf/progs/data_in_arena.c | 112 + + .../selftests/bpf/progs/data_in_arena_decl.c | 37 + + .../selftests/bpf/progs/data_in_arena_extern.c | 20 + + .../selftests/bpf/progs/data_in_arena_fail.c | 20 + + .../selftests/bpf/progs/data_in_arena_nomap.c | 20 + + .../selftests/bpf/progs/data_in_arena_rust.rs | 73 + + tools/testing/selftests/bpf/progs/dynptr_fail.c | 113 +- + .../selftests/bpf/progs/exceptions_dead_subprog.c | 40 + + tools/testing/selftests/bpf/progs/file_reader.c | 129 + + tools/testing/selftests/bpf/progs/irq.c | 17 +- + tools/testing/selftests/bpf/progs/iters.c | 388 +- + .../selftests/bpf/progs/iters_state_safety.c | 3 + + tools/testing/selftests/bpf/progs/iters_testmod.c | 7 +- + tools/testing/selftests/bpf/progs/linked_arena1.c | 42 + + tools/testing/selftests/bpf/progs/linked_arena2.c | 22 + + tools/testing/selftests/bpf/progs/lsm.c | 5 +- + .../selftests/bpf/progs/lsm_inode_init_xattr.c | 98 + + .../bpf/progs/lsm_inode_init_xattr_budget.c | 37 + + .../bpf/progs/lsm_inode_init_xattr_value.c | 47 + + tools/testing/selftests/bpf/progs/map_kptr_fail.c | 10 +- + .../selftests/bpf/progs/may_goto_priv_stack.c | 52 + + .../selftests/bpf/progs/mem_rdonly_untrusted.c | 3 +- + .../selftests/bpf/progs/percpu_alloc_fail.c | 35 + + tools/testing/selftests/bpf/progs/preempt_lock.c | 26 + + tools/testing/selftests/bpf/progs/rbtree_fail.c | 4 +- + .../selftests/bpf/progs/refcounted_kptr_fail.c | 9 +- + .../selftests/bpf/progs/res_spin_lock_fail.c | 2 +- + tools/testing/selftests/bpf/progs/setget_sockopt.c | 4 +- + .../selftests/bpf/progs/skb_csum_complete.c | 46 + + tools/testing/selftests/bpf/progs/stack_arg_fail.c | 10 - + tools/testing/selftests/bpf/progs/stream.c | 20 + + tools/testing/selftests/bpf/progs/stream_fail.c | 2 +- + .../selftests/bpf/progs/struct_ops_multi_args.c | 14 +- + .../bpf/progs/struct_ops_private_stack_fail.c | 47 +- + .../bpf/progs/struct_ops_private_stack_large.c | 51 + + .../selftests/bpf/progs/tailcall_freplace_multi.c | 27 + + .../selftests/bpf/progs/tailcall_large_stack.c | 62 + + .../selftests/bpf/progs/task_kfunc_failure.c | 10 +- + tools/testing/selftests/bpf/progs/task_work_fail.c | 2 +- + tools/testing/selftests/bpf/progs/tcp_autolowat.c | 294 ++ + .../selftests/bpf/progs/test_global_func1.c | 65 + + .../selftests/bpf/progs/test_global_func5.c | 2 +- + .../bpf/progs/test_global_func_deep_stack.c | 33 +- + .../selftests/bpf/progs/test_kfunc_dynptr_param.c | 2 +- + .../selftests/bpf/progs/test_skc_to_unix_sock.c | 2 +- + tools/testing/selftests/bpf/progs/test_snprintf.c | 4 +- + tools/testing/selftests/bpf/progs/timer.c | 60 +- + tools/testing/selftests/bpf/progs/timer_failure.c | 29 + + .../selftests/bpf/progs/verifier_aggregate_arg.c | 200 + + .../selftests/bpf/progs/verifier_arena_large.c | 64 +- + .../selftests/bpf/progs/verifier_arena_scalar.c | 912 ++++ + .../selftests/bpf/progs/verifier_bounds_step.c | 544 ++ + .../selftests/bpf/progs/verifier_bpf_fastcall.c | 169 + + .../bpf/progs/verifier_btf_array_access.c | 576 +++ + tools/testing/selftests/bpf/progs/verifier_callx.c | 1086 ++++ + .../selftests/bpf/progs/verifier_callx_rodata.c | 903 ++++ + tools/testing/selftests/bpf/progs/verifier_cfg.c | 79 + + tools/testing/selftests/bpf/progs/verifier_ctx.c | 2 +- + .../selftests/bpf/progs/verifier_global_ptr_args.c | 9 +- + .../selftests/bpf/progs/verifier_global_subprogs.c | 33 +- + tools/testing/selftests/bpf/progs/verifier_gotox.c | 137 +- + .../bpf/progs/verifier_helper_access_var_len.c | 336 +- + .../bpf/progs/verifier_helper_packet_access.c | 4 +- + tools/testing/selftests/bpf/progs/verifier_idoms.c | 377 ++ + .../bpf/progs/verifier_kfunc_packet_access.c | 47 + + .../selftests/bpf/progs/verifier_kfunc_uninit.c | 242 + + .../bpf/progs/verifier_kfunc_uninit_multi.c | 113 + + .../selftests/bpf/progs/verifier_large_stack.c | 425 ++ + .../selftests/bpf/progs/verifier_live_stack.c | 616 ++- + .../selftests/bpf/progs/verifier_loop_hierarchy.c | 346 ++ + tools/testing/selftests/bpf/progs/verifier_lsm.c | 13 + + .../selftests/bpf/progs/verifier_lsm_init_xattr.c | 245 + + .../selftests/bpf/progs/verifier_map_in_map.c | 3 +- + .../bpf/progs/verifier_map_lookup_refine.c | 2 +- + .../selftests/bpf/progs/verifier_may_goto_1.c | 121 + + tools/testing/selftests/bpf/progs/verifier_mtu.c | 88 + + .../selftests/bpf/progs/verifier_raw_stack.c | 25 + + .../selftests/bpf/progs/verifier_ref_tracking.c | 6 +- + tools/testing/selftests/bpf/progs/verifier_scev.c | 3180 ++++++++++++ + tools/testing/selftests/bpf/progs/verifier_sock.c | 10 +- + .../selftests/bpf/progs/verifier_spill_fill.c | 43 + + .../selftests/bpf/progs/verifier_stack_arg_order.c | 4 +- + .../selftests/bpf/progs/verifier_stack_ptr.c | 89 + + .../selftests/bpf/progs/verifier_tailcall.c | 57 + + .../testing/selftests/bpf/progs/verifier_unpriv.c | 37 + + .../bpf/progs/verifier_value_illegal_alu.c | 173 +- + .../testing/selftests/bpf/progs/verifier_var_off.c | 32 + + .../selftests/bpf/progs/verifier_vfs_reject.c | 6 +- + tools/testing/selftests/bpf/progs/verifier_xadd.c | 27 + + .../selftests/bpf/progs/wakeup_source_fail.c | 2 +- + tools/testing/selftests/bpf/progs/wq_failures.c | 4 +- + .../testing/selftests/bpf/test_kmods/bpf_testmod.c | 132 +- + .../testing/selftests/bpf/test_kmods/bpf_testmod.h | 5 + + .../selftests/bpf/test_kmods/bpf_testmod_kfunc.h | 35 + + tools/testing/selftests/bpf/test_loader.c | 90 +- + tools/testing/selftests/bpf/test_progs.h | 3 + + tools/testing/selftests/bpf/testing_helpers.c | 45 +- + tools/testing/selftests/bpf/testing_helpers.h | 1 + + tools/testing/selftests/bpf/trace_helpers.c | 39 + + tools/testing/selftests/bpf/trace_helpers.h | 2 + + tools/testing/selftests/bpf/unpriv_helpers.c | 16 +- + tools/testing/selftests/bpf/unpriv_helpers.h | 2 + + tools/testing/selftests/bpf/verifier/basic_call.c | 2 +- + tools/testing/selftests/bpf/verifier/calls.c | 132 +- + tools/testing/selftests/bpf/verifier/map_kptr.c | 4 +- + tools/testing/selftests/bpf/veristat.c | 4 +- + tools/testing/selftests/bpf/vmtest.sh | 6 +- + tools/testing/selftests/bpf/xdp_hw_metadata.c | 2 +- + tools/testing/selftests/hid/Makefile | 2 + + 365 files changed, 40453 insertions(+), 5290 deletions(-) + delete mode 100644 crypto/bpf_crypto_skcipher.c + delete mode 100644 include/linux/bpf_crypto.h + create mode 100644 kernel/bpf/btf_vmlinux_inline.c + create mode 100644 kernel/bpf/loops.c + create mode 100644 kernel/bpf/scev.c + create mode 100644 net/ipv4/bpf_tcp_ops.c + delete mode 100644 samples/bpf/hash_func01.h + create mode 100644 tools/bpf/resolve_btfids/btf_colors.c + create mode 100644 tools/bpf/resolve_btfids/btf_colors.h + create mode 100644 tools/testing/selftests/bpf/Makefile.buildvars + create mode 100644 tools/testing/selftests/bpf/Makefile.runner + create mode 100644 tools/testing/selftests/bpf/Makefile.skel + create mode 100755 tools/testing/selftests/bpf/gen_bpf_skel.sh + create mode 100644 tools/testing/selftests/bpf/prog_tests/aggregate_arg.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/arena_memcg.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/arena_scalar_blinded.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_tcp_ops.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpf_tcp_ops_hdr.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/bpftool_ringbuf.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_inline.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_module_allowlist.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/btf_rust.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/call_rcu.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/callx_func_ptr_map.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/callx_rodata_lskel.c + delete mode 100644 tools/testing/selftests/bpf/prog_tests/cb_refs.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/copy_from_user_bprm.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/data_in_arena.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/linked_externs.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/lsm_inode_init_xattr.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/may_goto_far.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/may_goto_priv_stack.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/skb_csum_complete.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/tcp_autolowat.c + create mode 100644 tools/testing/selftests/bpf/progs/aggregate_arg_func.c + create mode 100644 tools/testing/selftests/bpf/progs/aggregate_arg_kfunc.c + create mode 100644 tools/testing/selftests/bpf/progs/arena_memcg.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_qdisc_fail__invalid_dynptr_returned_slice.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_tcp_ops.c + create mode 100644 tools/testing/selftests/bpf/progs/bpf_tcp_ops_hdr.c + create mode 100644 tools/testing/selftests/bpf/progs/bpftool_ringbuf.c + create mode 100644 tools/testing/selftests/bpf/progs/btf_module_allowlist.c + create mode 100644 tools/testing/selftests/bpf/progs/call_rcu.c + create mode 100644 tools/testing/selftests/bpf/progs/call_rcu_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/callx_rodata.c + rename tools/testing/selftests/bpf/{ => progs}/cgroup_getset_retval_hooks.h (100%) + create mode 100644 tools/testing/selftests/bpf/progs/copy_from_user_bprm.c + create mode 100644 tools/testing/selftests/bpf/progs/data_in_arena.c + create mode 100644 tools/testing/selftests/bpf/progs/data_in_arena_decl.c + create mode 100644 tools/testing/selftests/bpf/progs/data_in_arena_extern.c + create mode 100644 tools/testing/selftests/bpf/progs/data_in_arena_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/data_in_arena_nomap.c + create mode 100644 tools/testing/selftests/bpf/progs/data_in_arena_rust.rs + create mode 100644 tools/testing/selftests/bpf/progs/exceptions_dead_subprog.c + create mode 100644 tools/testing/selftests/bpf/progs/linked_arena1.c + create mode 100644 tools/testing/selftests/bpf/progs/linked_arena2.c + create mode 100644 tools/testing/selftests/bpf/progs/lsm_inode_init_xattr.c + create mode 100644 tools/testing/selftests/bpf/progs/lsm_inode_init_xattr_budget.c + create mode 100644 tools/testing/selftests/bpf/progs/lsm_inode_init_xattr_value.c + create mode 100644 tools/testing/selftests/bpf/progs/may_goto_priv_stack.c + create mode 100644 tools/testing/selftests/bpf/progs/skb_csum_complete.c + create mode 100644 tools/testing/selftests/bpf/progs/struct_ops_private_stack_large.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_freplace_multi.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_large_stack.c + create mode 100644 tools/testing/selftests/bpf/progs/tcp_autolowat.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_aggregate_arg.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_arena_scalar.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_bounds_step.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_btf_array_access.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_callx.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_callx_rodata.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_idoms.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_kfunc_packet_access.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_kfunc_uninit.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_kfunc_uninit_multi.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_large_stack.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_loop_hierarchy.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_lsm_init_xattr.c + create mode 100644 tools/testing/selftests/bpf/progs/verifier_scev.c +$ git am -3 ../patches/0001-perf-Fixup-for-btf_vlan-API-change.patch +Applying: perf: Fixup for btf_vlan() API change +Using index info to reconstruct a base tree... +M tools/perf/builtin-trace.c +M tools/perf/util/btf.c +Falling back to patching base and 3-way merge... +Auto-merging tools/perf/builtin-trace.c +No changes -- Patch already applied. +Merging ipsec-next/master (014d795c73837 idpf: fix kernel-doc parameter descriptions) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (41de84543574f net/mlx5: IFC, Add capability bits for virtual LAG) +$ git merge -m Merge branch 'mlx5-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'ort' strategy. + include/linux/mlx5/mlx5_ifc.h | 16 +++++++++++++--- + 1 file changed, 13 insertions(+), 3 deletions(-) +Merging netfilter-next/main (a5e7d8e446af9 Merge branch '100GbE' of git://git.kernel.org/pub/scm/linux/kernel/git/tnguy/next-queue) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (87b80c2f6b05c net: txgbe: free the fixed-rate clock on cleanup) +$ git merge -m Merge branch 'main' of https://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (609a23989d637 Bluetooth: btusb: annotate Intel Otter Peak 2 USB ID) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging MAINTAINERS +Auto-merging net/bluetooth/hci_sock.c +Auto-merging net/bluetooth/l2cap_sock.c +Merge made by the 'ort' strategy. + .../bindings/net/bluetooth/brcm,bluetooth.yaml | 1 + + MAINTAINERS | 2 + + drivers/bluetooth/Kconfig | 15 + + drivers/bluetooth/Makefile | 3 + + drivers/bluetooth/btbcm.c | 7 +- + drivers/bluetooth/btintel.c | 151 +- + drivers/bluetooth/btintel.h | 19 + + drivers/bluetooth/btintel_pcie.c | 1537 ++++++- + drivers/bluetooth/btintel_pcie.h | 257 +- + drivers/bluetooth/btmrvl_main.c | 4 +- + drivers/bluetooth/btmtk.c | 507 ++- + drivers/bluetooth/btmtk.h | 12 + + drivers/bluetooth/btmtksdio.c | 57 +- + drivers/bluetooth/btnxpuart.c | 4 +- + drivers/bluetooth/{btusb.c => btusb_main.c} | 372 +- + drivers/bluetooth/btusb_qcom.c | 4557 ++++++++++++++++++++ + drivers/bluetooth/btusb_qcom.h | 99 + + drivers/bluetooth/hci_bcm.c | 1 + + drivers/bluetooth/hci_bcsp.c | 26 +- + drivers/bluetooth/hci_h4.c | 123 +- + drivers/bluetooth/hci_h5.c | 11 +- + drivers/bluetooth/hci_ll.c | 2 +- + drivers/bluetooth/hci_serdev.c | 46 +- + drivers/bluetooth/hci_uart.h | 39 +- + drivers/bluetooth/virtio_bt.c | 21 +- + include/net/bluetooth/hci_core.h | 69 +- + include/net/bluetooth/hci_h4.h | 60 + + include/net/bluetooth/hci_mon.h | 2 + + include/net/bluetooth/l2cap.h | 102 +- + include/net/bluetooth/mgmt.h | 14 + + net/bluetooth/6lowpan.c | 44 +- + net/bluetooth/Makefile | 2 +- + net/bluetooth/bnep/core.c | 16 +- + net/bluetooth/hci_conn.c | 28 + + net/bluetooth/hci_core.c | 53 +- + net/bluetooth/hci_event.c | 186 +- + net/bluetooth/hci_h4.c | 160 + + net/bluetooth/hci_sock.c | 8 + + net/bluetooth/hci_sync.c | 72 +- + net/bluetooth/iso.c | 15 +- + net/bluetooth/l2cap_core.c | 284 +- + net/bluetooth/l2cap_sock.c | 118 +- + net/bluetooth/mgmt.c | 82 +- + net/bluetooth/rfcomm/core.c | 6 +- + net/bluetooth/rfcomm/sock.c | 5 +- + net/bluetooth/sco.c | 10 +- + net/bluetooth/smp.c | 4 +- + scripts/context-analysis-suppression.txt | 1 + + 48 files changed, 8424 insertions(+), 790 deletions(-) + rename drivers/bluetooth/{btusb.c => btusb_main.c} (94%) + create mode 100644 drivers/bluetooth/btusb_qcom.c + create mode 100644 drivers/bluetooth/btusb_qcom.h + create mode 100644 include/net/bluetooth/hci_h4.h + create mode 100644 net/bluetooth/hci_h4.c +Merging wireless-next/for-next (a4190accbf7e0 wifi: cfg80211: fix potential requested_regd leak) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c +Auto-merging drivers/net/wireless/intel/iwlwifi/iwl-trans.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +CONFLICT (content): Merge conflict in drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c +Auto-merging drivers/net/wireless/intel/iwlwifi/mvm/fw.c +Resolved 'drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b19fd6f971212] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git +$ git diff -M --stat --summary HEAD^.. + drivers/net/wireless/ath/ath10k/htt_tx.c | 12 +- + drivers/net/wireless/ath/ath10k/qmi.c | 1 + + drivers/net/wireless/ath/ath11k/core.c | 21 +- + drivers/net/wireless/ath/ath11k/mac.c | 33 +- + drivers/net/wireless/ath/ath11k/mac.h | 2 +- + drivers/net/wireless/ath/ath11k/reg.c | 4 +- + drivers/net/wireless/ath/ath12k/ahb.c | 41 +- + drivers/net/wireless/ath/ath12k/core.c | 37 +- + .../net/wireless/ath/ath12k/debugfs_htt_stats.c | 2 +- + drivers/net/wireless/ath/ath12k/dp.h | 8 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 2 +- + drivers/net/wireless/ath/ath12k/hw.h | 1 + + drivers/net/wireless/ath/ath12k/mac.c | 87 +- + drivers/net/wireless/ath/ath12k/mac.h | 2 +- + drivers/net/wireless/ath/ath12k/reg.c | 6 +- + drivers/net/wireless/ath/ath12k/wifi7/hal_desc.h | 26 - + drivers/net/wireless/ath/ath12k/wifi7/hw.c | 6 + + drivers/net/wireless/ath/ath12k/wmi.c | 17 + + drivers/net/wireless/ath/ath6kl/cfg80211.c | 2 - + drivers/net/wireless/ath/ath9k/channel.c | 2 + + drivers/net/wireless/ath/ath9k/common-spectral.c | 9 + + drivers/net/wireless/ath/regd.c | 2 + + drivers/net/wireless/broadcom/b43/main.c | 5 +- + .../wireless/broadcom/brcm80211/brcmsmac/channel.c | 2 + + drivers/net/wireless/intel/iwlwifi/Makefile | 7 +- + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 8 +- + drivers/net/wireless/intel/iwlwifi/cfg/dr.c | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/rf-fm.c | 4 + + drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/debugfs.c | 5 +- + drivers/net/wireless/intel/iwlwifi/dvm/devices.c | 32 +- + drivers/net/wireless/intel/iwlwifi/dvm/eeprom.c | 88 +- + drivers/net/wireless/intel/iwlwifi/dvm/led.c | 11 +- + drivers/net/wireless/intel/iwlwifi/dvm/lib.c | 2 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 11 +- + drivers/net/wireless/intel/iwlwifi/dvm/main.c | 36 +- + drivers/net/wireless/intel/iwlwifi/dvm/power.c | 3 +- + drivers/net/wireless/intel/iwlwifi/dvm/rx.c | 19 +- + drivers/net/wireless/intel/iwlwifi/dvm/tt.c | 14 +- + drivers/net/wireless/intel/iwlwifi/dvm/tx.c | 3 +- + drivers/net/wireless/intel/iwlwifi/dvm/ucode.c | 3 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 306 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 20 +- + .../net/wireless/intel/iwlwifi/fw/api/commands.h | 5 +- + .../wireless/intel/iwlwifi/fw/api/ctxt-info-v2.h | 328 ++ + .../net/wireless/intel/iwlwifi/fw/api/ctxt-info.h | 185 + + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 88 +- + .../net/wireless/intel/iwlwifi/fw/api/datapath.h | 51 +- + .../net/wireless/intel/iwlwifi/fw/api/mac-cfg.h | 53 +- + .../net/wireless/intel/iwlwifi/fw/api/offload.h | 5 +- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 14 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 23 +- + drivers/net/wireless/intel/iwlwifi/fw/api/scan.h | 68 +- + drivers/net/wireless/intel/iwlwifi/fw/api/stats.h | 60 +- + drivers/net/wireless/intel/iwlwifi/fw/api/tx.h | 11 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg-old.c | 120 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 156 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 2 +- + drivers/net/wireless/intel/iwlwifi/fw/dump.c | 16 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 2 + + drivers/net/wireless/intel/iwlwifi/fw/init.c | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/pnvm.c | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/regulatory.c | 97 +- + drivers/net/wireless/intel/iwlwifi/fw/regulatory.h | 26 +- + drivers/net/wireless/intel/iwlwifi/fw/runtime.h | 13 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.c | 412 +- + drivers/net/wireless/intel/iwlwifi/fw/uefi.h | 26 + + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 13 +- + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 54 +- + .../net/wireless/intel/iwlwifi/iwl-devtrace-io.h | 18 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 9 +- + drivers/net/wireless/intel/iwlwifi/iwl-io.c | 448 -- + drivers/net/wireless/intel/iwlwifi/iwl-io.h | 107 - + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 33 +- + drivers/net/wireless/intel/iwlwifi/iwl-scd.h | 22 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.c | 354 +- + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 228 +- + drivers/net/wireless/intel/iwlwifi/mld/agg.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mld/constants.h | 4 + + drivers/net/wireless/intel/iwlwifi/mld/d3.c | 76 +- + drivers/net/wireless/intel/iwlwifi/mld/debugfs.c | 4 +- + .../net/wireless/intel/iwlwifi/mld/ftm-initiator.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mld/fw.c | 22 +- + drivers/net/wireless/intel/iwlwifi/mld/hcmd.h | 2 + + drivers/net/wireless/intel/iwlwifi/mld/key.c | 6 + + drivers/net/wireless/intel/iwlwifi/mld/link.c | 14 +- + .../net/wireless/intel/iwlwifi/mld/low_latency.c | 3 +- + drivers/net/wireless/intel/iwlwifi/mld/mac80211.c | 6 + + drivers/net/wireless/intel/iwlwifi/mld/mld.c | 20 + + drivers/net/wireless/intel/iwlwifi/mld/mld.h | 6 + + drivers/net/wireless/intel/iwlwifi/mld/mlo.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mld/nan.c | 35 +- + drivers/net/wireless/intel/iwlwifi/mld/notif.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mld/power.c | 2 +- + drivers/net/wireless/intel/iwlwifi/mld/ptp.c | 12 +- + .../net/wireless/intel/iwlwifi/mld/regulatory.c | 83 +- + .../net/wireless/intel/iwlwifi/mld/regulatory.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mld/rx.c | 752 ++- + drivers/net/wireless/intel/iwlwifi/mld/scan.c | 20 +- + drivers/net/wireless/intel/iwlwifi/mld/scan.h | 4 +- + drivers/net/wireless/intel/iwlwifi/mld/sta.c | 7 +- + drivers/net/wireless/intel/iwlwifi/mld/stats.c | 35 +- + .../net/wireless/intel/iwlwifi/mld/tests/Makefile | 2 +- + .../net/wireless/intel/iwlwifi/mld/tests/tx-gp2.c | 154 + + drivers/net/wireless/intel/iwlwifi/mld/tlc.c | 184 +- + drivers/net/wireless/intel/iwlwifi/mld/tx.c | 135 + + drivers/net/wireless/intel/iwlwifi/mld/tx.h | 41 +- + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 89 +- + drivers/net/wireless/intel/iwlwifi/mvm/debugfs.c | 144 +- + .../net/wireless/intel/iwlwifi/mvm/ftm-initiator.c | 51 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 44 +- + drivers/net/wireless/intel/iwlwifi/mvm/led.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 3 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 15 + + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 31 +- + drivers/net/wireless/intel/iwlwifi/mvm/scan.c | 6 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 8 +- + drivers/net/wireless/intel/iwlwifi/mvm/tdls.c | 4 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 1 - + drivers/net/wireless/intel/iwlwifi/mvm/utils.c | 8 +- + .../net/wireless/intel/iwlwifi/pcie/ctxt-info-v2.c | 30 +- + .../net/wireless/intel/iwlwifi/pcie/ctxt-info.c | 5 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 14 +- + .../intel/iwlwifi/pcie/{gen1_2 => }/internal.h | 136 +- + .../intel/iwlwifi/pcie/iwl-context-info-v2.h | 320 +- + .../wireless/intel/iwlwifi/pcie/iwl-context-info.h | 177 +- + .../wireless/intel/iwlwifi/pcie/{gen1_2 => }/rx.c | 198 +- + .../intel/iwlwifi/pcie/{gen1_2 => }/trans-gen2.c | 96 +- + .../intel/iwlwifi/pcie/{gen1_2 => }/trans.c | 929 ++- + .../intel/iwlwifi/pcie/{gen1_2 => }/tx-gen2.c | 9 +- + .../wireless/intel/iwlwifi/pcie/{gen1_2 => }/tx.c | 167 +- + drivers/net/wireless/intel/iwlwifi/pcie/utils.c | 91 +- + drivers/net/wireless/intel/iwlwifi/pcie/utils.h | 46 +- + drivers/net/wireless/marvell/mwifiex/cmdevt.c | 22 +- + drivers/net/wireless/marvell/mwifiex/fw.h | 6 + + drivers/net/wireless/marvell/mwifiex/init.c | 1 + + drivers/net/wireless/marvell/mwifiex/main.h | 1 + + drivers/net/wireless/marvell/mwifiex/sta_ioctl.c | 3 +- + drivers/net/wireless/mediatek/mt76/Kconfig | 1 + + drivers/net/wireless/mediatek/mt76/channel.c | 26 +- + drivers/net/wireless/mediatek/mt76/eeprom.c | 17 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 32 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 31 +- + drivers/net/wireless/mediatek/mt76/mt7603/dma.c | 18 +- + .../net/wireless/mediatek/mt76/mt7615/debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 17 +- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 13 + + .../net/wireless/mediatek/mt76/mt7615/pci_init.c | 1 + + drivers/net/wireless/mediatek/mt76/mt7615/usb.c | 17 +- + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 20 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 19 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 4 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mac.c | 30 +- + .../net/wireless/mediatek/mt76/mt76x02_usb_mcu.c | 2 +- + .../net/wireless/mediatek/mt76/mt7915/coredump.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 6 + + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 17 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 2 +- + .../net/wireless/mediatek/mt76/mt7921/debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 14 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 48 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 26 +- + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 6 + + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 1 + + .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7921/regd.c | 28 +- + drivers/net/wireless/mediatek/mt76/mt7925/Makefile | 2 +- + .../net/wireless/mediatek/mt76/mt7925/cached_cal.c | 298 + + .../net/wireless/mediatek/mt76/mt7925/cached_cal.h | 151 + + drivers/net/wireless/mediatek/mt76/mt7925/init.c | 2 + + drivers/net/wireless/mediatek/mt76/mt7925/mac.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7925/main.c | 115 +- + drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 73 +- + drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h | 10 +- + drivers/net/wireless/mediatek/mt76/mt7925/nan.c | 694 ++- + drivers/net/wireless/mediatek/mt76/mt7925/nan.h | 103 +- + drivers/net/wireless/mediatek/mt76/mt7925/pci.c | 66 +- + .../net/wireless/mediatek/mt76/mt7925/pci_mac.c | 8 +- + .../net/wireless/mediatek/mt76/mt7925/pci_mcu.c | 2 + + drivers/net/wireless/mediatek/mt76/mt7925/regs.h | 3 +- + drivers/net/wireless/mediatek/mt76/mt7925/usb.c | 26 +- + drivers/net/wireless/mediatek/mt76/mt792x.h | 18 + + drivers/net/wireless/mediatek/mt76/mt792x_core.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt792x_mac.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt792x_usb.c | 13 +- + drivers/net/wireless/mediatek/mt76/mt7996/Kconfig | 1 + + .../net/wireless/mediatek/mt76/mt7996/coredump.c | 7 +- + .../net/wireless/mediatek/mt76/mt7996/debugfs.c | 319 +- + drivers/net/wireless/mediatek/mt76/mt7996/init.c | 7 + + drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 23 +- + drivers/net/wireless/mediatek/mt76/mt7996/main.c | 784 ++- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 153 +- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 23 + + drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 42 +- + drivers/net/wireless/mediatek/mt76/mt7996/npu.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt7996/pci.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt7996/regs.h | 38 +- + drivers/net/wireless/mediatek/mt76/scan.c | 227 +- + drivers/net/wireless/mediatek/mt76/tx.c | 9 +- + drivers/net/wireless/mediatek/mt76/usb.c | 47 +- + drivers/net/wireless/morsemicro/mm81x/command.c | 5 +- + drivers/net/wireless/morsemicro/mm81x/core.h | 16 +- + drivers/net/wireless/morsemicro/mm81x/mac.c | 297 +- + drivers/net/wireless/morsemicro/mm81x/mmrc.c | 34 +- + drivers/net/wireless/morsemicro/mm81x/yaps_hw.c | 14 +- + drivers/net/wireless/nxp/nxpwifi/debugfs.c | 5 +- + drivers/net/wireless/nxp/nxpwifi/main.c | 5 +- + drivers/net/wireless/nxp/nxpwifi/sdio.c | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/core.c | 156 +- + drivers/net/wireless/realtek/rtl8xxxu/regs.h | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 2 +- + drivers/net/wireless/realtek/rtlwifi/base.c | 2 +- + .../realtek/rtlwifi/btcoexist/halbtc8192e2ant.c | 2 +- + .../realtek/rtlwifi/btcoexist/halbtc8723b2ant.c | 2 +- + .../realtek/rtlwifi/btcoexist/halbtc8821a2ant.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 4 +- + drivers/net/wireless/realtek/rtlwifi/debug.h | 2 +- + drivers/net/wireless/realtek/rtlwifi/regd.c | 4 + + .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/phy.h | 2 +- + .../wireless/realtek/rtlwifi/rtl8188ee/pwrseq.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/reg.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 92 +- + .../net/wireless/realtek/rtlwifi/rtl8192d/reg.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192du/phy.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/fw.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/hw.c | 1 - + .../net/wireless/realtek/rtlwifi/rtl8192ee/phy.c | 2 +- + .../wireless/realtek/rtlwifi/rtl8192ee/pwrseq.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/hw.c | 102 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/phy.c | 10 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/reg.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 4 +- + .../wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 1 - + .../wireless/realtek/rtlwifi/rtl8723ae/pwrseq.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/dm.c | 2 +- + .../wireless/realtek/rtlwifi/rtl8723be/pwrseq.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/reg.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 4 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 12 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/fw.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 73 +- + .../wireless/realtek/rtlwifi/rtl8821ae/pwrseq.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/reg.h | 14 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/usb.c | 2 +- + drivers/net/wireless/realtek/rtlwifi/wifi.h | 6 +- + drivers/net/wireless/realtek/rtw88/Kconfig | 18 + + drivers/net/wireless/realtek/rtw88/Makefile | 6 + + drivers/net/wireless/realtek/rtw88/debug.c | 5 + + drivers/net/wireless/realtek/rtw88/mac80211.c | 4 +- + drivers/net/wireless/realtek/rtw88/main.c | 7 +- + drivers/net/wireless/realtek/rtw88/main.h | 8 + + drivers/net/wireless/realtek/rtw88/pci.c | 29 + + drivers/net/wireless/realtek/rtw88/phy.c | 39 + + drivers/net/wireless/realtek/rtw88/phy.h | 1 + + drivers/net/wireless/realtek/rtw88/reg.h | 36 + + drivers/net/wireless/realtek/rtw88/rtw8703b.c | 36 +- + drivers/net/wireless/realtek/rtw88/rtw8703b.h | 63 - + drivers/net/wireless/realtek/rtw88/rtw8723b.c | 2534 +++++++++ + drivers/net/wireless/realtek/rtw88/rtw8723b.h | 14 + + .../net/wireless/realtek/rtw88/rtw8723b_table.c | 861 +++ + .../net/wireless/realtek/rtw88/rtw8723b_table.h | 17 + + drivers/net/wireless/realtek/rtw88/rtw8723bs.c | 59 + + drivers/net/wireless/realtek/rtw88/rtw8723x.h | 60 + + drivers/net/wireless/realtek/rtw88/rtw8812a.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw8821a.c | 2 +- + drivers/net/wireless/realtek/rtw88/rtw88xxa.c | 38 - + drivers/net/wireless/realtek/rtw88/rtw88xxa.h | 1 - + drivers/net/wireless/realtek/rtw88/rx.c | 8 +- + drivers/net/wireless/realtek/rtw88/sdio.c | 506 +- + drivers/net/wireless/realtek/rtw88/sdio.h | 24 +- + drivers/net/wireless/realtek/rtw88/tx.c | 9 +- + drivers/net/wireless/realtek/rtw88/tx.h | 3 +- + drivers/net/wireless/realtek/rtw88/usb.c | 90 +- + drivers/net/wireless/realtek/rtw88/usb.h | 5 + + drivers/net/wireless/realtek/rtw89/Kconfig | 4 +- + drivers/net/wireless/realtek/rtw89/cam.c | 4 +- + drivers/net/wireless/realtek/rtw89/chan.c | 28 +- + drivers/net/wireless/realtek/rtw89/chan.h | 1 + + drivers/net/wireless/realtek/rtw89/coex.c | 1465 ++++- + drivers/net/wireless/realtek/rtw89/coex.h | 1 - + drivers/net/wireless/realtek/rtw89/core.c | 174 +- + drivers/net/wireless/realtek/rtw89/core.h | 349 +- + drivers/net/wireless/realtek/rtw89/debug.c | 10 +- + drivers/net/wireless/realtek/rtw89/fw.c | 895 ++- + drivers/net/wireless/realtek/rtw89/fw.h | 136 +- + drivers/net/wireless/realtek/rtw89/led.c | 2 +- + drivers/net/wireless/realtek/rtw89/mac.c | 16 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 6 +- + drivers/net/wireless/realtek/rtw89/mac_be.c | 3 + + drivers/net/wireless/realtek/rtw89/pci.c | 62 +- + drivers/net/wireless/realtek/rtw89/pci.h | 4 +- + drivers/net/wireless/realtek/rtw89/phy.c | 37 +- + drivers/net/wireless/realtek/rtw89/phy.h | 32 +- + drivers/net/wireless/realtek/rtw89/phy_be.c | 219 +- + drivers/net/wireless/realtek/rtw89/ps.c | 15 +- + drivers/net/wireless/realtek/rtw89/reg.h | 32 +- + drivers/net/wireless/realtek/rtw89/regd.c | 8 +- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 5 + + drivers/net/wireless/realtek/rtw89/rtw8851b_rfk.c | 4 +- + .../wireless/realtek/rtw89/rtw8851b_rfk_table.c | 3 +- + drivers/net/wireless/realtek/rtw89/rtw8851bu.c | 8 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 13 + + drivers/net/wireless/realtek/rtw89/rtw8852au.c | 8 +- + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 34 +- + drivers/net/wireless/realtek/rtw89/rtw8852bt.c | 6 + + drivers/net/wireless/realtek/rtw89/rtw8852bu.c | 8 +- + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 17 + + drivers/net/wireless/realtek/rtw89/rtw8852cu.c | 9 +- + drivers/net/wireless/realtek/rtw89/rtw8922a.c | 4 +- + drivers/net/wireless/realtek/rtw89/rtw8922au.c | 14 +- + drivers/net/wireless/realtek/rtw89/rtw8922d.c | 260 +- + drivers/net/wireless/realtek/rtw89/ser.c | 13 +- + drivers/net/wireless/realtek/rtw89/usb.c | 18 +- + drivers/net/wireless/realtek/rtw89/usb.h | 3 +- + drivers/net/wireless/realtek/rtw89/util.h | 4 + + drivers/net/wireless/realtek/rtw89/wow.c | 27 +- + drivers/net/wireless/virtual/mac80211_hwsim_main.c | 11 +- + drivers/staging/Kconfig | 2 - + drivers/staging/Makefile | 1 - + drivers/staging/rtl8723bs/Kconfig | 13 - + drivers/staging/rtl8723bs/Makefile | 60 - + drivers/staging/rtl8723bs/TODO | 7 - + drivers/staging/rtl8723bs/core/rtw_ap.c | 1943 ------- + drivers/staging/rtl8723bs/core/rtw_btcoex.c | 75 - + drivers/staging/rtl8723bs/core/rtw_cmd.c | 1936 ------- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 253 - + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 1206 ---- + drivers/staging/rtl8723bs/core/rtw_io.c | 145 - + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 494 -- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 2568 --------- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 5901 -------------------- + drivers/staging/rtl8723bs/core/rtw_pwrctrl.c | 1139 ---- + drivers/staging/rtl8723bs/core/rtw_recv.c | 2249 -------- + drivers/staging/rtl8723bs/core/rtw_security.c | 1470 ----- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 549 -- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 1759 ------ + drivers/staging/rtl8723bs/core/rtw_xmit.c | 2569 --------- + drivers/staging/rtl8723bs/hal/Hal8723BReg.h | 65 - + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c | 2595 --------- + drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h | 184 - + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c | 2624 --------- + drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h | 146 - + drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h | 426 -- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c | 556 -- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.h | 39 - + drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c | 237 - + drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.h | 19 - + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c | 554 -- + drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.h | 40 - + drivers/staging/rtl8723bs/hal/HalPhyRf.c | 268 - + drivers/staging/rtl8723bs/hal/HalPhyRf.h | 39 - + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 1767 ------ + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h | 66 - + drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c | 144 - + drivers/staging/rtl8723bs/hal/Mp_Precomp.h | 23 - + drivers/staging/rtl8723bs/hal/hal_btcoex.c | 1303 ----- + drivers/staging/rtl8723bs/hal/hal_com.c | 767 --- + drivers/staging/rtl8723bs/hal/hal_com_phycfg.c | 973 ---- + drivers/staging/rtl8723bs/hal/hal_intf.c | 283 - + drivers/staging/rtl8723bs/hal/hal_pwr_seq.c | 128 - + drivers/staging/rtl8723bs/hal/hal_sdio.c | 100 - + drivers/staging/rtl8723bs/hal/odm.c | 988 ---- + drivers/staging/rtl8723bs/hal/odm.h | 1109 ---- + drivers/staging/rtl8723bs/hal/odm_CfoTracking.c | 210 - + drivers/staging/rtl8723bs/hal/odm_CfoTracking.h | 39 - + drivers/staging/rtl8723bs/hal/odm_DIG.c | 799 --- + drivers/staging/rtl8723bs/hal/odm_DIG.h | 164 - + .../rtl8723bs/hal/odm_DynamicBBPowerSaving.c | 81 - + .../rtl8723bs/hal/odm_DynamicBBPowerSaving.h | 31 - + drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.c | 22 - + drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h | 29 - + drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c | 158 - + drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.h | 23 - + drivers/staging/rtl8723bs/hal/odm_HWConfig.c | 439 -- + drivers/staging/rtl8723bs/hal/odm_HWConfig.h | 85 - + drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c | 176 - + drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h | 45 - + drivers/staging/rtl8723bs/hal/odm_RegDefine11N.h | 160 - + drivers/staging/rtl8723bs/hal/odm_interface.h | 29 - + drivers/staging/rtl8723bs/hal/odm_precomp.h | 47 - + drivers/staging/rtl8723bs/hal/odm_reg.h | 91 - + drivers/staging/rtl8723bs/hal/odm_types.h | 40 - + drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c | 933 ---- + drivers/staging/rtl8723bs/hal/rtl8723b_dm.c | 256 - + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 2826 ---------- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 759 --- + drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c | 135 - + drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c | 69 - + drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c | 477 -- + drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c | 568 -- + drivers/staging/rtl8723bs/hal/sdio_halinit.c | 1192 ---- + drivers/staging/rtl8723bs/hal/sdio_ops.c | 859 --- + drivers/staging/rtl8723bs/include/Hal8192CPhyReg.h | 232 - + drivers/staging/rtl8723bs/include/HalPwrSeqCmd.h | 111 - + drivers/staging/rtl8723bs/include/basic_types.h | 175 - + drivers/staging/rtl8723bs/include/cmd_osdep.h | 16 - + drivers/staging/rtl8723bs/include/drv_types.h | 431 -- + drivers/staging/rtl8723bs/include/drv_types_sdio.h | 25 - + drivers/staging/rtl8723bs/include/hal_btcoex.h | 54 - + drivers/staging/rtl8723bs/include/hal_com.h | 152 - + drivers/staging/rtl8723bs/include/hal_com_h2c.h | 28 - + drivers/staging/rtl8723bs/include/hal_com_phycfg.h | 108 - + drivers/staging/rtl8723bs/include/hal_com_reg.h | 594 -- + drivers/staging/rtl8723bs/include/hal_data.h | 276 - + drivers/staging/rtl8723bs/include/hal_intf.h | 250 - + drivers/staging/rtl8723bs/include/hal_pg.h | 63 - + drivers/staging/rtl8723bs/include/hal_phy.h | 73 - + drivers/staging/rtl8723bs/include/hal_phy_cfg.h | 63 - + drivers/staging/rtl8723bs/include/hal_phy_reg.h | 17 - + drivers/staging/rtl8723bs/include/hal_pwr_seq.h | 226 - + drivers/staging/rtl8723bs/include/hal_sdio.h | 18 - + drivers/staging/rtl8723bs/include/ieee80211.h | 748 --- + drivers/staging/rtl8723bs/include/ioctl_cfg80211.h | 58 - + drivers/staging/rtl8723bs/include/osdep_intf.h | 42 - + drivers/staging/rtl8723bs/include/osdep_service.h | 53 - + .../rtl8723bs/include/osdep_service_linux.h | 118 - + drivers/staging/rtl8723bs/include/rtl8192c_recv.h | 33 - + drivers/staging/rtl8723bs/include/rtl8723b_cmd.h | 182 - + drivers/staging/rtl8723bs/include/rtl8723b_dm.h | 32 - + drivers/staging/rtl8723bs/include/rtl8723b_hal.h | 246 - + drivers/staging/rtl8723bs/include/rtl8723b_recv.h | 95 - + drivers/staging/rtl8723bs/include/rtl8723b_rf.h | 17 - + drivers/staging/rtl8723bs/include/rtl8723b_spec.h | 237 - + drivers/staging/rtl8723bs/include/rtl8723b_xmit.h | 421 -- + drivers/staging/rtl8723bs/include/rtw_ap.h | 39 - + drivers/staging/rtl8723bs/include/rtw_btcoex.h | 27 - + drivers/staging/rtl8723bs/include/rtw_byteorder.h | 16 - + drivers/staging/rtl8723bs/include/rtw_cmd.h | 705 --- + drivers/staging/rtl8723bs/include/rtw_eeprom.h | 118 - + drivers/staging/rtl8723bs/include/rtw_efuse.h | 78 - + drivers/staging/rtl8723bs/include/rtw_event.h | 92 - + drivers/staging/rtl8723bs/include/rtw_ht.h | 83 - + drivers/staging/rtl8723bs/include/rtw_io.h | 58 - + drivers/staging/rtl8723bs/include/rtw_ioctl_set.h | 27 - + drivers/staging/rtl8723bs/include/rtw_mlme.h | 397 -- + drivers/staging/rtl8723bs/include/rtw_mlme_ext.h | 708 --- + drivers/staging/rtl8723bs/include/rtw_pwrctrl.h | 254 - + drivers/staging/rtl8723bs/include/rtw_qos.h | 15 - + drivers/staging/rtl8723bs/include/rtw_recv.h | 457 -- + drivers/staging/rtl8723bs/include/rtw_rf.h | 100 - + drivers/staging/rtl8723bs/include/rtw_security.h | 272 - + drivers/staging/rtl8723bs/include/rtw_version.h | 3 - + drivers/staging/rtl8723bs/include/rtw_wifi_regd.h | 16 - + drivers/staging/rtl8723bs/include/rtw_xmit.h | 470 -- + drivers/staging/rtl8723bs/include/sdio_hal.h | 14 - + drivers/staging/rtl8723bs/include/sdio_ops.h | 33 - + drivers/staging/rtl8723bs/include/sdio_ops_linux.h | 29 - + drivers/staging/rtl8723bs/include/sta_info.h | 330 -- + drivers/staging/rtl8723bs/include/wifi.h | 409 -- + drivers/staging/rtl8723bs/include/wlan_bssdef.h | 195 - + drivers/staging/rtl8723bs/include/xmit_osdep.h | 43 - + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2798 ---------- + drivers/staging/rtl8723bs/os_dep/os_intfs.c | 1189 ---- + drivers/staging/rtl8723bs/os_dep/osdep_service.c | 201 - + drivers/staging/rtl8723bs/os_dep/sdio_intf.c | 465 -- + drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c | 495 -- + drivers/staging/rtl8723bs/os_dep/wifi_regd.c | 129 - + drivers/staging/rtl8723bs/os_dep/xmit_linux.c | 216 - + include/net/cfg80211.h | 93 +- + include/net/mac80211.h | 25 + + include/uapi/linux/nl80211.h | 16 + + net/mac80211/cfg.c | 552 +- + net/mac80211/debugfs.c | 1 + + net/mac80211/driver-ops.c | 76 + + net/mac80211/driver-ops.h | 62 +- + net/mac80211/ieee80211_i.h | 25 +- + net/mac80211/link.c | 1 + + net/mac80211/main.c | 10 +- + net/mac80211/mesh_pathtbl.c | 25 +- + net/mac80211/offchannel.c | 334 +- + net/mac80211/parse.c | 7 +- + net/mac80211/rate.c | 5 - + net/mac80211/rx.c | 1 + + net/mac80211/scan.c | 18 +- + net/mac80211/sta_info.c | 133 +- + net/mac80211/sta_info.h | 10 +- + net/mac80211/tests/chan-mode.c | 19 +- + net/mac80211/trace.h | 28 + + net/mac80211/tx.c | 128 +- + net/wireless/chan.c | 2 +- + net/wireless/core.c | 97 +- + net/wireless/core.h | 47 +- + net/wireless/debugfs.c | 3 + + net/wireless/mlme.c | 152 +- + net/wireless/nl80211.c | 977 +++- + net/wireless/rdev-ops.h | 50 + + net/wireless/reg.c | 235 +- + net/wireless/reg.h | 2 +- + net/wireless/sme.c | 42 +- + net/wireless/trace.h | 47 +- + net/wireless/util.c | 11 + + net/wireless/wext-sme.c | 3 + + 507 files changed, 18523 insertions(+), 72343 deletions(-) + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/ctxt-info-v2.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/fw/api/ctxt-info.h + delete mode 100644 drivers/net/wireless/intel/iwlwifi/iwl-io.c + delete mode 100644 drivers/net/wireless/intel/iwlwifi/iwl-io.h + create mode 100644 drivers/net/wireless/intel/iwlwifi/mld/tests/tx-gp2.c + rename drivers/net/wireless/intel/iwlwifi/pcie/{gen1_2 => }/internal.h (92%) + rename drivers/net/wireless/intel/iwlwifi/pcie/{gen1_2 => }/rx.c (93%) + rename drivers/net/wireless/intel/iwlwifi/pcie/{gen1_2 => }/trans-gen2.c (87%) + rename drivers/net/wireless/intel/iwlwifi/pcie/{gen1_2 => }/trans.c (84%) + rename drivers/net/wireless/intel/iwlwifi/pcie/{gen1_2 => }/tx-gen2.c (99%) + rename drivers/net/wireless/intel/iwlwifi/pcie/{gen1_2 => }/tx.c (94%) + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/cached_cal.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/cached_cal.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723b.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723b.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723b_table.c + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723b_table.h + create mode 100644 drivers/net/wireless/realtek/rtw88/rtw8723bs.c + delete mode 100644 drivers/staging/rtl8723bs/Kconfig + delete mode 100644 drivers/staging/rtl8723bs/Makefile + delete mode 100644 drivers/staging/rtl8723bs/TODO + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_ap.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_btcoex.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_cmd.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_efuse.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_ieee80211.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_io.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_ioctl_set.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_mlme.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_mlme_ext.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_pwrctrl.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_recv.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_security.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_sta_mgt.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_wlan_util.c + delete mode 100644 drivers/staging/rtl8723bs/core/rtw_xmit.c + delete mode 100644 drivers/staging/rtl8723bs/hal/Hal8723BReg.h + delete mode 100644 drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c + delete mode 100644 drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h + delete mode 100644 drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c + delete mode 100644 drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h + delete mode 100644 drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h + delete mode 100644 drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.c + delete mode 100644 drivers/staging/rtl8723bs/hal/HalHWImg8723B_BB.h + delete mode 100644 drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.c + delete mode 100644 drivers/staging/rtl8723bs/hal/HalHWImg8723B_MAC.h + delete mode 100644 drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.c + delete mode 100644 drivers/staging/rtl8723bs/hal/HalHWImg8723B_RF.h + delete mode 100644 drivers/staging/rtl8723bs/hal/HalPhyRf.c + delete mode 100644 drivers/staging/rtl8723bs/hal/HalPhyRf.h + delete mode 100644 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c + delete mode 100644 drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h + delete mode 100644 drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c + delete mode 100644 drivers/staging/rtl8723bs/hal/Mp_Precomp.h + delete mode 100644 drivers/staging/rtl8723bs/hal/hal_btcoex.c + delete mode 100644 drivers/staging/rtl8723bs/hal/hal_com.c + delete mode 100644 drivers/staging/rtl8723bs/hal/hal_com_phycfg.c + delete mode 100644 drivers/staging/rtl8723bs/hal/hal_intf.c + delete mode 100644 drivers/staging/rtl8723bs/hal/hal_pwr_seq.c + delete mode 100644 drivers/staging/rtl8723bs/hal/hal_sdio.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm.h + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_CfoTracking.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_CfoTracking.h + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_DIG.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_DIG.h + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_DynamicBBPowerSaving.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_DynamicBBPowerSaving.h + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.h + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_HWConfig.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_HWConfig.h + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.c + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_RegConfig8723B.h + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_RegDefine11N.h + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_interface.h + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_precomp.h + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_reg.h + delete mode 100644 drivers/staging/rtl8723bs/hal/odm_types.h + delete mode 100644 drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c + delete mode 100644 drivers/staging/rtl8723bs/hal/rtl8723b_dm.c + delete mode 100644 drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c + delete mode 100644 drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c + delete mode 100644 drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c + delete mode 100644 drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c + delete mode 100644 drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c + delete mode 100644 drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c + delete mode 100644 drivers/staging/rtl8723bs/hal/sdio_halinit.c + delete mode 100644 drivers/staging/rtl8723bs/hal/sdio_ops.c + delete mode 100644 drivers/staging/rtl8723bs/include/Hal8192CPhyReg.h + delete mode 100644 drivers/staging/rtl8723bs/include/HalPwrSeqCmd.h + delete mode 100644 drivers/staging/rtl8723bs/include/basic_types.h + delete mode 100644 drivers/staging/rtl8723bs/include/cmd_osdep.h + delete mode 100644 drivers/staging/rtl8723bs/include/drv_types.h + delete mode 100644 drivers/staging/rtl8723bs/include/drv_types_sdio.h + delete mode 100644 drivers/staging/rtl8723bs/include/hal_btcoex.h + delete mode 100644 drivers/staging/rtl8723bs/include/hal_com.h + delete mode 100644 drivers/staging/rtl8723bs/include/hal_com_h2c.h + delete mode 100644 drivers/staging/rtl8723bs/include/hal_com_phycfg.h + delete mode 100644 drivers/staging/rtl8723bs/include/hal_com_reg.h + delete mode 100644 drivers/staging/rtl8723bs/include/hal_data.h + delete mode 100644 drivers/staging/rtl8723bs/include/hal_intf.h + delete mode 100644 drivers/staging/rtl8723bs/include/hal_pg.h + delete mode 100644 drivers/staging/rtl8723bs/include/hal_phy.h + delete mode 100644 drivers/staging/rtl8723bs/include/hal_phy_cfg.h + delete mode 100644 drivers/staging/rtl8723bs/include/hal_phy_reg.h + delete mode 100644 drivers/staging/rtl8723bs/include/hal_pwr_seq.h + delete mode 100644 drivers/staging/rtl8723bs/include/hal_sdio.h + delete mode 100644 drivers/staging/rtl8723bs/include/ieee80211.h + delete mode 100644 drivers/staging/rtl8723bs/include/ioctl_cfg80211.h + delete mode 100644 drivers/staging/rtl8723bs/include/osdep_intf.h + delete mode 100644 drivers/staging/rtl8723bs/include/osdep_service.h + delete mode 100644 drivers/staging/rtl8723bs/include/osdep_service_linux.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtl8192c_recv.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtl8723b_cmd.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtl8723b_dm.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtl8723b_hal.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtl8723b_recv.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtl8723b_rf.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtl8723b_spec.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtl8723b_xmit.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_ap.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_btcoex.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_byteorder.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_cmd.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_eeprom.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_efuse.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_event.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_ht.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_io.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_ioctl_set.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_mlme.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_mlme_ext.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_pwrctrl.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_qos.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_recv.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_rf.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_security.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_version.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_wifi_regd.h + delete mode 100644 drivers/staging/rtl8723bs/include/rtw_xmit.h + delete mode 100644 drivers/staging/rtl8723bs/include/sdio_hal.h + delete mode 100644 drivers/staging/rtl8723bs/include/sdio_ops.h + delete mode 100644 drivers/staging/rtl8723bs/include/sdio_ops_linux.h + delete mode 100644 drivers/staging/rtl8723bs/include/sta_info.h + delete mode 100644 drivers/staging/rtl8723bs/include/wifi.h + delete mode 100644 drivers/staging/rtl8723bs/include/wlan_bssdef.h + delete mode 100644 drivers/staging/rtl8723bs/include/xmit_osdep.h + delete mode 100644 drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c + delete mode 100644 drivers/staging/rtl8723bs/os_dep/os_intfs.c + delete mode 100644 drivers/staging/rtl8723bs/os_dep/osdep_service.c + delete mode 100644 drivers/staging/rtl8723bs/os_dep/sdio_intf.c + delete mode 100644 drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c + delete mode 100644 drivers/staging/rtl8723bs/os_dep/wifi_regd.c + delete mode 100644 drivers/staging/rtl8723bs/os_dep/xmit_linux.c +Merging ath-next/for-next (cd026e68fdbf8 Merge tag 'ath-next-20261012' of git://git.kernel.org/pub/scm/linux/kernel/git/ath/ath) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ath/ath.git ath-next/for-next +Already up to date. +Merging iwlwifi-next/next (3627924ed81fd wifi: iwlwifi: mld: include VI packets in low latency detection) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iwlwifi/iwlwifi-next.git iwlwifi-next/next +Already up to date. +Merging wpan-next/master (a6bfdfcc6711d ieee802154: allow legacy LLSEC ADD/DEL ops to pass strict validation) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Already up to date. +Merging wpan-staging/staging (a6bfdfcc6711d ieee802154: allow legacy LLSEC ADD/DEL ops to pass strict validation) +$ git merge -m Merge branch 'staging' of https://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (2f7fa8d90694d mtd: parsers: qcom: fix offset/size overflow on large partitions) +$ git merge -m Merge branch 'mtd/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Auto-merging drivers/mtd/chips/cfi_cmdset_0001.c +Auto-merging drivers/mtd/mtd_virt_concat.c +Auto-merging drivers/mtd/mtdconcat.c +Auto-merging drivers/mtd/mtdcore.c +Auto-merging drivers/mtd/nand/raw/cadence-nand-controller.c +Auto-merging drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c +Merge made by the 'ort' strategy. + drivers/mtd/chips/cfi_cmdset_0001.c | 5 +- + drivers/mtd/chips/cfi_cmdset_0002.c | 15 ++++ + drivers/mtd/devices/docg3.c | 20 ++--- + drivers/mtd/devices/powernv_flash.c | 2 +- + drivers/mtd/hyperbus/hbmc-am654.c | 7 +- + drivers/mtd/maps/Kconfig | 17 ++++ + drivers/mtd/maps/Makefile | 1 + + drivers/mtd/maps/amd76xrom.c | 2 + + drivers/mtd/maps/int0800.c | 115 ++++++++++++++++++++++++ + drivers/mtd/maps/l440gx.c | 2 - + drivers/mtd/maps/pci.c | 2 +- + drivers/mtd/mtd_blkdevs.c | 5 ++ + drivers/mtd/mtd_virt_concat.c | 2 + + drivers/mtd/mtdconcat.c | 2 +- + drivers/mtd/mtdcore.c | 2 +- + drivers/mtd/mtdsuper.c | 4 +- + drivers/mtd/nand/onenand/onenand_base.c | 2 +- + drivers/mtd/nand/raw/cadence-nand-controller.c | 2 +- + drivers/mtd/nand/raw/fsmc_nand.c | 2 +- + drivers/mtd/nand/raw/gpmi-nand/gpmi-nand.c | 2 +- + drivers/mtd/nand/raw/intel-nand-controller.c | 6 +- + drivers/mtd/nand/raw/loongson-nand-controller.c | 4 +- + drivers/mtd/nand/raw/lpc32xx_mlc.c | 10 +-- + drivers/mtd/nand/raw/lpc32xx_slc.c | 10 +-- + drivers/mtd/nand/raw/marvell_nand.c | 7 +- + drivers/mtd/nand/raw/mtk_nand.c | 2 +- + drivers/mtd/nand/raw/nand_base.c | 2 +- + drivers/mtd/nand/raw/nand_legacy.c | 4 +- + drivers/mtd/nand/raw/omap2.c | 10 +-- + drivers/mtd/nand/raw/sh_flctl.c | 8 +- + drivers/mtd/parsers/qcomsmempart.c | 4 +- + drivers/mtd/spi-nor/otp.c | 2 +- + include/linux/mtd/bbm.h | 2 +- + include/linux/mtd/rawnand.h | 2 +- + include/linux/mtd/sh_flctl.h | 4 +- + 35 files changed, 217 insertions(+), 71 deletions(-) + create mode 100644 drivers/mtd/maps/int0800.c +Merging nand/nand/next (30daaf3e7897b mtd: spinand: heyangtek: Reserve both bad block marker bytes) +$ git merge -m Merge branch 'nand/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Auto-merging drivers/mtd/nand/raw/fsmc_nand.c +Auto-merging drivers/mtd/nand/raw/intel-nand-controller.c +Auto-merging drivers/mtd/nand/raw/lpc32xx_mlc.c +Auto-merging drivers/mtd/nand/raw/lpc32xx_slc.c +Auto-merging drivers/mtd/nand/raw/omap2.c +Auto-merging drivers/mtd/nand/spi/core.c +Merge made by the 'ort' strategy. + .../bindings/mtd/arasan,nand-controller.yaml | 3 + + Documentation/devicetree/bindings/mtd/ibm,ndfc.txt | 39 ----- + .../devicetree/bindings/mtd/ibm,ndfc.yaml | 128 ++++++++++++++ + drivers/mtd/nand/onenand/onenand_omap2.c | 4 +- + drivers/mtd/nand/qpic_common.c | 131 ++++++++++++++ + drivers/mtd/nand/raw/atmel/nand-controller.c | 6 +- + drivers/mtd/nand/raw/brcmnand/brcmnand.c | 2 + + drivers/mtd/nand/raw/fsl_ifc_nand.c | 49 ++---- + drivers/mtd/nand/raw/fsmc_nand.c | 2 +- + drivers/mtd/nand/raw/intel-nand-controller.c | 2 +- + drivers/mtd/nand/raw/internals.h | 1 + + drivers/mtd/nand/raw/lpc32xx_mlc.c | 21 +-- + drivers/mtd/nand/raw/lpc32xx_slc.c | 21 +-- + drivers/mtd/nand/raw/nand_esmt.c | 34 ++++ + drivers/mtd/nand/raw/nand_ids.c | 2 +- + drivers/mtd/nand/raw/ndfc.c | 28 ++- + .../mtd/nand/raw/nuvoton-ma35d1-nand-controller.c | 1 - + drivers/mtd/nand/raw/omap2.c | 4 +- + drivers/mtd/nand/raw/pl35x-nand-controller.c | 1 + + drivers/mtd/nand/raw/qcom_nandc.c | 194 ++++----------------- + drivers/mtd/nand/raw/stm32_fmc2_nand.c | 8 +- + drivers/mtd/nand/raw/sunxi_nand.c | 37 ++-- + drivers/mtd/nand/spi/Makefile | 2 +- + drivers/mtd/nand/spi/core.c | 1 + + drivers/mtd/nand/spi/heyangtek.c | 10 +- + drivers/mtd/nand/spi/issi.c | 187 ++++++++++++++++++++ + drivers/mtd/nand/spi/winbond.c | 87 ++++++++- + include/linux/mtd/lpc32xx_mlc.h | 17 -- + include/linux/mtd/lpc32xx_slc.h | 17 -- + include/linux/mtd/nand-qpic-common.h | 18 +- + include/linux/mtd/spinand.h | 3 +- + 31 files changed, 691 insertions(+), 369 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mtd/ibm,ndfc.txt + create mode 100644 Documentation/devicetree/bindings/mtd/ibm,ndfc.yaml + create mode 100644 drivers/mtd/nand/spi/issi.c + delete mode 100644 include/linux/mtd/lpc32xx_mlc.h + delete mode 100644 include/linux/mtd/lpc32xx_slc.h +Merging spi-nor/spi-nor/next (68d7115d77a87 mtd: spi-nor: sfdp: get the 1-1-8 and 1-8-8 page programs from 4BAIT) +$ git merge -m Merge branch 'spi-nor/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Auto-merging drivers/mtd/spi-nor/core.c +Auto-merging drivers/mtd/spi-nor/otp.c +Merge made by the 'ort' strategy. + Documentation/driver-api/mtd/spi-nor.rst | 2 +- + drivers/mtd/spi-nor/atmel.c | 75 ++- + drivers/mtd/spi-nor/core.c | 1035 ++++++++++++------------------ + drivers/mtd/spi-nor/core.h | 144 +++-- + drivers/mtd/spi-nor/debugfs.c | 31 +- + drivers/mtd/spi-nor/everspin.c | 7 +- + drivers/mtd/spi-nor/gigadevice.c | 15 +- + drivers/mtd/spi-nor/issi.c | 29 +- + drivers/mtd/spi-nor/macronix.c | 73 ++- + drivers/mtd/spi-nor/micron-st.c | 70 +- + drivers/mtd/spi-nor/otp.c | 16 +- + drivers/mtd/spi-nor/sfdp.c | 255 ++++++-- + drivers/mtd/spi-nor/sfdp.h | 23 +- + drivers/mtd/spi-nor/spansion.c | 109 ++-- + drivers/mtd/spi-nor/sst.c | 16 +- + drivers/mtd/spi-nor/swp.c | 133 ++-- + drivers/mtd/spi-nor/sysfs.c | 4 +- + drivers/mtd/spi-nor/winbond.c | 320 +++++++-- + drivers/mtd/spi-nor/xmc.c | 1 + + include/linux/mtd/spi-nor.h | 10 +- + 20 files changed, 1310 insertions(+), 1058 deletions(-) +Merging crypto/master (666d66df25253 crypto: talitos - init tasklets before requesting IRQs) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/crypto/aes-neonbs-glue.c +Auto-merging drivers/char/hw_random/imx-rngc.c +Auto-merging drivers/crypto/hisilicon/sec2/sec_main.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/tests/Makefile +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-qat_kpt | 3 +- + .../bindings/crypto/hisilicon,hip06-sec.yaml | 134 -- + .../devicetree/bindings/trivial-devices.yaml | 2 + + MAINTAINERS | 12 +- + arch/arm/crypto/aes-neonbs-glue.c | 2 +- + arch/arm64/boot/dts/hisilicon/hip07.dtsi | 280 ----- + arch/arm64/crypto/aes-neonbs-glue.c | 2 +- + arch/powerpc/crypto/vmx.c | 14 +- + crypto/algapi.c | 23 +- + crypto/algif_hash.c | 2 +- + crypto/algif_skcipher.c | 8 +- + crypto/asymmetric_keys/Kconfig | 12 + + crypto/asymmetric_keys/Makefile | 2 + + crypto/asymmetric_keys/pkcs7_parser.c | 6 + + crypto/asymmetric_keys/restrict.c | 8 +- + crypto/asymmetric_keys/verify_pefile.c | 5 + + crypto/asymmetric_keys/verify_pefile_test.c | 100 ++ + crypto/asymmetric_keys/x509_public_key.c | 6 +- + crypto/cast5_generic.c | 4 +- + crypto/cast6_generic.c | 3 +- + crypto/ecc.c | 33 +- + crypto/lskcipher.c | 6 +- + crypto/rsassa-pkcs1.c | 4 +- + crypto/tcrypt.c | 182 +-- + crypto/testmgr.c | 11 +- + crypto/testmgr.h | 327 ++++- + crypto/zstd.c | 40 +- + drivers/char/hw_random/amd-rng.c | 25 +- + drivers/char/hw_random/atmel-rng.c | 11 +- + drivers/char/hw_random/ba431-rng.c | 2 +- + drivers/char/hw_random/cctrng.c | 19 +- + drivers/char/hw_random/core.c | 1 + + drivers/char/hw_random/imx-rngc.c | 8 +- + drivers/char/hw_random/intel-rng.c | 15 +- + drivers/char/hw_random/jh7110-trng.c | 39 +- + drivers/char/hw_random/omap-rng.c | 8 +- + drivers/char/hw_random/omap3-rom-rng.c | 7 +- + drivers/char/hw_random/stm32-rng.c | 22 +- + drivers/char/hw_random/virtio-rng.c | 6 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 3 +- + drivers/crypto/amcc/crypto4xx_core.c | 35 +- + drivers/crypto/amcc/crypto4xx_trng.c | 15 +- + drivers/crypto/amcc/crypto4xx_trng.h | 6 +- + drivers/crypto/amlogic/amlogic-gxl-cipher.c | 25 +- + drivers/crypto/amlogic/amlogic-gxl-core.c | 48 +- + drivers/crypto/aspeed/aspeed-hace-crypto.c | 3 +- + drivers/crypto/atmel-aes.c | 4 +- + drivers/crypto/atmel-ecc.c | 12 +- + drivers/crypto/atmel-sha.c | 21 +- + drivers/crypto/atmel-tdes.c | 74 +- + drivers/crypto/caam/caamalg_qi.c | 2 + + drivers/crypto/caam/caamalg_qi2.c | 19 +- + drivers/crypto/caam/caampkc.c | 6 + + drivers/crypto/cavium/cpt/cptpf_main.c | 12 +- + drivers/crypto/cavium/cpt/cptvf_main.c | 4 +- + drivers/crypto/cavium/cpt/cptvf_mbox.c | 4 +- + drivers/crypto/cavium/nitrox/nitrox_main.c | 2 +- + drivers/crypto/ccp/ccp-dev-v3.c | 4 + + drivers/crypto/ccp/ccp-dev-v5.c | 4 + + drivers/crypto/ccp/ccp-dev.c | 2 +- + drivers/crypto/ccp/dbc.c | 4 +- + drivers/crypto/ccp/sfs.c | 9 +- + drivers/crypto/ccp/sp-platform.c | 4 +- + drivers/crypto/ccree/cc_aead.c | 4 +- + drivers/crypto/ccree/cc_buffer_mgr.c | 4 +- + drivers/crypto/ccree/cc_pm.c | 8 +- + drivers/crypto/chelsio/chcr_algo.c | 2 +- + drivers/crypto/gemini/sl3516-ce-cipher.c | 3 +- + drivers/crypto/gemini/sl3516-ce-rng.c | 6 +- + drivers/crypto/hisilicon/Kconfig | 14 - + drivers/crypto/hisilicon/Makefile | 1 - + drivers/crypto/hisilicon/hpre/hpre.h | 1 - + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 28 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 49 +- + drivers/crypto/hisilicon/qm.c | 2 +- + drivers/crypto/hisilicon/sec/Makefile | 3 - + drivers/crypto/hisilicon/sec/sec_algs.c | 1122 ----------------- + drivers/crypto/hisilicon/sec/sec_drv.c | 1307 -------------------- + drivers/crypto/hisilicon/sec/sec_drv.h | 428 ------- + drivers/crypto/hisilicon/sec2/sec_main.c | 2 +- + drivers/crypto/hisilicon/zip/dae_main.c | 23 +- + drivers/crypto/hisilicon/zip/zip_main.c | 2 +- + drivers/crypto/inside-secure/eip93/eip93-aead.c | 3 +- + drivers/crypto/inside-secure/eip93/eip93-regs.h | 2 +- + drivers/crypto/inside-secure/safexcel_cipher.c | 16 +- + drivers/crypto/inside-secure/safexcel_hash.c | 6 +- + drivers/crypto/intel/ixp4xx/ixp4xx_crypto.c | 3 +- + .../crypto/intel/qat/qat_420xx/adf_420xx_hw_data.c | 1 - + .../crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c | 1 - + .../crypto/intel/qat/qat_6xxx/adf_6xxx_hw_data.c | 6 - + .../crypto/intel/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 1 - + .../intel/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 6 - + .../crypto/intel/qat/qat_c62x/adf_c62x_hw_data.c | 1 - + .../intel/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 6 - + .../intel/qat/qat_common/adf_accel_devices.h | 1 - + drivers/crypto/intel/qat/qat_common/adf_cfg.c | 84 +- + .../crypto/intel/qat/qat_common/adf_gen2_hw_data.c | 9 - + .../crypto/intel/qat/qat_common/adf_gen2_hw_data.h | 1 - + .../crypto/intel/qat/qat_common/adf_gen4_hw_data.c | 6 - + .../crypto/intel/qat/qat_common/adf_gen4_hw_data.h | 1 - + .../crypto/intel/qat/qat_common/adf_gen4_vf_mig.c | 5 + + drivers/crypto/intel/qat/qat_common/adf_gen6_ras.c | 20 +- + drivers/crypto/intel/qat/qat_common/adf_gen6_ras.h | 24 +- + drivers/crypto/intel/qat/qat_common/adf_init.c | 24 +- + drivers/crypto/intel/qat/qat_common/adf_isr.c | 15 +- + .../crypto/intel/qat/qat_common/adf_sysfs_kpt.c | 24 +- + drivers/crypto/intel/qat/qat_common/qat_algs.c | 18 +- + .../crypto/intel/qat/qat_common/qat_asym_algs.c | 38 +- + .../intel/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 1 - + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 6 - + drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | 10 +- + drivers/crypto/marvell/octeontx/otx_cptvf_mbox.c | 4 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 10 +- + drivers/crypto/mxs-dcp.c | 3 + + drivers/crypto/nx/nx-842.c | 2 + + drivers/crypto/omap-des.c | 2 + + drivers/crypto/omap-sham.c | 5 +- + drivers/crypto/padlock-aes.c | 22 +- + drivers/crypto/qce/aead.c | 11 +- + drivers/crypto/qce/sha.c | 9 +- + drivers/crypto/qce/skcipher.c | 9 +- + drivers/crypto/rockchip/rk3288_crypto.c | 4 +- + drivers/crypto/s5p-sss.c | 7 +- + drivers/crypto/sa2ul.c | 130 +- + drivers/crypto/sa2ul.h | 3 - + drivers/crypto/starfive/jh7110-cryp.c | 20 +- + drivers/crypto/talitos.c | 75 +- + drivers/crypto/xilinx/zynqmp-aes-gcm.c | 14 +- + drivers/crypto/xilinx/zynqmp-sha.c | 2 +- + include/crypto/aes.h | 13 + + include/linux/ccp.h | 58 +- + include/linux/hisi_acc_qm.h | 6 +- + include/linux/psp-sev.h | 86 +- + include/linux/rhashtable-types.h | 74 +- + include/linux/rhashtable.h | 39 +- + include/uapi/linux/psp-sev.h | 26 +- + kernel/padata.c | 2 +- + lib/842/842_decompress.c | 7 +- + lib/Kconfig.debug | 15 + + lib/rhashtable.c | 75 +- + lib/tests/842_decompress_kunit.c | 144 +++ + lib/tests/Makefile | 1 + + 142 files changed, 1719 insertions(+), 4223 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/crypto/hisilicon,hip06-sec.yaml + create mode 100644 crypto/asymmetric_keys/verify_pefile_test.c + delete mode 100644 drivers/crypto/hisilicon/sec/Makefile + delete mode 100644 drivers/crypto/hisilicon/sec/sec_algs.c + delete mode 100644 drivers/crypto/hisilicon/sec/sec_drv.c + delete mode 100644 drivers/crypto/hisilicon/sec/sec_drv.h + create mode 100644 lib/tests/842_decompress_kunit.c +Merging libcrypto/libcrypto-next (40f47fa10a1d1 lib/crypto: x86/sha512: Follow the normal %rbp convention) +$ git merge -m Merge branch 'libcrypto-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git libcrypto/libcrypto-next +Auto-merging MAINTAINERS +Auto-merging include/crypto/aes.h +Auto-merging lib/Kconfig.debug +Auto-merging lib/tests/Makefile +Merge made by the 'ort' strategy. + Documentation/crypto/libcrypto-hash.rst | 5 + + Documentation/crypto/libcrypto-zeroization.rst | 150 +++ + Documentation/crypto/libcrypto.rst | 14 + + MAINTAINERS | 9 +- + arch/riscv/crypto/Kconfig | 15 - + arch/riscv/crypto/Makefile | 4 - + arch/riscv/crypto/aes-riscv64-glue.c | 566 --------- + arch/riscv/crypto/aes-riscv64-zvkned.S | 312 ----- + arch/sparc/include/asm/opcodes.h | 6 + + arch/x86/crypto/Kconfig | 18 +- + arch/x86/crypto/Makefile | 10 +- + arch/x86/crypto/aesni-intel_asm.S | 1338 -------------------- + arch/x86/crypto/aesni-intel_glue.c | 792 +----------- + arch/x86/purgatory/Makefile | 3 +- + crypto/aes.c | 31 +- + fs/smb/client/smb2transport.c | 3 +- + include/crypto/aes-ccm.h | 22 +- + include/crypto/aes-gcm.h | 22 +- + include/crypto/aes-xts.h | 13 +- + include/crypto/aes.h | 18 + + include/crypto/blake2b.h | 9 + + include/crypto/blake2s.h | 9 + + include/crypto/md5.h | 19 + + include/crypto/sha1.h | 19 + + include/crypto/sha2.h | 73 ++ + include/crypto/sm3.h | 10 + + lib/Kconfig.debug | 11 - + lib/Makefile | 2 +- + lib/crypto/.kunitconfig | 1 + + lib/crypto/Makefile | 20 + + lib/crypto/aes.c | 34 +- + lib/crypto/blake2b.c | 2 +- + lib/crypto/blake2s.c | 2 +- + lib/crypto/chacha20poly1305.c | 11 +- + lib/crypto/md5.c | 2 +- + .../riscv/crypto => lib/crypto/riscv}/aes-macros.S | 25 +- + .../crypto/riscv}/aes-riscv64-zvkned-zvbb-zvkg.S | 99 +- + .../crypto/riscv}/aes-riscv64-zvkned-zvkb.S | 23 +- + lib/crypto/riscv/aes-riscv64-zvkned.S | 305 ++++- + lib/crypto/riscv/aes.h | 244 +++- + lib/crypto/sha1.c | 2 +- + lib/{ => crypto}/siphash.c | 0 + lib/crypto/sm3.c | 2 +- + lib/crypto/sparc/aes.h | 75 ++ + lib/crypto/sparc/aes_asm.S | 165 +++ + lib/crypto/tests/Kconfig | 9 + + lib/crypto/tests/Makefile | 1 + + lib/{ => crypto}/tests/siphash_kunit.c | 0 + lib/crypto/x86/aes-aesni.S | 831 ++++++++++-- + .../crypto => lib/crypto/x86}/aes-ctr-avx-x86_64.S | 117 +- + .../crypto => lib/crypto/x86}/aes-xts-avx-x86_64.S | 179 +-- + lib/crypto/x86/aes.h | 381 +++++- + lib/crypto/x86/sha1-avx2-asm.S | 10 +- + lib/crypto/x86/sha1-ssse3-and-avx.S | 9 +- + lib/crypto/x86/sha256-avx-asm.S | 10 +- + lib/crypto/x86/sha256-avx2-asm.S | 10 +- + lib/crypto/x86/sha256-ni-asm.S | 9 +- + lib/crypto/x86/sha256-ssse3-asm.S | 8 +- + lib/crypto/x86/sha512-avx-asm.S | 11 +- + lib/crypto/x86/sha512-avx2-asm.S | 11 +- + lib/crypto/x86/sha512-ssse3-asm.S | 11 +- + lib/tests/Makefile | 1 - + security/keys/trusted-keys/trusted_tpm1.c | 2 +- + tools/testing/selftests/bpf/progs/test_siphash.h | 2 +- + 64 files changed, 2559 insertions(+), 3568 deletions(-) + create mode 100644 Documentation/crypto/libcrypto-zeroization.rst + delete mode 100644 arch/riscv/crypto/aes-riscv64-glue.c + delete mode 100644 arch/riscv/crypto/aes-riscv64-zvkned.S + delete mode 100644 arch/x86/crypto/aesni-intel_asm.S + rename {arch/riscv/crypto => lib/crypto/riscv}/aes-macros.S (90%) + rename {arch/riscv/crypto => lib/crypto/riscv}/aes-riscv64-zvkned-zvbb-zvkg.S (74%) + rename {arch/riscv/crypto => lib/crypto/riscv}/aes-riscv64-zvkned-zvkb.S (93%) + rename lib/{ => crypto}/siphash.c (100%) + rename lib/{ => crypto}/tests/siphash_kunit.c (100%) + rename {arch/x86/crypto => lib/crypto/x86}/aes-ctr-avx-x86_64.S (88%) + rename {arch/x86/crypto => lib/crypto/x86}/aes-xts-avx-x86_64.S (81%) +Merging drm/drm-next (a56b45995b1e6 Merge tag 'drm-rust-next-2026-10-11' of https://gitlab.freedesktop.org/drm/rust/kernel into drm-next) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git drm/drm-next +Auto-merging Documentation/devicetree/bindings/display/fsl,lcdif.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/firmware/qcom/Kconfig +CONFLICT (content): Merge conflict in drivers/firmware/qcom/Kconfig +Auto-merging drivers/firmware/qcom/qcom_scm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mes_userqueue.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_connector.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/tests/amdgpu_dm_connector_test.c +Auto-merging drivers/gpu/drm/aspeed/aspeed_gfx_drv.c +Auto-merging drivers/gpu/drm/clients/drm_fbdev_helper.c +Auto-merging drivers/gpu/drm/drm_bridge.c +Auto-merging drivers/gpu/drm/drm_gpusvm.c +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_abi16.c +Auto-merging drivers/gpu/drm/panthor/panthor_sched.c +Auto-merging drivers/gpu/drm/sti/sti_cursor.c +Auto-merging drivers/gpu/drm/sti/sti_hqvdp.c +Auto-merging drivers/gpu/drm/vc4/vc4_drv.c +Auto-merging drivers/gpu/drm/vc4/vc4_drv.h +Auto-merging drivers/gpu/drm/vc4/vc4_gem.c +Auto-merging drivers/gpu/drm/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/vc4/vc4_irq.c +Auto-merging drivers/gpu/drm/vc4/vc4_v3d.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/vc4/vc4_v3d.c +Auto-merging drivers/gpu/drm/virtio/virtgpu_plane.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_kms.c +Auto-merging drivers/gpu/drm/xe/display/xe_fb_pin.c +Auto-merging drivers/gpu/drm/xe/xe_bo.c +Auto-merging drivers/gpu/drm/xe/xe_bo.h +Auto-merging drivers/gpu/drm/xe/xe_configfs.c +Auto-merging drivers/gpu/drm/xe/xe_lrc.c +Auto-merging drivers/gpu/drm/xe/xe_sysctrl_mailbox.c +Auto-merging drivers/soc/qcom/llcc-qcom.c +Auto-merging drivers/soc/qcom/qcom-geni-se.c +CONFLICT (content): Merge conflict in drivers/soc/qcom/qcom-geni-se.c +Auto-merging drivers/soc/qcom/rpmh-rsc.c +Auto-merging drivers/soc/qcom/smp2p.c +Auto-merging drivers/soc/qcom/socinfo.c +Auto-merging drivers/soc/qcom/ubwc_config.c +Auto-merging rust/bindings/bindings_helper.h +Auto-merging rust/helpers/helpers.c +Auto-merging rust/kernel/bitfield.rs +Auto-merging rust/kernel/lib.rs +Auto-merging rust/kernel/mem.rs +CONFLICT (add/add): Merge conflict in rust/kernel/mem.rs +Auto-merging rust/macros/lib.rs +Resolved 'drivers/firmware/qcom/Kconfig' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c' using previous resolution. +Resolved 'drivers/gpu/drm/vc4/vc4_v3d.c' using previous resolution. +Resolved 'drivers/soc/qcom/qcom-geni-se.c' using previous resolution. +Resolved 'rust/kernel/mem.rs' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7713bd1782875] Merge branch 'drm-next' of https://gitlab.freedesktop.org/drm/kernel.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-driver-intel-xe-gpu | 10 + + .../display/allwinner,sun6i-a31-mipi-dsi.yaml | 10 +- + .../bindings/display/brcm,bcm2835-v3d.yaml | 3 + + .../bindings/display/bridge/analogix,dp.yaml | 19 +- + .../display/bridge/fsl,imx8qxp-pxl2dpi.yaml | 4 +- + .../bindings/display/bridge/lontium,lt8912b.yaml | 8 +- + .../bridge/megachips,stdp2690-ge-b850v3-fw.yaml | 2 +- + .../bindings/display/bridge/nxp,tda998x.yaml | 2 +- + .../display/bridge/renesas,r8a779g0-dsc.yaml | 96 + + .../bindings/display/bridge/toshiba,tc358764.yaml | 2 +- + .../bindings/display/bridge/toshiba,tc358775.yaml | 12 +- + .../bindings/display/faraday,tve200.yaml | 2 +- + .../devicetree/bindings/display/fsl,lcdif.yaml | 12 +- + .../devicetree/bindings/display/himax,hx8357.yaml | 2 +- + .../bindings/display/imx/fsl,imx-lcdc.yaml | 2 +- + .../bindings/display/imx/fsl,imx6q-ldb.yaml | 54 +- + .../bindings/display/mediatek/mediatek,ethdr.yaml | 90 +- + .../bindings/display/mediatek/mediatek,hdmi.yaml | 24 +- + .../devicetree/bindings/display/msm/gmu.yaml | 8 +- + .../devicetree/bindings/display/msm/gpu.yaml | 3 + + .../devicetree/bindings/display/msm/hdmi.yaml | 4 +- + .../devicetree/bindings/display/msm/qcom,mdp5.yaml | 1 + + .../bindings/display/panel/ilitek,il79900a.yaml | 13 +- + .../bindings/display/panel/ilitek,ili7836a.yaml | 58 + + .../bindings/display/panel/novatek,nt36532.yaml | 83 + + .../panel/panel-simple-lvds-dual-ports.yaml | 2 + + .../bindings/display/panel/panel-simple.yaml | 2 + + .../bindings/display/panel/samsung,ams495qa01.yaml | 2 +- + .../panel/samsung,s6e8aa5x01-ams561ra01.yaml | 2 +- + .../display/rockchip/rockchip,analogix-dp.yaml | 1 + + .../bindings/display/sitronix,st7567.yaml | 4 +- + .../bindings/display/solomon,ssd1351.yaml | 42 + + .../devicetree/bindings/display/st,stm32-dsi.yaml | 46 +- + .../devicetree/bindings/display/st,stm32-ltdc.yaml | 6 +- + .../bindings/display/st,stm32mp25-lvds.yaml | 4 +- + .../display/tegra/nvidia,tegra20-host1x.yaml | 52 +- + Documentation/gpu/amdgpu/index.rst | 1 + + Documentation/gpu/amdgpu/ualink.rst | 75 + + Documentation/gpu/drm-kms-helpers.rst | 19 +- + Documentation/gpu/drm-kms.rst | 3 + + Documentation/gpu/drm-ras.rst | 39 + + Documentation/gpu/drm-uapi.rst | 93 +- + Documentation/gpu/nova/core/fsp.rst | 2 + + Documentation/gpu/nova/core/interrupts.rst | 603 + + Documentation/gpu/nova/core/pramin.rst | 128 + + Documentation/gpu/nova/core/todo.rst | 2 +- + Documentation/gpu/nova/index.rst | 2 + + Documentation/gpu/todo.rst | 48 +- + Documentation/gpu/xe/index.rst | 1 + + Documentation/gpu/xe/xe_migrate.rst | 3 + + Documentation/gpu/xe/xe_sigid.rst | 14 + + Documentation/netlink/specs/drm_ras.yaml | 80 + + MAINTAINERS | 62 +- + arch/arm/boot/dts/broadcom/bcm2835-common.dtsi | 1 + + drivers/accel/amdxdna/aie2_ctx.c | 126 +- + drivers/accel/amdxdna/aie2_message.c | 1 + + drivers/accel/amdxdna/aie2_msg_priv.h | 1 + + drivers/accel/amdxdna/aie2_pci.c | 15 +- + drivers/accel/amdxdna/aie2_pci.h | 6 +- + drivers/accel/amdxdna/amdxdna_gem.c | 460 +- + drivers/accel/amdxdna/amdxdna_gem.h | 6 +- + drivers/accel/amdxdna/amdxdna_mailbox.c | 2 +- + drivers/accel/amdxdna/npu4_regs.c | 1 + + drivers/accel/ethosu/ethosu_drv.c | 2 +- + drivers/accel/ethosu/ethosu_job.c | 4 +- + drivers/accel/ivpu/ivpu_drv.c | 13 + + drivers/accel/ivpu/ivpu_drv.h | 5 +- + drivers/accel/ivpu/ivpu_fw.c | 65 +- + drivers/accel/ivpu/ivpu_gem.c | 5 +- + drivers/accel/ivpu/ivpu_hw.c | 22 + + drivers/accel/ivpu/ivpu_hw_ip.c | 6 +- + drivers/accel/ivpu/ivpu_ipc.c | 11 +- + drivers/accel/ivpu/ivpu_job.c | 98 +- + drivers/accel/ivpu/ivpu_job.h | 5 +- + drivers/accel/ivpu/ivpu_mmu.c | 12 +- + drivers/accel/ivpu/ivpu_ms.c | 17 +- + drivers/accel/qaic/qaic_data.c | 8 +- + drivers/accel/qaic/qaic_debugfs.c | 1 + + drivers/accel/qaic/qaic_drv.c | 1 + + drivers/accel/qaic/qaic_ras.c | 1 + + drivers/accel/qaic/qaic_ssr.c | 1 + + drivers/accel/qaic/qaic_timesync.c | 1 + + drivers/accel/qaic/sahara.c | 1 + + drivers/accel/rocket/rocket_gem.c | 2 +- + drivers/dma-buf/dma-buf.c | 2 +- + drivers/dma-buf/dma-resv.c | 2 +- + drivers/firmware/efi/sysfb_efi.c | 9 - + drivers/gpu/buddy.c | 1342 +- + drivers/gpu/drm/Kconfig | 16 +- + drivers/gpu/drm/Kconfig.debug | 1 + + drivers/gpu/drm/Makefile | 8 +- + drivers/gpu/drm/adp/adp-mipi.c | 1 + + drivers/gpu/drm/adp/adp_drv.c | 2 +- + drivers/gpu/drm/amd/amdgpu/Makefile | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acp.c | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 136 + + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 8 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_aldebaran.c | 3 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gc_9_4_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.c | 151 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10.h | 6 +- + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v10_3.c | 1 + + .../gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v12_1.c | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_atomfirmware.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 55 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dev_coredump.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 144 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 409 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 14 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 25 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 89 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.h | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 135 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 157 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 25 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 263 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ib.c | 124 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 73 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_imu.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ioc32.c | 45 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ip.c | 68 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ip.h | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 70 + + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.h | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_isp.c | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_job.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_jpeg.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 25 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_lsdma.c | 20 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_lsdma.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 861 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 70 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mmhub.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 643 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 88 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 113 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 50 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.h | 36 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 169 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 165 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma_types.h | 163 + + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace_points.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 72 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c | 6592 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.h | 427 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 38 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 46 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq.c | 48 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_userq_fence.c | 77 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 90 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 127 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 131 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_cpu.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_internal.h | 167 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 71 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_sdma.c | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_tlb_fence.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 66 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgv_sriovmsg.h | 49 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 42 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 29 +- + drivers/gpu/drm/amd/amdgpu/cik.c | 7 - + drivers/gpu/drm/amd/amdgpu/cik_ih.c | 43 - + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 68 +- + drivers/gpu/drm/amd/amdgpu/cz_ih.c | 43 - + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 - + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 - + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 - + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 50 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 113 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_0.c | 117 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1.c | 830 +- + drivers/gpu/drm/amd/amdgpu/gfx_v12_1_pkt.h | 39 - + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 26 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 39 +- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 153 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 150 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 112 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.h | 1 + + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 45 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v12_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v12_1.c | 65 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 3 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 9 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_0.c | 119 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_1.c | 293 +- + drivers/gpu/drm/amd/amdgpu/gmc_v12_1.h | 2 + + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 92 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 90 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 19 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 21 +- + drivers/gpu/drm/amd/amdgpu/hdp_v8_0.c | 132 + + drivers/gpu/drm/amd/amdgpu/hdp_v8_0.h | 31 + + drivers/gpu/drm/amd/amdgpu/iceland_ih.c | 43 - + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 46 +- + drivers/gpu/drm/amd/amdgpu/ih_v6_1.c | 23 +- + drivers/gpu/drm/amd/amdgpu/ih_v7_0.c | 50 +- + drivers/gpu/drm/amd/amdgpu/ih_v8_0.c | 781 + + drivers/gpu/drm/amd/amdgpu/ih_v8_0.h | 28 + + drivers/gpu/drm/amd/amdgpu/imu_v12_1.c | 91 +- + drivers/gpu/drm/amd/amdgpu/isp_v4_1_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 2 - + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_1.h | 8 - + drivers/gpu/drm/amd/amdgpu/jpeg_v5_0_2.c | 265 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v5_3_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/lsdma_v7_1.c | 27 +- + drivers/gpu/drm/amd/amdgpu/lsdma_v8_0.c | 138 + + drivers/gpu/drm/amd/amdgpu/lsdma_v8_0.h | 31 + + drivers/gpu/drm/amd/amdgpu/mes_userqueue.c | 86 +- + drivers/gpu/drm/amd/amdgpu/mes_userqueue.h | 4 + + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 237 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_0.c | 217 +- + drivers/gpu/drm/amd/amdgpu/mes_v12_1.c | 286 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v4_2_0.c | 377 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v5_0.c | 603 + + drivers/gpu/drm/amd/amdgpu/mmhub_v5_0.h | 28 + + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 18 +- + drivers/gpu/drm/amd/amdgpu/nbif_v6_3_1.c | 155 +- + drivers/gpu/drm/amd/amdgpu/nbif_v7_10.c | 350 + + drivers/gpu/drm/amd/amdgpu/nbif_v7_10.h | 32 + + drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v6_3_2.c | 18 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_11_5.c | 351 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_11_5.h | 32 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 1 + + drivers/gpu/drm/amd/amdgpu/nv.c | 6 - + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 167 + + drivers/gpu/drm/amd/amdgpu/psp_v15_0_3.c | 836 + + drivers/gpu/drm/amd/amdgpu/psp_v15_0_3.h | 32 + + drivers/gpu/drm/amd/amdgpu/psp_v15_0_8.c | 146 + + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 105 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 113 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 126 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 252 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 143 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 135 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 145 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_0.c | 144 +- + drivers/gpu/drm/amd/amdgpu/sdma_v7_1.c | 117 +- + drivers/gpu/drm/amd/amdgpu/si.c | 6 - + drivers/gpu/drm/amd/amdgpu/si_dma.c | 38 +- + drivers/gpu/drm/amd/amdgpu/si_ih.c | 31 - + drivers/gpu/drm/amd/amdgpu/smuio_v15_0_3.c | 84 + + drivers/gpu/drm/amd/amdgpu/smuio_v15_0_3.h | 30 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 6 - + drivers/gpu/drm/amd/amdgpu/soc15_common.h | 6 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 6 - + drivers/gpu/drm/amd/amdgpu/soc24.c | 6 - + drivers/gpu/drm/amd/amdgpu/soc_v1_0.c | 476 +- + drivers/gpu/drm/amd/amdgpu/soc_v1_0.h | 27 + + drivers/gpu/drm/amd/amdgpu/ta_ras_if.h | 1 + + drivers/gpu/drm/amd/amdgpu/tonga_ih.c | 44 - + drivers/gpu/drm/amd/amdgpu/ualink_v1_0.c | 143 + + drivers/gpu/drm/amd/amdgpu/ualink_v1_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 8 - + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 8 - + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 8 - + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vce_v1_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vce_v2_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vce_v3_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 3 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 17 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_3.c | 22 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 24 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_1.c | 20 +- + drivers/gpu/drm/amd/amdgpu/vcn_v5_0_2.c | 351 +- + drivers/gpu/drm/amd/amdgpu/vega10_ih.c | 15 - + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 15 - + drivers/gpu/drm/amd/amdgpu/vi.c | 6 - + drivers/gpu/drm/amd/amdgpu/vpe_v3_0.c | 351 + + drivers/gpu/drm/amd/amdgpu/vpe_v3_0.h | 29 + + drivers/gpu/drm/amd/amdkfd/cwsr_trap_handler.h | 90 +- + .../gpu/drm/amd/amdkfd/cwsr_trap_handler_gfx12.asm | 122 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 21 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 187 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.h | 4 + + drivers/gpu/drm/amd/amdkfd/kfd_flat_memory.c | 6 + + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 25 + + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 53 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager_v12_1.c | 31 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 - + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 46 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_queue.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 35 +- + drivers/gpu/drm/amd/display/Kconfig | 12 +- + drivers/gpu/drm/amd/display/Makefile | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 468 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 183 +- + .../amd/display/amdgpu_dm/amdgpu_dm_backlight.c | 35 +- + .../amd/display/amdgpu_dm/amdgpu_dm_backlight.h | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_color.c | 86 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.c | 137 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_colorop.h | 29 + + .../amd/display/amdgpu_dm/amdgpu_dm_connector.c | 415 +- + .../amd/display/amdgpu_dm/amdgpu_dm_connector.h | 11 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 87 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.h | 9 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_cursor.c | 63 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_cursor.h | 6 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 88 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.c | 47 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_dmub.h | 15 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_freesync.c | 63 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 32 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 30 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.h | 9 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_ism.c | 21 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_ism.h | 2 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 73 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.h | 25 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 109 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.h | 14 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_services.c | 35 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_trace.h | 99 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 72 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h | 16 + + .../drm/amd/display/amdgpu_dm/tests/.kunitconfig | 1 - + .../gpu/drm/amd/display/amdgpu_dm/tests/Makefile | 4 +- + .../amdgpu_dm/tests/amdgpu_dm_backlight_test.c | 53 +- + .../amdgpu_dm/tests/amdgpu_dm_colorop_test.c | 232 +- + .../amdgpu_dm/tests/amdgpu_dm_connector_test.c | 4670 +- + .../display/amdgpu_dm/tests/amdgpu_dm_crtc_test.c | 813 +- + .../amdgpu_dm/tests/amdgpu_dm_cursor_test.c | 736 + + .../display/amdgpu_dm/tests/amdgpu_dm_dmub_test.c | 578 +- + .../amdgpu_dm/tests/amdgpu_dm_freesync_test.c | 429 + + .../amdgpu_dm/tests/amdgpu_dm_helpers_test.c | 1129 +- + .../display/amdgpu_dm/tests/amdgpu_dm_irq_test.c | 2308 +- + .../display/amdgpu_dm/tests/amdgpu_dm_ism_test.c | 436 +- + .../amdgpu_dm/tests/amdgpu_dm_mst_types_test.c | 2791 +- + .../display/amdgpu_dm/tests/amdgpu_dm_plane_test.c | 2660 +- + .../amdgpu_dm/tests/amdgpu_dm_services_test.c | 228 +- + .../amd/display/amdgpu_dm/tests/amdgpu_dm_test.c | 4292 +- + .../display/amdgpu_dm/tests/amdgpu_dm_wb_test.c | 334 + + drivers/gpu/drm/amd/display/dc/Makefile | 8 +- + .../drm/amd/display/dc/bios/command_table_helper.c | 7 +- + .../amd/display/dc/bios/command_table_helper2.c | 2 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 8 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 4 + + .../amd/display/dc/clk_mgr/dce112/dce112_clk_mgr.c | 12 +- + .../amd/display/dc/clk_mgr/dcn10/dcn10_clk_mgr.c | 181 + + .../amd/display/dc/clk_mgr/dcn10/dcn10_clk_mgr.h | 29 + + .../drm/amd/display/dc/clk_mgr/dcn10/rv1_clk_mgr.c | 9 +- + .../drm/amd/display/dc/clk_mgr/dcn10/rv2_clk_mgr.c | 6 +- + .../amd/display/dc/clk_mgr/dcn20/dcn20_clk_mgr.c | 12 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 6 +- + .../drm/amd/display/dc/clk_mgr/dcn21/rn_clk_mgr.c | 5 +- + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 8 +- + .../drm/amd/display/dc/clk_mgr/dcn301/vg_clk_mgr.c | 8 +- + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 10 +- + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 10 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 14 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 10 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 18 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 12 +- + .../amd/display/dc/clk_mgr/dcn401/dcn401_clk_mgr.c | 19 +- + .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.c | 33 +- + .../amd/display/dc/clk_mgr/dcn42/dcn42_clk_mgr.h | 5 + + .../amd/display/dc/clk_mgr/dcn42b/dcn42b_clk_mgr.c | 54 +- + .../gpu/drm/amd/display/dc/clk_mgr/dcn60/dalsmc.h | 345 +- + .../amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.c | 478 +- + .../amd/display/dc/clk_mgr/dcn60/dcn60_clk_mgr.h | 17 +- + .../dc/clk_mgr/dcn60/dcn60_clk_mgr_smu_msg.c | 184 +- + .../dc/clk_mgr/dcn60/dcn60_clk_mgr_smu_msg.h | 167 +- + .../display/dc/clk_mgr/dcn60/dcn60_smu_driver_if.h | 78 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 422 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 + + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 1635 +- + .../gpu/drm/amd/display/dc/core/dc_link_exports.c | 30 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 245 +- + drivers/gpu/drm/amd/display/dc/core/dc_state.c | 6 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 180 +- + .../gpu/drm/amd/display/dc/core2/CMakeLists.txt | 10 + + drivers/gpu/drm/amd/display/dc/core2/dc_core2.c | 34 + + drivers/gpu/drm/amd/display/dc/core2/dc_core2.h | 19 + + .../gpu/drm/amd/display/dc/core2/dc_core2_init.c | 13 + + .../gpu/drm/amd/display/dc/core2/dc_core2_init.h | 10 + + drivers/gpu/drm/amd/display/dc/dc.h | 73 +- + .../amd/display/dc/dc_api_dispatch/CMakeLists.txt | 9 + + .../drm/amd/display/dc/dc_api_dispatch/api_shim.c | 32 + + .../drm/amd/display/dc/dc_api_dispatch/api_shim.h | 19 + + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 291 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 58 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_edid_parser.c | 80 - + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 30 +- + drivers/gpu/drm/amd/display/dc/dc_memory_pool.c | 281 + + drivers/gpu/drm/amd/display/dc/dc_memory_pool.h | 107 + + drivers/gpu/drm/amd/display/dc/dc_probe.h | 1 + + drivers/gpu/drm/amd/display/dc/dc_stream.h | 14 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 8 +- + .../gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.c | 1 + + .../gpu/drm/amd/display/dc/dccg/dcn20/dcn20_dccg.h | 4 + + .../drm/amd/display/dc/dccg/dcn201/dcn201_dccg.c | 1 + + .../gpu/drm/amd/display/dc/dccg/dcn21/dcn21_dccg.c | 1 + + .../gpu/drm/amd/display/dc/dccg/dcn30/dcn30_dccg.c | 2 + + .../drm/amd/display/dc/dccg/dcn301/dcn301_dccg.c | 1 + + .../gpu/drm/amd/display/dc/dccg/dcn31/dcn31_dccg.c | 1 + + .../drm/amd/display/dc/dccg/dcn314/dcn314_dccg.c | 1 + + .../gpu/drm/amd/display/dc/dccg/dcn32/dcn32_dccg.c | 1 + + .../gpu/drm/amd/display/dc/dccg/dcn35/dcn35_dccg.c | 2 + + .../drm/amd/display/dc/dccg/dcn401/dcn401_dccg.c | 1 + + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.c | 15 +- + .../gpu/drm/amd/display/dc/dccg/dcn42/dcn42_dccg.h | 2 +- + .../gpu/drm/amd/display/dc/dccg/dcn60/dcn60_dccg.c | 5 + + .../gpu/drm/amd/display/dc/dccg/dcn60/dcn60_dccg.h | 4 + + drivers/gpu/drm/amd/display/dc/dce/dce_abm.c | 2 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.c | 12 +- + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 11 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 121 - + drivers/gpu/drm/amd/display/dc/dce/dmub_abm.c | 1 + + .../gpu/drm/amd/display/dc/dce/dmub_hw_lock_mgr.c | 18 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 1 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.c | 28 +- + drivers/gpu/drm/amd/display/dc/dce/dmub_replay.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_vmid.c | 2 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 8 +- + .../drm/amd/display/dc/dcn301/dcn301_panel_cntl.c | 1 + + .../drm/amd/display/dc/dcn31/dcn31_panel_cntl.c | 1 + + .../gpu/drm/amd/display/dc/dio/dcn10/dcn10_dio.c | 1 + + .../amd/display/dc/dio/dcn10/dcn10_link_encoder.c | 12 +- + .../display/dc/dio/dcn10/dcn10_stream_encoder.c | 2 + + .../amd/display/dc/dio/dcn20/dcn20_link_encoder.c | 2 + + .../display/dc/dio/dcn20/dcn20_stream_encoder.c | 2 + + .../display/dc/dio/dcn30/dcn30_dio_link_encoder.c | 2 + + .../dc/dio/dcn30/dcn30_dio_stream_encoder.c | 2 + + .../dc/dio/dcn301/dcn301_dio_link_encoder.c | 2 + + .../display/dc/dio/dcn31/dcn31_dio_link_encoder.c | 2 + + .../dc/dio/dcn314/dcn314_dio_stream_encoder.c | 2 + + .../display/dc/dio/dcn32/dcn32_dio_link_encoder.c | 2 + + .../dc/dio/dcn32/dcn32_dio_stream_encoder.c | 2 + + .../dc/dio/dcn321/dcn321_dio_link_encoder.c | 2 + + .../display/dc/dio/dcn35/dcn35_dio_link_encoder.c | 2 + + .../dc/dio/dcn35/dcn35_dio_stream_encoder.c | 2 + + .../dc/dio/dcn401/dcn401_dio_link_encoder.c | 2 + + .../dc/dio/dcn401/dcn401_dio_stream_encoder.c | 1 + + .../display/dc/dio/dcn42/dcn42_dio_link_encoder.c | 6 +- + .../dc/dio/dcn42/dcn42_dio_stream_encoder.c | 2 + + .../display/dc/dio/dcn60/dcn60_dio_link_encoder.c | 2 + + .../dc/dio/dcn60/dcn60_dio_stream_encoder.c | 2 + + .../display/dc/dio/virtual/virtual_link_encoder.c | 3 + + .../dc/dio/virtual/virtual_stream_encoder.c | 1 + + .../gpu/drm/amd/display/dc/dml/dcn10/dcn10_fpu.c | 1 - + .../gpu/drm/amd/display/dc/dml/dcn30/dcn30_fpu.c | 18 +- + .../amd/display/dc/dml/dcn30/display_mode_vba_30.c | 2 +- + .../amd/display/dc/dml/dcn31/display_mode_vba_31.c | 2 +- + .../gpu/drm/amd/display/dc/dml/dcn314/dcn314_fpu.c | 4 +- + .../gpu/drm/amd/display/dc/dml/dml1_frl_cap_chk.c | 8 +- + .../gpu/drm/amd/display/dc/dml/dsc/rc_calc_fpu.c | 1 - + drivers/gpu/drm/amd/display/dc/dml2_0/Makefile | 17 +- + .../amd/display/dc/dml2_0/dml21/dml21_wrapper.h | 106 - + .../dml2_0/dml21/inc/bounding_boxes/dcn42_soc_bb.h | 39 +- + .../dml21/inc/bounding_boxes/dcn42b_soc_bb.h | 37 +- + .../dml2_0/dml21/inc/bounding_boxes/dcn4_soc_bb.h | 27 +- + .../dml2_0/dml21/inc/bounding_boxes/dcn6_soc_bb.h | 12 + + .../dc/dml2_0/dml21/inc/dml_top_dchub_registers.h | 1 + + .../dml2_0/dml21/inc/dml_top_display_cfg_types.h | 1 + + .../dml2_0/dml21/inc/dml_top_soc_parameter_types.h | 28 +- + .../display/dc/dml2_0/dml21/inc/dml_top_types.h | 15 + + .../dc/dml2_0/dml21/src/dml2_cga/dml2_cga_dcn6.c | 4 +- + .../dml2_0/dml21/src/dml2_cga/dml2_cga_factory.c | 1 + + .../dc/dml2_0/dml21/src/dml2_core/dml2_core_dcn4.c | 4 + + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.c | 222 +- + .../dml21/src/dml2_core/dml2_core_dcn4_calcs.h | 1 + + .../src/dml2_core/dml2_core_dcn5_calcs_dchub.c | 18 +- + .../src/dml2_core/dml2_core_dcn5_calcs_dchub.h | 23 + + .../dml2_core/dml2_core_dcn5_calcs_display_pipe.c | 2 +- + .../dml2_core/dml2_core_dcn5_funcs_initialize.c | 2 +- + .../dml2_core_dcn5_funcs_mode_programming.c | 4 + + .../dml2_core/dml2_core_dcn5_funcs_mode_support.c | 32 +- + .../dml21/src/dml2_core/dml2_core_dcn6_calcs.c | 63 +- + .../dml21/src/dml2_core/dml2_core_dcn6_calcs.h | 468 + + .../src/dml2_core/dml2_core_dcn6_calcs_dchub.c | 88 +- + .../dml2_core/dml2_core_dcn6_funcs_initialize.c | 4 + + .../dml2_core_dcn6_funcs_mode_programming.c | 52 +- + .../dml2_core_dcn6_funcs_mode_programming.h | 31 + + .../dml2_core/dml2_core_dcn6_funcs_mode_support.c | 350 +- + .../dml2_core/dml2_core_dcn6_funcs_mode_support.h | 324 + + .../dml2_0/dml21/src/dml2_core/dml2_core_factory.c | 1 + + .../dml21/src/dml2_core/dml2_core_shared_types.h | 11 +- + .../dc/dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_dcn4.c | 106 +- + .../dml2_0/dml21/src/dml2_dpmm/dml2_dpmm_factory.c | 1 + + .../dml2_0/dml21/src/dml2_mcg/dml2_mcg_factory.c | 1 + + .../dml21/src/dml2_pmo/dml2_pmo_dcn4_fams2.c | 11 +- + .../dml2_0/dml21/src/dml2_pmo/dml2_pmo_factory.c | 1 + + .../alternate_pstate_shared_lib.c | 22 +- + .../dml21/src/dml2_top/dml2_top_interfaces.c | 1 + + .../dc/dml2_0/dml21/src/dml2_top/dml2_top_utm.c | 4 +- + .../src/dml2_utm_soc_bb/dml2_utm_soc_bb_dcn6.c | 15 +- + .../src/dml2_utm_soc_bb/dml2_utm_soc_bb_factory.c | 1 + + .../dml21/src/inc/dml2_internal_shared_types.h | 19 + + .../gpu/drm/amd/display/dc/dml2_wrapper/Makefile | 62 + + .../dml21_wrapper}/dml21_translation_helper.c | 46 +- + .../dml21_wrapper}/dml21_translation_helper.h | 7 +- + .../dml21_wrapper}/dml21_utils.c | 24 +- + .../dml21_wrapper}/dml21_utils.h | 7 +- + .../dml21_wrapper}/dml21_wrapper.c | 2 +- + .../dc/dml2_wrapper/dml21_wrapper/dml21_wrapper.h | 107 + + .../dml21_wrapper}/dml21_wrapper_fpu.c | 19 +- + .../dml21_wrapper}/dml21_wrapper_fpu.h | 7 +- + .../dml2_dc_resource_mgmt.c | 60 +- + .../dml2_dc_resource_mgmt.h | 0 + .../dc/{dml2_0 => dml2_wrapper}/dml2_dc_types.h | 0 + .../{dml2_0 => dml2_wrapper}/dml2_internal_types.h | 2 +- + .../{dml2_0 => dml2_wrapper}/dml2_mall_phantom.c | 70 +- + .../{dml2_0 => dml2_wrapper}/dml2_mall_phantom.h | 0 + .../dc/{dml2_0 => dml2_wrapper}/dml2_policy.c | 2 +- + .../dc/{dml2_0 => dml2_wrapper}/dml2_policy.h | 0 + .../dml2_translation_helper.c | 20 +- + .../dml2_translation_helper.h | 0 + .../dc/{dml2_0 => dml2_wrapper}/dml2_utils.c | 28 +- + .../dc/{dml2_0 => dml2_wrapper}/dml2_utils.h | 0 + .../dc/{dml2_0 => dml2_wrapper}/dml2_wrapper.c | 6 +- + .../dc/{dml2_0 => dml2_wrapper}/dml2_wrapper.h | 0 + .../dc/{dml2_0 => dml2_wrapper}/dml2_wrapper_fpu.c | 45 +- + .../dc/{dml2_0 => dml2_wrapper}/dml2_wrapper_fpu.h | 0 + drivers/gpu/drm/amd/display/dc/dpp/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dpp/dcn30/dcn30_dpp.h | 22 + + .../drm/amd/display/dc/dpp/dcn30/dcn30_dpp_cm.c | 12 +- + .../gpu/drm/amd/display/dc/dpp/dcn401/dcn401_dpp.h | 2 + + .../drm/amd/display/dc/dpp/dcn401/dcn401_dpp_cm.c | 19 + + .../gpu/drm/amd/display/dc/dpp/dcn50/dcn50_dpp.c | 20 +- + .../gpu/drm/amd/display/dc/dpp/dcn50/dcn50_dpp.h | 14 +- + .../gpu/drm/amd/display/dc/dpp/dcn60/dcn60_dpp.c | 3 +- + .../gpu/drm/amd/display/dc/dpp/dcn60/dcn60_dpp.h | 10 +- + .../drm/amd/display/dc/dpp/dcn60/dcn60_dpp_cm.c | 115 + + drivers/gpu/drm/amd/display/dc/dsc/dc_dsc.c | 8 + + .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.c | 48 +- + .../gpu/drm/amd/display/dc/dsc/dcn20/dcn20_dsc.h | 13 +- + .../gpu/drm/amd/display/dc/dsc/dcn35/dcn35_dsc.c | 1 + + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.c | 34 +- + .../gpu/drm/amd/display/dc/dsc/dcn401/dcn401_dsc.h | 5 +- + .../gpu/drm/amd/display/dc/dsc/dcn60/dcn60_dsc.c | 45 +- + .../gpu/drm/amd/display/dc/dsc/dcn60/dcn60_dsc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dsc/dsc.h | 3 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_ddc.c | 7 +- + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 4 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 4 + + .../dc/hpo/dcn30/dcn30_hpo_frl_stream_encoder.c | 8 +- + .../dc/hpo/dcn401/dcn401_hpo_frl_stream_encoder.c | 2 + + .../dc/hpo/dcn42/dcn42_hpo_frl_stream_encoder.c | 11 +- + .../dc/hpo/dcn60/dcn60_hpo_frl_stream_encoder.c | 142 +- + .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.c | 2 + + .../drm/amd/display/dc/hubbub/dcn10/dcn10_hubbub.h | 11 +- + .../drm/amd/display/dc/hubbub/dcn20/dcn20_hubbub.c | 7 +- + .../amd/display/dc/hubbub/dcn201/dcn201_hubbub.c | 2 + + .../drm/amd/display/dc/hubbub/dcn21/dcn21_hubbub.c | 2 + + .../drm/amd/display/dc/hubbub/dcn30/dcn30_hubbub.c | 2 + + .../amd/display/dc/hubbub/dcn301/dcn301_hubbub.c | 2 + + .../drm/amd/display/dc/hubbub/dcn31/dcn31_hubbub.c | 6 +- + .../drm/amd/display/dc/hubbub/dcn32/dcn32_hubbub.c | 2 + + .../drm/amd/display/dc/hubbub/dcn35/dcn35_hubbub.c | 16 +- + .../amd/display/dc/hubbub/dcn401/dcn401_hubbub.c | 3 + + .../drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.c | 57 +- + .../drm/amd/display/dc/hubbub/dcn42/dcn42_hubbub.h | 7 +- + .../drm/amd/display/dc/hubbub/dcn60/dcn60_hubbub.c | 250 +- + .../drm/amd/display/dc/hubbub/dcn60/dcn60_hubbub.h | 19 +- + .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.c | 4 +- + .../gpu/drm/amd/display/dc/hubp/dcn10/dcn10_hubp.h | 3 +- + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.c | 5 +- + .../gpu/drm/amd/display/dc/hubp/dcn20/dcn20_hubp.h | 3 +- + .../gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.c | 11 +- + .../gpu/drm/amd/display/dc/hubp/dcn21/dcn21_hubp.h | 2 +- + .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.c | 7 +- + .../gpu/drm/amd/display/dc/hubp/dcn30/dcn30_hubp.h | 3 +- + .../gpu/drm/amd/display/dc/hubp/dcn31/dcn31_hubp.c | 1 + + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.c | 114 +- + .../drm/amd/display/dc/hubp/dcn401/dcn401_hubp.h | 5 +- + .../gpu/drm/amd/display/dc/hubp/dcn42/dcn42_hubp.c | 6 +- + .../gpu/drm/amd/display/dc/hubp/dcn50/dcn50_hubp.c | 28 +- + .../gpu/drm/amd/display/dc/hubp/dcn50/dcn50_hubp.h | 3 +- + .../gpu/drm/amd/display/dc/hubp/dcn60/dcn60_hubp.c | 9 +- + drivers/gpu/drm/amd/display/dc/hwss/Makefile | 6 + + .../gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.c | 46 +- + .../gpu/drm/amd/display/dc/hwss/dce/dce_hwseq.h | 12 +- + .../drm/amd/display/dc/hwss/dce110/dce110_hwseq.c | 39 +- + .../drm/amd/display/dc/hwss/dce60/dce60_hwseq.c | 8 +- + .../drm/amd/display/dc/hwss/dce80/dce80_hwseq.c | 3 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.c | 291 +- + .../drm/amd/display/dc/hwss/dcn10/dcn10_hwseq.h | 22 +- + .../gpu/drm/amd/display/dc/hwss/dcn10/dcn10_init.c | 6 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c | 306 +- + .../drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.h | 26 +- + .../gpu/drm/amd/display/dc/hwss/dcn20/dcn20_init.c | 5 +- + .../drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.c | 64 +- + .../drm/amd/display/dc/hwss/dcn201/dcn201_hwseq.h | 7 +- + .../drm/amd/display/dc/hwss/dcn201/dcn201_init.c | 6 +- + .../gpu/drm/amd/display/dc/hwss/dcn21/dcn21_init.c | 5 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c | 61 +- + .../drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h | 8 +- + .../gpu/drm/amd/display/dc/hwss/dcn30/dcn30_init.c | 5 +- + .../drm/amd/display/dc/hwss/dcn301/dcn301_init.c | 5 +- + .../gpu/drm/amd/display/dc/hwss/dcn31/dcn31_init.c | 5 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_hwseq.c | 22 +- + .../drm/amd/display/dc/hwss/dcn314/dcn314_init.c | 5 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.c | 142 +- + .../drm/amd/display/dc/hwss/dcn32/dcn32_hwseq.h | 12 +- + .../gpu/drm/amd/display/dc/hwss/dcn32/dcn32_init.c | 7 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 147 +- + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 16 +- + .../gpu/drm/amd/display/dc/hwss/dcn35/dcn35_init.c | 7 +- + .../drm/amd/display/dc/hwss/dcn351/dcn351_init.c | 7 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.c | 431 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_hwseq.h | 26 +- + .../drm/amd/display/dc/hwss/dcn401/dcn401_init.c | 7 +- + .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.c | 346 +- + .../drm/amd/display/dc/hwss/dcn42/dcn42_hwseq.h | 23 +- + .../gpu/drm/amd/display/dc/hwss/dcn42/dcn42_init.c | 12 +- + .../drm/amd/display/dc/hwss/dcn50/dcn50_hwseq.c | 24 +- + .../drm/amd/display/dc/hwss/dcn60/dcn60_hwseq.c | 249 +- + .../drm/amd/display/dc/hwss/dcn60/dcn60_hwseq.h | 5 +- + .../gpu/drm/amd/display/dc/hwss/dcn60/dcn60_init.c | 14 +- + drivers/gpu/drm/amd/display/dc/hwss/hw_sequencer.h | 392 +- + .../drm/amd/display/dc/hwss/hw_sequencer_private.h | 28 +- + drivers/gpu/drm/amd/display/dc/inc/clock_source.h | 4 +- + drivers/gpu/drm/amd/display/dc/inc/core_status.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 13 +- + drivers/gpu/drm/amd/display/dc/inc/custom_float.h | 21 +- + .../gpu/drm/amd/display/dc/inc/dc_core_interface.h | 31 + + drivers/gpu/drm/amd/display/dc/inc/hw/abm.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 1 + + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 9 + + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 10 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/dio.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/dmcu.h | 10 - + drivers/gpu/drm/amd/display/dc/inc/hw/dpp.h | 5 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hubp.h | 6 +- + drivers/gpu/drm/amd/display/dc/inc/hw/hw_shared.h | 10 - + .../gpu/drm/amd/display/dc/inc/hw/link_encoder.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 65 +- + drivers/gpu/drm/amd/display/dc/inc/hw/opp.h | 17 +- + drivers/gpu/drm/amd/display/dc/inc/hw/pg_cntl.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/rmcm.h | 140 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 2 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/link_service.h | 9 +- + drivers/gpu/drm/amd/display/dc/inc/resource.h | 20 +- + drivers/gpu/drm/amd/display/dc/irq/Makefile | 2 + + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 21 - + .../amd/display/dc/irq/dce110/irq_service_dce110.h | 9 - + drivers/gpu/drm/amd/display/dc/irq/irq_service.c | 28 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.h | 9 + + .../amd/display/dc/link/hwss/link_hwss_hpo_dp.c | 23 +- + .../gpu/drm/amd/display/dc/link/link_detection.c | 8 +- + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 15 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 7 +- + .../drm/amd/display/dc/link/protocols/link_ddc.c | 9 +- + .../display/dc/link/protocols/link_dp_capability.c | 3 +- + .../dc/link/protocols/link_dp_panel_replay.c | 36 +- + .../dc/link/protocols/link_dp_panel_replay.h | 2 +- + .../display/dc/link/protocols/link_dp_training.c | 20 +- + .../dc/link/protocols/link_edp_panel_control.c | 103 +- + .../dc/link/protocols/link_edp_panel_control.h | 6 + + .../amd/display/dc/link/protocols/link_hdmi_frl.c | 86 +- + .../gpu/drm/amd/display/dc/mpc/dcn10/dcn10_mpc.c | 1 + + .../gpu/drm/amd/display/dc/mpc/dcn20/dcn20_mpc.c | 1 + + .../gpu/drm/amd/display/dc/mpc/dcn30/dcn30_mpc.c | 1 + + .../gpu/drm/amd/display/dc/mpc/dcn32/dcn32_mpc.c | 1 + + .../gpu/drm/amd/display/dc/mpc/dcn401/dcn401_mpc.c | 19 +- + .../gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.c | 680 +- + .../gpu/drm/amd/display/dc/mpc/dcn42/dcn42_mpc.h | 714 +- + .../gpu/drm/amd/display/dc/mpc/dcn60/dcn60_mpc.c | 41 +- + .../gpu/drm/amd/display/dc/mpc/dcn60/dcn60_mpc.h | 238 - + .../gpu/drm/amd/display/dc/opp/dcn20/dcn20_opp.c | 7 +- + .../gpu/drm/amd/display/dc/opp/dcn20/dcn20_opp.h | 3 +- + .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.c | 10 + + .../gpu/drm/amd/display/dc/optc/dcn31/dcn31_optc.h | 1 + + .../drm/amd/display/dc/optc/dcn314/dcn314_optc.c | 1 + + .../gpu/drm/amd/display/dc/optc/dcn35/dcn35_optc.c | 1 + + .../gpu/drm/amd/display/dc/optc/dcn42/dcn42_optc.c | 1 + + .../gpu/drm/amd/display/dc/optc/dcn60/dcn60_optc.c | 83 +- + drivers/gpu/drm/amd/display/dc/os_types.h | 19 + + .../drm/amd/display/dc/pg/dcn35/dcn35_pg_cntl.c | 1 + + .../drm/amd/display/dc/pg/dcn42/dcn42_pg_cntl.c | 5 + + drivers/gpu/drm/amd/display/dc/resource/Makefile | 4 + + .../display/dc/resource/dce112/dce112_resource.c | 62 - + .../amd/display/dc/resource/dcn32/dcn32_resource.c | 2 +- + .../amd/display/dc/resource/dcn35/dcn35_resource.c | 2 +- + .../display/dc/resource/dcn351/dcn351_resource.c | 2 +- + .../amd/display/dc/resource/dcn36/dcn36_resource.c | 2 +- + .../display/dc/resource/dcn401/dcn401_resource.c | 2 +- + .../amd/display/dc/resource/dcn42/dcn42_resource.c | 62 +- + .../display/dc/resource/dcn42b/dcn42b_resource.c | 131 +- + .../amd/display/dc/resource/dcn60/dcn60_resource.c | 66 +- + .../amd/display/dc/resource/dcn60/dcn60_resource.h | 9 +- + drivers/gpu/drm/amd/display/dc/rmcm/Makefile | 44 + + .../gpu/drm/amd/display/dc/rmcm/dcn42/dcn42_rmcm.c | 867 + + .../gpu/drm/amd/display/dc/rmcm/dcn42/dcn42_rmcm.h | 717 + + .../gpu/drm/amd/display/dc/rmcm/dcn60/dcn60_rmcm.c | 251 + + .../{dc_edid_parser.h => rmcm/dcn60/dcn60_rmcm.h} | 23 +- + .../dcn401/dcn401_soc_and_ip_translator.c | 6 +- + .../dcn60/dcn60_soc_and_ip_translator.c | 45 +- + drivers/gpu/drm/amd/display/dc/sspl/Makefile | 5 +- + drivers/gpu/drm/amd/display/dc/sspl/dc_spl.c | 130 +- + .../amd/display/dc/sspl/dc_spl_isharp_filters.c | 10 +- + .../amd/display/dc/sspl/dc_spl_scl_easf_filters.c | 88 +- + .../drm/amd/display/dc/sspl/dc_spl_scl_filters.c | 24 +- + drivers/gpu/drm/amd/display/dc/sspl/dc_spl_types.h | 60 +- + .../gpu/drm/amd/display/dc/sspl/spl_custom_float.c | 152 - + .../gpu/drm/amd/display/dc/sspl/spl_custom_float.h | 29 - + .../gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.c | 495 - + .../gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.h | 526 - + .../gpu/drm/amd/display/dc/sspl/spl_namespace.h | 17 + + drivers/gpu/drm/amd/display/dc/sspl/spl_os_types.h | 44 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 60 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 189 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.c | 74 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn20.h | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.c | 82 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn31.h | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 82 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 82 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.h | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.c | 86 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn401.h | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.c | 86 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn42.h | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn60.c | 86 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn60.h | 2 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 63 +- + drivers/gpu/drm/amd/display/include/dal_asic_id.h | 5 + + .../drm/amd/display/include/link_service_types.h | 1 + + .../drm/amd/display/modules/color/color_gamma.c | 3 +- + .../drm/amd/display/modules/inc/mod_info_packet.h | 4 + + .../gpu/drm/amd/display/modules/inc/mod_power.h | 4 + + .../amd/display/modules/info_packet/info_packet.c | 109 + + .../drm/amd/display/modules/power/power_replay.c | 19 +- + drivers/gpu/drm/amd/include/amd_shared.h | 6 +- + .../drm/amd/include/asic_reg/gc/gc_12_1_0_offset.h | 4 + + .../amd/include/asic_reg/gc/gc_12_1_0_sh_mask.h | 8 +- + .../amd/include/asic_reg/hdp/hdp_8_0_1_offset.h | 213 + + .../amd/include/asic_reg/hdp/hdp_8_0_1_sh_mask.h | 665 + + .../include/asic_reg/lsdma/lsdma_8_0_1_offset.h | 385 + + .../include/asic_reg/lsdma/lsdma_8_0_1_sh_mask.h | 1399 + + .../include/asic_reg/mmhub/mmhub_5_0_1_offset.h | 1494 +- + .../include/asic_reg/mmhub/mmhub_5_0_1_sh_mask.h | 7489 ++- + .../drm/amd/include/asic_reg/mp/mp_15_0_3_offset.h | 1105 + + .../amd/include/asic_reg/mp/mp_15_0_3_sh_mask.h | 1646 + + .../amd/include/asic_reg/nbif/nbif_7_10_0_offset.h | 15938 +++++ + .../include/asic_reg/nbif/nbif_7_10_0_sh_mask.h | 60316 ++++++++++++++++++ + .../amd/include/asic_reg/nbio/nbio_7_11_5_offset.h | 11074 ++++ + .../include/asic_reg/nbio/nbio_7_11_5_sh_mask.h | 63248 +++++++++++++++++++ + .../amd/include/asic_reg/oss/osssys_8_0_1_offset.h | 275 + + .../include/asic_reg/oss/osssys_8_0_1_sh_mask.h | 984 + + .../amd/include/asic_reg/pcie/pcie_6_1_3_offset.h | 1755 + + .../amd/include/asic_reg/pcie/pcie_6_1_3_sh_mask.h | 10821 ++++ + .../include/asic_reg/smuio/smuio_15_0_3_offset.h | 79 + + .../include/asic_reg/smuio/smuio_15_0_3_sh_mask.h | 164 + + .../amd/include/asic_reg/vpe/vpe_3_0_0_offset.h | 877 + + .../amd/include/asic_reg/vpe/vpe_3_0_0_sh_mask.h | 2661 + + drivers/gpu/drm/amd/include/discovery.h | 159 +- + .../amd/include/ivsrcid/mpnht/irqsrcs_mpnht_15_0.h | 30 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 4 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 17 + + drivers/gpu/drm/amd/include/mes_v11_api_def.h | 18 + + drivers/gpu/drm/amd/include/mes_v12_api_def.h | 17 + + drivers/gpu/drm/amd/include/soc_v2_0_ih_clientid.h | 51 + + drivers/gpu/drm/amd/include/v12_structs.h | 2 +- + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 26 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 56 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 3 + + drivers/gpu/drm/amd/pm/legacy-dpm/kv_dpm.c | 6 - + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 7 - + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 6 - + .../gpu/drm/amd/pm/powerplay/hwmgr/ppatomctrl.c | 3 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 49 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 23 +- + .../pm/swsmu/inc/pmfw_if/smu15_driver_if_v15_0_0.h | 46 - + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_12_ppsmc.h | 1 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 1 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v15_0.h | 6 - + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 2 - + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 6 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_12_ppt.c | 24 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 10 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.h | 1 + + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu15/smu_v15_0.c | 174 +- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_0_ppt.c | 270 +- + .../gpu/drm/amd/pm/swsmu/smu15/smu_v15_0_8_ppt.c | 21 +- + drivers/gpu/drm/amd/ras/core/Makefile | 11 +- + drivers/gpu/drm/amd/ras/core/aca.c | 353 +- + drivers/gpu/drm/amd/ras/core/aca.h | 44 +- + drivers/gpu/drm/amd/ras/core/aca_v1_0.c | 41 +- + drivers/gpu/drm/amd/ras/core/aca_v5_0.c | 448 + + drivers/gpu/drm/amd/ras/core/aca_v5_0.h | 62 + + drivers/gpu/drm/amd/ras/core/cmd.c | 147 +- + drivers/gpu/drm/amd/ras/core/cmd.h | 32 +- + drivers/gpu/drm/amd/ras/core/core.c | 309 +- + drivers/gpu/drm/amd/ras/core/eeprom.c | 510 +- + drivers/gpu/drm/amd/ras/core/eeprom.h | 27 +- + drivers/gpu/drm/amd/ras/core/eeprom_fw.c | 640 +- + drivers/gpu/drm/amd/ras/core/eeprom_fw.h | 67 +- + drivers/gpu/drm/amd/ras/core/log_ring.c | 56 +- + drivers/gpu/drm/amd/ras/core/log_ring.h | 46 +- + drivers/gpu/drm/amd/ras/core/ras.h | 138 +- + drivers/gpu/drm/amd/ras/core/ras_bert.c | 546 + + drivers/gpu/drm/amd/ras/core/ras_bert.h | 33 + + drivers/gpu/drm/amd/ras/core/ras_cper.c | 844 +- + drivers/gpu/drm/amd/ras/core/ras_cper.h | 177 +- + drivers/gpu/drm/amd/ras/core/ras_eeprom_mgr.c | 419 + + drivers/gpu/drm/amd/ras/core/ras_eeprom_mgr.h | 124 + + drivers/gpu/drm/amd/ras/core/ras_gfx.c | 13 +- + drivers/gpu/drm/amd/ras/core/ras_mce.c | 151 + + drivers/gpu/drm/amd/ras/core/ras_mce.h | 51 + + drivers/gpu/drm/amd/ras/core/ras_mp1.c | 171 +- + drivers/gpu/drm/amd/ras/core/ras_mp1.h | 87 +- + drivers/gpu/drm/amd/ras/core/ras_mp1_v13_0.c | 175 +- + drivers/gpu/drm/amd/ras/core/ras_mp1_v15_0.c | 249 + + drivers/gpu/drm/amd/ras/core/ras_mp1_v15_0.h | 30 + + drivers/gpu/drm/amd/ras/core/ras_nbio.c | 12 +- + drivers/gpu/drm/amd/ras/core/ras_process.c | 36 +- + drivers/gpu/drm/amd/ras/core/ras_psp.c | 603 +- + drivers/gpu/drm/amd/ras/core/ras_psp.h | 111 +- + drivers/gpu/drm/amd/ras/core/ras_psp_v13_0.c | 76 + + drivers/gpu/drm/amd/ras/core/ras_psp_v15_0.c | 133 + + drivers/gpu/drm/amd/ras/core/ras_psp_v15_0.h | 31 + + drivers/gpu/drm/amd/ras/core/ras_psp_v15_0_3.c | 114 + + drivers/gpu/drm/amd/ras/core/ras_psp_v15_0_3.h | 31 + + drivers/gpu/drm/amd/ras/core/ras_umc.c | 639 +- + drivers/gpu/drm/amd/ras/core/ras_umc.h | 52 +- + drivers/gpu/drm/amd/ras/core/ras_umc_v12_0.c | 143 +- + drivers/gpu/drm/amd/ras/core/ras_umc_v12_0.h | 3 - + drivers/gpu/drm/amd/ras/core/ras_umc_v13_0.c | 221 + + drivers/gpu/drm/amd/ras/core/ras_umc_v13_0.h | 70 + + drivers/gpu/drm/amd/ras/core/ras_umc_v15_0.c | 220 + + drivers/gpu/drm/amd/ras/core/ras_umc_v15_0.h | 69 + + drivers/gpu/drm/amd/ras/core/ta_if.h | 35 + + drivers/gpu/drm/amd/ras/ras_mgr/Makefile | 6 +- + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.c | 191 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.h | 30 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_cmd.c | 38 + + .../drm/amd/ras/ras_mgr/amdgpu_ras_eeprom_i2c.c | 142 +- + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mce.c | 276 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mce.h | 31 + + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.c | 373 +- + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mgr.h | 8 +- + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1.c | 107 + + .../{amdgpu_ras_mp1_v13_0.h => amdgpu_ras_mp1.h} | 8 +- + .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1_v13_0.c | 154 - + .../gpu/drm/amd/ras/ras_mgr/amdgpu_ras_process.c | 9 +- + drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_sys.c | 100 +- + .../gpu/drm/amd/ras/ras_mgr/amdgpu_virt_ras_cmd.c | 42 +- + drivers/gpu/drm/amd/ras/ras_mgr/ras_sys.h | 9 +- + .../gpu/drm/arm/display/include/malidp_product.h | 10 +- + drivers/gpu/drm/arm/display/komeda/komeda_crtc.c | 28 +- + drivers/gpu/drm/arm/display/komeda/komeda_plane.c | 18 +- + .../drm/arm/display/komeda/komeda_wb_connector.c | 33 + + drivers/gpu/drm/arm/hdlcd_crtc.c | 4 +- + drivers/gpu/drm/arm/malidp_crtc.c | 19 +- + drivers/gpu/drm/arm/malidp_planes.c | 18 +- + drivers/gpu/drm/armada/armada_crtc.c | 2 +- + drivers/gpu/drm/armada/armada_fbdev.c | 2 +- + drivers/gpu/drm/armada/armada_overlay.c | 39 +- + drivers/gpu/drm/armada/armada_plane.c | 15 +- + drivers/gpu/drm/armada/armada_plane.h | 2 +- + drivers/gpu/drm/aspeed/aspeed_gfx.h | 11 +- + drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 203 +- + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 3 +- + drivers/gpu/drm/ast/ast_dp.c | 24 +- + drivers/gpu/drm/ast/ast_mode.c | 20 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_crtc.c | 19 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_plane.c | 33 +- + drivers/gpu/drm/bridge/Kconfig | 25 +- + drivers/gpu/drm/bridge/analogix/Kconfig | 1 + + drivers/gpu/drm/bridge/analogix/analogix_dp_core.c | 128 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_core.h | 4 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.c | 15 +- + drivers/gpu/drm/bridge/analogix/analogix_dp_reg.h | 4 + + drivers/gpu/drm/bridge/aux-bridge.c | 1 + + drivers/gpu/drm/bridge/cadence/cdns-dsi-core.c | 1 + + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 1 - + drivers/gpu/drm/bridge/chipone-icn6211.c | 8 +- + drivers/gpu/drm/bridge/fsl-ldb.c | 19 +- + drivers/gpu/drm/bridge/imx/imx93-pdfc.c | 1 + + drivers/gpu/drm/bridge/ite-it6505.c | 4 +- + drivers/gpu/drm/bridge/lontium-lt8713sx.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 6 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 2 +- + drivers/gpu/drm/bridge/panel.c | 563 - + drivers/gpu/drm/bridge/samsung-dsim.c | 28 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 3 +- + drivers/gpu/drm/bridge/ssd2825.c | 23 +- + drivers/gpu/drm/bridge/synopsys/dw-dp.c | 4 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-qp.c | 209 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 11 +- + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi2.c | 11 +- + drivers/gpu/drm/bridge/tc358767.c | 68 +- + drivers/gpu/drm/bridge/tc358768.c | 25 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 79 +- + drivers/gpu/drm/bridge/ti-tdp158.c | 1 + + drivers/gpu/drm/bridge/waveshare-dsi.c | 17 +- + drivers/gpu/drm/ci/build.sh | 1 - + drivers/gpu/drm/ci/test.yml | 10 - + .../msm-sc7180-trogdor-lazor-limozeen-fails.txt | 22 - + .../msm-sc7180-trogdor-lazor-limozeen-flakes.txt | 20 - + .../msm-sc7180-trogdor-lazor-limozeen-skips.txt | 30 - + drivers/gpu/drm/clients/Makefile | 3 +- + drivers/gpu/drm/clients/drm_fbdev_client.c | 25 +- + .../drm_fbdev_helper.c} | 34 +- + drivers/gpu/drm/clients/drm_log.c | 54 +- + drivers/gpu/drm/display/drm_bridge_connector.c | 187 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 6 + + drivers/gpu/drm/display/drm_hdmi_helper.c | 304 + + drivers/gpu/drm/display/drm_hdmi_state_helper.c | 239 +- + drivers/gpu/drm/display/drm_scdc_helper.c | 359 +- + drivers/gpu/drm/drm_atomic.c | 36 +- + drivers/gpu/drm/drm_atomic_helper.c | 10 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 86 - + drivers/gpu/drm/drm_atomic_uapi.c | 7 + + drivers/gpu/drm/drm_bridge.c | 44 +- + drivers/gpu/drm/drm_bridge_helper.c | 2 - + drivers/gpu/drm/drm_buddy.c | 3 +- + drivers/gpu/drm/drm_client_event.c | 18 + + drivers/gpu/drm/drm_colorop.c | 107 + + drivers/gpu/drm/drm_connector.c | 155 +- + drivers/gpu/drm/drm_crtc_helper_internal.h | 9 + + drivers/gpu/drm/drm_crtc_internal.h | 2 - + drivers/gpu/drm/drm_debugfs.c | 157 - + drivers/gpu/drm/drm_drv.c | 34 +- + drivers/gpu/drm/drm_edid.c | 237 +- + drivers/gpu/drm/drm_fbdev_dma.c | 2 +- + drivers/gpu/drm/drm_fbdev_shmem.c | 2 +- + drivers/gpu/drm/drm_fbdev_ttm.c | 2 +- + drivers/gpu/drm/drm_gem.c | 19 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 100 +- + drivers/gpu/drm/drm_gpusvm.c | 465 +- + drivers/gpu/drm/drm_kms_helper_common.c | 53 + + drivers/gpu/drm/drm_mode_config.c | 21 +- + drivers/gpu/drm/drm_modeset_helper.c | 2 + + drivers/gpu/drm/drm_of.c | 75 +- + drivers/gpu/drm/drm_pagemap.c | 18 +- + drivers/gpu/drm/drm_panel.c | 664 +- + drivers/gpu/drm/drm_panel_backlight_quirks.c | 2 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 2 +- + drivers/gpu/drm/drm_panic.c | 927 +- + drivers/gpu/drm/drm_panic_helper.c | 919 + + .../{drm_panic_qr.rs => drm_panic_helper_qr.rs} | 4 +- + drivers/gpu/drm/drm_panic_internal.h | 69 + + drivers/gpu/drm/drm_probe_helper.c | 15 +- + drivers/gpu/drm/drm_ras.c | 278 +- + drivers/gpu/drm/drm_ras_nl.c | 33 + + drivers/gpu/drm/drm_ras_nl.h | 8 + + drivers/gpu/drm/drm_simple_kms_helper.c | 37 +- + drivers/gpu/drm/drm_syncobj.c | 35 +- + drivers/gpu/drm/drm_sysfs.c | 32 - + drivers/gpu/drm/drm_timeout.c | 95 + + drivers/gpu/drm/exynos/exynos_dp.c | 36 +- + drivers/gpu/drm/exynos/exynos_drm_crtc.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_dpi.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 3 +- + drivers/gpu/drm/exynos/exynos_drm_plane.c | 22 +- + drivers/gpu/drm/exynos/exynos_drm_vidi.c | 15 +- + drivers/gpu/drm/exynos/exynos_hdmi.c | 3 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_crtc.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_plane.c | 2 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 10 +- + drivers/gpu/drm/gma500/fbdev.c | 2 +- + drivers/gpu/drm/gma500/psb_intel_display.c | 34 +- + drivers/gpu/drm/gud/gud_drv.c | 2 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_de.c | 18 +- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 5 +- + drivers/gpu/drm/hisilicon/kirin/dw_drm_dsi.c | 9 +- + drivers/gpu/drm/hisilicon/kirin/kirin_drm_ade.c | 4 +- + drivers/gpu/drm/hyperv/hyperv_drm.h | 1 - + drivers/gpu/drm/hyperv/hyperv_drm_modeset.c | 4 +- + drivers/gpu/drm/hyperv/hyperv_drm_proto.c | 44 +- + drivers/gpu/drm/i915/Makefile | 1 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 3 + + drivers/gpu/drm/i915/display/intel_alpm.c | 166 +- + drivers/gpu/drm/i915/display/intel_alpm.h | 3 + + drivers/gpu/drm/i915/display/intel_atomic.c | 1 + + drivers/gpu/drm/i915/display/intel_audio.c | 153 + + drivers/gpu/drm/i915/display/intel_audio_regs.h | 16 +- + drivers/gpu/drm/i915/display/intel_bios.c | 262 +- + drivers/gpu/drm/i915/display/intel_bios.h | 14 + + drivers/gpu/drm/i915/display/intel_cdclk.c | 326 +- + drivers/gpu/drm/i915/display/intel_cmtg.c | 2 +- + drivers/gpu/drm/i915/display/intel_color.c | 76 +- + .../gpu/drm/i915/display/intel_color_pipeline.c | 34 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 12 + + drivers/gpu/drm/i915/display/intel_cursor.c | 296 +- + drivers/gpu/drm/i915/display/intel_cursor_regs.h | 8 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 5 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 73 +- + drivers/gpu/drm/i915/display/intel_ddi_buf_trans.c | 90 +- + drivers/gpu/drm/i915/display/intel_dip.c | 215 + + drivers/gpu/drm/i915/display/intel_dip.h | 53 + + drivers/gpu/drm/i915/display/intel_dip_regs.h | 38 + + drivers/gpu/drm/i915/display/intel_display.c | 136 +- + drivers/gpu/drm/i915/display/intel_display.h | 3 +- + .../drm/i915/display/intel_display_clock_gating.c | 67 +- + .../drm/i915/display/intel_display_clock_gating.h | 16 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 7 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 21 +- + drivers/gpu/drm/i915/display/intel_display_irq.c | 18 +- + .../gpu/drm/i915/display/intel_display_limits.h | 1 + + .../gpu/drm/i915/display/intel_display_params.h | 5 + + drivers/gpu/drm/i915/display/intel_display_power.c | 9 + + .../gpu/drm/i915/display/intel_display_power_map.c | 42 +- + .../drm/i915/display/intel_display_power_well.c | 6 +- + drivers/gpu/drm/i915/display/intel_display_regs.h | 18 +- + drivers/gpu/drm/i915/display/intel_display_rpm.c | 7 + + drivers/gpu/drm/i915/display/intel_display_rpm.h | 1 + + drivers/gpu/drm/i915/display/intel_display_types.h | 41 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 4 +- + drivers/gpu/drm/i915/display/intel_display_wa.h | 9 - + drivers/gpu/drm/i915/display/intel_dp.c | 331 +- + .../gpu/drm/i915/display/intel_dp_aux_backlight.c | 78 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 176 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 54 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 6 +- + drivers/gpu/drm/i915/display/intel_dp_test.c | 77 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 22 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 221 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 22 + + drivers/gpu/drm/i915/display/intel_fb.c | 20 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 12 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 3 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 53 +- + drivers/gpu/drm/i915/display/intel_hdmi.h | 11 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 5 + + drivers/gpu/drm/i915/display/intel_hti.c | 3 - + drivers/gpu/drm/i915/display/intel_lspcon.c | 82 +- + .../gpu/drm/i915/display/intel_modeset_verify.c | 1 - + drivers/gpu/drm/i915/display/intel_parent.c | 14 +- + drivers/gpu/drm/i915/display/intel_parent.h | 9 +- + drivers/gpu/drm/i915/display/intel_plane.c | 53 +- + drivers/gpu/drm/i915/display/intel_psr.c | 86 +- + drivers/gpu/drm/i915/display/intel_psr_regs.h | 2 + + drivers/gpu/drm/i915/display/intel_snps_phy.c | 60 +- + drivers/gpu/drm/i915/display/intel_snps_phy.h | 2 + + drivers/gpu/drm/i915/display/intel_tdf.h | 25 - + drivers/gpu/drm/i915/display/intel_vga.c | 7 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 409 +- + drivers/gpu/drm/i915/display/intel_vrr.h | 2 + + drivers/gpu/drm/i915/display/intel_vrr_regs.h | 6 - + drivers/gpu/drm/i915/display/skl_universal_plane.c | 61 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 14 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 10 +- + drivers/gpu/drm/i915/gem/i915_gem_wait.c | 17 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 2 +- + .../gpu/drm/i915/gt/intel_execlists_submission.c | 17 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 8 +- + drivers/gpu/drm/i915/gt/selftest_engine_pm.c | 8 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_rc6.c | 4 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 2 +- + drivers/gpu/drm/i915/gvt/aperture_gm.c | 4 +- + drivers/gpu/drm/i915/gvt/handlers.c | 2 +- + drivers/gpu/drm/i915/i915_debugfs.c | 22 +- + drivers/gpu/drm/i915/i915_dpt.c | 3 - + drivers/gpu/drm/i915/i915_drv.h | 2 - + drivers/gpu/drm/i915/i915_fb_pin.c | 6 - + drivers/gpu/drm/i915/i915_gem.c | 6 +- + drivers/gpu/drm/i915/i915_gem.h | 6 +- + drivers/gpu/drm/i915/i915_gtt_view_types.h | 74 - + drivers/gpu/drm/i915/i915_overlay.c | 5 - + drivers/gpu/drm/i915/i915_reg.h | 2 +- + drivers/gpu/drm/i915/i915_request.c | 2 - + drivers/gpu/drm/i915/i915_switcheroo.c | 11 +- + drivers/gpu/drm/i915/i915_vma.c | 44 +- + drivers/gpu/drm/i915/i915_vma.h | 12 +- + drivers/gpu/drm/i915/i915_vma_types.h | 29 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 30 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 2 +- + drivers/gpu/drm/i915/intel_pcode.c | 14 +- + drivers/gpu/drm/i915/intel_pcode.h | 2 +- + drivers/gpu/drm/i915/selftests/i915_sw_fence.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_vma.c | 60 +- + drivers/gpu/drm/i915/selftests/igt_atomic.c | 7 + + drivers/gpu/drm/i915/vlv_iosf_sb.c | 6 +- + drivers/gpu/drm/imagination/pvr_ccb.c | 43 +- + drivers/gpu/drm/imagination/pvr_device.c | 25 +- + drivers/gpu/drm/imagination/pvr_fw.c | 153 +- + drivers/gpu/drm/imagination/pvr_fw.h | 20 +- + drivers/gpu/drm/imagination/pvr_fw_meta.c | 18 +- + drivers/gpu/drm/imagination/pvr_fw_riscv.c | 40 +- + drivers/gpu/drm/imagination/pvr_fw_startstop.c | 22 +- + drivers/gpu/drm/imagination/pvr_fw_trace.c | 1 - + drivers/gpu/drm/imagination/pvr_rogue_cr_defs.h | 920 +- + drivers/gpu/drm/imagination/pvr_rogue_defs.h | 22 +- + drivers/gpu/drm/imagination/pvr_rogue_riscv.h | 2 - + drivers/gpu/drm/imagination/pvr_trace.h | 14 +- + drivers/gpu/drm/imx/dc/dc-crtc.c | 2 +- + drivers/gpu/drm/imx/dc/dc-kms.c | 9 +- + drivers/gpu/drm/imx/dc/dc-plane.c | 2 +- + drivers/gpu/drm/imx/dcss/Kconfig | 1 + + drivers/gpu/drm/imx/dcss/dcss-crtc.c | 2 +- + drivers/gpu/drm/imx/dcss/dcss-plane.c | 2 +- + drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c | 18 +- + drivers/gpu/drm/imx/ipuv3/ipuv3-plane.c | 21 +- + drivers/gpu/drm/imx/lcdc/imx-lcdc.c | 261 +- + drivers/gpu/drm/ingenic/Kconfig | 1 + + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 4 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 2 +- + drivers/gpu/drm/kmb/kmb_crtc.c | 2 +- + drivers/gpu/drm/kmb/kmb_dsi.c | 9 +- + drivers/gpu/drm/kmb/kmb_plane.c | 2 +- + drivers/gpu/drm/lima/lima_gem.c | 2 +- + drivers/gpu/drm/logicvc/Kconfig | 1 + + drivers/gpu/drm/logicvc/logicvc_crtc.c | 2 +- + drivers/gpu/drm/logicvc/logicvc_layer.c | 2 +- + drivers/gpu/drm/loongson/lsdc_crtc.c | 30 +- + drivers/gpu/drm/loongson/lsdc_drv.c | 4 +- + drivers/gpu/drm/loongson/lsdc_plane.c | 2 +- + drivers/gpu/drm/mcde/Kconfig | 2 +- + drivers/gpu/drm/mcde/mcde_display.c | 273 +- + drivers/gpu/drm/mcde/mcde_drm.h | 12 +- + drivers/gpu/drm/mcde/mcde_drv.c | 3 +- + drivers/gpu/drm/mcde/mcde_dsi.c | 51 +- + drivers/gpu/drm/mediatek/mtk_crtc.c | 18 +- + drivers/gpu/drm/mediatek/mtk_dsi.c | 10 +- + drivers/gpu/drm/mediatek/mtk_plane.c | 21 +- + drivers/gpu/drm/meson/meson_crtc.c | 2 +- + drivers/gpu/drm/meson/meson_encoder_cvbs.c | 11 +- + drivers/gpu/drm/meson/meson_encoder_dsi.c | 11 +- + drivers/gpu/drm/meson/meson_encoder_hdmi.c | 11 +- + drivers/gpu/drm/meson/meson_overlay.c | 2 +- + drivers/gpu/drm/meson/meson_plane.c | 2 +- + drivers/gpu/drm/mgag200/mgag200_drv.h | 8 +- + drivers/gpu/drm/mgag200/mgag200_mode.c | 15 +- + drivers/gpu/drm/msm/Makefile | 2 + + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 18 + + drivers/gpu/drm/msm/adreno/a3xx_gpu.c | 30 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.c | 76 +- + drivers/gpu/drm/msm/adreno/a5xx_gpu.h | 2 + + drivers/gpu/drm/msm/adreno/a6xx_catalog.c | 1440 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 231 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 1 + + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 42 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 17 + + drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 96 + + drivers/gpu/drm/msm/adreno/a6xx_hfi.h | 1 + + drivers/gpu/drm/msm/adreno/a7xx_catalog.c | 502 + + drivers/gpu/drm/msm/adreno/a8xx_catalog.c | 1846 + + drivers/gpu/drm/msm/adreno/a8xx_gpu.c | 21 +- + drivers/gpu/drm/msm/adreno/adreno_device.c | 6 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 3 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 35 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_core_perf.c | 17 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 18 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 10 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 2 + + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 18 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_crtc.c | 2 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 14 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_plane.c | 2 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_cfg.c | 81 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_crtc.c | 20 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_plane.c | 16 +- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 164 +- + drivers/gpu/drm/msm/dp/dp_ctrl.h | 8 +- + drivers/gpu/drm/msm/dp/dp_debug.c | 1 + + drivers/gpu/drm/msm/dp/dp_display.c | 116 +- + drivers/gpu/drm/msm/dp/dp_panel.c | 191 +- + drivers/gpu/drm/msm/dp/dp_panel.h | 17 +- + drivers/gpu/drm/msm/dp/dp_reg.h | 56 + + drivers/gpu/drm/msm/dsi/dsi.c | 3 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 2 + + drivers/gpu/drm/msm/dsi/dsi_manager.c | 2 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 34 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 16 +- + drivers/gpu/drm/msm/msm_debugfs.c | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 89 +- + drivers/gpu/drm/msm/msm_drv.h | 6 +- + drivers/gpu/drm/msm/msm_fbdev.c | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 107 +- + drivers/gpu/drm/msm/msm_gem.h | 10 +- + drivers/gpu/drm/msm/msm_gem_prime.c | 9 +- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 31 +- + drivers/gpu/drm/msm/msm_gem_vma.c | 8 +- + drivers/gpu/drm/msm/msm_io_utils.c | 6 +- + drivers/gpu/drm/msm/msm_mdss.c | 15 + + drivers/gpu/drm/msm/registers/adreno/a2xx.xml | 25 +- + drivers/gpu/drm/msm/registers/adreno/a5xx.xml | 17 + + drivers/gpu/drm/msm/registers/adreno/a6xx.xml | 89 +- + .../gpu/drm/msm/registers/adreno/adreno_pm4.xml | 41 +- + drivers/gpu/drm/mxsfb/lcdif_kms.c | 19 +- + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 43 + + drivers/gpu/drm/mxsfb/mxsfb_drv.h | 2 + + drivers/gpu/drm/mxsfb/mxsfb_kms.c | 18 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 5 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 14 +- + drivers/gpu/drm/nouveau/dispnv50/headca7d.c | 21 +- + drivers/gpu/drm/nouveau/dispnv50/wndw.c | 17 +- + .../gpu/drm/nouveau/include/nvhw/class/clca7d.h | 4 + + drivers/gpu/drm/nouveau/include/nvkm/subdev/pci.h | 1 + + drivers/gpu/drm/nouveau/nouveau_abi16.c | 4 + + drivers/gpu/drm/nouveau/nouveau_acpi.c | 32 +- + drivers/gpu/drm/nouveau/nouveau_acpi.h | 10 +- + drivers/gpu/drm/nouveau/nouveau_bios.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 152 +- + drivers/gpu/drm/nouveau/nouveau_connector.h | 12 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 114 +- + drivers/gpu/drm/nouveau/nouveau_exec.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_fence.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_led.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_svm.c | 13 + + drivers/gpu/drm/nouveau/nouveau_vga.c | 34 +- + drivers/gpu/drm/nouveau/nvkm/engine/device/base.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/bios/init.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/clk/gk20a.h | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/pci/Kbuild | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/pci/mcp79.c | 35 + + drivers/gpu/drm/nova/driver.rs | 37 +- + drivers/gpu/drm/nova/file.rs | 129 +- + drivers/gpu/drm/omapdrm/dss/dsi.c | 361 +- + drivers/gpu/drm/omapdrm/dss/hdmi.h | 6 + + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 29 +- + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 37 +- + drivers/gpu/drm/omapdrm/dss/hdmi_common.c | 14 + + drivers/gpu/drm/omapdrm/dss/omapdss.h | 1 - + drivers/gpu/drm/omapdrm/dss/output.c | 42 +- + drivers/gpu/drm/omapdrm/omap_crtc.c | 17 +- + drivers/gpu/drm/omapdrm/omap_debugfs.c | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 1 - + drivers/gpu/drm/omapdrm/omap_fbdev.c | 2 +- + drivers/gpu/drm/omapdrm/omap_plane.c | 13 +- + drivers/gpu/drm/panel/Kconfig | 28 +- + drivers/gpu/drm/panel/Makefile | 2 + + drivers/gpu/drm/panel/panel-ebbg-ft8719.c | 23 +- + drivers/gpu/drm/panel/panel-edp.c | 6 + + drivers/gpu/drm/panel/panel-himax-hx83102.c | 24 +- + drivers/gpu/drm/panel/panel-himax-hx83112a.c | 26 +- + drivers/gpu/drm/panel/panel-himax-hx83112b.c | 23 +- + drivers/gpu/drm/panel/panel-himax-hx8394.c | 26 +- + drivers/gpu/drm/panel/panel-ilitek-ili7836a.c | 297 + + drivers/gpu/drm/panel/panel-ilitek-ili9805.c | 21 +- + drivers/gpu/drm/panel/panel-ilitek-ili9806e-core.c | 12 +- + drivers/gpu/drm/panel/panel-ilitek-ili9806e-core.h | 1 - + drivers/gpu/drm/panel/panel-ilitek-ili9806e-dsi.c | 16 +- + drivers/gpu/drm/panel/panel-ilitek-ili9806e-spi.c | 6 - + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 15 +- + drivers/gpu/drm/panel/panel-ilitek-ili9882t.c | 258 +- + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 19 +- + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 32 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 20 +- + drivers/gpu/drm/panel/panel-leadtek-ltk500hd1829.c | 20 +- + drivers/gpu/drm/panel/panel-novatek-nt36532.c | 431 + + drivers/gpu/drm/panel/panel-samsung-dsi.h | 38 + + drivers/gpu/drm/panel/panel-samsung-s6d16d0.c | 74 +- + drivers/gpu/drm/panel/panel-samsung-s6d7aa0.c | 20 +- + drivers/gpu/drm/panel/panel-samsung-s6e3fa7.c | 20 +- + drivers/gpu/drm/panel/panel-samsung-s6e3fc2x01.c | 91 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 30 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha8.c | 90 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 31 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-dsi.c | 13 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0-spi.c | 6 - + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 12 +- + drivers/gpu/drm/panel/panel-samsung-s6e63m0.h | 1 - + .../drm/panel/panel-samsung-s6e88a0-ams427ap24.c | 20 +- + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 26 +- + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 19 +- + .../gpu/drm/panel/panel-samsung-s6e8fc0-m1906f9.c | 46 +- + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 35 +- + drivers/gpu/drm/panel/panel-sharp-ls043t1le01.c | 31 +- + drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 20 +- + drivers/gpu/drm/panel/panel-simple.c | 57 + + drivers/gpu/drm/panel/panel-sony-td4353-jdi.c | 20 +- + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 20 +- + drivers/gpu/drm/panel/panel-visionox-r66451.c | 23 +- + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 21 +- + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 2 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 1 - + drivers/gpu/drm/panfrost/panfrost_drv.c | 4 +- + drivers/gpu/drm/panthor/panthor_device.h | 286 +- + drivers/gpu/drm/panthor/panthor_drv.c | 2 +- + drivers/gpu/drm/panthor/panthor_fw.c | 22 +- + drivers/gpu/drm/panthor/panthor_gem.c | 14 +- + drivers/gpu/drm/panthor/panthor_gpu.c | 117 +- + drivers/gpu/drm/panthor/panthor_mmu.c | 44 +- + drivers/gpu/drm/panthor/panthor_mmu.h | 3 +- + drivers/gpu/drm/panthor/panthor_pwr.c | 24 +- + drivers/gpu/drm/panthor/panthor_sched.c | 591 +- + drivers/gpu/drm/panthor/panthor_sched.h | 5 + + drivers/gpu/drm/panthor/panthor_trace.h | 38 + + drivers/gpu/drm/pl111/Kconfig | 1 + + drivers/gpu/drm/pl111/pl111_display.c | 207 +- + drivers/gpu/drm/pl111/pl111_drm.h | 5 +- + drivers/gpu/drm/pl111/pl111_drv.c | 19 +- + drivers/gpu/drm/pl111/pl111_versatile.c | 18 - + drivers/gpu/drm/qxl/qxl_display.c | 6 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 36 + + drivers/gpu/drm/radeon/radeon_combios.c | 51 + + drivers/gpu/drm/radeon/radeon_device.c | 20 +- + drivers/gpu/drm/radeon/radeon_fbdev.c | 2 +- + drivers/gpu/drm/radeon/radeon_fence.c | 4 +- + drivers/gpu/drm/radeon/radeon_mode.h | 3 +- + drivers/gpu/drm/renesas/rcar-du/Kconfig | 12 + + drivers/gpu/drm/renesas/rcar-du/Makefile | 1 + + drivers/gpu/drm/renesas/rcar-du/rcar_dsc.c | 153 + + drivers/gpu/drm/renesas/rcar-du/rcar_du_crtc.c | 17 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_encoder.c | 17 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_plane.c | 19 +- + drivers/gpu/drm/renesas/rcar-du/rcar_du_vsp.c | 17 +- + drivers/gpu/drm/renesas/rcar-du/rcar_mipi_dsi.c | 51 +- + drivers/gpu/drm/renesas/rz-du/Kconfig | 13 + + drivers/gpu/drm/renesas/rz-du/Makefile | 1 + + drivers/gpu/drm/renesas/rz-du/rzg2l_du_crtc.c | 15 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.c | 24 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_drv.h | 3 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_du_encoder.c | 24 + + drivers/gpu/drm/renesas/rz-du/rzg2l_du_vsp.c | 15 +- + drivers/gpu/drm/renesas/rz-du/rzg2l_mipi_dsi.c | 162 +- + drivers/gpu/drm/renesas/rz-du/rzg3l_lvds.c | 275 + + drivers/gpu/drm/renesas/rz-du/rzg3l_lvds_regs.h | 25 + + drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 17 +- + drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 19 +- + drivers/gpu/drm/rockchip/Kconfig | 2 + + drivers/gpu/drm/rockchip/analogix_dp-rockchip.c | 11 - + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 66 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 20 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 20 +- + drivers/gpu/drm/scheduler/sched_entity.c | 61 +- + drivers/gpu/drm/scheduler/sched_fence.c | 3 +- + drivers/gpu/drm/scheduler/sched_internal.h | 3 +- + drivers/gpu/drm/scheduler/sched_main.c | 9 +- + drivers/gpu/drm/scheduler/tests/tests_basic.c | 2 +- + drivers/gpu/drm/sitronix/st7571.c | 3 +- + drivers/gpu/drm/sitronix/st7920.c | 24 +- + drivers/gpu/drm/solomon/ssd130x-spi.c | 25 +- + drivers/gpu/drm/solomon/ssd130x.c | 473 +- + drivers/gpu/drm/solomon/ssd130x.h | 10 +- + drivers/gpu/drm/sprd/sprd_dpu.c | 4 +- + drivers/gpu/drm/sti/sti_crtc.c | 2 +- + drivers/gpu/drm/sti/sti_cursor.c | 2 +- + drivers/gpu/drm/sti/sti_gdp.c | 2 +- + drivers/gpu/drm/sti/sti_hqvdp.c | 2 +- + drivers/gpu/drm/stm/Kconfig | 1 + + drivers/gpu/drm/stm/ltdc.c | 6 +- + drivers/gpu/drm/sun4i/sun4i_crtc.c | 2 +- + drivers/gpu/drm/sun4i/sun4i_hdmi_enc.c | 3 +- + drivers/gpu/drm/sun4i/sun4i_layer.c | 21 +- + drivers/gpu/drm/sun4i/sun8i_ui_layer.c | 2 +- + drivers/gpu/drm/sun4i/sun8i_vi_layer.c | 2 +- + drivers/gpu/drm/sysfb/drm_sysfb_helper.h | 12 +- + drivers/gpu/drm/sysfb/drm_sysfb_modeset.c | 70 +- + drivers/gpu/drm/sysfb/efidrm.c | 17 +- + drivers/gpu/drm/sysfb/ofdrm.c | 18 +- + drivers/gpu/drm/sysfb/vesadrm.c | 18 +- + drivers/gpu/drm/tegra/dc.c | 18 +- + drivers/gpu/drm/tegra/dsi.c | 16 +- + drivers/gpu/drm/tegra/fbdev.c | 2 +- + drivers/gpu/drm/tegra/plane.c | 28 +- + drivers/gpu/drm/tegra/rgb.c | 16 +- + drivers/gpu/drm/tegra/submit.c | 145 +- + drivers/gpu/drm/tegra/uapi.c | 51 +- + drivers/gpu/drm/tegra/uapi.h | 3 +- + drivers/gpu/drm/tests/Makefile | 1 + + drivers/gpu/drm/tests/drm_connector_test.c | 42 +- + drivers/gpu/drm/tests/drm_hdmi_state_helper_test.c | 56 +- + drivers/gpu/drm/tests/drm_kunit_helpers.c | 4 +- + .../{drm_panic_test.c => drm_panic_helper_test.c} | 75 +- + drivers/gpu/drm/tidss/Kconfig | 1 + + drivers/gpu/drm/tidss/tidss_dispc.c | 38 +- + drivers/gpu/drm/tidss/tidss_dispc.h | 2 +- + drivers/gpu/drm/tidss/tidss_encoder.c | 10 +- + drivers/gpu/drm/tidss/tidss_plane.c | 2 + + drivers/gpu/drm/tilcdc/tilcdc_crtc.c | 7 +- + drivers/gpu/drm/tilcdc/tilcdc_plane.c | 2 +- + drivers/gpu/drm/tiny/appletbdrm.c | 14 +- + drivers/gpu/drm/tiny/arcpgu.c | 201 +- + drivers/gpu/drm/tiny/bochs.c | 6 +- + drivers/gpu/drm/tiny/cirrus-qemu.c | 2 +- + drivers/gpu/drm/tiny/gm12u320.c | 138 +- + drivers/gpu/drm/tiny/pixpaper.c | 2 +- + drivers/gpu/drm/tiny/repaper.c | 138 +- + drivers/gpu/drm/tiny/sharp-memory.c | 2 +- + drivers/gpu/drm/ttm/ttm_bo.c | 3 +- + drivers/gpu/drm/ttm/ttm_module.c | 1 - + drivers/gpu/drm/tve200/Kconfig | 2 +- + drivers/gpu/drm/tve200/tve200_display.c | 220 +- + drivers/gpu/drm/tve200/tve200_drm.h | 7 +- + drivers/gpu/drm/tve200/tve200_drv.c | 41 +- + drivers/gpu/drm/tyr/driver.rs | 114 +- + drivers/gpu/drm/tyr/fw.rs | 7 +- + drivers/gpu/drm/tyr/gpu.rs | 6 +- + drivers/gpu/drm/tyr/regs.rs | 57 +- + drivers/gpu/drm/udl/udl_modeset.c | 2 +- + drivers/gpu/drm/v3d/v3d_bo.c | 3 +- + drivers/gpu/drm/v3d/v3d_drv.h | 32 +- + drivers/gpu/drm/v3d/v3d_gem.c | 3 - + drivers/gpu/drm/v3d/v3d_perfmon.c | 13 +- + drivers/gpu/drm/v3d/v3d_sched.c | 4 - + drivers/gpu/drm/v3d/v3d_submit.c | 19 +- + drivers/gpu/drm/vboxvideo/vbox_mode.c | 6 +- + drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c | 2 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 14 +- + drivers/gpu/drm/vc4/vc4_drv.c | 1 - + drivers/gpu/drm/vc4/vc4_drv.h | 15 +- + drivers/gpu/drm/vc4/vc4_gem.c | 43 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 5 +- + drivers/gpu/drm/vc4/vc4_irq.c | 7 +- + drivers/gpu/drm/vc4/vc4_plane.c | 15 +- + drivers/gpu/drm/vc4/vc4_txp.c | 2 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 37 +- + drivers/gpu/drm/verisilicon/vs_bridge.c | 11 +- + drivers/gpu/drm/verisilicon/vs_bridge.h | 1 - + drivers/gpu/drm/verisilicon/vs_crtc.c | 2 +- + drivers/gpu/drm/verisilicon/vs_cursor_plane.c | 10 +- + drivers/gpu/drm/verisilicon/vs_plane.c | 34 +- + drivers/gpu/drm/verisilicon/vs_plane.h | 4 +- + drivers/gpu/drm/verisilicon/vs_primary_plane.c | 9 +- + drivers/gpu/drm/virtio/virtgpu_display.c | 14 +- + drivers/gpu/drm/virtio/virtgpu_plane.c | 14 +- + drivers/gpu/drm/vkms/tests/gen_yuv_conversion.py | 87 + + drivers/gpu/drm/vkms/tests/vkms_format_test.c | 40 +- + drivers/gpu/drm/vkms/vkms_colorop.c | 66 +- + drivers/gpu/drm/vkms/vkms_composer.c | 36 +- + drivers/gpu/drm/vkms/vkms_crtc.c | 18 +- + drivers/gpu/drm/vkms/vkms_drv.h | 2 +- + drivers/gpu/drm/vkms/vkms_formats.c | 112 +- + drivers/gpu/drm/vkms/vkms_formats.h | 2 +- + drivers/gpu/drm/vkms/vkms_plane.c | 91 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 39 +- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ldu.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_scrn.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_stdu.c | 6 +- + drivers/gpu/drm/xe/Makefile | 6 +- + drivers/gpu/drm/xe/abi/guc_actions_slpc_abi.h | 1 + + drivers/gpu/drm/xe/abi/guc_klvs_abi.h | 1 + + drivers/gpu/drm/xe/abi/xe_log_abi.h | 200 + + drivers/gpu/drm/xe/abi/xe_sigid_abi.h | 172 + + .../gpu/drm/xe/compat-i915-headers/i915_config.h | 16 - + .../xe/compat-i915-headers/i915_gtt_view_types.h | 7 - + drivers/gpu/drm/xe/display/xe_display.c | 32 +- + drivers/gpu/drm/xe/display/xe_display_pcode.c | 4 +- + drivers/gpu/drm/xe/display/xe_display_rpm.c | 8 +- + drivers/gpu/drm/xe/display/xe_display_wa.c | 13 +- + drivers/gpu/drm/xe/display/xe_display_wa.h | 9 + + drivers/gpu/drm/xe/display/xe_dsb_buffer.c | 2 +- + drivers/gpu/drm/xe/display/xe_fb_pin.c | 30 +- + drivers/gpu/drm/xe/display/xe_panic.c | 3 +- + drivers/gpu/drm/xe/display/xe_tdf.c | 15 - + drivers/gpu/drm/xe/instructions/xe_mi_commands.h | 7 +- + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 36 +- + drivers/gpu/drm/xe/regs/xe_lrc_layout.h | 2 + + drivers/gpu/drm/xe/regs/xe_regs.h | 2 + + drivers/gpu/drm/xe/tests/Makefile | 1 + + drivers/gpu/drm/xe/tests/xe_any_kunit.c | 213 + + .../gpu/drm/xe/tests/xe_guc_klv_helpers_kunit.c | 303 + + drivers/gpu/drm/xe/tests/xe_kunit_helpers.c | 4 + + drivers/gpu/drm/xe/tests/xe_log_kunit.c | 553 + + drivers/gpu/drm/xe/tests/xe_pci.c | 25 +- + drivers/gpu/drm/xe/xe_any.h | 137 + + drivers/gpu/drm/xe/xe_bo.c | 80 +- + drivers/gpu/drm/xe/xe_bo.h | 13 +- + drivers/gpu/drm/xe/xe_bo_types.h | 10 +- + drivers/gpu/drm/xe/xe_configfs.c | 139 +- + drivers/gpu/drm/xe/xe_configfs.h | 4 + + drivers/gpu/drm/xe/xe_cpu_bind.c | 296 + + drivers/gpu/drm/xe/xe_cpu_bind.h | 111 + + drivers/gpu/drm/xe/xe_debugfs.c | 66 + + drivers/gpu/drm/xe/xe_debugfs.h | 4 + + drivers/gpu/drm/xe/xe_defaults.h | 1 + + drivers/gpu/drm/xe/xe_devcoredump.c | 50 +- + drivers/gpu/drm/xe/xe_devcoredump.h | 15 +- + drivers/gpu/drm/xe/xe_device.c | 164 +- + drivers/gpu/drm/xe/xe_device.h | 2 +- + drivers/gpu/drm/xe/xe_device_sysfs.c | 36 + + drivers/gpu/drm/xe/xe_device_types.h | 70 +- + drivers/gpu/drm/xe/xe_dma_buf.c | 22 +- + drivers/gpu/drm/xe/xe_drm_client.c | 2 +- + drivers/gpu/drm/xe/xe_drm_ras.c | 65 + + drivers/gpu/drm/xe/xe_drm_ras.h | 3 + + drivers/gpu/drm/xe/xe_drm_ras_types.h | 3 + + drivers/gpu/drm/xe/xe_exec_queue.c | 239 +- + drivers/gpu/drm/xe/xe_exec_queue.h | 16 +- + drivers/gpu/drm/xe/xe_exec_queue_types.h | 36 +- + drivers/gpu/drm/xe/xe_execlist.c | 4 +- + drivers/gpu/drm/xe/xe_ggtt.c | 74 +- + drivers/gpu/drm/xe/xe_gsc.c | 3 +- + drivers/gpu/drm/xe/xe_gt.c | 24 +- + drivers/gpu/drm/xe/xe_gt.h | 13 + + drivers/gpu/drm/xe/xe_gt_ccs_mode.c | 6 - + drivers/gpu/drm/xe/xe_gt_debugfs.c | 252 +- + drivers/gpu/drm/xe/xe_gt_idle.c | 84 +- + drivers/gpu/drm/xe/xe_gt_idle.h | 1 + + drivers/gpu/drm/xe/xe_gt_printk.h | 3 + + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.c | 299 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_config.h | 10 + + drivers/gpu/drm/xe/xe_gt_sriov_printk.h | 3 + + drivers/gpu/drm/xe/xe_gt_stats.c | 7 + + drivers/gpu/drm/xe/xe_gt_stats_types.h | 22 + + drivers/gpu/drm/xe/xe_gt_types.h | 29 + + drivers/gpu/drm/xe/xe_guc.c | 34 +- + drivers/gpu/drm/xe/xe_guc.h | 2 + + drivers/gpu/drm/xe/xe_guc_ads.c | 9 +- + drivers/gpu/drm/xe/xe_guc_capture.c | 2 - + drivers/gpu/drm/xe/xe_guc_ct.c | 114 +- + drivers/gpu/drm/xe/xe_guc_ct.h | 38 +- + drivers/gpu/drm/xe/xe_guc_engine_activity.c | 6 +- + drivers/gpu/drm/xe/xe_guc_exec_queue_types.h | 32 +- + drivers/gpu/drm/xe/xe_guc_hwconfig.c | 2 +- + drivers/gpu/drm/xe/xe_guc_klv_helpers.c | 78 + + drivers/gpu/drm/xe/xe_guc_klv_helpers.h | 5 + + drivers/gpu/drm/xe/xe_guc_log.c | 7 +- + drivers/gpu/drm/xe/xe_guc_pagefault.c | 80 +- + drivers/gpu/drm/xe/xe_guc_pc.c | 18 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 472 +- + drivers/gpu/drm/xe/xe_guc_submit.h | 5 + + drivers/gpu/drm/xe/xe_guc_submit_types.h | 2 + + drivers/gpu/drm/xe/xe_guc_tlb_inval.c | 29 + + drivers/gpu/drm/xe/xe_guc_types.h | 6 + + drivers/gpu/drm/xe/xe_hwmon.c | 95 +- + drivers/gpu/drm/xe/xe_log.c | 247 + + drivers/gpu/drm/xe/xe_log.h | 194 + + drivers/gpu/drm/xe/xe_lrc.c | 112 +- + drivers/gpu/drm/xe/xe_lrc.h | 5 + + drivers/gpu/drm/xe/xe_lrc_types.h | 4 + + drivers/gpu/drm/xe/xe_mert.c | 2 +- + drivers/gpu/drm/xe/xe_migrate.c | 884 +- + drivers/gpu/drm/xe/xe_migrate.h | 95 +- + drivers/gpu/drm/xe/xe_mmio_gem.c | 7 +- + drivers/gpu/drm/xe/xe_module.c | 4 + + drivers/gpu/drm/xe/xe_module.h | 1 + + drivers/gpu/drm/xe/xe_nvm.c | 1 + + drivers/gpu/drm/xe/xe_oa.c | 7 +- + drivers/gpu/drm/xe/xe_pagefault.c | 841 +- + drivers/gpu/drm/xe/xe_pagefault.h | 137 + + drivers/gpu/drm/xe/xe_pagefault_types.h | 211 +- + drivers/gpu/drm/xe/xe_pci.c | 101 +- + drivers/gpu/drm/xe/xe_pci_error.c | 13 +- + drivers/gpu/drm/xe/xe_pci_types.h | 4 +- + drivers/gpu/drm/xe/xe_pcode.c | 27 +- + drivers/gpu/drm/xe/xe_pcode.h | 6 +- + drivers/gpu/drm/xe/xe_pm.c | 68 + + drivers/gpu/drm/xe/xe_pm.h | 3 + + drivers/gpu/drm/xe/xe_printk.h | 3 + + drivers/gpu/drm/xe/xe_pt.c | 813 +- + drivers/gpu/drm/xe/xe_pt.h | 12 +- + drivers/gpu/drm/xe/xe_pt_types.h | 49 +- + drivers/gpu/drm/xe/xe_pxp_submit.c | 5 +- + drivers/gpu/drm/xe/xe_ras.c | 245 +- + drivers/gpu/drm/xe/xe_ras.h | 2 + + drivers/gpu/drm/xe/xe_ras_types.h | 50 + + drivers/gpu/drm/xe/xe_res_cursor.h | 5 +- + drivers/gpu/drm/xe/xe_ring_ops.c | 90 +- + drivers/gpu/drm/xe/xe_ring_ops_types.h | 24 + + drivers/gpu/drm/xe/xe_sched_job.c | 101 +- + drivers/gpu/drm/xe/xe_sched_job.h | 56 + + drivers/gpu/drm/xe/xe_sched_job_types.h | 49 +- + drivers/gpu/drm/xe/xe_sriov_packet.c | 31 +- + drivers/gpu/drm/xe/xe_sriov_pf_provision.c | 4 +- + drivers/gpu/drm/xe/xe_sriov_printk.h | 3 + + drivers/gpu/drm/xe/xe_sriov_vf_ccs.c | 1 - + drivers/gpu/drm/xe/xe_survivability_mode.c | 85 +- + drivers/gpu/drm/xe/xe_svm.c | 250 +- + drivers/gpu/drm/xe/xe_svm.h | 97 +- + drivers/gpu/drm/xe/xe_sync.c | 20 +- + drivers/gpu/drm/xe/xe_sysctrl.c | 92 + + drivers/gpu/drm/xe/xe_sysctrl.h | 2 + + drivers/gpu/drm/xe/xe_sysctrl_event.c | 28 +- + drivers/gpu/drm/xe/xe_sysctrl_mailbox.c | 7 +- + drivers/gpu/drm/xe/xe_sysctrl_mailbox_types.h | 52 + + drivers/gpu/drm/xe/xe_tile_printk.h | 3 + + drivers/gpu/drm/xe/xe_tile_sriov_printk.h | 3 + + drivers/gpu/drm/xe/xe_tile_types.h | 4 + + drivers/gpu/drm/xe/xe_tlb_inval.c | 96 +- + drivers/gpu/drm/xe/xe_tlb_inval.h | 1 + + drivers/gpu/drm/xe/xe_tlb_inval_job.c | 28 +- + drivers/gpu/drm/xe/xe_tlb_inval_job.h | 4 +- + drivers/gpu/drm/xe/xe_tlb_inval_types.h | 27 + + drivers/gpu/drm/xe/xe_trace.h | 2 +- + drivers/gpu/drm/xe/xe_trace_bo.h | 58 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 600 +- + drivers/gpu/drm/xe/xe_ttm_vram_mgr.h | 3 + + drivers/gpu/drm/xe/xe_ttm_vram_mgr_types.h | 40 + + drivers/gpu/drm/xe/xe_tuning.c | 4 + + drivers/gpu/drm/xe/xe_uc_fw.c | 1 + + drivers/gpu/drm/xe/xe_userptr.c | 21 +- + drivers/gpu/drm/xe/xe_vm.c | 570 +- + drivers/gpu/drm/xe/xe_vm.h | 3 + + drivers/gpu/drm/xe/xe_vm_madvise.c | 6 - + drivers/gpu/drm/xe/xe_vm_types.h | 56 +- + drivers/gpu/drm/xe/xe_vram.c | 255 +- + drivers/gpu/drm/xe/xe_vram.h | 10 + + drivers/gpu/drm/xe/xe_wa.c | 4 +- + drivers/gpu/drm/xe/xe_wa_oob.rules | 2 + + drivers/gpu/drm/xe/xe_wait_user_fence.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front.h | 6 +- + drivers/gpu/drm/xen/xen_drm_front_kms.c | 188 +- + drivers/gpu/drm/xlnx/zynqmp_kms.c | 18 +- + drivers/gpu/host1x/channel.c | 6 +- + drivers/gpu/host1x/context.c | 383 +- + drivers/gpu/host1x/context.h | 18 +- + drivers/gpu/host1x/dev.c | 52 +- + drivers/gpu/host1x/dev.h | 3 + + drivers/gpu/host1x/fence.c | 43 + + drivers/gpu/host1x/hw/cdma_hw.c | 3 + + drivers/gpu/host1x/hw/channel_hw.c | 3 +- + drivers/gpu/host1x/hw/debug_hw_1x06.c | 3 + + drivers/gpu/host1x/syncpt.c | 21 +- + drivers/gpu/nova-core/Kconfig | 15 + + drivers/gpu/nova-core/api.rs | 73 + + drivers/gpu/nova-core/driver.rs | 125 +- + drivers/gpu/nova-core/falcon.rs | 164 +- + drivers/gpu/nova-core/falcon/fsp.rs | 67 +- + drivers/gpu/nova-core/falcon/gsp.rs | 98 +- + drivers/gpu/nova-core/falcon/hal.rs | 22 +- + drivers/gpu/nova-core/falcon/hal/ga102.rs | 76 +- + drivers/gpu/nova-core/falcon/hal/tu102.rs | 55 +- + drivers/gpu/nova-core/falcon/sec2.rs | 37 +- + drivers/gpu/nova-core/fb.rs | 22 +- + drivers/gpu/nova-core/fb/hal/gb100.rs | 59 +- + drivers/gpu/nova-core/fb/regs.rs | 34 +- + drivers/gpu/nova-core/firmware.rs | 3 +- + drivers/gpu/nova-core/firmware/booter.rs | 2 +- + drivers/gpu/nova-core/firmware/fwsec/bootloader.rs | 30 +- + drivers/gpu/nova-core/firmware/gsp.rs | 119 +- + .../gpu/nova-core/firmware/{fsp.rs => gsp_fmc.rs} | 59 +- + drivers/gpu/nova-core/firmware/radix3.rs | 144 + + drivers/gpu/nova-core/firmware/riscv.rs | 8 +- + drivers/gpu/nova-core/fsp.rs | 45 +- + drivers/gpu/nova-core/gpu.rs | 354 +- + drivers/gpu/nova-core/gpu/regs.rs | 86 + + drivers/gpu/nova-core/gsp.rs | 39 +- + drivers/gpu/nova-core/gsp/boot.rs | 26 +- + drivers/gpu/nova-core/gsp/cmdq.rs | 264 +- + drivers/gpu/nova-core/gsp/cmdq/continuation.rs | 6 +- + drivers/gpu/nova-core/gsp/commands.rs | 48 +- + drivers/gpu/nova-core/gsp/fw.rs | 18 +- + drivers/gpu/nova-core/gsp/fw/commands.rs | 28 + + drivers/gpu/nova-core/gsp/hal.rs | 16 +- + drivers/gpu/nova-core/gsp/hal/gh100.rs | 16 +- + drivers/gpu/nova-core/gsp/hal/tu102.rs | 41 +- + drivers/gpu/nova-core/gsp/regs.rs | 9 +- + drivers/gpu/nova-core/gsp/sequencer.rs | 14 +- + drivers/gpu/nova-core/irq.rs | 29 + + drivers/gpu/nova-core/irq/doorbell_test.rs | 251 + + drivers/gpu/nova-core/irq/gsp.rs | 195 + + drivers/gpu/nova-core/irq/hal.rs | 67 + + drivers/gpu/nova-core/irq/hal/gh100.rs | 40 + + drivers/gpu/nova-core/irq/hal/tu102.rs | 43 + + drivers/gpu/nova-core/irq/interrupt_tree.rs | 682 + + drivers/gpu/nova-core/irq/regs.rs | 88 + + drivers/gpu/nova-core/mctp.rs | 16 +- + drivers/gpu/nova-core/mm.rs | 335 + + drivers/gpu/nova-core/mm/bar_user.rs | 420 + + drivers/gpu/nova-core/mm/hal.rs | 56 + + drivers/gpu/nova-core/mm/hal/gb100.rs | 35 + + drivers/gpu/nova-core/mm/hal/gh100.rs | 35 + + drivers/gpu/nova-core/mm/hal/tu102.rs | 37 + + drivers/gpu/nova-core/mm/pagetable.rs | 424 + + drivers/gpu/nova-core/mm/pagetable/map.rs | 345 + + drivers/gpu/nova-core/mm/pagetable/ver2.rs | 275 + + drivers/gpu/nova-core/mm/pagetable/ver3.rs | 421 + + drivers/gpu/nova-core/mm/pagetable/walk.rs | 244 + + drivers/gpu/nova-core/mm/pramin.rs | 312 + + drivers/gpu/nova-core/mm/regs.rs | 70 + + drivers/gpu/nova-core/mm/tlb.rs | 120 + + drivers/gpu/nova-core/mm/vmm.rs | 346 + + drivers/gpu/nova-core/nova_core.rs | 5 + + drivers/gpu/nova-core/num.rs | 2 +- + drivers/gpu/nova-core/regs.rs | 326 +- + drivers/gpu/nova-core/selftest.rs | 64 + + drivers/gpu/nova-core/vbios.rs | 11 +- + drivers/gpu/tests/gpu_buddy_test.c | 160 +- + drivers/gpu/vga/vga_switcheroo.c | 41 +- + drivers/pci/vgaarb.c | 13 +- + drivers/vfio/pci/vfio_pci_core.c | 9 +- + drivers/video/fbdev/core/fbcon.c | 8 - + drivers/video/fbdev/efifb.c | 2 +- + include/drm/bridge/analogix_dp.h | 1 - + .../drm_fbdev_helper.h} | 4 +- + include/drm/display/drm_dp.h | 1 + + include/drm/display/drm_dp_helper.h | 6 + + include/drm/display/drm_hdmi_helper.h | 15 + + include/drm/display/drm_hdmi_state_helper.h | 11 +- + include/drm/display/drm_scdc.h | 21 +- + include/drm/display/drm_scdc_helper.h | 105 +- + include/drm/drm_atomic.h | 89 +- + include/drm/drm_atomic_state_helper.h | 6 - + include/drm/drm_bridge.h | 103 +- + include/drm/drm_client.h | 14 + + include/drm/drm_client_event.h | 3 + + include/drm/drm_colorop.h | 127 + + include/drm/drm_connector.h | 216 +- + include/drm/drm_crtc.h | 12 - + include/drm/drm_device.h | 1 + + include/drm/drm_edid.h | 2 + + include/drm/drm_gem.h | 14 +- + include/drm/drm_gem_atomic_helper.h | 13 +- + include/drm/drm_gpusvm.h | 77 +- + include/drm/drm_mipi_dbi.h | 2 +- + include/drm/drm_mode_config.h | 4 +- + include/drm/drm_modeset_helper_vtables.h | 53 +- + include/drm/drm_of.h | 15 +- + include/drm/drm_pagemap.h | 7 + + include/drm/drm_panel.h | 99 +- + include/drm/{drm_utils.h => drm_panel_quirks.h} | 10 +- + include/drm/drm_panic.h | 117 +- + include/drm/drm_panic_helper.h | 41 + + include/drm/drm_plane.h | 69 +- + include/drm/drm_print.h | 3 + + include/drm/drm_ras.h | 34 + + include/drm/drm_simple_kms_helper.h | 7 +- + include/drm/drm_sysfs.h | 4 - + include/drm/drm_timeout.h | 17 + + include/drm/gpu_scheduler.h | 10 +- + include/drm/intel/display_parent_interface.h | 24 +- + include/drm/intel/gtt_view_types.h | 79 + + include/drm/intel/pciids.h | 1 + + include/drm/ttm/ttm_resource.h | 2 +- + include/linux/dma-fence.h | 2 +- + include/linux/gpu_buddy.h | 101 +- + include/linux/hdmi.h | 12 + + include/linux/host1x.h | 53 +- + include/linux/vga_switcheroo.h | 29 +- + include/linux/vgaarb.h | 8 +- + include/sound/omap-hdmi-audio.h | 1 + + include/uapi/drm/amdgpu_drm.h | 43 + + include/uapi/drm/drm_mode.h | 12 + + include/uapi/drm/drm_ras.h | 18 + + include/uapi/drm/ivpu_accel.h | 17 +- + include/uapi/drm/nova_drm.h | 146 +- + include/uapi/drm/tegra_drm.h | 4 +- + include/uapi/drm/xe_drm.h | 22 +- + kernel/cgroup/dmem.c | 4 +- + rust/bindings/bindings_helper.h | 5 +- + rust/helpers/dma_fence.c | 49 + + rust/helpers/helpers.c | 1 + + rust/helpers/pci.c | 6 + + rust/kernel/auxiliary.rs | 17 +- + rust/kernel/bitfield.rs | 9 + + rust/kernel/debugfs.rs | 26 +- + rust/kernel/debugfs/entry.rs | 4 +- + rust/kernel/debugfs/file_ops.rs | 29 +- + rust/kernel/device_id.rs | 3 +- + rust/kernel/dma.rs | 141 +- + rust/kernel/dma_buf/dma_fence.rs | 1022 + + rust/kernel/dma_buf/mod.rs | 14 + + rust/kernel/drm/driver.rs | 75 +- + rust/kernel/drm/gem/mod.rs | 13 +- + rust/kernel/drm/gem/shmem.rs | 5 +- + rust/kernel/io.rs | 220 +- + rust/kernel/io/register.rs | 803 +- + rust/kernel/io/resource.rs | 8 + + rust/kernel/lib.rs | 2 + + rust/kernel/maple_tree.rs | 30 +- + rust/kernel/mem.rs | 230 + + rust/kernel/pci.rs | 14 + + rust/kernel/pci/irq.rs | 68 +- + rust/kernel/sync/atomic.rs | 4 +- + rust/kernel/uaccess.rs | 18 +- + rust/macros/io/mod.rs | 3 + + rust/macros/io/register.rs | 296 + + rust/macros/lib.rs | 9 + + samples/rust/rust_dma.rs | 30 +- + samples/rust/rust_driver_pci.rs | 4 + + sound/soc/ti/omap-hdmi.c | 51 +- + 1824 files changed, 287688 insertions(+), 34422 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-intel-xe-gpu + create mode 100644 Documentation/devicetree/bindings/display/bridge/renesas,r8a779g0-dsc.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/ilitek,ili7836a.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/novatek,nt36532.yaml + create mode 100644 Documentation/devicetree/bindings/display/solomon,ssd1351.yaml + create mode 100644 Documentation/gpu/amdgpu/ualink.rst + create mode 100644 Documentation/gpu/nova/core/interrupts.rst + create mode 100644 Documentation/gpu/nova/core/pramin.rst + create mode 100644 Documentation/gpu/xe/xe_sigid.rst + delete mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ioc32.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_sdma_types.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_ualink.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vm_internal.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v8_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/hdp_v8_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/ih_v8_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/ih_v8_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/lsdma_v8_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/lsdma_v8_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v5_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v5_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbif_v7_10.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbif_v7_10.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_11_5.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_11_5.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v15_0_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/psp_v15_0_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v15_0_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/smuio_v15_0_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/ualink_v1_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/ualink_v1_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vpe_v3_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vpe_v3_0.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/dcn10_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn10/dcn10_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn60/dcn60_smu_driver_if.h + create mode 100644 drivers/gpu/drm/amd/display/dc/core2/CMakeLists.txt + create mode 100644 drivers/gpu/drm/amd/display/dc/core2/dc_core2.c + create mode 100644 drivers/gpu/drm/amd/display/dc/core2/dc_core2.h + create mode 100644 drivers/gpu/drm/amd/display/dc/core2/dc_core2_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/core2/dc_core2_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_api_dispatch/CMakeLists.txt + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_api_dispatch/api_shim.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_api_dispatch/api_shim.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dc_edid_parser.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_memory_pool.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dc_memory_pool.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/dml2_0/dml21/dml21_wrapper.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_wrapper/Makefile + rename drivers/gpu/drm/amd/display/dc/{dml2_0/dml21 => dml2_wrapper/dml21_wrapper}/dml21_translation_helper.c (96%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0/dml21 => dml2_wrapper/dml21_wrapper}/dml21_translation_helper.h (94%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0/dml21 => dml2_wrapper/dml21_wrapper}/dml21_utils.c (97%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0/dml21 => dml2_wrapper/dml21_wrapper}/dml21_utils.h (96%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0/dml21 => dml2_wrapper/dml21_wrapper}/dml21_wrapper.c (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2_wrapper/dml21_wrapper/dml21_wrapper.h + rename drivers/gpu/drm/amd/display/dc/{dml2_0/dml21 => dml2_wrapper/dml21_wrapper}/dml21_wrapper_fpu.c (96%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0/dml21 => dml2_wrapper/dml21_wrapper}/dml21_wrapper_fpu.h (95%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_dc_resource_mgmt.c (96%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_dc_resource_mgmt.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_dc_types.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_internal_types.h (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_mall_phantom.c (97%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_mall_phantom.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_policy.c (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_policy.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_translation_helper.c (99%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_translation_helper.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_utils.c (98%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_utils.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_wrapper.c (97%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_wrapper.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_wrapper_fpu.c (93%) + rename drivers/gpu/drm/amd/display/dc/{dml2_0 => dml2_wrapper}/dml2_wrapper_fpu.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/dpp/dcn60/dcn60_dpp_cm.c + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/dc_core_interface.h + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/rmcm.h + create mode 100644 drivers/gpu/drm/amd/display/dc/rmcm/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/rmcm/dcn42/dcn42_rmcm.c + create mode 100644 drivers/gpu/drm/amd/display/dc/rmcm/dcn42/dcn42_rmcm.h + create mode 100644 drivers/gpu/drm/amd/display/dc/rmcm/dcn60/dcn60_rmcm.c + rename drivers/gpu/drm/amd/display/dc/{dc_edid_parser.h => rmcm/dcn60/dcn60_rmcm.h} (71%) + delete mode 100644 drivers/gpu/drm/amd/display/dc/sspl/spl_custom_float.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/sspl/spl_custom_float.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/sspl/spl_fixpt31_32.h + create mode 100644 drivers/gpu/drm/amd/display/dc/sspl/spl_namespace.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_8_0_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/hdp/hdp_8_0_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/lsdma/lsdma_8_0_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/lsdma/lsdma_8_0_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_15_0_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_15_0_3_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbif/nbif_7_10_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbif/nbif_7_10_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_5_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_5_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_8_0_1_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/oss/osssys_8_0_1_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/pcie/pcie_6_1_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/pcie/pcie_6_1_3_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_15_0_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/smuio/smuio_15_0_3_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vpe/vpe_3_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vpe/vpe_3_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/mpnht/irqsrcs_mpnht_15_0.h + create mode 100644 drivers/gpu/drm/amd/include/soc_v2_0_ih_clientid.h + create mode 100644 drivers/gpu/drm/amd/ras/core/aca_v5_0.c + create mode 100644 drivers/gpu/drm/amd/ras/core/aca_v5_0.h + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_bert.c + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_bert.h + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_eeprom_mgr.c + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_eeprom_mgr.h + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_mce.c + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_mce.h + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_mp1_v15_0.c + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_mp1_v15_0.h + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_psp_v15_0.c + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_psp_v15_0.h + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_psp_v15_0_3.c + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_psp_v15_0_3.h + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_umc_v13_0.c + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_umc_v13_0.h + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_umc_v15_0.c + create mode 100644 drivers/gpu/drm/amd/ras/core/ras_umc_v15_0.h + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.c + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_bert.h + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mce.c + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mce.h + create mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1.c + rename drivers/gpu/drm/amd/ras/ras_mgr/{amdgpu_ras_mp1_v13_0.h => amdgpu_ras_mp1.h} (86%) + delete mode 100644 drivers/gpu/drm/amd/ras/ras_mgr/amdgpu_ras_mp1_v13_0.c + delete mode 100644 drivers/gpu/drm/bridge/panel.c + delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-fails.txt + delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-flakes.txt + delete mode 100644 drivers/gpu/drm/ci/xfails/msm-sc7180-trogdor-lazor-limozeen-skips.txt + rename drivers/gpu/drm/{drm_fb_helper.c => clients/drm_fbdev_helper.c} (97%) + create mode 100644 drivers/gpu/drm/drm_panic_helper.c + rename drivers/gpu/drm/{drm_panic_qr.rs => drm_panic_helper_qr.rs} (99%) + create mode 100644 drivers/gpu/drm/drm_panic_internal.h + create mode 100644 drivers/gpu/drm/drm_timeout.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dip.c + create mode 100644 drivers/gpu/drm/i915/display/intel_dip.h + create mode 100644 drivers/gpu/drm/i915/display/intel_dip_regs.h + delete mode 100644 drivers/gpu/drm/i915/display/intel_tdf.h + delete mode 100644 drivers/gpu/drm/i915/i915_gtt_view_types.h + create mode 100644 drivers/gpu/drm/msm/adreno/a7xx_catalog.c + create mode 100644 drivers/gpu/drm/msm/adreno/a8xx_catalog.c + create mode 100644 drivers/gpu/drm/nouveau/nvkm/subdev/pci/mcp79.c + create mode 100644 drivers/gpu/drm/panel/panel-ilitek-ili7836a.c + create mode 100644 drivers/gpu/drm/panel/panel-novatek-nt36532.c + create mode 100644 drivers/gpu/drm/panel/panel-samsung-dsi.h + create mode 100644 drivers/gpu/drm/renesas/rcar-du/rcar_dsc.c + create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg3l_lvds.c + create mode 100644 drivers/gpu/drm/renesas/rz-du/rzg3l_lvds_regs.h + rename drivers/gpu/drm/tests/{drm_panic_test.c => drm_panic_helper_test.c} (77%) + create mode 100755 drivers/gpu/drm/vkms/tests/gen_yuv_conversion.py + create mode 100644 drivers/gpu/drm/xe/abi/xe_log_abi.h + create mode 100644 drivers/gpu/drm/xe/abi/xe_sigid_abi.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_config.h + delete mode 100644 drivers/gpu/drm/xe/compat-i915-headers/i915_gtt_view_types.h + create mode 100644 drivers/gpu/drm/xe/display/xe_display_wa.h + delete mode 100644 drivers/gpu/drm/xe/display/xe_tdf.c + create mode 100644 drivers/gpu/drm/xe/tests/xe_any_kunit.c + create mode 100644 drivers/gpu/drm/xe/tests/xe_log_kunit.c + create mode 100644 drivers/gpu/drm/xe/xe_any.h + create mode 100644 drivers/gpu/drm/xe/xe_cpu_bind.c + create mode 100644 drivers/gpu/drm/xe/xe_cpu_bind.h + create mode 100644 drivers/gpu/drm/xe/xe_log.c + create mode 100644 drivers/gpu/drm/xe/xe_log.h + create mode 100644 drivers/gpu/nova-core/api.rs + rename drivers/gpu/nova-core/firmware/{fsp.rs => gsp_fmc.rs} (67%) + create mode 100644 drivers/gpu/nova-core/firmware/radix3.rs + create mode 100644 drivers/gpu/nova-core/gpu/regs.rs + create mode 100644 drivers/gpu/nova-core/irq.rs + create mode 100644 drivers/gpu/nova-core/irq/doorbell_test.rs + create mode 100644 drivers/gpu/nova-core/irq/gsp.rs + create mode 100644 drivers/gpu/nova-core/irq/hal.rs + create mode 100644 drivers/gpu/nova-core/irq/hal/gh100.rs + create mode 100644 drivers/gpu/nova-core/irq/hal/tu102.rs + create mode 100644 drivers/gpu/nova-core/irq/interrupt_tree.rs + create mode 100644 drivers/gpu/nova-core/irq/regs.rs + create mode 100644 drivers/gpu/nova-core/mm.rs + create mode 100644 drivers/gpu/nova-core/mm/bar_user.rs + create mode 100644 drivers/gpu/nova-core/mm/hal.rs + create mode 100644 drivers/gpu/nova-core/mm/hal/gb100.rs + create mode 100644 drivers/gpu/nova-core/mm/hal/gh100.rs + create mode 100644 drivers/gpu/nova-core/mm/hal/tu102.rs + create mode 100644 drivers/gpu/nova-core/mm/pagetable.rs + create mode 100644 drivers/gpu/nova-core/mm/pagetable/map.rs + create mode 100644 drivers/gpu/nova-core/mm/pagetable/ver2.rs + create mode 100644 drivers/gpu/nova-core/mm/pagetable/ver3.rs + create mode 100644 drivers/gpu/nova-core/mm/pagetable/walk.rs + create mode 100644 drivers/gpu/nova-core/mm/pramin.rs + create mode 100644 drivers/gpu/nova-core/mm/regs.rs + create mode 100644 drivers/gpu/nova-core/mm/tlb.rs + create mode 100644 drivers/gpu/nova-core/mm/vmm.rs + create mode 100644 drivers/gpu/nova-core/selftest.rs + rename include/drm/{drm_fb_helper.h => clients/drm_fbdev_helper.h} (99%) + rename include/drm/{drm_utils.h => drm_panel_quirks.h} (57%) + create mode 100644 include/drm/drm_panic_helper.h + create mode 100644 include/drm/drm_timeout.h + create mode 100644 include/drm/intel/gtt_view_types.h + create mode 100644 rust/helpers/dma_fence.c + create mode 100644 rust/kernel/dma_buf/dma_fence.rs + create mode 100644 rust/kernel/dma_buf/mod.rs + create mode 100644 rust/macros/io/mod.rs + create mode 100644 rust/macros/io/register.rs +$ git am -3 ../patches/0001-drm-Fix-sanitizers.patch +Applying: drm: Fix sanitizers +Using index info to reconstruct a base tree... +M drivers/gpu/drm/amd/display/dc/dml/Makefile +M drivers/gpu/drm/amd/display/dc/dml2_0/Makefile +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging drm-exynos/for-linux-next (3a8660878839f Linux 6.18-rc1) +$ git merge -m Merge branch 'for-linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/daeinki/drm-exynos.git drm-exynos/for-linux-next +Already up to date. +Merging drm-misc/for-linux-next (1b15fa434b4b4 Merge tag 'drm-misc-next-2026-10-02' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/misc/kernel.git drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (c54e4d1050772 drm/amdgpu: make Mac FB workaround generic) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux.git amdgpu/drm-next +Already up to date. +Merging drm-intel/for-linux-next (1b15fa434b4b4 Merge tag 'drm-misc-next-2026-10-02' of https://gitlab.freedesktop.org/drm/misc/kernel into drm-next) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/i915/kernel.git drm-intel/for-linux-next +Already up to date. +Merging drm-msm/msm-next (d024361c631b3 drm/msm/a6xx: Split out a7xx/a8xx device tables) +$ 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 (6b93e8b453fa2 drm/msm/dpu: round up the compressed INTF width) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging drm-xe/drm-xe-next (f7f8e453bef8e drm/xe/uc: Add missing HuC firmware entry for Alderlake-N) +$ git merge -m Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git drm-xe/drm-xe-next +Auto-merging drivers/gpu/drm/xe/Makefile +Auto-merging drivers/gpu/drm/xe/display/xe_fb_pin.c +Auto-merging drivers/gpu/drm/xe/xe_bo.c +Auto-merging drivers/gpu/drm/xe/xe_sysctrl_mailbox.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/xe/xe_sysctrl_mailbox.c +Auto-merging drivers/gpu/drm/xe/xe_vm.c +Auto-merging drivers/mtd/devices/mtd_intel_dg.c +Resolved 'drivers/gpu/drm/xe/xe_sysctrl_mailbox.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b680b6d604dba] Merge branch 'drm-xe-next' of https://gitlab.freedesktop.org/drm/xe/kernel.git +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/xe/Makefile | 1 + + drivers/gpu/drm/xe/abi/xe_sigid_abi.h | 16 +- + drivers/gpu/drm/xe/regs/xe_gt_regs.h | 3 + + drivers/gpu/drm/xe/tests/xe_dma_buf.c | 89 +++++ + drivers/gpu/drm/xe/xe_bo.c | 11 +- + drivers/gpu/drm/xe/xe_debugfs.c | 4 + + drivers/gpu/drm/xe/xe_device.c | 29 ++ + drivers/gpu/drm/xe/xe_device.h | 2 + + drivers/gpu/drm/xe/xe_drm_ras.c | 17 +- + drivers/gpu/drm/xe/xe_exec.c | 7 +- + drivers/gpu/drm/xe/xe_execlist.c | 6 +- + drivers/gpu/drm/xe/xe_gpu_scheduler_types.h | 5 +- + drivers/gpu/drm/xe/xe_gt_sriov_pf_service.c | 1 + + drivers/gpu/drm/xe/xe_guc_exec_queue_types.h | 5 +- + drivers/gpu/drm/xe/xe_guc_submit.c | 58 ++- + drivers/gpu/drm/xe/xe_hw_engine.c | 37 +- + drivers/gpu/drm/xe/xe_module.c | 24 +- + drivers/gpu/drm/xe/xe_nvm.c | 13 +- + drivers/gpu/drm/xe/xe_oa.c | 7 + + drivers/gpu/drm/xe/xe_sysctrl_debugfs.c | 500 ++++++++++++++++++++++++++ + drivers/gpu/drm/xe/xe_sysctrl_debugfs.h | 14 + + drivers/gpu/drm/xe/xe_sysctrl_event.c | 14 +- + drivers/gpu/drm/xe/xe_sysctrl_mailbox.c | 140 ++++---- + drivers/gpu/drm/xe/xe_sysctrl_mailbox.h | 6 +- + drivers/gpu/drm/xe/xe_sysctrl_mailbox_types.h | 37 ++ + drivers/gpu/drm/xe/xe_sysctrl_types.h | 47 +++ + drivers/gpu/drm/xe/xe_ttm_vram_mgr.c | 59 ++- + drivers/gpu/drm/xe/xe_ttm_vram_mgr_types.h | 4 +- + drivers/gpu/drm/xe/xe_uc_fw.c | 1 + + drivers/gpu/drm/xe/xe_validation.h | 2 + + drivers/gpu/drm/xe/xe_vm.c | 49 ++- + drivers/gpu/drm/xe/xe_vm.h | 2 + + drivers/mtd/devices/mtd_intel_dg.c | 65 +++- + include/drm/intel/pciids.h | 3 +- + include/linux/intel_dg_nvm_aux.h | 1 + + 35 files changed, 1113 insertions(+), 166 deletions(-) + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_debugfs.c + create mode 100644 drivers/gpu/drm/xe/xe_sysctrl_debugfs.h +$ git am -3 ../patches/0001-drm-xe-Fix-up-merge-issue.patch +Applying: drm: xe: Fix up merge issue +Using index info to reconstruct a base tree... +M drivers/gpu/drm/xe/xe_ttm_vram_mgr.c +Falling back to patching base and 3-way merge... +Auto-merging drivers/gpu/drm/xe/xe_ttm_vram_mgr.c +No changes -- Patch already applied. +Merging drm-rust/for-linux-next (d511064b2e732 rust: drm: Remove unused flags argument from Registration::new()) +$ git merge -m Merge branch 'for-linux-next' of https://gitlab.freedesktop.org/drm/rust/kernel.git drm-rust/for-linux-next +Already up to date. +Merging drm-nova/nova-next (93296e9d9528f gpu: nova-core: vbios: store reference to Device where relevant) +$ git merge -m Merge branch 'nova-next' of https://gitlab.freedesktop.org/drm/nova.git drm-nova/nova-next +Already up to date. +Merging etnaviv/etnaviv/next (6bde14ba5f7ef drm/etnaviv: add optional reset support) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Already up to date. +Merging fbdev/for-next (b40e7ffea0669 MAINTAINERS: name the deller/linux-fbdev for-next branch) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/video/fbdev/efifb.c +Auto-merging drivers/video/fbdev/ssd1307fb.c +CONFLICT (content): Merge conflict in drivers/video/fbdev/ssd1307fb.c +Resolved 'drivers/video/fbdev/ssd1307fb.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1dc00d26d174f] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 +- + drivers/hid/hid-picolcd_fb.c | 12 ++++-- + drivers/video/fbdev/acornfb.c | 57 ++++++------------------- + drivers/video/fbdev/acornfb.h | 9 +--- + drivers/video/fbdev/atafb.c | 28 +----------- + drivers/video/fbdev/atmel_lcdfb.c | 11 +++-- + drivers/video/fbdev/aty/aty128fb.c | 2 +- + drivers/video/fbdev/aty/atyfb_base.c | 4 +- + drivers/video/fbdev/aty/mach64_cursor.c | 2 +- + drivers/video/fbdev/aty/radeon_base.c | 4 +- + drivers/video/fbdev/aty/radeon_monitor.c | 4 +- + drivers/video/fbdev/aty/radeonfb.h | 2 +- + drivers/video/fbdev/au1100fb.c | 2 +- + drivers/video/fbdev/core/Kconfig | 6 --- + drivers/video/fbdev/core/fb_info.c | 1 + + drivers/video/fbdev/efifb.c | 4 +- + drivers/video/fbdev/grvga.c | 2 +- + drivers/video/fbdev/gxt4500.c | 1 + + drivers/video/fbdev/kyro/STG4000OverlayDevice.c | 2 +- + drivers/video/fbdev/kyro/fbdev.c | 4 +- + drivers/video/fbdev/maxinefb.c | 2 +- + drivers/video/fbdev/mmp/core.c | 2 +- + drivers/video/fbdev/mmp/hw/mmp_ctrl.c | 4 +- + drivers/video/fbdev/mmp/hw/mmp_ctrl.h | 4 +- + drivers/video/fbdev/mmp/hw/mmp_spi.c | 2 +- + drivers/video/fbdev/nvidia/nvidia.c | 1 + + drivers/video/fbdev/ocfb.c | 2 +- + drivers/video/fbdev/omap2/omapfb/dss/dispc.c | 4 +- + drivers/video/fbdev/pm2fb.c | 2 +- + drivers/video/fbdev/s1d13xxxfb.c | 6 +-- + drivers/video/fbdev/sh_mobile_lcdcfb.c | 43 +++++++++++++------ + drivers/video/fbdev/skeletonfb.c | 6 +-- + drivers/video/fbdev/smscufx.c | 9 ++-- + drivers/video/fbdev/ssd1307fb.c | 6 ++- + drivers/video/fbdev/sstfb.c | 5 ++- + drivers/video/fbdev/tgafb.c | 6 +-- + drivers/video/fbdev/tridentfb.c | 2 +- + drivers/video/fbdev/udlfb.c | 14 ++++-- + drivers/video/fbdev/via/dvi.c | 6 +-- + drivers/video/fbdev/via/hw.c | 2 +- + drivers/video/fbdev/via/viafbdev.c | 4 +- + drivers/video/fbdev/xen-fbfront.c | 7 ++- + drivers/video/sticore.c | 2 +- + include/video/mmp_disp.h | 6 +-- + 44 files changed, 144 insertions(+), 162 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-drm-hyperv-Remove-reference-to-hyperv_fb-.patch +Applying: fix up for "drm/hyperv: Remove reference to hyperv_fb driver" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/hyperv/Kconfig +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master d587ab42c2de2] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git + Date: Wed Oct 14 13:53:14 2026 +0100 +Merging regmap/for-next (9f19c8a019d7c Merge regmap/for-7.4 into regmap-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/internal.h | 12 ++ + drivers/base/regmap/regcache-rbtree.c | 4 +- + drivers/base/regmap/regcache.c | 156 ++++++++++++-------------- + drivers/base/regmap/regmap-debugfs.c | 118 ++++++++----------- + drivers/base/regmap/regmap-kunit.c | 98 +++++++++++++++- + drivers/base/regmap/regmap-ram.c | 26 ++++- + drivers/base/regmap/regmap-raw-ram.c | 21 ++-- + drivers/base/regmap/regmap.c | 205 ++++++++++++---------------------- + 8 files changed, 329 insertions(+), 311 deletions(-) +Merging sound/for-next (a68a688ce220f ALSA: usb-audio: Use fixed control index for us16x08 mixer elements) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/scan.c +Auto-merging sound/core/pcm_native.c +Auto-merging sound/hda/codecs/side-codecs/cs35l41_hda.c +CONFLICT (content): Merge conflict in sound/hda/codecs/side-codecs/cs35l41_hda.c +Auto-merging sound/hda/codecs/side-codecs/tas2781_hda_i2c.c +Resolved 'sound/hda/codecs/side-codecs/cs35l41_hda.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 474c7b51c2564] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git +$ git diff -M --stat --summary HEAD^.. + Documentation/sound/alsa-configuration.rst | 6 + + Documentation/sound/cards/hdspm.rst | 109 ++--- + MAINTAINERS | 13 + + drivers/acpi/scan.c | 1 + + drivers/platform/x86/serial-multi-instantiate.c | 1 + + include/sound/control.h | 4 +- + include/sound/core.h | 1 - + include/sound/emu10k1.h | 4 +- + include/sound/emux_legacy.h | 2 +- + include/sound/hda_codec.h | 6 +- + include/sound/hdaudio.h | 12 +- + include/sound/rawmidi.h | 1 + + include/uapi/sound/asound.h | 3 +- + sound/core/control.c | 2 + + sound/core/control_led.c | 62 ++- + sound/core/info.c | 3 +- + sound/core/init.c | 66 +-- + sound/core/jack.c | 5 +- + sound/core/pcm_compat.c | 4 +- + sound/core/pcm_native.c | 62 ++- + sound/core/rawmidi.c | 86 +++- + sound/core/seq/Kconfig | 7 +- + sound/core/seq/oss/seq_oss.c | 3 + + sound/core/seq/oss/seq_oss_init.c | 2 +- + sound/core/seq/oss/seq_oss_midi.c | 5 + + sound/core/seq/seq_clientmgr.c | 27 +- + sound/core/seq/seq_compat.c | 15 +- + sound/core/seq/seq_ports.c | 41 +- + sound/core/seq/seq_ports.h | 1 + + sound/core/timer.c | 2 + + sound/core/timer_compat.c | 1 + + sound/core/ump.c | 2 +- + sound/core/vmaster.c | 7 +- + sound/drivers/aloop.c | 31 +- + sound/drivers/dummy.c | 10 +- + sound/drivers/mpu401/mpu401_uart.c | 8 +- + sound/drivers/pcmtest.c | 132 ++---- + sound/drivers/serial-generic.c | 10 +- + sound/firewire/bebob/bebob_hwdep.c | 2 +- + sound/hda/codecs/ca0132.c | 391 +++++++++++++++- + sound/hda/codecs/cirrus/cs8409-tables.c | 9 +- + sound/hda/codecs/cirrus/cs8409.c | 52 ++- + sound/hda/codecs/cirrus/cs8409.h | 4 + + sound/hda/codecs/conexant.c | 80 ++++ + sound/hda/codecs/hdmi/eld.c | 6 +- + sound/hda/codecs/hdmi/hdmi.c | 5 +- + sound/hda/codecs/realtek/alc269.c | 299 ++++++++++-- + sound/hda/codecs/realtek/alc882.c | 2 +- + sound/hda/codecs/side-codecs/Kconfig | 1 + + sound/hda/codecs/side-codecs/cs35l41_hda.c | 12 +- + sound/hda/codecs/side-codecs/cs35l41_hda_i2c.c | 3 + + .../hda/codecs/side-codecs/cs35l41_hda_property.c | 32 ++ + sound/hda/codecs/side-codecs/tas2781_hda_i2c.c | 19 +- + sound/hda/codecs/sigmatel.c | 6 +- + sound/hda/common/bind.c | 15 +- + sound/hda/common/codec.c | 18 +- + sound/hda/common/hda_jack.h | 1 + + sound/hda/common/jack.c | 88 ++-- + sound/hda/controllers/acpi.c | 41 ++ + sound/hda/controllers/intel.c | 33 +- + sound/hda/core/bus.c | 38 +- + sound/hda/core/component.c | 5 +- + sound/hda/core/controller.c | 24 +- + sound/hda/core/device.c | 13 +- + sound/hda/core/local.h | 2 + + sound/i2c/other/ak4113.c | 2 +- + sound/i2c/other/ak4114.c | 2 +- + sound/i2c/other/ak4xxx-adda.c | 2 +- + sound/isa/galaxy/galaxy.c | 10 +- + sound/isa/opti9xx/opti92x-ad1848.c | 2 +- + sound/isa/sc6000.c | 10 +- + sound/mips/hal2.c | 34 +- + sound/mips/sgio2audio.c | 43 +- + sound/mips/snd-n64.c | 63 ++- + sound/oss/dmasound/dmasound_q40.c | 65 ++- + sound/parisc/harmony.c | 24 +- + sound/pci/ac97/ac97_codec.c | 2 +- + sound/pci/ac97/ac97_patch.c | 2 +- + sound/pci/ad1889.c | 13 +- + sound/pci/ali5451/ali5451.c | 13 +- + sound/pci/als300.c | 11 +- + sound/pci/als4000.c | 13 +- + sound/pci/atiixp.c | 13 +- + sound/pci/atiixp_modem.c | 13 +- + sound/pci/au88x0/au88x0.c | 11 +- + sound/pci/au88x0/au88x0.h | 2 +- + sound/pci/au88x0/au88x0_mpu401.c | 2 +- + sound/pci/aw2/aw2-alsa.c | 11 +- + sound/pci/aw2/aw2-saa7146.c | 4 +- + sound/pci/azt3328.c | 11 +- + sound/pci/bt87x.c | 13 +- + sound/pci/ca0106/ca0106_main.c | 11 +- + sound/pci/cmipci.c | 11 +- + sound/pci/cs4281.c | 15 +- + sound/pci/cs46xx/cs46xx.c | 25 +- + sound/pci/cs46xx/cs46xx_lib.c | 6 +- + sound/pci/cs46xx/dsp_spos_scb_lib.c | 8 +- + sound/pci/cs5535audio/cs5535audio.c | 13 +- + sound/pci/ctxfi/xfi.c | 23 +- + sound/pci/echoaudio/echoaudio.c | 18 +- + sound/pci/echoaudio/echoaudio.h | 4 +- + sound/pci/emu10k1/emu10k1x.c | 13 +- + sound/pci/ens1370.c | 13 +- + sound/pci/es1938.c | 13 +- + sound/pci/es1968.c | 13 +- + sound/pci/fm801.c | 13 +- + sound/pci/ice1712/ice1724.c | 13 +- + sound/pci/intel8x0.c | 14 +- + sound/pci/intel8x0m.c | 13 +- + sound/pci/korg1212/korg1212.c | 11 +- + sound/pci/lola/lola.c | 13 +- + sound/pci/lx6464es/lx6464es.c | 11 +- + sound/pci/lx6464es/lx_core.c | 2 +- + sound/pci/lx6464es/lx_defs.h | 2 +- + sound/pci/maestro3.c | 11 +- + sound/pci/oxygen/oxygen_lib.c | 15 +- + sound/pci/oxygen/oxygen_pcm.c | 37 +- + sound/pci/pcxhr/pcxhr_core.c | 4 +- + sound/pci/riptide/riptide.c | 15 +- + sound/pci/rme32.c | 13 +- + sound/pci/rme96.c | 13 +- + sound/pci/rme9652/hdsp.c | 13 +- + sound/pci/rme9652/hdspm.c | 12 +- + sound/pci/rme9652/rme9652.c | 11 +- + sound/pci/sis7019.c | 13 +- + sound/pci/sonicvibes.c | 13 +- + sound/pci/trident/trident_memory.c | 2 +- + sound/pci/via82xx.c | 24 +- + sound/pci/via82xx_modem.c | 13 +- + sound/pci/vx222/vx222_ops.c | 2 +- + sound/pci/ymfpci/ymfpci.c | 13 +- + sound/pcmcia/vx/vxp_ops.c | 2 +- + sound/ppc/powermac.c | 35 +- + sound/ppc/tumbler.c | 2 +- + sound/sh/sh_dac_audio.c | 22 +- + sound/soc/codecs/hda.c | 7 + + sound/soc/codecs/tas675x.c | 10 +- + sound/soc/fsl/fsl_asrc_m2m.c | 2 + + sound/soc/sof/intel/hda-codec.c | 4 +- + sound/sparc/cs4231.c | 49 +- + sound/sparc/dbri.c | 37 +- + sound/synth/emux/emux_oss.c | 14 +- + sound/usb/Makefile | 1 + + sound/usb/caiaq/Makefile | 2 +- + sound/usb/caiaq/device.c | 22 +- + sound/usb/caiaq/device.h | 16 +- + sound/usb/caiaq/input.c | 29 +- + sound/usb/caiaq/lcd.c | 258 +++++++++++ + sound/usb/caiaq/lcd.h | 7 + + sound/usb/caiaq/midi.c | 2 + + sound/usb/card.h | 1 + + sound/usb/clock.c | 27 ++ + sound/usb/endpoint.c | 16 + + sound/usb/line6/capture.c | 3 +- + sound/usb/line6/pcm.c | 16 +- + sound/usb/midi.c | 69 +-- + sound/usb/mixer.c | 392 ++++++++++------ + sound/usb/mixer.h | 10 +- + sound/usb/mixer_evo.c | 505 +++++++++++++++++++++ + sound/usb/mixer_evo.h | 12 + + sound/usb/mixer_maps.c | 13 + + sound/usb/mixer_quirks.c | 7 +- + sound/usb/mixer_scarlett.c | 18 +- + sound/usb/mixer_us16x08.c | 39 +- + sound/usb/mixer_us16x08.h | 2 +- + sound/usb/quirks-table.h | 253 ++++++++++- + sound/usb/quirks.c | 277 ++++++++++- + sound/usb/usbaudio.h | 6 + + sound/virtio/virtio_pcm.h | 2 + + sound/virtio/virtio_pcm_msg.c | 19 + + sound/virtio/virtio_pcm_ops.c | 1 + + sound/x86/intel_hdmi_audio.c | 19 +- + tools/testing/selftests/alsa/.gitignore | 1 + + tools/testing/selftests/alsa/Makefile | 2 +- + tools/testing/selftests/alsa/aloop-test.c | 345 ++++++++++++++ + tools/testing/selftests/alsa/mixer-test.c | 490 +++++++++++++++++++- + tools/testing/selftests/alsa/utimer-test.c | 6 + + 177 files changed, 4553 insertions(+), 1370 deletions(-) + create mode 100644 sound/usb/caiaq/lcd.c + create mode 100644 sound/usb/caiaq/lcd.h + create mode 100644 sound/usb/mixer_evo.c + create mode 100644 sound/usb/mixer_evo.h + create mode 100644 tools/testing/selftests/alsa/aloop-test.c +Merging ieee1394/for-next (82d59eb7f5431 firewire: core: add kerneldoc for inbound transaction-related symbols) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Merge made by the 'ort' strategy. + Documentation/driver-api/firewire.rst | 5 + + drivers/firewire/.kunitconfig | 1 + + drivers/firewire/Kconfig | 16 ++ + drivers/firewire/Makefile | 2 + + drivers/firewire/config-rom-generator-test.c | 407 +++++++++++++++++++++++++++ + drivers/firewire/config-rom-parser-test.c | 355 +++++++++++++++++++++++ + drivers/firewire/core-card.c | 11 +- + drivers/firewire/core-cdev.c | 299 ++++++++++---------- + drivers/firewire/core-device.c | 4 + + drivers/firewire/core-topology.c | 3 + + drivers/firewire/core-transaction.c | 376 ++++++++++++++----------- + drivers/firewire/device-attribute-test.c | 4 +- + drivers/firewire/ohci-serdes-test.c | 4 +- + drivers/firewire/ohci.c | 320 ++++++++++++++------- + drivers/firewire/ohci.h | 2 +- + drivers/firewire/uapi-test.c | 20 ++ + include/linux/firewire.h | 153 ++++++++-- + include/uapi/linux/firewire-cdev.h | 4 +- + tools/firewire/nosy-dump.c | 10 +- + 19 files changed, 1533 insertions(+), 463 deletions(-) + create mode 100644 drivers/firewire/config-rom-generator-test.c + create mode 100644 drivers/firewire/config-rom-parser-test.c +Merging sound-asoc/for-next (54940f76f33c5 Merge asoc/for-7.4 into asoc-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging sound/hda/codecs/side-codecs/aw88399_hda.c +Auto-merging sound/soc/amd/acp-es8336.c +Auto-merging sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c +Auto-merging sound/soc/codecs/hda.c +Auto-merging sound/soc/fsl/fsl_asrc_m2m.c +Auto-merging sound/soc/intel/boards/sof_cirrus_common.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/adi,adau1372.yaml | 10 +- + .../devicetree/bindings/sound/adi,adau7118.yaml | 22 +- + .../bindings/sound/airoha,an7581-afe.yaml | 41 + + .../bindings/sound/airoha,an7581-wm8960.yaml | 71 + + .../bindings/sound/amlogic,gx-sound-card.yaml | 20 +- + .../bindings/sound/asahi-kasei,ak4619.yaml | 16 +- + .../bindings/sound/audio-graph-port.yaml | 10 +- + .../devicetree/bindings/sound/cirrus,cs35l45.yaml | 146 +- + .../devicetree/bindings/sound/cirrus,cs4270.yaml | 12 +- + .../devicetree/bindings/sound/cirrus,cs42l42.yaml | 42 +- + .../devicetree/bindings/sound/cirrus,cs42l84.yaml | 18 +- + .../devicetree/bindings/sound/cirrus,cs42xx8.yaml | 56 +- + .../bindings/sound/davinci-evm-audio.txt | 49 - + .../devicetree/bindings/sound/dialog,da7219.yaml | 62 +- + .../bindings/sound/esstech,es9039q2m.yaml | 94 + + .../devicetree/bindings/sound/everest,es8316.yaml | 5 + + .../bindings/sound/foursemi,fs2105s.yaml | 2 +- + .../devicetree/bindings/sound/fsl,easrc.yaml | 45 + + .../devicetree/bindings/sound/fsl,imx-asrc.yaml | 45 +- + .../devicetree/bindings/sound/fsl,sai.yaml | 14 +- + .../bindings/sound/hisilicon,hi6210-i2s.yaml | 4 + + .../devicetree/bindings/sound/imx-audio-card.yaml | 4 +- + .../devicetree/bindings/sound/imx-audmux.yaml | 8 +- + .../bindings/sound/invensense,ics43432.yaml | 8 +- + .../bindings/sound/loongson,ls-audio-card.yaml | 4 +- + .../bindings/sound/mediatek,mt2701-audio.yaml | 10 +- + .../bindings/sound/mediatek,mt8173-afe-pcm.yaml | 22 +- + .../bindings/sound/mediatek,mt8183-audio.yaml | 82 +- + .../sound/mt8186-mt6366-da7219-max98357.yaml | 36 +- + .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 36 +- + .../sound/mt8192-mt6359-rt1015-rt5682.yaml | 46 +- + .../devicetree/bindings/sound/mt8195-mt6359.yaml | 50 +- + .../devicetree/bindings/sound/nuvoton,nau8360.yaml | 115 + + .../bindings/sound/nvidia,tegra30-ahub.txt | 88 - + .../bindings/sound/nvidia,tegra30-ahub.yaml | 289 +++ + .../sound/qcom,msm8916-wcd-digital-codec.yaml | 1 + + .../devicetree/bindings/sound/qcom,q6apm-dai.yaml | 17 +- + .../bindings/sound/qcom,q6apm-lpass-dais.yaml | 12 +- + .../bindings/sound/qcom,q6dsp-lpass-ports.yaml | 16 +- + .../devicetree/bindings/sound/qcom,sm8250.yaml | 1 + + .../bindings/sound/qcom,wcd9378-sdw.yaml | 105 + + .../devicetree/bindings/sound/realtek,rt5677.yaml | 10 + + .../devicetree/bindings/sound/renesas,rsnd.yaml | 16 +- + .../devicetree/bindings/sound/renesas,rz-ssi.yaml | 32 +- + .../bindings/sound/stericsson,ux500-msp-i2s.yaml | 96 + + .../bindings/sound/ti,da830-evm-audio.yaml | 83 + + .../devicetree/bindings/sound/ti,tas2781.yaml | 4 +- + .../devicetree/bindings/sound/ti,tas5805m.yaml | 10 +- + .../bindings/sound/ti,tlv320dac3100.yaml | 2 +- + .../devicetree/bindings/sound/ti,tpa6130a2.yaml | 2 +- + .../devicetree/bindings/sound/ux500-mop500.txt | 39 - + .../devicetree/bindings/sound/ux500-msp.txt | 42 - + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 18 + + drivers/firmware/cirrus/cs_dsp.c | 4 +- + drivers/gpib/fmh_gpib/fmh_gpib.c | 10 +- + include/dt-bindings/sound/cs35l45.h | 27 + + include/dt-bindings/sound/qcom,q6dsp-lpass-ports.h | 52 + + include/linux/dmaengine.h | 9 - + include/linux/firmware/cirrus/cs_dsp.h | 2 +- + include/sound/aw88399.h | 6 +- + include/sound/compress_driver.h | 2 + + include/sound/sdca.h | 23 +- + include/sound/sdca_class.h | 70 + + include/sound/simple_card_utils.h | 2 + + include/sound/soc-component.h | 21 +- + include/sound/soc-dai.h | 179 +- + include/sound/soc.h | 24 +- + include/sound/soc_sdw_utils.h | 20 + + include/sound/sof/ipc4/header.h | 24 +- + include/sound/tas2781-dsp.h | 13 + + include/sound/tas2781.h | 31 + + sound/core/compress_offload.c | 110 +- + sound/hda/codecs/side-codecs/aw88399_hda.c | 38 +- + sound/hda/codecs/side-codecs/aw88399_hda.h | 1 - + sound/hda/core/intel-nhlt.c | 4 +- + sound/soc/amd/acp-es8336.c | 3 +- + sound/soc/amd/acp/Kconfig | 5 +- + sound/soc/amd/acp/acp-sdw-legacy-mach.c | 32 + + sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c | 12 + + sound/soc/amd/acp/amd-acp63-acpi-match.c | 50 + + sound/soc/amd/acp/soc_amd_sdw_common.h | 13 + + sound/soc/amd/ps/acp63.h | 8 + + sound/soc/amd/ps/pci-ps.c | 2 + + sound/soc/amd/ps/ps-common.c | 2 + + sound/soc/atmel/atmel-pcm-dma.c | 2 +- + sound/soc/bcm/cygnus-ssp.h | 2 +- + sound/soc/codecs/88pm860x-codec.c | 6 + + sound/soc/codecs/Kconfig | 49 + + sound/soc/codecs/Makefile | 8 + + sound/soc/codecs/ab8500-codec.c | 157 +- + sound/soc/codecs/adau1372.c | 12 + + sound/soc/codecs/adau1373.c | 12 + + sound/soc/codecs/adau1701.c | 15 +- + sound/soc/codecs/adau17x1.c | 17 +- + sound/soc/codecs/adau1977.c | 13 + + sound/soc/codecs/adau7118.c | 12 + + sound/soc/codecs/ak4104.c | 7 + + sound/soc/codecs/ak4118.c | 7 + + sound/soc/codecs/ak4458.c | 9 + + sound/soc/codecs/ak4535.c | 6 + + sound/soc/codecs/ak4619.c | 32 + + sound/soc/codecs/ak4642.c | 14 +- + sound/soc/codecs/ak4671.c | 7 + + sound/soc/codecs/ak5386.c | 6 + + sound/soc/codecs/ak5558.c | 7 + + sound/soc/codecs/alc5623.c | 11 + + sound/soc/codecs/alc5632.c | 13 + + sound/soc/codecs/arizona-jack.c | 1 + + sound/soc/codecs/arizona.c | 23 + + sound/soc/codecs/aw88261.c | 10 +- + sound/soc/codecs/aw88399-lib.c | 18 +- + sound/soc/codecs/cpcap.c | 88 +- + sound/soc/codecs/cs35l33.c | 8 +- + sound/soc/codecs/cs35l34.c | 2 +- + sound/soc/codecs/cs35l35.c | 7 + + sound/soc/codecs/cs35l36.c | 56 + + sound/soc/codecs/cs35l41.c | 10 + + sound/soc/codecs/cs35l45-tables.c | 62 + + sound/soc/codecs/cs35l45.c | 177 +- + sound/soc/codecs/cs35l45.h | 53 + + sound/soc/codecs/cs35l56-shared-test.c | 56 + + sound/soc/codecs/cs35l56.c | 10 + + sound/soc/codecs/cs40l50-codec.c | 9 + + sound/soc/codecs/cs4234.c | 9 + + sound/soc/codecs/cs4265.c | 12 + + sound/soc/codecs/cs4270.c | 6 + + sound/soc/codecs/cs4271.c | 6 + + sound/soc/codecs/cs42l42.c | 11 +- + sound/soc/codecs/cs42l43.c | 12 + + sound/soc/codecs/cs42l51.c | 7 + + sound/soc/codecs/cs42l52.c | 22 +- + sound/soc/codecs/cs42l56.c | 17 +- + sound/soc/codecs/cs42l73.c | 11 +- + sound/soc/codecs/cs42l84.c | 6 + + sound/soc/codecs/cs42xx8.c | 8 + + sound/soc/codecs/cs43130.c | 14 + + sound/soc/codecs/cs4341.c | 8 + + sound/soc/codecs/cs4349.c | 12 + + sound/soc/codecs/cs48l32.c | 23 + + sound/soc/codecs/cs530x.c | 9 + + sound/soc/codecs/cs53l30.c | 8 + + sound/soc/codecs/cx20442.c | 2 +- + sound/soc/codecs/cx2072x.c | 12 + + sound/soc/codecs/da7210.c | 9 +- + sound/soc/codecs/da7218.c | 141 +- + sound/soc/codecs/da7219.c | 12 + + sound/soc/codecs/da732x.c | 17 + + sound/soc/codecs/da9055.c | 8 + + sound/soc/codecs/es7134.c | 6 + + sound/soc/codecs/es7241.c | 7 + + sound/soc/codecs/es8311.c | 27 +- + sound/soc/codecs/es8316.c | 27 +- + sound/soc/codecs/es8323.c | 32 +- + sound/soc/codecs/es8326.c | 181 +- + sound/soc/codecs/es8326.h | 4 + + sound/soc/codecs/es8328.c | 20 +- + sound/soc/codecs/es8375.c | 32 +- + sound/soc/codecs/es8389.c | 65 +- + sound/soc/codecs/es9039q2m.c | 2008 +++++++++++++++++ + sound/soc/codecs/fs210x.c | 5 +- + sound/soc/codecs/hda.c | 7 +- + sound/soc/codecs/hdac_hda.c | 2 +- + sound/soc/codecs/hdac_hdmi.c | 2 +- + sound/soc/codecs/hdmi-codec.c | 8 +- + sound/soc/codecs/inno_rk3036.c | 12 + + sound/soc/codecs/isabelle.c | 13 + + sound/soc/codecs/lm49453.c | 15 + + sound/soc/codecs/lpass-rx-macro.c | 6 +- + sound/soc/codecs/lpass-tx-macro.c | 4 +- + sound/soc/codecs/lpass-va-macro.c | 4 +- + sound/soc/codecs/lpass-wsa-macro.c | 48 +- + sound/soc/codecs/max98088.c | 12 + + sound/soc/codecs/max98090.c | 35 +- + sound/soc/codecs/max98095.c | 24 +- + sound/soc/codecs/max98371.c | 7 + + sound/soc/codecs/max98373-i2c.c | 10 + + sound/soc/codecs/max98388.c | 10 + + sound/soc/codecs/max98390.c | 10 + + sound/soc/codecs/max98396.c | 12 + + sound/soc/codecs/max9850.c | 11 + + sound/soc/codecs/max98520.c | 10 + + sound/soc/codecs/max9860.c | 23 + + sound/soc/codecs/max9867.c | 10 + + sound/soc/codecs/max98925.c | 8 + + sound/soc/codecs/max98926.c | 8 + + sound/soc/codecs/max98927.c | 14 +- + sound/soc/codecs/mc13783.c | 12 + + sound/soc/codecs/ml26124.c | 6 + + sound/soc/codecs/mt6359-accdet.c | 50 +- + sound/soc/codecs/mt6359.c | 8 +- + sound/soc/codecs/nau8325.c | 11 + + sound/soc/codecs/nau8360-dsp.c | 634 ++++++ + sound/soc/codecs/nau8360-dsp.h | 122 ++ + sound/soc/codecs/nau8360.c | 2309 ++++++++++++++++++++ + sound/soc/codecs/nau8360.h | 917 ++++++++ + sound/soc/codecs/nau8540.c | 15 +- + sound/soc/codecs/nau8810.c | 12 + + sound/soc/codecs/nau8821.c | 11 + + sound/soc/codecs/nau8822.c | 27 +- + sound/soc/codecs/nau8824.c | 11 + + sound/soc/codecs/nau8825.c | 29 +- + sound/soc/codecs/ntp8835.c | 7 + + sound/soc/codecs/ntp8918.c | 7 + + sound/soc/codecs/pcm5102a.c | 30 +- + sound/soc/codecs/pcm6240.c | 8 +- + sound/soc/codecs/rk3308_codec.c | 113 +- + sound/soc/codecs/rk3328_codec.c | 9 + + sound/soc/codecs/rt1011.c | 44 +- + sound/soc/codecs/rt1015.c | 91 +- + sound/soc/codecs/rt1016.c | 14 +- + sound/soc/codecs/rt1019.c | 10 + + sound/soc/codecs/rt1305.c | 14 +- + sound/soc/codecs/rt1308.c | 14 +- + sound/soc/codecs/rt1318.c | 13 +- + sound/soc/codecs/rt1320-sdw.c | 12 +- + sound/soc/codecs/rt274.c | 8 + + sound/soc/codecs/rt286.c | 8 + + sound/soc/codecs/rt298.c | 8 + + sound/soc/codecs/rt5514-spi.c | 37 +- + sound/soc/codecs/rt5514.c | 39 +- + sound/soc/codecs/rt5616.c | 23 +- + sound/soc/codecs/rt5631.c | 10 + + sound/soc/codecs/rt5631.h | 8 +- + sound/soc/codecs/rt5640.c | 22 +- + sound/soc/codecs/rt5645.c | 45 +- + sound/soc/codecs/rt5651.c | 12 +- + sound/soc/codecs/rt5659.c | 20 +- + sound/soc/codecs/rt5660.c | 14 +- + sound/soc/codecs/rt5663.c | 10 + + sound/soc/codecs/rt5665.c | 14 +- + sound/soc/codecs/rt5668.c | 22 + + sound/soc/codecs/rt5670.c | 12 +- + sound/soc/codecs/rt5677-spi.c | 21 +- + sound/soc/codecs/rt5677.c | 10 + + sound/soc/codecs/rt5682-sdw.c | 3 +- + sound/soc/codecs/rt5682.c | 22 + + sound/soc/codecs/rt5682s.c | 38 +- + sound/soc/codecs/rt711-sdca-sdw.c | 6 +- + sound/soc/codecs/rt711-sdw.c | 8 +- + sound/soc/codecs/rt712-sdca-dmic.c | 4 +- + sound/soc/codecs/rt712-sdca-sdw.c | 7 +- + sound/soc/codecs/rt712-sdca-sdw.h | 3 + + sound/soc/codecs/rt712-sdca.c | 141 +- + sound/soc/codecs/rt712-sdca.h | 6 + + sound/soc/codecs/rt721-sdca-sdw.c | 61 +- + sound/soc/codecs/rt721-sdca-sdw.h | 7 + + sound/soc/codecs/rt721-sdca.c | 797 +++++-- + sound/soc/codecs/rt721-sdca.h | 44 + + sound/soc/codecs/rt722-sdca-sdw.c | 6 +- + sound/soc/codecs/rt766-sdca.c | 10 +- + sound/soc/codecs/rt766-sdca.h | 1 + + sound/soc/codecs/rt9120.c | 9 + + sound/soc/codecs/rt9123.c | 13 + + sound/soc/codecs/rtq9124.c | 9 + + sound/soc/codecs/rtq9128.c | 9 + + sound/soc/codecs/sgtl5000.c | 11 + + sound/soc/codecs/si476x.c | 18 + + sound/soc/codecs/sma1303.c | 13 + + sound/soc/codecs/sma1307.c | 27 +- + sound/soc/codecs/sn624x-sdca-sdw.c | 1888 ++++++++++++++++ + sound/soc/codecs/sn624x-sdca.h | 152 ++ + sound/soc/codecs/src4xxx.c | 8 + + sound/soc/codecs/ssm2518.c | 13 + + sound/soc/codecs/ssm2602.c | 13 + + sound/soc/codecs/ssm3515.c | 10 + + sound/soc/codecs/ssm4567.c | 13 + + sound/soc/codecs/sta32x.c | 116 +- + sound/soc/codecs/sta350.c | 15 +- + sound/soc/codecs/sta529.c | 7 + + sound/soc/codecs/tas2552.c | 14 + + sound/soc/codecs/tas2562.c | 10 + + sound/soc/codecs/tas2764.c | 14 +- + sound/soc/codecs/tas2770.c | 14 +- + sound/soc/codecs/tas2780.c | 10 + + sound/soc/codecs/tas2781-comlib-i2c.c | 4 +- + sound/soc/codecs/tas2781-comlib.c | 10 +- + sound/soc/codecs/tas2781-fmwlib.c | 46 +- + sound/soc/codecs/tas2781-i2c.c | 320 ++- + sound/soc/codecs/tas2783-sdw.c | 218 +- + sound/soc/codecs/tas2783.h | 4 +- + sound/soc/codecs/tas5086.c | 7 + + sound/soc/codecs/tas571x.c | 7 + + sound/soc/codecs/tas5720.c | 9 + + sound/soc/codecs/tas6424.c | 9 + + sound/soc/codecs/tfa9879.c | 9 + + sound/soc/codecs/tlv320adc3xxx.c | 14 + + sound/soc/codecs/tlv320adcx140.c | 12 + + sound/soc/codecs/tlv320aic23.c | 9 + + sound/soc/codecs/tlv320aic26.c | 8 + + sound/soc/codecs/tlv320aic31xx.c | 41 +- + sound/soc/codecs/tlv320aic32x4-clk.c | 2 +- + sound/soc/codecs/tlv320aic32x4.c | 102 +- + sound/soc/codecs/tlv320aic3x.c | 42 +- + sound/soc/codecs/tlv320dac33.c | 10 +- + sound/soc/codecs/tscs454.c | 15 + + sound/soc/codecs/twl4030.c | 87 +- + sound/soc/codecs/uda1334.c | 6 + + sound/soc/codecs/uda1342.c | 7 + + sound/soc/codecs/uda1380.c | 11 + + sound/soc/codecs/wcd-mbhc-v2.c | 8 +- + sound/soc/codecs/wcd9335.c | 25 +- + sound/soc/codecs/wcd934x.c | 2 +- + sound/soc/codecs/wcd9378-sdca.c | 1080 +++++++++ + sound/soc/codecs/wcd9378-sdca.h | 20 + + sound/soc/codecs/wcd9378-sdw.c | 51 + + sound/soc/codecs/wcd939x.c | 10 +- + sound/soc/codecs/wcd939x.h | 1 - + sound/soc/codecs/wm2200.c | 10 + + sound/soc/codecs/wm5100.c | 10 + + sound/soc/codecs/wm8350.c | 24 + + sound/soc/codecs/wm8400.c | 9 + + sound/soc/codecs/wm8510.c | 12 + + sound/soc/codecs/wm8523.c | 13 + + sound/soc/codecs/wm8524.c | 6 + + sound/soc/codecs/wm8580.c | 20 + + sound/soc/codecs/wm8711.c | 13 + + sound/soc/codecs/wm8728.c | 9 + + sound/soc/codecs/wm8731.c | 13 + + sound/soc/codecs/wm8737.c | 11 + + sound/soc/codecs/wm8741.c | 13 + + sound/soc/codecs/wm8750.c | 13 + + sound/soc/codecs/wm8753.c | 20 + + sound/soc/codecs/wm8770.c | 11 + + sound/soc/codecs/wm8776.c | 13 + + sound/soc/codecs/wm8804.c | 15 +- + sound/soc/codecs/wm8900.c | 18 + + sound/soc/codecs/wm8903.c | 18 + + sound/soc/codecs/wm8904.c | 20 +- + sound/soc/codecs/wm8940.c | 13 + + sound/soc/codecs/wm8955.c | 42 +- + sound/soc/codecs/wm8958-dsp2.c | 8 +- + sound/soc/codecs/wm8960.c | 13 + + sound/soc/codecs/wm8961.c | 18 + + sound/soc/codecs/wm8962.c | 74 +- + sound/soc/codecs/wm8971.c | 13 + + sound/soc/codecs/wm8974.c | 17 + + sound/soc/codecs/wm8978.c | 12 + + sound/soc/codecs/wm8983.c | 12 + + sound/soc/codecs/wm8985.c | 53 +- + sound/soc/codecs/wm8988.c | 13 + + sound/soc/codecs/wm8990.c | 9 + + sound/soc/codecs/wm8991.c | 9 + + sound/soc/codecs/wm8993.c | 18 + + sound/soc/codecs/wm8994.c | 23 + + sound/soc/codecs/wm8995.c | 61 +- + sound/soc/codecs/wm8996.c | 14 +- + sound/soc/codecs/wm9081.c | 18 + + sound/soc/codecs/wm9713.c | 13 + + sound/soc/codecs/wm_hubs.c | 2 +- + sound/soc/codecs/zl38060.c | 6 + + sound/soc/dwc/dwc-i2s.c | 15 +- + sound/soc/fsl/Kconfig | 2 +- + sound/soc/fsl/fsl_asrc.c | 110 +- + sound/soc/fsl/fsl_asrc_common.h | 7 +- + sound/soc/fsl/fsl_asrc_dma.c | 38 +- + sound/soc/fsl/fsl_asrc_m2m.c | 17 +- + sound/soc/fsl/fsl_easrc.c | 125 +- + sound/soc/fsl/fsl_mqs.c | 14 + + sound/soc/fsl/fsl_xcvr.c | 28 +- + sound/soc/generic/audio-graph-card.c | 1 + + sound/soc/generic/audio-graph-card2.c | 4 +- + sound/soc/generic/simple-card-utils.c | 23 +- + sound/soc/generic/simple-card.c | 13 +- + sound/soc/hisilicon/hi6210-i2s.c | 7 + + sound/soc/img/img-i2s-in.c | 12 +- + sound/soc/img/img-i2s-out.c | 13 +- + sound/soc/img/img-parallel-out.c | 8 +- + sound/soc/intel/atom/sst-mfld-dsp.h | 2 +- + sound/soc/intel/atom/sst/sst.h | 2 +- + sound/soc/intel/atom/sst/sst_acpi.c | 14 +- + sound/soc/intel/avs/boards/hdaudio.c | 8 +- + sound/soc/intel/avs/pcm.c | 22 +- + sound/soc/intel/avs/probes.c | 12 +- + sound/soc/intel/avs/topology.c | 25 - + sound/soc/intel/avs/topology.h | 3 - + sound/soc/intel/boards/Kconfig | 15 + + sound/soc/intel/boards/Makefile | 2 + + sound/soc/intel/boards/cht_rt5677.c | 654 ++++++ + sound/soc/intel/boards/sof_cirrus_common.c | 2 +- + sound/soc/intel/catpt/pcm.c | 12 +- + sound/soc/intel/common/soc-acpi-intel-arl-match.c | 71 + + sound/soc/intel/common/soc-acpi-intel-cht-match.c | 8 + + sound/soc/intel/common/soc-acpi-intel-lnl-match.c | 71 + + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 71 + + sound/soc/intel/common/soc-acpi-intel-ptl-match.c | 85 + + sound/soc/intel/common/sof-function-topology-lib.c | 289 ++- + sound/soc/intel/common/sof-function-topology-lib.h | 3 + + sound/soc/jz4740/jz4740-i2s.c | 7 + + sound/soc/kirkwood/kirkwood-i2s.c | 7 + + sound/soc/loongson/loongson_i2s.c | 6 + + sound/soc/mediatek/Kconfig | 27 +- + sound/soc/mediatek/Makefile | 1 + + sound/soc/mediatek/an7581/Makefile | 9 + + sound/soc/mediatek/an7581/an7581-afe-common.h | 49 + + sound/soc/mediatek/an7581/an7581-afe-pcm.c | 515 +++++ + sound/soc/mediatek/an7581/an7581-dai-etdm.c | 433 ++++ + sound/soc/mediatek/an7581/an7581-reg.h | 114 + + sound/soc/mediatek/an7581/an7581-wm8960.c | 161 ++ + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 22 +- + sound/soc/mediatek/common/mtk-base-afe.h | 2 + + sound/soc/mediatek/common/mtk-soundcard-driver.c | 67 +- + sound/soc/mediatek/mt2701/mt2701-afe-clock-ctrl.c | 61 +- + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 4 +- + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 4 +- + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 4 +- + sound/soc/mediatek/mt6797/mt6797-afe-clk.c | 23 +- + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 8 +- + sound/soc/mediatek/mt7986/mt7986-afe-pcm.c | 8 +- + sound/soc/mediatek/mt7986/mt7986-dai-etdm.c | 2 +- + sound/soc/mediatek/mt7986/mt7986-wm8960.c | 4 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 26 +- + sound/soc/mediatek/mt8183/mt8183-afe-clk.c | 31 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 21 +- + sound/soc/mediatek/mt8186/mt8186-afe-clk.c | 95 +- + sound/soc/mediatek/mt8186/mt8186-afe-gpio.c | 6 +- + sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 23 +- + sound/soc/mediatek/mt8188/mt8188-afe-clk.c | 115 +- + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 41 +- + sound/soc/mediatek/mt8188/mt8188-audsys-clk.c | 12 +- + sound/soc/mediatek/mt8188/mt8188-dai-adda.c | 5 +- + sound/soc/mediatek/mt8188/mt8188-dai-dmic.c | 10 +- + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 3 + + sound/soc/mediatek/mt8189/mt8189-afe-clk.c | 134 +- + sound/soc/mediatek/mt8189/mt8189-afe-pcm.c | 69 +- + sound/soc/mediatek/mt8189/mt8189-dai-i2s.c | 18 +- + sound/soc/mediatek/mt8189/mt8189-dai-tdm.c | 19 +- + sound/soc/mediatek/mt8192/mt8192-afe-clk.c | 163 +- + sound/soc/mediatek/mt8192/mt8192-afe-gpio.c | 94 +- + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 23 +- + sound/soc/mediatek/mt8192/mt8192-dai-adda.c | 44 +- + sound/soc/mediatek/mt8192/mt8192-dai-i2s.c | 20 +- + sound/soc/mediatek/mt8192/mt8192-dai-tdm.c | 18 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 37 +- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 2 +- + sound/soc/mediatek/mt8196/mt8196-afe-pcm.c | 14 +- + sound/soc/mediatek/mt8365/mt8365-afe-pcm.c | 7 +- + sound/soc/mxs/mxs-saif.c | 10 + + sound/soc/pxa/mmp-sspa.c | 6 + + sound/soc/pxa/pxa-ssp.c | 11 + + sound/soc/pxa/pxa2xx-i2s.c | 6 + + sound/soc/pxa/pxa2xx-pcm-lib.c | 9 +- + sound/soc/qcom/Kconfig | 1 + + sound/soc/qcom/common.c | 61 +- + sound/soc/qcom/common.h | 5 +- + sound/soc/qcom/qdsp6/audioreach.c | 12 +- + sound/soc/qcom/qdsp6/audioreach.h | 22 +- + sound/soc/qcom/qdsp6/q6apm-dai.c | 317 ++- + sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 2 + + sound/soc/qcom/qdsp6/q6apm.c | 9 +- + sound/soc/qcom/qdsp6/q6apm.h | 2 +- + sound/soc/qcom/qdsp6/q6asm-dai.c | 2 +- + sound/soc/qcom/qdsp6/q6dsp-lpass-ports.c | 54 + + sound/soc/qcom/qdsp6/q6prm.c | 2 + + sound/soc/qcom/sc8280xp.c | 132 +- + sound/soc/qcom/sdm845.c | 49 +- + sound/soc/renesas/rz-ssi.c | 9 + + sound/soc/renesas/siu_dai.c | 6 + + sound/soc/renesas/ssi.c | 13 + + sound/soc/rockchip/rk3399_gru_sound.c | 4 +- + sound/soc/rockchip/rockchip_i2s.c | 29 +- + sound/soc/rockchip/rockchip_i2s_tdm.c | 27 +- + sound/soc/rockchip/rockchip_pdm.c | 14 +- + sound/soc/rockchip/rockchip_sai.c | 35 +- + sound/soc/samsung/aries_wm8994.c | 14 +- + sound/soc/samsung/pcm.c | 19 +- + sound/soc/samsung/spdif.c | 8 +- + sound/soc/samsung/tm2_wm5110.c | 12 +- + sound/soc/sdca/Kconfig | 6 +- + sound/soc/sdca/sdca_asoc.c | 4 +- + sound/soc/sdca/sdca_class.c | 148 +- + sound/soc/sdca/sdca_class.h | 35 - + sound/soc/sdca/sdca_class_function.c | 50 +- + sound/soc/sdca/sdca_device.c | 4 + + sound/soc/sdca/sdca_fdl.c | 18 +- + sound/soc/sdca/sdca_functions.c | 15 +- + sound/soc/sdw_utils/Makefile | 4 +- + sound/soc/sdw_utils/soc_sdw_rt711.c | 1 + + sound/soc/sdw_utils/soc_sdw_rt_mf_sdca.c | 6 + + sound/soc/sdw_utils/soc_sdw_rt_sdca_jack_common.c | 8 + + sound/soc/sdw_utils/soc_sdw_senary_amp.c | 80 + + sound/soc/sdw_utils/soc_sdw_senary_dmic.c | 49 + + sound/soc/sdw_utils/soc_sdw_senary_sdca.c | 63 + + .../sdw_utils/soc_sdw_senary_sdca_jack_common.c | 197 ++ + sound/soc/sdw_utils/soc_sdw_utils.c | 384 ++++ + sound/soc/soc-component.c | 27 +- + sound/soc/soc-compress.c | 209 +- + sound/soc/soc-core.c | 250 +-- + sound/soc/soc-dai.c | 418 +++- + sound/soc/soc-dapm.c | 9 +- + sound/soc/soc-generic-dmaengine-pcm.c | 28 +- + sound/soc/soc-internal.h | 39 + + sound/soc/soc-ops.c | 4 +- + sound/soc/soc-pcm.c | 144 +- + sound/soc/soc-topology-test.c | 66 +- + sound/soc/sof/Makefile | 4 +- + sound/soc/sof/amd/Kconfig | 1 + + sound/soc/sof/amd/acp-common.c | 17 + + sound/soc/sof/amd/acp-dsp-offset.h | 17 + + sound/soc/sof/amd/acp.c | 391 +++- + sound/soc/sof/amd/acp.h | 16 + + sound/soc/sof/amd/acp7x.h | 37 + + sound/soc/sof/amd/pci-acp7x.c | 2 + + sound/soc/sof/core.c | 10 +- + sound/soc/sof/imx/imx-common.c | 1 + + sound/soc/sof/imx/imx8.c | 26 +- + sound/soc/sof/intel/Kconfig | 9 +- + sound/soc/sof/intel/apl.c | 1 + + sound/soc/sof/intel/cnl.c | 1 + + sound/soc/sof/intel/hda-common-ops.c | 8 + + sound/soc/sof/intel/hda-dai.c | 26 +- + sound/soc/sof/intel/hda-pcm.c | 142 ++ + sound/soc/sof/intel/hda-stream.c | 91 +- + sound/soc/sof/intel/hda.h | 15 + + sound/soc/sof/intel/icl.c | 1 + + sound/soc/sof/intel/mtl.c | 1 + + sound/soc/sof/intel/skl.c | 1 + + sound/soc/sof/intel/tgl.c | 1 + + sound/soc/sof/{compress.c => ipc3-compress.c} | 145 +- + sound/soc/sof/ipc3-dtrace.c | 2 +- + sound/soc/sof/ipc3-pcm.c | 29 +- + sound/soc/sof/ipc3-priv.h | 3 + + sound/soc/sof/ipc4-compress.c | 823 +++++++ + sound/soc/sof/ipc4-loader.c | 37 + + sound/soc/sof/ipc4-pcm.c | 114 +- + sound/soc/sof/ipc4-priv.h | 55 +- + sound/soc/sof/ipc4-topology.c | 178 +- + sound/soc/sof/ipc4-topology.h | 9 + + sound/soc/sof/ipc4.c | 13 +- + sound/soc/sof/mediatek/mt8186/mt8186.c | 2 +- + sound/soc/sof/mediatek/mt8195/mt8195.c | 2 +- + sound/soc/sof/ops.h | 74 + + sound/soc/sof/pcm.c | 20 +- + sound/soc/sof/sof-audio.c | 95 +- + sound/soc/sof/sof-audio.h | 24 +- + sound/soc/sof/sof-priv.h | 12 + + sound/soc/sof/sof-utils.c | 12 +- + sound/soc/sof/sof-utils.h | 11 +- + sound/soc/sof/topology.c | 5 +- + sound/soc/sprd/sprd-pcm-compress.c | 7 +- + sound/soc/sprd/sprd-pcm-dma.c | 10 +- + sound/soc/sti/uniperif_player.c | 29 +- + sound/soc/sti/uniperif_reader.c | 27 +- + sound/soc/stm/stm32_i2s.c | 35 +- + sound/soc/stm/stm32_sai_sub.c | 15 + + sound/soc/stm/stm32_spdifrx.c | 2 +- + sound/soc/sunxi/sun4i-i2s.c | 13 + + sound/soc/sunxi/sun8i-codec.c | 13 + + sound/soc/tegra/tegra20_i2s.c | 10 + + sound/soc/tegra/tegra210_adx.c | 12 +- + sound/soc/tegra/tegra210_adx.h | 2 +- + sound/soc/tegra/tegra210_i2s.c | 13 + + sound/soc/tegra/tegra30_i2s.c | 10 + + sound/soc/ti/davinci-i2s.c | 16 +- + sound/soc/ti/davinci-mcasp.c | 17 +- + sound/soc/ti/omap-mcbsp.c | 14 +- + sound/soc/uniphier/aio-cpu.c | 9 + + sound/soc/uniphier/aio-dma.c | 5 +- + sound/soc/uniphier/aio.h | 2 +- + sound/soc/ux500/Kconfig | 23 +- + sound/soc/ux500/Makefile | 3 - + sound/soc/ux500/mop500.c | 167 -- + sound/soc/ux500/mop500_ab8500.c | 437 ---- + sound/soc/ux500/mop500_ab8500.h | 17 - + sound/soc/ux500/ux500_msp_dai.c | 33 +- + sound/soc/ux500/ux500_msp_i2s.c | 2 +- + sound/soc/xilinx/xlnx_formatter_pcm.c | 79 +- + sound/soc/xtensa/xtfpga-i2s.c | 12 +- + 568 files changed, 25230 insertions(+), 4327 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/airoha,an7581-afe.yaml + create mode 100644 Documentation/devicetree/bindings/sound/airoha,an7581-wm8960.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/davinci-evm-audio.txt + create mode 100644 Documentation/devicetree/bindings/sound/esstech,es9039q2m.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8360.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.txt + create mode 100644 Documentation/devicetree/bindings/sound/nvidia,tegra30-ahub.yaml + create mode 100644 Documentation/devicetree/bindings/sound/qcom,wcd9378-sdw.yaml + create mode 100644 Documentation/devicetree/bindings/sound/stericsson,ux500-msp-i2s.yaml + create mode 100644 Documentation/devicetree/bindings/sound/ti,da830-evm-audio.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/ux500-mop500.txt + delete mode 100644 Documentation/devicetree/bindings/sound/ux500-msp.txt + create mode 100644 include/sound/sdca_class.h + create mode 100644 sound/soc/codecs/es9039q2m.c + create mode 100644 sound/soc/codecs/nau8360-dsp.c + create mode 100644 sound/soc/codecs/nau8360-dsp.h + create mode 100644 sound/soc/codecs/nau8360.c + create mode 100644 sound/soc/codecs/nau8360.h + create mode 100644 sound/soc/codecs/sn624x-sdca-sdw.c + create mode 100644 sound/soc/codecs/sn624x-sdca.h + create mode 100644 sound/soc/codecs/wcd9378-sdca.c + create mode 100644 sound/soc/codecs/wcd9378-sdca.h + create mode 100644 sound/soc/codecs/wcd9378-sdw.c + create mode 100644 sound/soc/intel/boards/cht_rt5677.c + create mode 100644 sound/soc/mediatek/an7581/Makefile + create mode 100644 sound/soc/mediatek/an7581/an7581-afe-common.h + create mode 100644 sound/soc/mediatek/an7581/an7581-afe-pcm.c + create mode 100644 sound/soc/mediatek/an7581/an7581-dai-etdm.c + create mode 100644 sound/soc/mediatek/an7581/an7581-reg.h + create mode 100644 sound/soc/mediatek/an7581/an7581-wm8960.c + delete mode 100644 sound/soc/sdca/sdca_class.h + create mode 100644 sound/soc/sdw_utils/soc_sdw_senary_amp.c + create mode 100644 sound/soc/sdw_utils/soc_sdw_senary_dmic.c + create mode 100644 sound/soc/sdw_utils/soc_sdw_senary_sdca.c + create mode 100644 sound/soc/sdw_utils/soc_sdw_senary_sdca_jack_common.c + create mode 100644 sound/soc/soc-internal.h + create mode 100644 sound/soc/sof/amd/acp7x.h + rename sound/soc/sof/{compress.c => ipc3-compress.c} (66%) + create mode 100644 sound/soc/sof/ipc4-compress.c + delete mode 100644 sound/soc/ux500/mop500.c + delete mode 100644 sound/soc/ux500/mop500_ab8500.c + delete mode 100644 sound/soc/ux500/mop500_ab8500.h +Merging modules/modules-next (08abfa5a161e1 drivers: Replace __MODULE_STRING() with __stringify()) +$ git merge -m Merge branch 'modules-next' of https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git modules/modules-next +Auto-merging drivers/gpu/drm/clients/drm_fbdev_helper.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/clients/drm_fbdev_helper.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/gpu/drm/xe/xe_device.c +Auto-merging drivers/gpu/drm/xe/xe_exec_queue.c +Auto-merging drivers/gpu/drm/xe/xe_ggtt.c +Auto-merging drivers/gpu/drm/xe/xe_guc.c +Auto-merging drivers/gpu/drm/xe/xe_guc_ads.c +Auto-merging drivers/gpu/drm/xe/xe_guc_ct.c +Auto-merging drivers/gpu/drm/xe/xe_guc_log.c +Auto-merging drivers/gpu/drm/xe/xe_mmio.c +Auto-merging drivers/gpu/drm/xe/xe_oa.c +Auto-merging drivers/gpu/drm/xe/xe_pm.c +Auto-merging drivers/gpu/drm/xe/xe_pt.c +Auto-merging drivers/gpu/drm/xe/xe_sync.c +Auto-merging drivers/gpu/drm/xe/xe_tuning.c +Auto-merging drivers/gpu/drm/xe/xe_uc_fw.c +Auto-merging drivers/gpu/drm/xe/xe_vm.c +Auto-merging drivers/gpu/drm/xe/xe_wa.c +Auto-merging drivers/net/ethernet/atheros/atlx/atl1.c +Auto-merging drivers/net/ethernet/atheros/atlx/atl2.c +Auto-merging drivers/thunderbolt/tb.c +Auto-merging drivers/thunderbolt/tunnel.c +Auto-merging drivers/usb/atm/speedtch.c +Auto-merging fs/coredump.c +Auto-merging fs/nfsd/nfs4layouts.c +Auto-merging fs/nfsd/nfs4recover.c +Auto-merging include/linux/module.h +Auto-merging kernel/module/main.c +Auto-merging kernel/reboot.c +Auto-merging kernel/time/jiffies.c +Auto-merging net/bridge/br_stp_if.c +Auto-merging net/core/skb_fault_injection.c +Recorded preimage for 'drivers/gpu/drm/clients/drm_fbdev_helper.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/clients/drm_fbdev_helper.c'. +[master e4622b8294abc] Merge branch 'modules-next' of https://git.kernel.org/pub/scm/linux/kernel/git/modules/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/x86/kernel/cpu/mce/dev-mcelog.c | 2 +- + block/blk-core.c | 1 + + drivers/block/drbd/drbd_nl.c | 1 + + drivers/comedi/comedi_fops.c | 5 +- + drivers/gpu/drm/clients/drm_fbdev_helper.c | 1 + + drivers/gpu/drm/i915/display/intel_connector.c | 1 + + .../gpu/drm/i915/display/intel_display_driver.c | 1 + + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 1 + + drivers/gpu/drm/i915/gt/intel_gt.c | 2 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 1 + + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 1 + + drivers/gpu/drm/i915/i915_driver.c | 1 + + drivers/gpu/drm/i915/i915_pci.c | 2 + + drivers/gpu/drm/i915/intel_uncore.c | 1 + + drivers/gpu/drm/xe/xe_device.c | 2 +- + drivers/gpu/drm/xe/xe_exec_queue.c | 1 + + drivers/gpu/drm/xe/xe_ggtt.c | 2 +- + drivers/gpu/drm/xe/xe_guc.c | 1 + + drivers/gpu/drm/xe/xe_guc_ads.c | 2 +- + drivers/gpu/drm/xe/xe_guc_ct.c | 2 +- + drivers/gpu/drm/xe/xe_guc_log.c | 2 +- + drivers/gpu/drm/xe/xe_guc_relay.c | 2 +- + drivers/gpu/drm/xe/xe_hw_engine_class_sysfs.c | 1 + + drivers/gpu/drm/xe/xe_hw_engine_group.c | 2 + + drivers/gpu/drm/xe/xe_mmio.c | 1 + + drivers/gpu/drm/xe/xe_oa.c | 1 + + drivers/gpu/drm/xe/xe_pm.c | 2 +- + drivers/gpu/drm/xe/xe_pt.c | 2 + + drivers/gpu/drm/xe/xe_pxp.c | 2 + + drivers/gpu/drm/xe/xe_sriov.c | 2 +- + drivers/gpu/drm/xe/xe_sync.c | 1 + + drivers/gpu/drm/xe/xe_tile.c | 2 +- + drivers/gpu/drm/xe/xe_tuning.c | 2 + + drivers/gpu/drm/xe/xe_uc_fw.c | 2 +- + drivers/gpu/drm/xe/xe_vm.c | 1 + + drivers/gpu/drm/xe/xe_wa.c | 2 +- + drivers/gpu/drm/xe/xe_wopcm.c | 2 +- + drivers/greybus/svc_watchdog.c | 1 + + drivers/i2c/busses/i2c-kempld.c | 3 +- + drivers/macintosh/windfarm_core.c | 1 + + drivers/net/ethernet/atheros/atl1e/atl1e_param.c | 9 ++-- + drivers/net/ethernet/atheros/atlx/atl1.c | 3 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 11 ++-- + drivers/net/ethernet/intel/e1000/e1000_param.c | 15 +++--- + drivers/net/ethernet/intel/e1000e/param.c | 16 +++--- + .../net/ethernet/oki-semi/pch_gbe/pch_gbe_param.c | 7 +-- + drivers/net/netdevsim/tc.c | 1 + + drivers/platform/cznic/turris-omnia-mcu-watchdog.c | 3 +- + drivers/pnp/pnpbios/core.c | 2 +- + drivers/rtc/rtc-ds1374.c | 3 +- + drivers/thunderbolt/tb.c | 3 +- + drivers/thunderbolt/tunnel.c | 5 +- + drivers/tty/serial/8250/8250_platform.c | 3 +- + drivers/usb/atm/speedtch.c | 15 +++--- + drivers/usb/atm/usbatm.c | 17 ++++--- + drivers/video/fbdev/uvesafb.c | 1 + + fs/coredump.c | 2 +- + fs/nfs/cache_lib.c | 2 +- + fs/nfsd/nfs4layouts.c | 2 +- + fs/nfsd/nfs4recover.c | 1 + + fs/ocfs2/stackglue.c | 1 + + include/linux/compat.h | 1 + + include/linux/kmod.h | 12 +---- + include/linux/module.h | 1 - + include/linux/module_symbol.h | 7 ++- + include/linux/syscalls.h | 1 + + kernel/cgroup/cgroup-v1.c | 2 +- + kernel/module/kallsyms.c | 59 ++++++++++++---------- + kernel/module/kmod.c | 3 +- + kernel/module/main.c | 1 + + kernel/module/tracking.c | 2 +- + kernel/power/process.c | 2 +- + kernel/reboot.c | 2 +- + kernel/time/jiffies.c | 1 + + kernel/umh.c | 2 +- + lib/kobject_uevent.c | 2 +- + net/bridge/br_stp_if.c | 2 +- + net/core/skb_fault_injection.c | 1 + + rust/kernel/module_param.rs | 9 +++- + scripts/faddr2line | 2 +- + scripts/mod/modpost.h | 2 +- + security/keys/request_key.c | 2 +- + security/tomoyo/common.h | 2 +- + tools/perf/util/symbol.h | 4 +- + 85 files changed, 181 insertions(+), 129 deletions(-) +Merging input/next (68a0deade76c0 Input: mms114 - fix touch slot corruption in suspend) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging Documentation/devicetree/bindings/input/mediatek,mt6779-keypad.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/input/keyboard/atkbd.c +Auto-merging drivers/input/keyboard/gpio_keys.c +Auto-merging drivers/input/touchscreen/colibri-vf50-ts.c +Auto-merging drivers/input/touchscreen/cyttsp5.c +Auto-merging drivers/input/touchscreen/edt-ft5x06.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/adc-joystick.yaml | 20 +- + .../bindings/input/adi,ad7147_captouch.yaml | 48 ++++ + .../devicetree/bindings/input/cypress-sf.yaml | 14 +- + .../bindings/input/mediatek,mt6779-keypad.yaml | 10 +- + .../bindings/input/microchip,cap11xx.yaml | 14 +- + .../bindings/input/touchscreen/eeti,exc3000.yaml | 16 +- + .../bindings/input/touchscreen/sis,9200-ts.yaml | 61 +++++ + .../bindings/input/touchscreen/sis_i2c.txt | 31 --- + .../bindings/input/touchscreen/ti,tsc2007.yaml | 12 +- + MAINTAINERS | 2 +- + drivers/input/input-mt.c | 5 +- + drivers/input/keyboard/adp5520-keys.c | 1 - + drivers/input/keyboard/applespi.c | 2 - + drivers/input/keyboard/atkbd.c | 5 +- + drivers/input/keyboard/bcm-keypad.c | 1 - + drivers/input/keyboard/clps711x-keypad.c | 1 - + drivers/input/keyboard/cros_ec_keyb.c | 2 - + drivers/input/keyboard/gpio_keys.c | 1 - + drivers/input/keyboard/imx_keypad.c | 1 - + drivers/input/keyboard/jornada720_kbd.c | 1 - + drivers/input/keyboard/lpc32xx-keys.c | 1 - + drivers/input/keyboard/matrix_keypad.c | 2 +- + drivers/input/keyboard/max7359_keypad.c | 1 - + drivers/input/keyboard/mpr121_touchkey.c | 1 - + drivers/input/keyboard/pxa27x_keypad.c | 1 - + drivers/input/keyboard/qt1050.c | 1 - + drivers/input/keyboard/snvs_pwrkey.c | 9 +- + drivers/input/keyboard/st-keyscan.c | 14 +- + drivers/input/keyboard/stmpe-keypad.c | 1 - + drivers/input/keyboard/tc3589x-keypad.c | 1 - + drivers/input/keyboard/tegra-kbc.c | 1 - + drivers/input/matrix-keymap.c | 7 + + drivers/input/misc/88pm860x_onkey.c | 1 - + drivers/input/misc/ab8500-ponkey.c | 1 - + drivers/input/misc/ad714x.c | 4 - + drivers/input/misc/ariel-pwrbutton.c | 1 - + drivers/input/misc/axp20x-pek.c | 1 - + drivers/input/misc/e3x0-button.c | 1 - + drivers/input/misc/max77693-haptic.c | 1 - + drivers/input/misc/max8925_onkey.c | 1 - + drivers/input/misc/pwm-vibra.c | 1 - + drivers/input/misc/regulator-haptic.c | 1 - + drivers/input/misc/retu-pwrbutton.c | 1 - + drivers/input/misc/tps65218-pwrbutton.c | 1 - + drivers/input/misc/twl4030-pwrbutton.c | 1 - + drivers/input/misc/wm831x-on.c | 1 - + drivers/input/mouse/cyapa.c | 1 - + drivers/input/serio/gscps2.c | 293 +++++++++++---------- + drivers/input/touchscreen/88pm860x-ts.c | 1 - + drivers/input/touchscreen/ad7877.c | 1 - + drivers/input/touchscreen/ad7879.c | 1 - + drivers/input/touchscreen/ar1021_i2c.c | 1 - + drivers/input/touchscreen/bcm_iproc_tsc.c | 1 - + drivers/input/touchscreen/chipone_icn8318.c | 1 - + drivers/input/touchscreen/colibri-vf50-ts.c | 1 - + drivers/input/touchscreen/cyttsp5.c | 8 +- + drivers/input/touchscreen/cyttsp_core.c | 1 - + drivers/input/touchscreen/da9034-ts.c | 1 - + drivers/input/touchscreen/edt-ft5x06.c | 1 - + drivers/input/touchscreen/hycon-hy46xx.c | 1 - + drivers/input/touchscreen/jornada720_ts.c | 1 - + drivers/input/touchscreen/max11801_ts.c | 1 - + drivers/input/touchscreen/mms114.c | 13 +- + drivers/input/touchscreen/sx8654.c | 1 - + drivers/input/touchscreen/wm831x-ts.c | 1 - + drivers/input/touchscreen/wm97xx-core.c | 1 - + 66 files changed, 331 insertions(+), 305 deletions(-) + create mode 100644 Documentation/devicetree/bindings/input/adi,ad7147_captouch.yaml + create mode 100644 Documentation/devicetree/bindings/input/touchscreen/sis,9200-ts.yaml + delete mode 100644 Documentation/devicetree/bindings/input/touchscreen/sis_i2c.txt +Merging block/for-next (e8b704b323f93 Merge branch 'for-7.4/io_uring-dmabuf' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git block/for-next +Auto-merging block/blk-core.c +Auto-merging drivers/nvme/host/pci.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging include/linux/bvec.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/iov_iter.h +Auto-merging include/linux/uio.h +CONFLICT (content): Merge conflict in include/linux/uio.h +Auto-merging io_uring/io-wq.c +Auto-merging lib/iov_iter.c +CONFLICT (content): Merge conflict in lib/iov_iter.c +Resolved 'include/linux/uio.h' using previous resolution. +Resolved 'lib/iov_iter.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9137bcd856bca] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/m68k/mac/config.c | 31 +- + block/bdev.c | 2 +- + block/bio.c | 89 ++- + block/blk-core.c | 7 +- + block/blk-merge.c | 50 ++ + block/blk-mq.c | 1 + + block/blk-settings.c | 18 +- + block/blk-zoned.c | 872 +++++++++++++++++----------- + block/blk.h | 6 + + block/fops.c | 140 ++++- + drivers/block/amiflop.c | 71 ++- + drivers/block/aoe/aoenet.c | 14 +- + drivers/block/floppy.c | 56 +- + drivers/block/loop.c | 112 +--- + drivers/block/rnull/configfs.rs | 44 +- + drivers/block/rnull/rnull.rs | 15 +- + drivers/block/swim.c | 457 ++++++++------- + drivers/block/swim3.c | 8 +- + drivers/block/swim_asm.S | 340 +++++------ + drivers/block/ublk_drv.c | 10 +- + drivers/block/zloop.c | 9 +- + drivers/dma-buf/Makefile | 2 +- + drivers/dma-buf/dma-buf-io.c | 183 ++++++ + drivers/md/dm-io-rewind.c | 6 +- + drivers/nvme/host/Makefile | 1 + + drivers/nvme/host/core.c | 12 + + drivers/nvme/host/ioctl.c | 19 +- + drivers/nvme/host/nvme.h | 2 + + drivers/nvme/host/pci-dmabuf.c | 164 ++++++ + drivers/nvme/host/pci-dmabuf.h | 73 +++ + drivers/nvme/host/pci.c | 249 +++++++- + fs/iomap/buffered-io.c | 4 + + include/linux/bio.h | 21 +- + include/linux/blk-mq.h | 7 + + include/linux/blk_types.h | 14 +- + include/linux/blkdev.h | 13 +- + include/linux/bvec.h | 3 +- + include/linux/dma-buf-io.h | 105 ++++ + include/linux/fs.h | 2 + + include/linux/io_uring.h | 32 + + include/linux/io_uring/cmd.h | 34 +- + include/linux/io_uring_types.h | 7 + + include/linux/iov_iter.h | 2 + + include/linux/uio.h | 11 + + include/uapi/linux/io_uring.h | 46 +- + io_uring/Makefile | 1 + + io_uring/cancel.c | 89 ++- + io_uring/cancel.h | 13 +- + io_uring/dma-buf.c | 66 +++ + io_uring/dma-buf.h | 67 +++ + io_uring/fdinfo.c | 11 +- + io_uring/io-wq.c | 14 +- + io_uring/io_uring.c | 225 +++++-- + io_uring/io_uring.h | 31 - + io_uring/memmap.c | 8 + + io_uring/notif.c | 2 + + io_uring/refs.h | 27 + + io_uring/rsrc.c | 219 +++++-- + io_uring/rsrc.h | 32 +- + io_uring/rw.c | 57 +- + io_uring/timeout.c | 18 + + io_uring/timeout.h | 2 + + io_uring/uring_cmd.c | 23 +- + io_uring/uring_cmd.h | 2 +- + lib/iov_iter.c | 27 +- + rust/kernel/block/mq/gen_disk.rs | 72 +-- + rust/kernel/block/mq/operations.rs | 16 +- + rust/kernel/block/mq/request.rs | 16 +- + rust/kernel/block/mq/tag_set.rs | 35 +- + tools/testing/selftests/ublk/fault_inject.c | 14 +- + 70 files changed, 3196 insertions(+), 1255 deletions(-) + create mode 100644 drivers/dma-buf/dma-buf-io.c + create mode 100644 drivers/nvme/host/pci-dmabuf.c + create mode 100644 drivers/nvme/host/pci-dmabuf.h + create mode 100644 include/linux/dma-buf-io.h + create mode 100644 io_uring/dma-buf.c + create mode 100644 io_uring/dma-buf.h +$ git am -3 ../patches/0001-Revert-block-remove-bio_last_bvec_all.patch +Applying: Revert "block: remove bio_last_bvec_all" +$ git reset HEAD^ +Unstaged changes after reset: +M Documentation/block/biovecs.rst +M include/linux/bio.h +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 11ab1b9326f00] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/axboe/linux.git + Date: Wed Oct 14 14:20:12 2026 +0100 +$ git am -3 ../patches/0001-Fixup-for-blk-zoned-mismerge.patch +Applying: Fixup for blk-zoned mismerge +Using index info to reconstruct a base tree... +M block/blk-zoned.c +Falling back to patching base and 3-way merge... +Auto-merging block/blk-zoned.c +CONFLICT (content): Merge conflict in block/blk-zoned.c +Recorded preimage for 'block/blk-zoned.c' +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch=diff' to see the failed patch +hint: When you have resolved this problem, run "git am --continue". +hint: If you prefer to skip this patch, run "git am --skip" instead. +hint: To restore the original branch and stop patching, run "git am --abort". +hint: Disable this message with "git config advice.mergeConflict false" +Patch failed at 0001 Fixup for blk-zoned mismerge +Merging device-mapper/for-next (334714e4bdf88 dm-verity: clear LSM integrity state on suspend) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/md/dm-snap.c +Auto-merging drivers/md/dm-verity-verify-sig.c +Merge made by the 'ort' strategy. + .../admin-guide/device-mapper/dm-crypt.rst | 20 +++- + Documentation/admin-guide/device-mapper/verity.rst | 5 + + drivers/md/Kconfig | 14 +++ + drivers/md/dm-bufio.c | 104 ++++++++++++--------- + drivers/md/dm-cache-metadata.c | 2 +- + drivers/md/dm-clone-metadata.c | 3 - + drivers/md/dm-crypt.c | 53 +++++++---- + drivers/md/dm-delay.c | 3 +- + drivers/md/dm-exception-store.h | 2 +- + drivers/md/dm-mpath.c | 5 +- + drivers/md/dm-pcache/backing_dev.c | 2 +- + drivers/md/dm-ps-historical-service-time.c | 61 ++++-------- + drivers/md/dm-raid.c | 2 +- + drivers/md/dm-raid1.c | 2 +- + drivers/md/dm-snap-persistent.c | 7 +- + drivers/md/dm-snap.c | 18 ++-- + drivers/md/dm-thin.c | 3 - + drivers/md/dm-unstripe.c | 2 +- + drivers/md/dm-vdo/block-map.c | 2 +- + drivers/md/dm-vdo/dm-vdo-target.c | 2 +- + drivers/md/dm-vdo/indexer/chapter-index.c | 15 ++- + drivers/md/dm-vdo/indexer/delta-index.c | 17 +++- + drivers/md/dm-vdo/indexer/volume.c | 6 -- + drivers/md/dm-verity-target.c | 39 ++++++-- + drivers/md/dm-verity-verify-sig.c | 4 +- + drivers/md/dm-writecache.c | 93 +++++++++++------- + drivers/md/dm-zone.c | 6 +- + drivers/md/dm.c | 2 +- + drivers/md/persistent-data/dm-bitset.c | 5 +- + drivers/md/persistent-data/dm-btree-remove.c | 2 +- + 30 files changed, 301 insertions(+), 200 deletions(-) +Merging libata/for-next (21d333ab2be2a ata: libahci: re-enable FBS after error handling on a port multiplier) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/libata/linux libata/for-next +Auto-merging drivers/ata/ahci.c +Auto-merging drivers/ata/libahci.c +Auto-merging drivers/ata/libahci_platform.c +Auto-merging drivers/ata/libata-core.c +Auto-merging drivers/ata/libata-scsi.c +Auto-merging include/linux/libata.h +Merge made by the 'ort' strategy. + Documentation/driver-api/libata.rst | 4 +- + drivers/ata/Kconfig | 17 +- + drivers/ata/Makefile | 2 +- + drivers/ata/ahci.c | 19 +- + drivers/ata/ahci_brcm.c | 1 + + drivers/ata/ahci_ceva.c | 1 + + drivers/ata/ahci_da850.c | 6 +- + drivers/ata/ahci_qoriq.c | 1 + + drivers/ata/ahci_st.c | 78 +-- + drivers/ata/ata_generic.c | 16 + + drivers/ata/libahci.c | 44 +- + drivers/ata/libahci_platform.c | 4 + + drivers/ata/libata-core.c | 81 ++- + drivers/ata/libata-scsi.c | 7 +- + drivers/ata/libata-sff.c | 13 +- + drivers/ata/pata_arasan_cf.c | 6 +- + drivers/ata/pata_cswarp.c | 183 +++++++ + drivers/ata/pata_parport/pata_parport.c | 9 +- + drivers/ata/sata_dwc_460ex.c | 5 +- + drivers/ata/sata_fsl.c | 26 +- + drivers/ata/sata_inic162x.c | 903 -------------------------------- + drivers/ata/sata_mv.c | 10 +- + drivers/ata/sata_qstor.c | 8 +- + include/linux/libata.h | 1 + + 24 files changed, 438 insertions(+), 1007 deletions(-) + create mode 100644 drivers/ata/pata_cswarp.c + delete mode 100644 drivers/ata/sata_inic162x.c +Merging pcmcia/pcmcia-next (b3c26ea81ccc5 pcmcia: remove obsolete host controller drivers) +$ git merge -m Merge branch 'pcmcia-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (fd9af27f6c231 dt-bindings: mmc: sun4i-a10-mmc: add Allwinner B288) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging CREDITS +Auto-merging Documentation/devicetree/bindings/mmc/qcom,sdhci-msm.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + CREDITS | 5 + + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 2 + + .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 29 +- + .../devicetree/bindings/mmc/cdns,sd6hc.yaml | 105 + + .../bindings/mmc/mmc-controller-common.yaml | 10 + + .../devicetree/bindings/mmc/qcom,sdhci-msm.yaml | 2 + + Documentation/driver-api/mmc/mmc-async-req.rst | 64 +- + Documentation/driver-api/mmc/mmc-tools.rst | 1 + + MAINTAINERS | 12 +- + drivers/memstick/core/ms_block.c | 2 +- + drivers/memstick/host/r592.c | 2 +- + drivers/mmc/core/block.c | 2 +- + drivers/mmc/core/core.c | 8 +- + drivers/mmc/core/core.h | 10 +- + drivers/mmc/core/crypto.c | 2 +- + drivers/mmc/core/host.c | 39 +- + drivers/mmc/core/mmc.c | 2 +- + drivers/mmc/core/mmc_ops.c | 22 +- + drivers/mmc/core/sdio_cis.c | 5 +- + drivers/mmc/host/Kconfig | 31 - + drivers/mmc/host/Makefile | 2 +- + drivers/mmc/host/atmel-mci.c | 5 +- + drivers/mmc/host/bcm2835.c | 2 +- + drivers/mmc/host/cavium-thunderx.c | 5 +- + drivers/mmc/host/davinci_mmc.c | 6 +- + drivers/mmc/host/dw_mmc-rockchip.c | 2 +- + drivers/mmc/host/dw_mmc.c | 316 ++- + drivers/mmc/host/dw_mmc.h | 18 +- + drivers/mmc/host/meson-gx-mmc.c | 31 +- + drivers/mmc/host/mvsdio.c | 2 +- + drivers/mmc/host/rtsx_usb_sdmmc.c | 5 + + .../host/{sdhci-cadence.c => sdhci-cadence-core.c} | 303 ++- + drivers/mmc/host/sdhci-cadence-phy-v6.c | 975 ++++++++ + drivers/mmc/host/sdhci-cadence.h | 118 + + drivers/mmc/host/sdhci-msm.c | 34 +- + drivers/mmc/host/sdhci-of-arasan.c | 4 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 13 + + drivers/mmc/host/sdhci-of-esdhc.c | 2 +- + drivers/mmc/host/sdhci-omap.c | 2 +- + drivers/mmc/host/sdhci-pci-core.c | 8 +- + drivers/mmc/host/sdhci-pxav3.c | 13 +- + drivers/mmc/host/sdhci.h | 2 +- + drivers/mmc/host/sunplus-mmc.c | 5 + + drivers/mmc/host/ushc.c | 5 +- + drivers/mmc/host/vub300.c | 2493 -------------------- + drivers/staging/greybus/sdio.c | 11 +- + include/linux/mmc/host.h | 6 +- + 47 files changed, 1825 insertions(+), 2918 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/cdns,sd6hc.yaml + rename drivers/mmc/host/{sdhci-cadence.c => sdhci-cadence-core.c} (67%) + create mode 100644 drivers/mmc/host/sdhci-cadence-phy-v6.c + create mode 100644 drivers/mmc/host/sdhci-cadence.h + delete mode 100644 drivers/mmc/host/vub300.c +Merging mfd/for-mfd-next (319633b06ff2b dt-bindings: mfd: qcom,tcsr: Add compatible for MSM8952) +$ git merge -m Merge branch 'for-mfd-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/input/cpcap-pwrbutton.txt | 20 - + .../bindings/input/motorola,cpcap-pwrbutton.yaml | 32 ++ + .../leds/backlight/ti,lm3533-backlight.yaml | 69 +++ + .../devicetree/bindings/leds/ti,lm3533-leds.yaml | 67 +++ + .../devicetree/bindings/leds/ti,lm3533.yaml | 169 +++++++ + .../devicetree/bindings/mfd/motorola,cpcap.yaml | 408 +++++++++++++++ + .../devicetree/bindings/mfd/motorola-cpcap.txt | 78 --- + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 1 + + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + + .../devicetree/bindings/mfd/rohm,bd71815-pmic.yaml | 9 +- + .../devicetree/bindings/mfd/rohm,bd71828-pmic.yaml | 9 +- + .../devicetree/bindings/mfd/rohm,bd72720-pmic.yaml | 29 +- + .../devicetree/bindings/mfd/rohm,bd73800-pmic.yaml | 218 ++++++++ + .../devicetree/bindings/mfd/rohm,pmic-pins.yaml | 72 +++ + .../devicetree/bindings/mfd/stericsson,ab8500.yaml | 150 +++++- + .../bindings/mfd/ti,keystone-devctrl.yaml | 90 ++++ + .../devicetree/bindings/mfd/ti,tps61050.yaml | 92 ++++ + .../devicetree/bindings/mfd/ti,tps65910.yaml | 8 + + .../devicetree/bindings/mfd/ti,twl6040.yaml | 156 ++++++ + .../bindings/mfd/ti-keystone-devctrl.txt | 19 - + Documentation/devicetree/bindings/mfd/tps6105x.txt | 62 --- + Documentation/devicetree/bindings/mfd/twl6040.txt | 67 --- + .../bindings/regulator/rohm,bd73800-regulator.yaml | 99 ++++ + MAINTAINERS | 2 + + drivers/clk/clk-bd718x7.c | 8 + + drivers/gpio/Kconfig | 12 + + drivers/gpio/Makefile | 1 + + drivers/gpio/gpio-bd73800.c | 209 ++++++++ + drivers/iio/light/lm3533-als.c | 185 +++---- + drivers/leds/leds-lm3533.c | 121 ++--- + drivers/mfd/Kconfig | 17 +- + drivers/mfd/ab8500-core.c | 2 +- + drivers/mfd/cs42l43-i2c.c | 10 + + drivers/mfd/cs42l43-sdw.c | 9 + + drivers/mfd/cs42l43.c | 30 +- + drivers/mfd/cs42l43.h | 1 + + drivers/mfd/da903x.c | 34 +- + drivers/mfd/da9062-core.c | 24 +- + drivers/mfd/da9150-core.c | 8 +- + drivers/mfd/intel-lpss.c | 24 +- + drivers/mfd/intel_quark_i2c_gpio.c | 52 +- + drivers/mfd/iqs62x.c | 8 +- + drivers/mfd/khadas-mcu.c | 104 +++- + drivers/mfd/lm3533-core.c | 386 ++++++-------- + drivers/mfd/lm3533-ctrlbank.c | 33 +- + drivers/mfd/max77843.c | 8 +- + drivers/mfd/motorola-cpcap.c | 143 +++--- + drivers/mfd/mt6360-core.c | 8 +- + drivers/mfd/rk8xx-core.c | 2 +- + drivers/mfd/rk8xx-i2c.c | 4 +- + drivers/mfd/rn5t618.c | 8 +- + drivers/mfd/rohm-bd71828.c | 147 +++++- + drivers/mfd/ti_am335x_tscadc.c | 8 +- + drivers/mfd/tps6586x.c | 8 +- + drivers/mfd/twl-core.c | 31 +- + drivers/mfd/wcd934x.c | 8 +- + drivers/mfd/wm831x-auxadc.c | 2 +- + drivers/regulator/Kconfig | 4 +- + drivers/regulator/bd71828-regulator.c | 558 ++++++++++++++++++++- + drivers/rtc/rtc-bd70528.c | 8 + + drivers/thermal/khadas_mcu_fan.c | 108 +++- + drivers/video/backlight/lm3533_bl.c | 188 +++---- + include/linux/mfd/cs42l43-regs.h | 1 + + include/linux/mfd/da9150/core.h | 1 + + include/linux/mfd/khadas-mcu.h | 19 +- + include/linux/mfd/lm3533.h | 75 +-- + include/linux/mfd/motorola-cpcap.h | 7 + + include/linux/mfd/rohm-bd73800.h | 306 +++++++++++ + include/linux/mfd/rohm-generic.h | 1 + + 69 files changed, 3747 insertions(+), 1111 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/input/cpcap-pwrbutton.txt + create mode 100644 Documentation/devicetree/bindings/input/motorola,cpcap-pwrbutton.yaml + create mode 100644 Documentation/devicetree/bindings/leds/backlight/ti,lm3533-backlight.yaml + create mode 100644 Documentation/devicetree/bindings/leds/ti,lm3533-leds.yaml + create mode 100644 Documentation/devicetree/bindings/leds/ti,lm3533.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/motorola,cpcap.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/motorola-cpcap.txt + create mode 100644 Documentation/devicetree/bindings/mfd/rohm,bd73800-pmic.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/rohm,pmic-pins.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ti,keystone-devctrl.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ti,tps61050.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ti,twl6040.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/ti-keystone-devctrl.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/tps6105x.txt + delete mode 100644 Documentation/devicetree/bindings/mfd/twl6040.txt + create mode 100644 Documentation/devicetree/bindings/regulator/rohm,bd73800-regulator.yaml + create mode 100644 drivers/gpio/gpio-bd73800.c + create mode 100644 include/linux/mfd/rohm-bd73800.h +Merging backlight/for-backlight-next (5e1631df673f3 backlight: ili9320/ktd253: Fix typos in comments) +$ git merge -m Merge branch 'for-backlight-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Merge made by the 'ort' strategy. + drivers/video/backlight/ili9320.c | 2 +- + drivers/video/backlight/ktd253-backlight.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging battery/for-next (5c1c602463d59 power: supply: sbs-battery: disable polling before supply teardown) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Auto-merging drivers/power/supply/max17042_battery.c +Auto-merging drivers/power/supply/power_supply_core.c +Auto-merging include/linux/power_supply.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-power | 49 ++- + .../ABI/testing/sysfs-class-power-ltc4162l | 2 + + Documentation/ABI/testing/sysfs-class-power-mp2629 | 2 +- + Documentation/ABI/testing/sysfs-class-power-rt9467 | 2 + + Documentation/ABI/testing/sysfs-class-power-rt9471 | 2 + + .../devicetree/bindings/power/supply/battery.yaml | 3 +- + .../devicetree/bindings/power/supply/bq27xxx.yaml | 4 +- + .../power/supply/stericsson,ab8500-charger.yaml | 76 +++- + Documentation/power/power_supply_class.rst | 23 +- + drivers/power/reset/keystone-reset.c | 3 +- + drivers/power/reset/macsmc-reboot.c | 4 +- + drivers/power/supply/Kconfig | 1 + + drivers/power/supply/ab8500-bm.h | 8 +- + drivers/power/supply/ab8500_bmdata.c | 3 +- + drivers/power/supply/ab8500_btemp.c | 30 +- + drivers/power/supply/ab8500_chargalg.c | 9 +- + drivers/power/supply/ab8500_charger.c | 406 ++++++++++++++++++--- + drivers/power/supply/ab8500_fg.c | 181 +++------ + drivers/power/supply/axp20x_ac_power.c | 3 - + drivers/power/supply/axp20x_battery.c | 3 - + drivers/power/supply/axp20x_usb_power.c | 50 +-- + drivers/power/supply/bq24190_charger.c | 101 +++-- + drivers/power/supply/bq24257_charger.c | 43 ++- + drivers/power/supply/bq2515x_charger.c | 15 +- + drivers/power/supply/bq25630_charger.c | 84 +++++ + drivers/power/supply/bq256xx_charger.c | 96 ++++- + drivers/power/supply/bq257xx_charger.c | 124 +++---- + drivers/power/supply/bq25890_charger.c | 2 +- + drivers/power/supply/bq27xxx_battery.c | 24 +- + drivers/power/supply/bq27xxx_battery_i2c.c | 4 + + drivers/power/supply/charger-manager.c | 2 +- + drivers/power/supply/cpcap-charger.c | 4 +- + drivers/power/supply/cros_charge-control.c | 157 +++++++- + drivers/power/supply/da9030_battery.c | 2 +- + drivers/power/supply/intel_dc_ti_battery.c | 2 +- + drivers/power/supply/ltc2941-battery-gauge.c | 6 +- + drivers/power/supply/ltc4162-l-charger.c | 56 ++- + drivers/power/supply/max17042_battery.c | 28 +- + drivers/power/supply/mm8013.c | 1 + + drivers/power/supply/pf1550-charger.c | 32 +- + drivers/power/supply/power_supply_core.c | 98 ++--- + drivers/power/supply/power_supply_sysfs.c | 17 + + drivers/power/supply/qcom_battmgr.c | 1 + + drivers/power/supply/qcom_smbx.c | 102 ++++-- + drivers/power/supply/rt9467-charger.c | 54 ++- + drivers/power/supply/rt9471.c | 54 ++- + drivers/power/supply/s2mu005-battery.c | 4 +- + drivers/power/supply/sbs-battery.c | 11 + + drivers/power/supply/sbs-charger.c | 4 +- + drivers/power/supply/smb347-charger.c | 4 +- + include/linux/power/bq27xxx_battery.h | 2 + + include/linux/power_supply.h | 18 +- + 52 files changed, 1469 insertions(+), 547 deletions(-) +Merging regulator/for-next (8c3ce6554a5b9 Merge regulator/for-7.4 into regulator-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Auto-merging Documentation/devicetree/bindings/mfd/ti,tps65910.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/regulator/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/ti,tps65910.yaml | 12 +- + .../devicetree/bindings/regulator/lp872x.txt | 161 ----- + .../bindings/regulator/max8925-regulator.txt | 40 -- + .../regulator/maxim,max77620-regulator.yaml | 17 +- + .../bindings/regulator/maxim,max77826.yaml | 4 +- + .../bindings/regulator/maxim,max77838.yaml | 4 +- + .../regulator/mediatek,mt6380-regulator.yaml | 117 ++++ + .../devicetree/bindings/regulator/mps,mp5416.yaml | 38 +- + .../devicetree/bindings/regulator/mps,mp886x.yaml | 30 +- + .../devicetree/bindings/regulator/mps,mpq4210.yaml | 68 ++ + .../devicetree/bindings/regulator/mps,mpq7920.yaml | 46 +- + .../bindings/regulator/mt6380-regulator.txt | 89 --- + .../bindings/regulator/nexperia,nex10000ub.yaml | 69 ++ + .../regulator/nvidia,tegra-regulators-coupling.txt | 65 -- + .../nvidia,tegra-regulators-coupling.yaml | 38 ++ + .../devicetree/bindings/regulator/nxp,pf0900.yaml | 2 +- + .../bindings/regulator/onnn,fan53880.yaml | 4 +- + .../bindings/regulator/pwm-regulator.yaml | 2 +- + .../bindings/regulator/qcom,rpmh-regulator.yaml | 16 + + .../regulator/richtek,rtmv20-regulator.yaml | 6 +- + .../bindings/regulator/silergy,sy8824x.yaml | 8 +- + .../bindings/regulator/silergy,sy8827n.yaml | 9 +- + .../devicetree/bindings/regulator/ti,lp872x.yaml | 186 +++++ + .../devicetree/bindings/regulator/ti,tps62360.yaml | 1 + + .../devicetree/bindings/regulator/ti,tps65023.yaml | 90 +++ + .../devicetree/bindings/regulator/ti,tps6586x.yaml | 196 ++++++ + .../devicetree/bindings/regulator/tps65023.txt | 60 -- + .../devicetree/bindings/regulator/tps6586x.txt | 135 ---- + .../bindings/soc/mediatek/mediatek,pwrap.yaml | 3 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 6 + + drivers/regulator/88pm886-regulator.c | 26 + + drivers/regulator/Kconfig | 21 +- + drivers/regulator/Makefile | 2 + + drivers/regulator/ab8500-ext.c | 2 +- + drivers/regulator/ab8500.c | 748 +++++++++++++++++++-- + drivers/regulator/axp20x-regulator.c | 6 +- + drivers/regulator/core.c | 10 +- + drivers/regulator/fixed.c | 4 + + drivers/regulator/mp886x.c | 34 +- + drivers/regulator/mpq4210.c | 243 +++++++ + drivers/regulator/nex10000ub-regulator.c | 147 ++++ + drivers/regulator/pca9450-regulator.c | 81 ++- + drivers/regulator/pf1550-regulator.c | 19 +- + drivers/regulator/pv88080-regulator.c | 4 +- + drivers/regulator/qcom-rpmh-regulator.c | 55 +- + drivers/regulator/rt6190-regulator.c | 18 +- + drivers/regulator/tps6105x-regulator.c | 2 +- + drivers/regulator/tps65185.c | 6 +- + include/linux/mfd/88pm886.h | 7 + + include/linux/regulator/driver.h | 2 +- + include/linux/regulator/pca9450.h | 4 +- + kernel/irq/irqdesc.c | 10 +- + kernel/softirq.c | 4 +- + 54 files changed, 2221 insertions(+), 758 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/lp872x.txt + delete mode 100644 Documentation/devicetree/bindings/regulator/max8925-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6380-regulator.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/mps,mpq4210.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/mt6380-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/nexperia,nex10000ub.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/nvidia,tegra-regulators-coupling.txt + create mode 100644 Documentation/devicetree/bindings/regulator/nvidia,tegra-regulators-coupling.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/ti,lp872x.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps65023.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/ti,tps6586x.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/tps65023.txt + delete mode 100644 Documentation/devicetree/bindings/regulator/tps6586x.txt + create mode 100644 drivers/regulator/mpq4210.c + create mode 100644 drivers/regulator/nex10000ub-regulator.c +Merging security/next (881f19c2ffbc7 lsm: remove redundant NULL check in security_init()) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Auto-merging fs/namei.c +Auto-merging fs/namespace.c +Auto-merging include/linux/lsm_hook_defs.h +CONFLICT (content): Merge conflict in include/linux/lsm_hook_defs.h +Auto-merging include/linux/ns/ns_common_types.h +CONFLICT (content): Merge conflict in include/linux/ns/ns_common_types.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/security.h +CONFLICT (content): Merge conflict in include/linux/security.h +Auto-merging kernel/nsproxy.c +Auto-merging security/security.c +Auto-merging security/selinux/hooks.c +Auto-merging security/smack/smack_lsm.c +Auto-merging tools/testing/selftests/bpf/progs/lsm.c +Auto-merging tools/testing/selftests/landlock/fs_test.c +Resolved 'include/linux/lsm_hook_defs.h' using previous resolution. +Resolved 'include/linux/ns/ns_common_types.h' using previous resolution. +Resolved 'include/linux/security.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d34fb148f8e81] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/LSM/index.rst | 20 +- + fs/cachefiles/security.c | 4 +- + fs/namei.c | 18 +- + fs/namespace.c | 3 +- + include/linux/cred.h | 17 +- + include/linux/lsm_audit.h | 7 +- + include/linux/lsm_hook_defs.h | 28 +-- + include/linux/lsm_hooks.h | 1 + + include/linux/ns/ns_common_types.h | 3 + + include/linux/sched.h | 8 +- + include/linux/security.h | 78 +++++--- + include/uapi/linux/nsfs.h | 1 + + init/init_task.c | 2 +- + kernel/auditsc.c | 5 +- + kernel/cred.c | 5 +- + kernel/nscommon.c | 17 +- + kernel/nsproxy.c | 6 + + rust/kernel/security.rs | 3 +- + security/lsm_audit.c | 8 +- + security/lsm_init.c | 9 +- + security/security.c | 115 +++++++++-- + security/selinux/hooks.c | 25 ++- + security/smack/smack_lsm.c | 9 +- + tools/testing/selftests/bpf/prog_tests/test_lsm.c | 231 ++++++++++++++++++++++ + tools/testing/selftests/bpf/progs/lsm.c | 79 ++++++++ + tools/testing/selftests/landlock/fs_test.c | 10 +- + 26 files changed, 600 insertions(+), 112 deletions(-) +$ git am -3 ../patches/0001-security-Fix-up-mismerge-and-additional-semantic-iss.patch +Applying: security: Fix up mismerge and additional semantic issues with vfs-brauner +Using index info to reconstruct a base tree... +M include/linux/lsm_hook_defs.h +M security/security.c +M security/selinux/hooks.c +Falling back to patching base and 3-way merge... +Auto-merging security/selinux/hooks.c +Auto-merging security/security.c +$ git reset HEAD^ +Unstaged changes after reset: +M include/linux/security.h +M security/apparmor/af_unix.c +M security/apparmor/file.c +M security/apparmor/include/af_unix.h +M security/apparmor/include/file.h +M security/apparmor/include/net.h +M security/apparmor/lsm.c +M security/apparmor/net.c +M security/security.c +M security/selinux/hooks.c +M security/smack/smack_lsm.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 44d6522de1ec3] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git + Date: Wed Oct 14 14:35:27 2026 +0100 +$ git am -3 ../patches/0001-security-More-merge-fixup-from-the-constification-of.patch +Applying: security: More merge fixup from the constification of idmap +$ git reset HEAD^ +Unstaged changes after reset: +M security/security.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 6e9daa793eaac] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git + Date: Wed Oct 14 14:35:27 2026 +0100 +Merging apparmor/apparmor-next (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'apparmor-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (1dc317438308c integrity: Replace integrity_audit_message() with integrity_audit_msg()) +$ git merge -m Merge branch 'next-integrity' of https://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Auto-merging security/integrity/evm/evm_main.c +Auto-merging security/integrity/ima/ima_api.c +Auto-merging security/integrity/ima/ima_appraise.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/integrity/ima/ima_policy.c +Merge made by the 'ort' strategy. + security/integrity/evm/evm_main.c | 9 +++++---- + security/integrity/ima/ima_api.c | 8 ++++---- + security/integrity/ima/ima_appraise.c | 6 +++--- + security/integrity/ima/ima_fs.c | 7 ++++--- + security/integrity/ima/ima_init.c | 2 +- + security/integrity/ima/ima_main.c | 13 +++++++------ + security/integrity/ima/ima_policy.c | 11 ++++++----- + security/integrity/ima/ima_queue.c | 2 +- + security/integrity/ima/ima_queue_keys.c | 8 ++++---- + security/integrity/ima/ima_template_lib.c | 2 +- + security/integrity/integrity.h | 18 +++--------------- + security/integrity/integrity_audit.c | 12 ++---------- + 12 files changed, 41 insertions(+), 57 deletions(-) +Merging selinux/next (12802add29de8 Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Auto-merging security/selinux/selinuxfs.c +Merge made by the 'ort' strategy. + security/selinux/avc.c | 37 ++++++----- + security/selinux/include/avc.h | 7 +- + security/selinux/selinuxfs.c | 59 +++++++++-------- + security/selinux/ss/mls.c | 38 ----------- + security/selinux/ss/mls.h | 3 - + security/selinux/ss/mls_types.h | 3 - + security/selinux/ss/policydb.c | 137 ++++++++++++++++++++++++++++++++++++---- + 7 files changed, 183 insertions(+), 101 deletions(-) +Merging smack/next (fedc88e38ce97 smack: fix cred UAF in smack_file_send_sigiotask()) +$ git merge -m Merge branch 'next' of https://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (72d3fcf802c45 Linux 7.3-rc5) +$ git merge -m Merge branch 'master' of git://git.code.sf.net/p/tomoyo/tomoyo.git tomoyo/master +Already up to date. +Merging tpmdd-tpm/for-next-tpm (cf507674f8f73 tpm: fix zero-length read discarding the pending response) +$ git merge -m Merge branch 'for-next-tpm' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd-tpm/for-next-tpm +Merge made by the 'ort' strategy. + drivers/char/tpm/tpm-dev-common.c | 3 +++ + drivers/char/tpm/tpm2-cmd.c | 21 ++++++++++++++++++++- + drivers/char/tpm/tpm_nsc.c | 8 ++++++-- + 3 files changed, 29 insertions(+), 3 deletions(-) +Merging tpmdd-keys/for-next-keys (a626e44fd64c4 keys: Check the authorization payload in process keyring searches) +$ git merge -m Merge branch 'for-next-keys' of https://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd-keys/for-next-keys +Auto-merging security/keys/process_keys.c +Auto-merging security/keys/trusted-keys/trusted_tpm1.c +Merge made by the 'ort' strategy. + security/keys/key.c | 13 ++++++++++--- + security/keys/keyctl.c | 2 ++ + security/keys/keyring.c | 2 +- + security/keys/process_keys.c | 5 ++--- + security/keys/trusted-keys/trusted_tpm1.c | 4 +++- + security/keys/trusted-keys/trusted_tpm2.c | 4 +++- + 6 files changed, 21 insertions(+), 9 deletions(-) +Merging watchdog/watchdog-next (8b5a9f09037e3 dt-bindings: watchdog: apple,wdt: Add t8140 compatible) +$ git merge -m Merge branch 'watchdog-next' of https://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git watchdog/watchdog-next +Auto-merging drivers/watchdog/hpwdt.c +Auto-merging drivers/watchdog/mtk_wdt.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/watchdog/apple,wdt.yaml | 1 + + .../bindings/watchdog/mediatek,mtk-wdt.yaml | 2 + + .../bindings/watchdog/renesas,r9a09g057-wdt.yaml | 29 ++++- + .../devicetree/bindings/watchdog/samsung-wdt.yaml | 23 +++- + Documentation/watchdog/watchdog-parameters.rst | 2 + + drivers/watchdog/acquirewdt.c | 3 +- + drivers/watchdog/advantech_ec_wdt.c | 3 +- + drivers/watchdog/advantechwdt.c | 5 +- + drivers/watchdog/airoha_wdt.c | 5 +- + drivers/watchdog/alim1535_wdt.c | 5 +- + drivers/watchdog/alim7101_wdt.c | 5 +- + drivers/watchdog/arm_smc_wdt.c | 3 +- + drivers/watchdog/armada_37xx_wdt.c | 3 +- + drivers/watchdog/aspeed_wdt.c | 3 +- + drivers/watchdog/at91rm9200_wdt.c | 5 +- + drivers/watchdog/at91sam9_wdt.c | 5 +- + drivers/watchdog/atcwdt200_wdt.c | 5 +- + drivers/watchdog/ath79_wdt.c | 5 +- + drivers/watchdog/bcm2835_wdt.c | 3 +- + drivers/watchdog/bcm47xx_wdt.c | 5 +- + drivers/watchdog/bcm7038_wdt.c | 3 +- + drivers/watchdog/booke_wdt.c | 3 +- + drivers/watchdog/cadence_wdt.c | 13 +-- + drivers/watchdog/cgbc_wdt.c | 7 +- + drivers/watchdog/da9052_wdt.c | 5 +- + drivers/watchdog/da9055_wdt.c | 3 +- + drivers/watchdog/da9062_wdt.c | 8 +- + drivers/watchdog/davinci_wdt.c | 7 +- + drivers/watchdog/db8500_wdt.c | 5 +- + drivers/watchdog/dw_wdt.c | 3 +- + drivers/watchdog/ebc-c384_wdt.c | 5 +- + drivers/watchdog/eurotechwdt.c | 3 +- + drivers/watchdog/exar_wdt.c | 5 +- + drivers/watchdog/f71808e_wdt.c | 9 +- + drivers/watchdog/gef_wdt.c | 3 +- + drivers/watchdog/geodewdt.c | 5 +- + drivers/watchdog/gpio_wdt.c | 3 +- + drivers/watchdog/hpwdt.c | 3 +- + drivers/watchdog/i6300esb.c | 28 +++-- + drivers/watchdog/iTCO_wdt.c | 5 +- + drivers/watchdog/ib700wdt.c | 5 +- + drivers/watchdog/ibmasr.c | 3 +- + drivers/watchdog/ie6xx_wdt.c | 5 +- + drivers/watchdog/imgpdc_wdt.c | 5 +- + drivers/watchdog/imx2_wdt.c | 5 +- + drivers/watchdog/imx7ulp_wdt.c | 3 +- + drivers/watchdog/imx_sc_wdt.c | 3 +- + drivers/watchdog/indydog.c | 3 +- + drivers/watchdog/intel_oc_wdt.c | 5 +- + drivers/watchdog/it87_wdt.c | 7 +- + drivers/watchdog/jz4740_wdt.c | 7 +- + drivers/watchdog/keembay_wdt.c | 13 +-- + drivers/watchdog/kempld_wdt.c | 7 +- + drivers/watchdog/lenovo_se10_wdt.c | 5 +- + drivers/watchdog/lenovo_se30_wdt.c | 5 +- + drivers/watchdog/lenovo_se30g2_se60_wdt.c | 5 +- + drivers/watchdog/loongson1_wdt.c | 5 +- + drivers/watchdog/lpc18xx_wdt.c | 5 +- + drivers/watchdog/ma35d1_wdt.c | 3 +- + drivers/watchdog/max63xx_wdt.c | 9 +- + drivers/watchdog/max77620_wdt.c | 3 +- + drivers/watchdog/mena21_wdt.c | 3 +- + drivers/watchdog/menf21bmc_wdt.c | 3 +- + drivers/watchdog/menz69_wdt.c | 3 +- + drivers/watchdog/meson_gxbb_wdt.c | 5 +- + drivers/watchdog/meson_wdt.c | 3 +- + drivers/watchdog/mixcomwd.c | 3 +- + drivers/watchdog/mpc8xxx_wdt.c | 5 +- + drivers/watchdog/msc313e_wdt.c | 12 +-- + drivers/watchdog/mt7621_wdt.c | 3 +- + drivers/watchdog/mtk_wdt.c | 119 ++++++++++++++++++--- + drivers/watchdog/nct6694_wdt.c | 3 +- + drivers/watchdog/ni903x_wdt.c | 5 +- + drivers/watchdog/nic7018_wdt.c | 5 +- + drivers/watchdog/nv_tco.c | 5 +- + drivers/watchdog/octeon-wdt-main.c | 5 +- + drivers/watchdog/of_xilinx_wdt.c | 8 +- + drivers/watchdog/omap_wdt.c | 3 +- + drivers/watchdog/orion_wdt.c | 3 +- + drivers/watchdog/pc87413_wdt.c | 9 +- + drivers/watchdog/pcwd.c | 5 +- + drivers/watchdog/pcwd_pci.c | 7 +- + drivers/watchdog/pcwd_usb.c | 7 +- + drivers/watchdog/pika_wdt.c | 5 +- + drivers/watchdog/pm8916_wdt.c | 8 +- + drivers/watchdog/pnx4008_wdt.c | 5 +- + drivers/watchdog/pseries-wdt.c | 7 +- + drivers/watchdog/rc32434_wdt.c | 5 +- + drivers/watchdog/renesas_wdt.c | 3 +- + drivers/watchdog/rn5t618_wdt.c | 3 +- + drivers/watchdog/rt2880_wdt.c | 3 +- + drivers/watchdog/rti_wdt.c | 5 +- + drivers/watchdog/rzg2l_wdt.c | 3 +- + drivers/watchdog/rzv2h_wdt.c | 3 +- + drivers/watchdog/s32g_wdt.c | 5 +- + drivers/watchdog/s3c2410_wdt.c | 23 +++- + drivers/watchdog/sama5d4_wdt.c | 5 +- + drivers/watchdog/sbc60xxwdt.c | 5 +- + drivers/watchdog/sbc7240_wdt.c | 5 +- + drivers/watchdog/sbc8360.c | 3 +- + drivers/watchdog/sbc_epx_c3.c | 3 +- + drivers/watchdog/sbsa_gwdt.c | 24 ++++- + drivers/watchdog/sc1200wdt.c | 3 +- + drivers/watchdog/sch311x_wdt.c | 5 +- + drivers/watchdog/shwdt.c | 7 +- + drivers/watchdog/simatic-ipc-wdt.c | 3 +- + drivers/watchdog/sl28cpld_wdt.c | 3 +- + drivers/watchdog/smsc37b787_wdt.c | 3 +- + drivers/watchdog/softdog.c | 5 +- + drivers/watchdog/sp5100_tco.c | 68 ++++++++++-- + drivers/watchdog/sp805_wdt.c | 14 +-- + drivers/watchdog/starfive-wdt.c | 7 +- + drivers/watchdog/stmp3xxx_rtc_wdt.c | 13 +-- + drivers/watchdog/stpmic1_wdt.c | 3 +- + drivers/watchdog/sun4v_wdt.c | 5 +- + drivers/watchdog/sunplus_wdt.c | 3 +- + drivers/watchdog/sunxi_wdt.c | 3 +- + drivers/watchdog/tegra_wdt.c | 5 +- + drivers/watchdog/tqmx86_wdt.c | 3 +- + drivers/watchdog/ts4800_wdt.c | 3 +- + drivers/watchdog/twl4030_wdt.c | 3 +- + drivers/watchdog/txx9wdt.c | 7 +- + drivers/watchdog/uniphier_wdt.c | 5 +- + drivers/watchdog/via_wdt.c | 5 +- + drivers/watchdog/visconti_wdt.c | 3 +- + drivers/watchdog/w83627hf_wdt.c | 5 +- + drivers/watchdog/w83877f_wdt.c | 5 +- + drivers/watchdog/w83977f_wdt.c | 5 +- + drivers/watchdog/wafer5823wdt.c | 5 +- + drivers/watchdog/watchdog_core.c | 5 +- + drivers/watchdog/watchdog_dev.c | 9 +- + drivers/watchdog/wdat_wdt.c | 5 +- + drivers/watchdog/wdt.c | 9 +- + drivers/watchdog/wdt977.c | 7 +- + drivers/watchdog/wdt_pci.c | 9 +- + drivers/watchdog/wm831x_wdt.c | 3 +- + drivers/watchdog/wm8350_wdt.c | 3 +- + drivers/watchdog/xen_wdt.c | 5 +- + drivers/watchdog/xilinx_wwdt.c | 5 +- + drivers/watchdog/ziirave_wdt.c | 3 +- + include/dt-bindings/reset/mediatek,mt8167-wdt.h | 21 ++++ + 141 files changed, 689 insertions(+), 298 deletions(-) + create mode 100644 include/dt-bindings/reset/mediatek,mt8167-wdt.h +Merging iommu/next (c233d59828627 Merge branches 'apple/dart', 'arm/smmu/updates', 'arm/smmu/bindings', 'hyper-v', 'samsung/exynos', 'riscv', 'broadcom', 'intel/vt-d', 'amd/amd-vi' and 'core' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/iommu/linux.git iommu/next +Auto-merging Documentation/arch/arm64/silicon-errata.rst +Auto-merging MAINTAINERS +Auto-merging arch/x86/hyperv/hv_init.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c +Auto-merging drivers/iommu/dma-iommu.c +Auto-merging drivers/pci/controller/pci-hyperv.c +Merge made by the 'ort' strategy. + Documentation/arch/arm64/silicon-errata.rst | 3 +- + .../bindings/display/brcm,bcm2835-hvs.yaml | 3 + + .../devicetree/bindings/iommu/apple,dart.yaml | 12 +- + .../devicetree/bindings/iommu/arm,smmu-v3.yaml | 10 + + .../devicetree/bindings/iommu/arm,smmu.yaml | 4 + + .../bindings/iommu/brcm,bcm2712-iommu.yaml | 54 ++ + .../bindings/iommu/brcm,bcm2712-iommuc.yaml | 40 ++ + MAINTAINERS | 12 + + arch/x86/hyperv/hv_init.c | 4 + + arch/x86/include/asm/iommu.h | 20 + + arch/x86/include/asm/mshyperv.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 50 ++ + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 12 + + drivers/hv/hv_common.c | 115 ++++ + drivers/iommu/Kconfig | 18 +- + drivers/iommu/Makefile | 1 + + drivers/iommu/amd/amd_iommu.h | 3 + + drivers/iommu/amd/amd_iommu_types.h | 7 + + drivers/iommu/amd/init.c | 169 +++-- + drivers/iommu/amd/iommu.c | 468 ++++++++++---- + drivers/iommu/apple-dart.c | 74 ++- + .../iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 1 + + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 29 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-test.c | 57 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 628 +++++++++++++------ + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 77 ++- + drivers/iommu/arm/arm-smmu-v3/tegra241-cmdqv.c | 2 +- + drivers/iommu/bcm2712-iommu-cache.c | 84 +++ + drivers/iommu/bcm2712-iommu-cache.h | 9 + + drivers/iommu/bcm2712-iommu.c | 550 +++++++++++++++++ + drivers/iommu/dma-iommu.c | 32 +- + drivers/iommu/exynos-iommu.c | 37 +- + drivers/iommu/generic_pt/.kunitconfig | 1 + + drivers/iommu/generic_pt/Kconfig | 10 + + drivers/iommu/generic_pt/fmt/Makefile | 2 + + drivers/iommu/generic_pt/fmt/bcm2712.h | 288 +++++++++ + drivers/iommu/generic_pt/fmt/defs_bcm2712.h | 18 + + drivers/iommu/generic_pt/fmt/iommu_bcm2712.c | 6 + + drivers/iommu/generic_pt/kunit_iommu_pt.h | 2 +- + drivers/iommu/hyperv/Kconfig | 15 + + drivers/iommu/hyperv/Makefile | 1 + + drivers/iommu/hyperv/hv-iommu-guest.c | 682 +++++++++++++++++++++ + drivers/iommu/hyperv/iommu.h | 44 ++ + drivers/iommu/intel/dmar.c | 72 ++- + drivers/iommu/intel/iommu.c | 167 ++++- + drivers/iommu/intel/iommu.h | 17 +- + drivers/iommu/intel/nested.c | 2 + + drivers/iommu/iommu-priv.h | 4 + + drivers/iommu/iommu-sva.c | 14 +- + drivers/iommu/iommu.c | 4 + + drivers/iommu/riscv/iommu.c | 12 + + drivers/pci/controller/pci-hyperv.c | 21 +- + include/asm-generic/mshyperv.h | 4 + + include/hyperv/hvgdk_mini.h | 10 + + include/hyperv/hvhdk_mini.h | 155 +++++ + include/linux/amd-iommu.h | 13 +- + include/linux/generic_pt/common.h | 6 + + include/linux/generic_pt/iommu.h | 12 + + include/linux/hyperv.h | 8 + + include/linux/iommu.h | 2 - + 61 files changed, 3696 insertions(+), 486 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iommu/brcm,bcm2712-iommu.yaml + create mode 100644 Documentation/devicetree/bindings/iommu/brcm,bcm2712-iommuc.yaml + create mode 100644 drivers/iommu/bcm2712-iommu-cache.c + create mode 100644 drivers/iommu/bcm2712-iommu-cache.h + create mode 100644 drivers/iommu/bcm2712-iommu.c + create mode 100644 drivers/iommu/generic_pt/fmt/bcm2712.h + create mode 100644 drivers/iommu/generic_pt/fmt/defs_bcm2712.h + create mode 100644 drivers/iommu/generic_pt/fmt/iommu_bcm2712.c + create mode 100644 drivers/iommu/hyperv/Kconfig + create mode 100644 drivers/iommu/hyperv/hv-iommu-guest.c + create mode 100644 drivers/iommu/hyperv/iommu.h +Merging audit/next (e35ae53e5b6da Automated merge of 'dev' into 'next') +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Auto-merging kernel/auditsc.c +Merge made by the 'ort' strategy. + fs/fsopen.c | 3 ++ + include/linux/audit.h | 16 +++++++-- + include/uapi/linux/audit.h | 1 + + kernel/audit.c | 2 +- + kernel/audit.h | 20 +++++++---- + kernel/audit_tree.c | 1 + + kernel/audit_watch.c | 2 ++ + kernel/auditfilter.c | 86 ++++++++++++++++++++++------------------------ + kernel/auditsc.c | 17 ++++++++- + 9 files changed, 93 insertions(+), 55 deletions(-) +Merging devicetree/for-next (e2c8975e89ebd dt-bindings: reset: Drop obsolete STM32(MP1) RCC bindings) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging Documentation/devicetree/bindings/i2c/xlnx,xps-iic-2.00.a.yaml +Auto-merging Documentation/devicetree/bindings/media/mediatek-jpeg-decoder.yaml +Auto-merging Documentation/devicetree/bindings/media/mediatek-jpeg-encoder.yaml +Auto-merging Documentation/devicetree/bindings/media/qcom,x1e80100-camss.yaml +Auto-merging Documentation/devicetree/bindings/mfd/ti,tps65910.yaml +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/of/irq.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/arm,cci-400.yaml | 6 +- + .../devicetree/bindings/arm/arm,coresight-cti.yaml | 2 +- + .../devicetree/bindings/arm/keystone/ti,sci.yaml | 4 +- + .../bindings/arm/mediatek/mediatek,audsys.yaml | 2 +- + .../bindings/arm/mediatek/mediatek,g3dsys.txt | 30 - + Documentation/devicetree/bindings/arm/omap/mpu.txt | 54 -- + .../devicetree/bindings/arm/ti/ti,omap-mpu.yaml | 58 ++ + .../devicetree/bindings/arm/vexpress-config.yaml | 4 + + .../devicetree/bindings/bus/omap-ocp2scp.txt | 29 - + .../devicetree/bindings/bus/ti,omap-ocp2scp.yaml | 74 ++ + .../bindings/display/bridge/sil,sii9022.yaml | 2 +- + .../display/mediatek/mediatek,hdmi-ddc.yaml | 11 +- + .../devicetree/bindings/dts-coding-style.rst | 5 +- + .../bindings/firmware/nvidia,tegra186-bpmp.yaml | 6 +- + .../devicetree/bindings/gpio/delta,tn48m-gpio.yaml | 2 +- + .../devicetree/bindings/gpu/arm,mali-utgard.yaml | 25 +- + .../devicetree/bindings/hwmon/adi,ltc2991.yaml | 2 +- + .../devicetree/bindings/hwmon/vexpress.txt | 23 - + .../bindings/i2c/xlnx,xps-iic-2.00.a.yaml | 4 +- + .../bindings/iio/light/upisemi,us5182.yaml | 2 +- + .../devicetree/bindings/input/matrix-keymap.yaml | 3 +- + .../devicetree/bindings/input/ti,tca8418.yaml | 21 +- + .../interrupt-controller/chrp,open-pic.yaml | 7 +- + .../bindings/interrupt-controller/qcom,pdc.yaml | 1 + + .../mailbox/allwinner,sun6i-a31-msgbox.yaml | 3 - + .../devicetree/bindings/mailbox/altera-mailbox.txt | 12 +- + .../bindings/mailbox/hisilicon,hi3660-mailbox.txt | 2 +- + .../bindings/mailbox/hisilicon,hi6220-mailbox.txt | 2 +- + .../devicetree/bindings/mailbox/mailbox.txt | 60 -- + .../bindings/mailbox/ti,omap-mailbox.yaml | 3 +- + .../bindings/media/amlogic,c3-mipi-csi2.yaml | 4 +- + .../devicetree/bindings/media/arm,mali-c55.yaml | 2 +- + .../devicetree/bindings/media/atmel,isc.yaml | 14 +- + .../bindings/media/brcm,bcm2835-unicam.yaml | 10 +- + .../devicetree/bindings/media/cdns,csi2rx.yaml | 58 +- + .../bindings/media/i2c/galaxycore,gc05a2.yaml | 2 +- + .../devicetree/bindings/media/i2c/ovti,ov2680.yaml | 26 +- + .../devicetree/bindings/media/i2c/ovti,ov2732.yaml | 6 +- + .../bindings/media/img,e5010-jpeg-enc.yaml | 22 +- + .../bindings/media/mediatek,vcodec-encoder.yaml | 2 +- + .../bindings/media/mediatek-jpeg-decoder.yaml | 4 +- + .../bindings/media/mediatek-jpeg-encoder.yaml | 2 +- + .../bindings/media/microchip,csi2dc.yaml | 52 +- + .../devicetree/bindings/media/microchip,xisc.yaml | 14 +- + .../devicetree/bindings/media/nxp,imx8-jpeg.yaml | 4 +- + .../bindings/media/qcom,msm8996-venus.yaml | 40 +- + .../bindings/media/qcom,x1e80100-camss.yaml | 26 +- + .../bindings/media/raspberrypi,pispbe.yaml | 12 +- + .../devicetree/bindings/media/samsung,fimc.yaml | 14 +- + .../devicetree/bindings/media/st,stm32-dcmi.yaml | 16 +- + .../devicetree/bindings/media/st,stm32-dcmipp.yaml | 14 +- + .../devicetree/bindings/media/ti,cal.yaml | 48 +- + .../devicetree/bindings/mfd/ti,tps65910.yaml | 2 +- + Documentation/devicetree/bindings/mux/reg-mux.yaml | 2 +- + .../bindings/nvmem/zii,rave-sp-eeprom.yaml | 2 +- + .../bindings/pci/hisilicon,kirin-pcie.yaml | 4 +- + .../bindings/pinctrl/sunplus,sp7021-pinctrl.yaml | 2 +- + .../bindings/power/reset/xlnx,zynqmp-power.yaml | 9 +- + .../devicetree/bindings/regulator/vexpress.txt | 32 - + .../devicetree/bindings/reset/st,stm32-rcc.txt | 6 - + .../devicetree/bindings/reset/st,stm32mp1-rcc.txt | 6 - + .../bindings/scsi/hisilicon,hip05-sas-v1.yaml | 158 ++++ + .../devicetree/bindings/scsi/hisilicon-sas.txt | 98 --- + .../soc/hisilicon/hisilicon,hip05-cpld.yaml | 35 + + .../soc/mediatek/mediatek,mt2701-g3dsys.yaml | 58 ++ + .../bindings/soc/nuvoton/nuvoton,npcm-gcr.yaml | 18 +- + .../bindings/soc/qcom/qcom,aoss-qmp.yaml | 2 +- + .../bindings/sound/mediatek,mt8173-rt5650.yaml | 73 ++ + .../devicetree/bindings/sound/mt8173-rt5650.txt | 31 - + .../bindings/spi/aspeed,ast2600-fmc.yaml | 6 +- + .../devicetree/bindings/thermal/thermal-idle.yaml | 2 +- + .../devicetree/bindings/trivial-devices.yaml | 4 +- + Documentation/devicetree/of_unittest.rst | 2 +- + MAINTAINERS | 4 +- + drivers/of/fdt_address.c | 2 +- + drivers/of/irq.c | 39 +- + drivers/of/property.c | 23 +- + include/dt-bindings/clock/agilex-clock.h | 1 + + scripts/dtc/dt-check-style | 972 ++++++++++++--------- + .../dtc/dt-style-selftest/bad/dts-blank-lines.dts | 37 + + .../bad/dts-child-name-order.dtso | 33 + + .../dtc/dt-style-selftest/bad/dts-cont-align.dts | 27 + + .../dt-style-selftest/bad/dts-digit-node-order.dts | 40 + + .../bad/dts-digit-node-order.dtso | 41 + + .../bad/dts-extend-node-child-name-order.dtso | 26 + + .../bad/dts-extend-node-digit-node-order.dtso | 34 + + .../dtc/dt-style-selftest/bad/dts-line-length.dts | 22 + + .../dtc/dt-style-selftest/bad/dts-node-name.dts | 60 ++ + .../dt-style-selftest/bad/dts-property-name.dts | 28 + + .../dt-style-selftest/bad/dts-property-order.dts | 18 + + .../dt-style-selftest/bad/dts-property-order.dtso | 62 ++ + .../bad/dts-redundant-ws-strict.dts | 27 + + .../dtc/dt-style-selftest/bad/dts-redundant-ws.dts | 28 + + .../dt-style-selftest/bad/dts-redundant-ws.dtso | 9 + + .../dtc/dt-style-selftest/bad/dts-trailing-ws.dts | 16 + + .../dtc/dt-style-selftest/bad/dts-unused-label.dts | 21 + + .../dt-style-selftest/bad/yaml-blank-lines.yaml | 54 ++ + .../bad/yaml-child-addr-order.yaml | 2 +- + .../bad/yaml-child-name-order.yaml | 2 +- + .../dtc/dt-style-selftest/bad/yaml-cont-align.yaml | 9 +- + .../bad/yaml-digit-node-order.yaml | 2 +- + .../dtc/dt-style-selftest/bad/yaml-hex-case.yaml | 7 +- + .../dt-style-selftest/bad/yaml-indent-strict.yaml | 2 +- + .../bad/yaml-label-in-string.yaml | 2 +- + .../dt-style-selftest/bad/yaml-line-length.yaml | 5 +- + .../dt-style-selftest/bad/yaml-mixed-indent.yaml | 4 +- + .../dt-style-selftest/bad/yaml-multi-close.yaml | 2 +- + .../dtc/dt-style-selftest/bad/yaml-node-close.yaml | 2 +- + .../dtc/dt-style-selftest/bad/yaml-node-name.yaml | 54 ++ + .../bad/yaml-prop-order-device-type.yaml | 2 +- + .../dtc/dt-style-selftest/bad/yaml-prop-order.yaml | 7 +- + .../dt-style-selftest/bad/yaml-prop-pairing.yaml | 2 +- + .../dt-style-selftest/bad/yaml-property-name.yaml | 46 + + .../bad/yaml-redundant-ws-strict.yaml | 31 + + .../dt-style-selftest/bad/yaml-redundant-ws.yaml | 35 + + .../dt-style-selftest/bad/yaml-required-blank.yaml | 2 +- + scripts/dtc/dt-style-selftest/bad/yaml-tab.yaml | 2 +- + .../bad/yaml-trailing-comment.yaml | 2 +- + .../dt-style-selftest/bad/yaml-trailing-ws.yaml | 7 +- + .../bad/yaml-unclosed-comment.yaml | 2 +- + .../bad/yaml-unit-addr-prefix.yaml | 2 +- + .../dtc/dt-style-selftest/bad/yaml-unit-addr.yaml | 2 +- + .../dt-style-selftest/bad/yaml-unused-label.yaml | 2 +- + .../bad/yaml-value-ws-multiline.yaml | 2 +- + .../dtc/dt-style-selftest/bad/yaml-value-ws.yaml | 2 +- + .../expected/dts-blank-lines.dts.txt | 6 + + .../expected/dts-child-name-order.dts.txt | 1 + + .../expected/dts-child-name-order.dtso.txt | 3 + + .../expected/dts-cont-align.dts.txt | 11 + + .../expected/dts-digit-node-order.dts.txt | 2 + + .../expected/dts-digit-node-order.dtso.txt | 2 + + .../dts-extend-node-child-name-order.dtso.txt | 2 + + .../dts-extend-node-digit-node-order.dtso.txt | 2 + + .../expected/dts-line-length.dts.txt | 3 + + .../expected/dts-mixed-indent.dts.txt | 1 + + .../expected/dts-node-name.dts.txt | 13 + + .../expected/dts-property-name.dts.txt | 14 + + .../expected/dts-property-order.dts.txt | 16 +- + .../expected/dts-property-order.dtso.txt | 12 + + .../expected/dts-redundant-ws-strict.dts.txt | 13 + + .../expected/dts-redundant-ws.dts.txt | 10 + + .../expected/dts-redundant-ws.dtso.txt | 2 + + .../expected/dts-trailing-ws.dts.txt | 3 + + .../expected/dts-unused-label.dts.txt | 2 + + .../expected/yaml-blank-lines.yaml.txt | 6 + + .../expected/yaml-cont-align.yaml.txt | 4 +- + .../expected/yaml-hex-case.yaml.txt | 2 + + .../expected/yaml-line-length.yaml.txt | 1 + + .../expected/yaml-mixed-indent.yaml.txt | 1 + + .../expected/yaml-node-name.yaml.txt | 7 + + .../expected/yaml-prop-order.yaml.txt | 1 + + .../expected/yaml-prop-pairing.yaml.txt | 4 +- + .../expected/yaml-property-name.yaml.txt | 14 + + .../expected/yaml-redundant-ws-strict.yaml.txt | 5 + + .../expected/yaml-redundant-ws.yaml.txt | 4 + + .../expected/yaml-trailing-ws.yaml.txt | 2 + + .../expected/yaml-value-ws-multiline.yaml.txt | 1 + + .../good/dts-child-name-order.dtso | 44 + + .../dtc/dt-style-selftest/good/dts-cont-align.dts | 14 +- + .../good/dts-digit-node-order.dts | 3 - + .../good/dts-digit-node-order.dtso | 59 ++ + .../good/dts-extend-node-child-name-order.dtso | 26 + + .../good/dts-extend-node-digit-node-order.dtso | 34 + + .../dt-style-selftest/good/dts-property-order.dts | 8 + + .../dt-style-selftest/good/dts-property-order.dtso | 50 ++ + .../dtc/dt-style-selftest/good/yaml-4space.yaml | 2 +- + .../dt-style-selftest/good/yaml-cont-align.yaml | 33 + + .../good/yaml-tricky-parsing.yaml | 2 +- + scripts/dtc/dt-style-selftest/run.sh | 2 +- + 169 files changed, 2591 insertions(+), 1124 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/arm/mediatek/mediatek,g3dsys.txt + delete mode 100644 Documentation/devicetree/bindings/arm/omap/mpu.txt + create mode 100644 Documentation/devicetree/bindings/arm/ti/ti,omap-mpu.yaml + delete mode 100644 Documentation/devicetree/bindings/bus/omap-ocp2scp.txt + create mode 100644 Documentation/devicetree/bindings/bus/ti,omap-ocp2scp.yaml + delete mode 100644 Documentation/devicetree/bindings/hwmon/vexpress.txt + delete mode 100644 Documentation/devicetree/bindings/mailbox/mailbox.txt + delete mode 100644 Documentation/devicetree/bindings/regulator/vexpress.txt + delete mode 100644 Documentation/devicetree/bindings/reset/st,stm32-rcc.txt + delete mode 100644 Documentation/devicetree/bindings/reset/st,stm32mp1-rcc.txt + create mode 100644 Documentation/devicetree/bindings/scsi/hisilicon,hip05-sas-v1.yaml + delete mode 100644 Documentation/devicetree/bindings/scsi/hisilicon-sas.txt + create mode 100644 Documentation/devicetree/bindings/soc/hisilicon/hisilicon,hip05-cpld.yaml + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,mt2701-g3dsys.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt8173-rt5650.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/mt8173-rt5650.txt + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-blank-lines.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-child-name-order.dtso + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-cont-align.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-digit-node-order.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-digit-node-order.dtso + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-extend-node-child-name-order.dtso + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-extend-node-digit-node-order.dtso + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-line-length.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-node-name.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-property-name.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-property-order.dtso + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-redundant-ws-strict.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-redundant-ws.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-redundant-ws.dtso + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-trailing-ws.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/dts-unused-label.dts + create mode 100644 scripts/dtc/dt-style-selftest/bad/yaml-blank-lines.yaml + create mode 100644 scripts/dtc/dt-style-selftest/bad/yaml-node-name.yaml + create mode 100644 scripts/dtc/dt-style-selftest/bad/yaml-property-name.yaml + create mode 100644 scripts/dtc/dt-style-selftest/bad/yaml-redundant-ws-strict.yaml + create mode 100644 scripts/dtc/dt-style-selftest/bad/yaml-redundant-ws.yaml + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-blank-lines.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-child-name-order.dtso.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-cont-align.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-digit-node-order.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-digit-node-order.dtso.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-extend-node-child-name-order.dtso.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-extend-node-digit-node-order.dtso.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-line-length.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-node-name.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-property-name.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-property-order.dtso.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-redundant-ws-strict.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-redundant-ws.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-redundant-ws.dtso.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-trailing-ws.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/dts-unused-label.dts.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/yaml-blank-lines.yaml.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/yaml-node-name.yaml.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/yaml-property-name.yaml.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/yaml-redundant-ws-strict.yaml.txt + create mode 100644 scripts/dtc/dt-style-selftest/expected/yaml-redundant-ws.yaml.txt + create mode 100644 scripts/dtc/dt-style-selftest/good/dts-child-name-order.dtso + create mode 100644 scripts/dtc/dt-style-selftest/good/dts-digit-node-order.dtso + create mode 100644 scripts/dtc/dt-style-selftest/good/dts-extend-node-child-name-order.dtso + create mode 100644 scripts/dtc/dt-style-selftest/good/dts-extend-node-digit-node-order.dtso + create mode 100644 scripts/dtc/dt-style-selftest/good/dts-property-order.dtso + create mode 100644 scripts/dtc/dt-style-selftest/good/yaml-cont-align.yaml +Merging dt-krzk/for-next (dfcea1641506d Merge branches 'next/dt' and 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/actions/owl-s500.dtsi | 12 ++++++------ + arch/arm/boot/dts/arm/vexpress-v2p-ca5s.dts | 2 +- + arch/arm/boot/dts/aspeed/aspeed-bmc-opp-witherspoon.dts | 2 +- + arch/arm/boot/dts/aspeed/aspeed-bmc-supermicro-x11spi.dts | 2 +- + arch/arm64/boot/dts/actions/s700.dtsi | 6 +++--- + arch/arm64/boot/dts/actions/s900.dtsi | 6 +++--- + arch/arm64/boot/dts/cavium/thunder-88xx.dtsi | 6 +++--- + 7 files changed, 18 insertions(+), 18 deletions(-) +Merging mailbox/for-next (134ef0278d4e4 mailbox: qcom-ipcc: remove stray disable_irq_wake() call) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git mailbox/for-next +CONFLICT (modify/delete): Documentation/devicetree/bindings/mailbox/hisilicon,hi3660-mailbox.txt deleted in mailbox/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/mailbox/hisilicon,hi3660-mailbox.txt left in tree. +CONFLICT (modify/delete): Documentation/devicetree/bindings/mailbox/hisilicon,hi6220-mailbox.txt deleted in mailbox/for-next and modified in HEAD. Version HEAD of Documentation/devicetree/bindings/mailbox/hisilicon,hi6220-mailbox.txt left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/mailbox/hisilicon,hi3660-mailbox.txt +Documentation/devicetree/bindings/mailbox/hisilicon,hi6220-mailbox.txt +fatal: pathspec 'Documentation/devicetree/bindings/mailbox/hisilicon,hi3660-mailbox.txt +Documentation/devicetree/bindings/mailbox/hisilicon,hi6220-mailbox.txt' did not match any files +$ git commit --no-edit -v -a +[master 8bcae02414c5f] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jassibrar/mailbox.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/mailbox/hisilicon,hi3660-mailbox.txt | 51 --------- + .../bindings/mailbox/hisilicon,hi3660-mbox.yaml | 57 ++++++++++ + .../bindings/mailbox/hisilicon,hi6220-mailbox.txt | 74 ------------- + .../bindings/mailbox/hisilicon,hi6220-mbox.yaml | 63 +++++++++++ + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 2 + + .../bindings/mailbox/ti,secure-proxy.yaml | 4 +- + drivers/mailbox/arm_mhu_db.c | 4 +- + drivers/mailbox/arm_mhuv2.c | 9 +- + drivers/mailbox/arm_mhuv3.c | 6 +- + drivers/mailbox/axiado-mailbox.c | 116 ++++++++++++++++----- + drivers/mailbox/bcm74110-mailbox.c | 13 +++ + drivers/mailbox/mailbox-altera.c | 2 +- + drivers/mailbox/mtk-cmdq-mailbox.c | 7 +- + drivers/mailbox/pcc.c | 11 +- + drivers/mailbox/qcom-ipcc.c | 20 ++-- + drivers/mailbox/rockchip-mailbox.c | 60 +++++------ + drivers/mailbox/ti-msgmgr.c | 63 ++++++++--- + 17 files changed, 341 insertions(+), 221 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mailbox/hisilicon,hi3660-mailbox.txt + create mode 100644 Documentation/devicetree/bindings/mailbox/hisilicon,hi3660-mbox.yaml + delete mode 100644 Documentation/devicetree/bindings/mailbox/hisilicon,hi6220-mailbox.txt + create mode 100644 Documentation/devicetree/bindings/mailbox/hisilicon,hi6220-mbox.yaml +Merging spi/for-next (85b0e19de168d Merge spi/for-7.4 into spi-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/spi/spi-atmel.c +Auto-merging drivers/spi/spi-ti-qspi.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-spi-master | 6 +- + .../devicetree/bindings/spi/amlogic,a4-spisg.yaml | 30 +- + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 13 +- + .../bindings/spi/microchip,pic32mzda-spi.yaml | 82 +++ + .../bindings/spi/microchip,spi-pic32.txt | 34 - + .../bindings/spi/nuvoton,ma35d1-qspi.yaml | 21 +- + .../bindings/spi/qcom,sa8255p-geni-spi.yaml | 9 + + .../bindings/spi/qcom,spi-geni-qcom.yaml | 9 + + .../bindings/spi/realtek,rtd1625-nor.yaml | 65 ++ + .../devicetree/bindings/spi/renesas,sh-msiof.yaml | 9 +- + .../devicetree/bindings/spi/spi-davinci.txt | 100 --- + .../bindings/spi/spi-peripheral-props.yaml | 9 + + .../spi/ti,davinci-spi-peripheral-props.yaml | 25 + + .../devicetree/bindings/spi/ti,davinci-spi.yaml | 125 ++++ + Documentation/driver-api/driver-model/devres.rst | 2 - + Documentation/spi/multiple-data-lanes.rst | 10 +- + MAINTAINERS | 6 + + drivers/spi/Kconfig | 379 +++++------ + drivers/spi/Makefile | 2 + + drivers/spi/atmel-quadspi.c | 26 +- + drivers/spi/spi-amlogic-spisg.c | 116 +++- + drivers/spi/spi-ar934x.c | 13 +- + drivers/spi/spi-at91-usart.c | 8 +- + drivers/spi/spi-atmel.c | 8 +- + drivers/spi/spi-bcm2835.c | 29 +- + drivers/spi/spi-bcm63xx-hsspi.c | 1 + + drivers/spi/spi-bcm63xx.c | 2 +- + drivers/spi/spi-bitbang.c | 2 +- + drivers/spi/spi-cadence-quadspi.c | 4 +- + drivers/spi/spi-dw-core.c | 126 ++-- + drivers/spi/spi-dw-dma.c | 289 +++++++-- + drivers/spi/spi-dw-mmio.c | 2 + + drivers/spi/spi-dw.h | 8 + + drivers/spi/spi-ep93xx.c | 8 +- + drivers/spi/spi-fsl-dspi.c | 35 +- + drivers/spi/spi-fsl-spi.c | 8 + + drivers/spi/spi-geni-qcom.c | 114 +++- + drivers/spi/spi-imx.c | 12 +- + drivers/spi/spi-ingenic.c | 10 +- + drivers/spi/spi-ma35d1-qspi.c | 64 +- + drivers/spi/spi-ma35d1.c | 716 +++++++++++++++++++++ + drivers/spi/spi-mem.c | 14 +- + drivers/spi/spi-mtk-nor.c | 1 + + drivers/spi/spi-mxic.c | 8 +- + drivers/spi/spi-nxp-xspi.c | 16 +- + drivers/spi/spi-omap2-mcspi.c | 4 +- + drivers/spi/spi-orion.c | 9 + + drivers/spi/spi-pic32.c | 2 +- + drivers/spi/spi-pl022.c | 19 +- + drivers/spi/spi-qpic-snand.c | 105 ++- + drivers/spi/spi-realtek-rtl.c | 36 +- + drivers/spi/spi-rockchip-sfc.c | 21 +- + drivers/spi/spi-rspi.c | 49 +- + drivers/spi/spi-rtk-nor.c | 624 ++++++++++++++++++ + drivers/spi/spi-s3c64xx.c | 2 +- + drivers/spi/spi-sh-msiof.c | 18 +- + drivers/spi/spi-stm32.c | 5 +- + drivers/spi/spi-sun4i.c | 68 +- + drivers/spi/spi-sun6i.c | 2 +- + drivers/spi/spi-sunplus-sp7021.c | 13 +- + drivers/spi/spi-tegra210-quad.c | 517 ++++++++++++--- + drivers/spi/spi-ti-qspi.c | 2 +- + drivers/spi/spi-topcliff-pch.c | 4 +- + drivers/spi/spi-virtio.c | 22 +- + drivers/spi/spi-xilinx.c | 2 +- + drivers/spi/spi.c | 19 +- + include/linux/spi/spi.h | 9 + + tools/spi/Makefile | 2 +- + tools/spi/spidev_test.c | 330 +++++++--- + 69 files changed, 3551 insertions(+), 909 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/microchip,pic32mzda-spi.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/microchip,spi-pic32.txt + create mode 100644 Documentation/devicetree/bindings/spi/realtek,rtd1625-nor.yaml + delete mode 100644 Documentation/devicetree/bindings/spi/spi-davinci.txt + create mode 100644 Documentation/devicetree/bindings/spi/ti,davinci-spi-peripheral-props.yaml + create mode 100644 Documentation/devicetree/bindings/spi/ti,davinci-spi.yaml + create mode 100644 drivers/spi/spi-ma35d1.c + create mode 100644 drivers/spi/spi-rtk-nor.c +Merging tip/master (6ff90f554839b Merge branch into tip/master: 'x86/tdx') +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/ABI/testing/sysfs-devices-system-cpu +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/arch/arm64/silicon-errata.rst +Auto-merging Documentation/devicetree/bindings/interrupt-controller/qcom,pdc.yaml +Auto-merging Documentation/scheduler/index.rst +CONFLICT (content): Merge conflict in Documentation/scheduler/index.rst +Auto-merging MAINTAINERS +Auto-merging arch/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/arm64/configs/defconfig +CONFLICT (content): Merge conflict in arch/arm64/configs/defconfig +Auto-merging arch/arm64/include/asm/preempt.h +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/powerpc/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/kernel/paravirt.c +Auto-merging arch/riscv/kernel/smp.c +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/kernel/hiperdispatch.c +Auto-merging arch/um/kernel/um_arch.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/crypto/aesni-intel_glue.c +Auto-merging arch/x86/include/asm/string_64.h +Auto-merging drivers/irqchip/irq-aclint-sswi.c +Auto-merging drivers/resctrl/mpam_resctrl.c +Auto-merging fs/aio.c +Auto-merging fs/exec.c +Auto-merging include/linux/sched.h +Auto-merging io_uring/rw.c +Auto-merging kernel/events/core.c +Auto-merging kernel/exit.c +Auto-merging kernel/sched/fair.c +Auto-merging net/core/pktgen.c +Resolved 'Documentation/scheduler/index.rst' using previous resolution. +Resolved 'arch/arm64/configs/defconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 84540665e7536] Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-devices-system-cpu | 24 +- + Documentation/ABI/testing/sysfs-platform-ts5500 | 54 -- + Documentation/admin-guide/kernel-parameters.txt | 12 + + Documentation/arch/arm64/silicon-errata.rst | 3 + + Documentation/arch/x86/tdx.rst | 21 + + Documentation/arch/x86/xstate.rst | 54 ++ + .../bindings/interrupt-controller/qcom,pdc.yaml | 1 + + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/steal-governor.rst | 151 ++++ + Documentation/filesystems/resctrl.rst | 19 +- + Documentation/scheduler/index.rst | 1 + + Documentation/scheduler/sched-paravirt.rst | 67 ++ + MAINTAINERS | 14 +- + arch/Kconfig | 38 - + arch/arm/kernel/perf_regs.c | 8 +- + arch/arm64/Kconfig | 10 +- + arch/arm64/Kconfig.platforms | 1 + + arch/arm64/boot/dts/qcom/purwa.dtsi | 5 + + arch/arm64/configs/defconfig | 2 - + arch/arm64/include/asm/preempt.h | 10 - + arch/arm64/kernel/paravirt.c | 4 +- + arch/arm64/kernel/perf_regs.c | 8 +- + arch/csky/kernel/perf_regs.c | 8 +- + arch/loongarch/Kconfig | 1 - + arch/loongarch/kernel/paravirt.c | 4 +- + arch/loongarch/kernel/perf_regs.c | 8 +- + arch/mips/kernel/perf_regs.c | 8 +- + arch/parisc/kernel/perf_regs.c | 8 +- + arch/powerpc/Kconfig | 1 - + arch/powerpc/perf/perf_regs.c | 2 +- + arch/powerpc/platforms/pseries/setup.c | 4 +- + arch/riscv/Kconfig | 1 - + arch/riscv/include/asm/smp.h | 12 + + arch/riscv/kernel/paravirt.c | 4 +- + arch/riscv/kernel/perf_regs.c | 8 +- + arch/riscv/kernel/sbi-ipi.c | 4 +- + arch/riscv/kernel/smp.c | 12 - + arch/s390/Kconfig | 1 - + arch/s390/include/asm/preempt.h | 11 - + arch/s390/kernel/hiperdispatch.c | 10 +- + arch/s390/kernel/perf_regs.c | 2 +- + arch/um/kernel/um_arch.c | 78 +- + arch/x86/Kconfig | 10 - + arch/x86/boot/compressed/error.c | 19 - + arch/x86/boot/compressed/error.h | 1 - + arch/x86/boot/compressed/mem.c | 42 - + arch/x86/boot/compressed/sev.h | 2 - + arch/x86/boot/compressed/tdx-shared.c | 2 + + arch/x86/boot/early_serial_console.c | 13 +- + arch/x86/boot/string.c | 13 +- + arch/x86/coco/sev/core.c | 32 +- + arch/x86/coco/tdx/tdx-shared.c | 31 + + arch/x86/coco/tdx/tdx.c | 48 +- + arch/x86/crypto/aegis128-aesni-glue.c | 3 +- + arch/x86/crypto/aesni-intel_glue.c | 7 +- + arch/x86/crypto/aria_aesni_avx2_glue.c | 11 +- + arch/x86/crypto/aria_aesni_avx_glue.c | 11 +- + arch/x86/crypto/aria_gfni_avx512_glue.c | 11 +- + arch/x86/crypto/camellia_aesni_avx2_glue.c | 11 +- + arch/x86/crypto/camellia_aesni_avx_glue.c | 11 +- + arch/x86/crypto/cast5_avx_glue.c | 7 +- + arch/x86/crypto/cast6_avx_glue.c | 7 +- + arch/x86/crypto/serpent_avx2_glue.c | 9 +- + arch/x86/crypto/serpent_avx_glue.c | 7 +- + arch/x86/crypto/sm4_aesni_avx2_glue.c | 11 +- + arch/x86/crypto/sm4_aesni_avx_glue.c | 11 +- + arch/x86/crypto/twofish_avx_glue.c | 6 +- + arch/x86/events/amd/uncore.c | 39 +- + arch/x86/events/core.c | 488 ++++++++++- + arch/x86/events/intel/core.c | 154 ++-- + arch/x86/events/intel/ds.c | 232 ++++-- + arch/x86/events/intel/lbr.c | 2 +- + arch/x86/events/perf_event.h | 217 ++++- + arch/x86/include/asm/cpufeatures.h | 5 +- + arch/x86/include/asm/cpuid/api.h | 2 +- + arch/x86/include/asm/fpu/regset.h | 6 +- + arch/x86/include/asm/fpu/sched.h | 6 +- + arch/x86/include/asm/fpu/types.h | 25 - + arch/x86/include/asm/fpu/xstate.h | 3 + + arch/x86/include/asm/kvm-x86-ops.h | 1 + + arch/x86/include/asm/kvm_host.h | 10 +- + arch/x86/include/asm/local.h | 4 +- + arch/x86/include/asm/math_emu.h | 15 - + arch/x86/include/asm/msr-index.h | 10 + + arch/x86/include/asm/perf_event.h | 46 +- + arch/x86/include/asm/preempt.h | 28 - + arch/x86/include/asm/processor.h | 2 +- + arch/x86/include/asm/sev.h | 4 + + arch/x86/include/asm/shared/string.h | 52 ++ + arch/x86/include/asm/shared/tdx.h | 7 + + arch/x86/include/asm/special_insns.h | 13 - + arch/x86/include/asm/string.h | 21 +- + arch/x86/include/asm/string_64.h | 1 - + arch/x86/include/asm/tdx.h | 27 +- + arch/x86/include/asm/tdx_global_metadata.h | 9 +- + arch/x86/include/asm/traps.h | 2 - + arch/x86/include/uapi/asm/perf_regs.h | 53 ++ + arch/x86/include/uapi/asm/sigcontext.h | 15 + + arch/x86/kernel/alternative.c | 3 +- + arch/x86/kernel/asm-offsets.c | 1 + + arch/x86/kernel/cpu/amd.c | 21 +- + arch/x86/kernel/cpu/bugs.c | 20 +- + arch/x86/kernel/cpu/common.c | 98 ++- + arch/x86/kernel/cpu/microcode/intel-ucode-defs.h | 91 +- + arch/x86/kernel/cpu/mtrr/amd.c | 9 +- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 6 + + arch/x86/kernel/cpu/resctrl/intel_aet.c | 34 + + arch/x86/kernel/cpu/scattered.c | 2 + + arch/x86/kernel/cpu/sgx/main.c | 8 +- + arch/x86/kernel/cpu/vmware.c | 4 +- + arch/x86/kernel/crash.c | 6 +- + arch/x86/kernel/fpu/bugs.c | 4 - + arch/x86/kernel/fpu/core.c | 46 +- + arch/x86/kernel/fpu/init.c | 6 +- + arch/x86/kernel/fpu/regset.c | 6 - + arch/x86/kernel/fpu/signal.c | 136 +-- + arch/x86/kernel/fpu/xstate.c | 62 +- + arch/x86/kernel/kvm.c | 4 +- + arch/x86/kernel/perf_regs.c | 172 +++- + arch/x86/kernel/shstk.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 4 + + arch/x86/kvm/svm/sev.c | 2 + + arch/x86/kvm/vmx/pmu_intel.c | 28 +- + arch/x86/kvm/vmx/tdx.c | 99 ++- + arch/x86/kvm/vmx/tdx.h | 2 + + arch/x86/kvm/vmx/vmx.c | 10 +- + arch/x86/kvm/vmx/vmx.h | 15 +- + arch/x86/platform/Makefile | 1 - + arch/x86/platform/olpc/olpc-xo15-sci.c | 4 +- + arch/x86/platform/pvh/enlighten.c | 3 +- + arch/x86/platform/ts5500/Makefile | 2 - + arch/x86/platform/ts5500/ts5500.c | 341 -------- + arch/x86/virt/svm/sev.c | 172 +++- + arch/x86/virt/vmx/tdx/seamcall_internal.h | 19 + + arch/x86/virt/vmx/tdx/tdx.c | 439 ++++++++-- + arch/x86/virt/vmx/tdx/tdx.h | 10 +- + arch/x86/virt/vmx/tdx/tdx_global_metadata.c | 23 +- + arch/x86/virt/vmx/tdx/tdxcall.S | 10 +- + arch/x86/xen/pmu.c | 5 +- + drivers/base/cpu.c | 12 + + drivers/clocksource/timer-clint.c | 4 +- + drivers/crypto/ccp/sev-dev.c | 2 + + drivers/firmware/efi/libstub/x86-stub.c | 39 + + drivers/irqchip/Kconfig | 6 +- + drivers/irqchip/irq-aclint-sswi.c | 4 +- + drivers/irqchip/irq-al-fic.c | 2 +- + drivers/irqchip/irq-gic-v3-its.c | 6 +- + drivers/irqchip/irq-gic-v3.c | 12 +- + drivers/irqchip/irq-gic-v5.c | 9 +- + drivers/irqchip/irq-gic.c | 8 +- + drivers/irqchip/irq-lan966x-oic.c | 1 - + drivers/irqchip/irq-mtk-cirq.c | 2 +- + drivers/irqchip/irq-pruss-intc.c | 38 +- + drivers/irqchip/irq-riscv-imsic-early.c | 4 +- + drivers/irqchip/irq-riscv-imsic-state.c | 13 +- + drivers/irqchip/irq-riscv-imsic-state.h | 1 - + drivers/irqchip/irq-sifive-plic.c | 2 +- + drivers/irqchip/irq-vic.c | 2 +- + drivers/irqchip/qcom-pdc.c | 3 + + drivers/resctrl/mpam_resctrl.c | 5 + + drivers/soc/fsl/qe/qe_ports_ic.c | 1 - + drivers/virt/Kconfig | 17 + + drivers/virt/Makefile | 1 + + drivers/virt/coco/tdx-guest/tdx-guest.c | 82 +- + drivers/virt/steal_governor.c | 296 +++++++ + drivers/xen/time.c | 4 +- + fs/aio.c | 2 +- + fs/exec.c | 13 +- + fs/proc/uptime.c | 6 +- + fs/resctrl/ctrlmondata.c | 6 +- + fs/resctrl/monitor.c | 2 + + fs/resctrl/pseudo_lock.c | 9 +- + fs/resctrl/rdtgroup.c | 10 +- + include/asm-generic/preempt.h | 10 - + include/linux/bitmap.h | 14 + + include/linux/cpumask.h | 42 + + include/linux/hardirq.h | 2 +- + include/linux/hrtimer.h | 10 +- + include/linux/interrupt.h | 6 +- + include/linux/interrupt_rc.h | 13 + + include/linux/irq-entry-common.h | 17 +- + include/linux/irq_work.h | 2 + + include/linux/kernel.h | 20 - + include/linux/kernel_stat.h | 11 + + include/linux/list.h | 6 +- + include/linux/perf_event.h | 23 + + include/linux/perf_regs.h | 36 +- + include/linux/posix-timers.h | 39 +- + include/linux/preempt.h | 20 +- + include/linux/resctrl.h | 19 + + include/linux/resctrl_types.h | 2 + + include/linux/sched.h | 37 +- + include/linux/sched/cputime.h | 6 +- + include/linux/sched/task.h | 1 - + include/linux/wait.h | 2 +- + include/uapi/linux/perf_event.h | 49 +- + include/uapi/linux/sched.h | 2 +- + io_uring/rw.c | 2 +- + kernel/Kconfig.kexec | 2 +- + kernel/Kconfig.preempt | 13 +- + kernel/cpu.c | 6 + + kernel/crash_core.c | 2 +- + kernel/entry/common.c | 17 +- + kernel/events/core.c | 177 +++- + kernel/exit.c | 13 +- + kernel/futex/requeue.c | 2 +- + kernel/futex/waitwake.c | 8 +- + kernel/irq/irqdomain.c | 1 + + kernel/irq/refcount_interrupt_test.c | 22 + + kernel/irq_work.c | 16 +- + kernel/locking/rtmutex.c | 2 +- + kernel/sched/core.c | 451 +++++----- + kernel/sched/cputime.c | 4 +- + kernel/sched/deadline.c | 9 +- + kernel/sched/debug.c | 21 +- + kernel/sched/ext/ext.c | 18 +- + kernel/sched/ext/ext.h | 7 + + kernel/sched/fair.c | 216 +++-- + kernel/sched/idle.c | 5 +- + kernel/sched/rt.c | 7 +- + kernel/sched/sched.h | 80 +- + kernel/sched/stop_task.c | 5 +- + kernel/sched/topology.c | 18 + + kernel/sched/wait.c | 22 +- + kernel/smp.c | 1 + + kernel/smpboot.c | 6 +- + kernel/time/hrtimer.c | 23 +- + kernel/time/posix-cpu-timers.c | 103 ++- + kernel/time/posix-timers.c | 26 +- + kernel/time/posix-timers.h | 3 + + kernel/time/sleep_timeout.c | 4 +- + kernel/time/tick-sched.c | 30 +- + kernel/time/time_test.c | 16 + + kernel/time/timeconv.c | 6 +- + kernel/time/timekeeping.c | 4 +- + kernel/time/timer.c | 2 +- + kernel/time/timer_migration.c | 6 +- + lib/bitmap.c | 17 + + lib/crc/x86/crc-pclmul-template.h | 6 +- + lib/crypto/x86/blake2s.h | 4 +- + lib/crypto/x86/chacha.h | 3 +- + lib/crypto/x86/nh.h | 4 +- + lib/crypto/x86/poly1305.h | 7 +- + lib/crypto/x86/sha1.h | 4 +- + lib/crypto/x86/sha256.h | 4 +- + lib/crypto/x86/sha512.h | 3 +- + lib/crypto/x86/sm3.h | 3 +- + lib/raid/xor/Makefile | 2 +- + lib/raid/xor/x86/xor-avx512.c | 122 +++ + lib/raid/xor/x86/xor_arch.h | 31 +- + lib/refcount.c | 15 +- + net/core/pktgen.c | 4 +- + tools/objtool/Documentation/klp-test-design.txt | 286 +++++++ + tools/objtool/Documentation/klp-write-tests.txt | 266 ++++++ + tools/objtool/Makefile | 15 +- + .../tests/generic/fixtures/abs_and_addressable.c | 44 + + tools/objtool/tests/generic/fixtures/basic.c | 20 + + .../objtool/tests/generic/fixtures/changed_data.c | 16 + + .../objtool/tests/generic/fixtures/checksum_data.c | 116 +++ + .../objtool/tests/generic/fixtures/checksum_insn.c | 78 ++ + .../tests/generic/fixtures/checksum_position.c | 42 + + .../objtool/tests/generic/fixtures/checksum_skip.c | 47 ++ + .../objtool/tests/generic/fixtures/cold_function.c | 21 + + .../objtool/tests/generic/fixtures/cross_module.c | 25 + + .../tests/generic/fixtures/data_alignment.c | 29 + + .../tests/generic/fixtures/function_removal.c | 25 + + .../tests/generic/fixtures/init_reference.c | 17 + + tools/objtool/tests/generic/fixtures/jump_label.c | 76 ++ + tools/objtool/tests/generic/fixtures/klp_funcs.c | 31 + + .../tests/generic/fixtures/local_to_global.c | 34 + + tools/objtool/tests/generic/fixtures/new_data.c | 23 + + .../tests/generic/fixtures/new_export_ref.c | 35 + + .../objtool/tests/generic/fixtures/new_function.c | 21 + + tools/objtool/tests/generic/fixtures/no_modinfo.c | 11 + + .../tests/generic/fixtures/special_section.c | 24 + + .../generic/fixtures/special_section_shared.c | 31 + + tools/objtool/tests/generic/fixtures/static_call.c | 59 ++ + .../objtool/tests/generic/fixtures/static_local.c | 17 + + .../generic/fixtures/static_local_uncorrelated.c | 41 + + .../objtool/tests/generic/fixtures/switch_rodata.c | 31 + + .../tests/generic/fixtures/symid_discarded.c | 25 + + tools/objtool/tests/generic/fixtures/sympos_dup.c | 32 + + .../tests/generic/fixtures/sympos_vmlinux.c | 40 + + .../tests/generic/fixtures/thinlto_ambiguity.c | 57 ++ + .../objtool/tests/generic/fixtures/thinlto_local.c | 39 + + tools/objtool/tests/generic/fixtures/ubsan_noise.c | 49 ++ + .../tests/generic/test-abs-and-addressable.sh | 50 ++ + tools/objtool/tests/generic/test-basic.sh | 17 + + tools/objtool/tests/generic/test-changed-data.sh | 18 + + tools/objtool/tests/generic/test-checksum-data.sh | 61 ++ + tools/objtool/tests/generic/test-checksum-debug.sh | 49 ++ + tools/objtool/tests/generic/test-checksum-insn.sh | 49 ++ + .../tests/generic/test-checksum-position.sh | 51 ++ + tools/objtool/tests/generic/test-checksum-skip.sh | 81 ++ + tools/objtool/tests/generic/test-checksum-value.sh | 37 + + tools/objtool/tests/generic/test-cold-function.sh | 39 + + tools/objtool/tests/generic/test-data-alignment.sh | 40 + + .../generic/test-export-symbol-for-modules.sh | 39 + + .../objtool/tests/generic/test-function-removal.sh | 34 + + tools/objtool/tests/generic/test-init-reference.sh | 29 + + .../tests/generic/test-jump-label-exempt-keys.sh | 51 ++ + tools/objtool/tests/generic/test-jump-label-key.sh | 44 + + .../tests/generic/test-jump-label-module-key.sh | 22 + + .../generic/test-jump-label-module-static-key.sh | 45 + + .../tests/generic/test-jump-label-new-key.sh | 51 ++ + .../tests/generic/test-klp-funcs-content.sh | 45 + + .../tests/generic/test-local-to-global-flip.sh | 63 ++ + .../objtool/tests/generic/test-local-vs-export.sh | 32 + + .../objtool/tests/generic/test-missing-checksum.sh | 18 + + .../objtool/tests/generic/test-missing-modinfo.sh | 16 + + .../tests/generic/test-modname-normalize.sh | 26 + + tools/objtool/tests/generic/test-module-object.sh | 31 + + .../tests/generic/test-module-vmlinux-reloc.sh | 40 + + tools/objtool/tests/generic/test-new-data.sh | 27 + + tools/objtool/tests/generic/test-new-export-ref.sh | 46 ++ + tools/objtool/tests/generic/test-new-function.sh | 16 + + tools/objtool/tests/generic/test-post-link.sh | 42 + + .../tests/generic/test-special-section-shared.sh | 26 + + .../objtool/tests/generic/test-special-section.sh | 20 + + .../generic/test-static-call-annotate-stripped.sh | 42 + + .../tests/generic/test-static-call-module-key.sh | 36 + + .../objtool/tests/generic/test-static-call-new.sh | 45 + + .../generic/test-static-local-uncorrelated.sh | 41 + + tools/objtool/tests/generic/test-static-local.sh | 24 + + tools/objtool/tests/generic/test-switch-rodata.sh | 53 ++ + .../objtool/tests/generic/test-symid-discarded.sh | 44 + + tools/objtool/tests/generic/test-sympos-vmlinux.sh | 57 ++ + tools/objtool/tests/generic/test-sympos.sh | 51 ++ + .../tests/generic/test-symvers-parse-error.sh | 23 + + .../tests/generic/test-thinlto-ambiguity.sh | 77 ++ + tools/objtool/tests/generic/test-thinlto-local.sh | 48 ++ + tools/objtool/tests/generic/test-ubsan-noise.sh | 48 ++ + tools/objtool/tests/lib.sh | 911 +++++++++++++++++++++ + tools/objtool/tests/run-tests.sh | 239 ++++++ + tools/objtool/tests/x86/fixtures/alt_annotate.c | 57 ++ + tools/objtool/tests/x86/fixtures/checksum_alt.c | 66 ++ + .../objtool/tests/x86/fixtures/empty_alternative.c | 77 ++ + tools/objtool/tests/x86/fixtures/kcfi.c | 39 + + .../objtool/tests/x86/fixtures/special_sections.c | 77 ++ + .../tests/x86/fixtures/static_call_no_key.c | 32 + + tools/objtool/tests/x86/test-alt-annotation.sh | 38 + + tools/objtool/tests/x86/test-checksum-alt.sh | 45 + + tools/objtool/tests/x86/test-empty-alternative.sh | 31 + + tools/objtool/tests/x86/test-kcfi.sh | 39 + + .../tests/x86/test-manual-klp-static-call.sh | 40 + + tools/objtool/tests/x86/test-special-sections.sh | 42 + + tools/perf/trace/beauty/include/uapi/linux/sched.h | 2 +- + .../testing/selftests/timers/clocksource-switch.c | 23 +- + tools/testing/selftests/timers/posix_timers.c | 7 +- + tools/testing/selftests/timers/raw_skew.c | 12 + + tools/testing/selftests/x86/Makefile | 5 +- + .../selftests/x86/sigframe_fpu_portability.c | 235 ++++++ + tools/testing/selftests/x86/xstate.c | 12 - + tools/testing/selftests/x86/xstate.h | 20 + + 354 files changed, 10402 insertions(+), 2292 deletions(-) + delete mode 100644 Documentation/ABI/testing/sysfs-platform-ts5500 + create mode 100644 Documentation/driver-api/steal-governor.rst + create mode 100644 Documentation/scheduler/sched-paravirt.rst + delete mode 100644 arch/x86/include/asm/math_emu.h + create mode 100644 arch/x86/include/asm/shared/string.h + delete mode 100644 arch/x86/platform/ts5500/Makefile + delete mode 100644 arch/x86/platform/ts5500/ts5500.c + create mode 100644 drivers/virt/steal_governor.c + create mode 100644 lib/raid/xor/x86/xor-avx512.c + create mode 100644 tools/objtool/Documentation/klp-test-design.txt + create mode 100644 tools/objtool/Documentation/klp-write-tests.txt + create mode 100644 tools/objtool/tests/generic/fixtures/abs_and_addressable.c + create mode 100644 tools/objtool/tests/generic/fixtures/basic.c + create mode 100644 tools/objtool/tests/generic/fixtures/changed_data.c + create mode 100644 tools/objtool/tests/generic/fixtures/checksum_data.c + create mode 100644 tools/objtool/tests/generic/fixtures/checksum_insn.c + create mode 100644 tools/objtool/tests/generic/fixtures/checksum_position.c + create mode 100644 tools/objtool/tests/generic/fixtures/checksum_skip.c + create mode 100644 tools/objtool/tests/generic/fixtures/cold_function.c + create mode 100644 tools/objtool/tests/generic/fixtures/cross_module.c + create mode 100644 tools/objtool/tests/generic/fixtures/data_alignment.c + create mode 100644 tools/objtool/tests/generic/fixtures/function_removal.c + create mode 100644 tools/objtool/tests/generic/fixtures/init_reference.c + create mode 100644 tools/objtool/tests/generic/fixtures/jump_label.c + create mode 100644 tools/objtool/tests/generic/fixtures/klp_funcs.c + create mode 100644 tools/objtool/tests/generic/fixtures/local_to_global.c + create mode 100644 tools/objtool/tests/generic/fixtures/new_data.c + create mode 100644 tools/objtool/tests/generic/fixtures/new_export_ref.c + create mode 100644 tools/objtool/tests/generic/fixtures/new_function.c + create mode 100644 tools/objtool/tests/generic/fixtures/no_modinfo.c + create mode 100644 tools/objtool/tests/generic/fixtures/special_section.c + create mode 100644 tools/objtool/tests/generic/fixtures/special_section_shared.c + create mode 100644 tools/objtool/tests/generic/fixtures/static_call.c + create mode 100644 tools/objtool/tests/generic/fixtures/static_local.c + create mode 100644 tools/objtool/tests/generic/fixtures/static_local_uncorrelated.c + create mode 100644 tools/objtool/tests/generic/fixtures/switch_rodata.c + create mode 100644 tools/objtool/tests/generic/fixtures/symid_discarded.c + create mode 100644 tools/objtool/tests/generic/fixtures/sympos_dup.c + create mode 100644 tools/objtool/tests/generic/fixtures/sympos_vmlinux.c + create mode 100644 tools/objtool/tests/generic/fixtures/thinlto_ambiguity.c + create mode 100644 tools/objtool/tests/generic/fixtures/thinlto_local.c + create mode 100644 tools/objtool/tests/generic/fixtures/ubsan_noise.c + create mode 100755 tools/objtool/tests/generic/test-abs-and-addressable.sh + create mode 100755 tools/objtool/tests/generic/test-basic.sh + create mode 100755 tools/objtool/tests/generic/test-changed-data.sh + create mode 100755 tools/objtool/tests/generic/test-checksum-data.sh + create mode 100755 tools/objtool/tests/generic/test-checksum-debug.sh + create mode 100755 tools/objtool/tests/generic/test-checksum-insn.sh + create mode 100755 tools/objtool/tests/generic/test-checksum-position.sh + create mode 100755 tools/objtool/tests/generic/test-checksum-skip.sh + create mode 100755 tools/objtool/tests/generic/test-checksum-value.sh + create mode 100755 tools/objtool/tests/generic/test-cold-function.sh + create mode 100755 tools/objtool/tests/generic/test-data-alignment.sh + create mode 100755 tools/objtool/tests/generic/test-export-symbol-for-modules.sh + create mode 100755 tools/objtool/tests/generic/test-function-removal.sh + create mode 100755 tools/objtool/tests/generic/test-init-reference.sh + create mode 100755 tools/objtool/tests/generic/test-jump-label-exempt-keys.sh + create mode 100755 tools/objtool/tests/generic/test-jump-label-key.sh + create mode 100755 tools/objtool/tests/generic/test-jump-label-module-key.sh + create mode 100755 tools/objtool/tests/generic/test-jump-label-module-static-key.sh + create mode 100755 tools/objtool/tests/generic/test-jump-label-new-key.sh + create mode 100755 tools/objtool/tests/generic/test-klp-funcs-content.sh + create mode 100755 tools/objtool/tests/generic/test-local-to-global-flip.sh + create mode 100755 tools/objtool/tests/generic/test-local-vs-export.sh + create mode 100755 tools/objtool/tests/generic/test-missing-checksum.sh + create mode 100755 tools/objtool/tests/generic/test-missing-modinfo.sh + create mode 100755 tools/objtool/tests/generic/test-modname-normalize.sh + create mode 100755 tools/objtool/tests/generic/test-module-object.sh + create mode 100755 tools/objtool/tests/generic/test-module-vmlinux-reloc.sh + create mode 100755 tools/objtool/tests/generic/test-new-data.sh + create mode 100755 tools/objtool/tests/generic/test-new-export-ref.sh + create mode 100755 tools/objtool/tests/generic/test-new-function.sh + create mode 100755 tools/objtool/tests/generic/test-post-link.sh + create mode 100755 tools/objtool/tests/generic/test-special-section-shared.sh + create mode 100755 tools/objtool/tests/generic/test-special-section.sh + create mode 100755 tools/objtool/tests/generic/test-static-call-annotate-stripped.sh + create mode 100755 tools/objtool/tests/generic/test-static-call-module-key.sh + create mode 100755 tools/objtool/tests/generic/test-static-call-new.sh + create mode 100755 tools/objtool/tests/generic/test-static-local-uncorrelated.sh + create mode 100755 tools/objtool/tests/generic/test-static-local.sh + create mode 100755 tools/objtool/tests/generic/test-switch-rodata.sh + create mode 100755 tools/objtool/tests/generic/test-symid-discarded.sh + create mode 100755 tools/objtool/tests/generic/test-sympos-vmlinux.sh + create mode 100755 tools/objtool/tests/generic/test-sympos.sh + create mode 100755 tools/objtool/tests/generic/test-symvers-parse-error.sh + create mode 100755 tools/objtool/tests/generic/test-thinlto-ambiguity.sh + create mode 100755 tools/objtool/tests/generic/test-thinlto-local.sh + create mode 100755 tools/objtool/tests/generic/test-ubsan-noise.sh + create mode 100644 tools/objtool/tests/lib.sh + create mode 100755 tools/objtool/tests/run-tests.sh + create mode 100644 tools/objtool/tests/x86/fixtures/alt_annotate.c + create mode 100644 tools/objtool/tests/x86/fixtures/checksum_alt.c + create mode 100644 tools/objtool/tests/x86/fixtures/empty_alternative.c + create mode 100644 tools/objtool/tests/x86/fixtures/kcfi.c + create mode 100644 tools/objtool/tests/x86/fixtures/special_sections.c + create mode 100644 tools/objtool/tests/x86/fixtures/static_call_no_key.c + create mode 100755 tools/objtool/tests/x86/test-alt-annotation.sh + create mode 100755 tools/objtool/tests/x86/test-checksum-alt.sh + create mode 100755 tools/objtool/tests/x86/test-empty-alternative.sh + create mode 100755 tools/objtool/tests/x86/test-kcfi.sh + create mode 100755 tools/objtool/tests/x86/test-manual-klp-static-call.sh + create mode 100755 tools/objtool/tests/x86/test-special-sections.sh + create mode 100644 tools/testing/selftests/x86/sigframe_fpu_portability.c +Merging kexec/kexec-next (cc092886b9ce0 Merge branch 'kexec-7.4' into kexec-next) +$ git merge -m Merge branch 'kexec-next' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git kexec/kexec-next +Auto-merging include/linux/mm.h +Auto-merging mm/memory-failure.c +Merge made by the 'ort' strategy. + arch/riscv/kernel/kexec_elf.c | 2 +- + include/linux/kexec.h | 15 --------------- + include/linux/mm.h | 14 ++++++++++++++ + kernel/kexec_core.c | 10 ++++++++++ + kernel/kexec_file.c | 22 ++++++++++++++++++++-- + mm/memory-failure.c | 40 ++++++++++++++++++++++++++++++++++++++++ + 6 files changed, 85 insertions(+), 18 deletions(-) +Merging liveupdate/next (e1fe7daedae7a Merge branch 'lu-pci-preservation' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git liveupdate/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging drivers/pci/pci-driver.c +Auto-merging drivers/pci/pci.c +Auto-merging drivers/pci/pci.h +Auto-merging drivers/pci/probe.c +Auto-merging drivers/pci/quirks.c +Auto-merging include/linux/memblock.h +Auto-merging include/linux/pci.h +Auto-merging mm/Kconfig +Auto-merging mm/memblock.c +CONFLICT (content): Merge conflict in mm/memblock.c +Auto-merging mm/mm_init.c +CONFLICT (content): Merge conflict in mm/mm_init.c +Auto-merging tools/testing/selftests/liveupdate/vmtest.sh +Resolved 'mm/memblock.c' using previous resolution. +Resolved 'mm/mm_init.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a68f9e7d84af0] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/liveupdate/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/PCI/index.rst | 1 + + Documentation/PCI/liveupdate.rst | 35 + + Documentation/admin-guide/kernel-parameters.txt | 22 +- + Documentation/admin-guide/mm/kho.rst | 18 +- + Documentation/core-api/kho/index.rst | 36 +- + Documentation/core-api/liveupdate.rst | 5 + + MAINTAINERS | 15 + + arch/x86/boot/compressed/kaslr.c | 12 +- + arch/x86/include/uapi/asm/setup_data.h | 4 +- + arch/x86/kernel/e820.c | 11 +- + arch/x86/kernel/kexec-bzimage64.c | 6 +- + arch/x86/kernel/setup.c | 2 +- + arch/x86/realmode/init.c | 2 +- + drivers/firmware/efi/efi-init.c | 6 +- + drivers/of/fdt.c | 8 +- + drivers/of/kexec.c | 16 +- + drivers/pci/Kconfig | 15 + + drivers/pci/Makefile | 1 + + drivers/pci/liveupdate.c | 1015 +++++++++++++++++++++++ + drivers/pci/liveupdate.h | 62 ++ + drivers/pci/pci-driver.c | 9 +- + drivers/pci/pci.c | 79 +- + drivers/pci/pci.h | 5 + + drivers/pci/probe.c | 16 +- + drivers/pci/quirks.c | 58 +- + include/asm-generic/kexec_handover.h | 2 +- + include/linux/kexec.h | 2 +- + include/linux/kexec_handover.h | 16 +- + include/linux/kho/abi/pci.h | 66 ++ + include/linux/liveupdate.h | 22 + + include/linux/memblock.h | 30 +- + include/linux/pci.h | 7 + + include/linux/pci_liveupdate.h | 72 ++ + kernel/kexec_file.c | 4 +- + kernel/liveupdate/Kconfig | 1 - + kernel/liveupdate/kexec_handover.c | 347 ++++---- + kernel/liveupdate/kexec_handover_debugfs.c | 24 +- + kernel/liveupdate/kexec_handover_internal.h | 4 +- + kernel/liveupdate/luo_file.c | 84 ++ + kernel/liveupdate/luo_internal.h | 17 + + mm/Kconfig | 4 - + mm/memblock.c | 56 +- + mm/memfd_luo.c | 3 +- + mm/mm_init.c | 4 +- + tools/testing/memblock/internal.h | 2 +- + tools/testing/selftests/liveupdate/vmtest.sh | 2 +- + 46 files changed, 1872 insertions(+), 356 deletions(-) + create mode 100644 Documentation/PCI/liveupdate.rst + create mode 100644 drivers/pci/liveupdate.c + create mode 100644 drivers/pci/liveupdate.h + create mode 100644 include/linux/kho/abi/pci.h + create mode 100644 include/linux/pci_liveupdate.h +Merging clockevents/timers/drivers/next (36790ef578034 clocksource/drivers/timer-econet-en751221: Fix clock reference leak) +$ git merge -m Merge branch 'timers/drivers/next' of https://git.kernel.org/pub/scm/linux/kernel/git/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging MAINTAINERS +Auto-merging drivers/clocksource/timer-ti-dm.c +Merge made by the 'ort' strategy. + .../bindings/timer/renesas,rzn1-timer.yaml | 74 ++++ + MAINTAINERS | 7 + + drivers/clocksource/Kconfig | 11 + + drivers/clocksource/Makefile | 1 + + drivers/clocksource/clksrc-dbx500-prcmu.c | 2 + + drivers/clocksource/mips-gic-timer.c | 138 +++++- + drivers/clocksource/timer-digicolor.c | 2 + + drivers/clocksource/timer-econet-en751221.c | 1 + + drivers/clocksource/timer-fttmr010.c | 2 + + drivers/clocksource/timer-rzn1.c | 483 +++++++++++++++++++++ + drivers/clocksource/timer-ti-dm.c | 4 +- + include/linux/platform_data/dmtimer-omap.h | 2 + + 12 files changed, 708 insertions(+), 19 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/renesas,rzn1-timer.yaml + create mode 100644 drivers/clocksource/timer-rzn1.c +Merging edac/edac-for-next (0489f2176209b Merge ras/edac-urgent into for-next) +$ git merge -m Merge branch 'edac-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging MAINTAINERS +Auto-merging arch/x86/include/asm/msr-index.h +Merge made by the 'ort' strategy. + MAINTAINERS | 26 +++- + arch/x86/include/asm/mce.h | 5 + + arch/x86/include/asm/msr-index.h | 2 + + drivers/base/cacheinfo.c | 17 +++ + drivers/edac/Kconfig | 22 +++ + drivers/edac/Makefile | 5 +- + drivers/edac/bluefield_edac.c | 4 +- + drivers/edac/dummy_edac.c | 191 +++++++++++++++++++++++++ + drivers/edac/i10nm_base.c | 2 + + drivers/edac/ie31200_edac.c | 4 +- + drivers/edac/intel-bff.c | 295 +++++++++++++++++++++++++++++++++++++++ + drivers/edac/loongson_edac.c | 4 +- + drivers/edac/skx_base.c | 2 +- + include/linux/cacheinfo.h | 12 +- + 14 files changed, 567 insertions(+), 24 deletions(-) + create mode 100644 drivers/edac/dummy_edac.c + create mode 100644 drivers/edac/intel-bff.c +Merging ftrace/for-next (f973b1ca0bb34 Merge probes/for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging init/main.c +Auto-merging kernel/kprobes.c +Auto-merging lib/bootconfig.c +Auto-merging tools/bootconfig/main.c +Merge made by the 'ort' strategy. + include/linux/bootconfig.h | 21 +- + init/main.c | 77 ++- + kernel/kprobes.c | 520 +++++++++++++++------ + kernel/trace/trace_probe.c | 2 +- + lib/bootconfig.c | 38 +- + tools/bootconfig/main.c | 37 +- + tools/testing/selftests/ftrace/Makefile | 4 +- + tools/testing/selftests/ftrace/boottime-ktap | 6 + + tools/testing/selftests/ftrace/boottime/Makefile | 10 + + tools/testing/selftests/ftrace/boottime/README | 74 +++ + .../ftrace/boottime/bootconfigs/01-kprobe.bconf | 4 + + .../ftrace/boottime/bootconfigs/02-synth.bconf | 4 + + .../ftrace/boottime/bootconfigs/03-eprobe.bconf | 4 + + .../ftrace/boottime/bootconfigs/04-fprobe.bconf | 4 + + .../ftrace/boottime/bootconfigs/05-tprobe.bconf | 4 + + .../ftrace/boottime/bootconfigs/06-instance.bconf | 5 + + .../boottime/cmdlines/cmdline-01-ftrace.cmdline | 1 + + .../cmdlines/cmdline-02-trace-event.cmdline | 1 + + .../cmdlines/cmdline-03-trace-buf-size.cmdline | 1 + + .../cmdlines/cmdline-04-trace-options.cmdline | 1 + + .../cmdlines/cmdline-05-trace-clock.cmdline | 1 + + .../cmdlines/cmdline-06-trace-instance.cmdline | 1 + + .../cmdlines/persistent-01-reserve-mem.cmdline | 1 + + .../cmdlines/persistent-02-backup-instance.cmdline | 1 + + .../selftests/ftrace/boottime/run_boottime_test.sh | 403 ++++++++++++++++ + .../selftests/ftrace/boottime/tests/01-kprobe.sh | 25 + + .../selftests/ftrace/boottime/tests/02-synth.sh | 25 + + .../selftests/ftrace/boottime/tests/03-eprobe.sh | 25 + + .../selftests/ftrace/boottime/tests/04-fprobe.sh | 25 + + .../selftests/ftrace/boottime/tests/05-tprobe.sh | 25 + + .../selftests/ftrace/boottime/tests/06-instance.sh | 30 ++ + .../ftrace/boottime/tests/cmdline-01-ftrace.sh | 19 + + .../boottime/tests/cmdline-02-trace-event.sh | 26 ++ + .../boottime/tests/cmdline-03-trace-buf-size.sh | 29 ++ + .../boottime/tests/cmdline-04-trace-options.sh | 23 + + .../boottime/tests/cmdline-05-trace-clock.sh | 19 + + .../boottime/tests/cmdline-06-trace-instance.sh | 24 + + .../boottime/tests/persistent-01-reserve-mem.sh | 28 ++ + .../tests/persistent-02-backup-instance.sh | 40 ++ + tools/testing/selftests/ftrace/config | 6 + + 40 files changed, 1398 insertions(+), 196 deletions(-) + create mode 100755 tools/testing/selftests/ftrace/boottime-ktap + create mode 100644 tools/testing/selftests/ftrace/boottime/Makefile + create mode 100644 tools/testing/selftests/ftrace/boottime/README + create mode 100644 tools/testing/selftests/ftrace/boottime/bootconfigs/01-kprobe.bconf + create mode 100644 tools/testing/selftests/ftrace/boottime/bootconfigs/02-synth.bconf + create mode 100644 tools/testing/selftests/ftrace/boottime/bootconfigs/03-eprobe.bconf + create mode 100644 tools/testing/selftests/ftrace/boottime/bootconfigs/04-fprobe.bconf + create mode 100644 tools/testing/selftests/ftrace/boottime/bootconfigs/05-tprobe.bconf + create mode 100644 tools/testing/selftests/ftrace/boottime/bootconfigs/06-instance.bconf + create mode 100644 tools/testing/selftests/ftrace/boottime/cmdlines/cmdline-01-ftrace.cmdline + create mode 100644 tools/testing/selftests/ftrace/boottime/cmdlines/cmdline-02-trace-event.cmdline + create mode 100644 tools/testing/selftests/ftrace/boottime/cmdlines/cmdline-03-trace-buf-size.cmdline + create mode 100644 tools/testing/selftests/ftrace/boottime/cmdlines/cmdline-04-trace-options.cmdline + create mode 100644 tools/testing/selftests/ftrace/boottime/cmdlines/cmdline-05-trace-clock.cmdline + create mode 100644 tools/testing/selftests/ftrace/boottime/cmdlines/cmdline-06-trace-instance.cmdline + create mode 100644 tools/testing/selftests/ftrace/boottime/cmdlines/persistent-01-reserve-mem.cmdline + create mode 100644 tools/testing/selftests/ftrace/boottime/cmdlines/persistent-02-backup-instance.cmdline + create mode 100755 tools/testing/selftests/ftrace/boottime/run_boottime_test.sh + create mode 100644 tools/testing/selftests/ftrace/boottime/tests/01-kprobe.sh + create mode 100644 tools/testing/selftests/ftrace/boottime/tests/02-synth.sh + create mode 100644 tools/testing/selftests/ftrace/boottime/tests/03-eprobe.sh + create mode 100644 tools/testing/selftests/ftrace/boottime/tests/04-fprobe.sh + create mode 100644 tools/testing/selftests/ftrace/boottime/tests/05-tprobe.sh + create mode 100644 tools/testing/selftests/ftrace/boottime/tests/06-instance.sh + create mode 100644 tools/testing/selftests/ftrace/boottime/tests/cmdline-01-ftrace.sh + create mode 100644 tools/testing/selftests/ftrace/boottime/tests/cmdline-02-trace-event.sh + create mode 100644 tools/testing/selftests/ftrace/boottime/tests/cmdline-03-trace-buf-size.sh + create mode 100644 tools/testing/selftests/ftrace/boottime/tests/cmdline-04-trace-options.sh + create mode 100644 tools/testing/selftests/ftrace/boottime/tests/cmdline-05-trace-clock.sh + create mode 100644 tools/testing/selftests/ftrace/boottime/tests/cmdline-06-trace-instance.sh + create mode 100644 tools/testing/selftests/ftrace/boottime/tests/persistent-01-reserve-mem.sh + create mode 100644 tools/testing/selftests/ftrace/boottime/tests/persistent-02-backup-instance.sh +$ git am -3 ../patches/0001-ftrace-Fix-semantic-conflict-with-mm-tree.patch +Applying: ftrace: Fix semantic conflict with mm tree +Using index info to reconstruct a base tree... +M kernel/trace/trace_printk.c +Falling back to patching base and 3-way merge... +Auto-merging kernel/trace/trace_printk.c +No changes -- Patch already applied. +Merging rcu/next (d9011419496a3 Merge branches 'misc.2026.10.06a' and 'torture.2026.10.12a' into HEAD) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/rcu/linux rcu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging include/linux/compiler.h +Merge made by the 'ort' strategy. + Documentation/RCU/stallwarn.rst | 22 +- + Documentation/admin-guide/kernel-parameters.txt | 23 +- + include/linux/compiler.h | 17 + + include/linux/rcupdate.h | 10 +- + include/linux/rcuref.h | 2 +- + include/linux/srcu.h | 83 +++- + include/linux/srcutiny.h | 18 +- + include/linux/srcutree.h | 19 +- + kernel/rcu/Kconfig | 6 + + kernel/rcu/rcu.h | 14 + + kernel/rcu/rcutorture.c | 317 ++++++++++++- + kernel/rcu/srcutiny.c | 189 +++++++- + kernel/rcu/srcutree.c | 502 ++++++++++++++++++--- + kernel/rcu/tasks.h | 15 +- + kernel/rcu/tiny.c | 127 +++++- + kernel/rcu/tree.c | 164 ++++++- + kernel/rcu/tree.h | 6 + + kernel/rcu/tree_exp.h | 2 +- + kernel/rcu/tree_nocb.h | 3 +- + kernel/rcu/tree_plugin.h | 2 - + kernel/rcu/tree_stall.h | 36 +- + .../testing/selftests/bpf/prog_tests/rcu_reentry.c | 93 ++++ + tools/testing/selftests/bpf/progs/rcu_reentry.c | 51 +++ + .../testing/selftests/rcutorture/bin/kvm-again.sh | 11 +- + .../testing/selftests/rcutorture/bin/kvm-remote.sh | 22 +- + .../selftests/rcutorture/bin/srcu_lockdep.sh | 77 +++- + tools/testing/selftests/rcutorture/bin/torture.sh | 24 + + 27 files changed, 1676 insertions(+), 179 deletions(-) + create mode 100644 tools/testing/selftests/bpf/prog_tests/rcu_reentry.c + create mode 100644 tools/testing/selftests/bpf/progs/rcu_reentry.c +Merging paulmck/non-rcu/next (ea0ffa26d4da5 Merge branches 'cmpxchg-emu.2026.10.12a', 'csd-lock.2026.09.03a' and 'nmi.2026.09.17a' into HEAD) +$ git merge -m Merge branch 'non-rcu/next' of https://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git paulmck/non-rcu/next +Auto-merging arch/arc/include/asm/cmpxchg.h +Auto-merging kernel/smp.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + arch/arc/include/asm/cmpxchg.h | 3 + + arch/csky/include/asm/cmpxchg.h | 9 ++ + arch/sh/include/asm/cmpxchg.h | 2 + + arch/x86/kernel/nmi.c | 21 ++++- + arch/xtensa/include/asm/cmpxchg.h | 1 + + include/linux/cmpxchg-emu.h | 4 +- + kernel/smp.c | 77 +++++++++++------ + lib/Kconfig.debug | 12 +++ + lib/Makefile | 1 + + lib/cmpxchg-emu.c | 38 ++++++++- + lib/test_csd_lock.c | 173 ++++++++++++++++++++++++++++++++++++++ + 11 files changed, 308 insertions(+), 33 deletions(-) + create mode 100644 lib/test_csd_lock.c +Merging kvm/next (d4b7fb647204f Merge branch 'kvm-xen-longmode' into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging include/linux/kvm_host.h +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + arch/x86/include/asm/kvm_host.h | 3 +- + arch/x86/kvm/xen.c | 212 ++++++++++++++++++++++++---------------- + arch/x86/kvm/xen.h | 5 + + include/linux/kvm_host.h | 2 + + virt/kvm/kvm_main.c | 10 ++ + virt/kvm/pfncache.c | 18 ++-- + 6 files changed, 157 insertions(+), 93 deletions(-) +$ git am -3 ../patches/kvm-x86-static-cpu-has +Applying: Signed-off-by: Mark Brown <broonie@kernel.org> +Using index info to reconstruct a base tree... +M arch/x86/kvm/msrs.c +Falling back to patching base and 3-way merge... +Auto-merging arch/x86/kvm/msrs.c +No changes -- Patch already applied. +Merging kvm-arm/next (dd0bc00e3e920 Merge branch kvm-arm64/cca-7.4 into kvmarm-master/next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Auto-merging arch/arm64/Makefile +Auto-merging arch/arm64/include/asm/kvm_host.h +Auto-merging arch/arm64/include/asm/ptrace.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/ptrace.h +Auto-merging arch/arm64/include/asm/sysreg.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/kernel/image-vars.h +Auto-merging arch/arm64/kernel/pi/Makefile +Auto-merging arch/arm64/kvm/arm.c +Auto-merging arch/arm64/kvm/hyp/include/nvhe/pkvm.h +Auto-merging arch/arm64/kvm/hyp/include/nvhe/spinlock.h +Auto-merging arch/arm64/kvm/hyp/nvhe/Makefile +Auto-merging arch/arm64/kvm/hyp/nvhe/hyp-main.c +CONFLICT (content): Merge conflict in arch/arm64/kvm/hyp/nvhe/hyp-main.c +Auto-merging arch/arm64/kvm/hyp/nvhe/pkvm.c +Auto-merging arch/arm64/kvm/mmu.c +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging arch/arm64/kvm/vgic/vgic-init.c +Auto-merging arch/arm64/kvm/vgic/vgic-its.c +Auto-merging arch/arm64/kvm/vgic/vgic.c +Auto-merging arch/powerpc/kvm/book3s_hv.c +Auto-merging arch/s390/kvm/s390/s390.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/vmx/tdx.c +Auto-merging drivers/irqchip/irq-gic-v5.c +Auto-merging include/linux/kvm_host.h +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Auto-merging virt/kvm/kvm_main.c +Resolved 'arch/arm64/include/asm/ptrace.h' using previous resolution. +Resolved 'arch/arm64/include/asm/sysreg.h' using previous resolution. +Resolved 'arch/arm64/kvm/hyp/nvhe/hyp-main.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0484674ca5e27] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 67 +- + Documentation/virt/kvm/arm/fw-pseudo-registers.rst | 2 + + Documentation/virt/kvm/arm/pkvm.rst | 164 +- + Documentation/virt/kvm/devices/arm-vgic-v5.rst | 271 ++- + Documentation/virt/kvm/devices/vcpu.rst | 5 +- + arch/arm64/Makefile | 3 + + arch/arm64/include/asm/brk-imm.h | 1 + + arch/arm64/include/asm/esr.h | 34 +- + arch/arm64/include/asm/kvm_arm.h | 6 +- + arch/arm64/include/asm/kvm_asm.h | 11 +- + arch/arm64/include/asm/kvm_emulate.h | 124 +- + arch/arm64/include/asm/kvm_hcall.h | 258 +++ + arch/arm64/include/asm/kvm_host.h | 298 ++-- + arch/arm64/include/asm/kvm_hyp.h | 7 + + arch/arm64/include/asm/kvm_hypevents.h | 14 + + arch/arm64/include/asm/kvm_hyptrace.h | 9 + + arch/arm64/include/asm/kvm_mmu.h | 19 +- + arch/arm64/include/asm/kvm_nested.h | 7 + + arch/arm64/include/asm/kvm_pgtable.h | 17 +- + arch/arm64/include/asm/kvm_pkvm.h | 152 +- + arch/arm64/include/asm/ptrace.h | 64 +- + arch/arm64/include/asm/stacktrace/nvhe.h | 10 +- + arch/arm64/include/asm/sysreg.h | 33 +- + arch/arm64/include/uapi/asm/kvm.h | 15 + + arch/arm64/kernel/image-vars.h | 1 + + arch/arm64/kernel/pi/Makefile | 1 + + arch/arm64/kernel/vmlinux.lds.S | 10 +- + arch/arm64/kvm/Kconfig | 1 + + arch/arm64/kvm/Makefile | 3 +- + arch/arm64/kvm/arch_timer.c | 39 +- + arch/arm64/kvm/arm.c | 359 +++- + .../define_hypevents.h} | 0 + arch/arm64/kvm/guest.c | 33 +- + arch/arm64/kvm/hyp/entry.S | 2 +- + arch/arm64/kvm/hyp/exception.c | 30 +- + arch/arm64/kvm/hyp/hyp-constants.c | 2 - + arch/arm64/kvm/hyp/include/hyp/adjust_pc.h | 52 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 4 +- + arch/arm64/kvm/hyp/include/nvhe/alloc.h | 28 + + arch/arm64/kvm/hyp/include/nvhe/define_events.h | 2 - + arch/arm64/kvm/hyp/include/nvhe/mm.h | 3 + + arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 40 +- + arch/arm64/kvm/hyp/include/nvhe/spinlock.h | 4 + + arch/arm64/kvm/hyp/include/nvhe/trace.h | 71 +- + arch/arm64/kvm/hyp/nvhe/Makefile | 3 +- + arch/arm64/kvm/hyp/nvhe/alloc.c | 1212 +++++++++++++ + arch/arm64/kvm/hyp/nvhe/events.c | 8 + + arch/arm64/kvm/hyp/nvhe/ffa.c | 220 ++- + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 1172 +++++++++--- + arch/arm64/kvm/hyp/nvhe/hyp.lds.S | 1 - + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 20 +- + arch/arm64/kvm/hyp/nvhe/mm.c | 79 +- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 507 +++++- + arch/arm64/kvm/hyp/nvhe/setup.c | 6 + + arch/arm64/kvm/hyp/nvhe/stacktrace.c | 3 +- + arch/arm64/kvm/hyp/nvhe/switch.c | 29 +- + arch/arm64/kvm/hyp/nvhe/sys_regs.c | 63 + + arch/arm64/kvm/hyp/nvhe/trace.c | 76 +- + arch/arm64/kvm/hyp/pgtable.c | 6 +- + arch/arm64/kvm/hyp/vgic-v5-sr.c | 45 + + arch/arm64/kvm/hyp/vhe/switch.c | 21 +- + arch/arm64/kvm/hyp_trace.c | 90 +- + arch/arm64/kvm/hypercalls.c | 11 + + arch/arm64/kvm/inject_fault.c | 10 +- + arch/arm64/kvm/mmio.c | 3 + + arch/arm64/kvm/mmu.c | 784 ++++++-- + arch/arm64/kvm/nested.c | 151 +- + arch/arm64/kvm/pauth.c | 2 +- + arch/arm64/kvm/pkvm.c | 226 ++- + arch/arm64/kvm/pmu-emul.c | 5 +- + arch/arm64/kvm/psci.c | 11 +- + arch/arm64/kvm/ptdump.c | 79 +- + arch/arm64/kvm/pvtime.c | 10 +- + arch/arm64/kvm/stacktrace.c | 3 - + arch/arm64/kvm/sys_regs.c | 69 +- + arch/arm64/kvm/sys_regs.h | 2 +- + arch/arm64/kvm/trace_pkvm.h | 45 + + arch/arm64/kvm/vgic-sys-reg-v5.c | 519 ++++++ + arch/arm64/kvm/vgic/vgic-init.c | 162 +- + arch/arm64/kvm/vgic/vgic-irqfd.c | 18 +- + arch/arm64/kvm/vgic/vgic-irs-v5.c | 1217 +++++++++++++ + arch/arm64/kvm/vgic/vgic-its.c | 6 +- + arch/arm64/kvm/vgic/vgic-kvm-device.c | 272 ++- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 33 +- + arch/arm64/kvm/vgic/vgic-mmio.c | 6 + + arch/arm64/kvm/vgic/vgic-mmio.h | 2 + + arch/arm64/kvm/vgic/vgic-v5-tables.c | 1872 ++++++++++++++++++++ + arch/arm64/kvm/vgic/vgic-v5-tables.h | 140 ++ + arch/arm64/kvm/vgic/vgic-v5.c | 1152 +++++++++++- + arch/arm64/kvm/vgic/vgic.c | 39 +- + arch/arm64/kvm/vgic/vgic.h | 21 + + arch/arm64/tools/sysreg | 51 + + arch/powerpc/kvm/book3s_hv.c | 2 +- + arch/s390/kvm/s390/s390.c | 11 +- + arch/x86/kvm/mmu/mmu.c | 11 +- + arch/x86/kvm/vmx/tdx.c | 2 +- + drivers/irqchip/irq-gic-v5-irs.c | 19 +- + drivers/irqchip/irq-gic-v5.c | 111 +- + include/kvm/arm_arch_timer.h | 15 + + include/kvm/arm_psci.h | 2 + + include/kvm/arm_vgic.h | 213 ++- + include/linux/irqchip/arm-gic-v5.h | 254 ++- + include/linux/irqchip/arm-vgic-info.h | 5 + + include/linux/kvm_host.h | 3 +- + include/linux/trace_remote_event.h | 2 + + include/trace/define_remote_events.h | 19 +- + tools/arch/arm64/include/uapi/asm/kvm.h | 15 + + tools/testing/selftests/kvm/Makefile.kvm | 2 + + .../selftests/kvm/arm64/arch_timer_edge_cases.c | 25 + + .../testing/selftests/kvm/arm64/debug-exceptions.c | 2 +- + .../testing/selftests/kvm/arm64/external_aborts.c | 23 +- + tools/testing/selftests/kvm/arm64/hypercalls.c | 31 +- + .../selftests/kvm/arm64/nv_pre_fault_memory_test.c | 158 ++ + tools/testing/selftests/kvm/arm64/sea_to_user.c | 75 +- + tools/testing/selftests/kvm/arm64/set_id_regs.c | 106 +- + tools/testing/selftests/kvm/arm64/vgic_init.c | 116 +- + tools/testing/selftests/kvm/arm64/vgic_v5.c | 1849 ++++++++++++++++++- + tools/testing/selftests/kvm/include/arm64/gic_v5.h | 105 ++ + tools/testing/selftests/kvm/include/test_util.h | 1 + + tools/testing/selftests/kvm/lib/test_util.c | 15 + + .../testing/selftests/kvm/pre_fault_memory_test.c | 150 +- + virt/kvm/kvm_main.c | 12 +- + 122 files changed, 14792 insertions(+), 1320 deletions(-) + create mode 100644 arch/arm64/include/asm/kvm_hcall.h + rename arch/arm64/{include/asm/kvm_define_hypevents.h => kvm/define_hypevents.h} (100%) + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/alloc.h + create mode 100644 arch/arm64/kvm/hyp/nvhe/alloc.c + create mode 100644 arch/arm64/kvm/trace_pkvm.h + create mode 100644 arch/arm64/kvm/vgic-sys-reg-v5.c + create mode 100644 arch/arm64/kvm/vgic/vgic-irs-v5.c + create mode 100644 arch/arm64/kvm/vgic/vgic-v5-tables.c + create mode 100644 arch/arm64/kvm/vgic/vgic-v5-tables.h + create mode 100644 tools/testing/selftests/kvm/arm64/nv_pre_fault_memory_test.c +Merging kvms390/next (ef7078796fd14 Merge branch 'vfio_file_reference' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/kvms390/linux into kvms390/next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging arch/s390/kernel/uv.c +Auto-merging arch/s390/kvm/s390/interrupt.c +Auto-merging arch/s390/kvm/s390/s390.c +Auto-merging arch/s390/kvm/s390/s390.h +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging drivers/s390/crypto/vfio_ap_ops.c +Auto-merging include/linux/kvm_host.h +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Auto-merging virt/kvm/kvm_main.c +Merge made by the 'ort' strategy. + Documentation/virt/kvm/devices/vm.rst | 18 ++++ + arch/s390/include/asm/kvm_host_s390.h | 4 +- + arch/s390/kernel/uv.c | 41 +++---- + arch/s390/kvm/s390/intercept.c | 32 +++--- + arch/s390/kvm/s390/interrupt.c | 130 ++++++++++++++++++----- + arch/s390/kvm/s390/pci.c | 9 +- + arch/s390/kvm/s390/priv.c | 19 ++-- + arch/s390/kvm/s390/s390.c | 12 +-- + arch/s390/kvm/s390/s390.h | 1 + + arch/x86/include/asm/kvm_host.h | 2 + + arch/x86/include/asm/kvm_page_track.h | 10 +- + arch/x86/kvm/Makefile | 4 +- + arch/x86/kvm/mmu/page_track.c | 22 ++-- + arch/x86/kvm/svm/sev.c | 8 +- + drivers/s390/crypto/vfio_ap_ops.c | 20 ++-- + drivers/vfio/device_cdev.c | 2 +- + drivers/vfio/group.c | 13 ++- + drivers/vfio/vfio.h | 14 +-- + drivers/vfio/vfio_main.c | 57 ++++------ + include/linux/kvm_host.h | 19 +++- + include/linux/vfio.h | 5 +- + tools/testing/selftests/kvm/Makefile.kvm | 1 + + tools/testing/selftests/kvm/s390/irq_injection.c | 74 +++++++++++++ + virt/kvm/kvm_main.c | 21 ++-- + virt/kvm/vfio.c | 13 ++- + 25 files changed, 389 insertions(+), 162 deletions(-) + create mode 100644 tools/testing/selftests/kvm/s390/irq_injection.c +Merging kvm-ppc/topic/ppc-kvm (93f51579e7df2 Linux 7.3-rc4) +$ git merge -m Merge branch 'topic/ppc-kvm' of https://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +Already up to date. +Merging kvm-riscv/riscv_kvm_next (41e81f7e3ef96 RISC-V: KVM: Fix HSM hart status error propagation) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Already up to date. +Merging kvm-x86/next (dea4f6380f4ec Merge branch 'vmx') +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging MAINTAINERS +Auto-merging arch/arm64/kvm/mmu.c +CONFLICT (content): Merge conflict in arch/arm64/kvm/mmu.c +Auto-merging arch/arm64/kvm/nested.c +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/include/asm/kvm-x86-ops.h +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kernel/cpu/scattered.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/mmu/paging_tmpl.h +Auto-merging arch/x86/kvm/svm/sev.c +Auto-merging arch/x86/kvm/vmx/tdx.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/vmx/vmx.h +Auto-merging include/linux/kvm_host.h +Auto-merging tools/testing/selftests/kvm/Makefile.kvm +Auto-merging tools/testing/selftests/kvm/arm64/hypercalls.c +Auto-merging tools/testing/selftests/kvm/include/test_util.h +Auto-merging tools/testing/selftests/kvm/lib/loongarch/processor.c +Auto-merging tools/testing/selftests/kvm/lib/test_util.c +Auto-merging virt/kvm/guest_memfd.c +Auto-merging virt/kvm/kvm_main.c +Resolved 'arch/arm64/kvm/mmu.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5b798b726d44b] Merge branch 'next' of https://github.com/kvm-x86/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 26 + + Documentation/virt/kvm/api.rst | 141 ++++- + .../virt/kvm/x86/amd-memory-encryption.rst | 22 +- + Documentation/virt/kvm/x86/hypercalls.rst | 2 +- + Documentation/virt/kvm/x86/intel-tdx.rst | 4 + + MAINTAINERS | 2 + + arch/arm64/kvm/mmu.c | 3 +- + arch/arm64/kvm/nested.c | 4 +- + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/kvm-x86-ops.h | 3 +- + arch/x86/include/asm/kvm_host.h | 32 +- + arch/x86/include/asm/svm.h | 18 +- + arch/x86/include/asm/vmx.h | 8 + + arch/x86/include/uapi/asm/svm.h | 2 + + arch/x86/kernel/cpu/scattered.c | 1 + + arch/x86/kvm/Kconfig | 15 +- + arch/x86/kvm/cpuid.c | 37 +- + arch/x86/kvm/cpuid.h | 1 - + arch/x86/kvm/hyperv.c | 9 +- + arch/x86/kvm/kvm_emulate.h | 4 +- + arch/x86/kvm/lapic.c | 4 +- + arch/x86/kvm/lapic.h | 2 +- + arch/x86/kvm/mmu/mmu.c | 183 ++++-- + arch/x86/kvm/mmu/paging_tmpl.h | 21 +- + arch/x86/kvm/msrs.c | 15 +- + arch/x86/kvm/pmu.c | 14 +- + arch/x86/kvm/regs.c | 16 +- + arch/x86/kvm/regs.h | 11 +- + arch/x86/kvm/reverse_cpuid.h | 2 +- + arch/x86/kvm/svm/nested.c | 47 +- + arch/x86/kvm/svm/sev.c | 110 +++- + arch/x86/kvm/svm/svm.c | 193 +++++- + arch/x86/kvm/svm/svm.h | 13 +- + arch/x86/kvm/vmx/common.h | 90 ++- + arch/x86/kvm/vmx/main.c | 153 ++++- + arch/x86/kvm/vmx/nested.c | 60 +- + arch/x86/kvm/vmx/posted_intr.c | 24 +- + arch/x86/kvm/vmx/posted_intr.h | 8 +- + arch/x86/kvm/vmx/tdx.c | 141 +++-- + arch/x86/kvm/vmx/vmx.c | 309 +++------ + arch/x86/kvm/vmx/vmx.h | 46 +- + arch/x86/kvm/vmx/x86_ops.h | 6 +- + arch/x86/kvm/x86.c | 703 ++++++++++++--------- + arch/x86/kvm/x86.h | 13 +- + include/linux/kvm_host.h | 89 +-- + include/trace/events/kvm.h | 6 +- + include/uapi/linux/kvm.h | 16 + + tools/testing/selftests/kvm/Makefile | 2 +- + tools/testing/selftests/kvm/Makefile.kvm | 13 +- + .../selftests/kvm/access_tracking_perf_test.c | 10 + + tools/testing/selftests/kvm/arm64/hypercalls.c | 2 +- + .../testing/selftests/kvm/arm64/page_fault_test.c | 18 +- + tools/testing/selftests/kvm/arm64/vgic_its_save.c | 8 +- + .../testing/selftests/kvm/arm64/vgic_lpi_stress.c | 21 +- + tools/testing/selftests/kvm/demand_paging_test.c | 3 +- + tools/testing/selftests/kvm/dirty_log_test.c | 12 +- + tools/testing/selftests/kvm/guest_memfd_test.c | 2 +- + .../testing/selftests/kvm/hardware_disable_test.c | 3 + + tools/testing/selftests/kvm/include/kvm_util.h | 271 +++++++- + tools/testing/selftests/kvm/include/numaif.h | 43 ++ + .../testing/selftests/kvm/include/powerpc/hcall.h | 17 + + .../selftests/kvm/include/powerpc/kvm_util_arch.h | 22 + + .../selftests/kvm/include/powerpc/ppc_asm.h | 32 + + .../selftests/kvm/include/powerpc/processor.h | 39 ++ + .../testing/selftests/kvm/include/powerpc/ucall.h | 21 + + tools/testing/selftests/kvm/include/test_util.h | 37 +- + tools/testing/selftests/kvm/include/x86/evmcs.h | 78 +-- + .../testing/selftests/kvm/include/x86/processor.h | 27 +- + tools/testing/selftests/kvm/include/x86/smm.h | 2 +- + tools/testing/selftests/kvm/include/x86/vmx.h | 186 +++--- + tools/testing/selftests/kvm/kvm_create_max_vcpus.c | 14 +- + tools/testing/selftests/kvm/lib/arm64/processor.c | 4 +- + tools/testing/selftests/kvm/lib/elf.c | 48 +- + tools/testing/selftests/kvm/lib/guest_modes.c | 20 +- + tools/testing/selftests/kvm/lib/guest_sprintf.c | 12 - + tools/testing/selftests/kvm/lib/io.c | 157 ----- + tools/testing/selftests/kvm/lib/kvm_util.c | 373 +++++++---- + .../selftests/kvm/lib/loongarch/processor.c | 5 +- + tools/testing/selftests/kvm/lib/powerpc/handlers.S | 93 +++ + tools/testing/selftests/kvm/lib/powerpc/hcall.c | 45 ++ + .../testing/selftests/kvm/lib/powerpc/processor.c | 512 +++++++++++++++ + tools/testing/selftests/kvm/lib/powerpc/ucall.c | 22 + + tools/testing/selftests/kvm/lib/riscv/processor.c | 4 +- + tools/testing/selftests/kvm/lib/s390/processor.c | 7 +- + tools/testing/selftests/kvm/lib/test_util.c | 7 - + tools/testing/selftests/kvm/lib/userfaultfd_util.c | 6 +- + tools/testing/selftests/kvm/lib/x86/memstress.c | 8 +- + tools/testing/selftests/kvm/lib/x86/processor.c | 23 +- + tools/testing/selftests/kvm/lib/x86/vmx.c | 159 +++-- + tools/testing/selftests/kvm/memslot_perf_test.c | 7 +- + tools/testing/selftests/kvm/s390/cmma_test.c | 19 +- + tools/testing/selftests/kvm/s390/irq_routing.c | 2 +- + .../testing/selftests/kvm/set_memory_region_test.c | 8 +- + tools/testing/selftests/kvm/steal_time.c | 20 +- + tools/testing/selftests/kvm/x86/amx_test.c | 2 +- + tools/testing/selftests/kvm/x86/aperfmperf_test.c | 10 +- + tools/testing/selftests/kvm/x86/cpuid_test.c | 2 +- + .../selftests/kvm/x86/evmcs_smm_controls_test.c | 6 +- + .../testing/selftests/kvm/x86/feature_msrs_test.c | 2 +- + .../testing/selftests/kvm/x86/fix_hypercall_test.c | 2 +- + .../kvm/x86/guest_memfd_conversions_test.c | 512 +++++++++++++++ + tools/testing/selftests/kvm/x86/hyperv_clock.c | 2 +- + tools/testing/selftests/kvm/x86/hyperv_evmcs.c | 87 +-- + tools/testing/selftests/kvm/x86/hyperv_svm_test.c | 2 +- + tools/testing/selftests/kvm/x86/kvm_buslock_test.c | 8 +- + .../selftests/kvm/x86/nested_close_kvm_test.c | 6 +- + .../selftests/kvm/x86/nested_dirty_log_test.c | 8 +- + .../selftests/kvm/x86/nested_emulation_test.c | 23 +- + .../selftests/kvm/x86/nested_exceptions_test.c | 33 +- + .../selftests/kvm/x86/nested_invalid_cr3_test.c | 14 +- + .../selftests/kvm/x86/nested_tdp_fault_test.c | 16 +- + .../selftests/kvm/x86/nested_tsc_adjust_test.c | 10 +- + .../selftests/kvm/x86/nested_tsc_scaling_test.c | 244 ++++--- + .../testing/selftests/kvm/x86/nested_x2apic_test.c | 40 +- + .../testing/selftests/kvm/x86/nx_huge_pages_test.c | 3 +- + .../kvm/x86/private_mem_conversions_test.c | 66 +- + .../selftests/kvm/x86/private_mem_kvm_exits_test.c | 36 +- + .../kvm/x86/save_restore_pf_stress_test.c | 14 +- + tools/testing/selftests/kvm/x86/set_boot_cpu_id.c | 2 +- + tools/testing/selftests/kvm/x86/set_sregs_test.c | 11 + + tools/testing/selftests/kvm/x86/sev_dbg_test.c | 6 +- + tools/testing/selftests/kvm/x86/sev_smoke_test.c | 3 +- + .../kvm/x86/smaller_maxphyaddr_emulation_test.c | 9 +- + tools/testing/selftests/kvm/x86/smm_test.c | 4 +- + tools/testing/selftests/kvm/x86/state_test.c | 74 +-- + .../selftests/kvm/x86/svm_nested_clear_efer_svme.c | 50 -- + .../selftests/kvm/x86/svm_nested_efer_test.c | 266 ++++++++ + .../selftests/kvm/x86/triple_fault_event_test.c | 8 +- + tools/testing/selftests/kvm/x86/tsc_msrs_test.c | 2 +- + .../selftests/kvm/x86/vmx_apic_access_test.c | 22 +- + .../selftests/kvm/x86/vmx_apicv_updates_test.c | 16 +- + .../x86/vmx_exception_with_invalid_guest_state.c | 2 +- + .../kvm/x86/vmx_invalid_nested_guest_state.c | 12 +- + .../selftests/kvm/x86/vmx_nested_la57_state_test.c | 12 +- + .../selftests/kvm/x86/vmx_preemption_timer_test.c | 28 +- + tools/testing/selftests/kvm/x86/xapic_ipi_test.c | 78 +-- + virt/kvm/Kconfig | 3 - + virt/kvm/guest_memfd.c | 649 ++++++++++++++++--- + virt/kvm/guest_memfd.h | 19 +- + virt/kvm/kvm_main.c | 159 +++-- + 140 files changed, 5405 insertions(+), 2252 deletions(-) + create mode 100644 tools/testing/selftests/kvm/include/powerpc/hcall.h + create mode 100644 tools/testing/selftests/kvm/include/powerpc/kvm_util_arch.h + create mode 100644 tools/testing/selftests/kvm/include/powerpc/ppc_asm.h + create mode 100644 tools/testing/selftests/kvm/include/powerpc/processor.h + create mode 100644 tools/testing/selftests/kvm/include/powerpc/ucall.h + delete mode 100644 tools/testing/selftests/kvm/lib/io.c + create mode 100644 tools/testing/selftests/kvm/lib/powerpc/handlers.S + create mode 100644 tools/testing/selftests/kvm/lib/powerpc/hcall.c + create mode 100644 tools/testing/selftests/kvm/lib/powerpc/processor.c + create mode 100644 tools/testing/selftests/kvm/lib/powerpc/ucall.c + create mode 100644 tools/testing/selftests/kvm/x86/guest_memfd_conversions_test.c + delete mode 100644 tools/testing/selftests/kvm/x86/svm_nested_clear_efer_svme.c + create mode 100644 tools/testing/selftests/kvm/x86/svm_nested_efer_test.c +$ git am -3 ../patches/0001-KVM-selftests-Fix-up-semantic-changes.patch +Applying: KVM: selftests: Fix up semantic changes +Using index info to reconstruct a base tree... +M tools/testing/selftests/kvm/lib/kvm_util.c +Falling back to patching base and 3-way merge... +Auto-merging tools/testing/selftests/kvm/lib/kvm_util.c +CONFLICT (content): Merge conflict in tools/testing/selftests/kvm/lib/kvm_util.c +Recorded preimage for 'tools/testing/selftests/kvm/lib/kvm_util.c' +error: Failed to merge in the changes. +hint: Use 'git am --show-current-patch=diff' to see the failed patch +hint: When you have resolved this problem, run "git am --continue". +hint: If you prefer to skip this patch, run "git am --skip" instead. +hint: To restore the original branch and stop patching, run "git am --abort". +hint: Disable this message with "git config advice.mergeConflict false" +Patch failed at 0001 KVM: selftests: Fix up semantic changes +$ git am -3 ../patches/0001-KVM-selftests-Fix-up-phy_pages_alloc-API-rework-inte.patch +Applying: KVM: selftests: Fix up phy_pages_alloc() API rework interaction +Using index info to reconstruct a base tree... +M tools/testing/selftests/kvm/arm64/vgic_its_save.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging xen-tip/linux-next (61b6d1df1d623 xen-blkfront: Fix IO race during unplug) + 992df081bc887 ("xen/scsifront: check for a NULL shadow entry on a backend response") +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging arch/x86/platform/pvh/enlighten.c +Auto-merging drivers/scsi/xen-scsifront.c +Merge made by the 'ort' strategy. + arch/x86/platform/pvh/enlighten.c | 2 + + drivers/block/xen-blkback/blkback.c | 7 +++ + drivers/block/xen-blkfront.c | 16 ++--- + drivers/pci/xen-pcifront.c | 16 +++-- + drivers/scsi/xen-scsifront.c | 2 +- + drivers/xen/gntdev-dmabuf.c | 4 +- + drivers/xen/gntdev.c | 7 +++ + drivers/xen/mcelog.c | 2 +- + drivers/xen/privcmd.c | 47 ++++++-------- + drivers/xen/xen-pciback/pci_stub.c | 7 ++- + include/xen/interface/hvm/hvm_vcpu.h | 116 ----------------------------------- + include/xen/interface/platform.h | 4 +- + include/xen/interface/xen.h | 2 +- + include/xen/xenbus.h | 2 +- + 14 files changed, 67 insertions(+), 167 deletions(-) + delete mode 100644 include/xen/interface/hvm/hvm_vcpu.h +Merging percpu/for-next (8f0b4cce4481f Linux 6.19-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Already up to date. +Merging workqueues/for-next (92b542db38bf7 Merge branch 'for-7.3-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. + include/trace/events/workqueue.h | 146 ++++++++++ + kernel/workqueue.c | 603 ++++++++++++++++++++++++++------------- + 2 files changed, 547 insertions(+), 202 deletions(-) +Merging sched-ext/for-next (8ef2c4fe917a5 Merge branch 'for-7.3-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/sched_ext.git sched-ext/for-next +Auto-merging init/Kconfig +Auto-merging kernel/sched/ext/cid.c +Auto-merging kernel/sched/ext/ext.c +Auto-merging kernel/sched/ext/sub.c +Auto-merging kernel/sched/sched.h +Auto-merging tools/sched_ext/include/scx/common.bpf.h +Merge made by the 'ort' strategy. + Documentation/scheduler/sched-ext.rst | 13 + + include/linux/sched/ext.h | 38 +- + init/Kconfig | 2 - + kernel/sched/ext/cid.c | 67 +- + kernel/sched/ext/cid.h | 11 +- + kernel/sched/ext/ext.c | 1011 ++++++++++++++++---- + kernel/sched/ext/ext.h | 32 +- + kernel/sched/ext/idle.c | 64 +- + kernel/sched/ext/internal.h | 172 +++- + kernel/sched/ext/sub.c | 380 ++++++-- + kernel/sched/ext/sub.h | 44 +- + kernel/sched/ext/types.h | 28 +- + kernel/sched/sched.h | 9 +- + kernel/sched/syscalls.c | 2 + + tools/sched_ext/Makefile | 2 +- + tools/sched_ext/include/scx/cid.bpf.h | 697 ++++++++++++-- + tools/sched_ext/include/scx/common.bpf.h | 94 +- + tools/sched_ext/include/scx/compat.bpf.h | 84 ++ + tools/sched_ext/include/scx/compat.h | 28 +- + tools/sched_ext/include/scx/const-defs.h | 20 + + tools/sched_ext/include/scx/enum_defs.autogen.h | 10 + + tools/sched_ext/include/scx/enums.autogen.bpf.h | 21 +- + tools/sched_ext/include/scx/enums.autogen.h | 22 +- + tools/sched_ext/include/scx/enums_abi.autogen.h | 12 +- + tools/sched_ext/include/scx/features.bpf.h | 29 + + tools/sched_ext/scx_flatcg.bpf.c | 2 +- + tools/sched_ext/scx_qmap.bpf.c | 219 ++++- + tools/sched_ext/scx_qmap.c | 60 +- + tools/sched_ext/scx_qmap.h | 13 + + tools/testing/selftests/sched_ext/.gitignore | 4 + + tools/testing/selftests/sched_ext/Makefile | 13 +- + .../testing/selftests/sched_ext/allowed_cpus.bpf.c | 24 +- + tools/testing/selftests/sched_ext/allowed_cpus.c | 123 ++- + .../selftests/sched_ext/cgroup_nr_cpus.bpf.c | 60 ++ + tools/testing/selftests/sched_ext/cgroup_nr_cpus.c | 419 ++++++++ + tools/testing/selftests/sched_ext/config | 3 + + tools/testing/selftests/sched_ext/create_dsq.bpf.c | 35 + + tools/testing/selftests/sched_ext/create_dsq.c | 4 +- + tools/testing/selftests/sched_ext/dequeue_remote.c | 1 + + .../testing/selftests/sched_ext/enq_blocked.bpf.c | 116 +++ + tools/testing/selftests/sched_ext/enq_blocked.c | 917 ++++++++++++++++++ + tools/testing/selftests/sched_ext/enq_blocked.h | 28 + + tools/testing/selftests/sched_ext/hotplug.c | 34 +- + tools/testing/selftests/sched_ext/kick.bpf.c | 164 ++++ + tools/testing/selftests/sched_ext/kick.c | 519 ++++++++++ + tools/testing/selftests/sched_ext/kick_test.h | 29 + + tools/testing/selftests/sched_ext/nohz_tick.bpf.c | 57 +- + tools/testing/selftests/sched_ext/nohz_tick.c | 207 +++- + tools/testing/selftests/sched_ext/nohz_tick_test.h | 13 + + tools/testing/selftests/sched_ext/rt_stall.c | 80 +- + tools/testing/selftests/sched_ext/runner.c | 2 +- + .../selftests/sched_ext/test_modules/Makefile | 13 + + .../sched_ext/test_modules/scx_enq_blocked_test.c | 195 ++++ + tools/testing/selftests/sched_ext/util.c | 143 +++ + tools/testing/selftests/sched_ext/util.h | 12 + + 55 files changed, 5779 insertions(+), 622 deletions(-) + create mode 100644 tools/sched_ext/include/scx/const-defs.h + create mode 100644 tools/sched_ext/include/scx/features.bpf.h + create mode 100644 tools/testing/selftests/sched_ext/cgroup_nr_cpus.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/cgroup_nr_cpus.c + create mode 100644 tools/testing/selftests/sched_ext/enq_blocked.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/enq_blocked.c + create mode 100644 tools/testing/selftests/sched_ext/enq_blocked.h + create mode 100644 tools/testing/selftests/sched_ext/kick.bpf.c + create mode 100644 tools/testing/selftests/sched_ext/kick.c + create mode 100644 tools/testing/selftests/sched_ext/kick_test.h + create mode 100644 tools/testing/selftests/sched_ext/nohz_tick_test.h + create mode 100644 tools/testing/selftests/sched_ext/test_modules/Makefile + create mode 100644 tools/testing/selftests/sched_ext/test_modules/scx_enq_blocked_test.c +Merging drivers-x86/for-next (98f039265e580 platform/x86: asus-nb-wmi: add tablet mode quirk for ROG Flow X13 GV302X) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/video_detect.c +Auto-merging drivers/platform/x86/amd/pmf/spc.c +Auto-merging drivers/platform/x86/asus-laptop.c +Auto-merging drivers/platform/x86/hp/hp-bioscfg/enum-attributes.c +Auto-merging drivers/platform/x86/hp/hp-wmi.c +Auto-merging drivers/platform/x86/lenovo/yogabook.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-tpmi | 8 +- + .../admin-guide/laptops/thinkpad-acpi.rst | 26 +- + Documentation/wmi/devices/acer-wmi-battery.rst | 70 +++ + Documentation/wmi/devices/bitland-mifs-wmi.rst | 64 ++- + MAINTAINERS | 5 +- + drivers/acpi/Kconfig | 2 +- + drivers/acpi/video_detect.c | 8 - + drivers/gpu/drm/amd/amdgpu/Kconfig | 4 +- + drivers/gpu/drm/gma500/Kconfig | 1 - + drivers/gpu/drm/i915/Kconfig | 1 - + drivers/gpu/drm/radeon/Kconfig | 4 +- + drivers/gpu/drm/xe/Kconfig | 5 +- + drivers/platform/arm64/acer-aspire1-ec.c | 2 +- + drivers/platform/arm64/huawei-gaokun-ec.c | 2 +- + drivers/platform/arm64/lenovo-thinkpad-t14s.c | 10 +- + drivers/platform/arm64/lenovo-yoga-c630.c | 2 +- + drivers/platform/loongarch/Kconfig | 1 + + drivers/platform/mellanox/mlxbf-tmfifo.c | 1 - + drivers/platform/mellanox/mlxreg-hotplug.c | 4 +- + .../platform/surface/surface_aggregator_registry.c | 5 +- + drivers/platform/wmi/Kconfig | 14 +- + drivers/platform/wmi/Makefile | 4 + + drivers/platform/{x86/wmi-bmof.c => wmi/bmof.c} | 0 + drivers/platform/x86/Kconfig | 24 +- + drivers/platform/x86/Makefile | 4 +- + drivers/platform/x86/acer-wmi-battery.c | 450 +++++++++++++++++++ + drivers/platform/x86/acer-wmi.c | 76 +++- + drivers/platform/x86/amd/pmc/pmc-quirks.c | 9 + + drivers/platform/x86/amd/pmc/pmc.c | 21 +- + drivers/platform/x86/amd/pmf/core.c | 1 + + drivers/platform/x86/amd/pmf/spc.c | 8 +- + drivers/platform/x86/amd/pmf/sps.c | 10 +- + drivers/platform/x86/amd/pmf/util.c | 1 + + drivers/platform/x86/asus-armoury.c | 309 ++++++------- + drivers/platform/x86/asus-armoury.h | 197 +++++++-- + drivers/platform/x86/asus-laptop.c | 2 +- + drivers/platform/x86/asus-nb-wmi.c | 25 +- + drivers/platform/x86/asus-tf103c-dock.c | 2 +- + drivers/platform/x86/asus-wmi.c | 198 +++++---- + drivers/platform/x86/asus-wmi.h | 1 - + drivers/platform/x86/ayaneo-ec.c | 7 + + drivers/platform/x86/bitland-mifs-wmi.c | 146 +++--- + drivers/platform/x86/dell/alienware-wmi-wmax.c | 8 + + drivers/platform/x86/dell/dell-dw5826e-reset.c | 30 +- + drivers/platform/x86/dell/dell-wmi-aio.c | 225 ++++------ + drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 99 ++++- + drivers/platform/x86/hp/hp-bioscfg/bioscfg.h | 3 + + .../platform/x86/hp/hp-bioscfg/enum-attributes.c | 57 +-- + .../platform/x86/hp/hp-bioscfg/int-attributes.c | 57 +-- + .../x86/hp/hp-bioscfg/order-list-attributes.c | 58 +-- + .../x86/hp/hp-bioscfg/passwdobj-attributes.c | 57 +-- + .../platform/x86/hp/hp-bioscfg/spmobj-attributes.c | 3 - + .../platform/x86/hp/hp-bioscfg/string-attributes.c | 58 +-- + .../x86/hp/hp-bioscfg/surestart-attributes.c | 18 +- + drivers/platform/x86/hp/hp-wmi.c | 42 +- + drivers/platform/x86/hp/hp_accel.c | 2 +- + drivers/platform/x86/huawei-wmi.c | 1 + + drivers/platform/x86/intel/bxtwc_tmu.c | 5 +- + drivers/platform/x86/intel/bytcrc_pwrsrc.c | 2 +- + drivers/platform/x86/intel/crystal_cove_charger.c | 2 +- + drivers/platform/x86/intel/int0002_vgpio.c | 4 +- + drivers/platform/x86/intel/pmc/core.c | 1 + + drivers/platform/x86/intel/pmc/core.h | 2 +- + drivers/platform/x86/intel/pmc/nvl.c | 2 +- + drivers/platform/x86/intel/pmt/class.c | 35 +- + drivers/platform/x86/intel/pmt/class.h | 5 +- + drivers/platform/x86/intel/pmt/crashlog.c | 235 +++++++--- + drivers/platform/x86/intel/pmt/discovery.c | 2 +- + drivers/platform/x86/intel/pmt/telemetry.c | 3 + + drivers/platform/x86/intel/punit_ipc.c | 4 +- + .../x86/intel/speed_select_if/isst_if_common.c | 57 ++- + drivers/platform/x86/intel/tpmi_power_domains.c | 18 + + .../x86/intel/uncore-frequency/uncore-frequency.c | 1 + + drivers/platform/x86/intel/vsec.c | 19 +- + drivers/platform/x86/intel/vsec_tpmi.c | 2 +- + drivers/platform/x86/intel/wmi/sbl-fw-update.c | 16 +- + drivers/platform/x86/lenovo/ideapad-laptop.c | 4 + + drivers/platform/x86/lenovo/think-lmi.c | 14 +- + drivers/platform/x86/lenovo/thinkpad_acpi.c | 487 +++++++++++---------- + drivers/platform/x86/lenovo/yogabook.c | 11 +- + drivers/platform/x86/msi-ec.c | 11 + + drivers/platform/x86/msi-laptop.c | 2 +- + drivers/platform/x86/oxpec.c | 75 +++- + drivers/platform/x86/panasonic-laptop.c | 14 +- + drivers/platform/x86/samsung-laptop.c | 2 +- + drivers/platform/x86/topstar-laptop.c | 6 +- + drivers/platform/x86/toshiba_haps.c | 11 +- + drivers/platform/x86/uniwill/uniwill-acpi.c | 343 +++++++++++---- + include/linux/intel_vsec.h | 14 +- + include/linux/platform_data/x86/asus-wmi.h | 7 +- + include/linux/string_choices.h | 6 + + include/uapi/linux/amd-pmf.h | 3 + + tools/power/x86/intel-speed-select/Makefile | 4 +- + tools/power/x86/intel-speed-select/isst-config.c | 4 +- + .../power/x86/intel-speed-select/isst-core-mbox.c | 2 +- + tools/power/x86/intel-speed-select/isst.h | 2 +- + 96 files changed, 2516 insertions(+), 1373 deletions(-) + create mode 100644 Documentation/wmi/devices/acer-wmi-battery.rst + rename drivers/platform/{x86/wmi-bmof.c => wmi/bmof.c} (100%) + create mode 100644 drivers/platform/x86/acer-wmi-battery.c +Merging chrome-platform/for-next (2d3ee0bdb321a platform/chrome: cros_ec_typec: Poll for role swap completion) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Merge made by the 'ort' strategy. + drivers/platform/chrome/cros_ec_ishtp.c | 2 +- + drivers/platform/chrome/cros_ec_proto.c | 43 +++++-- + drivers/platform/chrome/cros_ec_proto_test.c | 158 ++++++++++++++++++++++++- + drivers/platform/chrome/cros_ec_rpmsg.c | 2 +- + drivers/platform/chrome/cros_ec_typec.c | 104 +++++++++++----- + drivers/platform/chrome/cros_usbpd_notify.c | 41 ++++--- + include/linux/platform_data/cros_ec_commands.h | 72 +++++++++++ + 7 files changed, 357 insertions(+), 65 deletions(-) +Merging chrome-platform-firmware/for-firmware-next (f2e05ce9763fe firmware: coreboot: Add CFR firmware attributes driver) +$ git merge -m Merge branch 'for-firmware-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Auto-merging MAINTAINERS +Auto-merging drivers/firmware/Kconfig +Auto-merging drivers/firmware/Makefile +Auto-merging drivers/platform/x86/Kconfig +Auto-merging drivers/platform/x86/Makefile +Auto-merging drivers/platform/x86/asus-armoury.c +Auto-merging drivers/platform/x86/hp/hp-bioscfg/bioscfg.c +Auto-merging drivers/platform/x86/lenovo/think-lmi.c +Merge made by the 'ort' strategy. + MAINTAINERS | 34 +- + drivers/firmware/Kconfig | 5 +- + drivers/firmware/Makefile | 3 +- + drivers/firmware/{google => coreboot}/Kconfig | 89 +- + drivers/firmware/coreboot/Makefile | 15 + + drivers/firmware/{google => coreboot}/cbmem.c | 0 + drivers/firmware/coreboot/coreboot-cfr.c | 1204 ++++++++++++++++++++ + .../firmware/{google => coreboot}/coreboot_table.c | 4 +- + .../firmware/{google => coreboot}/coreboot_table.h | 0 + .../{google => coreboot}/framebuffer-coreboot.c | 0 + drivers/firmware/{google => coreboot}/gsmi.c | 0 + .../{google => coreboot}/memconsole-coreboot.c | 0 + .../{google => coreboot}/memconsole-x86-legacy.c | 0 + drivers/firmware/{google => coreboot}/memconsole.c | 0 + drivers/firmware/{google => coreboot}/memconsole.h | 6 +- + drivers/firmware/{google => coreboot}/vpd.c | 0 + drivers/firmware/{google => coreboot}/vpd_decode.c | 0 + drivers/firmware/{google => coreboot}/vpd_decode.h | 0 + .../x86 => firmware}/firmware_attributes_class.c | 2 +- + drivers/firmware/google/Makefile | 14 - + drivers/platform/x86/Kconfig | 3 - + drivers/platform/x86/Makefile | 2 - + drivers/platform/x86/asus-armoury.c | 2 +- + drivers/platform/x86/dell/dell-wmi-sysman/sysman.c | 2 +- + drivers/platform/x86/hp/hp-bioscfg/bioscfg.c | 2 +- + drivers/platform/x86/lenovo/think-lmi.c | 2 +- + drivers/platform/x86/lenovo/wmi-other.c | 2 +- + drivers/platform/x86/samsung-galaxybook.c | 2 +- + .../linux/firmware_attributes.h | 6 +- + 29 files changed, 1335 insertions(+), 64 deletions(-) + rename drivers/firmware/{google => coreboot}/Kconfig (57%) + create mode 100644 drivers/firmware/coreboot/Makefile + rename drivers/firmware/{google => coreboot}/cbmem.c (100%) + create mode 100644 drivers/firmware/coreboot/coreboot-cfr.c + rename drivers/firmware/{google => coreboot}/coreboot_table.c (99%) + rename drivers/firmware/{google => coreboot}/coreboot_table.h (100%) + rename drivers/firmware/{google => coreboot}/framebuffer-coreboot.c (100%) + rename drivers/firmware/{google => coreboot}/gsmi.c (100%) + rename drivers/firmware/{google => coreboot}/memconsole-coreboot.c (100%) + rename drivers/firmware/{google => coreboot}/memconsole-x86-legacy.c (100%) + rename drivers/firmware/{google => coreboot}/memconsole.c (100%) + rename drivers/firmware/{google => coreboot}/memconsole.h (82%) + rename drivers/firmware/{google => coreboot}/vpd.c (100%) + rename drivers/firmware/{google => coreboot}/vpd_decode.c (100%) + rename drivers/firmware/{google => coreboot}/vpd_decode.h (100%) + rename drivers/{platform/x86 => firmware}/firmware_attributes_class.c (94%) + delete mode 100644 drivers/firmware/google/Makefile + rename drivers/platform/x86/firmware_attributes_class.h => include/linux/firmware_attributes.h (60%) +Merging hsi/for-next (e81250ec6b692 hsi: omap_ssi_core: fix missing DMA mask setup for SSI controller device) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds-lj/for-leds-next (05b4738b0078f leds: trigger: Add led_trigger_notify_hw_control_changed() interface) +$ git merge -m Merge branch 'for-leds-next' of https://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-led | 28 ++- + .../ABI/testing/sysfs-class-led-trigger-netdev | 3 + + .../devicetree/bindings/leds/adi,ltc3208.yaml | 183 ++++++++++++++++ + .../devicetree/bindings/leds/leds-cpcap.txt | 29 --- + .../bindings/leds/motorola,cpcap-leds.yaml | 42 ++++ + Documentation/leds/leds-class.rst | 72 +++++++ + Documentation/leds/leds-st1202.rst | 5 + + MAINTAINERS | 8 + + drivers/leds/Kconfig | 12 ++ + drivers/leds/Makefile | 1 + + drivers/leds/flash/leds-aat1290.c | 5 +- + drivers/leds/flash/leds-ktd2692.c | 10 +- + drivers/leds/led-class-flash.c | 21 +- + drivers/leds/led-class.c | 46 ++-- + drivers/leds/led-core.c | 5 +- + drivers/leds/led-triggers.c | 177 ++++++++++++++- + drivers/leds/leds-cros_ec.c | 6 + + drivers/leds/leds-is31fl32xx.c | 20 +- + drivers/leds/leds-lm3692x.c | 4 +- + drivers/leds/leds-lp8860.c | 5 +- + drivers/leds/leds-ltc3208.c | 234 ++++++++++++++++++++ + drivers/leds/leds-max77705.c | 3 +- + drivers/leds/leds-pca9532.c | 9 +- + drivers/leds/leds-pca963x.c | 5 +- + drivers/leds/leds-ss4200.c | 2 +- + drivers/leds/leds-st1202.c | 240 ++++++++++++++++----- + drivers/leds/leds-syscon.c | 9 +- + drivers/leds/leds-turris-omnia.c | 7 + + drivers/leds/leds.h | 8 +- + drivers/leds/rgb/leds-qcom-lpg.c | 38 ++-- + drivers/leds/trigger/Kconfig | 10 + + drivers/leds/trigger/ledtrig-netdev.c | 13 +- + include/linux/leds.h | 24 +++ + 33 files changed, 1089 insertions(+), 195 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/adi,ltc3208.yaml + delete mode 100644 Documentation/devicetree/bindings/leds/leds-cpcap.txt + create mode 100644 Documentation/devicetree/bindings/leds/motorola,cpcap-leds.yaml + create mode 100644 drivers/leds/leds-ltc3208.c +Merging ipmi/for-next (921fcdb737891 char: ipmi: Replace deprecated strcpy with strscpy) +$ git merge -m Merge branch 'for-next' of https://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/ipmi_watchdog.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) +Merging driver-core/driver-core-next (d4ffc4896b3e7 rust: pci: add extended capability and SR-IOV support) +$ git merge -m Merge branch 'driver-core-next' of https://git.kernel.org/pub/scm/linux/kernel/git/driver-core/driver-core.git driver-core/driver-core-next +Auto-merging MAINTAINERS +Auto-merging drivers/base/bus.c +Auto-merging drivers/perf/arm_spe_pmu.c +Auto-merging drivers/perf/cxl_pmu.c +Auto-merging drivers/perf/hisilicon/hisi_uncore_pmu.h +Auto-merging drivers/perf/xgene_pmu.c +Auto-merging include/linux/module.h +Auto-merging include/linux/panic.h +Auto-merging kernel/module/main.c +Auto-merging kernel/panic.c +Auto-merging lib/kobject_uevent.c +Auto-merging rust/helpers/pci.c +Auto-merging rust/kernel/auxiliary.rs +Auto-merging rust/kernel/io.rs +Auto-merging rust/kernel/io/resource.rs +Auto-merging rust/kernel/pci.rs +Merge made by the 'ort' strategy. + Documentation/admin-guide/tainted-kernels.rst | 54 ++--- + MAINTAINERS | 1 + + arch/powerpc/perf/hv-24x7.c | 2 +- + arch/x86/kernel/cpu/mce/core.c | 6 +- + drivers/base/bus.c | 3 + + drivers/base/core.c | 30 +-- + drivers/base/node.c | 17 +- + drivers/base/platform.c | 19 +- + drivers/base/property.c | 2 +- + drivers/base/transport_class.c | 2 +- + drivers/gpu/drm/tyr/vm.rs | 1 - + drivers/interconnect/debugfs-client.c | 81 +++++-- + drivers/perf/alibaba_uncore_drw_pmu.c | 2 +- + drivers/perf/arm-cci.c | 2 +- + drivers/perf/arm-ccn.c | 2 +- + drivers/perf/arm_cspmu/arm_cspmu.h | 2 +- + drivers/perf/arm_dsu_pmu.c | 2 +- + drivers/perf/arm_spe_pmu.c | 6 +- + drivers/perf/cxl_pmu.c | 10 +- + drivers/perf/fsl_imx8_ddr_perf.c | 2 +- + drivers/perf/fujitsu_uncore_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_pcie_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_pmu.h | 6 +- + drivers/perf/hisilicon/hns3_pmu.c | 6 +- + drivers/perf/nvidia_t410_c2c_pmu.c | 2 +- + drivers/perf/nvidia_t410_cmem_latency_pmu.c | 12 +- + drivers/perf/qcom_l3_pmu.c | 8 +- + drivers/perf/starfive_starlink_pmu.c | 2 +- + drivers/perf/xgene_pmu.c | 2 +- + drivers/soundwire/debugfs.c | 63 +++++- + fs/debugfs/file.c | 81 +------ + include/linux/device.h | 14 +- + include/linux/kernfs.h | 2 +- + include/linux/module.h | 10 + + include/linux/panic.h | 3 +- + include/trace/events/module.h | 3 +- + kernel/module/main.c | 17 +- + kernel/panic.c | 10 +- + lib/kobject.c | 2 +- + lib/kobject_uevent.c | 2 +- + rust/helpers/dma.c | 5 + + rust/helpers/pci.c | 5 + + rust/kernel/auxiliary.rs | 8 + + rust/kernel/io.rs | 74 ++++++- + rust/kernel/io/resource.rs | 6 +- + rust/kernel/pci.rs | 8 + + rust/kernel/pci/cap.rs | 292 ++++++++++++++++++++++++++ + rust/kernel/scatterlist.rs | 23 +- + tools/debugging/kernel-chktaint | 8 + + 49 files changed, 693 insertions(+), 231 deletions(-) + create mode 100644 rust/kernel/pci/cap.rs +Merging usb/usb-next (bbf6b99a57b24 usb: typec: ucsi_ccg: Add retry mechanism in ccg_read) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/devicetree/bindings/usb/qcom,snps-dwc3.yaml +Auto-merging arch/arm/boot/dts/st/stm32mp131.dtsi +Auto-merging arch/arm/boot/dts/st/stm32mp151.dtsi +Auto-merging arch/arm64/boot/dts/st/stm32mp231.dtsi +Auto-merging arch/arm64/boot/dts/st/stm32mp251.dtsi +Auto-merging drivers/net/usb/r8152.c +Auto-merging drivers/thunderbolt/tb.c +CONFLICT (content): Merge conflict in drivers/thunderbolt/tb.c +Auto-merging drivers/usb/gadget/legacy/inode.c +Auto-merging drivers/usb/gadget/udc/lpc32xx_udc.c +Auto-merging include/linux/pci_ids.h +Recorded preimage for 'drivers/thunderbolt/tb.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/thunderbolt/tb.c'. +[master 14fdc39fc83f0] Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/dma/ti/ti,cppi41.yaml | 109 + + .../devicetree/bindings/phy/ti,am335x-usb-phy.yaml | 49 + + .../devicetree/bindings/usb/am33xx-usb.txt | 200 - + .../devicetree/bindings/usb/da8xx-usb.txt | 81 - + .../devicetree/bindings/usb/generic-ehci.yaml | 24 + + .../devicetree/bindings/usb/generic-ohci.yaml | 24 + + .../devicetree/bindings/usb/generic-xhci.yaml | 4 +- + .../devicetree/bindings/usb/gpio-sbu-mux.yaml | 1 + + .../bindings/usb/nvidia,tegra234-xusb.yaml | 52 +- + .../devicetree/bindings/usb/ohci-da8xx.txt | 23 - + .../devicetree/bindings/usb/qcom,snps-dwc3.yaml | 22 + + .../bindings/usb/ti,am335x-usb-ctrl-module.yaml | 38 + + .../devicetree/bindings/usb/ti,am33xx-usb.yaml | 103 + + .../devicetree/bindings/usb/ti,da830-musb.yaml | 113 + + .../devicetree/bindings/usb/ti,da830-ohci.yaml | 61 + + .../devicetree/bindings/usb/ti,hd3ss3220.yaml | 11 + + .../devicetree/bindings/usb/ti,musb-am33xx.yaml | 113 + + Documentation/hwmon/prom21-xhci.rst | 2 +- + Documentation/usb/usbmon.rst | 2 +- + arch/arm/boot/dts/st/stm32mp131.dtsi | 4 +- + arch/arm/boot/dts/st/stm32mp151.dtsi | 4 +- + arch/arm64/boot/dts/st/stm32mp231.dtsi | 64 + + arch/arm64/boot/dts/st/stm32mp251.dtsi | 63 + + drivers/net/thunderbolt/main.c | 6 +- + drivers/net/usb/r8152.c | 2 +- + drivers/thunderbolt/debugfs.c | 126 +- + drivers/thunderbolt/dma_test.c | 10 +- + drivers/thunderbolt/eeprom.c | 23 +- + drivers/thunderbolt/nhi.c | 222 +- + drivers/thunderbolt/nhi.h | 2 + + drivers/thunderbolt/path.c | 2 +- + drivers/thunderbolt/pci.c | 113 + + drivers/thunderbolt/quirks.c | 18 + + drivers/thunderbolt/sb_regs.h | 2 + + drivers/thunderbolt/stream.c | 287 +- + drivers/thunderbolt/switch.c | 4 + + drivers/thunderbolt/tb.c | 78 - + drivers/thunderbolt/tb.h | 5 +- + drivers/thunderbolt/usb4.c | 10 +- + drivers/usb/cdns3/core.c | 4 +- + drivers/usb/cdns3/drd.c | 4 +- + drivers/usb/chipidea/ci_hdrc_imx.c | 8 +- + drivers/usb/chipidea/otg_fsm.c | 2 +- + drivers/usb/chipidea/udc.c | 2 +- + drivers/usb/class/cdc-acm.c | 6 +- + drivers/usb/common/ulpi.c | 4 +- + drivers/usb/common/usb-conn-gpio.c | 8 +- + drivers/usb/core/driver.c | 13 +- + drivers/usb/core/hub.c | 2 +- + drivers/usb/core/quirks.c | 3 + + drivers/usb/core/urb.c | 4 +- + drivers/usb/core/usb.c | 2 +- + drivers/usb/dwc2/core.c | 2 +- + drivers/usb/dwc2/core.h | 2 +- + drivers/usb/dwc2/debugfs.c | 6 +- + drivers/usb/dwc2/gadget.c | 98 +- + drivers/usb/dwc2/hcd.c | 4 +- + drivers/usb/dwc2/hcd_ddma.c | 2 +- + drivers/usb/dwc3/debugfs.c | 6 +- + drivers/usb/dwc3/dwc3-google.c | 4 +- + drivers/usb/dwc3/dwc3-imx.c | 2 +- + drivers/usb/dwc3/dwc3-imx8mp.c | 4 +- + drivers/usb/dwc3/dwc3-keystone.c | 5 +- + drivers/usb/dwc3/dwc3-omap.c | 5 +- + drivers/usb/fotg210/Kconfig | 5 + + drivers/usb/fotg210/fotg210-core.c | 273 +- + drivers/usb/fotg210/fotg210-hcd.c | 5666 +------------------- + drivers/usb/fotg210/fotg210-hcd.h | 689 --- + drivers/usb/fotg210/fotg210-udc.c | 114 +- + drivers/usb/fotg210/fotg210-udc.h | 2 +- + drivers/usb/fotg210/fotg210.h | 26 +- + drivers/usb/gadget/composite.c | 2 +- + drivers/usb/gadget/function/f_mass_storage.c | 7 +- + drivers/usb/gadget/legacy/inode.c | 205 +- + drivers/usb/gadget/udc/aspeed-vhub/core.c | 4 +- + drivers/usb/gadget/udc/aspeed-vhub/dev.c | 2 - + drivers/usb/gadget/udc/aspeed_udc.c | 5 +- + drivers/usb/gadget/udc/at91_udc.c | 1 - + drivers/usb/gadget/udc/atmel_usba_udc.c | 5 +- + drivers/usb/gadget/udc/bcm63xx_udc.c | 1 - + drivers/usb/gadget/udc/core.c | 9 +- + drivers/usb/gadget/udc/fsl_udc_core.c | 3 - + drivers/usb/gadget/udc/lpc32xx_udc.c | 1 - + drivers/usb/gadget/udc/r8a66597-udc.c | 4 +- + drivers/usb/gadget/udc/renesas_usbf.c | 8 +- + drivers/usb/gadget/udc/snps_udc_plat.c | 4 +- + drivers/usb/gadget/udc/tegra-xudc.c | 5 +- + drivers/usb/host/Kconfig | 13 + + drivers/usb/host/ehci-dbg.c | 3 +- + drivers/usb/host/ehci-hcd.c | 31 +- + drivers/usb/host/ehci-hub.c | 104 +- + drivers/usb/host/ehci-ppc-of.c | 47 +- + drivers/usb/host/ehci-timer.c | 3 +- + drivers/usb/host/ehci.h | 55 +- + drivers/usb/host/octeon-hcd.c | 41 +- + drivers/usb/host/ohci-dbg.c | 2 +- + drivers/usb/host/ohci-hub.c | 2 +- + drivers/usb/host/ohci-ppc-of.c | 44 +- + drivers/usb/host/pci-quirks.c | 4 +- + drivers/usb/host/xhci-dbgtty.c | 2 + + drivers/usb/host/xhci-pci-prom21.c | 3 + + drivers/usb/host/xhci-pci.c | 12 +- + drivers/usb/host/xhci-pci.h | 3 + + drivers/usb/host/xhci-ring.c | 255 +- + drivers/usb/host/xhci-tegra.c | 45 +- + drivers/usb/host/xhci.c | 27 +- + drivers/usb/host/xhci.h | 5 + + drivers/usb/image/microtek.c | 1 + + drivers/usb/misc/apple-mfi-fastcharge.c | 2 +- + drivers/usb/misc/brcmstb-usb-pinmap.c | 9 +- + drivers/usb/misc/onboard_usb_dev.c | 2 +- + drivers/usb/misc/qcom_eud.c | 2 +- + drivers/usb/mon/mon_main.c | 3 + + drivers/usb/mtu3/mtu3_core.c | 4 +- + drivers/usb/musb/da8xx.c | 8 +- + drivers/usb/musb/musb_dsps.c | 25 + + drivers/usb/phy/phy-ab8500-usb.c | 12 +- + drivers/usb/phy/phy-generic.c | 3 +- + drivers/usb/phy/phy-gpio-vbus-usb.c | 5 +- + drivers/usb/renesas_usbhs/mod.c | 4 +- + drivers/usb/storage/alauda.c | 95 +- + drivers/usb/storage/ene_ub6250.c | 2 + + drivers/usb/storage/sddr09.c | 9 + + drivers/usb/storage/usb.c | 6 +- + drivers/usb/typec/anx7411.c | 4 +- + drivers/usb/typec/bus.c | 4 +- + drivers/usb/typec/hd3ss3220.c | 36 +- + drivers/usb/typec/mux/gpio-sbu-mux.c | 13 +- + drivers/usb/typec/mux/it5205.c | 2 +- + drivers/usb/typec/mux/ps883x.c | 48 + + drivers/usb/typec/tcpm/tcpci_maxim_core.c | 3 +- + drivers/usb/typec/tcpm/tcpci_mt6360.c | 1 - + drivers/usb/typec/tcpm/tcpci_mt6370.c | 2 +- + drivers/usb/typec/tcpm/tcpm.c | 57 +- + drivers/usb/typec/tipd/core.c | 3 + + drivers/usb/typec/ucsi/ucsi.c | 55 +- + drivers/usb/typec/ucsi/ucsi.h | 3 +- + drivers/usb/typec/ucsi/ucsi_ccg.c | 37 +- + drivers/usb/usbip/stub_main.c | 2 +- + include/linux/pci_ids.h | 1 + + include/linux/thunderbolt.h | 47 +- + include/linux/ulpi/driver.h | 4 +- + include/linux/usb.h | 6 +- + include/linux/usb/typec_altmode.h | 4 +- + 144 files changed, 3053 insertions(+), 7492 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/ti/ti,cppi41.yaml + create mode 100644 Documentation/devicetree/bindings/phy/ti,am335x-usb-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/am33xx-usb.txt + delete mode 100644 Documentation/devicetree/bindings/usb/da8xx-usb.txt + delete mode 100644 Documentation/devicetree/bindings/usb/ohci-da8xx.txt + create mode 100644 Documentation/devicetree/bindings/usb/ti,am335x-usb-ctrl-module.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ti,am33xx-usb.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ti,da830-musb.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ti,da830-ohci.yaml + create mode 100644 Documentation/devicetree/bindings/usb/ti,musb-am33xx.yaml + delete mode 100644 drivers/usb/fotg210/fotg210-hcd.h +Merging thunderbolt/next (a93a8e3200002 thunderbolt: stream: Make read return framing error to the userspace) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-serial/usb-next (e7daa54802c56 USB: serial: sierra: fix urb leak on write completion) +$ git merge -m Merge branch 'usb-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Merge made by the 'ort' strategy. + drivers/usb/serial/option.c | 5 +++++ + drivers/usb/serial/sierra.c | 3 ++- + drivers/usb/serial/usb_wwan.c | 9 ++++++--- + 3 files changed, 13 insertions(+), 4 deletions(-) +Merging tty/tty-next (36844ea19656f Merge 7.3-rc6 into tty-next) +$ git merge -m Merge branch 'tty-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging MAINTAINERS +Auto-merging drivers/tty/serial/8250/8250_platform.c +Auto-merging drivers/tty/serial/8250/8250_port.c +Auto-merging drivers/tty/serial/amba-pl011.c +Auto-merging drivers/tty/serial/sifive.c +Auto-merging include/linux/soc/qcom/geni-se.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/devices.txt | 13 +- + Documentation/devicetree/bindings/serial/8250.yaml | 32 +- + .../devicetree/bindings/serial/cdns,uart.yaml | 1 + + .../devicetree/bindings/serial/renesas,hscif.yaml | 4 +- + .../devicetree/bindings/serial/renesas,scif.yaml | 4 +- + .../bindings/serial/snps-dw-apb-uart.yaml | 1 + + Documentation/driver-api/serial/driver.rst | 2 +- + MAINTAINERS | 2 +- + drivers/acpi/acpi_apd.c | 1 + + drivers/tty/Kconfig | 10 - + drivers/tty/Makefile | 1 - + drivers/tty/hvc/hvcs.c | 6 +- + drivers/tty/moxa.c | 2136 -------------------- + drivers/tty/pty.c | 5 +- + drivers/tty/serdev/serdev-ttyport.c | 2 + + drivers/tty/serial/8250/8250.h | 17 +- + drivers/tty/serial/8250/8250_airoha.c | 187 ++ + drivers/tty/serial/8250/8250_core.c | 25 +- + drivers/tty/serial/8250/8250_dma.c | 29 +- + drivers/tty/serial/8250/8250_dw.c | 19 +- + drivers/tty/serial/8250/8250_dwlib.c | 5 + + drivers/tty/serial/8250/8250_dwlib.h | 5 + + drivers/tty/serial/8250/8250_early.c | 1 + + drivers/tty/serial/8250/8250_hub6.c | 11 +- + drivers/tty/serial/8250/8250_mid.c | 16 +- + drivers/tty/serial/8250/8250_mxpcie.c | 30 +- + drivers/tty/serial/8250/8250_omap.c | 4 +- + drivers/tty/serial/8250/8250_pci.c | 2 +- + drivers/tty/serial/8250/8250_platform.c | 9 +- + drivers/tty/serial/8250/8250_pnp.c | 2 +- + drivers/tty/serial/8250/8250_port.c | 46 +- + drivers/tty/serial/8250/8250_uniphier.c | 28 +- + drivers/tty/serial/8250/Kconfig | 15 +- + drivers/tty/serial/8250/Makefile | 3 +- + drivers/tty/serial/Kconfig | 1 + + drivers/tty/serial/amba-pl011.c | 21 +- + drivers/tty/serial/arc_uart.c | 2 +- + drivers/tty/serial/atmel_serial.c | 8 +- + drivers/tty/serial/fsl_lpuart.c | 18 +- + drivers/tty/serial/kgdboc.c | 2 +- + drivers/tty/serial/qcom_geni_serial.c | 43 +- + drivers/tty/serial/samsung_tty.c | 27 +- + drivers/tty/serial/serial_core.c | 51 +- + drivers/tty/serial/serial_txx9.c | 62 +- + drivers/tty/serial/sh-sci.c | 22 +- + drivers/tty/serial/sifive.c | 2 +- + drivers/tty/serial/tegra-tcu.c | 22 +- + drivers/tty/sysrq.c | 5 +- + drivers/tty/tty_port.c | 8 +- + drivers/tty/vt/keyboard.c | 4 +- + include/linux/serial_core.h | 2 - + include/linux/soc/qcom/geni-se.h | 12 +- + 52 files changed, 534 insertions(+), 2452 deletions(-) + delete mode 100644 drivers/tty/moxa.c + create mode 100644 drivers/tty/serial/8250/8250_airoha.c +Merging char-misc/char-misc-next (7e170600b3629 Merge tag 'coresight-next-v7.4' of ssh://gitolite.kernel.org/pub/scm/linux/kernel/git/coresight/linux into char-misc-next) +$ git merge -m Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging Documentation/devicetree/bindings/spi/spi-peripheral-props.yaml +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/android/binder/allocation.rs +Auto-merging drivers/android/binder/context.rs +Auto-merging drivers/android/binder/freeze.rs +Auto-merging drivers/android/binder/node.rs +Auto-merging drivers/android/binder/page_range.rs +Auto-merging drivers/android/binder/process.rs +Auto-merging drivers/android/binder/range_alloc/tree.rs +Auto-merging drivers/android/binder/rust_binderfs.c +Auto-merging drivers/android/binder/thread.rs +Auto-merging drivers/android/binder/transaction.rs +CONFLICT (modify/delete): drivers/android/binder_alloc.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/android/binder_alloc.c left in tree. +CONFLICT (modify/delete): drivers/android/binderfs.c deleted in char-misc/char-misc-next and modified in HEAD. Version HEAD of drivers/android/binderfs.c left in tree. +Auto-merging drivers/iio/gyro/bmg160_core.c +Auto-merging drivers/iio/light/lm3533-als.c +Auto-merging drivers/pci/quirks.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/android/binderfs.c +drivers/android/binder_alloc.c +fatal: pathspec 'drivers/android/binderfs.c +drivers/android/binder_alloc.c' did not match any files +$ git commit --no-edit -v -a +[master b9d13d214ee99] Merge branch 'char-misc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/debugfs-iio-ad9910 | 23 + + Documentation/ABI/testing/debugfs-iio-backend | 16 +- + Documentation/ABI/testing/sysfs-bus-iio | 115 + + Documentation/ABI/testing/sysfs-bus-iio-adc | 9 + + .../ABI/testing/sysfs-bus-iio-frequency-ad9910 | 31 + + .../ABI/testing/sysfs-bus-mhi-devices-loopback | 49 + + .../bindings/iio/accel/adi,adis16201.yaml | 6 +- + .../devicetree/bindings/iio/accel/adi,adxl367.yaml | 13 +- + .../devicetree/bindings/iio/adc/adi,ad4080.yaml | 38 +- + .../devicetree/bindings/iio/adc/adi,ad4130.yaml | 3 +- + .../devicetree/bindings/iio/adc/adi,ad4851.yaml | 8 +- + .../devicetree/bindings/iio/adc/adi,ad7173.yaml | 2 +- + .../devicetree/bindings/iio/adc/adi,ad7768-1.yaml | 6 +- + .../devicetree/bindings/iio/adc/adi,ad7768.yaml | 270 + + .../devicetree/bindings/iio/adc/adi,ad7779.yaml | 30 +- + .../devicetree/bindings/iio/adc/adi,ade9000.yaml | 58 +- + .../devicetree/bindings/iio/adc/adi,max40080.yaml | 65 + + .../bindings/iio/adc/axiado,ax3000-saradc.yaml | 63 + + .../devicetree/bindings/iio/adc/lltc,ltc2497.yaml | 2 +- + .../bindings/iio/adc/maxim,max34408.yaml | 28 +- + .../bindings/iio/adc/mediatek,mt2701-auxadc.yaml | 1 + + .../bindings/iio/adc/nxp,lpc1850-adc.yaml | 2 +- + .../bindings/iio/adc/renesas,r9a09g077-adc.yaml | 22 +- + .../bindings/iio/adc/renesas,rzg2l-adc.yaml | 17 +- + .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 6 + + .../devicetree/bindings/iio/adc/ti,ads1100.yaml | 10 +- + .../devicetree/bindings/iio/adc/ti,ads112c04.yaml | 149 + + .../devicetree/bindings/iio/adc/ti,ads1298.yaml | 18 +- + .../devicetree/bindings/iio/addac/adi,ad74115.yaml | 3 +- + .../bindings/iio/addac/adi,ad74413r.yaml | 3 +- + .../devicetree/bindings/iio/dac/adi,ad3530r.yaml | 15 +- + .../devicetree/bindings/iio/dac/adi,ad5529r.yaml | 254 + + .../devicetree/bindings/iio/dac/adi,ad5710r.yaml | 145 + + .../bindings/iio/dac/microchip,mcp47feb02.yaml | 219 +- + .../bindings/iio/frequency/adi,ad9910.yaml | 209 + + .../bindings/iio/imu/invensense,icm42600.yaml | 24 +- + .../devicetree/bindings/iio/light/adux1020.yaml | 8 +- + .../bindings/iio/light/amstaos,tsl2591.yaml | 2 +- + .../bindings/iio/light/capella,cm32181.yaml | 44 + + .../devicetree/bindings/iio/light/isl29018.yaml | 6 +- + .../bindings/iio/light/liteon,ltr501.yaml | 32 +- + .../devicetree/bindings/iio/light/noa1305.yaml | 4 +- + .../devicetree/bindings/iio/light/stk33xx.yaml | 19 +- + .../devicetree/bindings/iio/light/tsl2583.yaml | 4 +- + .../devicetree/bindings/iio/light/tsl2772.yaml | 14 +- + .../bindings/iio/light/vishay,veml6030.yaml | 21 +- + .../bindings/iio/pressure/infineon,dps310.yaml | 10 +- + .../iio/proximity/pulsedlight,lidar-lite-v2.yaml | 71 + + .../bindings/iio/proximity/vishay,vcnl3020.yaml | 6 +- + .../bindings/iio/temperature/adi,ltc2983.yaml | 1 + + .../bindings/interconnect/qcom,kuno-rpmh.yaml | 118 + + .../bindings/interconnect/qcom,osm-l3.yaml | 1 + + .../devicetree/bindings/mfd/mediatek,mt6397.yaml | 21 + + .../devicetree/bindings/misc/pci1179,0220.yaml | 146 + + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 1 + + .../bindings/nvmem/socionext,uniphier-efuse.yaml | 6 +- + .../bindings/spi/spi-peripheral-props.yaml | 7 + + .../devicetree/bindings/trivial-devices.yaml | 6 +- + Documentation/iio/ad7768.rst | 275 + + Documentation/iio/ad9910.rst | 792 +++ + Documentation/iio/ade9000.rst | 26 +- + Documentation/iio/adis16475.rst | 2 +- + Documentation/iio/adis16480.rst | 2 +- + Documentation/iio/adis16550.rst | 2 +- + Documentation/iio/adxl313.rst | 2 +- + Documentation/iio/adxl345.rst | 2 +- + Documentation/iio/adxl380.rst | 10 +- + Documentation/iio/index.rst | 2 + + MAINTAINERS | 87 +- + drivers/android/Kconfig | 41 +- + drivers/android/Makefile | 3 - + drivers/android/binder.c | 7187 -------------------- + drivers/android/binder/Makefile | 4 +- + drivers/android/binder/allocation.rs | 17 +- + drivers/android/binder/context.rs | 8 +- + drivers/android/binder/defs.rs | 3 +- + drivers/android/binder/error.rs | 39 + + drivers/android/binder/freeze.rs | 17 +- + drivers/android/binder/node.rs | 10 +- + drivers/android/binder/node/wrapper.rs | 8 +- + drivers/android/binder/page_range.rs | 6 +- + drivers/android/binder/process.rs | 43 +- + drivers/android/binder/range_alloc/array.rs | 2 +- + drivers/android/binder/range_alloc/mod.rs | 2 +- + drivers/android/binder/range_alloc/tree.rs | 2 +- + drivers/android/binder/rust_binder_events.h | 42 + + drivers/android/binder/rust_binder_internal.h | 1 + + drivers/android/binder/rust_binder_main.rs | 45 +- + drivers/android/binder/rust_binderfs.c | 21 +- + drivers/android/binder/thread.rs | 74 +- + drivers/android/binder/trace.rs | 37 + + drivers/android/binder/transaction.rs | 202 +- + drivers/android/binder_alloc.c | 1398 ---- + drivers/android/binder_alloc.h | 189 - + drivers/android/binder_internal.h | 597 -- + drivers/android/binder_netlink.c | 32 - + drivers/android/binder_netlink.h | 21 - + drivers/android/binder_trace.h | 448 -- + drivers/android/binderfs.c | 785 --- + drivers/android/dbitmap.h | 169 - + drivers/android/tests/.kunitconfig | 7 - + drivers/android/tests/Makefile | 6 - + drivers/android/tests/binder_alloc_kunit.c | 572 -- + drivers/bus/mhi/ep/Kconfig | 2 + + drivers/bus/mhi/ep/Makefile | 1 + + drivers/bus/mhi/ep/clients/Kconfig | 16 + + drivers/bus/mhi/ep/clients/Makefile | 2 + + drivers/bus/mhi/ep/clients/loopback.c | 126 + + drivers/bus/mhi/ep/main.c | 32 +- + drivers/bus/mhi/host/Kconfig | 1 + + drivers/bus/mhi/host/Makefile | 1 + + drivers/bus/mhi/host/clients/Kconfig | 17 + + drivers/bus/mhi/host/clients/Makefile | 2 + + drivers/bus/mhi/host/clients/loopback.c | 312 + + drivers/bus/mhi/host/debugfs.c | 4 +- + drivers/bus/mhi/host/pci_generic.c | 22 +- + drivers/char/xilinx_hwicap/xilinx_hwicap.c | 18 +- + drivers/char/xillybus/xillyusb.c | 25 +- + drivers/firmware/stratix10-svc.c | 598 +- + drivers/fpga/altera-cvp.c | 43 +- + drivers/fpga/dfl.h | 1 - + drivers/fpga/fpga-mgr.c | 2 +- + drivers/fpga/stratix10-soc.c | 2 +- + drivers/fpga/xilinx-selectmap.c | 39 +- + drivers/greybus/greybus_trace.h | 2 +- + drivers/hwtracing/coresight/coresight-config.c | 18 +- + drivers/hwtracing/coresight/coresight-config.h | 22 + + drivers/hwtracing/coresight/coresight-core.c | 1 + + drivers/hwtracing/coresight/coresight-etm.h | 48 +- + drivers/hwtracing/coresight/coresight-etm3x-core.c | 196 +- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 461 +- + drivers/hwtracing/coresight/coresight-etm4x-cfg.c | 14 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 561 +- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 961 +-- + drivers/hwtracing/coresight/coresight-etm4x.h | 199 +- + drivers/hwtracing/coresight/coresight-sysfs.c | 15 +- + drivers/hwtracing/coresight/coresight-tnoc.c | 2 +- + drivers/hwtracing/coresight/coresight-trbe.c | 7 + + drivers/iio/accel/Kconfig | 7 +- + drivers/iio/accel/adis16201.c | 133 +- + drivers/iio/accel/adxl313_spi.c | 2 + + drivers/iio/accel/adxl367.c | 59 +- + drivers/iio/accel/adxl372_spi.c | 2 + + drivers/iio/accel/adxl380.c | 7 + + drivers/iio/accel/adxl380_spi.c | 2 + + drivers/iio/accel/bma220_spi.c | 3 +- + drivers/iio/accel/bma400_core.c | 2 - + drivers/iio/accel/kionix-kx022a.c | 22 +- + drivers/iio/accel/kionix-kx022a.h | 2 +- + drivers/iio/accel/kxcjk-1013.c | 1 + + drivers/iio/accel/mma8452.c | 145 +- + drivers/iio/accel/mma9551.c | 1 + + drivers/iio/accel/mma9553.c | 1 + + drivers/iio/accel/sca3000.c | 2 + + drivers/iio/adc/Kconfig | 86 +- + drivers/iio/adc/Makefile | 4 + + drivers/iio/adc/ad4080.c | 34 +- + drivers/iio/adc/ad4134.c | 1 - + drivers/iio/adc/ad7173.c | 3 +- + drivers/iio/adc/ad7192.c | 3 + + drivers/iio/adc/ad7606_spi.c | 6 +- + drivers/iio/adc/ad7768-1.c | 3 + + drivers/iio/adc/ad7768.c | 1921 ++++++ + drivers/iio/adc/ade9000.c | 180 +- + drivers/iio/adc/adi-axi-adc.c | 21 + + drivers/iio/adc/at91-sama5d2_adc.c | 10 +- + drivers/iio/adc/axiado_saradc.c | 277 + + drivers/iio/adc/bcm_iproc_adc.c | 101 +- + drivers/iio/adc/ltc2497-core.c | 297 +- + drivers/iio/adc/ltc2497.c | 42 + + drivers/iio/adc/ltc2497.h | 31 +- + drivers/iio/adc/max11205.c | 2 + + drivers/iio/adc/max14001.c | 1 + + drivers/iio/adc/max40080.c | 574 ++ + drivers/iio/adc/mcp3911.c | 2 + + drivers/iio/adc/meson_saradc.c | 2 +- + drivers/iio/adc/nxp-sar-adc.c | 2 +- + drivers/iio/adc/pac1934.c | 9 +- + drivers/iio/adc/rockchip_saradc.c | 16 + + drivers/iio/adc/rzg2l_adc.c | 29 +- + drivers/iio/adc/rzt2h_adc.c | 499 +- + drivers/iio/adc/sophgo-cv1800b-adc.c | 2 + + drivers/iio/adc/stm32-adc.c | 14 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 4 +- + drivers/iio/adc/ti-adc128s052.c | 8 +- + drivers/iio/adc/ti-ads1015.c | 30 + + drivers/iio/adc/ti-ads1018.c | 6 +- + drivers/iio/adc/ti-ads1100.c | 188 +- + drivers/iio/adc/ti-ads112c04.c | 524 ++ + drivers/iio/adc/ti-ads112c14.c | 1274 +++- + drivers/iio/adc/ti-ads131m02.c | 2 + + drivers/iio/adc/ti-ads7950.c | 4 +- + drivers/iio/adc/ti_am335x_adc.c | 4 +- + drivers/iio/amplifiers/ad8366.c | 2 + + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 8 +- + drivers/iio/chemical/ens160_core.c | 7 +- + drivers/iio/chemical/sps30.c | 11 +- + .../iio/common/cros_ec_sensors/cros_ec_sensors.c | 2 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 5 +- + drivers/iio/dac/Kconfig | 50 +- + drivers/iio/dac/Makefile | 5 +- + drivers/iio/dac/ad3530r.c | 321 +- + drivers/iio/dac/ad3552r.c | 2 +- + drivers/iio/dac/ad5529r.c | 546 ++ + drivers/iio/dac/ad5755.c | 3 + + drivers/iio/dac/ad5758.c | 8 +- + drivers/iio/dac/ad8460.c | 2 +- + .../iio/dac/{mcp47feb02.c => mcp47feb02-core.c} | 393 +- + drivers/iio/dac/mcp47feb02-i2c.c | 145 + + drivers/iio/dac/mcp47feb02-spi.c | 145 + + drivers/iio/dac/mcp47feb02.h | 41 + + drivers/iio/dac/mcp4821.c | 7 +- + drivers/iio/dummy/iio_simple_dummy.c | 2 +- + drivers/iio/frequency/Kconfig | 21 + + drivers/iio/frequency/Makefile | 1 + + drivers/iio/frequency/ad9910.c | 2347 +++++++ + drivers/iio/frequency/adf4350.c | 2 +- + drivers/iio/frequency/adf4377.c | 3 + + drivers/iio/gyro/adxrs290.c | 4 +- + drivers/iio/gyro/bmg160_core.c | 4 +- + drivers/iio/gyro/itg3200_buffer.c | 3 +- + drivers/iio/humidity/Kconfig | 8 +- + drivers/iio/humidity/am2315.c | 34 +- + drivers/iio/humidity/ens210.c | 4 +- + drivers/iio/humidity/hts221_core.c | 168 +- + drivers/iio/humidity/hts221_i2c.c | 11 +- + drivers/iio/humidity/hts221_spi.c | 11 +- + drivers/iio/iio_core.h | 7 + + drivers/iio/imu/adis16400.c | 8 +- + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 5 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_accel.c | 33 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_buffer.c | 114 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 26 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_gyro.c | 24 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 16 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 16 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 6 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 4 +- + drivers/iio/industrialio-backend.c | 33 + + drivers/iio/industrialio-core.c | 255 +- + drivers/iio/industrialio-gts-helper.c | 2 +- + drivers/iio/light/Kconfig | 14 + + drivers/iio/light/Makefile | 1 + + drivers/iio/light/apds9306.c | 2 +- + drivers/iio/light/apds9999.c | 12 +- + drivers/iio/light/cros_ec_light_prox.c | 2 +- + drivers/iio/light/iqs621-als.c | 24 +- + drivers/iio/light/isl29018.c | 7 +- + drivers/iio/light/isl29028.c | 33 +- + drivers/iio/light/lm3533-als.c | 11 +- + drivers/iio/light/ltr390.c | 6 - + drivers/iio/light/ltr501.c | 113 +- + drivers/iio/light/stk3310.c | 203 +- + drivers/iio/light/tsl2583.c | 15 +- + drivers/iio/light/tsl2772.c | 16 +- + drivers/iio/light/vcnl4000.c | 3 +- + drivers/iio/light/veml3328.c | 53 +- + drivers/iio/light/veml6031x00.c | 1387 ++++ + drivers/iio/magnetometer/ak8975.c | 234 +- + drivers/iio/position/iqs624-pos.c | 24 +- + drivers/iio/potentiometer/x9250.c | 7 +- + drivers/iio/pressure/Kconfig | 2 + + drivers/iio/pressure/Makefile | 2 + + drivers/iio/pressure/bmp280-spi.c | 2 + + drivers/iio/pressure/cros_ec_baro.c | 2 +- + drivers/iio/pressure/dps310.c | 313 +- + drivers/iio/pressure/rohm-bm1390.c | 6 +- + drivers/iio/proximity/aw96103.c | 2 +- + drivers/iio/temperature/iqs620at-temp.c | 9 +- + drivers/iio/temperature/ltc2983.c | 19 +- + drivers/iio/temperature/mlx90632.c | 10 +- + drivers/iio/temperature/mlx90635.c | 11 +- + drivers/iio/temperature/tmp117.c | 18 +- + drivers/iio/temperature/tsys01.c | 17 +- + drivers/iio/temperature/tsys02d.c | 12 +- + drivers/iio/test/Kconfig | 13 + + drivers/iio/test/Makefile | 1 + + drivers/iio/test/iio-test-channel-prefix.c | 307 + + drivers/iio/test/iio-test-rescale.c | 4 +- + drivers/interconnect/core.c | 32 + + drivers/interconnect/mediatek/Makefile | 2 +- + drivers/interconnect/qcom/Kconfig | 57 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/bcm-voter.c | 59 +- + drivers/interconnect/qcom/bcm-voter.h | 1 + + drivers/interconnect/qcom/eliza.c | 18 +- + drivers/interconnect/qcom/icc-common.h | 9 + + drivers/interconnect/qcom/icc-rpm.c | 105 +- + drivers/interconnect/qcom/icc-rpm.h | 6 +- + drivers/interconnect/qcom/icc-rpmh.c | 71 +- + drivers/interconnect/qcom/kuno.c | 988 +++ + drivers/interconnect/qcom/milos.c | 66 +- + drivers/interconnect/qcom/msm8976.c | 3 +- + drivers/interconnect/qcom/msm8996.c | 1 + + drivers/interconnect/qcom/sm6350.c | 56 +- + drivers/interconnect/qcom/sm8650.c | 70 +- + drivers/interconnect/qcom/smd-rpm.c | 8 +- + drivers/interconnect/samsung/exynos.c | 1 + + drivers/misc/Kconfig | 13 + + drivers/misc/Makefile | 1 + + drivers/misc/ad525x_dpot.c | 9 +- + drivers/misc/cardreader/alcor_pci.c | 6 +- + drivers/misc/cb710/core.c | 8 +- + drivers/misc/enclosure.c | 3 +- + drivers/misc/fastrpc.c | 200 +- + drivers/misc/genwqe/card_ddcb.c | 3 + + drivers/misc/ibmvmc.c | 7 +- + drivers/misc/isl29003.c | 10 +- + drivers/misc/lis3lv02d/lis3lv02d_spi.c | 6 +- + drivers/misc/mei/gsc-me.c | 2 +- + drivers/misc/mei/hw-me.c | 99 +- + drivers/misc/mei/init.c | 33 +- + drivers/misc/mei/mei_dev.h | 1 + + drivers/misc/mei/pci-csc.c | 141 +- + drivers/misc/mei/vsc-tp.c | 17 +- + drivers/misc/nsm.c | 7 +- + drivers/misc/pch_phub.c | 8 +- + drivers/misc/phantom.c | 8 +- + drivers/misc/tc9564-pci.c | 84 + + drivers/misc/tifm_7xx1.c | 8 +- + drivers/misc/tsl2550.c | 13 +- + drivers/nvmem/Kconfig | 14 +- + drivers/nvmem/Makefile | 2 + + drivers/nvmem/core.c | 128 +- + drivers/nvmem/internals.h | 5 +- + drivers/nvmem/layouts.c | 13 +- + drivers/nvmem/layouts/onie-tlv.c | 1 + + drivers/nvmem/layouts/sl28vpd.c | 1 + + drivers/nvmem/mt6323-efuse.c | 83 + + drivers/nvmem/rockchip-otp.c | 15 +- + drivers/pci/quirks.c | 1 + + drivers/peci/controller/peci-aspeed.c | 8 +- + drivers/peci/controller/peci-npcm.c | 6 +- + drivers/platform/goldfish/goldfish_pipe.c | 22 +- + drivers/pps/generators/pps_gen.c | 111 +- + drivers/slimbus/messaging.c | 2 +- + drivers/slimbus/qcom-ngd-ctrl.c | 82 +- + drivers/slimbus/slimbus.h | 14 +- + .../iio/Documentation/sysfs-bus-iio-adc-ad7280a | 2 +- + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/accel/Kconfig | 19 - + drivers/staging/iio/accel/Makefile | 6 - + drivers/staging/iio/accel/adis16203.c | 315 - + drivers/staging/iio/adc/ad7816.c | 33 +- + drivers/staging/iio/frequency/ad9832.c | 6 + + drivers/staging/iio/frequency/ad9834.c | 6 + + include/dt-bindings/interconnect/qcom,kuno.h | 89 + + include/linux/coresight.h | 4 + + include/linux/firmware/intel/stratix10-smc.h | 44 + + include/linux/iio/adc/qcom-adc5-gen3-common.h | 2 +- + include/linux/iio/backend.h | 6 + + include/linux/iio/iio-gts-helper.h | 11 +- + include/linux/iio/iio-opaque.h | 2 +- + include/linux/iio/iio.h | 25 +- + include/linux/mhi.h | 2 +- + include/linux/mhi_ep.h | 16 + + include/linux/notifier.h | 7 + + include/linux/pps_gen_kernel.h | 4 +- + include/linux/slimbus.h | 2 +- + include/uapi/linux/android/binder.h | 1 + + include/uapi/linux/iio/types.h | 1 + + kernel/notifier.c | 105 + + tools/iio/iio_event_monitor.c | 2 + + .../selftests/filesystems/binderfs/binderfs_test.c | 2 +- + .../testing/selftests/filesystems/binderfs/config | 3 +- + 366 files changed, 21782 insertions(+), 15577 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-iio-ad9910 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-frequency-ad9910 + create mode 100644 Documentation/ABI/testing/sysfs-bus-mhi-devices-loopback + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad7768.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,max40080.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/axiado,ax3000-saradc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads112c04.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5529r.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/adi,ad5710r.yaml + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,ad9910.yaml + create mode 100644 Documentation/devicetree/bindings/iio/light/capella,cm32181.yaml + create mode 100644 Documentation/devicetree/bindings/iio/proximity/pulsedlight,lidar-lite-v2.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,kuno-rpmh.yaml + create mode 100644 Documentation/devicetree/bindings/misc/pci1179,0220.yaml + create mode 100644 Documentation/iio/ad7768.rst + create mode 100644 Documentation/iio/ad9910.rst + delete mode 100644 drivers/android/binder.c + delete mode 100644 drivers/android/binder_alloc.c + delete mode 100644 drivers/android/binder_alloc.h + delete mode 100644 drivers/android/binder_internal.h + delete mode 100644 drivers/android/binder_netlink.c + delete mode 100644 drivers/android/binder_netlink.h + delete mode 100644 drivers/android/binder_trace.h + delete mode 100644 drivers/android/binderfs.c + delete mode 100644 drivers/android/dbitmap.h + delete mode 100644 drivers/android/tests/.kunitconfig + delete mode 100644 drivers/android/tests/Makefile + delete mode 100644 drivers/android/tests/binder_alloc_kunit.c + create mode 100644 drivers/bus/mhi/ep/clients/Kconfig + create mode 100644 drivers/bus/mhi/ep/clients/Makefile + create mode 100644 drivers/bus/mhi/ep/clients/loopback.c + create mode 100644 drivers/bus/mhi/host/clients/Kconfig + create mode 100644 drivers/bus/mhi/host/clients/Makefile + create mode 100644 drivers/bus/mhi/host/clients/loopback.c + create mode 100644 drivers/iio/adc/ad7768.c + create mode 100644 drivers/iio/adc/axiado_saradc.c + create mode 100644 drivers/iio/adc/max40080.c + create mode 100644 drivers/iio/adc/ti-ads112c04.c + create mode 100644 drivers/iio/dac/ad5529r.c + rename drivers/iio/dac/{mcp47feb02.c => mcp47feb02-core.c} (69%) + create mode 100644 drivers/iio/dac/mcp47feb02-i2c.c + create mode 100644 drivers/iio/dac/mcp47feb02-spi.c + create mode 100644 drivers/iio/dac/mcp47feb02.h + create mode 100644 drivers/iio/frequency/ad9910.c + create mode 100644 drivers/iio/light/veml6031x00.c + create mode 100644 drivers/iio/test/iio-test-channel-prefix.c + create mode 100644 drivers/interconnect/qcom/kuno.c + create mode 100644 drivers/misc/tc9564-pci.c + create mode 100644 drivers/nvmem/mt6323-efuse.c + delete mode 100644 drivers/staging/iio/accel/Kconfig + delete mode 100644 drivers/staging/iio/accel/Makefile + delete mode 100644 drivers/staging/iio/accel/adis16203.c + create mode 100644 include/dt-bindings/interconnect/qcom,kuno.h +Merging coresight/next (343cfcbb3ecfd coresight: tnoc: Constify amba_id table) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fastrpc/for-next (ef071c4906eb4 Merge branches 'fastrpc-fixes' and 'fastrpc-for-7.4' into fastrpc-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Auto-merging drivers/misc/fastrpc.c +Merge made by the 'ort' strategy. +Merging fpga/for-next (093da48782df3 fpga: altera-cvp: Retry teardown and reset CVP state on failure) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (3fd56a2833c22 Merge branch 'icc-misc' into icc-next) +$ git merge -m Merge branch 'icc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (a3b3580713f3a iio: dac: ad5758: Fix the offset calculation) +$ git merge -m Merge branch 'togreg' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Already up to date. +Merging nfc/for-next (fd73f4a665989 Linux 7.3-rc3) +$ git merge -m Merge branch 'for-next' of https://codeberg.org/linux-nfc/linux.git nfc/for-next +Already up to date. +Merging phy-next/next (8f56fdf3d8cb9 phy: tegra: Add support for Tegra238 XUSB pad controller) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml +CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/phy/qualcomm/Kconfig +Auto-merging include/linux/phy/phy.h +Resolved 'Documentation/devicetree/bindings/phy/qcom,x1e80100-csi2-phy.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 35097cfcd6962] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/phy/aspeed,ast2700-usb3-phy.yaml | 48 + + .../bindings/phy/mediatek,mt8195-dp-phy.yaml | 77 ++ + .../bindings/phy/mediatek,mt8196-pcie-sphy.yaml | 93 ++ + .../devicetree/bindings/phy/mediatek,tphy.yaml | 1 + + .../devicetree/bindings/phy/mediatek,xsphy.yaml | 5 + + .../bindings/phy/nvidia,tegra194-xusb-padctl.yaml | 39 + + .../bindings/phy/nvidia,tegra264-mphy.yaml | 108 +++ + .../bindings/phy/phy-rockchip-usbdp.yaml | 24 + + .../bindings/phy/qcom,m31-eusb2-phy.yaml | 1 + + .../phy/qcom,nord-qmp-gen5x16-pcie-phy.yaml | 267 ++++++ + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 93 +- + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 4 + + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 61 +- + .../bindings/phy/qcom,snps-eusb2-phy.yaml | 13 +- + .../bindings/phy/rockchip-inno-csi-dphy.yaml | 2 + + .../devicetree/bindings/phy/ti,tcan104x-can.yaml | 10 +- + MAINTAINERS | 10 +- + drivers/phy/Kconfig | 3 +- + drivers/phy/Makefile | 1 + + drivers/phy/apple/atc.c | 93 +- + drivers/phy/aspeed/Kconfig | 15 + + drivers/phy/aspeed/Makefile | 2 + + drivers/phy/aspeed/phy-aspeed-usb3.c | 236 +++++ + drivers/phy/broadcom/phy-brcm-sata.c | 2 +- + drivers/phy/broadcom/phy-brcm-usb.c | 29 +- + drivers/phy/cadence/phy-cadence-sierra.c | 11 +- + drivers/phy/freescale/phy-fsl-samsung-hdmi.c | 61 +- + drivers/phy/hisilicon/phy-hi3670-pcie.c | 4 +- + drivers/phy/mediatek/Kconfig | 12 + + drivers/phy/mediatek/Makefile | 1 + + drivers/phy/mediatek/phy-mtk-dp.c | 826 ++++++++++++++++-- + drivers/phy/mediatek/phy-mtk-pcie-sphy.c | 561 ++++++++++++ + drivers/phy/mediatek/phy-mtk-xsphy.c | 39 +- + drivers/phy/phy-google-usb.c | 449 +++++++++- + drivers/phy/phy-xgene.c | 2 +- + drivers/phy/qualcomm/Kconfig | 1 + + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 506 +++++++++-- + drivers/phy/qualcomm/phy-qcom-qmp-common.h | 32 + + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 24 - + drivers/phy/qualcomm/phy-qcom-qmp-pcie-multiphy.c | 963 +++++++++++++++++++-- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 105 ++- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6_40.h | 55 ++ + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6_40.h | 14 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v8_50.h | 4 +- + .../qualcomm/phy-qcom-qmp-qserdes-com-pcie-v6_40.h | 94 ++ + .../phy-qcom-qmp-qserdes-txrxz-pcie-v6_40.h | 194 +++++ + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 24 - + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 24 - + drivers/phy/qualcomm/phy-qcom-qmp-usbc.c | 24 - + drivers/phy/realtek/phy-rtk-usb2.c | 3 +- + drivers/phy/realtek/phy-rtk-usb3.c | 3 +- + drivers/phy/rockchip/Kconfig | 2 + + drivers/phy/rockchip/phy-rockchip-inno-csidphy.c | 15 + + drivers/phy/rockchip/phy-rockchip-inno-hdmi.c | 2 +- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 2 +- + drivers/phy/rockchip/phy-rockchip-naneng-combphy.c | 19 + + drivers/phy/rockchip/phy-rockchip-samsung-dcphy.c | 8 +- + drivers/phy/rockchip/phy-rockchip-samsung-hdptx.c | 80 +- + drivers/phy/rockchip/phy-rockchip-usb.c | 2 +- + drivers/phy/rockchip/phy-rockchip-usbdp.c | 443 +++++----- + drivers/phy/samsung/phy-exynos5-usbdrd.c | 78 +- + drivers/phy/socionext/phy-uniphier-usb3hs.c | 3 +- + drivers/phy/spacemit/Kconfig | 3 + + drivers/phy/starfive/phy-jh7110-dphy-tx.c | 16 +- + drivers/phy/tegra/Kconfig | 11 + + drivers/phy/tegra/Makefile | 3 + + drivers/phy/tegra/phy-tegra-mphy.c | 459 ++++++++++ + drivers/phy/tegra/xusb-tegra186.c | 56 +- + drivers/phy/tegra/xusb.c | 20 +- + drivers/phy/tegra/xusb.h | 6 + + include/dt-bindings/phy/nvidia,tegra264-mphy.h | 12 + + include/dt-bindings/phy/phy-qcom-qmp.h | 1 + + include/linux/phy/omap_control_phy.h | 2 +- + include/linux/phy/phy-hdmi.h | 6 + + include/linux/phy/phy-thunderbolt.h | 14 + + include/linux/phy/phy.h | 2 + + 76 files changed, 5663 insertions(+), 875 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/aspeed,ast2700-usb3-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,mt8195-dp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/mediatek,mt8196-pcie-sphy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra264-mphy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,nord-qmp-gen5x16-pcie-phy.yaml + create mode 100644 drivers/phy/aspeed/Kconfig + create mode 100644 drivers/phy/aspeed/Makefile + create mode 100644 drivers/phy/aspeed/phy-aspeed-usb3.c + create mode 100644 drivers/phy/mediatek/phy-mtk-pcie-sphy.c + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v6_40.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6_40.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com-pcie-v6_40.h + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-qserdes-txrxz-pcie-v6_40.h + create mode 100644 drivers/phy/tegra/phy-tegra-mphy.c + create mode 100644 include/dt-bindings/phy/nvidia,tegra264-mphy.h + create mode 100644 include/linux/phy/phy-thunderbolt.h +Merging soundwire/next (2e9eff8847a46 soundwire: intel_auxdevice: add rt766/rt767 codec to wake_capable_list) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging drivers/soundwire/dmi-quirks.c +Merge made by the 'ort' strategy. + .../bindings/soundwire/qcom,soundwire.yaml | 1 + + drivers/soundwire/bus.c | 54 +++++---- + drivers/soundwire/bus_type.c | 16 ++- + drivers/soundwire/dmi-quirks.c | 65 +++++++++++ + drivers/soundwire/intel.h | 6 +- + drivers/soundwire/intel_auxdevice.c | 14 ++- + drivers/soundwire/intel_bus_common.c | 8 +- + drivers/soundwire/qcom.c | 123 +++++++++++++++++---- + drivers/soundwire/slave.c | 28 +++-- + drivers/soundwire/stream.c | 8 +- + include/linux/soundwire/sdw.h | 4 + + include/linux/soundwire/sdw_intel.h | 2 +- + 12 files changed, 255 insertions(+), 74 deletions(-) +Merging extcon/extcon-next (8d3ae59288f1e Linux 7.2) +$ git merge -m Merge branch 'extcon-next' of https://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'gnss-next' of https://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (6a5f427bee12c vfio/pci: Remove the core dependency on driver data) +$ git merge -m Merge branch 'next' of https://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging Documentation/driver-api/index.rst +Auto-merging MAINTAINERS +Auto-merging drivers/vfio/device_cdev.c +Auto-merging drivers/vfio/vfio_main.c +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'ort' strategy. + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/vfio-selftests.rst | 252 +++ + MAINTAINERS | 1 + + drivers/vfio/cdx/main.c | 17 +- + drivers/vfio/device_cdev.c | 12 + + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 15 +- + drivers/vfio/mdev/mdev_core.c | 2 +- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 27 +- + drivers/vfio/pci/ism/main.c | 19 +- + drivers/vfio/pci/mlx5/cmd.c | 2 +- + drivers/vfio/pci/mlx5/main.c | 13 +- + drivers/vfio/pci/nvgrace-gpu/main.c | 19 +- + drivers/vfio/pci/pds/pci_drv.c | 8 +- + drivers/vfio/pci/pds/vfio_dev.c | 5 +- + drivers/vfio/pci/qat/main.c | 12 +- + drivers/vfio/pci/vfio_pci.c | 33 +- + drivers/vfio/pci/vfio_pci_core.c | 37 +- + drivers/vfio/pci/vfio_pci_rdwr.c | 3 - + drivers/vfio/pci/virtio/main.c | 8 +- + drivers/vfio/pci/xe/main.c | 8 +- + drivers/vfio/platform/vfio_platform_common.c | 15 +- + drivers/vfio/vfio_iommu_type1.c | 12 +- + drivers/vfio/vfio_main.c | 7 - + include/linux/mlx5/cq.h | 10 - + include/linux/mlx5/device.h | 231 +-- + include/linux/mlx5/mlx5_ifc.h | 178 ++ + include/linux/mlx5/mlx5_ifc_macros.h | 185 ++ + include/linux/vfio_pci_core.h | 41 +- + tools/arch/arm64/include/asm/barrier.h | 4 + + tools/arch/x86/include/asm/barrier.h | 5 + + tools/include/asm-generic/io.h | 28 + + tools/include/asm/barrier.h | 8 + + tools/include/linux/stddef.h | 10 + + .../selftests/kvm/include/arm64/processor.h | 4 +- + tools/testing/selftests/kvm/irq_test.c | 2 - + tools/testing/selftests/vfio/.gitignore | 1 + + tools/testing/selftests/vfio/lib/drivers/dsa/dsa.c | 1 + + tools/testing/selftests/vfio/lib/drivers/igb/igb.c | 1 + + .../testing/selftests/vfio/lib/drivers/ioat/ioat.c | 1 + + .../testing/selftests/vfio/lib/drivers/mlx5/mlx5.c | 1928 ++++++++++++++++++++ + .../selftests/vfio/lib/drivers/mlx5/mlx5_hw.h | 114 ++ + .../selftests/vfio/lib/drivers/mlx5/mlx5_ifc.h | 1 + + .../vfio/lib/drivers/mlx5/mlx5_ifc_fpga.h | 1 + + .../vfio/lib/drivers/mlx5/mlx5_ifc_macros.h | 1 + + .../vfio/lib/drivers/nv_falcon/nv_falcon.c | 1 + + .../vfio/lib/include/libvfio/vfio_pci_device.h | 11 + + .../vfio/lib/include/libvfio/vfio_pci_driver.h | 6 + + tools/testing/selftests/vfio/lib/iova_allocator.c | 7 +- + tools/testing/selftests/vfio/lib/libvfio.mk | 1 + + tools/testing/selftests/vfio/lib/sysfs.c | 1 + + tools/testing/selftests/vfio/lib/vfio_pci_driver.c | 6 + + tools/testing/selftests/vfio/settings | 5 + + .../testing/selftests/vfio/vfio_pci_driver_test.c | 5 +- + .../selftests/vfio/vfio_pci_sriov_uapi_test.c | 35 + + 54 files changed, 2993 insertions(+), 368 deletions(-) + create mode 100644 Documentation/driver-api/vfio-selftests.rst + create mode 100644 include/linux/mlx5/mlx5_ifc_macros.h + create mode 100644 tools/include/linux/stddef.h + create mode 100644 tools/testing/selftests/vfio/lib/drivers/mlx5/mlx5.c + create mode 100644 tools/testing/selftests/vfio/lib/drivers/mlx5/mlx5_hw.h + create mode 120000 tools/testing/selftests/vfio/lib/drivers/mlx5/mlx5_ifc.h + create mode 120000 tools/testing/selftests/vfio/lib/drivers/mlx5/mlx5_ifc_fpga.h + create mode 120000 tools/testing/selftests/vfio/lib/drivers/mlx5/mlx5_ifc_macros.h + create mode 100644 tools/testing/selftests/vfio/settings +Merging w1/for-next (813a5b9a3c9f6 w1: fix spelling mistakes in comments across the subsystem) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Merge made by the 'ort' strategy. + drivers/w1/masters/ds2482.c | 2 +- + drivers/w1/masters/ds2490.c | 4 ++-- + drivers/w1/masters/omap_hdq.c | 2 +- + drivers/w1/slaves/w1_ds28e17.c | 2 +- + drivers/w1/slaves/w1_therm.c | 2 +- + drivers/w1/w1.c | 2 +- + drivers/w1/w1_family.c | 2 +- + drivers/w1/w1_netlink.h | 2 +- + 8 files changed, 9 insertions(+), 9 deletions(-) +Merging spmi/spmi-next (8cdeaa50eae8d Linux 7.2-rc2) +$ git merge -m Merge branch 'spmi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sboyd/spmi.git spmi/spmi-next +Already up to date. +Merging staging/staging-next (dbc2fa996f446 staging: rtl8723bs: Remove manual ifname allocation) +$ git merge -m Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging CREDITS +Auto-merging MAINTAINERS +Auto-merging drivers/staging/greybus/uart.c +CONFLICT (modify/delete): drivers/staging/rtl8723bs/core/rtw_ap.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/core/rtw_ap.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/core/rtw_cmd.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/core/rtw_cmd.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/core/rtw_efuse.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/core/rtw_efuse.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/core/rtw_ieee80211.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/core/rtw_ieee80211.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/core/rtw_ioctl_set.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/core/rtw_ioctl_set.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/core/rtw_mlme.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/core/rtw_mlme.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/core/rtw_mlme_ext.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/core/rtw_mlme_ext.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/core/rtw_pwrctrl.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/core/rtw_pwrctrl.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/core/rtw_recv.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/core/rtw_recv.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/core/rtw_security.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/core/rtw_security.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/core/rtw_sta_mgt.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/core/rtw_sta_mgt.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/core/rtw_wlan_util.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/core/rtw_wlan_util.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/core/rtw_xmit.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/core/rtw_xmit.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/Hal8723BReg.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/Hal8723BReg.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/HalBtc8723b1Ant.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/HalBtc8723b2Ant.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/HalBtcOutSrc.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/HalPhyRf.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/HalPhyRf.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/HalPwrSeqCmd.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/hal_btcoex.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/hal_btcoex.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/hal_com.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/hal_com.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/hal_com_phycfg.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/hal_com_phycfg.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/hal_intf.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/hal_intf.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/odm.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/odm.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/odm.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/odm.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/odm_DIG.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/odm_DIG.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/odm_DynamicTxPower.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/odm_EdcaTurboCheck.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/odm_HWConfig.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/odm_HWConfig.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/odm_HWConfig.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/odm_HWConfig.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/odm_precomp.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/odm_precomp.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/rtl8723b_cmd.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/rtl8723b_dm.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/rtl8723b_dm.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/rtl8723b_rf6052.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/rtl8723b_rxdesc.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/rtl8723bs_recv.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/rtl8723bs_xmit.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/sdio_halinit.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/sdio_halinit.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/hal/sdio_ops.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/hal/sdio_ops.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/HalPwrSeqCmd.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/HalPwrSeqCmd.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/basic_types.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/basic_types.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/cmd_osdep.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/cmd_osdep.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/drv_types.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/drv_types.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/hal_com.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/hal_com.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/hal_com_h2c.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/hal_com_h2c.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/hal_com_phycfg.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/hal_com_phycfg.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/hal_com_reg.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/hal_com_reg.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/hal_data.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/hal_data.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/hal_intf.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/hal_intf.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/hal_pg.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/hal_pg.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/hal_phy.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/hal_phy.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/ieee80211.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/ieee80211.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/ioctl_cfg80211.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/ioctl_cfg80211.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/osdep_intf.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/osdep_intf.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/osdep_service.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/osdep_service.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/osdep_service_linux.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/osdep_service_linux.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtl8723b_cmd.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtl8723b_cmd.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtl8723b_dm.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtl8723b_dm.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtl8723b_hal.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtl8723b_hal.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtl8723b_spec.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtl8723b_spec.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtl8723b_xmit.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtl8723b_xmit.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtw_ap.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtw_ap.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtw_cmd.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtw_cmd.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtw_eeprom.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtw_eeprom.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtw_efuse.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtw_efuse.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtw_ht.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtw_ht.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtw_io.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtw_io.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtw_ioctl_set.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtw_ioctl_set.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtw_mlme.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtw_mlme.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtw_mlme_ext.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtw_mlme_ext.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtw_pwrctrl.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtw_pwrctrl.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtw_recv.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtw_recv.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtw_security.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtw_security.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/rtw_xmit.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/rtw_xmit.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/sdio_ops.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/sdio_ops.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/sta_info.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/sta_info.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/wlan_bssdef.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/wlan_bssdef.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/include/xmit_osdep.h deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/include/xmit_osdep.h left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/os_dep/os_intfs.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/os_dep/os_intfs.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/os_dep/sdio_intf.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/os_dep/sdio_intf.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/os_dep/sdio_ops_linux.c left in tree. +CONFLICT (modify/delete): drivers/staging/rtl8723bs/os_dep/xmit_linux.c deleted in HEAD and modified in staging/staging-next. Version staging/staging-next of drivers/staging/rtl8723bs/os_dep/xmit_linux.c left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master f95ad3b377e0d] Merge branch 'staging-next' of https://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git +$ git diff -M --stat --summary HEAD^.. + CREDITS | 4 + + MAINTAINERS | 7 - + drivers/staging/axis-fifo/axis-fifo.c | 6 +- + drivers/staging/fbtft/fb_bd663474.c | 4 +- + drivers/staging/greybus/Kconfig | 19 - + drivers/staging/greybus/Makefile | 8 - + drivers/staging/greybus/TODO | 0 + drivers/staging/greybus/arche-apb-ctrl.c | 490 ----------- + drivers/staging/greybus/arche-platform.c | 653 -------------- + drivers/staging/greybus/arche_platform.h | 28 - + drivers/staging/greybus/camera.c | 1367 ------------------------------ + drivers/staging/greybus/gb-camera.h | 127 --- + drivers/staging/greybus/gbphy.c | 2 +- + drivers/staging/greybus/loopback.c | 5 +- + drivers/staging/greybus/uart.c | 32 +- + drivers/staging/most/video/video.c | 1 - + drivers/staging/octeon/ethernet-tx.c | 2 +- + drivers/staging/sm750fb/sm750.c | 22 +- + drivers/staging/sm750fb/sm750_accel.h | 4 +- + drivers/staging/vme_user/vme_tsi148.c | 3 +- + 20 files changed, 52 insertions(+), 2732 deletions(-) + delete mode 100644 drivers/staging/greybus/TODO + delete mode 100644 drivers/staging/greybus/arche-apb-ctrl.c + delete mode 100644 drivers/staging/greybus/arche-platform.c + delete mode 100644 drivers/staging/greybus/arche_platform.h + delete mode 100644 drivers/staging/greybus/camera.c + delete mode 100644 drivers/staging/greybus/gb-camera.h +Merging counter-next/counter-next (edac5cf356994 MAINTAINERS: Mark ftm-quaddec driver as orphaned) +$ git merge -m Merge branch 'counter-next' of https://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging mux/for-next (ac7bde3c53166 mux: Add driver for Renesas RZ/V2H VBENCTL VBUS_SEL mux) +$ 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 | 13 ++++++++ + drivers/mux/Makefile | 2 ++ + drivers/mux/rzv2h-vbenctl.c | 81 +++++++++++++++++++++++++++++++++++++++++++++ + 3 files changed, 96 insertions(+) + create mode 100644 drivers/mux/rzv2h-vbenctl.c +Merging dmaengine/next (42c31fec1ca76 dmaengine: ste_dma40: Preserve the LCPA I/O address space) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +CONFLICT (modify/delete): Documentation/devicetree/bindings/usb/am33xx-usb.txt deleted in HEAD and modified in dmaengine/next. Version dmaengine/next of Documentation/devicetree/bindings/usb/am33xx-usb.txt left in tree. +CONFLICT (modify/delete): Documentation/devicetree/bindings/usb/da8xx-usb.txt deleted in HEAD and modified in dmaengine/next. Version dmaengine/next of Documentation/devicetree/bindings/usb/da8xx-usb.txt left in tree. +Auto-merging MAINTAINERS +Auto-merging drivers/dma/dmaengine.c +Auto-merging drivers/dma/mmp_pdma.c +Auto-merging drivers/dma/pxa_dma.c +Auto-merging drivers/dma/sprd-dma.c +Auto-merging drivers/dma/sun6i-dma.c +Auto-merging drivers/dma/switchtec_dma.c +Auto-merging drivers/dma/xilinx/xilinx_dma.c +Auto-merging drivers/pci/controller/dwc/pcie-designware.c +Auto-merging include/linux/dmaengine.h +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f Documentation/devicetree/bindings/usb/am33xx-usb.txt +rm 'Documentation/devicetree/bindings/usb/am33xx-usb.txt' +$ git commit --no-edit -v -a +[master 10e36c8a607b9] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/dma/allwinner,sun50i-a64-dma.yaml | 2 + + .../devicetree/bindings/dma/amlogic,a9-dma.yaml | 68 ++ + .../devicetree/bindings/dma/apple,admac.yaml | 10 +- + .../bindings/dma/hisilicon,k3-dma-1.0.yaml | 87 +++ + Documentation/devicetree/bindings/dma/k3dma.txt | 47 -- + .../devicetree/bindings/dma/mediatek,uart-dma.yaml | 1 + + .../devicetree/bindings/dma/qcom,gpi.yaml | 2 + + .../devicetree/bindings/dma/renesas,rcar-dmac.yaml | 6 + + .../devicetree/bindings/dma/snps,dw-axi-dmac.yaml | 22 + + .../devicetree/bindings/dma/stericsson,dma40.yaml | 14 + + .../bindings/dma/ti,dra7-dma-crossbar.yaml | 94 +++ + .../devicetree/bindings/dma/ti-dma-crossbar.txt | 68 -- + Documentation/driver-api/dmaengine/provider.rst | 15 +- + MAINTAINERS | 9 +- + drivers/dma/Kconfig | 10 + + drivers/dma/Makefile | 1 + + drivers/dma/altera-msgdma.c | 10 +- + drivers/dma/amba-pl08x.c | 4 +- + drivers/dma/amlogic-dma.c | 737 +++++++++++++++++++++ + drivers/dma/apple-admac.c | 24 + + drivers/dma/arm-dma350.c | 2 +- + drivers/dma/at_hdmac.c | 139 ++-- + drivers/dma/at_xdmac.c | 159 +++-- + drivers/dma/bestcomm/Kconfig | 2 +- + drivers/dma/bestcomm/ata.c | 2 - + drivers/dma/bestcomm/bestcomm.c | 46 +- + drivers/dma/bestcomm/gen_bd.c | 23 +- + drivers/dma/dma-jz4780.c | 10 +- + drivers/dma/dmaengine.c | 47 +- + drivers/dma/dmaengine.h | 32 + + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 151 ++--- + drivers/dma/dw-axi-dmac/dw-axi-dmac.h | 57 +- + drivers/dma/dw-edma/dw-edma-core.c | 512 +++++++++----- + drivers/dma/dw-edma/dw-edma-core.h | 67 +- + drivers/dma/dw-edma/dw-edma-pcie.c | 18 + + drivers/dma/dw-edma/dw-edma-v0-core.c | 59 +- + drivers/dma/dw-edma/dw-hdma-v0-core.c | 82 ++- + drivers/dma/dw-edma/dw-hdma-v0-debugfs.c | 17 +- + drivers/dma/dw-edma/dw-hdma-v0-regs.h | 10 - + drivers/dma/dw/core.c | 47 +- + drivers/dma/dw/dw.c | 1 + + drivers/dma/dw/platform.c | 12 +- + drivers/dma/ep93xx_dma.c | 37 +- + drivers/dma/fsl-edma-common.c | 255 ++++++- + drivers/dma/fsl-edma-common.h | 15 +- + drivers/dma/fsl-edma-main.c | 7 +- + drivers/dma/fsl-edma-trace.h | 5 + + drivers/dma/fsl_raid.c | 38 +- + drivers/dma/fsldma.c | 22 +- + drivers/dma/idma64.c | 10 +- + drivers/dma/img-mdc-dma.c | 2 +- + drivers/dma/ioat/init.c | 18 +- + drivers/dma/ioat/sysfs.c | 22 +- + drivers/dma/loongson/loongson1-apb-dma.c | 23 +- + drivers/dma/loongson/loongson2-apb-cmc-dma.c | 27 +- + drivers/dma/loongson/loongson2-apb-dma.c | 9 +- + drivers/dma/mediatek/mtk-hsdma.c | 26 +- + drivers/dma/mmp_pdma.c | 3 +- + drivers/dma/moxart-dma.c | 23 +- + drivers/dma/mv_xor.c | 8 +- + drivers/dma/nbpfaxi.c | 2 +- + drivers/dma/owl-dma.c | 21 +- + drivers/dma/pch_dma.c | 41 +- + drivers/dma/pl330.c | 4 +- + drivers/dma/plx_dma.c | 10 +- + drivers/dma/ppc4xx/adma.c | 12 +- + drivers/dma/ppc4xx/xor.h | 2 +- + drivers/dma/pxa_dma.c | 52 +- + drivers/dma/qcom/bam_dma.c | 10 +- + drivers/dma/qcom/gpi.c | 9 +- + drivers/dma/qcom/hidma.c | 8 +- + drivers/dma/sh/rcar-dmac.c | 26 +- + drivers/dma/sh/rz-dmac.c | 6 +- + drivers/dma/sprd-dma.c | 45 +- + drivers/dma/st_fdma.c | 2 +- + drivers/dma/ste_dma40.c | 607 +++++++++++++---- + drivers/dma/ste_dma40_ll.c | 8 +- + drivers/dma/ste_dma40_ll.h | 4 +- + drivers/dma/stm32/stm32-dma.c | 69 +- + drivers/dma/stm32/stm32-dma3.c | 99 ++- + drivers/dma/stm32/stm32-mdma.c | 96 ++- + drivers/dma/sun4i-dma.c | 17 +- + drivers/dma/sun6i-dma.c | 215 ++++-- + drivers/dma/switchtec_dma.c | 94 ++- + drivers/dma/tegra186-gpc-dma.c | 4 +- + drivers/dma/tegra20-apb-dma.c | 2 +- + drivers/dma/ti/k3-udma.c | 6 +- + drivers/dma/timb_dma.c | 63 +- + drivers/dma/txx9dmac.c | 89 ++- + drivers/dma/virt-dma.h | 16 + + drivers/dma/xgene-dma.c | 4 +- + drivers/dma/xilinx/xilinx_dma.c | 85 ++- + drivers/dma/xilinx/zynqmp_dma.c | 74 ++- + drivers/pci/controller/dwc/pcie-designware.c | 1 + + include/dt-bindings/dma/amlogic,a9-dma.h | 8 + + include/linux/dma/edma.h | 24 +- + include/linux/dma/imx-dma.h | 11 +- + include/linux/dmaengine.h | 402 ++++++++++- + include/linux/fsl/bestcomm/gen_bd.h | 8 - + include/trace/events/tegra_apb_dma.h | 6 +- + 100 files changed, 3958 insertions(+), 1580 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/amlogic,a9-dma.yaml + create mode 100644 Documentation/devicetree/bindings/dma/hisilicon,k3-dma-1.0.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/k3dma.txt + create mode 100644 Documentation/devicetree/bindings/dma/ti,dra7-dma-crossbar.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/ti-dma-crossbar.txt + create mode 100644 drivers/dma/amlogic-dma.c + create mode 100644 include/dt-bindings/dma/amlogic,a9-dma.h +Merging cgroup/for-next (9c012be0980af Merge branch 'for-7.4' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging block/blk-cgroup.c +Auto-merging kernel/cgroup/cgroup-internal.h +Auto-merging kernel/cgroup/cgroup-v1.c +Auto-merging kernel/cgroup/dmem.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 62 +++++-- + block/blk-cgroup.c | 11 +- + include/linux/cgroup-defs.h | 8 + + kernel/cgroup/cgroup-internal.h | 2 +- + kernel/cgroup/cgroup-v1.c | 26 ++- + kernel/cgroup/cgroup.c | 181 +++++++++++++-------- + kernel/cgroup/cpuset-internal.h | 8 +- + kernel/cgroup/cpuset-v1.c | 59 ++++++- + kernel/cgroup/cpuset.c | 145 ++--------------- + kernel/cgroup/debug.c | 18 +- + kernel/cgroup/dmem.c | 4 +- + kernel/cgroup/freezer.c | 5 +- + kernel/cgroup/namespace.c | 2 - + tools/testing/selftests/cgroup/lib/cgroup_util.c | 58 ++++++- + .../selftests/cgroup/lib/include/cgroup_util.h | 3 + + tools/testing/selftests/cgroup/settings | 1 + + tools/testing/selftests/cgroup/test_cpu.c | 5 +- + tools/testing/selftests/cgroup/test_kmem.c | 2 +- + tools/testing/selftests/cgroup/test_memcontrol.c | 81 ++++++--- + tools/testing/selftests/cgroup/with_stress.sh | 2 +- + 20 files changed, 398 insertions(+), 285 deletions(-) + create mode 100644 tools/testing/selftests/cgroup/settings +Merging scsi/for-next (2b1060a8368e0 Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/scsi/xen-scsifront.c +Auto-merging drivers/usb/gadget/function/f_mass_storage.c +Merge made by the 'ort' strategy. + Documentation/scsi/scsi_mid_low_api.rst | 32 +- + MAINTAINERS | 1 - + drivers/ata/libata-eh.c | 17 +- + drivers/ata/libata-sata.c | 20 +- + drivers/ata/libata-scsi.c | 344 ++-- + drivers/ata/libata.h | 5 +- + drivers/cdrom/cdrom.c | 10 +- + drivers/message/fusion/mptfc.c | 8 +- + drivers/s390/scsi/zfcp_erp.c | 30 +- + drivers/s390/scsi/zfcp_ext.h | 2 +- + drivers/s390/scsi/zfcp_fsf.c | 9 +- + drivers/s390/scsi/zfcp_scsi.c | 6 +- + drivers/s390/scsi/zfcp_sysfs.c | 4 +- + drivers/scsi/3w-9xxx.c | 20 +- + drivers/scsi/3w-sas.c | 28 +- + drivers/scsi/3w-xxxx.c | 27 +- + drivers/scsi/53c700.c | 16 +- + drivers/scsi/BusLogic.c | 20 +- + drivers/scsi/a100u2w.c | 4 +- + drivers/scsi/a2091.c | 4 +- + drivers/scsi/a3000.c | 4 +- + drivers/scsi/aacraid/commsup.c | 8 +- + drivers/scsi/advansys.c | 8 +- + drivers/scsi/aha1542.c | 20 +- + drivers/scsi/aha1740.c | 12 +- + drivers/scsi/arm/eesox.c | 8 +- + drivers/scsi/arm/fas216.c | 20 +- + drivers/scsi/atp870u.c | 12 +- + drivers/scsi/bfa/bfa_fcs.c | 88 +- + drivers/scsi/bfa/bfad_bsg.c | 4 +- + drivers/scsi/ch.c | 55 +- + drivers/scsi/constants.c | 61 +- + drivers/scsi/csiostor/csio_attr.c | 4 +- + drivers/scsi/csiostor/csio_scsi.c | 4 +- + drivers/scsi/dc395x.c | 18 +- + drivers/scsi/device_handler/scsi_dh_alua.c | 55 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 28 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 29 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 55 +- + drivers/scsi/esp_scsi.c | 32 +- + drivers/scsi/fcoe/fcoe.c | 4 +- + drivers/scsi/fdomain.c | 16 +- + drivers/scsi/gvp11.c | 4 +- + drivers/scsi/hosts.c | 17 +- + drivers/scsi/hpsa.c | 71 +- + drivers/scsi/hpsa_cmd.h | 23 - + drivers/scsi/hptiop.c | 8 +- + drivers/scsi/ibmvscsi/ibmvfc-core.c | 262 +-- + drivers/scsi/ibmvscsi/ibmvfc-nvme.c | 8 +- + drivers/scsi/ibmvscsi/ibmvscsi.c | 86 +- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 5 +- + drivers/scsi/imm.c | 4 +- + drivers/scsi/initio.c | 8 +- + drivers/scsi/ipr.c | 324 ++-- + drivers/scsi/ips.c | 26 +- + drivers/scsi/leapraid/leapraid_func.h | 7 - + drivers/scsi/leapraid/leapraid_os.c | 15 +- + drivers/scsi/libfc/fc_fcp.c | 8 +- + drivers/scsi/libiscsi.c | 3 +- + drivers/scsi/libsas/sas_scsi_host.c | 10 +- + drivers/scsi/lpfc/lpfc_els.c | 30 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 44 +- + drivers/scsi/lpfc/lpfc_init.c | 16 +- + drivers/scsi/lpfc/lpfc_scsi.c | 26 +- + drivers/scsi/lpfc/lpfc_sli.c | 4 +- + drivers/scsi/mac53c94.c | 8 +- + drivers/scsi/megaraid.c | 8 +- + drivers/scsi/megaraid/mega_common.h | 2 - + drivers/scsi/megaraid/megaraid_mbox.c | 12 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 18 +- + drivers/scsi/mesh.c | 24 +- + drivers/scsi/mpi3mr/mpi/mpi30_cnfg.h | 77 +- + drivers/scsi/mpi3mr/mpi/mpi30_image.h | 7 +- + drivers/scsi/mpi3mr/mpi/mpi30_ioc.h | 15 +- + drivers/scsi/mpi3mr/mpi/mpi30_transport.h | 2 +- + drivers/scsi/mpi3mr/mpi3mr.h | 13 +- + drivers/scsi/mpi3mr/mpi3mr_app.c | 87 +- + drivers/scsi/mpi3mr/mpi3mr_fw.c | 223 ++- + drivers/scsi/mpi3mr/mpi3mr_os.c | 320 ++-- + drivers/scsi/mpi3mr/mpi3mr_transport.c | 106 +- + drivers/scsi/mpt3sas/mpt3sas_scsih.c | 69 +- + drivers/scsi/mvumi.c | 28 +- + drivers/scsi/myrb.c | 67 +- + drivers/scsi/myrs.c | 23 +- + drivers/scsi/nsp32.c | 8 +- + drivers/scsi/pcmcia/sym53c500_cs.c | 8 +- + drivers/scsi/pm8001/pm8001_defs.h | 98 ++ + drivers/scsi/pm8001/pm8001_hwi.c | 2 +- + drivers/scsi/pm8001/pm8001_hwi.h | 4 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 2 +- + drivers/scsi/pm8001/pm80xx_hwi.h | 100 +- + drivers/scsi/pmcraid.c | 84 +- + drivers/scsi/ps3rom.c | 5 +- + drivers/scsi/qla1280.c | 44 +- + drivers/scsi/qla2xxx/qla_attr.c | 4 +- + drivers/scsi/qla2xxx/qla_init.c | 4 +- + drivers/scsi/qla2xxx/qla_isr.c | 9 +- + drivers/scsi/qla2xxx/qla_target.c | 99 +- + drivers/scsi/qla2xxx/qla_target.h | 3 - + drivers/scsi/qlogicfas408.c | 8 +- + drivers/scsi/qlogicpti.c | 20 +- + drivers/scsi/scsi.c | 15 +- + drivers/scsi/scsi_common.c | 24 +- + drivers/scsi/scsi_debug.c | 647 ++++--- + drivers/scsi/scsi_debugfs.c | 2 +- + drivers/scsi/scsi_devinfo.c | 5 +- + drivers/scsi/scsi_error.c | 165 +- + drivers/scsi/scsi_ioctl.c | 3 +- + drivers/scsi/scsi_lib.c | 182 +- + drivers/scsi/scsi_lib_test.c | 95 +- + drivers/scsi/scsi_logging.c | 22 +- + drivers/scsi/scsi_proc.c | 9 +- + drivers/scsi/scsi_scan.c | 38 +- + drivers/scsi/scsi_sysfs.c | 28 +- + drivers/scsi/scsi_transport_fc.c | 136 +- + drivers/scsi/scsi_transport_spi.c | 12 +- + drivers/scsi/sd.c | 126 +- + drivers/scsi/sd_zbc.c | 2 +- + drivers/scsi/sense_codes.h | 2352 +++++++++++++++++--------- + drivers/scsi/ses.c | 23 +- + drivers/scsi/sgiwd93.c | 4 +- + drivers/scsi/smartpqi/smartpqi_init.c | 31 +- + drivers/scsi/snic/snic_disc.c | 16 +- + drivers/scsi/sr.c | 3 +- + drivers/scsi/sr_ioctl.c | 29 +- + drivers/scsi/st.c | 132 +- + drivers/scsi/st.h | 2 + + drivers/scsi/stex.c | 51 +- + drivers/scsi/storvsc_drv.c | 15 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 56 +- + drivers/scsi/sym53c8xx_2/sym_hipd.h | 4 +- + drivers/scsi/wd33c93.c | 4 +- + drivers/scsi/wd719x.c | 24 +- + drivers/scsi/xen-scsifront.c | 40 +- + drivers/scsi/zorro7xx.c | 31 +- + drivers/target/target_core_file.c | 4 +- + drivers/target/target_core_pscsi.c | 16 +- + drivers/target/target_core_spc.c | 11 +- + drivers/target/target_core_transport.c | 11 +- + drivers/target/target_core_ua.c | 28 +- + drivers/target/target_core_ua.h | 7 +- + drivers/target/target_core_user.c | 5 +- + drivers/ufs/Kconfig | 1 + + drivers/ufs/core/ufs-debugfs.c | 4 +- + drivers/ufs/core/ufs-rpmb.c | 30 +- + drivers/ufs/core/ufs-sysfs.c | 12 +- + drivers/ufs/core/ufshcd.c | 250 ++- + drivers/ufs/host/ufs-exynos.c | 4 +- + drivers/ufs/host/ufs-mediatek.c | 20 +- + drivers/ufs/host/ufs-qcom.c | 52 +- + drivers/ufs/host/ufs-qcom.h | 5 +- + drivers/ufs/host/ufs-sprd.c | 4 +- + drivers/ufs/host/ufshcd-pci.c | 3 +- + drivers/usb/gadget/function/f_mass_storage.c | 34 +- + drivers/usb/gadget/function/storage_common.h | 69 +- + drivers/usb/storage/debug.c | 11 +- + drivers/usb/storage/debug.h | 4 +- + drivers/usb/storage/transport.c | 7 +- + drivers/usb/storage/uas.c | 12 +- + drivers/usb/storage/usb.h | 4 +- + include/scsi/scsi_cmnd.h | 3 +- + include/scsi/scsi_common.h | 16 +- + include/scsi/scsi_dbg.h | 6 +- + include/scsi/scsi_device.h | 26 +- + include/scsi/scsi_host.h | 9 +- + include/scsi/scsi_proto.h | 71 +- + include/scsi/scsi_sense.h | 950 +++++++++++ + include/trace/events/scsi.h | 4 +- + include/ufs/ufs.h | 1 + + include/ufs/ufshcd.h | 8 + + 170 files changed, 6247 insertions(+), 3555 deletions(-) + create mode 100644 include/scsi/scsi_sense.h +Merging scsi-mkp/for-next (9621cbd332862 Merge patch series "lpfc: Update lpfc to revision 15.0.0.1") +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/scsi/ufs.rst | 38 ++++ + MAINTAINERS | 2 + + drivers/scsi/Makefile | 1 + + drivers/scsi/lpfc/lpfc_ct.c | 2 - + drivers/scsi/lpfc/lpfc_els.c | 80 ++++--- + drivers/scsi/lpfc/lpfc_hbadisc.c | 7 + + drivers/scsi/lpfc/lpfc_init.c | 16 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 30 ++- + drivers/scsi/lpfc/lpfc_sli.c | 8 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/scsi_debug.c | 448 +++++++++++++++++++++++-------------- + drivers/ufs/host/ufs-qcom.c | 4 +- + 12 files changed, 436 insertions(+), 202 deletions(-) +$ git am -3 ../patches/device-id-zorro +Applying: foofof +Using index info to reconstruct a base tree... +M include/linux/device-id/zorro.h +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +$ git am -3 ../patches/0001-libata-Fix-up-semantic-conflict-in-ata_scsi_set_sens.patch +Applying: libata: Fix up semantic conflict in ata_scsi_set_sense() +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/ata/libata-scsi.c +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master dd15238c711f8] Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git + Date: Wed Oct 14 15:04:39 2026 +0100 +Merging vhost/linux-next (c69023b5e16e5 tools/virtio: add missing device-id/virtio.h wrapper header) +$ git merge -m Merge branch 'linux-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging arch/um/drivers/virtio_uml.c +Auto-merging drivers/platform/mellanox/mlxbf-tmfifo.c +Merge made by the 'ort' strategy. + arch/um/drivers/virtio_uml.c | 10 ++++ + drivers/platform/mellanox/mlxbf-tmfifo.c | 15 ++++++ + drivers/remoteproc/remoteproc_core.c | 12 +++++ + drivers/remoteproc/remoteproc_virtio.c | 39 +++++++++++--- + drivers/s390/virtio/virtio_ccw.c | 6 +-- + drivers/vhost/net.c | 4 +- + drivers/vhost/scsi.c | 2 +- + drivers/vhost/test.c | 4 +- + drivers/vhost/vdpa.c | 4 +- + drivers/vhost/vhost.c | 26 ++++++++-- + drivers/vhost/vhost.h | 5 +- + drivers/vhost/vsock.c | 89 +++++++++++++++++++++++++------- + drivers/virtio/virtio.c | 2 + + drivers/virtio/virtio_pci_legacy.c | 2 - + drivers/virtio/virtio_pci_modern.c | 15 +++--- + drivers/virtio/virtio_vdpa.c | 34 ++++++++++-- + include/linux/remoteproc.h | 3 ++ + tools/virtio/linux/device-id/virtio.h | 2 + + 18 files changed, 215 insertions(+), 59 deletions(-) + create mode 100644 tools/virtio/linux/device-id/virtio.h +Merging rpmsg/for-next (a101347c14c48 Merge branches 'rpmsg-next', 'rproc-fixes' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/qcom/sdx75.dtsi +Auto-merging drivers/remoteproc/remoteproc_core.c +Auto-merging drivers/remoteproc/remoteproc_virtio.c +Auto-merging drivers/soc/qcom/Kconfig +Auto-merging include/linux/remoteproc.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/remoteproc/mtk,scp.yaml | 22 +- + .../bindings/remoteproc/qcom,pas-common.yaml | 9 + + .../bindings/remoteproc/qcom,sm8550-pas.yaml | 31 +- + .../bindings/remoteproc/ti,am3352-wkup-m3.yaml | 1 - + Documentation/staging/rpmsg.rst | 17 + + MAINTAINERS | 8 + + arch/arm64/boot/dts/qcom/sdx75.dtsi | 3 +- + drivers/remoteproc/Kconfig | 11 +- + drivers/remoteproc/imx_dsp_rproc.c | 7 +- + drivers/remoteproc/imx_rproc.c | 51 +- + drivers/remoteproc/omap_remoteproc.c | 12 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 2 +- + drivers/remoteproc/qcom_q6v5_pas.c | 166 +++++- + drivers/remoteproc/remoteproc_core.c | 67 +-- + drivers/remoteproc/remoteproc_debugfs.c | 6 +- + drivers/remoteproc/remoteproc_elf_loader.c | 23 +- + drivers/remoteproc/remoteproc_sysfs.c | 7 +- + drivers/remoteproc/remoteproc_virtio.c | 61 +-- + drivers/remoteproc/stm32_rproc.c | 2 +- + drivers/remoteproc/ti_k3_common.c | 10 +- + drivers/remoteproc/ti_k3_common.h | 4 + + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 7 +- + drivers/remoteproc/ti_k3_m4_remoteproc.c | 4 +- + drivers/remoteproc/ti_k3_r5_remoteproc.c | 9 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 23 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 156 ++++-- + drivers/soc/qcom/Kconfig | 12 + + drivers/soc/qcom/Makefile | 1 + + drivers/soc/qcom/qmi_tmd.c | 595 +++++++++++++++++++++ + include/dt-bindings/thermal/qcom,pas.h | 20 + + include/linux/omap-mailbox.h | 5 +- + include/linux/remoteproc.h | 4 +- + include/linux/rpmsg/virtio_rpmsg.h | 41 ++ + include/linux/soc/qcom/qmi.h | 1 + + include/linux/soc/qcom/qmi_tmd.h | 36 ++ + include/uapi/linux/rpmsg.h | 15 +- + samples/rpmsg/rpmsg_client_sample.c | 20 +- + 37 files changed, 1220 insertions(+), 249 deletions(-) + create mode 100644 drivers/soc/qcom/qmi_tmd.c + create mode 100644 include/dt-bindings/thermal/qcom,pas.h + create mode 100644 include/linux/rpmsg/virtio_rpmsg.h + create mode 100644 include/linux/soc/qcom/qmi_tmd.h +Merging gpio-brgl/gpio/for-next (39225ea01d82c gpio: legacy: Kill gpio_set_value_cansleep()) +$ git merge -m Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/Makefile +Auto-merging drivers/gpio/gpio-mvebu.c +Auto-merging drivers/gpio/gpiolib-acpi-quirks.c +CONFLICT (content): Merge conflict in drivers/gpio/gpiolib-acpi-quirks.c +Auto-merging drivers/gpio/gpiolib-cdev.c +Auto-merging drivers/gpio/gpiolib.c +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/gpio/gpiolib-acpi-quirks.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 79173044a7bf6] Merge branch 'gpio/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/gpio/axiado,ax3005-sgpio.yaml | 112 ++++ + .../devicetree/bindings/gpio/fsl,qoriq-gpio.yaml | 7 + + .../devicetree/bindings/gpio/gpio-pca95xx.yaml | 3 + + .../devicetree/bindings/gpio/gpio-zynq.yaml | 6 + + .../bindings/gpio/nvidia,tegra186-gpio.yaml | 9 + + .../bindings/gpio/realtek,otto-gpio.yaml | 2 + + .../bindings/gpio/renesas,rcar-gpio.yaml | 5 + + Documentation/driver-api/gpio/board.rst | 2 +- + Documentation/driver-api/gpio/driver.rst | 7 + + MAINTAINERS | 9 + + drivers/gpio/Kconfig | 33 + + drivers/gpio/Makefile | 2 + + drivers/gpio/gpio-ad7768.c | 121 ++++ + drivers/gpio/gpio-adp5585.c | 20 +- + drivers/gpio/gpio-altera.c | 5 +- + drivers/gpio/gpio-axiado-sgpio.c | 736 +++++++++++++++++++++ + drivers/gpio/gpio-dln2.c | 6 +- + drivers/gpio/gpio-eic-sprd.c | 17 +- + drivers/gpio/gpio-it87.c | 2 +- + drivers/gpio/gpio-mlxbf2.c | 4 +- + drivers/gpio/gpio-mlxbf3.c | 4 +- + drivers/gpio/gpio-mmio.c | 65 +- + drivers/gpio/gpio-mvebu.c | 19 +- + drivers/gpio/gpio-omap.c | 11 +- + drivers/gpio/gpio-pcf857x.c | 16 +- + drivers/gpio/gpio-pxa.c | 4 +- + drivers/gpio/gpio-rcar.c | 86 ++- + drivers/gpio/gpio-realtek-otto.c | 21 +- + drivers/gpio/gpio-regmap.c | 98 ++- + drivers/gpio/gpio-rtd1625.c | 26 +- + drivers/gpio/gpio-siox.c | 4 +- + drivers/gpio/gpio-sloppy-logic-analyzer.c | 4 +- + drivers/gpio/gpio-tegra186.c | 74 +++ + drivers/gpio/gpiolib-acpi-quirks.c | 13 + + drivers/gpio/gpiolib-cdev.c | 2 + + drivers/gpio/gpiolib-kunit.c | 14 +- + drivers/gpio/gpiolib.c | 21 + + drivers/pinctrl/freescale/pinctrl-imx.c | 54 +- + drivers/pinctrl/freescale/pinctrl-imx.h | 4 + + drivers/pinctrl/freescale/pinctrl-vf610.c | 2 + + include/linux/gpio/driver.h | 9 + + include/linux/gpio/legacy.h | 10 - + include/linux/gpio/regmap.h | 2 + + include/linux/pinctrl/consumer.h | 4 +- + tools/gpio/gpio-hammer.c | 2 +- + 45 files changed, 1535 insertions(+), 142 deletions(-) + create mode 100644 Documentation/devicetree/bindings/gpio/axiado,ax3005-sgpio.yaml + create mode 100644 drivers/gpio/gpio-ad7768.c + create mode 100644 drivers/gpio/gpio-axiado-sgpio.c +Merging gpio-intel/for-next (0fc424b6a8ef4 gpio: wcove: use regmap_assign_bits() for conditional set/clear) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Merge made by the 'ort' strategy. + drivers/gpio/gpio-wcove.c | 5 +---- + 1 file changed, 1 insertion(+), 4 deletions(-) +Merging pinctrl/for-next (6e648fe0b51f9 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging Documentation/devicetree/bindings/pinctrl/apple,pinctrl.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../pinctrl/allwinner,sun55i-a523-pinctrl.yaml | 6 +- + .../bindings/pinctrl/ambarella,cv75-pinctrl.yaml | 237 ++ + .../devicetree/bindings/pinctrl/apple,pinctrl.yaml | 12 + + .../bindings/pinctrl/awinic,aw9523-pinctrl.yaml | 50 +- + .../devicetree/bindings/pinctrl/brcm,nsp-gpio.txt | 80 - + .../devicetree/bindings/pinctrl/brcm,nsp-gpio.yaml | 130 + + .../bindings/pinctrl/cix,sky1-pinctrl.yaml | 2 +- + .../bindings/pinctrl/econet,en7528-pinctrl.yaml | 190 + + .../bindings/pinctrl/fsl,imx35-pinctrl.yaml | 4 +- + .../bindings/pinctrl/fsl,imx7d-pinctrl.yaml | 12 +- + .../bindings/pinctrl/fsl,imx8m-pinctrl.yaml | 4 +- + .../bindings/pinctrl/fsl,imx8ulp-pinctrl.yaml | 4 +- + .../bindings/pinctrl/fsl,imx9-pinctrl.yaml | 4 +- + .../devicetree/bindings/pinctrl/fsl,imxrt1050.yaml | 4 +- + .../devicetree/bindings/pinctrl/fsl,imxrt1170.yaml | 4 +- + .../devicetree/bindings/pinctrl/intel,lgm-io.yaml | 14 +- + .../bindings/pinctrl/mediatek,mt6779-pinctrl.yaml | 194 +- + .../bindings/pinctrl/mediatek,mt6795-pinctrl.yaml | 236 -- + .../bindings/pinctrl/mediatek,mt8183-pinctrl.yaml | 4 +- + .../bindings/pinctrl/mediatek,mt8195-pinctrl.yaml | 2 +- + .../devicetree/bindings/pinctrl/pincfg-node.yaml | 11 + + .../devicetree/bindings/pinctrl/pinctrl-palmas.txt | 105 - + .../pinctrl/qcom,hawi-lpass-lpi-pinctrl.yaml | 109 + + .../bindings/pinctrl/qcom,hawi-tlmm.yaml | 4 +- + .../bindings/pinctrl/qcom,kaanapali-tlmm.yaml | 4 +- + .../bindings/pinctrl/qcom,kuno-tlmm.yaml | 110 + + .../bindings/pinctrl/qcom,maili-tlmm.yaml | 4 +- + .../bindings/pinctrl/qcom,msm8952-pinctrl.yaml | 146 + + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 3 + + .../bindings/pinctrl/qcom,sc8280xp-tlmm.yaml | 3 + + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 4 +- + .../bindings/pinctrl/semtech,sx1501q.yaml | 4 +- + .../pinctrl/starfive,jhb100-per0-pinctrl.yaml | 179 + + .../pinctrl/starfive,jhb100-per1-pinctrl.yaml | 178 + + .../pinctrl/starfive,jhb100-per2-pinctrl.yaml | 168 + + .../pinctrl/starfive,jhb100-per2pok-pinctrl.yaml | 162 + + .../pinctrl/starfive,jhb100-per3-pinctrl.yaml | 166 + + .../pinctrl/starfive,jhb100-sys0-pinctrl.yaml | 164 + + .../pinctrl/starfive,jhb100-sys0h-pinctrl.yaml | 162 + + .../pinctrl/starfive,jhb100-sys1-pinctrl.yaml | 164 + + .../pinctrl/starfive,jhb100-sys2-pinctrl.yaml | 165 + + .../bindings/pinctrl/ti,palmas-pinctrl.yaml | 170 + + .../bindings/pinctrl/xlnx,zynqmp-pinctrl.yaml | 46 +- + MAINTAINERS | 18 + + drivers/pinctrl/Kconfig | 20 + + drivers/pinctrl/Makefile | 2 + + drivers/pinctrl/airoha/Kconfig | 15 +- + drivers/pinctrl/airoha/Makefile | 1 + + drivers/pinctrl/airoha/airoha-common.h | 3 + + drivers/pinctrl/airoha/pinctrl-airoha.c | 33 +- + drivers/pinctrl/airoha/pinctrl-an7563.c | 1 + + drivers/pinctrl/airoha/pinctrl-an7581.c | 1 + + drivers/pinctrl/airoha/pinctrl-an7583.c | 1 + + drivers/pinctrl/airoha/pinctrl-en7523.c | 1 + + drivers/pinctrl/airoha/pinctrl-en7528.c | 1204 ++++++ + drivers/pinctrl/core.c | 4 +- + drivers/pinctrl/freescale/pinctrl-imx.c | 2 +- + drivers/pinctrl/intel/pinctrl-intel.c | 51 +- + drivers/pinctrl/intel/pinctrl-intel.h | 2 +- + drivers/pinctrl/mediatek/Kconfig | 7 + + drivers/pinctrl/mediatek/Makefile | 1 + + drivers/pinctrl/mediatek/pinctrl-mt6735.c | 1120 ++++++ + drivers/pinctrl/mediatek/pinctrl-mt7629.c | 2 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 3 +- + drivers/pinctrl/mediatek/pinctrl-mtk-mt6735.h | 3993 ++++++++++++++++++++ + drivers/pinctrl/microchip/pinctrl-mpfs-mssio.c | 2 +- + drivers/pinctrl/nuvoton/pinctrl-ma35.c | 8 +- + drivers/pinctrl/nxp/pinctrl-s32cc.c | 2 +- + drivers/pinctrl/pinconf-generic.c | 2 + + drivers/pinctrl/pinconf.c | 2 +- + drivers/pinctrl/pinctrl-ambarella-cv75.c | 587 +++ + drivers/pinctrl/pinctrl-ambarella.c | 533 +++ + drivers/pinctrl/pinctrl-ambarella.h | 40 + + drivers/pinctrl/pinctrl-amd.c | 252 +- + drivers/pinctrl/pinctrl-amd.h | 174 + + drivers/pinctrl/pinctrl-apple-gpio.c | 21 +- + drivers/pinctrl/pinctrl-axp209.c | 3 - + drivers/pinctrl/pinctrl-equilibrium.c | 2 +- + drivers/pinctrl/pinctrl-gemini.c | 3 +- + drivers/pinctrl/pinctrl-generic-mux.c | 76 +- + drivers/pinctrl/pinctrl-scmi.c | 232 +- + drivers/pinctrl/pinctrl-st.c | 2 +- + drivers/pinctrl/pinmux.c | 2 +- + drivers/pinctrl/qcom/Kconfig | 10 + + drivers/pinctrl/qcom/Kconfig.msm | 19 + + drivers/pinctrl/qcom/Makefile | 3 + + drivers/pinctrl/qcom/pinctrl-apq8064.c | 188 +- + drivers/pinctrl/qcom/pinctrl-apq8084.c | 502 +-- + drivers/pinctrl/qcom/pinctrl-hawi-lpass-lpi.c | 244 ++ + drivers/pinctrl/qcom/pinctrl-ipq4019.c | 208 +- + drivers/pinctrl/qcom/pinctrl-ipq8064.c | 208 +- + drivers/pinctrl/qcom/pinctrl-kuno.c | 801 ++++ + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 6 +- + drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 17 + + drivers/pinctrl/qcom/pinctrl-msm.h | 25 - + drivers/pinctrl/qcom/pinctrl-msm8952.c | 1257 ++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 1 + + drivers/pinctrl/qcom/tlmm-test.c | 2 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 412 +- + drivers/pinctrl/renesas/pinctrl-rzt2h.c | 182 +- + drivers/pinctrl/sprd/pinctrl-sprd.c | 3 + + drivers/pinctrl/starfive/Kconfig | 105 + + drivers/pinctrl/starfive/Makefile | 11 + + .../starfive/pinctrl-starfive-jhb100-per0.c | 182 + + .../starfive/pinctrl-starfive-jhb100-per1.c | 193 + + .../starfive/pinctrl-starfive-jhb100-per2.c | 136 + + .../starfive/pinctrl-starfive-jhb100-per2pok.c | 99 + + .../starfive/pinctrl-starfive-jhb100-per3.c | 129 + + .../starfive/pinctrl-starfive-jhb100-sys0.c | 121 + + .../starfive/pinctrl-starfive-jhb100-sys0h.c | 99 + + .../starfive/pinctrl-starfive-jhb100-sys1.c | 94 + + .../starfive/pinctrl-starfive-jhb100-sys2.c | 140 + + drivers/pinctrl/starfive/pinctrl-starfive-jhb100.c | 1446 +++++++ + drivers/pinctrl/starfive/pinctrl-starfive-jhb100.h | 153 + + drivers/pinctrl/stm32/Kconfig | 2 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 9 +- + drivers/pinctrl/sunplus/Kconfig | 8 +- + drivers/pinctrl/sunplus/sppctl.c | 45 +- + drivers/pinctrl/sunxi/Kconfig | 5 + + drivers/pinctrl/sunxi/Makefile | 1 + + drivers/pinctrl/sunxi/pinctrl-sun20i-d1.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun55i-a523-r.c | 3 +- + drivers/pinctrl/sunxi/pinctrl-sun55i-a523.c | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun60i-a733.c | 50 + + drivers/pinctrl/sunxi/pinctrl-sunxi-dt.c | 1 + + drivers/pinctrl/sunxi/pinctrl-sunxi.c | 41 +- + drivers/pinctrl/sunxi/pinctrl-sunxi.h | 71 +- + drivers/pinctrl/tegra/pinctrl-tegra-xusb.c | 6 +- + .../dt-bindings/pinctrl/mediatek,mt6735-pinfunc.h | 1148 ++++++ + include/linux/pinctrl/consumer.h | 1 + + include/linux/pinctrl/pinconf-generic.h | 5 + + 131 files changed, 18636 insertions(+), 1612 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/ambarella,cv75-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,nsp-gpio.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/brcm,nsp-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/econet,en7528-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/mediatek,mt6795-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/pinctrl-palmas.txt + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,hawi-lpass-lpi-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,kuno-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,msm8952-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/starfive,jhb100-per0-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/starfive,jhb100-per1-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/starfive,jhb100-per2-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/starfive,jhb100-per2pok-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/starfive,jhb100-per3-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/starfive,jhb100-sys0-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/starfive,jhb100-sys0h-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/starfive,jhb100-sys1-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/starfive,jhb100-sys2-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/ti,palmas-pinctrl.yaml + create mode 100644 drivers/pinctrl/airoha/pinctrl-en7528.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mt6735.c + create mode 100644 drivers/pinctrl/mediatek/pinctrl-mtk-mt6735.h + create mode 100644 drivers/pinctrl/pinctrl-ambarella-cv75.c + create mode 100644 drivers/pinctrl/pinctrl-ambarella.c + create mode 100644 drivers/pinctrl/pinctrl-ambarella.h + create mode 100644 drivers/pinctrl/qcom/pinctrl-hawi-lpass-lpi.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-kuno.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-msm8952.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jhb100-per0.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jhb100-per1.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jhb100-per2.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jhb100-per2pok.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jhb100-per3.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jhb100-sys0.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jhb100-sys0h.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jhb100-sys1.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jhb100-sys2.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jhb100.c + create mode 100644 drivers/pinctrl/starfive/pinctrl-starfive-jhb100.h + create mode 100644 drivers/pinctrl/sunxi/pinctrl-sun60i-a733.c + create mode 100644 include/dt-bindings/pinctrl/mediatek,mt6735-pinfunc.h +Merging pinctrl-intel/for-next (c016587866e57 pinctrl: intel: Try to retrieve driver data for pure platform drivers) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (0cd4a7b3a4883 pinctrl: renesas: rzt2h: Add a helper for reading PFC) +$ git merge -m Merge branch 'renesas-pinctrl' of https://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 (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pinctrl-qcom/pinctrl-qcom/for-next (9bcd1725b0cc7 pinctrl: qcom: lpass-lpi: Discard pm_runtime_put_autosuspend() return values) +$ git merge -m Merge branch 'pinctrl-qcom/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pinctrl-qcom/pinctrl-qcom/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 16 ++++++++++++---- + 1 file changed, 12 insertions(+), 4 deletions(-) +Merging pwm/pwm/for-next (00e917df050d7 dt-bindings: pwm: Add IPQ5210 binding) +$ git merge -m Merge branch 'pwm/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git pwm/pwm/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/pwm-tipwmss.txt | 58 --------------- + .../devicetree/bindings/pwm/qcom,ipq6018-pwm.yaml | 1 + + .../devicetree/bindings/pwm/ti,am33xx-pwmss.yaml | 82 ++++++++++++++++++++++ + Documentation/driver-api/pwm.rst | 2 +- + drivers/pwm/core.c | 1 + + drivers/pwm/pwm-brcmstb.c | 2 +- + drivers/pwm/pwm-ipq.c | 2 +- + drivers/pwm/pwm-iqs620a.c | 23 +----- + drivers/pwm/pwm-loongson.c | 2 + + drivers/pwm/pwm-lp3943.c | 3 + + drivers/pwm/pwm-mtk-disp.c | 4 +- + drivers/pwm/pwm-pca9685.c | 2 +- + drivers/pwm/pwm-renesas-tpu.c | 23 ++++-- + drivers/pwm/pwm-tiehrpwm.c | 3 + + 14 files changed, 119 insertions(+), 89 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/pwm/pwm-tipwmss.txt + create mode 100644 Documentation/devicetree/bindings/pwm/ti,am33xx-pwmss.yaml +Merging ktest/for-next (932cdaf3e273a ktest: Add logfile to failure directory) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (829a017fefe0c tracing/selftests: Fix incorrect invocation of exit_fail) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'ort' strategy. + .../test.d/00basic/ringbuffer_subbuf_size.tc | 6 +- + .../ftrace/test.d/00basic/trace_marker.tc | 4 +- + .../ftrace/test.d/kprobe/kprobe_eventname.tc | 2 +- + tools/testing/selftests/lib.mk | 3 +- + tools/testing/selftests/resctrl/cat_test.c | 23 ++- + tools/testing/selftests/resctrl/mba_test.c | 1 + + tools/testing/selftests/resctrl/mbm_test.c | 1 + + tools/testing/selftests/resctrl/resctrl.h | 2 + + tools/testing/selftests/resctrl/resctrl_val.c | 169 +++++++++++---------- + 9 files changed, 122 insertions(+), 89 deletions(-) +Merging kunit/test (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'test' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (e38f53f048246 kunit: Return void from kunit_run_all_tests()) +$ git merge -m Merge branch 'kunit' of https://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + include/kunit/test.h | 5 ++--- + lib/kunit/executor.c | 5 ++--- + 2 files changed, 4 insertions(+), 6 deletions(-) +Merging livepatching/for-next (f663062d717ea Merge branch 'for-7.4/trivial' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching.git livepatching/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 ++-- + include/linux/livepatch.h | 4 ++++ + kernel/livepatch/core.c | 10 ++++++++++ + tools/testing/selftests/livepatch/functions.sh | 12 +++++++++--- + 4 files changed, 25 insertions(+), 5 deletions(-) +Merging rtc/rtc-next (8a017ab98412c rtc: abx80x: add support for ABX81X) +$ git merge -m Merge branch 'rtc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml +Auto-merging drivers/rtc/rtc-bd70528.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/mediatek,mt6397.yaml | 9 + + .../devicetree/bindings/rtc/abracon,abx80x.yaml | 18 +- + .../devicetree/bindings/rtc/renesas,rzn1-rtc.yaml | 30 +- + drivers/rtc/Kconfig | 25 +- + drivers/rtc/rtc-abx80x.c | 834 +++++++++++++-------- + drivers/rtc/rtc-bd70528.c | 5 + + drivers/rtc/rtc-ftrtc010.c | 73 +- + drivers/rtc/rtc-mt6397.c | 91 ++- + drivers/rtc/rtc-omap.c | 5 +- + drivers/rtc/rtc-pcf8563.c | 3 +- + drivers/rtc/rtc-rzn1.c | 52 +- + drivers/soc/ti/pm33xx.c | 2 +- + include/linux/mfd/mt6397/rtc.h | 7 + + include/linux/rtc/rtc-omap.h | 2 +- + 14 files changed, 733 insertions(+), 423 deletions(-) +Merging nvdimm/libnvdimm-for-next (855a46681e0ba nvdimm/pmem: Release gendisk on probe failure) +$ git merge -m Merge branch 'libnvdimm-for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Auto-merging drivers/nvdimm/pmem.c +Merge made by the 'ort' strategy. + drivers/nvdimm/pmem.c | 6 ++++-- + 1 file changed, 4 insertions(+), 2 deletions(-) +Merging at24/at24/for-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'at24/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Already up to date. +Merging seccomp/for-next/seccomp (e32008340585a selftests/seccomp: Split fork_and_close into clone and close tests) +$ git merge -m Merge branch 'for-next/seccomp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Auto-merging tools/testing/selftests/seccomp/seccomp_bpf.c +Merge made by the 'ort' strategy. + Documentation/userspace-api/seccomp_filter.rst | 37 ++ + include/linux/seccomp.h | 3 +- + include/uapi/linux/seccomp.h | 2 + + kernel/seccomp.c | 26 +- + tools/include/uapi/linux/seccomp.h | 2 + + tools/testing/selftests/seccomp/seccomp_bpf.c | 642 +++++++++++++++++++++++++ + 6 files changed, 704 insertions(+), 8 deletions(-) +Merging slimbus/for-next (4350d70546699 Merge branch 'slimbus-for-v7.4' into slimbus-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Merge made by the 'ort' strategy. +Merging nvmem/for-next (41f42ff4ae134 Merge branches 'nvmem-fixes' and 'nvmem-for-v7.4' into nvmem-for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging Documentation/devicetree/bindings/mfd/mediatek,mt6397.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging hyperv/hyperv-next (be0cfab740e58 clocksource: hyper-v: Remove support for stimer interrupts in message mode) +$ git merge -m Merge branch 'hyperv-next' of https://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/for-next (f63dc0eea92d0 docs: ABI: auxdisplay: use literal blocks for commands) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-auxdisplay.git auxdisplay/for-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-auxdisplay-linedisp | 9 ++++++--- + drivers/auxdisplay/arm-charlcd.c | 7 ++----- + drivers/auxdisplay/panel.c | 5 +---- + 3 files changed, 9 insertions(+), 12 deletions(-) +Merging kgdb/kgdb/for-next (fdbdd0ccb30af kdb: remove redundant check for scancode 0xe0) +$ git merge -m Merge branch 'kgdb/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'hmm' of https://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (dc59e4fea9d83 Linux 7.2-rc1) +$ git merge -m Merge branch 'cfi/next' of https://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging mhi/mhi-next (0b1883ca75c00 bus: mhi: ep: clients: Add loopback driver for data path testing) +$ git merge -m Merge branch 'mhi-next' of https://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +$ git am -3 ../patches/0001-fix-up-for-net-qrtr-Drop-the-MHI-auto_queue-feature-.patch +Applying: fix up for "net: qrtr: Drop the MHI auto_queue feature for IPCR DL channels" +Using index info to reconstruct a base tree... +M drivers/net/wireless/ath/ath12k/wifi7/mhi.c +Falling back to patching base and 3-way merge... +No changes -- Patch already applied. +Merging cxl/next (d304df5f32930 Merge branch 'for-7.4/cxl-dcd' into cxl-for-next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging MAINTAINERS +Auto-merging drivers/cxl/core/ras.c +Auto-merging drivers/cxl/core/ras_rch.c +Auto-merging drivers/cxl/pci.c +Auto-merging drivers/pci/pci.c +Auto-merging include/linux/device.h +Auto-merging include/linux/pci.h +Merge made by the 'ort' strategy. + Documentation/driver-api/cxl/linux/cxl-driver.rst | 35 +++ + Documentation/driver-api/cxl/maturity-map.rst | 4 + + .../driver-api/cxl/platform/acpi/dsdt.rst | 3 +- + MAINTAINERS | 1 + + drivers/cxl/acpi.c | 20 +- + drivers/cxl/core/cdat.c | 107 ++++++-- + drivers/cxl/core/core.h | 14 +- + drivers/cxl/core/edac.c | 30 ++- + drivers/cxl/core/features.c | 58 +++-- + drivers/cxl/core/hdm.c | 144 ++++++++--- + drivers/cxl/core/mbox.c | 286 +++++++++++++++++++++ + drivers/cxl/core/mce.c | 8 +- + drivers/cxl/core/memdev.c | 100 ++++--- + drivers/cxl/core/pci.c | 74 ++++-- + drivers/cxl/core/port.c | 250 ++++++++++++------ + drivers/cxl/core/ras.c | 6 +- + drivers/cxl/core/ras_rch.c | 12 +- + drivers/cxl/core/region.c | 100 ++++--- + drivers/cxl/core/region_pmem.c | 6 +- + drivers/cxl/core/regs.c | 14 + + drivers/cxl/cxl.h | 48 +++- + drivers/cxl/cxlmem.h | 88 ++++++- + drivers/cxl/mem.c | 30 ++- + drivers/cxl/pci.c | 243 +++++++++++++---- + drivers/cxl/port.c | 3 + + drivers/pci/pci.c | 23 +- + include/cxl/cxl.h | 29 ++- + include/linux/device.h | 1 + + include/linux/pci.h | 2 +- + tools/testing/cxl/Kbuild | 16 +- + tools/testing/cxl/test/cxl.c | 117 +++++++-- + tools/testing/cxl/test/mem.c | 2 +- + 32 files changed, 1493 insertions(+), 381 deletions(-) +Merging zstd/zstd-next (65d1f5507ed2c zstd: Import upstream v1.5.7) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (191c12e9a7168 efi/runtime-wrappers: Don't park the worker after a recovered firmware fault) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging drivers/firmware/efi/libstub/Makefile +CONFLICT (content): Merge conflict in drivers/firmware/efi/libstub/Makefile +Resolved 'drivers/firmware/efi/libstub/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master eb38dc372d3ba] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/efivarfs.rst | 12 ++ + arch/x86/platform/efi/efi.c | 13 ++- + drivers/firmware/efi/capsule-loader.c | 6 +- + drivers/firmware/efi/capsule.c | 4 +- + drivers/firmware/efi/efi.c | 75 ++++++++---- + drivers/firmware/efi/libstub/Makefile | 42 +++---- + drivers/firmware/efi/libstub/bli.c | 86 ++++++++++++++ + drivers/firmware/efi/libstub/efi-stub-entry.c | 4 +- + drivers/firmware/efi/libstub/efi-stub-helper.c | 108 +++++++---------- + drivers/firmware/efi/libstub/efi-stub.c | 3 +- + drivers/firmware/efi/libstub/efistub.h | 12 +- + drivers/firmware/efi/libstub/fdt.c | 6 +- + drivers/firmware/efi/libstub/file.c | 8 +- + drivers/firmware/efi/libstub/gop.c | 23 ++-- + drivers/firmware/efi/libstub/kaslr.c | 19 ++- + drivers/firmware/efi/libstub/mem.c | 2 +- + drivers/firmware/efi/libstub/pci.c | 2 +- + drivers/firmware/efi/libstub/printk.c | 95 ++------------- + drivers/firmware/efi/libstub/random.c | 8 +- + drivers/firmware/efi/libstub/riscv-stub.c | 7 +- + drivers/firmware/efi/libstub/riscv.c | 2 +- + drivers/firmware/efi/libstub/smbios.c | 3 +- + drivers/firmware/efi/libstub/tpm.c | 8 +- + drivers/firmware/efi/libstub/unaccepted_memory.c | 2 +- + drivers/firmware/efi/libstub/vsprintf.c | 140 ++++++++--------------- + drivers/firmware/efi/libstub/x86-stub.c | 20 ++-- + drivers/firmware/efi/libstub/x86-stub.h | 16 +++ + drivers/firmware/efi/libstub/zboot.c | 3 +- + drivers/firmware/efi/runtime-wrappers.c | 42 ++++++- + fs/efivarfs/internal.h | 1 + + fs/efivarfs/super.c | 36 +++++- + include/linux/efi.h | 26 ++++- + include/linux/ucs2_string.h | 11 +- + lib/ucs2_string.c | 23 ++-- + 34 files changed, 494 insertions(+), 374 deletions(-) + create mode 100644 drivers/firmware/efi/libstub/bli.c +Merging unicode/for-next (a511442085c14 unicode: Properly reject invalid encoding version strings) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Already up to date. +Merging random/master (eb13a1ff271b0 random: vDSO: avoid call to memset() when zeroing reserved parameter) +$ git merge -m Merge branch 'master' of https://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +$ git am -3 ../patches/random-memset-check +Patch format detection failed. +$ git reset HEAD^ +Unstaged changes after reset: +M scripts/Kconfig.toolchain +$ git add -A . +$ git commit -v -a --amend +warning: notes ref refs/notes/commits is invalid +[master 594b5c7b814af] Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git + Date: Wed Oct 14 15:05:39 2026 +0100 +Merging landlock/next (62e09fcc4f1d2 landlock: Add documentation for capability and namespace restrictions) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Auto-merging include/trace/events/landlock.h +Auto-merging tools/testing/selftests/landlock/fs_test.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/LSM/landlock.rst | 46 +- + Documentation/security/landlock.rst | 177 +- + Documentation/trace/events-landlock.rst | 66 +- + Documentation/userspace-api/landlock.rst | 243 ++- + include/linux/landlock.h | 29 +- + include/trace/events/landlock.h | 244 ++- + include/uapi/linux/landlock.h | 139 +- + samples/Kconfig | 13 +- + samples/landlock/Makefile | 5 + + samples/landlock/sandboxer.c | 269 ++- + security/landlock/Makefile | 4 +- + security/landlock/access.h | 61 +- + security/landlock/audit.c | 32 +- + security/landlock/cap.c | 159 ++ + security/landlock/cap.h | 48 + + security/landlock/cred.h | 2 +- + security/landlock/domain.c | 13 +- + security/landlock/domain.h | 97 +- + security/landlock/fs.c | 2 +- + security/landlock/limits.h | 9 + + security/landlock/log.c | 53 +- + security/landlock/log.h | 10 +- + security/landlock/net.c | 2 +- + security/landlock/ns.c | 241 +++ + security/landlock/ns.h | 18 + + security/landlock/ruleset.c | 27 +- + security/landlock/ruleset.h | 33 +- + security/landlock/setup.c | 4 + + security/landlock/syscalls.c | 217 +- + security/landlock/trace.c | 27 +- + tools/testing/selftests/landlock/base_test.c | 21 +- + tools/testing/selftests/landlock/cap_test.c | 1370 +++++++++++++ + tools/testing/selftests/landlock/common.h | 13 + + tools/testing/selftests/landlock/config | 5 + + tools/testing/selftests/landlock/fs_test.c | 13 +- + tools/testing/selftests/landlock/ns_test.c | 2647 +++++++++++++++++++++++++ + tools/testing/selftests/landlock/trace.h | 52 +- + tools/testing/selftests/landlock/trace_test.c | 8 +- + tools/testing/selftests/landlock/wrappers.h | 29 + + 39 files changed, 6270 insertions(+), 178 deletions(-) + create mode 100644 security/landlock/cap.c + create mode 100644 security/landlock/cap.h + create mode 100644 security/landlock/ns.c + create mode 100644 security/landlock/ns.h + create mode 100644 tools/testing/selftests/landlock/cap_test.c + create mode 100644 tools/testing/selftests/landlock/ns_test.c +Merging sysctl/sysctl-next (4991c8b72b564 time/jiffies: Saturate in mult_hz() instead of wrapping) +$ git merge -m Merge branch 'sysctl-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sysctl/sysctl.git sysctl/sysctl-next +Auto-merging fs/dcache.c +Auto-merging fs/file_table.c +Auto-merging fs/proc/proc_sysctl.c +Auto-merging kernel/sysctl.c +Auto-merging kernel/time/jiffies.c +Merge made by the 'ort' strategy. + drivers/parport/procfs.c | 6 +- + fs/dcache.c | 2 +- + fs/file_table.c | 2 +- + fs/proc/proc_sysctl.c | 2 +- + kernel/sysctl.c | 427 +++++---- + lib/test_sysctl.c | 33 +- + tools/testing/selftests/sysctl/sysctl.sh | 1546 ++++++++++++------------------ + 7 files changed, 900 insertions(+), 1118 deletions(-) +Merging execve/for-next/execve (df2908090cda3 Linux 7.3-rc2) +$ git merge -m Merge branch 'for-next/execve' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (a73b4d1fa7d33 rust: bitmap: document panics in `next_bit` and `next_zero_bit`) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging MAINTAINERS +Auto-merging rust/kernel/bitmap.rs +Auto-merging rust/kernel/id_pool.rs +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + include/linux/bitfield-fix-width.h | 241 +++++++++++++++++++++++++++++++ + include/linux/bitfield.h | 49 +------ + lib/bitmap-str.c | 24 ++- + lib/test_bitmap.c | 9 ++ + rust/kernel/bitmap.rs | 17 ++- + rust/kernel/id_pool.rs | 15 +- + tools/include/linux/bitfield-fix-width.h | 236 ++++++++++++++++++++++++++++++ + tools/include/linux/bitfield.h | 49 +------ + 9 files changed, 538 insertions(+), 104 deletions(-) + create mode 100644 include/linux/bitfield-fix-width.h + create mode 100644 tools/include/linux/bitfield-fix-width.h +Merging hte/for-next (30167fadbf87f hte: tegra194-test: shut down timer before GPIO release) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Merge made by the 'ort' strategy. + drivers/hte/hte-tegra194-test.c | 2 +- + drivers/hte/hte-tegra194.c | 14 ++++++-------- + 2 files changed, 7 insertions(+), 9 deletions(-) +Merging kspp/for-next/kspp (ef16259088f99 extcon: realtek: Remove const from type_c_cfg allocation type) +$ git merge -m Merge branch 'for-next/kspp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Auto-merging .get_maintainer.ignore +CONFLICT (content): Merge conflict in .get_maintainer.ignore +Auto-merging MAINTAINERS +Auto-merging arch/um/include/asm/common.lds.S +Auto-merging drivers/scsi/lpfc/lpfc_sli.c +Auto-merging include/linux/gfp.h +Auto-merging include/linux/gfp_types.h +Auto-merging kernel/bpf/diagnostics.c +Auto-merging kernel/trace/trace_events.c +Auto-merging kernel/trace/trace_events_hist.c +Resolved '.get_maintainer.ignore' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 310309020241d] Merge branch 'for-next/kspp' of https://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git +$ git diff -M --stat --summary HEAD^.. + .get_maintainer.ignore | 1 + + Documentation/core-api/kernel-api.rst | 9 + + MAINTAINERS | 1 + + arch/powerpc/platforms/pseries/papr_scm.c | 6 +- + arch/um/include/asm/common.lds.S | 1 + + drivers/extcon/extcon-rtk-type-c.c | 3 +- + drivers/hwtracing/coresight/coresight-cti-sysfs.c | 2 +- + drivers/misc/lkdtm/core.c | 16 +- + drivers/scsi/lpfc/lpfc_sli.c | 45 +- + fs/signalfd.c | 28 +- + include/linux/device/devres.h | 102 ++++ + include/linux/fortify-string.h | 2 - + include/linux/gfp.h | 4 - + include/linux/gfp_types.h | 4 + + include/linux/seq_buf.h | 141 +++++- + include/linux/trace_seq.h | 5 +- + kernel/bpf/diagnostics.c | 8 +- + kernel/trace/trace_events.c | 4 +- + kernel/trace/trace_events_hist.c | 6 +- + lib/seq_buf.c | 37 +- + lib/tests/seq_buf_kunit.c | 537 +++++++++++++++++++++- + lib/tests/stackinit_kunit.c | 93 ++-- + scripts/coccinelle/api/kmalloc_objs.cocci | 161 +++++-- + scripts/gcc-plugins/randomize_layout_plugin.c | 63 ++- + tools/testing/nvdimm/test/ndtest.c | 2 +- + 25 files changed, 1142 insertions(+), 139 deletions(-) +Merging nolibc/for-next (5f81ffdf26072 tools/nolibc: fix the function argument order of calloc()) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/nolibc/linux-nolibc.git nolibc/for-next +Auto-merging tools/testing/selftests/nolibc/Makefile.nolibc +Merge made by the 'ort' strategy. + tools/include/nolibc/Makefile | 19 ++- + tools/include/nolibc/arch-arm.h | 7 +- + tools/include/nolibc/arch-hexagon.h | 159 +++++++++++++++++++++++++ + tools/include/nolibc/arch-mips.h | 8 +- + tools/include/nolibc/arch-parisc.h | 28 ++++- + tools/include/nolibc/arch-powerpc.h | 7 +- + tools/include/nolibc/arch-sh.h | 18 +++ + tools/include/nolibc/arch-x86.h | 2 + + tools/include/nolibc/arch.h | 7 ++ + tools/include/nolibc/compiler.h | 9 ++ + tools/include/nolibc/dirent.h | 25 +++- + tools/include/nolibc/err.h | 2 +- + tools/include/nolibc/nolibc.h | 1 + + tools/include/nolibc/stdlib.h | 12 +- + tools/include/nolibc/sys.h | 60 ++++++++-- + tools/include/nolibc/sys/select.h | 6 +- + tools/include/nolibc/sys/sendfile.h | 41 +++++++ + tools/include/nolibc/types.h | 2 +- + tools/include/nolibc/unistd.h | 4 + + tools/testing/selftests/nolibc/Makefile.nolibc | 15 ++- + tools/testing/selftests/nolibc/nolibc-test.c | 159 +++++++++++++++++++++++-- + tools/testing/selftests/nolibc/run-tests.sh | 30 ++++- + 22 files changed, 560 insertions(+), 61 deletions(-) + create mode 100644 tools/include/nolibc/arch-hexagon.h + create mode 100644 tools/include/nolibc/sys/sendfile.h +Merging iommufd/for-next (54dadb030c7e2 iommufd: Fix iommufd_hw_capabilities reference in kernel-doc) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Auto-merging drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c +Auto-merging drivers/iommu/intel/nested.c +Auto-merging include/linux/iommu.h +Merge made by the 'ort' strategy. + .../iommu/arm/arm-smmu-v3/arm-smmu-v3-iommufd.c | 199 ++++++++++++++++----- + drivers/iommu/intel/nested.c | 50 +++--- + drivers/iommu/iommufd/hw_pagetable.c | 25 +-- + drivers/iommu/iommufd/selftest.c | 163 ++++++++--------- + include/linux/iommu.h | 6 +- + include/linux/iommufd.h | 2 + + include/uapi/linux/iommufd.h | 6 +- + tools/testing/selftests/iommu/iommufd.c | 14 +- + tools/testing/selftests/iommu/iommufd_fail_nth.c | 14 +- + 9 files changed, 315 insertions(+), 164 deletions(-) +Merging turbostat/next (f31adc690d683 Merge branch 'x86_energy_perf_policy' into next) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/lenb/linux.git turbostat/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 9 + + tools/power/x86/turbostat/turbostat.8 | 6 +- + tools/power/x86/turbostat/turbostat.c | 669 +++++++++++---------- + .../x86_energy_perf_policy.c | 194 +++--- + 4 files changed, 490 insertions(+), 388 deletions(-) +Merging pwrseq/pwrseq/for-next (09baa2f4caab0 Merge tag 'pwrseq-is-controllable-for-v7.4' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux into pwrseq/for-next) +$ git merge -m Merge branch 'pwrseq/for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git pwrseq/pwrseq/for-next +Auto-merging drivers/power/sequencing/pwrseq-pcie-m2.c +Auto-merging drivers/power/sequencing/pwrseq-qcom-wcn.c +Merge made by the 'ort' strategy. + drivers/power/sequencing/Kconfig | 19 + + drivers/power/sequencing/Makefile | 2 + + drivers/power/sequencing/core.c | 49 + + drivers/power/sequencing/pwrseq-kunit.c | 1497 ++++++++++++++++++++++ + drivers/power/sequencing/pwrseq-pcie-m2.c | 45 +- + drivers/power/sequencing/pwrseq-qcom-wcn.c | 30 + + drivers/power/sequencing/pwrseq-renesas-pwrrdy.c | 142 ++ + include/linux/pwrseq/consumer.h | 7 + + include/linux/pwrseq/provider.h | 8 + + 9 files changed, 1797 insertions(+), 2 deletions(-) + create mode 100644 drivers/power/sequencing/pwrseq-kunit.c + create mode 100644 drivers/power/sequencing/pwrseq-renesas-pwrrdy.c +Merging capabilities-next/caps-next (507adb6448378 security: commoncap: clarify CAP_FS_SET comment in cap_task_fix_setuid()) +$ git merge -m Merge branch 'caps-next' of https://git.kernel.org/pub/scm/linux/kernel/git/sergeh/linux.git capabilities-next/caps-next +Auto-merging security/commoncap.c +Merge made by the 'ort' strategy. + security/commoncap.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) +$ git am -3 ../patches/0001-sign-file-Fix-up-merge-issue.patch +Applying: sign-file: Fix up merge issue +Using index info to reconstruct a base tree... +M scripts/sign-file.c +Falling back to patching base and 3-way merge... +Auto-merging scripts/sign-file.c +No changes -- Patch already applied. +Merging ipe/next (48f936e302a9c ipe: update the project and test suite links) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/wufan/ipe.git ipe/next +Merge made by the 'ort' strategy. + Documentation/admin-guide/LSM/ipe.rst | 6 ++-- + Documentation/security/ipe.rst | 2 +- + security/ipe/audit.c | 52 +++++++++++++++-------------------- + security/ipe/policy.c | 2 +- + security/ipe/policy_parser.c | 10 ++++++- + 5 files changed, 36 insertions(+), 36 deletions(-) +Merging kcsan/next (bd3cc16d1d7d5 kcsan: test: Do not count report printing time against test duration) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/melver/linux.git kcsan/next +Merge made by the 'ort' strategy. + kernel/kcsan/core.c | 7 ++++--- + kernel/kcsan/kcsan_test.c | 34 +++++++++++++++++++++++++++++++++- + 2 files changed, 37 insertions(+), 4 deletions(-) +Merging crc/crc-next (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'crc-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ebiggers/linux.git crc/crc-next +Already up to date. +Merging keys-next/keys-next (965e9a2cf23b0 pkcs7: Change a pr_warn() to pr_warn_once()) +$ git merge -m Merge branch 'keys-next' of https://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys-next/keys-next +Already up to date. +Merging fwctl/for-next (cee9395acd804 Linux 7.3-rc1) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/fwctl/fwctl.git fwctl/for-next +Already up to date. +Merging devsec-tsm/next (3177779ae17db virt: coco: change tsm_class to a const struct) +$ git merge -m Merge branch 'next' of https://git.kernel.org/pub/scm/linux/kernel/git/devsec/tsm.git devsec-tsm/next +Already up to date. +Merging hisilicon/for-next (a5db65458a911 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of https://github.com/hisilicon/linux-hisi.git hisilicon/for-next +Merge made by the 'ort' strategy. +Merging device-id/device-id-rework (995832b2cebe6 Replace <linux/mod_devicetable.h> by more specific <linux/device-id/*.h> (c files)) +$ git merge -m Merge branch 'device-id-rework' of https://git.kernel.org/pub/scm/linux/kernel/git/ukleinek/linux.git device-id/device-id-rework +Already up to date. +Merging kthread/for-next (fa39ec4f89f26 doc: Add housekeeping documentation) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/frederic/linux-dynticks.git kthread/for-next +Already up to date. +Merging kapi/spec (ef777ef05ebcc kernel/api: add syscall enter/exit tracepoints) +$ git merge -m Merge branch 'spec' of https://git.kernel.org/pub/scm/linux/kernel/git/sashal/kapi.git kapi/spec +Auto-merging .gitignore +Auto-merging MAINTAINERS +Auto-merging Makefile +CONFLICT (content): Merge conflict in Makefile +Auto-merging fs/open.c +CONFLICT (content): Merge conflict in fs/open.c +Auto-merging fs/read_write.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/syscalls.h +Auto-merging init/Kconfig +Auto-merging kernel/Makefile +Auto-merging mm/madvise.c +Auto-merging scripts/Makefile.build +Auto-merging tools/lib/python/kdoc/kdoc_parser.py +Auto-merging tools/testing/selftests/Makefile +Resolved 'Makefile' using previous resolution. +Resolved 'fs/open.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 9c513523039dc] Merge branch 'spec' of https://git.kernel.org/pub/scm/linux/kernel/git/sashal/kapi.git +$ git diff -M --stat --summary HEAD^.. + .gitignore | 1 + + Documentation/dev-tools/index.rst | 1 + + Documentation/dev-tools/kernel-api-spec.rst | 648 +++++ + MAINTAINERS | 13 + + Makefile | 1 + + arch/x86/include/asm/syscall_wrapper.h | 3 +- + fs/open.c | 557 ++++ + fs/read_write.c | 710 +++++ + include/asm-generic/vmlinux.lds.h | 14 + + include/linux/kapi_syscall.h | 35 + + include/linux/kernel_api_spec.h | 1226 ++++++++ + include/linux/syscalls.h | 42 +- + include/trace/events/kapi.h | 74 + + init/Kconfig | 2 + + kernel/Makefile | 1 + + kernel/api/Kconfig | 74 + + kernel/api/Makefile | 13 + + kernel/api/internal.h | 25 + + kernel/api/kapi_debugfs.c | 553 ++++ + kernel/api/kapi_kunit.c | 720 +++++ + kernel/api/kernel_api_spec.c | 1470 ++++++++++ + mm/madvise.c | 549 ++++ + scripts/Makefile.build | 26 + + tools/docs/kernel-doc | 12 +- + tools/kapi/.gitignore | 3 + + tools/kapi/Cargo.lock | 679 +++++ + tools/kapi/Cargo.toml | 20 + + tools/kapi/Makefile | 33 + + tools/kapi/README.md | 33 + + tools/kapi/src/extractor/debugfs.rs | 1704 +++++++++++ + tools/kapi/src/extractor/kerneldoc_parser.rs | 3335 ++++++++++++++++++++++ + tools/kapi/src/extractor/mod.rs | 442 +++ + tools/kapi/src/extractor/source_parser.rs | 531 ++++ + tools/kapi/src/extractor/vmlinux/binary_utils.rs | 461 +++ + tools/kapi/src/extractor/vmlinux/mod.rs | 1160 ++++++++ + tools/kapi/src/formatter/json.rs | 659 +++++ + tools/kapi/src/formatter/mod.rs | 220 ++ + tools/kapi/src/formatter/plain.rs | 679 +++++ + tools/kapi/src/formatter/rst.rs | 802 ++++++ + tools/kapi/src/main.rs | 123 + + tools/lib/python/kdoc/kdoc_apispec.py | 1391 +++++++++ + tools/lib/python/kdoc/kdoc_files.py | 12 +- + tools/lib/python/kdoc/kdoc_parser.py | 101 +- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/kapi/.gitignore | 2 + + tools/testing/selftests/kapi/Makefile | 7 + + tools/testing/selftests/kapi/kapi_test_util.h | 31 + + tools/testing/selftests/kapi/test_kapi.c | 1163 ++++++++ + 48 files changed, 20350 insertions(+), 12 deletions(-) + create mode 100644 Documentation/dev-tools/kernel-api-spec.rst + create mode 100644 include/linux/kapi_syscall.h + create mode 100644 include/linux/kernel_api_spec.h + create mode 100644 include/trace/events/kapi.h + create mode 100644 kernel/api/Kconfig + create mode 100644 kernel/api/Makefile + create mode 100644 kernel/api/internal.h + create mode 100644 kernel/api/kapi_debugfs.c + create mode 100644 kernel/api/kapi_kunit.c + create mode 100644 kernel/api/kernel_api_spec.c + create mode 100644 tools/kapi/.gitignore + create mode 100644 tools/kapi/Cargo.lock + create mode 100644 tools/kapi/Cargo.toml + create mode 100644 tools/kapi/Makefile + create mode 100644 tools/kapi/README.md + create mode 100644 tools/kapi/src/extractor/debugfs.rs + create mode 100644 tools/kapi/src/extractor/kerneldoc_parser.rs + create mode 100644 tools/kapi/src/extractor/mod.rs + create mode 100644 tools/kapi/src/extractor/source_parser.rs + create mode 100644 tools/kapi/src/extractor/vmlinux/binary_utils.rs + create mode 100644 tools/kapi/src/extractor/vmlinux/mod.rs + create mode 100644 tools/kapi/src/formatter/json.rs + create mode 100644 tools/kapi/src/formatter/mod.rs + create mode 100644 tools/kapi/src/formatter/plain.rs + create mode 100644 tools/kapi/src/formatter/rst.rs + create mode 100644 tools/kapi/src/main.rs + create mode 100644 tools/lib/python/kdoc/kdoc_apispec.py + create mode 100644 tools/testing/selftests/kapi/.gitignore + create mode 100644 tools/testing/selftests/kapi/Makefile + create mode 100644 tools/testing/selftests/kapi/kapi_test_util.h + create mode 100644 tools/testing/selftests/kapi/test_kapi.c +Merging pagemap-headers/headers (e02cb91d4644d ksm: Remove pagemap.h include) +$ git merge -m Merge branch 'headers' of git://git.infradead.org/users/willy/pagecache.git pagemap-headers/headers +Auto-merging arch/alpha/include/asm/pgtable.h +Auto-merging arch/arc/include/asm/pgtable-levels.h +Auto-merging arch/microblaze/include/asm/pgtable.h +Auto-merging arch/sparc/include/asm/pgtable_64.h +Auto-merging arch/sparc/include/asm/tlb_64.h +Auto-merging arch/x86/virt/vmx/tdx/tdx.c +Auto-merging block/fops.c +Auto-merging drivers/dma/ste_dma40.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_migrate.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/i915/display/intel_display_power.c +Auto-merging drivers/gpu/drm/msm/msm_fb.c +Auto-merging drivers/gpu/drm/msm/msm_gem_shrinker.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_dmem.c +Auto-merging drivers/gpu/drm/omapdrm/dss/hdmi4.c +Auto-merging drivers/gpu/drm/omapdrm/dss/hdmi5.c +Auto-merging drivers/gpu/drm/panel/panel-ilitek-ili9806e-core.c +Auto-merging drivers/gpu/drm/panthor/panthor_gem.c +Auto-merging drivers/hwmon/pmbus/pmbus_core.c +Auto-merging drivers/i2c/busses/i2c-amd-asf-plat.c +Auto-merging drivers/i2c/busses/i2c-gxp.c +Auto-merging drivers/i2c/busses/i2c-k1.c +Auto-merging drivers/iio/accel/fxls8962af-core.c +Auto-merging drivers/iio/adc/ti-ads1298.c +Auto-merging drivers/iio/light/rohm-bu27034.c +Auto-merging drivers/iio/pressure/bmp280-core.c +Auto-merging drivers/leds/leds-turris-omnia.c +Auto-merging drivers/media/platform/st/stm32/stm32-csi.c +Auto-merging drivers/media/platform/ti/omap3isp/ispvideo.c +Auto-merging drivers/media/usb/go7007/go7007-v4l2.c +Auto-merging drivers/media/usb/gspca/gspca.c +Auto-merging drivers/mfd/88pm886.c +Auto-merging drivers/mfd/cs42l43.c +Auto-merging drivers/mfd/twl-core.c +Auto-merging drivers/mmc/core/core.c +Auto-merging drivers/mmc/core/host.c +Auto-merging drivers/mmc/host/sh_mmcif.c +Auto-merging drivers/net/ethernet/atheros/atl1e/atl1e.h +Auto-merging drivers/net/ethernet/intel/e1000e/netdev.c +Auto-merging drivers/pinctrl/pinctrl-sx150x.c +Auto-merging drivers/platform/arm64/huawei-gaokun-ec.c +Auto-merging drivers/platform/arm64/lenovo-yoga-c630.c +Auto-merging drivers/power/supply/bq25630_charger.c +Auto-merging drivers/regulator/fixed.c +Auto-merging drivers/regulator/tps65185.c +Auto-merging drivers/regulator/tps6594-regulator.c +Auto-merging drivers/ufs/host/ufs-mediatek.c +Auto-merging drivers/ufs/host/ufs-qcom.c +Auto-merging drivers/usb/typec/mux/it5205.c +Auto-merging fs/aio.c +Auto-merging fs/buffer.c +Auto-merging fs/file_table.c +Auto-merging fs/inode.c +Auto-merging fs/nfs/blocklayout/blocklayout.c +Auto-merging fs/nfs/nfstrace.h +Auto-merging fs/nfs/pnfs.c +Auto-merging fs/nfsd/nfs4proc.c +Auto-merging include/drm/drm_print.h +Auto-merging include/linux/ceph/libceph.h +Auto-merging include/linux/i3c/master.h +Auto-merging include/linux/nfs_fs.h +Auto-merging include/linux/nfs_page.h +Auto-merging include/linux/suspend.h +Auto-merging include/linux/swap.h +Auto-merging kernel/power/snapshot.c +Auto-merging net/ceph/osd_client.c +CONFLICT (content): Merge conflict in net/ceph/osd_client.c +Auto-merging net/ceph/pagevec.c +Auto-merging net/sunrpc/auth_gss/gss_krb5_crypto.c +Auto-merging net/sunrpc/auth_gss/svcauth_gss.c +Auto-merging net/sunrpc/xdr.c +Auto-merging net/sunrpc/xprtsock.c +Auto-merging security/commoncap.c +Auto-merging security/selinux/hooks.c +Auto-merging security/selinux/selinuxfs.c +Auto-merging security/smack/smack_lsm.c +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_migrate.c' using previous resolution. +Resolved 'net/ceph/osd_client.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6fbefa4e81780] Merge branch 'headers' of git://git.infradead.org/users/willy/pagecache.git +$ git diff -M --stat --summary HEAD^.. + arch/alpha/include/asm/pgtable.h | 2 +- + arch/arc/include/asm/Kbuild | 1 + + arch/arc/include/asm/pgtable-levels.h | 2 ++ + arch/arc/include/asm/tlb.h | 12 ---------- + arch/arm/include/asm/pgalloc.h | 2 -- + arch/arm/include/asm/tlb.h | 2 -- + arch/arm/mach-pxa/pxa3xx.c | 1 + + arch/arm64/include/asm/tlb.h | 3 --- + arch/hexagon/include/asm/tlb.h | 1 - + arch/microblaze/include/asm/pgtable.h | 2 +- + arch/nios2/include/asm/tlb.h | 1 - + arch/openrisc/include/asm/Kbuild | 1 + + arch/openrisc/include/asm/tlb.h | 26 ---------------------- + arch/powerpc/include/asm/tlb.h | 2 -- + arch/sh/include/asm/pgtable.h | 2 +- + arch/sh/include/asm/tlb.h | 1 - + arch/sparc/include/asm/pgtable_64.h | 2 +- + arch/sparc/include/asm/tlb_64.h | 1 - + arch/x86/include/asm/pgalloc.h | 1 - + arch/x86/virt/vmx/tdx/tdx.c | 1 + + arch/xtensa/kernel/hibernate.c | 1 + + block/fops.c | 1 + + drivers/char/agp/backend.c | 1 - + drivers/char/agp/generic.c | 1 - + drivers/char/agp/intel-agp.c | 1 - + drivers/char/agp/intel-gtt.c | 1 - + drivers/char/agp/uninorth-agp.c | 3 ++- + drivers/dma/ste_dma40.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +-- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 1 + + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 1 - + drivers/gpu/drm/display/drm_dp_cec.c | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 1 + + drivers/gpu/drm/i915/display/intel_display_power.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 1 + + drivers/gpu/drm/msm/msm_fb.c | 2 ++ + drivers/gpu/drm/msm/msm_gem_shrinker.c | 2 ++ + drivers/gpu/drm/nouveau/nouveau_dmem.c | 1 + + drivers/gpu/drm/omapdrm/dss/hdmi4.c | 1 + + drivers/gpu/drm/omapdrm/dss/hdmi5.c | 1 + + drivers/gpu/drm/panel/panel-ilitek-ili9806e-core.c | 1 + + drivers/gpu/drm/panfrost/panfrost_gem.c | 2 ++ + drivers/gpu/drm/panthor/panthor_gem.c | 3 +++ + drivers/hwmon/pmbus/pmbus_core.c | 1 + + drivers/i2c/busses/i2c-amd-asf-plat.c | 1 + + drivers/i2c/busses/i2c-gxp.c | 1 + + drivers/i2c/busses/i2c-k1.c | 1 + + drivers/i2c/busses/i2c-pasemi-platform.c | 1 + + drivers/iio/accel/fxls8962af-core.c | 1 + + drivers/iio/adc/nct7201.c | 1 + + drivers/iio/adc/ti-ads1298.c | 1 + + drivers/iio/light/rohm-bu27034.c | 1 + + drivers/iio/pressure/bmp280-core.c | 1 + + drivers/iio/pressure/bmp280.h | 1 + + drivers/input/misc/aw86927.c | 1 + + drivers/input/touchscreen/goodix_berlin_core.c | 1 + + drivers/input/touchscreen/hynitron_cstxxx.c | 1 + + drivers/input/touchscreen/imagis.c | 1 + + drivers/leds/leds-turris-omnia.c | 1 + + drivers/media/common/videobuf2/frame_vector.c | 1 - + drivers/media/pci/cx18/cx18-driver.h | 1 - + drivers/media/pci/ivtv/ivtv-driver.h | 2 +- + drivers/media/platform/st/stm32/stm32-csi.c | 1 + + drivers/media/platform/ti/omap3isp/ispvideo.c | 1 - + drivers/media/usb/go7007/go7007-v4l2.c | 1 - + drivers/media/usb/gspca/gspca.c | 1 - + drivers/mfd/88pm886.c | 1 + + drivers/mfd/abx500-core.c | 1 + + drivers/mfd/adp5585.c | 1 + + drivers/mfd/cs40l50-core.c | 1 + + drivers/mfd/cs42l43.c | 1 + + drivers/mfd/rt5120.c | 1 + + drivers/mfd/tps65219.c | 1 + + drivers/mfd/twl-core.c | 2 +- + drivers/mmc/core/core.c | 1 - + drivers/mmc/core/host.c | 1 - + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 1 - + drivers/mmc/host/renesas_sdhi_sys_dmac.c | 1 - + drivers/mmc/host/sh_mmcif.c | 1 - + drivers/mmc/host/tmio_mmc.h | 1 - + drivers/mmc/host/tmio_mmc_core.c | 1 - + drivers/mmc/host/usdhi6rol0.c | 1 - + drivers/net/ethernet/atheros/atl1c/atl1c.h | 1 - + drivers/net/ethernet/atheros/atl1e/atl1e.h | 1 - + drivers/net/ethernet/intel/e1000/e1000.h | 1 - + drivers/net/ethernet/intel/e1000e/netdev.c | 1 - + drivers/net/ethernet/intel/igb/igb_main.c | 1 - + drivers/net/ethernet/intel/igbvf/netdev.c | 1 - + drivers/phy/st/phy-stm32-combophy.c | 1 + + drivers/pinctrl/pinctrl-sx150x.c | 1 + + drivers/platform/arm64/huawei-gaokun-ec.c | 1 + + drivers/platform/arm64/lenovo-yoga-c630.c | 2 +- + .../platform/x86/intel/int3472/clk_and_regulator.c | 1 + + drivers/power/supply/bq25630_charger.c | 1 + + drivers/power/supply/rk817_charger.c | 2 +- + drivers/regulator/fixed.c | 1 + + drivers/regulator/fp9931.c | 1 + + drivers/regulator/mt6360-regulator.c | 1 + + drivers/regulator/qcom-labibb-regulator.c | 1 + + drivers/regulator/rtq2208-regulator.c | 1 + + drivers/regulator/tps65185.c | 1 + + drivers/regulator/tps65219-regulator.c | 1 + + drivers/regulator/tps6594-regulator.c | 1 + + drivers/soc/xilinx/zynqmp_power.c | 1 + + drivers/ufs/host/ufs-mediatek.c | 1 + + drivers/ufs/host/ufs-qcom.c | 1 + + drivers/usb/core/hcd.c | 1 + + drivers/usb/typec/mux/it5205.c | 1 + + drivers/usb/typec/wusb3801.c | 1 + + drivers/video/fbdev/core/fb_procfs.c | 1 + + drivers/xen/balloon.c | 1 + + fs/aio.c | 1 + + fs/buffer.c | 1 + + fs/file_table.c | 1 + + fs/inode.c | 1 + + fs/nfs/blocklayout/blocklayout.c | 1 + + fs/nfs/nfs42proc.c | 1 + + fs/nfs/nfstrace.h | 1 + + fs/nfs/pnfs.c | 1 + + fs/nfsd/nfs4proc.c | 1 + + include/drm/drm_print.h | 1 + + include/drm/ttm/ttm_tt.h | 1 - + include/linux/balloon.h | 1 - + include/linux/ceph/libceph.h | 1 - + include/linux/i3c/master.h | 1 + + include/linux/ksm.h | 1 - + include/linux/mempolicy.h | 1 - + include/linux/nfs_fs.h | 1 - + include/linux/nfs_page.h | 1 - + include/linux/suspend.h | 1 - + include/linux/swap.h | 1 - + include/sound/cs35l41.h | 1 + + kernel/power/snapshot.c | 1 + + net/ceph/osd_client.c | 1 - + net/ceph/pagevec.c | 1 + + net/core/datagram.c | 1 - + net/rds/rdma.c | 1 - + net/sunrpc/auth_gss/auth_gss.c | 1 - + net/sunrpc/auth_gss/gss_krb5_crypto.c | 1 - + net/sunrpc/auth_gss/gss_krb5_wrap.c | 1 - + net/sunrpc/auth_gss/svcauth_gss.c | 1 - + net/sunrpc/cache.c | 1 - + net/sunrpc/rpc_pipe.c | 1 - + net/sunrpc/socklib.c | 1 - + net/sunrpc/xdr.c | 1 - + net/sunrpc/xprtsock.c | 1 - + security/commoncap.c | 3 --- + security/inode.c | 1 - + security/selinux/hooks.c | 1 - + security/selinux/selinuxfs.c | 1 - + security/smack/smack_lsm.c | 1 - + sound/soc/codecs/cs35l41-lib.c | 1 + + 155 files changed, 98 insertions(+), 118 deletions(-) + delete mode 100644 arch/arc/include/asm/tlb.h + delete mode 100644 arch/openrisc/include/asm/tlb.h diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..e647e3e6dbc0 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20261014 |