diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-12-16 12:37:13 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2022-12-16 12:37:13 +1100 |
| commit | ca39c4daa6f7f770b1329ffb46f1e4a6bcc3f291 (patch) | |
| tree | d08bad0b9089611fa0bde23b852f02c2998ec99f | |
| parent | 07bb4ba10cadbca4504cd796e488ff9e8665bfac (diff) | |
Add linux-next specific files for 20221216next-20221216
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 371 | ||||
| -rw-r--r-- | Next/Trees | 373 | ||||
| -rw-r--r-- | Next/merge.log | 6238 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 6983 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..3f66e78a74c6 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,371 @@ +Name SHA1 +---- ---- +origin 785d21ba2f447fb26df4b22f45653763beb767ea +fixes 9c9155a3509a2ebdb06d77c7a621e9685c802eac +mm-hotfixes 8fa590bf344816c925810331eea8387627bbeb40 +kbuild-current 869e4ae4cd2a23d625aaa14ae62dbebf768cb77d +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 73a0b6ee5d6269f92df43e1d09b3278a2886bf8a +arm64-fixes b7d9aae404841d9999b7476170867ae441e948d2 +arm-soc-fixes ef19964da8a668c683f1d38274f6fb756e047945 +davinci-current 9abf2313adc1ca1b6180c508c25f22f9395cc780 +drivers-memory-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current 553b20b211c4153f8af6096fd52069bbdf955e23 +powerpc-fixes 2e7ec190a0e38aaa8a6d87fd5f804ec07947febc +s390-fixes adba1a9b81d5020a9bf8332fee9ff0171fe7623d +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current ccd30a476f8e864732de220bd50e6f372f5ebcab +net a7d82367daa6baa5e8399e6327e7f2f463534505 +bpf f506439ec3dee11e0e77b0a1f3fb3eec22c97873 +ipsec 7ae9888d6e1ce4062d27367a28e46a26270a3e52 +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 7fb0269720d7d5359bc8349eef908a1c96866b65 +wireless 01258b62c62710297dab4e2b72f46e01be392cc6 +rdma-fixes 094226ad94f471a9f19e8f8e7140a09c2625abaa +sound-current b47068b4aa53a57552398e3f60d0ed1918700c2b +sound-asoc-fixes a12a383e59ce486abd719b6bda33c353a3b385e7 +regmap-fixes 84498d1fb35de6ab71bdfdb6270a464fb4a0951b +regulator-fixes f56a82a2d6aef07484a1f413e57e8719a1bf8148 +spi-fixes 45b3cd900bf8d1a3cd7cf48361df8c09ae5b4009 +pci-current ac9ccce8717df5aa5361c0cea9d8619f6d87af3c +driver-core.current eb7081409f94a9a8608593d0fb63a1aa3d6f95d8 +tty.current eb7081409f94a9a8608593d0fb63a1aa3d6f95d8 +usb.current b7b275e60bcd5f89771e865a8239325f86d9927d +usb-gadget-fixes e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial-fixes 188c9c2e0c7f4ae864113f80c40bafb394062271 +phy 819b885cd886c193782891c4f51bbcab3de119a4 +staging.current eb7081409f94a9a8608593d0fb63a1aa3d6f95d8 +iio-fixes 95e3f901f7b11eaa4f766967b28863a557eeb0b5 +counter-current fd5ac974fc25feed084c2d1599d0dddb4e0556bc +char-misc.current b7b275e60bcd5f89771e865a8239325f86d9927d +soundwire-fixes 49a467310dc4fae591a3547860ee04d8730780f4 +thunderbolt-fixes 830b3c68c1fb1e9176028d02ef86f3cf76aa2476 +input-current e291c116f60f3c1ca98090f0f8e7c77e658562fb +crypto-current 453de3eb08c4b7e31b3019a4b0cc3ebce51a6219 +vfio-fixes e806e223621e4f5105170df69d7311dc3fb4bbb4 +kselftest-fixes 89c1017aac67ca81973b7c8eac5d021315811a93 +modules-fixes 4f1354d5c6a3264c91238962d1597eef40c40419 +dmaengine-fixes c47e6403fa099f200868d6b106701cb42d181d2b +backlight-fixes 8ab33943cde793afc41db2865d4c31b40c7f1a05 +mtd-fixes c717b9b7d6de9e024e47f7cd5bbff49f581d3db9 +mfd-fixes a61f4661fba404418a7c77e86586dc52a58a93c6 +v4l-dvb-fixes 542d3c03fd895eb8370992293498332ea383a3b9 +reset-fixes ae358d71d4623ed0a466a7498f8ce25c7fda22d1 +mips-fixes 094226ad94f471a9f19e8f8e7140a09c2625abaa +at91-fixes 6a3fc8c330d1c1fa3d8773d7d38a7c55c4900dfe +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes 34e30ebbe48cc43c14276f863f0d2995c8f13186 +kvms390-fixes 0dd4cdccdab3d74bd86b868768a7dca216bcce7e +hwmon-fixes 76dcd734eca23168cb008912c0f69ff408905235 +nvdimm-fixes 472faf72b33d80aa8e7a99c9410c1a23d3bf0cd8 +cxl-fixes 8f401ec1c8975eabfe4c089de91cbe058deabf71 +btrfs-fixes ee267181ea7073d7a9fc06027334defb6574ead1 +vfs-fixes 10bc8e4af65946b727728d7479c028742321b60a +dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6 +i3c-fixes fe07bfda2fb9cdef8a4d4008a409bb02f35f1bd8 +drivers-x86-fixes e4678483f9bc400642bbc05c6b75a1b44bcb6c25 +samsung-krzk-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pinctrl-samsung-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +devicetree-fixes 60d865bd5a9b15a3961eb1c08bd4155682a3c81e +dt-krzk-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +scsi-fixes f014165faa7b953b81dcbf18835936e5f8d01f2a +drm-fixes c4252650a8c4770b669398fe7270ed8c94fc0eba +amdgpu-fixes 2c409ba81be25516afe05ae27a4a15da01740b01 +drm-intel-fixes 830b3c68c1fb1e9176028d02ef86f3cf76aa2476 +mmc-fixes 76dcd734eca23168cb008912c0f69ff408905235 +rtc-fixes db4e955ae333567dea02822624106c0b96a2f84f +gnss-fixes 247f34f7b80357943234f93f247a1ae6b6c3a740 +hyperv-fixes 25c94b051592c010abe92c85b0485f1faedc83f3 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes 39cefc5f6cd25d555e0455b24810e9aff365b8d6 +riscv-dt-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +riscv-soc-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pidfd-fixes 03ba0fe4d09f2eb0a91888caaa057ed67462ae2d +fpga-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +spdx 6cad1ecd4e3213d892b70afa999a81849d1f0206 +gpio-brgl-fixes 63ff545af73f759d1bd04198af8ed8577fb739fc +gpio-intel-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pinctrl-intel-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +erofs-fixes 37020bbb71d911431e16c2c940b97cf86ae4f2f6 +integrity-fixes 8433856947217ebb5697a8ff9c4c9cad4639a2cf +kunit-fixes d5e34828726400d89e4b2ce57efa07e5f884a65a +ubifs-fixes 7bdd6967fec5dda9c828ba5050a9f91540f59749 +memblock-fixes c94afc46cae7ad41b2ad6a99368147879f4b0e56 +cel-fixes ac8db824ead0de2e9111337c401409d010fba2f0 +irqchip-fixes 6c9f7434159b96231f5b27ab938f4766e3586b48 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current 94d957ae513fc420d0a5a9bac815eb49ffebb56f +efi-fixes 7572ac3c979d4d0fb42d73a72d2608656516ff4f +zstd-fixes 70d822cfb782ebed5c41bdad9fa520b5ec1c6923 +battery-fixes 767e684367e4759d9855b184045b7a9d6b19acd2 +uml-fixes bd71558d585ac61cfd799db7f25e78dca404dd7a +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 30a0b95b1335e12efef89dd78518ed3e4a71a763 +drm-misc-fixes f728a5ea27c92133893590e731ce10f6561ced87 +kbuild 19331e84c3873256537d446afec1f6c507f8c4ef +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf 818448e9cf92e5c6b3c10320372eefcbe4174e4f +compiler-attributes 6cf1ab89c9e75ed8f3432563c212d688b6d3563b +dma-mapping ffcb754584603adf7039d7972564fbf6febdc542 +asm-generic 5e5ff73c2e5863f93fc5fd78d178cd8f2af12464 +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 1907710cab8447f68c4c126492a726776346b2ff +arm64 c0cd1d541704c45030cbb2031612fdd68e8e15d5 +arm-perf 4361251cef466839795691e2628285e3f5093a98 +arm-soc 9e86b8206adee8f771534da7f717e7f61b851ab1 +actions 444d018d8d3874c9c3784a5df3ad2e5f554fbdb6 +amlogic e57e6bb6476defd166a98cb787dbac128e935fe3 +asahi-soc 296921e39d3605f2115cf6b5ecd31aa91bdfb83c +aspeed 45c86167addee931ef0f6f541b2f59e151991bd6 +at91 fb18447f4da5d9584e6adf3321a6d59ff37e6410 +broadcom 64610429f8deb8cbed9aac62ecd054934c461608 +davinci 53ad523ac43500bc1ab3f8c4d757715a29885a13 +drivers-memory 8dd7e4af585331dda004e92ed0739c3609e37177 +imx-mxs e114f7b74f59668cbfc46b0246f82b956ea88db5 +keystone cb293d3b430e35dbc1e8425869f27624355ff10a +mediatek 6b6221595e05f9120a6595bfb76f7f623266fb06 +mvebu ce88856dec4f0171546333d7290aa2ff721e38de +omap 6435241fd536e18dfc9b844aace8fed0bffbdc6d +qcom 7608329e874c91984535b76100e75bf3a61bc364 +raspberrypi c5915b53d4c2021fef3ceaa3c93ccd9ba67515ca +renesas 00841e945654c53409a811ab1ddaa934631ac54c +reset d985db83622679fc496ed824088e066528b3a872 +rockchip 554ba1ec66f27661a83b14e69f7c6ef0300aeb01 +samsung-krzk 4407a1eb1faf070fdc023eed10fecde7d0b66fcd +scmi 76dcd734eca23168cb008912c0f69ff408905235 +stm32 4cca342b840e8d308abf676e165b54719d1b10e7 +sunxi 47be7c123211c9e4814acf287074af7edcc937c9 +tee 4a56b125ba20784fe2f24830019a369dd898c98a +tegra 65de8bad744b5d86afe8aa038d45be7f045de3d8 +ti 6a5ab20fb9618bd3178d1c6770e3ee27016a3bd6 +xilinx aa95ef0c258b67f3e2984ceb1911d0122c9cbe3c +clk 0e2c9884cbbae00f956d881848669790d73be43d +clk-imx 8178e245fa953f793670147368642717fcdb302e +clk-renesas 777bcc85e1fbadfea1927e828165102cf5050b53 +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 7e2004906fb52257772be0ef262fba2d5eb1653b +loongarch 5535f4f70cfc15ef55b6ea7c7e17337b17337cb6 +m68k 553b20b211c4153f8af6096fd52069bbdf955e23 +m68knommu af5d74e32eb8e1b833f687047f0ffe3801d7229d +microblaze 5cfe469c2654c3a4dda8504b1209abdd8b379e95 +mips 4c587a982603d7e7e751b4925809a1512099a690 +nios2 7f7bc20bc41a4fbcd2db75b375ac95e5faf958ae +openrisc 34a0bac084e49324c29e6d0984d24096e02c6314 +parisc-hd 887e813357319f5b9c34429307d6d4ea68f688f5 +powerpc 13959373e9c9021cc80730c7bd1242e07b10b328 +powerpc-objtool a39818a3fb2bf12ae945a7c5fba8c5d9048a0e96 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v 6e66e96e31b81fb08075d18a3e2c201f1e2171da +riscv-dt 4563db4b7988613570d435e7846e553ecf92e521 +riscv-soc 8fbf94fea0b4e187ca9100936c5429f96b8a4e44 +s390 286c89ef3b34bc5f1471ebfcd4d9b3fc6a74a117 +sh 8518e694203d0bfd202ea4a80356785b6992322e +sparc-next dd0d718152e4c65b173070d48ea9dfc06894c3e5 +uml 43ee0357e15b0cfd0a9e331494ef88c92fadac7d +xtensa 8939c58d68f97ce530f02d46c9f2b56c3ec88399 +pidfd 6a857ab5b57cdeb16d7ea75591a0ae3c6ec0750a +vfs-idmapping e175af42241cafb3efd0a81f74a65be4bec8f2bd +fscrypt 41952551acb405080726aa38a8a7ce317d9de4bb +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs 1dd7bb25658d207dff330aedad0165fbe899750d +btrfs d1a1795bb77b72b56a02077a7db2028cbbbdc622 +ceph 68c62bee9d081cf815310b3a96e38d94fc16007d +cifs b2a20a5bd269f8ef409e35e6e7e89dcee639eb56 +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs c1cc2db216078f9b1e29c991b1b9177c26757162 +erofs c505feba4c0d76084e56ec498ce819f02a7043ae +exfat 36955d368dc101be885ad2c71618e3c3a93cd8ee +ext3 1acc506685dbf53a104d7f554d9361672220aca6 +ext4 1da18e38cb97e9521e93d63034521a9649524f64 +f2fs 041fae9c105ae342a4245cf1e0dc56a23fbb9d3c +fsverity a4bbf53d88c728da9ff6c316b1e4ded63a8f3940 +fuse 1b0e94993dbe282b2a6b778c0f18ab96e5e86d0c +gfs2 6b46a06100dd0e0ebe400573e94ccd09163bfd5b +jfs a60dca73a1a8079d867b2c2e9549440346c1ba83 +ksmbd 504a73d46bad8964be2cdaa63a2bedaef198ea3b +nfs 405ab45b5afae394703d6206112912a310a66c80 +nfs-anna 7e8436728e22181c3f12a5dbabd35ed3a8b8c593 +nfsd 75333d48f92256a0dec91dbf07835e804fc411c0 +ntfs3 36963cf225f890f97fd84af0a82d323043edd0f1 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 637d13b57d853dfc7f5743dfdfb9995c266a6031 +ubifs 8d0960731a26abae7b3479b5c7dd2a23cf622718 +v9fs 093af6393d21df1dbee89cd098a18f5602dfe5a9 +xfs 4883f57a2d861a68588aefbf592f86d1e059f1ec +zonefs 6bac30bb8ff8195cbcfc177b3b6b0732929170c1 +iomap f1bd37a4735286585751dbd9db330b48525cb193 +djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763 +file-locks f2f2494c8aa3cc317572c4674ef256005ebc092b +iversion 2b3319b355731c721dd43a2735e08737299e426a +vfs 9ea606dbbc50a8a9ae36b7e7f4d2dde7ea02f64e +printk 348af86ecc06ed87ce9115567ea09a1dfca771ca +pci f826afe5eae856b3834cbc65db6178cccd4a3142 +pstore 76d62f24db07f22ccf9bc18ca793c27d4ebef721 +hid d9beee49918db833b60721ce99924922d5446a74 +i2c 38cf3e4fa7d09afc4c7377b773345b56111d846a +i3c 08dcf0732cb4d97b85493d9f60470e48eebf87fe +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 364ffd2537c44cb6914ff5669153f4a86fffad29 +jc_docs c2016863bbfddaacb266011740e53df1d77c0705 +v4l-dvb d4acfa22b634347be33d5906744366742fccd151 +v4l-dvb-next d4acfa22b634347be33d5906744366742fccd151 +pm 02f29b079520d658643d9f1cf1d2e815bc38d396 +cpufreq-arm 8ff150aa6fe252e9b7713cf737c4dc5cbaa263ab +cpupower 8c37df3d635eac64a8fbb4b26672fb881e0cb673 +devfreq 7fc7f25419f5a6b09199ba4b5026b94ef184fa79 +opp dba79b78ecc18f7788fd08eb998388e226817fb5 +thermal 5011a110295d25418f5918a6af7bfcdb00dd4e34 +ieee1394 54b3bd99f094b3b919de4078f60d722e62a767e3 +dlm 7a5e9f1f83e3271a9f05933a80b870fe55ebbb3d +rdma dbc94a0fb81771a38733c0e8f2ea8c4fa6934dc1 +net-next 7e68dd7d07a28faa2e6574dd6b9dbd90cdeaae91 +bpf-next 7e68dd7d07a28faa2e6574dd6b9dbd90cdeaae91 +ipsec-next 7e68dd7d07a28faa2e6574dd6b9dbd90cdeaae91 +mlx5-next 9abf2313adc1ca1b6180c508c25f22f9395cc780 +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +bluetooth becee9f3220c20289163cdc0bc8583bd30965f62 +wireless-next d1c722867f8022a27182b9a1d84e9bca75486c9a +mtd a34506e08db7ccce160a259e4b00b1e307486c59 +nand 6408cc05a50aaf88074a5a31d065e5af87a456f5 +spi-nor 1799cd8540b67b88514c82f5fae1c75b986bcbd8 +crypto 453de3eb08c4b7e31b3019a4b0cc3ebce51a6219 +drm 66efff515a6500d4b4976fbab3bee8b92a1137fb +drm-misc b02897e56b4e1fa6445be695ce5d605bb098435c +amdgpu e4f665de417d8b923e638da1751c2c94eb68c713 +drm-intel ad0fca2dceeab8fdd8e1135f4b4ef2dc46c2ead9 +drm-tegra 08fef75f5e17c80cdb9ab56d65685cb43c8e44d3 +drm-msm d73b1d02de0858b96f743e1e8b767fb092ae4c1b +drm-msm-lumag 1eca2464c1db7e56fc72a75e9874e5646dfa6d99 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 30527af2bed11a81afdbc70e999e290a27c86f26 +fbdev 3c3bfb8586f848317ceba5d777e11204ba3e5758 +regmap e6bc64403134df07b3bfef5dc2d75c55243780a7 +sound ee0b089d660021792e4ab4dda191b097ce1e964f +sound-asoc a12a383e59ce486abd719b6bda33c353a3b385e7 +modules b7d23abc80f163acbf45226a343c98a7f92f12c9 +input c3991107a28a5ad0bd90660ca3bbf8c2c220ea98 +block 0c1f0737ef7af22f73941c75efcc5ce1f196738f +device-mapper 7991dbff6849f67e823b7cc0c15e5a90b0549b9f +libata f07788079f515ca4a681c5f595bdad19cfbd7b1d +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc ff874dbc4f868af128b412a9bd92637103cf11d7 +mfd 37fecbb80721c4e72ba3e43d4f07ba9ec15b68fd +backlight 0de796b6047d1ccc29d03fcd0a93dca52691ec21 +battery 104bb8a663451404a26331263ce5b96c34504049 +regulator f56a82a2d6aef07484a1f413e57e8719a1bf8148 +security 577cc1434e4cc1342c3df6d6a3c85136ab335c81 +apparmor 4295c60bbe9e63e35d330546eeaa1d2b62dae303 +integrity b6018af440a07bd0d74b58c4e18045f4a8dbfe6b +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 048be156491ff1aeb0fe5ff0862644d38cd39015 +smack 1a3065e92046e57f60d7c9a48acae0d0badefe36 +tomoyo be9c59066d8e3b1b358a7cbaf762311fd2ce6f2c +tpmdd eaabc245b02a0e0063068178624d2fc12ba91d69 +watchdog 9ec0b7e06835b857f892feb2fe6121db1393425d +iommu e3eca2e4f6489ed3143c80ce90bfa7ef7e12ebc7 +audit 50979953c0c41e929e5f955800da68e1bb24c7ab +devicetree 580f9896e088b399fc79f1421e56a1b68f0450b5 +dt-krzk 0c2cd289d0bd080493b02d7733225cc5d4a12af0 +mailbox b8ae88e1e75e5cb7a6df5298ab75334362ed631c +spi 45b3cd900bf8d1a3cd7cf48361df8c09ae5b4009 +tip 892cd97d2c733b4faa9799dd30967c04d40b7eed +clockevents 2eff537b37ca2c7f250350b2439c5542d7d3ae27 +edac ad5befcd0e1df65d39d0206da24ebcfc93bacf6e +irqchip 6ed54e1789a29d3f1557454cc7d2eb9c10d1d37b +ftrace 14b7bc94a4f6fee3fcfba0177c697cba08cf18fc +rcu 1ab6c3f2e9237692f4d3d4a555d1ac31290ae0d1 +kvm 549a715b98a13c6d05452be3ad37e980087bb081 +kvm-arm 753d734f3f347e7fc49b819472bbf61dcfc1a16f +kvms390 bedac519eefac999c31468a2dc174768d47ad4fa +xen-tip 7cffcade57a429667447c4f41d8414bbcf1b3aaa +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues c0feea594e058223973db94c1c32a830c9807c86 +drivers-x86 b0b698b80c56b0712f0d4346d51bf0363ba03068 +chrome-platform c88d317f7473c67fdecfa993d3077a52525bb863 +hsi 3ffa9f713c39a213a08d9ff13ab983a8aa5d8b5d +leds 7cb092a0336c5770656c6742e7a7ce3042c8c44e +ipmi 041fae9c105ae342a4245cf1e0dc56a23fbb9d3c +driver-core f18caf261398a7f2de4fa3f600deb87072fe7b8d +usb 81c25247a2a03a0f97e4805d7aff7541ccff6baa +thunderbolt a5cfc9d65879c0d377f732531a2e80ee3a9eebbc +usb-gadget e49d033bddf5b565044e2abe4241353959bc9120 +usb-serial 63b8ed26cd093ecc1bcdd1fd841f238a52c11031 +tty 6373ab4dfee731deec62b4452ea641611feff9b3 +char-misc f361c96c75184d0272572087c7d9874e0f64b870 +accel 2012e010cbbd6314952608b89fea6155958fdf51 +coresight c767c34740132ffc478226864a7461493cdc2413 +fpga ee31d5038c06b56ea515f4fe490274628c0f80e1 +icc 26e90ec7a8403fc8f7a4507098d7d262e9c2d302 +iio 0dec19b344b5428ac801e66903622885a53cd3f4 +phy-next bea3ce759b4664f20f1f57c53fe018c3b67da147 +soundwire 7cbf00bd4142cd88ac7ecbc4ea7b917a220cb721 +extcon 5313121b22fd11db0d14f305c110168b8176efdc +gnss 247f34f7b80357943234f93f247a1ae6b6c3a740 +vfio 70be6f322860d322ebcd120cf0c05402ead5c6de +staging 37aa6b98237082a4bf882b4d986329b94ebd447d +counter-next 30a0b95b1335e12efef89dd78518ed3e4a71a763 +mux ea327624ae52936b2c0eccffd9369983ca2d08e3 +dmaengine 25483dedd2f5d9bc6928cd790ee59772fb880a79 +cgroup 674b745e22b3caae48ad20422795eefd3f832a7b +scsi 1dbc54a8c0b627f6b0e6fac4ae6d537b96a91f61 +scsi-mkp 1a5665fc8d7a000671ebd3fe69c6f9acf1e0dcd9 +vhost be8ddea9e75e65b05837f6d51dc5774b866d0bcf +rpmsg b3af356e624349364d9de14c4e0a8eeb76cece3f +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 11e47bbd700f31bd1ee9f8863381bc9e741c0e97 +gpio-intel 8d259847243d1e21a866e828c4ce90d759f3d17b +gpio-sim 0fcfb00b28c0b7884635dacf38e46d60bf3d4eb1 +pinctrl 6c19feafb377abf412b89c0c4586f9e4b9f69857 +pinctrl-intel b14ef61314b37a4a720a1f5686627d5061387480 +pinctrl-renesas 80d34260f36c6c55f03c3c33be4a11ec06202e98 +pinctrl-samsung 9abf2313adc1ca1b6180c508c25f22f9395cc780 +pwm 8fa22f4b88e877c0811d2a0e506cf56755add554 +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 88a51b4f2e65ca4378a81ff0925fad076e82e177 +kselftest d5ba85d6d8be7da660d4ac25761a48c74ade958d +kunit 9abf2313adc1ca1b6180c508c25f22f9395cc780 +kunit-next 054be257f28ca8eeb8e3620766501b81ceb4b293 +livepatching cad81ab739979d3d628250e763eace86ad2514e5 +rtc e88f319a2546fd7772c726bf3a82a23b0859ddeb +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 9abf2313adc1ca1b6180c508c25f22f9395cc780 +ntb 1a3f7484e0763d10d9a75c3d8f9fbd351e1cacb2 +seccomp b9069728a70c23dad00684eb994a3f5295f127cf +cisco 9e98c678c2d6ae3a17cb2de55d17f69dddaa231b +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus 94c40c9882f19da20b189ebb508e9d1695d69caf +nvmem 18133a57a93557739bff807aaf97ebf02daa02b8 +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv 32c97d980e2eef25465d453f2956a9ca68926a3c +auxdisplay ddf75a86aba2cfb7ec4497e8692b60c8c8fe0ee7 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 094226ad94f471a9f19e8f8e7140a09c2625abaa +cfi 3123109284176b1532874591f7c81f3837bbdc17 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi 5562c6a9657e1bffd4d66df841db142c596f411c +memblock 80c2fe022ef5d29f3bafee90c37dbcff18cab57a +init 38b082236e77d403fed23ac2d30d570598744ec3 +cxl f04facfb993de47e2133b2b842d72b97b1c50162 +folio-iomap 4d7bd0eb72e5831ddb1288786a96448b48440825 +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi c2530a04a73e6b75ed71ed14d09d7b42d6300013 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab dc19745ad0e46c1a069540973e376cff0130443c +random 1ca06f1c1acecbe02124f14a37cce347b8c1a90c +landlock 4dd6da345ac249c30711693b4da8d732035f4351 +rust b9ecf9b9ac5969d7b7ea786ce5c76e24246df2c5 +sysctl 0dff89c4488f90c01807d9c12023433703206523 +folio 03b33c09ea22fa89dd204ad0a2058e512c691b9f +execve 6a46bf558803dd2b959ca7435a5c143efe837217 +bitmap 2386459394d2a46964829a00c48a08a23ead94ed +hte 9abf2313adc1ca1b6180c508c25f22f9395cc780 +kspp d6a9fb87e9d18f3394a9845546bbe868efdccfd2 +kspp-gustavo 0811296c55b7f0c5b038410828e37a1a1bf04463 +iommufd d6c55c0a20e5059abdde81713ddf6324a946eb3c +mm-stable 8fa590bf344816c925810331eea8387627bbeb40 +mm-nonmm-stable 8fa590bf344816c925810331eea8387627bbeb40 +mm 1d63c4bab97cc1e4ed21445120839a2de3c98060 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..2de75678f574 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,373 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#for-stable +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#master +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git#master +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#master +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-gadget-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#fixes +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +i3c-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/fixes +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +amdgpu-fixes git git://people.freedesktop.org/~agd5f/linux#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +pidfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +integrity-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +cel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-rc +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +broadcom-fixes git https://github.com/Broadcom/stblinux.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +asahi-soc-fixes git https://github.com/AsahiLinux/linux.git#asahi-soc/fixes +iommufd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +actions git git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc git https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +broadcom git https://github.com/Broadcom/stblinux.git#next +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +keystone git git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git#next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +raspberrypi git git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +nios2 git git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git#for-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +powerpc-objtool git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/objtool +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git://git.libc.org/linux-sh#for-next +sparc-next git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git#master +uml git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#next +xtensa git git://github.com/jcmvbkbc/linux-xtensa.git#xtensa-for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +vfs-idmapping git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#master +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git#fsverity +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#for-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +ieee1394 git git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git#for-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#master +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git#master +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#master +bluetooth git git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git#master +wireless-next git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git#for-next +mtd git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/next +nand git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#nand/next +spi-nor git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#spi-nor/next +crypto git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git#master +drm git git://git.freedesktop.org/git/drm/drm.git#drm-next +drm-misc git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next +amdgpu git https://gitlab.freedesktop.org/agd5f/linux#drm-next +drm-intel git git://anongit.freedesktop.org/drm-intel#for-linux-next +drm-tegra git https://gitlab.freedesktop.org/drm/tegra.git#for-next +drm-msm git https://gitlab.freedesktop.org/drm/msm.git#msm-next +drm-msm-lumag git https://gitlab.freedesktop.org/lumag/msm.git#msm-next-lumag +imx-drm git https://git.pengutronix.de/git/pza/linux#imx-drm/next +etnaviv git https://git.pengutronix.de/git/lst/linux#etnaviv/next +fbdev git git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git#for-next +regmap git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-next +sound git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-next +sound-asoc git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-next +modules git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-next +input git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#next +block git git://git.kernel.dk/linux-block.git#for-next +device-mapper git git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git#for-next +libata git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git#for-next +pcmcia git git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git#pcmcia-next +mmc git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#next +mfd git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-next +backlight git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-next +battery git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#for-next +regulator git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-next +security git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git#next +apparmor git git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor#apparmor-next +integrity git git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity#next-integrity +keys git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#keys-next +safesetid git https://github.com/micah-morton/linux.git#safesetid-next +selinux git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git#next +smack git git://github.com/cschaufler/smack-next#next +tomoyo git https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git#master +tpmdd git git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git#next +watchdog git git://www.linux-watchdog.org/linux-watchdog-next.git#master +iommu git git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git#next +audit git git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git#next +devicetree git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#for-next +dt-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#for-next +mailbox git git://git.linaro.org/landing-teams/working/fujitsu/integration.git#mailbox-for-next +spi git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-next +tip git git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git#master +clockevents git git://git.linaro.org/people/daniel.lezcano/linux.git#timers/drivers/next +edac git git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git#edac-for-next +irqchip git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-next +ftrace git git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git#for-next +rcu git git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git#rcu/next +kvm git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#next +kvm-arm git git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git#next +kvms390 git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-gadget git git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +gpio-sim git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/gpio-sim +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +cisco git https://github.com/daniel-walker/cisco-linux.git#for-next +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +init git git://git.infradead.org/users/hch/misc.git#init-user-pointers +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +folio-iomap git git://git.infradead.org/users/willy/linux.git#folio-iomap +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +folio git git://git.infradead.org/users/willy/pagecache.git#for-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..e8a680343272 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,6238 @@ +$ date -R +Fri, 16 Dec 2022 08:45:22 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 6f1f5caed5bf Merge tag 'for-linus-6.2-ofs1' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux +Merging origin/master (785d21ba2f44 Merge tag 'vfio-v6.2-rc1' of https://github.com/awilliam/linux-vfio) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 6f1f5caed5bf..785d21ba2f44 +Fast-forward (no commit created; -m option ignored) + Documentation/ABI/testing/sysfs-fs-f2fs | 47 +- + Documentation/ABI/testing/sysfs-kernel-oops_count | 6 + + Documentation/ABI/testing/sysfs-kernel-warn_count | 6 + + Documentation/admin-guide/kdump/vmcoreinfo.rst | 29 + + Documentation/admin-guide/sysctl/kernel.rst | 19 + + Documentation/core-api/kernel-api.rst | 3 + + Documentation/crypto/devel-algos.rst | 2 +- + Documentation/crypto/userspace-if.rst | 15 +- + .../bindings/crypto/rockchip,rk3288-crypto.yaml | 127 ++ + .../devicetree/bindings/crypto/rockchip-crypto.txt | 28 - + .../devicetree/bindings/crypto/st,stm32-cryp.yaml | 19 + + .../devicetree/bindings/gpio/gpio-davinci.yaml | 2 +- + .../devicetree/bindings/gpio/gpio-latch.yaml | 94 ++ + .../devicetree/bindings/gpio/gpio-pca9570.yaml | 1 + + .../bindings/gpio/hisilicon,ascend910-gpio.yaml | 56 + + .../devicetree/bindings/rng/nuvoton,npcm-rng.yaml | 4 +- + .../bindings/thermal/generic-adc-thermal.yaml | 84 + + .../bindings/thermal/imx8mm-thermal.yaml | 7 + + .../bindings/thermal/mediatek-thermal.txt | 2 + + .../devicetree/bindings/thermal/qcom-tsens.yaml | 81 +- + .../devicetree/bindings/thermal/rzg2l-thermal.yaml | 2 +- + .../bindings/thermal/thermal-generic-adc.txt | 95 -- + .../bindings/thermal/ti,j72xx-thermal.yaml | 35 +- + Documentation/driver-api/gpio/legacy.rst | 5 - + .../features/vm/huge-vmap/arch-support.txt | 2 +- + Documentation/filesystems/f2fs.rst | 13 +- + Documentation/riscv/patch-acceptance.rst | 22 +- + Documentation/virt/kvm/api.rst | 274 ++-- + Documentation/virt/kvm/arm/pvtime.rst | 14 +- + Documentation/virt/kvm/devices/arm-vgic-its.rst | 5 +- + Documentation/virt/kvm/devices/vcpu.rst | 2 + + MAINTAINERS | 34 +- + Makefile | 6 +- + arch/Kconfig | 24 + + arch/arm/Kconfig | 21 - + arch/arm/boot/compressed/Makefile | 2 +- + arch/arm/crypto/Kconfig | 2 +- + arch/arm/crypto/aes-cipher-glue.c | 2 +- + arch/arm/crypto/nh-neon-core.S | 2 +- + arch/arm/crypto/nhpoly1305-neon-glue.c | 11 +- + arch/arm/include/asm/gpio.h | 1 - + arch/arm64/Kconfig | 13 +- + arch/arm64/crypto/Kconfig | 49 +- + arch/arm64/crypto/Makefile | 9 + + arch/arm64/crypto/aes-ce-glue.c | 2 +- + arch/arm64/crypto/aes-cipher-glue.c | 2 +- + arch/arm64/crypto/aes-modes.S | 34 +- + arch/arm64/crypto/aes-neonbs-core.S | 16 +- + arch/arm64/crypto/crct10dif-ce-core.S | 5 +- + arch/arm64/crypto/ghash-ce-core.S | 8 +- + arch/arm64/crypto/ghash-ce-glue.c | 2 +- + arch/arm64/crypto/nh-neon-core.S | 5 +- + arch/arm64/crypto/nhpoly1305-neon-glue.c | 11 +- + arch/arm64/crypto/sm3-ce-glue.c | 2 +- + arch/arm64/crypto/sm3-neon-core.S | 601 ++++++++ + arch/arm64/crypto/sm3-neon-glue.c | 103 ++ + arch/arm64/crypto/sm4-ce-asm.h | 209 +++ + arch/arm64/crypto/sm4-ce-ccm-core.S | 328 ++++ + arch/arm64/crypto/sm4-ce-ccm-glue.c | 303 ++++ + arch/arm64/crypto/sm4-ce-cipher-glue.c | 2 +- + arch/arm64/crypto/sm4-ce-core.S | 1205 ++++++++++----- + arch/arm64/crypto/sm4-ce-gcm-core.S | 741 +++++++++ + arch/arm64/crypto/sm4-ce-gcm-glue.c | 286 ++++ + arch/arm64/crypto/sm4-ce-glue.c | 575 ++++++- + arch/arm64/crypto/sm4-ce.h | 16 + + arch/arm64/crypto/sm4-neon-core.S | 630 +++++--- + arch/arm64/crypto/sm4-neon-glue.c | 172 +-- + arch/arm64/include/asm/kvm_arm.h | 8 +- + arch/arm64/include/asm/kvm_asm.h | 7 +- + arch/arm64/include/asm/kvm_host.h | 76 +- + arch/arm64/include/asm/kvm_hyp.h | 3 + + arch/arm64/include/asm/kvm_mmu.h | 2 +- + arch/arm64/include/asm/kvm_pgtable.h | 175 ++- + arch/arm64/include/asm/kvm_pkvm.h | 38 + + arch/arm64/include/asm/mte.h | 65 +- + arch/arm64/include/asm/pgtable.h | 4 +- + arch/arm64/include/uapi/asm/kvm.h | 1 + + arch/arm64/kernel/cpufeature.c | 4 +- + arch/arm64/kernel/elfcore.c | 2 +- + arch/arm64/kernel/hibernate.c | 2 +- + arch/arm64/kernel/image-vars.h | 15 - + arch/arm64/kernel/mte.c | 21 +- + arch/arm64/kernel/vdso/Makefile | 2 +- + arch/arm64/kernel/vdso32/Makefile | 2 +- + arch/arm64/kvm/Kconfig | 2 + + arch/arm64/kvm/arm.c | 95 +- + arch/arm64/kvm/guest.c | 18 +- + arch/arm64/kvm/hyp/hyp-constants.c | 3 + + arch/arm64/kvm/hyp/include/nvhe/mem_protect.h | 25 +- + arch/arm64/kvm/hyp/include/nvhe/memory.h | 27 + + arch/arm64/kvm/hyp/include/nvhe/mm.h | 18 +- + arch/arm64/kvm/hyp/include/nvhe/pkvm.h | 68 + + arch/arm64/kvm/hyp/include/nvhe/spinlock.h | 10 +- + arch/arm64/kvm/hyp/nvhe/cache.S | 11 + + arch/arm64/kvm/hyp/nvhe/hyp-main.c | 110 +- + arch/arm64/kvm/hyp/nvhe/hyp-smp.c | 2 + + arch/arm64/kvm/hyp/nvhe/mem_protect.c | 521 ++++++- + arch/arm64/kvm/hyp/nvhe/mm.c | 167 +- + arch/arm64/kvm/hyp/nvhe/page_alloc.c | 29 +- + arch/arm64/kvm/hyp/nvhe/pkvm.c | 436 ++++++ + arch/arm64/kvm/hyp/nvhe/setup.c | 98 +- + arch/arm64/kvm/hyp/pgtable.c | 652 ++++---- + arch/arm64/kvm/hyp/vhe/Makefile | 2 +- + arch/arm64/kvm/irq.h | 16 - + arch/arm64/kvm/mmu.c | 195 ++- + arch/arm64/kvm/pkvm.c | 138 +- + arch/arm64/kvm/pmu-emul.c | 482 +++--- + arch/arm64/kvm/reset.c | 29 - + arch/arm64/kvm/sys_regs.c | 157 +- + arch/arm64/kvm/vgic/vgic-its.c | 20 + + arch/arm64/mm/copypage.c | 7 +- + arch/arm64/mm/fault.c | 4 +- + arch/arm64/mm/mteswap.c | 16 +- + arch/ia64/Kconfig | 1 + + arch/ia64/Makefile | 2 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 2 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 2 +- + arch/powerpc/kvm/irq.h | 22 - + arch/powerpc/kvm/powerpc.c | 18 +- + arch/riscv/Kconfig | 19 +- + arch/riscv/Kconfig.erratas | 13 + + arch/riscv/Kconfig.socs | 5 - + arch/riscv/boot/Makefile | 3 + + arch/riscv/configs/defconfig | 3 + + arch/riscv/errata/thead/errata.c | 19 + + arch/riscv/include/asm/alternative-macros.h | 99 +- + arch/riscv/include/asm/cacheflush.h | 7 + + arch/riscv/include/asm/errata_list.h | 16 +- + arch/riscv/include/asm/hugetlb.h | 6 + + arch/riscv/include/asm/hwcap.h | 3 +- + arch/riscv/include/asm/io.h | 5 + + arch/riscv/include/asm/kexec.h | 5 + + arch/riscv/include/asm/kprobes.h | 2 - + arch/riscv/include/asm/mmu.h | 2 + + arch/riscv/include/asm/page.h | 18 +- + arch/riscv/include/asm/pgtable-64.h | 6 +- + arch/riscv/include/asm/pgtable.h | 5 +- + arch/riscv/include/asm/sbi.h | 5 + + arch/riscv/include/asm/tlbflush.h | 18 + + arch/riscv/include/asm/vdso.h | 2 +- + arch/riscv/include/asm/vmalloc.h | 18 + + arch/riscv/include/uapi/asm/ucontext.h | 12 +- + arch/riscv/kernel/Makefile | 1 + + arch/riscv/kernel/cpu.c | 30 +- + arch/riscv/kernel/cpufeature.c | 43 +- + arch/riscv/kernel/crash_core.c | 21 + + arch/riscv/kernel/elf_kexec.c | 14 + + arch/riscv/kernel/entry.S | 21 +- + arch/riscv/kernel/mcount.S | 44 +- + arch/riscv/kernel/probes/Makefile | 2 +- + arch/riscv/kernel/probes/kprobes.c | 13 - + arch/riscv/kernel/probes/rethook.c | 27 + + arch/riscv/kernel/probes/rethook.h | 8 + + .../{kprobes_trampoline.S => rethook_trampoline.S} | 6 +- + arch/riscv/kernel/signal.c | 34 +- + arch/riscv/kernel/stacktrace.c | 11 +- + arch/riscv/kernel/traps.c | 22 +- + arch/riscv/mm/Makefile | 2 + + arch/riscv/mm/cacheflush.c | 7 + + arch/riscv/mm/context.c | 10 + + arch/riscv/mm/init.c | 25 +- + arch/riscv/mm/pgtable.c | 83 + + arch/riscv/mm/physaddr.c | 2 +- + arch/riscv/mm/pmem.c | 21 + + arch/riscv/mm/tlbflush.c | 28 +- + arch/s390/include/asm/kvm_host.h | 14 +- + arch/s390/include/asm/mem_encrypt.h | 4 +- + arch/s390/include/asm/stacktrace.h | 1 + + arch/s390/include/asm/uv.h | 10 + + arch/s390/kernel/asm-offsets.c | 1 + + arch/s390/kernel/entry.S | 26 +- + arch/s390/kernel/uv.c | 7 + + arch/s390/kvm/intercept.c | 9 +- + arch/s390/kvm/interrupt.c | 5 - + arch/s390/kvm/irq.h | 19 - + arch/s390/kvm/kvm-s390.c | 116 +- + arch/s390/kvm/kvm-s390.h | 8 +- + arch/s390/kvm/priv.c | 3 +- + arch/s390/kvm/pv.c | 357 ++++- + arch/s390/kvm/vsie.c | 4 +- + arch/s390/mm/gmap.c | 147 +- + arch/s390/mm/init.c | 12 +- + arch/um/drivers/random.c | 1 - + arch/um/drivers/virt-pci.c | 9 +- + arch/um/kernel/um_arch.c | 5 + + arch/x86/Kconfig | 80 +- + arch/x86/Makefile | 6 + + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/boot/compressed/head_64.S | 8 + + arch/x86/crypto/Makefile | 3 + + arch/x86/crypto/aegis128-aesni-asm.S | 9 +- + arch/x86/crypto/aria-aesni-avx-asm_64.S | 13 +- + arch/x86/crypto/camellia-aesni-avx-asm_64.S | 2 - + arch/x86/crypto/camellia-aesni-avx2-asm_64.S | 4 - + arch/x86/crypto/cast5-avx-x86_64-asm_64.S | 2 - + arch/x86/crypto/crct10dif-pcl-asm_64.S | 1 - + arch/x86/crypto/nh-avx2-x86_64.S | 5 +- + arch/x86/crypto/nh-sse2-x86_64.S | 5 +- + arch/x86/crypto/nhpoly1305-avx2-glue.c | 11 +- + arch/x86/crypto/nhpoly1305-sse2-glue.c | 11 +- + arch/x86/crypto/poly1305-x86_64-cryptogams.pl | 1 - + arch/x86/crypto/serpent-avx-x86_64-asm_64.S | 2 - + arch/x86/crypto/serpent-avx2-asm_64.S | 2 - + arch/x86/crypto/sha1_ni_asm.S | 4 +- + arch/x86/crypto/sha1_ssse3_asm.S | 3 +- + arch/x86/crypto/sha256-avx-asm.S | 4 +- + arch/x86/crypto/sha256-avx2-asm.S | 4 +- + arch/x86/crypto/sha256-ssse3-asm.S | 4 +- + arch/x86/crypto/sha256_ni_asm.S | 4 +- + arch/x86/crypto/sha512-avx-asm.S | 3 +- + arch/x86/crypto/sha512-avx2-asm.S | 3 +- + arch/x86/crypto/sha512-ssse3-asm.S | 3 +- + arch/x86/crypto/sm3-avx-asm_64.S | 4 +- + arch/x86/crypto/sm4-aesni-avx-asm_64.S | 14 +- + arch/x86/crypto/sm4-aesni-avx2-asm_64.S | 13 +- + arch/x86/crypto/twofish-avx-x86_64-asm_64.S | 2 - + arch/x86/crypto/twofish_glue.c | 2 +- + arch/x86/entry/entry_32.S | 4 +- + arch/x86/entry/entry_64.S | 50 +- + arch/x86/entry/entry_64_compat.S | 7 +- + arch/x86/entry/thunk_64.S | 4 +- + arch/x86/entry/vdso/Makefile | 14 +- + arch/x86/events/intel/lbr.c | 6 +- + arch/x86/include/asm/alternative.h | 68 +- + arch/x86/include/asm/cpufeatures.h | 6 +- + arch/x86/include/asm/current.h | 32 +- + arch/x86/include/asm/debugreg.h | 2 +- + arch/x86/include/asm/disabled-features.h | 9 +- + arch/x86/include/asm/hardirq.h | 3 +- + arch/x86/include/asm/hyperv-tlfs.h | 37 + + arch/x86/include/asm/irq_stack.h | 12 +- + arch/x86/include/asm/kvm-x86-ops.h | 4 +- + arch/x86/include/asm/kvm_host.h | 145 +- + arch/x86/include/asm/linkage.h | 63 +- + arch/x86/include/asm/nospec-branch.h | 176 ++- + arch/x86/include/asm/paravirt.h | 17 +- + arch/x86/include/asm/paravirt_types.h | 34 +- + arch/x86/include/asm/perf_event.h | 6 +- + arch/x86/include/asm/preempt.h | 27 +- + arch/x86/include/asm/processor.h | 11 +- + arch/x86/include/asm/qspinlock_paravirt.h | 47 +- + arch/x86/include/asm/smp.h | 12 +- + arch/x86/include/asm/svm.h | 100 +- + arch/x86/include/asm/text-patching.h | 1 + + arch/x86/include/uapi/asm/kvm.h | 13 +- + arch/x86/kernel/Makefile | 2 + + arch/x86/kernel/alternative.c | 529 ++++++- + arch/x86/kernel/asm-offsets.c | 5 + + arch/x86/kernel/asm-offsets_64.c | 2 +- + arch/x86/kernel/callthunks.c | 388 +++++ + arch/x86/kernel/cpu/Makefile | 3 - + arch/x86/kernel/cpu/bugs.c | 34 +- + arch/x86/kernel/cpu/common.c | 97 +- + arch/x86/kernel/dumpstack_32.c | 4 +- + arch/x86/kernel/dumpstack_64.c | 2 +- + arch/x86/kernel/ftrace.c | 20 +- + arch/x86/kernel/ftrace_64.S | 37 +- + arch/x86/kernel/head_64.S | 1 + + arch/x86/kernel/irq_32.c | 13 +- + arch/x86/kernel/irq_64.c | 6 +- + arch/x86/kernel/kprobes/core.c | 1 - + arch/x86/kernel/kvm.c | 20 +- + arch/x86/kernel/module.c | 47 +- + arch/x86/kernel/paravirt.c | 21 +- + arch/x86/kernel/process_32.c | 6 +- + arch/x86/kernel/process_64.c | 6 +- + arch/x86/kernel/relocate_kernel_64.S | 5 +- + arch/x86/kernel/setup_percpu.c | 7 +- + arch/x86/kernel/smpboot.c | 10 +- + arch/x86/kernel/static_call.c | 3 +- + arch/x86/kernel/traps.c | 4 +- + arch/x86/kernel/unwind_orc.c | 21 +- + arch/x86/kernel/vmlinux.lds.S | 37 +- + arch/x86/kvm/Kconfig | 11 + + arch/x86/kvm/Makefile | 6 +- + arch/x86/kvm/cpuid.c | 33 +- + arch/x86/kvm/emulate.c | 355 +---- + arch/x86/kvm/hyperv.c | 353 ++++- + arch/x86/kvm/hyperv.h | 64 +- + arch/x86/kvm/irq.c | 7 +- + arch/x86/kvm/kvm_cache_regs.h | 5 - + arch/x86/kvm/kvm_emulate.h | 48 +- + arch/x86/kvm/lapic.c | 16 +- + arch/x86/kvm/lapic.h | 2 +- + arch/x86/kvm/mmu/mmu.c | 176 ++- + arch/x86/kvm/mmu/mmu_internal.h | 33 +- + arch/x86/kvm/mmu/paging_tmpl.h | 6 +- + arch/x86/kvm/mmu/spte.c | 12 + + arch/x86/kvm/mmu/spte.h | 19 +- + arch/x86/kvm/mmu/tdp_mmu.c | 114 +- + arch/x86/kvm/mmu/tdp_mmu.h | 2 + + arch/x86/kvm/pmu.c | 90 +- + arch/x86/kvm/pmu.h | 6 +- + arch/x86/kvm/reverse_cpuid.h | 25 +- + arch/x86/kvm/smm.c | 649 ++++++++ + arch/x86/kvm/smm.h | 168 ++ + arch/x86/kvm/svm/hyperv.c | 18 + + arch/x86/kvm/svm/hyperv.h | 50 +- + arch/x86/kvm/svm/nested.c | 52 +- + arch/x86/kvm/svm/pmu.c | 4 +- + arch/x86/kvm/svm/sev.c | 6 +- + arch/x86/kvm/svm/svm.c | 63 +- + arch/x86/kvm/svm/svm.h | 5 +- + arch/x86/kvm/svm/svm_onhyperv.c | 8 +- + arch/x86/kvm/svm/svm_onhyperv.h | 25 +- + arch/x86/kvm/svm/vmenter.S | 1 + + arch/x86/kvm/trace.h | 36 +- + arch/x86/kvm/vmx/capabilities.h | 24 - + arch/x86/kvm/vmx/{evmcs.c => hyperv.c} | 45 +- + arch/x86/kvm/vmx/{evmcs.h => hyperv.h} | 12 +- + arch/x86/kvm/vmx/nested.c | 108 +- + arch/x86/kvm/vmx/nested.h | 7 +- + arch/x86/kvm/vmx/pmu_intel.c | 11 +- + arch/x86/kvm/vmx/sgx.c | 4 +- + arch/x86/kvm/vmx/vmcs12.h | 5 +- + arch/x86/kvm/vmx/vmenter.S | 2 + + arch/x86/kvm/vmx/vmx.c | 104 +- + arch/x86/kvm/vmx/vmx_ops.h | 20 +- + arch/x86/kvm/x86.c | 533 ++----- + arch/x86/kvm/x86.h | 1 + + arch/x86/kvm/xen.c | 505 ++++-- + arch/x86/kvm/xen.h | 13 +- + arch/x86/lib/error-inject.c | 1 + + arch/x86/lib/putuser.S | 62 +- + arch/x86/lib/retpoline.S | 107 +- + arch/x86/mm/pgtable.c | 22 +- + arch/x86/net/bpf_jit_comp.c | 45 +- + arch/x86/power/hibernate.c | 2 +- + arch/x86/xen/enlighten_pv.c | 2 +- + crypto/Kconfig | 9 +- + crypto/Makefile | 1 - + crypto/aes_generic.c | 2 +- + crypto/aes_ti.c | 2 +- + crypto/af_alg.c | 135 +- + crypto/algapi.c | 160 +- + crypto/algboss.c | 22 +- + crypto/anubis.c | 2 +- + crypto/api.c | 11 +- + crypto/blowfish_common.c | 3 +- + crypto/blowfish_generic.c | 3 +- + crypto/camellia_generic.c | 2 +- + crypto/cast5_generic.c | 2 +- + crypto/cast6_generic.c | 2 +- + crypto/ccm.c | 2 +- + crypto/cryptd.c | 36 +- + crypto/des_generic.c | 2 +- + crypto/dh.c | 4 +- + crypto/fcrypt.c | 2 +- + crypto/internal.h | 20 +- + crypto/kdf_sp800108.c | 10 +- + crypto/khazad.c | 2 +- + crypto/rsa-pkcs1pad.c | 5 +- + crypto/seed.c | 2 +- + crypto/serpent_generic.c | 2 +- + crypto/shash.c | 27 +- + crypto/skcipher.c | 2 +- + crypto/sm4_generic.c | 2 +- + crypto/tcrypt.c | 317 ++-- + crypto/tea.c | 2 +- + crypto/testmgr.c | 19 + + crypto/testmgr.h | 977 ++++++++++++ + crypto/twofish_common.c | 2 +- + crypto/twofish_generic.c | 2 +- + drivers/acpi/acpica/dswexec.c | 6 +- + drivers/acpi/acpica/evxfregn.c | 92 +- + drivers/acpi/ec.c | 32 +- + drivers/acpi/internal.h | 1 + + drivers/base/firmware_loader/main.c | 2 +- + drivers/char/hw_random/amd-rng.c | 18 +- + drivers/char/hw_random/cavium-rng-vf.c | 1 - + drivers/char/hw_random/cn10k-rng.c | 1 - + drivers/char/hw_random/core.c | 9 +- + drivers/char/hw_random/geode-rng.c | 36 +- + drivers/char/hw_random/mpfs-rng.c | 1 - + drivers/char/hw_random/mtk-rng.c | 5 +- + drivers/char/hw_random/npcm-rng.c | 15 +- + drivers/char/hw_random/s390-trng.c | 1 - + drivers/char/hw_random/stm32-rng.c | 8 +- + drivers/char/hw_random/timeriomem-rng.c | 2 - + drivers/char/hw_random/virtio-rng.c | 1 - + drivers/crypto/Kconfig | 19 +- + drivers/crypto/Makefile | 2 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-trng.c | 1 - + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 2 +- + drivers/crypto/amlogic/amlogic-gxl-core.c | 1 - + drivers/crypto/amlogic/amlogic-gxl.h | 2 +- + drivers/crypto/atmel-ecc.c | 6 +- + drivers/crypto/atmel-sha204a.c | 7 +- + drivers/crypto/caam/blob_gen.c | 9 + + drivers/crypto/caam/caamalg.c | 72 +- + drivers/crypto/caam/caamalg_qi.c | 52 +- + drivers/crypto/caam/caamalg_qi2.c | 173 +-- + drivers/crypto/caam/caamhash.c | 87 +- + drivers/crypto/caam/caampkc.c | 50 +- + drivers/crypto/caam/caamrng.c | 1 - + drivers/crypto/caam/regs.h | 3 + + drivers/crypto/cavium/cpt/cptvf_algs.c | 10 +- + drivers/crypto/cavium/nitrox/nitrox_aead.c | 12 +- + drivers/crypto/cavium/nitrox/nitrox_mbx.c | 1 + + drivers/crypto/ccp/ccp-crypto-aes-cmac.c | 21 +- + drivers/crypto/ccp/ccp-crypto-aes-galois.c | 12 +- + drivers/crypto/ccp/ccp-crypto-aes-xts.c | 20 +- + drivers/crypto/ccp/ccp-crypto-aes.c | 29 +- + drivers/crypto/ccp/ccp-crypto-des3.c | 17 +- + drivers/crypto/ccp/ccp-crypto-main.c | 15 +- + drivers/crypto/ccp/ccp-crypto-rsa.c | 18 +- + drivers/crypto/ccp/ccp-crypto-sha.c | 26 +- + drivers/crypto/ccp/sp-pci.c | 11 +- + drivers/crypto/ccree/cc_aead.c | 62 +- + drivers/crypto/ccree/cc_buffer_mgr.c | 18 +- + drivers/crypto/ccree/cc_debugfs.c | 2 +- + drivers/crypto/ccree/cc_driver.c | 10 +- + drivers/crypto/ccree/cc_hash.c | 86 +- + drivers/crypto/chelsio/Kconfig | 2 +- + drivers/crypto/chelsio/chcr_algo.c | 49 +- + drivers/crypto/chelsio/chcr_crypto.h | 6 +- + drivers/crypto/hisilicon/Kconfig | 2 +- + drivers/crypto/hisilicon/Makefile | 2 +- + drivers/crypto/hisilicon/debugfs.c | 1147 ++++++++++++++ + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 47 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 17 +- + drivers/crypto/hisilicon/qm.c | 1427 ++--------------- + drivers/crypto/hisilicon/qm_common.h | 87 ++ + drivers/crypto/hisilicon/sec2/sec_crypto.c | 5 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 10 +- + drivers/crypto/hisilicon/zip/zip_main.c | 7 +- + drivers/crypto/img-hash.c | 8 +- + drivers/crypto/inside-secure/safexcel.c | 69 +- + drivers/crypto/inside-secure/safexcel.h | 10 +- + drivers/crypto/inside-secure/safexcel_hash.c | 99 +- + drivers/crypto/ixp4xx_crypto.c | 10 +- + drivers/crypto/keembay/keembay-ocs-hcu-core.c | 26 +- + drivers/crypto/marvell/octeontx/otx_cpt_hw_types.h | 2 +- + drivers/crypto/marvell/octeontx/otx_cptpf_ucode.c | 3 +- + drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | 69 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 79 +- + drivers/crypto/n2_core.c | 6 + + drivers/crypto/nx/nx-842.h | 2 +- + drivers/crypto/omap-sham.c | 2 +- + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.c | 4 +- + drivers/crypto/qat/qat_4xxx/adf_4xxx_hw_data.h | 2 +- + drivers/crypto/qat/qat_4xxx/adf_drv.c | 146 +- + drivers/crypto/qat/qat_c3xxx/adf_c3xxx_hw_data.c | 4 + + drivers/crypto/qat/qat_c3xxx/adf_drv.c | 2 +- + .../crypto/qat/qat_c3xxxvf/adf_c3xxxvf_hw_data.c | 4 + + drivers/crypto/qat/qat_c3xxxvf/adf_drv.c | 2 - + drivers/crypto/qat/qat_c62x/adf_c62x_hw_data.c | 4 + + drivers/crypto/qat/qat_c62x/adf_drv.c | 2 +- + drivers/crypto/qat/qat_c62xvf/adf_c62xvf_hw_data.c | 4 + + drivers/crypto/qat/qat_c62xvf/adf_drv.c | 2 - + drivers/crypto/qat/qat_common/Makefile | 8 +- + drivers/crypto/qat/qat_common/adf_accel_devices.h | 14 + + drivers/crypto/qat/qat_common/adf_cfg_strings.h | 1 + + drivers/crypto/qat/qat_common/adf_common_drv.h | 9 +- + drivers/crypto/qat/qat_common/adf_ctl_drv.c | 6 + + drivers/crypto/qat/qat_common/adf_gen2_config.c | 206 +++ + drivers/crypto/qat/qat_common/adf_gen2_config.h | 10 + + drivers/crypto/qat/qat_common/adf_gen2_dc.c | 70 + + drivers/crypto/qat/qat_common/adf_gen2_dc.h | 10 + + drivers/crypto/qat/qat_common/adf_gen4_dc.c | 83 + + drivers/crypto/qat/qat_common/adf_gen4_dc.h | 10 + + drivers/crypto/qat/qat_common/adf_init.c | 11 + + drivers/crypto/qat/qat_common/adf_sriov.c | 4 + + drivers/crypto/qat/qat_common/icp_qat_fw.h | 24 + + drivers/crypto/qat/qat_common/icp_qat_fw_comp.h | 404 +++++ + drivers/crypto/qat/qat_common/icp_qat_hw.h | 66 + + drivers/crypto/qat/qat_common/icp_qat_hw_20_comp.h | 164 ++ + .../qat/qat_common/icp_qat_hw_20_comp_defs.h | 300 ++++ + drivers/crypto/qat/qat_common/qat_algs.c | 208 +-- + drivers/crypto/qat/qat_common/qat_algs_send.h | 16 +- + drivers/crypto/qat/qat_common/qat_asym_algs.c | 6 +- + drivers/crypto/qat/qat_common/qat_bl.c | 383 +++++ + drivers/crypto/qat/qat_common/qat_bl.h | 67 + + drivers/crypto/qat/qat_common/qat_comp_algs.c | 344 +++++ + drivers/crypto/qat/qat_common/qat_comp_req.h | 123 ++ + drivers/crypto/qat/qat_common/qat_compression.c | 297 ++++ + drivers/crypto/qat/qat_common/qat_compression.h | 37 + + drivers/crypto/qat/qat_common/qat_crypto.c | 120 +- + drivers/crypto/qat/qat_common/qat_crypto.h | 55 +- + .../crypto/qat/qat_dh895xcc/adf_dh895xcc_hw_data.c | 4 + + drivers/crypto/qat/qat_dh895xcc/adf_drv.c | 2 +- + .../qat/qat_dh895xccvf/adf_dh895xccvf_hw_data.c | 4 + + drivers/crypto/qat/qat_dh895xccvf/adf_drv.c | 2 - + drivers/crypto/qce/aead.c | 22 +- + drivers/crypto/qce/common.c | 5 +- + drivers/crypto/qce/sha.c | 18 +- + drivers/crypto/rockchip/rk3288_crypto.c | 505 +++--- + drivers/crypto/rockchip/rk3288_crypto.h | 107 +- + drivers/crypto/rockchip/rk3288_crypto_ahash.c | 267 ++-- + drivers/crypto/rockchip/rk3288_crypto_skcipher.c | 543 ++++--- + drivers/crypto/stm32/Kconfig | 4 +- + drivers/crypto/stm32/stm32-cryp.c | 417 +++-- + drivers/crypto/talitos.c | 6 +- + drivers/crypto/talitos.h | 4 +- + drivers/crypto/ux500/Kconfig | 10 - + drivers/crypto/ux500/Makefile | 1 - + drivers/crypto/ux500/cryp/Makefile | 10 - + drivers/crypto/ux500/cryp/cryp.c | 394 ----- + drivers/crypto/ux500/cryp/cryp.h | 315 ---- + drivers/crypto/ux500/cryp/cryp_core.c | 1600 -------------------- + drivers/crypto/ux500/cryp/cryp_irq.c | 45 - + drivers/crypto/ux500/cryp/cryp_irq.h | 31 - + drivers/crypto/ux500/cryp/cryp_irqp.h | 125 -- + drivers/crypto/ux500/cryp/cryp_p.h | 122 -- + .../crypto/virtio/virtio_crypto_akcipher_algs.c | 5 +- + drivers/dma-buf/dma-resv.c | 9 +- + drivers/firmware/turris-mox-rwtm.c | 1 - + drivers/gpio/Kconfig | 29 +- + drivers/gpio/Makefile | 4 +- + drivers/gpio/TODO | 7 + + drivers/gpio/gpio-104-idio-16.c | 88 +- + drivers/gpio/gpio-aggregator.c | 7 +- + drivers/gpio/gpio-davinci.c | 14 +- + drivers/gpio/gpio-exar.c | 1 + + drivers/gpio/gpio-ftgpio010.c | 2 +- + drivers/gpio/gpio-gw-pld.c | 5 +- + drivers/gpio/gpio-hisi.c | 7 + + drivers/gpio/gpio-idio-16.c | 146 ++ + drivers/gpio/gpio-idio-16.h | 71 + + drivers/gpio/gpio-latch.c | 219 +++ + drivers/gpio/gpio-max7300.c | 5 +- + drivers/gpio/gpio-max732x.c | 6 +- + drivers/gpio/gpio-merrifield.c | 3 +- + drivers/gpio/gpio-pca953x.c | 6 +- + drivers/gpio/gpio-pca9570.c | 49 +- + drivers/gpio/gpio-pcf857x.c | 6 +- + drivers/gpio/gpio-pci-idio-16.c | 119 +- + drivers/gpio/gpio-sim.c | 4 + + drivers/gpio/gpio-sl28cpld.c | 3 +- + drivers/gpio/gpio-sta2x11.c | 411 ----- + drivers/gpio/gpio-tpic2810.c | 5 +- + drivers/gpio/gpio-ts4900.c | 5 +- + drivers/gpio/gpiolib-acpi.c | 134 +- + drivers/gpio/gpiolib-acpi.h | 54 +- + drivers/gpio/gpiolib-cdev.c | 206 ++- + drivers/gpio/gpiolib-of.c | 452 +++--- + drivers/gpio/gpiolib-of.h | 9 +- + drivers/gpio/gpiolib-swnode.c | 123 ++ + drivers/gpio/gpiolib-swnode.h | 14 + + drivers/gpio/gpiolib.c | 295 ++-- + drivers/gpio/gpiolib.h | 14 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_rgb.c | 5 +- + drivers/gpu/drm/i915/gvt/kvmgt.c | 1 - + drivers/gpu/drm/i915/i915_user_extensions.c | 2 +- + drivers/gpu/drm/i915/i915_utils.h | 4 - + drivers/gpu/drm/sti/sti_dvo.c | 5 +- + drivers/gpu/drm/sti/sti_hda.c | 5 +- + drivers/gpu/drm/sti/sti_hdmi.c | 5 +- + drivers/hid/hid-u2fzero.c | 1 - + drivers/irqchip/Kconfig | 21 +- + drivers/leds/blink/leds-lgm-sso.c | 5 +- + drivers/leds/leds-gpio.c | 5 +- + drivers/perf/riscv_pmu_sbi.c | 34 +- + drivers/s390/cio/vfio_ccw_chp.c | 5 +- + drivers/s390/cio/vfio_ccw_drv.c | 174 +-- + drivers/s390/cio/vfio_ccw_fsm.c | 27 +- + drivers/s390/cio/vfio_ccw_ops.c | 107 +- + drivers/s390/cio/vfio_ccw_private.h | 37 +- + drivers/s390/crypto/vfio_ap_drv.c | 2 +- + drivers/s390/crypto/vfio_ap_ops.c | 8 +- + drivers/s390/crypto/zcrypt_api.c | 6 - + drivers/thermal/gov_power_allocator.c | 1 - + drivers/thermal/imx8mm_thermal.c | 180 ++- + drivers/thermal/imx_sc_thermal.c | 6 - + drivers/thermal/intel/therm_throt.c | 5 +- + drivers/thermal/k3_j72xx_bandgap.c | 67 +- + drivers/thermal/qcom/lmh.c | 2 +- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 8 +- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 3 +- + drivers/thermal/qcom/tsens-8960.c | 3 + + drivers/thermal/qcom/tsens-v0_1.c | 3 + + drivers/thermal/qcom/tsens-v1.c | 3 + + drivers/thermal/qcom/tsens-v2.c | 20 + + drivers/thermal/qcom/tsens.c | 68 +- + drivers/thermal/qcom/tsens.h | 8 +- + drivers/thermal/st/stm_thermal.c | 4 +- + drivers/thermal/thermal_of.c | 8 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 2 +- + drivers/usb/misc/chaoskey.c | 1 - + drivers/vfio/Kconfig | 7 +- + drivers/vfio/Makefile | 5 +- + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 1 - + drivers/vfio/iova_bitmap.c | 33 +- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 156 +- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.h | 2 + + drivers/vfio/pci/mlx5/cmd.c | 413 ++++- + drivers/vfio/pci/mlx5/cmd.h | 96 +- + drivers/vfio/pci/mlx5/main.c | 784 ++++++++-- + drivers/vfio/pci/vfio_pci_core.c | 15 +- + drivers/vfio/platform/vfio_amba.c | 1 - + drivers/vfio/platform/vfio_platform.c | 1 - + drivers/vfio/platform/vfio_platform_common.c | 3 +- + drivers/vfio/vfio.h | 13 + + drivers/vfio/vfio_iommu_spapr_tce.c | 65 +- + drivers/vfio/vfio_main.c | 145 +- + drivers/vfio/vfio_spapr_eeh.c | 107 -- + drivers/vfio/virqfd.c | 17 +- + drivers/video/fbdev/Kconfig | 2 +- + drivers/video/fbdev/controlfb.c | 2 +- + drivers/video/fbdev/core/fbcon.c | 3 +- + drivers/video/fbdev/da8xx-fb.c | 7 +- + drivers/video/fbdev/ep93xx-fb.c | 4 +- + drivers/video/fbdev/geode/Kconfig | 1 + + drivers/video/fbdev/matrox/matroxfb_maven.c | 5 +- + .../omap2/omapfb/displays/connector-analog-tv.c | 60 +- + .../fbdev/omap2/omapfb/displays/connector-hdmi.c | 49 +- + .../fbdev/omap2/omapfb/displays/encoder-opa362.c | 4 +- + .../fbdev/omap2/omapfb/displays/encoder-tfp410.c | 67 +- + .../video/fbdev/omap2/omapfb/displays/panel-dpi.c | 83 +- + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 116 +- + .../omapfb/displays/panel-lgphilips-lb035q02.c | 21 +- + .../omap2/omapfb/displays/panel-nec-nl8048hl11.c | 72 +- + .../omapfb/displays/panel-sharp-ls037v7dw01.c | 3 +- + .../omap2/omapfb/displays/panel-sony-acx565akm.c | 105 +- + .../omap2/omapfb/displays/panel-tpo-td028ttec1.c | 1 - + .../omap2/omapfb/displays/panel-tpo-td043mtea1.c | 59 +- + drivers/video/fbdev/omap2/omapfb/dss/hdmi5_core.c | 2 - + drivers/video/fbdev/pm2fb.c | 9 +- + drivers/video/fbdev/pxafb.c | 1 - + drivers/video/fbdev/sh_mobile_lcdcfb.c | 8 +- + drivers/video/fbdev/smscufx.c | 46 +- + drivers/video/fbdev/ssd1307fb.c | 12 +- + drivers/video/fbdev/uvesafb.c | 39 +- + drivers/video/fbdev/vermilion/vermilion.c | 4 +- + drivers/video/fbdev/via/via-core.c | 9 +- + fs/btrfs/send.c | 11 +- + fs/cifs/cifs_spnego.c | 2 +- + fs/cifs/cifsacl.c | 2 +- + fs/coredump.c | 7 +- + fs/f2fs/checkpoint.c | 9 +- + fs/f2fs/compress.c | 48 +- + fs/f2fs/data.c | 54 +- + fs/f2fs/debug.c | 131 +- + fs/f2fs/dir.c | 36 +- + fs/f2fs/extent_cache.c | 693 ++++++--- + fs/f2fs/f2fs.h | 278 ++-- + fs/f2fs/file.c | 46 +- + fs/f2fs/gc.c | 79 +- + fs/f2fs/inode.c | 20 +- + fs/f2fs/namei.c | 391 +++-- + fs/f2fs/node.c | 19 +- + fs/f2fs/node.h | 3 +- + fs/f2fs/recovery.c | 4 +- + fs/f2fs/segment.c | 201 ++- + fs/f2fs/segment.h | 6 - + fs/f2fs/shrinker.c | 25 +- + fs/f2fs/super.c | 126 +- + fs/f2fs/sysfs.c | 164 +- + fs/ksmbd/ksmbd_netlink.h | 1 + + fs/ksmbd/mgmt/user_session.c | 8 +- + fs/ksmbd/server.c | 20 +- + fs/ksmbd/smb2ops.c | 10 +- + fs/ksmbd/smb2pdu.c | 20 +- + fs/ksmbd/smb2pdu.h | 2 +- + fs/ksmbd/smb_common.c | 2 +- + fs/ksmbd/smb_common.h | 12 +- + fs/nfs/flexfilelayout/flexfilelayout.c | 4 +- + fs/nfs/nfs4idmap.c | 2 +- + fs/nfsd/nfs4callback.c | 2 +- + fs/proc/page.c | 3 +- + include/acpi/acpixf.h | 130 +- + include/asm-generic/gpio.h | 55 +- + include/asm-generic/hyperv-tlfs.h | 5 + + include/asm-generic/mshyperv.h | 11 +- + include/asm-generic/vmlinux.lds.h | 4 +- + include/crypto/acompress.h | 1 + + include/crypto/akcipher.h | 7 +- + include/crypto/algapi.h | 43 +- + include/crypto/aria.h | 2 +- + include/crypto/gcm.h | 22 + + include/crypto/internal/acompress.h | 2 + + include/crypto/internal/aead.h | 22 + + include/crypto/internal/akcipher.h | 26 +- + include/crypto/internal/hash.h | 30 +- + include/crypto/internal/kpp.h | 30 +- + include/crypto/internal/scompress.h | 3 +- + include/crypto/internal/skcipher.h | 30 + + include/crypto/kpp.h | 9 +- + include/crypto/scatterwalk.h | 1 - + include/kvm/arm_pmu.h | 15 +- + include/kvm/arm_vgic.h | 1 + + include/linux/build_bug.h | 9 + + include/linux/compiler.h | 1 + + include/linux/crypto.h | 5 - + include/linux/device.h | 7 +- + include/linux/fortify-string.h | 148 +- + include/linux/gpio/consumer.h | 21 - + include/linux/gpio/property.h | 11 + + include/linux/hisi_acc_qm.h | 14 +- + include/linux/hpet.h | 2 +- + include/linux/hw_random.h | 2 +- + include/linux/kernel-page-flags.h | 1 + + include/linux/kvm_dirty_ring.h | 20 +- + include/linux/kvm_host.h | 107 +- + include/linux/kvm_types.h | 1 + + include/linux/linkage.h | 4 +- + include/linux/mlx5/mlx5_ifc.h | 14 +- + include/linux/mm.h | 1 + + include/linux/of_gpio.h | 2 +- + include/linux/overflow.h | 47 + + include/linux/page-flags.h | 3 +- + include/linux/panic.h | 1 + + include/linux/static_call.h | 2 + + include/linux/string.h | 2 +- + include/linux/vfio.h | 31 +- + include/trace/events/f2fs.h | 176 ++- + include/trace/events/mmflags.h | 9 +- + include/uapi/linux/f2fs.h | 1 + + include/uapi/linux/if_alg.h | 1 + + include/uapi/linux/kvm.h | 31 +- + include/uapi/linux/vfio.h | 136 +- + include/video/omap-panel-data.h | 71 - + init/Kconfig | 15 +- + kernel/cred.c | 15 +- + kernel/exit.c | 60 + + kernel/kcsan/report.c | 3 +- + kernel/padata.c | 15 +- + kernel/panic.c | 45 +- + kernel/sched/core.c | 3 +- + kernel/signal.c | 1 + + kernel/static_call_inline.c | 23 +- + kernel/trace/trace_selftest.c | 9 +- + lib/Kconfig.debug | 29 +- + lib/Makefile | 7 +- + lib/crypto/Kconfig | 9 + + lib/crypto/Makefile | 5 + + lib/crypto/aesgcm.c | 727 +++++++++ + {crypto => lib/crypto}/gf128mul.c | 58 +- + lib/fortify_kunit.c | 255 ++++ + lib/memcpy_kunit.c | 205 +++ + lib/overflow_kunit.c | 381 +++++ + lib/{test_siphash.c => siphash_kunit.c} | 165 +- + lib/string.c | 82 - + lib/strscpy_kunit.c | 142 ++ + lib/test_strscpy.c | 150 -- + lib/ubsan.c | 3 +- + mm/Kconfig | 8 + + mm/gup.c | 33 +- + mm/huge_memory.c | 3 +- + mm/hugetlb.c | 5 +- + mm/kasan/kasan_test.c | 19 +- + mm/kasan/report.c | 4 +- + mm/kfence/report.c | 3 +- + mm/slab_common.c | 26 +- + net/dns_resolver/dns_key.c | 2 +- + samples/ftrace/ftrace-direct-modify.c | 3 + + samples/ftrace/ftrace-direct-multi-modify.c | 3 + + samples/ftrace/ftrace-direct-multi.c | 2 + + samples/ftrace/ftrace-direct-too.c | 2 + + samples/ftrace/ftrace-direct.c | 2 + + samples/vfio-mdev/mbochs.c | 8 +- + samples/vfio-mdev/mdpy-fb.c | 8 +- + samples/vfio-mdev/mdpy.c | 8 +- + samples/vfio-mdev/mtty.c | 8 +- + scripts/Makefile.lib | 3 + + scripts/head-object-list.txt | 1 - + scripts/kernel-doc | 6 +- + security/apparmor/Kconfig | 4 +- + security/apparmor/Makefile | 3 +- + security/apparmor/apparmorfs.c | 115 +- + security/apparmor/audit.c | 45 +- + security/apparmor/capability.c | 16 +- + security/apparmor/domain.c | 149 +- + security/apparmor/file.c | 125 +- + security/apparmor/include/apparmor.h | 23 +- + security/apparmor/include/audit.h | 8 +- + security/apparmor/include/cred.h | 13 - + security/apparmor/include/domain.h | 6 - + security/apparmor/include/file.h | 108 +- + security/apparmor/include/label.h | 13 +- + security/apparmor/include/lib.h | 10 +- + security/apparmor/include/match.h | 28 +- + security/apparmor/include/net.h | 1 + + security/apparmor/include/perms.h | 91 +- + security/apparmor/include/policy.h | 141 +- + security/apparmor/include/policy_compat.h | 33 + + security/apparmor/include/policy_unpack.h | 4 +- + security/apparmor/ipc.c | 16 +- + security/apparmor/label.c | 75 +- + security/apparmor/lib.c | 125 +- + security/apparmor/lsm.c | 25 +- + security/apparmor/match.c | 62 +- + security/apparmor/mount.c | 93 +- + security/apparmor/net.c | 28 +- + security/apparmor/policy.c | 204 ++- + security/apparmor/policy_compat.c | 319 ++++ + security/apparmor/policy_ns.c | 6 +- + security/apparmor/policy_unpack.c | 589 ++++--- + security/apparmor/policy_unpack_test.c | 14 +- + security/apparmor/procattr.c | 11 +- + security/apparmor/resource.c | 29 +- + security/apparmor/task.c | 14 +- + tools/arch/x86/include/asm/atomic.h | 11 + + tools/arch/x86/include/uapi/asm/kvm.h | 8 - + tools/include/asm-generic/atomic-gcc.h | 23 + + tools/include/asm-generic/bitops/atomic.h | 15 +- + tools/include/linux/bitfield.h | 176 +++ + tools/include/linux/bitmap.h | 34 - + tools/include/linux/interval_tree_generic.h | 187 +++ + tools/include/uapi/linux/kvm.h | 20 +- + tools/objtool/arch/x86/decode.c | 24 + + tools/objtool/builtin-check.c | 9 +- + tools/objtool/check.c | 391 ++++- + tools/objtool/elf.c | 296 ++-- + tools/objtool/include/objtool/arch.h | 2 + + tools/objtool/include/objtool/builtin.h | 3 + + tools/objtool/include/objtool/check.h | 12 +- + tools/objtool/include/objtool/elf.h | 9 +- + tools/objtool/include/objtool/objtool.h | 1 + + tools/objtool/objtool.c | 1 + + tools/perf/bench/find-bit-bench.c | 2 +- + tools/perf/builtin-c2c.c | 6 +- + tools/perf/builtin-kwork.c | 6 +- + tools/perf/builtin-record.c | 6 +- + tools/perf/builtin-sched.c | 2 +- + tools/perf/tests/bitmap.c | 2 +- + tools/perf/tests/mem2node.c | 2 +- + tools/perf/util/affinity.c | 4 +- + tools/perf/util/header.c | 8 +- + tools/perf/util/mmap.c | 6 +- + tools/perf/util/pmu.c | 2 +- + .../perf/util/scripting-engines/trace-event-perl.c | 2 +- + .../util/scripting-engines/trace-event-python.c | 2 +- + tools/perf/util/session.c | 2 +- + tools/perf/util/svghelper.c | 2 +- + tools/testing/memblock/Makefile | 2 +- + tools/testing/memblock/TODO | 14 +- + tools/testing/memblock/main.c | 2 + + tools/testing/memblock/tests/alloc_exact_nid_api.c | 1113 ++++++++++++++ + tools/testing/memblock/tests/alloc_exact_nid_api.h | 25 + + tools/testing/memblock/tests/alloc_nid_api.c | 546 +++---- + tools/testing/memblock/tests/alloc_nid_api.h | 1 + + tools/testing/memblock/tests/basic_api.c | 184 +++ + tools/testing/memblock/tests/common.c | 7 +- + tools/testing/memblock/tests/common.h | 8 +- + tools/testing/selftests/kvm/.gitignore | 8 +- + tools/testing/selftests/kvm/Makefile | 16 +- + .../selftests/kvm/aarch64/aarch32_id_regs.c | 6 +- + tools/testing/selftests/kvm/aarch64/arch_timer.c | 31 +- + .../selftests/kvm/aarch64/debug-exceptions.c | 360 +++-- + tools/testing/selftests/kvm/aarch64/hypercalls.c | 3 - + .../selftests/kvm/aarch64/page_fault_test.c | 1117 ++++++++++++++ + tools/testing/selftests/kvm/aarch64/psci_test.c | 1 - + tools/testing/selftests/kvm/aarch64/vgic_init.c | 2 - + tools/testing/selftests/kvm/aarch64/vgic_irq.c | 10 +- + .../selftests/kvm/access_tracking_perf_test.c | 52 +- + tools/testing/selftests/kvm/demand_paging_test.c | 250 +-- + tools/testing/selftests/kvm/dirty_log_perf_test.c | 130 +- + tools/testing/selftests/kvm/dirty_log_test.c | 90 +- + .../selftests/kvm/include/aarch64/processor.h | 35 +- + .../testing/selftests/kvm/include/kvm_util_base.h | 75 +- + tools/testing/selftests/kvm/include/memstress.h | 75 + + .../testing/selftests/kvm/include/perf_test_util.h | 63 - + tools/testing/selftests/kvm/include/test_util.h | 25 + + tools/testing/selftests/kvm/include/ucall_common.h | 18 +- + .../selftests/kvm/include/userfaultfd_util.h | 45 + + tools/testing/selftests/kvm/include/x86_64/evmcs.h | 48 +- + .../testing/selftests/kvm/include/x86_64/hyperv.h | 103 ++ + .../selftests/kvm/include/x86_64/processor.h | 442 ++++-- + tools/testing/selftests/kvm/include/x86_64/svm.h | 26 +- + .../selftests/kvm/include/x86_64/svm_util.h | 14 + + tools/testing/selftests/kvm/include/x86_64/vmx.h | 25 +- + tools/testing/selftests/kvm/kvm_page_table_test.c | 6 +- + .../testing/selftests/kvm/lib/aarch64/processor.c | 83 +- + tools/testing/selftests/kvm/lib/aarch64/ucall.c | 102 +- + tools/testing/selftests/kvm/lib/elf.c | 5 +- + tools/testing/selftests/kvm/lib/kvm_util.c | 193 ++- + .../kvm/lib/{perf_test_util.c => memstress.c} | 136 +- + tools/testing/selftests/kvm/lib/riscv/processor.c | 29 +- + tools/testing/selftests/kvm/lib/riscv/ucall.c | 42 +- + tools/testing/selftests/kvm/lib/s390x/processor.c | 8 +- + tools/testing/selftests/kvm/lib/s390x/ucall.c | 39 +- + tools/testing/selftests/kvm/lib/test_util.c | 36 + + tools/testing/selftests/kvm/lib/ucall_common.c | 103 ++ + tools/testing/selftests/kvm/lib/userfaultfd_util.c | 186 +++ + tools/testing/selftests/kvm/lib/x86_64/hyperv.c | 46 + + .../lib/x86_64/{perf_test_util.c => memstress.c} | 37 +- + tools/testing/selftests/kvm/lib/x86_64/processor.c | 314 ++-- + tools/testing/selftests/kvm/lib/x86_64/ucall.c | 39 +- + tools/testing/selftests/kvm/lib/x86_64/vmx.c | 56 +- + .../testing/selftests/kvm/max_guest_memory_test.c | 21 +- + .../kvm/memslot_modification_stress_test.c | 44 +- + tools/testing/selftests/kvm/memslot_perf_test.c | 339 +++-- + tools/testing/selftests/kvm/rseq_test.c | 4 - + tools/testing/selftests/kvm/s390x/memop.c | 2 - + tools/testing/selftests/kvm/s390x/resets.c | 2 - + tools/testing/selftests/kvm/s390x/sync_regs_test.c | 3 - + .../testing/selftests/kvm/set_memory_region_test.c | 5 +- + tools/testing/selftests/kvm/steal_time.c | 1 - + .../selftests/kvm/system_counter_offset_test.c | 1 - + tools/testing/selftests/kvm/x86_64/amx_test.c | 112 +- + tools/testing/selftests/kvm/x86_64/cpuid_test.c | 11 +- + .../selftests/kvm/x86_64/cr4_cpuid_sync_test.c | 3 - + .../selftests/kvm/x86_64/emulator_error_test.c | 193 --- + .../kvm/x86_64/exit_on_emulation_failure_test.c | 45 + + .../testing/selftests/kvm/x86_64/flds_emulation.h | 55 + + tools/testing/selftests/kvm/x86_64/hyperv_cpuid.c | 3 - + .../kvm/x86_64/{evmcs_test.c => hyperv_evmcs.c} | 100 +- + .../testing/selftests/kvm/x86_64/hyperv_features.c | 25 +- + tools/testing/selftests/kvm/x86_64/hyperv_ipi.c | 314 ++++ + .../testing/selftests/kvm/x86_64/hyperv_svm_test.c | 103 +- + .../selftests/kvm/x86_64/hyperv_tlb_flush.c | 690 +++++++++ + .../selftests/kvm/x86_64/nx_huge_pages_test.c | 5 +- + .../selftests/kvm/x86_64/platform_info_test.c | 3 - + .../selftests/kvm/x86_64/pmu_event_filter_test.c | 77 +- + .../testing/selftests/kvm/x86_64/set_sregs_test.c | 3 - + .../kvm/x86_64/smaller_maxphyaddr_emulation_test.c | 111 ++ + tools/testing/selftests/kvm/x86_64/smm_test.c | 2 + + .../kvm/x86_64/svm_nested_soft_inject_test.c | 3 - + .../testing/selftests/kvm/x86_64/sync_regs_test.c | 3 - + .../selftests/kvm/x86_64/userspace_io_test.c | 3 - + .../selftests/kvm/x86_64/userspace_msr_exit_test.c | 88 +- + .../selftests/kvm/x86_64/vmx_dirty_log_test.c | 1 + + tools/testing/selftests/kvm/x86_64/vmx_msrs_test.c | 47 + + .../selftests/kvm/x86_64/vmx_pmu_caps_test.c | 19 +- + .../selftests/kvm/x86_64/xapic_state_test.c | 4 +- + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 141 +- + virt/kvm/Kconfig | 6 + + virt/kvm/dirty_ring.c | 46 +- + virt/kvm/irqchip.c | 3 +- + virt/kvm/kvm_main.c | 107 +- + virt/kvm/kvm_mm.h | 4 +- + virt/kvm/pfncache.c | 114 +- + 923 files changed, 39576 insertions(+), 18264 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-oops_count + create mode 100644 Documentation/ABI/testing/sysfs-kernel-warn_count + create mode 100644 Documentation/devicetree/bindings/crypto/rockchip,rk3288-crypto.yaml + delete mode 100644 Documentation/devicetree/bindings/crypto/rockchip-crypto.txt + create mode 100644 Documentation/devicetree/bindings/gpio/gpio-latch.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/hisilicon,ascend910-gpio.yaml + create mode 100644 Documentation/devicetree/bindings/thermal/generic-adc-thermal.yaml + delete mode 100644 Documentation/devicetree/bindings/thermal/thermal-generic-adc.txt + create mode 100644 arch/arm64/crypto/sm3-neon-core.S + create mode 100644 arch/arm64/crypto/sm3-neon-glue.c + create mode 100644 arch/arm64/crypto/sm4-ce-asm.h + create mode 100644 arch/arm64/crypto/sm4-ce-ccm-core.S + create mode 100644 arch/arm64/crypto/sm4-ce-ccm-glue.c + create mode 100644 arch/arm64/crypto/sm4-ce-gcm-core.S + create mode 100644 arch/arm64/crypto/sm4-ce-gcm-glue.c + create mode 100644 arch/arm64/crypto/sm4-ce.h + create mode 100644 arch/arm64/kvm/hyp/include/nvhe/pkvm.h + delete mode 100644 arch/arm64/kvm/irq.h + delete mode 100644 arch/powerpc/kvm/irq.h + create mode 100644 arch/riscv/kernel/crash_core.c + create mode 100644 arch/riscv/kernel/probes/rethook.c + create mode 100644 arch/riscv/kernel/probes/rethook.h + rename arch/riscv/kernel/probes/{kprobes_trampoline.S => rethook_trampoline.S} (94%) + create mode 100644 arch/riscv/mm/pgtable.c + create mode 100644 arch/riscv/mm/pmem.c + delete mode 100644 arch/s390/kvm/irq.h + create mode 100644 arch/x86/kernel/callthunks.c + create mode 100644 arch/x86/kvm/smm.c + create mode 100644 arch/x86/kvm/smm.h + create mode 100644 arch/x86/kvm/svm/hyperv.c + rename arch/x86/kvm/vmx/{evmcs.c => hyperv.c} (95%) + rename arch/x86/kvm/vmx/{evmcs.h => hyperv.h} (95%) + create mode 100644 drivers/crypto/hisilicon/debugfs.c + create mode 100644 drivers/crypto/hisilicon/qm_common.h + create mode 100644 drivers/crypto/qat/qat_common/adf_gen2_config.c + create mode 100644 drivers/crypto/qat/qat_common/adf_gen2_config.h + create mode 100644 drivers/crypto/qat/qat_common/adf_gen2_dc.c + create mode 100644 drivers/crypto/qat/qat_common/adf_gen2_dc.h + create mode 100644 drivers/crypto/qat/qat_common/adf_gen4_dc.c + create mode 100644 drivers/crypto/qat/qat_common/adf_gen4_dc.h + create mode 100644 drivers/crypto/qat/qat_common/icp_qat_fw_comp.h + create mode 100644 drivers/crypto/qat/qat_common/icp_qat_hw_20_comp.h + create mode 100644 drivers/crypto/qat/qat_common/icp_qat_hw_20_comp_defs.h + create mode 100644 drivers/crypto/qat/qat_common/qat_bl.c + create mode 100644 drivers/crypto/qat/qat_common/qat_bl.h + create mode 100644 drivers/crypto/qat/qat_common/qat_comp_algs.c + create mode 100644 drivers/crypto/qat/qat_common/qat_comp_req.h + create mode 100644 drivers/crypto/qat/qat_common/qat_compression.c + create mode 100644 drivers/crypto/qat/qat_common/qat_compression.h + delete mode 100644 drivers/crypto/ux500/cryp/Makefile + delete mode 100644 drivers/crypto/ux500/cryp/cryp.c + delete mode 100644 drivers/crypto/ux500/cryp/cryp.h + delete mode 100644 drivers/crypto/ux500/cryp/cryp_core.c + delete mode 100644 drivers/crypto/ux500/cryp/cryp_irq.c + delete mode 100644 drivers/crypto/ux500/cryp/cryp_irq.h + delete mode 100644 drivers/crypto/ux500/cryp/cryp_irqp.h + delete mode 100644 drivers/crypto/ux500/cryp/cryp_p.h + create mode 100644 drivers/gpio/gpio-idio-16.c + create mode 100644 drivers/gpio/gpio-idio-16.h + create mode 100644 drivers/gpio/gpio-latch.c + delete mode 100644 drivers/gpio/gpio-sta2x11.c + create mode 100644 drivers/gpio/gpiolib-swnode.c + create mode 100644 drivers/gpio/gpiolib-swnode.h + delete mode 100644 drivers/vfio/vfio_spapr_eeh.c + create mode 100644 include/linux/gpio/property.h + delete mode 100644 include/video/omap-panel-data.h + create mode 100644 lib/crypto/aesgcm.c + rename {crypto => lib/crypto}/gf128mul.c (87%) + rename lib/{test_siphash.c => siphash_kunit.c} (60%) + create mode 100644 lib/strscpy_kunit.c + delete mode 100644 lib/test_strscpy.c + create mode 100644 security/apparmor/include/policy_compat.h + create mode 100644 security/apparmor/policy_compat.c + create mode 100644 tools/include/linux/bitfield.h + create mode 100644 tools/include/linux/interval_tree_generic.h + create mode 100644 tools/testing/memblock/tests/alloc_exact_nid_api.c + create mode 100644 tools/testing/memblock/tests/alloc_exact_nid_api.h + create mode 100644 tools/testing/selftests/kvm/aarch64/page_fault_test.c + create mode 100644 tools/testing/selftests/kvm/include/memstress.h + delete mode 100644 tools/testing/selftests/kvm/include/perf_test_util.h + create mode 100644 tools/testing/selftests/kvm/include/userfaultfd_util.h + rename tools/testing/selftests/kvm/lib/{perf_test_util.c => memstress.c} (62%) + create mode 100644 tools/testing/selftests/kvm/lib/ucall_common.c + create mode 100644 tools/testing/selftests/kvm/lib/userfaultfd_util.c + create mode 100644 tools/testing/selftests/kvm/lib/x86_64/hyperv.c + rename tools/testing/selftests/kvm/lib/x86_64/{perf_test_util.c => memstress.c} (68%) + delete mode 100644 tools/testing/selftests/kvm/x86_64/emulator_error_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/exit_on_emulation_failure_test.c + create mode 100644 tools/testing/selftests/kvm/x86_64/flds_emulation.h + rename tools/testing/selftests/kvm/x86_64/{evmcs_test.c => hyperv_evmcs.c} (66%) + create mode 100644 tools/testing/selftests/kvm/x86_64/hyperv_ipi.c + create mode 100644 tools/testing/selftests/kvm/x86_64/hyperv_tlb_flush.c + create mode 100644 tools/testing/selftests/kvm/x86_64/smaller_maxphyaddr_emulation_test.c +Merging fixes/fixes (9c9155a3509a Merge tag 'drm-next-2022-10-14' of git://anongit.freedesktop.org/drm/drm) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git fixes/fixes +Already up to date. +Merging mm-hotfixes/mm-hotfixes-unstable (8fa590bf3448 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Already up to date. +Merging kbuild-current/fixes (869e4ae4cd2a nios2: add FORCE for vmlinuz.gz) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (73a0b6ee5d62 ARM: 9278/1: kfence: only handle translation faults) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (b7d9aae40484 Revert "arm64: dma: Drop cache invalidation from arch_dma_prep_coherent()") +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (ef19964da8a6 Revert "ARM: dts: imx7: Fix NAND controller size-cells") +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging davinci-current/davinci/for-current (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (9abf2313adc1 Linux 6.1-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 tee-fixes/fixes (98268f2a2a9f Merge branch 'optee_ffa_probe_fix_for_v5.18' into fixes) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Merge made by the 'ort' strategy. +Merging m68k-current/for-linus (553b20b211c4 m68k: defconfig: Update defconfigs for v6.1-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k-current/for-linus +Already up to date. +Merging powerpc-fixes/fixes (2e7ec190a0e3 powerpc/64s: Add missing declaration for machine_check_early_boot()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (adba1a9b81d5 MAINTAINERS: add S390 MM section) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Auto-merging arch/sparc/mm/srmmu.c +Merge made by the 'ort' strategy. +Merging fscrypt-current/for-stable (ccd30a476f8e fscrypt: fix keyring memory leak on mount failure) +$ git merge -m Merge branch 'for-stable' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt-current/for-stable +Already up to date. +Merging net/master (a7d82367daa6 net: dsa: mv88e6xxx: avoid reg_lock deadlock in mv88e6xxx_setup_port()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Merge made by the 'ort' strategy. + Documentation/networking/nf_conntrack-sysctl.rst | 33 +++ + drivers/isdn/hardware/mISDN/hfcmulti.c | 19 +- + drivers/isdn/hardware/mISDN/hfcpci.c | 13 +- + drivers/isdn/hardware/mISDN/hfcsusb.c | 12 +- + drivers/net/bonding/bond_main.c | 24 +- + drivers/net/dsa/mv88e6xxx/chip.c | 9 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 35 +-- + drivers/net/ethernet/intel/igb/igb_main.c | 2 +- + drivers/net/ethernet/rdc/r6040.c | 5 +- + drivers/net/ethernet/renesas/ravb_main.c | 2 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 1 + + drivers/net/macsec.c | 34 +-- + drivers/net/wireguard/timers.c | 8 +- + drivers/nfc/pn533/pn533.c | 4 + + net/netfilter/ipvs/ip_vs_ctl.c | 5 + + net/netfilter/nf_flow_table_offload.c | 6 +- + net/unix/af_unix.c | 11 +- + .../testing/selftests/drivers/net/bonding/Makefile | 3 +- + .../selftests/drivers/net/bonding/option_prio.sh | 245 +++++++++++++++++++++ + 19 files changed, 390 insertions(+), 81 deletions(-) + create mode 100755 tools/testing/selftests/drivers/net/bonding/option_prio.sh +Merging bpf/master (f506439ec3de selftests/bpf: Add a test for using a cpumap from an freplace-to-XDP program) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + Documentation/bpf/map_sk_storage.rst | 56 ++++++++++++---------- + kernel/bpf/core.c | 5 +- + kernel/bpf/dispatcher.c | 5 ++ + kernel/bpf/syscall.c | 6 +-- + tools/testing/selftests/bpf/config | 1 + + .../selftests/bpf/prog_tests/fexit_bpf2bpf.c | 48 +++++++++++++++++++ + .../testing/selftests/bpf/progs/freplace_progmap.c | 24 ++++++++++ + tools/testing/selftests/bpf/progs/rcu_read_lock.c | 8 ++-- + .../selftests/bpf/progs/task_kfunc_failure.c | 2 +- + 9 files changed, 119 insertions(+), 36 deletions(-) + create mode 100644 tools/testing/selftests/bpf/progs/freplace_progmap.c +Merging ipsec/master (7ae9888d6e1c Merge git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless/for-next (01258b62c627 wifi: ti: remove obsolete lines in the Makefile) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + drivers/net/wireless/ti/Makefile | 3 --- + 1 file changed, 3 deletions(-) +Merging rdma-fixes/for-rc (094226ad94f4 Linux 6.1-rc5) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (b47068b4aa53 Merge tag 'asoc-fix-v6.1-rc7' of https://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (a12a383e59ce ASoC: lochnagar: Fix unused lochnagar_of_match warning) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/fsl,sai.yaml | 1 + + include/sound/hdaudio_ext.h | 2 + + sound/hda/ext/hdac_ext_stream.c | 41 ++ + sound/hda/hdac_controller.c | 4 +- + sound/hda/hdac_stream.c | 51 ++- + sound/soc/codecs/lochnagar-sc.c | 2 +- + sound/soc/codecs/rt5670.c | 2 - + sound/soc/codecs/wcd-clsh-v2.c | 6 - + sound/soc/codecs/wm8994.c | 5 + + sound/soc/fsl/imx-audmux.c | 3 +- + sound/soc/generic/audio-graph-card.c | 4 +- + sound/soc/intel/Kconfig | 1 + + sound/soc/intel/avs/Makefile | 4 + + sound/soc/intel/avs/apl.c | 24 +- + sound/soc/intel/avs/avs.h | 80 +++- + sound/soc/intel/avs/board_selection.c | 33 ++ + sound/soc/intel/avs/boards/Kconfig | 8 + + sound/soc/intel/avs/boards/Makefile | 2 + + sound/soc/intel/avs/boards/probe.c | 64 +++ + sound/soc/intel/avs/core.c | 2 + + sound/soc/intel/avs/debugfs.c | 436 +++++++++++++++++++++ + sound/soc/intel/avs/ipc.c | 2 +- + sound/soc/intel/avs/messages.c | 104 ++++- + sound/soc/intel/avs/messages.h | 53 +++ + sound/soc/intel/avs/pcm.c | 6 +- + sound/soc/intel/avs/probes.c | 313 +++++++++++++++ + sound/soc/intel/avs/registers.h | 3 +- + sound/soc/intel/avs/skl.c | 17 +- + sound/soc/intel/avs/utils.c | 22 -- + sound/soc/intel/boards/Makefile | 3 +- + sound/soc/intel/boards/bytcr_rt5640.c | 25 ++ + sound/soc/intel/boards/sof_es8336.c | 2 +- + sound/soc/intel/boards/sof_realtek_common.c | 3 +- + sound/soc/intel/boards/sof_rt5682.c | 6 + + sound/soc/intel/boards/sof_sdw.c | 10 +- + sound/soc/intel/boards/sof_sdw_common.h | 20 +- + sound/soc/intel/boards/sof_sdw_rt1316.c | 239 ----------- + sound/soc/intel/boards/sof_sdw_rt1318.c | 120 ------ + .../boards/{sof_sdw_rt1308.c => sof_sdw_rt_amp.c} | 139 +++++-- + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 5 + + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 2 +- + sound/soc/intel/skylake/skl-sst-cldma.c | 27 +- + sound/soc/intel/skylake/skl-topology.c | 73 ++-- + sound/soc/intel/skylake/skl-topology.h | 1 - + sound/soc/intel/skylake/skl.c | 5 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 7 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 14 +- + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 30 ++ + sound/soc/rockchip/rockchip_pdm.c | 1 + + sound/soc/rockchip/rockchip_spdif.c | 1 + + sound/soc/soc-pcm.c | 20 +- + sound/soc/sof/core.c | 9 - + sound/soc/sof/intel/hda-dsp.c | 72 ++++ + sound/soc/sof/intel/hda.h | 1 + + sound/soc/sof/intel/tgl.c | 2 +- + sound/soc/sof/mediatek/mtk-adsp-common.c | 2 +- + 56 files changed, 1519 insertions(+), 615 deletions(-) + create mode 100644 sound/soc/intel/avs/boards/probe.c + create mode 100644 sound/soc/intel/avs/debugfs.c + create mode 100644 sound/soc/intel/avs/probes.c + delete mode 100644 sound/soc/intel/boards/sof_sdw_rt1316.c + delete mode 100644 sound/soc/intel/boards/sof_sdw_rt1318.c + rename sound/soc/intel/boards/{sof_sdw_rt1308.c => sof_sdw_rt_amp.c} (59%) +Merging regmap-fixes/for-linus (84498d1fb35d regmap-irq: Use the new num_config_regs property in regmap_add_irq_chip_fwnode) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (f56a82a2d6ae Merge remote-tracking branch 'regulator/for-6.1' into regulator-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Auto-merging drivers/regulator/core.c +Merge made by the 'ort' strategy. + drivers/regulator/core.c | 4 ++-- + drivers/regulator/da9211-regulator.c | 11 ++++++----- + 2 files changed, 8 insertions(+), 7 deletions(-) +Merging spi-fixes/for-linus (45b3cd900bf8 Merge remote-tracking branch 'spi/for-6.1' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging MAINTAINERS +Auto-merging drivers/spi/spi-imx.c +Auto-merging drivers/spi/spi-intel.c +Auto-merging drivers/spi/spi-meson-spicc.c +Auto-merging drivers/spi/spi-mt65xx.c +Merge made by the 'ort' strategy. + drivers/spi/spi-fsl-spi.c | 19 ++++++++++++++++--- + 1 file changed, 16 insertions(+), 3 deletions(-) +Merging pci-current/for-linus (ac9ccce8717d MAINTAINERS: Include PCI bindings in host bridge entry) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (eb7081409f94 Linux 6.1-rc6) +$ git merge -m Merge branch 'driver-core-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core.current/driver-core-linus +Already up to date. +Merging tty.current/tty-linus (eb7081409f94 Linux 6.1-rc6) +$ git merge -m Merge branch 'tty-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty.current/tty-linus +Already up to date. +Merging usb.current/usb-linus (b7b275e60bcd Linux 6.1-rc7) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-gadget-fixes/fixes (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget-fixes/fixes +Already up to date. +Merging usb-serial-fixes/usb-linus (188c9c2e0c7f USB: serial: f81534: fix division by zero on line-speed change) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/serial/f81232.c | 12 +++++++----- + drivers/usb/serial/f81534.c | 12 +++++++----- + 2 files changed, 14 insertions(+), 10 deletions(-) +Merging phy/fixes (819b885cd886 phy: ralink: mt7621-pci: add sentinel to quirks table) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (eb7081409f94 Linux 6.1-rc6) +$ git merge -m Merge branch 'staging-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging.current/staging-linus +Already up to date. +Merging iio-fixes/fixes-togreg (95e3f901f7b1 iio: imu: fxos8700: fix ACCEL measurement range selection) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Merge made by the 'ort' strategy. + drivers/iio/adc/berlin2-adc.c | 4 +- + drivers/iio/adc/imx8qxp-adc.c | 11 ++++- + drivers/iio/adc/stm32-dfsdm-adc.c | 1 + + drivers/iio/adc/twl6030-gpadc.c | 32 ++++++++++++++ + drivers/iio/adc/xilinx-ams.c | 2 +- + drivers/iio/imu/fxos8700_core.c | 90 +++++++++++++++++++++++++++++++++------ + 6 files changed, 124 insertions(+), 16 deletions(-) +Merging counter-current/counter-current (fd5ac974fc25 counter: stm32-lptimer-cnt: fix the check on arr and cmp registers update) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Merge made by the 'ort' strategy. + drivers/counter/stm32-lptimer-cnt.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging char-misc.current/char-misc-linus (b7b275e60bcd Linux 6.1-rc7) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (49a467310dc4 soundwire: qcom: check for outanding writes before doing a read) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (830b3c68c1fb Linux 6.1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (e291c116f60f Merge branch 'next' into for-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (453de3eb08c4 crypto: ux500/cryp - delete driver) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git crypto-current/master +Already up to date. +Merging vfio-fixes/for-linus (e806e223621e vfio/pci: Check the device set open count on reset) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (89c1017aac67 selftests/pidfd_test: Remove the erroneous ',') +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (4f1354d5c6a3 livepatch: Call klp_match_callback() in klp_find_callback() to avoid code duplication) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (c47e6403fa09 dmaengine: at_hdmac: Check return code of dma_async_device_register) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (8ab33943cde7 backlight: pwm_bl: Drop support for legacy PWM probing) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Merge made by the 'ort' strategy. + .../devicetree/bindings/leds/backlight/qcom-wled.yaml | 1 + + drivers/mfd/palmas.c | 8 +------- + drivers/video/backlight/ktd253-backlight.c | 9 +++------ + drivers/video/backlight/pwm_bl.c | 12 ------------ + include/linux/pwm_backlight.h | 1 - + 5 files changed, 5 insertions(+), 26 deletions(-) +Merging mtd-fixes/mtd/fixes (c717b9b7d6de mtd: onenand: omap2: add dependency on GPMC) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (a61f4661fba4 mfd: intel_quark_i2c_gpio: Revert "Constify static struct resources") +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (542d3c03fd89 media: sun6i-isp: params: Unregister pending buffer on cleanup) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_bridge.c | 2 +- + drivers/media/platform/sunxi/sun6i-csi/sun6i_csi_capture.c | 2 +- + drivers/media/platform/sunxi/sun6i-mipi-csi2/sun6i_mipi_csi2.c | 5 ++--- + .../platform/sunxi/sun8i-a83t-mipi-csi2/sun8i_a83t_mipi_csi2.c | 5 ++--- + drivers/media/v4l2-core/v4l2-ctrls-api.c | 1 + + drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_capture.c | 4 ++-- + drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_params.c | 6 ++++-- + drivers/staging/media/sunxi/sun6i-isp/sun6i_isp_proc.c | 8 ++++---- + 8 files changed, 17 insertions(+), 16 deletions(-) +Merging reset-fixes/reset/fixes (ae358d71d462 reset: npcm: fix iprst2 and iprst4 setting) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (094226ad94f4 Linux 6.1-rc5) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (6a3fc8c330d1 ARM: at91: fix build for SAMA5D3 w/o L2 cache) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (34e30ebbe48c KVM: Document the interaction between KVM_CAP_HALT_POLL and halt_poll_ns) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (0dd4cdccdab3 KVM: s390: vsie: Fix the initialization of the epoch extension (epdx) field) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390-fixes/master +Already up to date. +Merging hwmon-fixes/hwmon (76dcd734eca2 Linux 6.1-rc8) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (472faf72b33d device-dax: Fix duplicate 'hmem' device registration) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (8f401ec1c897 cxl/region: Recycle region ids) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (ee267181ea70 Merge branch 'misc-6.1' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. +Merging vfs-fixes/fixes (10bc8e4af659 vfs: fix copy_file_range() averts filesystem freeze protection) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted()) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging i3c-fixes/i3c/fixes (fe07bfda2fb9 Linux 5.12-rc1) +$ git merge -m Merge branch 'i3c/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c-fixes/i3c/fixes +Already up to date. +Merging drivers-x86-fixes/fixes (e4678483f9bc platform/x86/amd: pmc: Add a workaround for an s0i3 issue on Cezanne) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk-fixes/fixes +Already up to date. +Merging pinctrl-samsung-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (60d865bd5a9b of: property: decrement node refcount in of_fwnode_get_reference_args()) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (f014165faa7b scsi: iscsi: Fix possible memory leak when device_register() failed) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (c4252650a8c4 Merge tag 'drm-misc-fixes-2022-12-08' of git://anongit.freedesktop.org/drm/drm-misc into drm-fixes) +$ git merge -m Merge branch 'drm-fixes' of git://git.freedesktop.org/git/drm/drm.git drm-fixes/drm-fixes +Already up to date. +Merging amdgpu-fixes/drm-fixes (2c409ba81be2 drm/radeon: fix si_enable_smc_cac() failed issue) +$ git merge -m Merge branch 'drm-fixes' of git://people.freedesktop.org/~agd5f/linux amdgpu-fixes/drm-fixes +Already up to date. +Merging drm-intel-fixes/for-linux-next-fixes (830b3c68c1fb Linux 6.1) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (76dcd734eca2 Linux 6.1-rc8) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (db4e955ae333 rtc: cmos: fix build on non-ACPI platforms) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (247f34f7b803 Linux 6.1-rc2) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (25c94b051592 Drivers: hv: vmbus: fix possible memory leak in vmbus_device_register()) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (39cefc5f6cd2 RISC-V: Fix a race condition during kernel stack overflow) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging riscv-dt-fixes/riscv-dt-fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging pidfd-fixes/fixes (03ba0fe4d09f file: simplify logic in __close_range()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd-fixes/fixes +Already up to date. +Merging fpga-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (6cad1ecd4e32 testing: use the copyleft-next-0.3.1 SPDX tag) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Merge made by the 'ort' strategy. + LICENSES/dual/copyleft-next-0.3.1 | 236 +++++++++++++++++++++++++++++++ + lib/test_kmod.c | 12 +- + lib/test_sysctl.c | 12 +- + tools/testing/selftests/kmod/kmod.sh | 13 +- + tools/testing/selftests/sysctl/sysctl.sh | 12 +- + 5 files changed, 240 insertions(+), 45 deletions(-) + create mode 100644 LICENSES/dual/copyleft-next-0.3.1 +Merging gpio-brgl-fixes/gpio/for-current (63ff545af73f gpio/rockchip: fix refcount leak in rockchip_gpiolib_register()) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel-fixes/fixes +Already up to date. +Merging pinctrl-intel-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Already up to date. +Merging erofs-fixes/fixes (37020bbb71d9 erofs: fix missing xas_retry() in fscache mode) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging integrity-fixes/fixes (843385694721 evm: Fix a small race in init_desc()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (d5e348287264 kunit: alloc_string_stream_fragment error handling bug fix) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Auto-merging lib/kunit/string-stream.c +Merge made by the 'ort' strategy. + lib/kunit/string-stream.c | 4 +++- + 1 file changed, 3 insertions(+), 1 deletion(-) +Merging ubifs-fixes/fixes (7bdd6967fec5 ubi: ensure that VID header offset + VID header size <= alloc, size) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Auto-merging fs/jffs2/file.c +Merge made by the 'ort' strategy. + drivers/mtd/ubi/build.c | 6 ++++++ + fs/jffs2/file.c | 15 +++++++-------- + 2 files changed, 13 insertions(+), 8 deletions(-) +Merging memblock-fixes/fixes (c94afc46cae7 memblock: use kfree() to release kmalloced memblock regions) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (ac8db824ead0 NFSD: Fix reads with a non-zero offset that don't end on a page boundary) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (94d957ae513f perf tools: Add the include/perf/ directory to .gitignore) +$ git merge -m Merge branch 'perf/urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf-current/perf/urgent +Already up to date. +Merging efi-fixes/urgent (7572ac3c979d arm64: efi: Revert "Recover from synchronous exceptions ...") +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (70d822cfb782 Merge branch 'zstd-next' into zstd-linus) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + include/linux/zstd_lib.h | 479 +++--- + lib/zstd/Makefile | 1 + + lib/zstd/common/bitstream.h | 9 + + lib/zstd/common/compiler.h | 67 +- + lib/zstd/common/entropy_common.c | 11 +- + lib/zstd/common/error_private.h | 81 +- + lib/zstd/common/fse.h | 3 +- + lib/zstd/common/fse_decompress.c | 2 +- + lib/zstd/common/huf.h | 46 +- + lib/zstd/common/mem.h | 2 + + lib/zstd/common/portability_macros.h | 93 ++ + lib/zstd/common/zstd_common.c | 10 - + lib/zstd/common/zstd_internal.h | 175 +-- + lib/zstd/compress/clevels.h | 132 ++ + lib/zstd/compress/fse_compress.c | 83 +- + lib/zstd/compress/huf_compress.c | 644 ++++++-- + lib/zstd/compress/zstd_compress.c | 2000 ++++++++++++++++++------ + lib/zstd/compress/zstd_compress_internal.h | 375 ++++- + lib/zstd/compress/zstd_compress_literals.c | 9 +- + lib/zstd/compress/zstd_compress_literals.h | 4 +- + lib/zstd/compress/zstd_compress_sequences.c | 31 +- + lib/zstd/compress/zstd_compress_superblock.c | 295 +--- + lib/zstd/compress/zstd_cwksp.h | 225 ++- + lib/zstd/compress/zstd_double_fast.c | 413 +++-- + lib/zstd/compress/zstd_fast.c | 441 ++++-- + lib/zstd/compress/zstd_lazy.c | 1352 ++++++++++++---- + lib/zstd/compress/zstd_lazy.h | 38 + + lib/zstd/compress/zstd_ldm.c | 76 +- + lib/zstd/compress/zstd_ldm.h | 1 + + lib/zstd/compress/zstd_ldm_geartab.h | 5 +- + lib/zstd/compress/zstd_opt.c | 402 +++-- + lib/zstd/decompress/huf_decompress.c | 912 ++++++++--- + lib/zstd/decompress/zstd_decompress.c | 80 +- + lib/zstd/decompress/zstd_decompress_block.c | 1022 +++++++++--- + lib/zstd/decompress/zstd_decompress_block.h | 10 +- + lib/zstd/decompress/zstd_decompress_internal.h | 38 +- + lib/zstd/decompress_sources.h | 6 + + lib/zstd/zstd_common_module.c | 32 + + lib/zstd/zstd_compress_module.c | 6 +- + 40 files changed, 6989 insertions(+), 2624 deletions(-) + create mode 100644 lib/zstd/common/portability_macros.h + create mode 100644 lib/zstd/compress/clevels.h + create mode 100644 lib/zstd/zstd_common_module.c +Merging battery-fixes/fixes (767e684367e4 power: supply: ab8500: Defer thermal zone probe) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executable to fix a binutils warning) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'asahi-soc/fixes' of https://github.com/AsahiLinux/linux.git asahi-soc-fixes/asahi-soc/fixes +Already up to date. +Merging iommufd-fixes/for-rc (30a0b95b1335 Linux 6.1-rc3) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (f728a5ea27c9 dma-buf: fix dma_buf_export init order v2) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Auto-merging drivers/dma-buf/dma-buf.c +CONFLICT (content): Merge conflict in drivers/dma-buf/dma-buf.c +Resolved 'drivers/dma-buf/dma-buf.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1f2422ba386d] Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + drivers/dma-buf/dma-buf-sysfs-stats.c | 7 +-- + drivers/dma-buf/dma-buf-sysfs-stats.h | 4 +- + drivers/dma-buf/dma-buf.c | 82 ++++++++++++++++------------------- + 3 files changed, 42 insertions(+), 51 deletions(-) +Merging kbuild/for-next (19331e84c387 modpost: Include '.text.*' in TEXT_SECTIONS) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Makefile +Auto-merging arch/x86/Makefile +Auto-merging kernel/padata.c +Auto-merging lib/Kconfig.debug +Auto-merging scripts/Makefile.build +Auto-merging scripts/Makefile.package +Merge made by the 'ort' strategy. + Documentation/process/changes.rst | 4 +-- + Makefile | 26 +++++++++++----- + arch/riscv/Makefile | 2 +- + arch/x86/Makefile | 2 +- + drivers/base/firmware_loader/firmware.h | 2 -- + init/version.c | 1 - + kernel/padata.c | 12 ++++++-- + lib/Kconfig.debug | 29 +++++++++++++++-- + scripts/Kbuild.include | 48 +++++++++++++++++++++++++++-- + scripts/Makefile.asm-generic | 6 ++-- + scripts/Makefile.build | 14 +++++---- + scripts/Makefile.clean | 5 +-- + scripts/Makefile.compiler | 4 +-- + scripts/Makefile.debug | 6 +++- + scripts/Makefile.dtbinst | 2 +- + scripts/Makefile.extrawarn | 1 + + scripts/Makefile.modfinal | 8 ++--- + scripts/Makefile.modinst | 4 +-- + scripts/Makefile.modpost | 41 +++++++++++++++--------- + scripts/Makefile.package | 10 ++++++ + scripts/clang-tools/gen_compile_commands.py | 8 ++--- + scripts/gen_autoksyms.sh | 2 +- + scripts/jobserver-exec | 4 ++- + scripts/kconfig/.gitignore | 4 ++- + scripts/kconfig/Makefile | 45 ++++++++++++++------------- + scripts/kconfig/gconf-cfg.sh | 7 +++-- + scripts/kconfig/lkc.h | 2 +- + scripts/kconfig/mconf-cfg.sh | 25 ++++++++------- + scripts/kconfig/mconf.c | 5 ++- + scripts/kconfig/menu.c | 4 +-- + scripts/kconfig/nconf-cfg.sh | 23 ++++++++------ + scripts/kconfig/qconf-cfg.sh | 10 ++++-- + scripts/kconfig/util.c | 2 +- + scripts/min-tool-version.sh | 2 +- + scripts/mod/file2alias.c | 30 +++++++++--------- + scripts/mod/modpost.c | 23 ++++++-------- + scripts/mod/sumversion.c | 4 +-- + scripts/modules-check.sh | 2 +- + scripts/package/mkdebian | 2 +- + scripts/package/mkspec | 7 +++++ + scripts/remove-stale-files | 2 ++ + 41 files changed, 285 insertions(+), 155 deletions(-) +Merging clang-format/clang-format (781121a7f6d1 clang-format: Fix space after for_each macros) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf/core (818448e9cf92 perf tools: Use "grep -E" instead of "egrep") +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Auto-merging MAINTAINERS +Auto-merging tools/lib/bpf/Makefile +Auto-merging tools/perf/builtin-kwork.c +Auto-merging tools/perf/builtin-record.c +Auto-merging tools/perf/tests/expr.c +Auto-merging tools/perf/tests/pmu-events.c +Auto-merging tools/perf/util/bpf-loader.c +Auto-merging tools/perf/util/evsel.c +Auto-merging tools/perf/util/expr.c +Auto-merging tools/perf/util/header.c +Auto-merging tools/perf/util/metricgroup.c +Auto-merging tools/perf/util/pmu.c +Auto-merging tools/perf/util/scripting-engines/trace-event-perl.c +Auto-merging tools/perf/util/scripting-engines/trace-event-python.c +Auto-merging tools/perf/util/session.c +Auto-merging tools/perf/util/stat-shadow.c +Auto-merging tools/perf/util/stat.c +CONFLICT (content): Merge conflict in tools/perf/util/stat.c +Resolved 'tools/perf/util/stat.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d8e4808b100b] Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 +- + tools/lib/api/Makefile | 66 + + tools/lib/api/fs/tracing_path.c | 16 + + tools/lib/api/fs/tracing_path.h | 1 + + tools/lib/bpf/Makefile | 1 + + tools/lib/perf/Makefile | 35 +- + tools/lib/perf/include/perf/cpumap.h | 3 +- + tools/lib/subcmd/Makefile | 52 + + tools/lib/symbol/Build | 1 + + tools/lib/symbol/Makefile | 122 + + tools/lib/traceevent/.gitignore | 4 - + tools/lib/traceevent/Build | 8 - + tools/lib/traceevent/Documentation/Makefile | 207 - + tools/lib/traceevent/Documentation/asciidoc.conf | 120 - + .../Documentation/libtraceevent-commands.txt | 153 - + .../Documentation/libtraceevent-cpus.txt | 77 - + .../Documentation/libtraceevent-endian_read.txt | 78 - + .../Documentation/libtraceevent-event_find.txt | 103 - + .../Documentation/libtraceevent-event_get.txt | 99 - + .../Documentation/libtraceevent-event_list.txt | 122 - + .../Documentation/libtraceevent-event_print.txt | 130 - + .../Documentation/libtraceevent-field_find.txt | 118 - + .../Documentation/libtraceevent-field_get_val.txt | 122 - + .../Documentation/libtraceevent-field_print.txt | 126 - + .../Documentation/libtraceevent-field_read.txt | 81 - + .../Documentation/libtraceevent-fields.txt | 105 - + .../Documentation/libtraceevent-file_endian.txt | 91 - + .../Documentation/libtraceevent-filter.txt | 209 - + .../Documentation/libtraceevent-func_apis.txt | 183 - + .../Documentation/libtraceevent-func_find.txt | 88 - + .../Documentation/libtraceevent-handle.txt | 101 - + .../Documentation/libtraceevent-header_page.txt | 102 - + .../Documentation/libtraceevent-host_endian.txt | 104 - + .../Documentation/libtraceevent-long_size.txt | 78 - + .../Documentation/libtraceevent-page_size.txt | 82 - + .../Documentation/libtraceevent-parse_event.txt | 90 - + .../Documentation/libtraceevent-parse_head.txt | 82 - + .../Documentation/libtraceevent-plugins.txt | 122 - + .../Documentation/libtraceevent-record_parse.txt | 137 - + .../libtraceevent-reg_event_handler.txt | 156 - + .../Documentation/libtraceevent-reg_print_func.txt | 155 - + .../Documentation/libtraceevent-set_flag.txt | 104 - + .../Documentation/libtraceevent-strerror.txt | 85 - + .../Documentation/libtraceevent-tseq.txt | 158 - + .../lib/traceevent/Documentation/libtraceevent.txt | 192 - + .../lib/traceevent/Documentation/manpage-1.72.xsl | 14 - + .../lib/traceevent/Documentation/manpage-base.xsl | 35 - + .../Documentation/manpage-bold-literal.xsl | 17 - + .../traceevent/Documentation/manpage-normal.xsl | 13 - + .../Documentation/manpage-suppress-sp.xsl | 21 - + tools/lib/traceevent/Makefile | 300 - + tools/lib/traceevent/event-parse-api.c | 333 - + tools/lib/traceevent/event-parse-local.h | 123 - + tools/lib/traceevent/event-parse.c | 7624 -------------------- + tools/lib/traceevent/event-parse.h | 750 -- + tools/lib/traceevent/event-plugin.c | 711 -- + tools/lib/traceevent/event-utils.h | 67 - + tools/lib/traceevent/kbuffer-parse.c | 809 --- + tools/lib/traceevent/kbuffer.h | 68 - + tools/lib/traceevent/libtraceevent.pc.template | 10 - + tools/lib/traceevent/parse-filter.c | 2281 ------ + tools/lib/traceevent/parse-utils.c | 71 - + tools/lib/traceevent/plugins/Build | 12 - + tools/lib/traceevent/plugins/Makefile | 225 - + tools/lib/traceevent/plugins/plugin_cfg80211.c | 43 - + tools/lib/traceevent/plugins/plugin_function.c | 282 - + tools/lib/traceevent/plugins/plugin_futex.c | 123 - + tools/lib/traceevent/plugins/plugin_hrtimer.c | 74 - + tools/lib/traceevent/plugins/plugin_jbd2.c | 61 - + tools/lib/traceevent/plugins/plugin_kmem.c | 80 - + tools/lib/traceevent/plugins/plugin_kvm.c | 527 -- + tools/lib/traceevent/plugins/plugin_mac80211.c | 88 - + tools/lib/traceevent/plugins/plugin_sched_switch.c | 146 - + tools/lib/traceevent/plugins/plugin_scsi.c | 434 -- + tools/lib/traceevent/plugins/plugin_tlb.c | 66 - + tools/lib/traceevent/plugins/plugin_xen.c | 138 - + tools/lib/traceevent/tep_strerror.c | 53 - + tools/lib/traceevent/trace-seq.c | 249 - + tools/lib/traceevent/trace-seq.h | 55 - + tools/perf/.gitignore | 7 +- + tools/perf/Build | 20 +- + tools/perf/Documentation/perf-annotate.txt | 2 +- + tools/perf/Documentation/perf-diff.txt | 2 +- + tools/perf/Documentation/perf-intel-pt.txt | 12 +- + tools/perf/Documentation/perf-list.txt | 10 +- + tools/perf/Documentation/perf-lock.txt | 6 +- + tools/perf/Documentation/perf-probe.txt | 2 +- + tools/perf/Documentation/perf-record.txt | 11 +- + tools/perf/Documentation/perf-report.txt | 2 +- + tools/perf/Documentation/perf-stat.txt | 4 +- + tools/perf/Documentation/perf-top.txt | 7 +- + tools/perf/MANIFEST | 4 +- + tools/perf/Makefile | 2 +- + tools/perf/Makefile.config | 62 +- + tools/perf/Makefile.perf | 170 +- + tools/perf/arch/arm/util/unwind-libdw.c | 2 +- + tools/perf/arch/arm64/entry/syscalls/mksyscalltbl | 2 +- + tools/perf/arch/arm64/util/Build | 2 +- + tools/perf/arch/arm64/util/machine.c | 1 + + tools/perf/arch/arm64/util/pmu.c | 1 + + tools/perf/arch/arm64/util/unwind-libdw.c | 2 +- + tools/perf/arch/powerpc/util/Build | 2 +- + tools/perf/arch/powerpc/util/event.c | 1 + + tools/perf/arch/powerpc/util/unwind-libdw.c | 2 +- + tools/perf/arch/riscv/util/Build | 1 + + tools/perf/arch/riscv/util/header.c | 104 + + tools/perf/arch/s390/util/Build | 2 +- + tools/perf/arch/s390/util/unwind-libdw.c | 1 + + tools/perf/arch/x86/include/arch-tests.h | 1 + + tools/perf/arch/x86/tests/Build | 2 +- + tools/perf/arch/x86/tests/arch-tests.c | 15 +- + ...intel-pt-pkt-decoder-test.c => intel-pt-test.c} | 154 + + tools/perf/arch/x86/tests/sample-parsing.c | 1 + + tools/perf/arch/x86/util/Build | 2 +- + tools/perf/arch/x86/util/event.c | 2 + + tools/perf/arch/x86/util/intel-pt.c | 4 + + tools/perf/arch/x86/util/iostat.c | 4 +- + tools/perf/arch/x86/util/tsc.c | 1 + + tools/perf/arch/x86/util/unwind-libdw.c | 2 +- + tools/perf/bench/inject-buildid.c | 2 +- + tools/perf/bench/numa.c | 9 +- + tools/perf/builtin-annotate.c | 4 +- + tools/perf/builtin-daemon.c | 4 +- + tools/perf/builtin-data.c | 5 +- + tools/perf/builtin-diff.c | 2 +- + tools/perf/builtin-ftrace.c | 4 +- + tools/perf/builtin-inject.c | 8 + + tools/perf/builtin-kmem.c | 1 + + tools/perf/builtin-kvm.c | 12 +- + tools/perf/builtin-kwork.c | 7 + + tools/perf/builtin-list.c | 565 +- + tools/perf/builtin-lock.c | 251 +- + tools/perf/builtin-mem.c | 1 + + tools/perf/builtin-probe.c | 7 +- + tools/perf/builtin-record.c | 14 +- + tools/perf/builtin-report.c | 11 +- + tools/perf/builtin-script.c | 23 +- + tools/perf/builtin-stat.c | 250 +- + tools/perf/builtin-timechart.c | 1 + + tools/perf/builtin-top.c | 6 +- + tools/perf/builtin-trace.c | 153 +- + tools/perf/builtin-version.c | 1 + + tools/perf/examples/bpf/5sec.c | 8 +- + tools/perf/examples/bpf/augmented_raw_syscalls.c | 175 +- + tools/perf/examples/bpf/augmented_syscalls.c | 169 - + tools/perf/examples/bpf/empty.c | 13 +- + tools/perf/examples/bpf/etcsnoop.c | 76 - + tools/perf/examples/bpf/hello.c | 24 +- + tools/perf/include/bpf/bpf.h | 70 - + tools/perf/include/bpf/linux/socket.h | 24 - + tools/perf/include/bpf/pid_filter.h | 21 - + tools/perf/include/bpf/stdio.h | 16 - + tools/perf/include/bpf/unistd.h | 10 - + tools/perf/perf.c | 24 +- + tools/perf/pmu-events/Build | 2 +- + .../{neoverse-n2 => neoverse-n2-v2}/branch.json | 0 + .../arm/{neoverse-n2 => neoverse-n2-v2}/bus.json | 0 + .../arm/{neoverse-n2 => neoverse-n2-v2}/cache.json | 0 + .../{neoverse-n2 => neoverse-n2-v2}/exception.json | 0 + .../instruction.json | 0 + .../{neoverse-n2 => neoverse-n2-v2}/memory.json | 0 + .../{neoverse-n2 => neoverse-n2-v2}/pipeline.json | 0 + .../arm/{neoverse-n2 => neoverse-n2-v2}/spe.json | 0 + .../arm/{neoverse-n2 => neoverse-n2-v2}/trace.json | 0 + tools/perf/pmu-events/arch/arm64/mapfile.csv | 3 +- + tools/perf/pmu-events/arch/riscv/mapfile.csv | 17 + + .../pmu-events/arch/riscv/riscv-sbi-firmware.json | 134 + + .../pmu-events/arch/riscv/sifive/u74/firmware.json | 68 + + .../arch/riscv/sifive/u74/instructions.json | 92 + + .../pmu-events/arch/riscv/sifive/u74/memory.json | 32 + + .../arch/riscv/sifive/u74/microarch.json | 57 + + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 73 +- + .../perf/pmu-events/arch/x86/alderlake/cache.json | 1391 ++-- + .../arch/x86/alderlake/floating-point.json | 91 +- + .../pmu-events/arch/x86/alderlake/frontend.json | 224 +- + .../perf/pmu-events/arch/x86/alderlake/memory.json | 214 +- + .../perf/pmu-events/arch/x86/alderlake/other.json | 132 +- + .../pmu-events/arch/x86/alderlake/pipeline.json | 1932 ++--- + .../arch/x86/alderlake/uncore-memory.json | 185 +- + .../arch/x86/alderlake/uncore-other.json | 73 +- + .../arch/x86/alderlake/virtual-memory.json | 223 +- + .../arch/x86/alderlaken/adln-metrics.json | 583 ++ + .../perf/pmu-events/arch/x86/alderlaken/cache.json | 330 + + .../arch/x86/alderlaken/floating-point.json | 18 + + .../pmu-events/arch/x86/alderlaken/frontend.json | 26 + + .../pmu-events/arch/x86/alderlaken/memory.json | 81 + + .../perf/pmu-events/arch/x86/alderlaken/other.json | 38 + + .../pmu-events/arch/x86/alderlaken/pipeline.json | 533 ++ + .../arch/x86/alderlaken/uncore-memory.json | 175 + + .../arch/x86/alderlaken/uncore-other.json | 33 + + .../arch/x86/alderlaken/virtual-memory.json | 47 + + tools/perf/pmu-events/arch/x86/mapfile.csv | 3 +- + tools/perf/pmu-events/jevents.py | 12 +- + tools/perf/pmu-events/metric.py | 502 ++ + tools/perf/pmu-events/metric_test.py | 157 + + tools/perf/scripts/python/Perf-Trace-Util/Build | 2 +- + tools/perf/scripts/python/bin/task-analyzer-record | 2 + + tools/perf/scripts/python/bin/task-analyzer-report | 3 + + tools/perf/scripts/python/intel-pt-events.py | 65 +- + tools/perf/scripts/python/task-analyzer.py | 934 +++ + tools/perf/tests/Build | 15 +- + tools/perf/tests/attr.py | 71 +- + tools/perf/tests/attr/README | 2 - + tools/perf/tests/attr/test-record-group | 22 - + .../attr/test-record-user-regs-no-sve-aarch64 | 9 + + .../attr/test-record-user-regs-old-sve-aarch64 | 10 + + .../tests/attr/test-record-user-regs-sve-aarch64 | 14 + + tools/perf/tests/attr/test-stat-group | 17 - + tools/perf/tests/builtin-test.c | 36 + + tools/perf/tests/code-reading.c | 4 +- + tools/perf/tests/cpumap.c | 2 +- + tools/perf/tests/dlfilter-test.c | 1 + + tools/perf/tests/event_groups.c | 139 + + tools/perf/tests/expr.c | 1 + + tools/perf/tests/make | 2 +- + tools/perf/tests/mmap-basic.c | 2 + + tools/perf/tests/openat-syscall-tp-fields.c | 1 + + tools/perf/tests/openat-syscall.c | 1 + + tools/perf/tests/parse-events.c | 36 +- + tools/perf/tests/parse-metric.c | 2 +- + tools/perf/tests/parse-no-sample-id-all.c | 1 + + tools/perf/tests/perf-record.c | 2 + + tools/perf/tests/perf-time-to-tsc.c | 1 + + tools/perf/tests/pmu-events.c | 3 +- + tools/perf/tests/sample-parsing.c | 4 +- + tools/perf/tests/shell/lib/probe_vfs_getname.sh | 4 +- + tools/perf/tests/shell/lock_contention.sh | 63 +- + tools/perf/tests/shell/pipe_test.sh | 55 +- + .../tests/shell/record+probe_libc_inet_pton.sh | 2 +- + .../tests/shell/record+script_probe_vfs_getname.sh | 2 +- + tools/perf/tests/shell/record.sh | 129 +- + tools/perf/tests/shell/record_offcpu.sh | 2 +- + tools/perf/tests/shell/stat.sh | 10 +- + tools/perf/tests/shell/test_arm_callgraph_fp.sh | 34 +- + tools/perf/tests/shell/test_arm_coresight.sh | 8 +- + tools/perf/tests/shell/test_arm_spe.sh | 6 +- + tools/perf/tests/shell/test_arm_spe_fork.sh | 46 +- + tools/perf/tests/shell/test_brstack.sh | 68 +- + tools/perf/tests/shell/test_data_symbol.sh | 33 +- + tools/perf/tests/shell/test_java_symbol.sh | 2 +- + tools/perf/tests/shell/test_task_analyzer.sh | 151 + + tools/perf/tests/shell/trace+probe_vfs_getname.sh | 4 +- + tools/perf/tests/sw-clock.c | 1 + + tools/perf/tests/switch-tracking.c | 1 + + tools/perf/tests/tests.h | 28 + + tools/perf/tests/thread-map.c | 1 + + tools/perf/tests/workloads/Build | 13 + + tools/perf/tests/workloads/brstack.c | 40 + + tools/perf/tests/workloads/datasym.c | 24 + + tools/perf/tests/workloads/leafloop.c | 34 + + tools/perf/tests/workloads/noploop.c | 32 + + tools/perf/tests/workloads/sqrtloop.c | 45 + + tools/perf/tests/workloads/thloop.c | 53 + + tools/perf/tests/wp.c | 12 +- + tools/perf/trace/beauty/Build | 1 + + tools/perf/trace/beauty/beauty.h | 3 + + tools/perf/trace/beauty/fadvise.sh | 2 +- + tools/perf/trace/beauty/fsmount.sh | 2 +- + tools/perf/trace/beauty/fspick.sh | 2 +- + tools/perf/trace/beauty/kcmp_type.sh | 2 +- + tools/perf/trace/beauty/kvm_ioctl.sh | 4 +- + tools/perf/trace/beauty/madvise_behavior.sh | 2 +- + tools/perf/trace/beauty/mmap_flags.sh | 22 +- + tools/perf/trace/beauty/mmap_prot.sh | 12 +- + tools/perf/trace/beauty/mount_flags.sh | 4 +- + tools/perf/trace/beauty/move_mount_flags.sh | 2 +- + tools/perf/trace/beauty/mremap_flags.sh | 4 +- + tools/perf/trace/beauty/perf_event_open.c | 44 + + tools/perf/trace/beauty/perf_ioctl.sh | 2 +- + .../perf/trace/beauty/pkey_alloc_access_rights.sh | 2 +- + tools/perf/trace/beauty/prctl_option.sh | 4 +- + tools/perf/trace/beauty/rename_flags.sh | 4 +- + tools/perf/trace/beauty/sockaddr.sh | 4 +- + tools/perf/trace/beauty/socket.sh | 4 +- + tools/perf/trace/beauty/sync_file_range.sh | 2 +- + tools/perf/trace/beauty/timespec.c | 21 + + .../trace/beauty/tracepoints/x86_irq_vectors.sh | 4 +- + tools/perf/trace/beauty/tracepoints/x86_msr.sh | 12 +- + tools/perf/trace/beauty/usbdevfs_ioctl.sh | 4 +- + tools/perf/trace/beauty/vhost_virtio_ioctl.sh | 4 +- + tools/perf/trace/beauty/x86_arch_prctl.sh | 4 +- + tools/perf/ui/util.c | 5 + + tools/perf/util/Build | 30 +- + tools/perf/util/amd-sample-raw.c | 1 + + .../perf/util/arm64-frame-pointer-unwind-support.h | 6 +- + tools/perf/util/auxtrace.c | 1 + + tools/perf/util/auxtrace.h | 2 +- + tools/perf/util/bpf-loader.c | 4 - + tools/perf/util/bpf-prologue.h | 6 +- + tools/perf/util/bpf_counter.c | 2 +- + tools/perf/util/bpf_kwork.c | 3 + + tools/perf/util/bpf_lock_contention.c | 114 +- + tools/perf/util/bpf_map.h | 3 +- + tools/perf/util/bpf_off_cpu.c | 2 +- + tools/perf/util/bpf_skel/lock_contention.bpf.c | 101 +- + tools/perf/util/bpf_skel/lock_data.h | 30 + + tools/perf/util/branch.h | 9 +- + tools/perf/util/config.c | 4 +- + tools/perf/util/counts.c | 1 - + tools/perf/util/counts.h | 1 - + tools/perf/util/cpumap.c | 17 +- + tools/perf/util/cpumap.h | 10 +- + tools/perf/util/cs-etm-base.c | 174 + + tools/perf/util/cs-etm.c | 208 +- + tools/perf/util/cs-etm.h | 46 +- + tools/perf/util/data-convert-bt.c | 8 +- + tools/perf/util/data-convert-json.c | 27 + + tools/perf/util/dwarf-aux.c | 77 +- + tools/perf/util/dwarf-aux.h | 3 + + tools/perf/util/event.h | 124 +- + tools/perf/util/evlist.c | 10 +- + tools/perf/util/evlist.h | 6 +- + tools/perf/util/evsel.c | 54 +- + tools/perf/util/evsel.h | 16 +- + tools/perf/util/evsel_fprintf.c | 7 +- + tools/perf/util/expr.c | 1 + + tools/perf/util/expr.h | 7 +- + tools/perf/util/header.c | 19 + + tools/perf/util/header.h | 2 + + .../util/intel-pt-decoder/intel-pt-insn-decoder.c | 1 + + tools/perf/util/intel-pt.c | 7 +- + tools/perf/util/iostat.c | 3 +- + tools/perf/util/iostat.h | 4 +- + tools/perf/util/kwork.h | 12 +- + tools/perf/util/llvm-utils.c | 8 +- + tools/perf/util/lock-contention.h | 5 +- + tools/perf/util/machine.c | 40 + + tools/perf/util/machine.h | 8 + + tools/perf/util/metricgroup.c | 243 +- + tools/perf/util/metricgroup.h | 4 +- + tools/perf/util/mmap.h | 5 - + tools/perf/util/parse-branch-options.c | 3 + + tools/perf/util/parse-events.c | 16 + + tools/perf/util/parse-events.h | 1 - + tools/perf/util/perf_regs.c | 2 +- + tools/perf/util/pfm.c | 154 +- + tools/perf/util/pfm.h | 7 +- + tools/perf/util/pmu.c | 294 +- + tools/perf/util/pmu.h | 128 +- + tools/perf/util/pmus.c | 5 + + tools/perf/util/pmus.h | 9 + + tools/perf/util/print-events.c | 639 +- + tools/perf/util/print-events.h | 42 +- + tools/perf/util/probe-finder.c | 37 +- + tools/perf/util/python.c | 26 +- + tools/perf/util/record.c | 7 - + tools/perf/util/record.h | 1 - + tools/perf/util/s390-cpumsf.c | 1 + + tools/perf/util/s390-sample-raw.c | 1 + + tools/perf/util/sample.h | 117 + + tools/perf/util/scripting-engines/Build | 6 +- + .../perf/util/scripting-engines/trace-event-perl.c | 3 + + .../util/scripting-engines/trace-event-python.c | 12 +- + tools/perf/util/session.c | 5 +- + tools/perf/util/session.h | 2 + + tools/perf/util/setup.py | 15 +- + tools/perf/util/sort.c | 63 +- + tools/perf/util/stat-display.c | 1514 ++-- + tools/perf/util/stat-shadow.c | 1 + + tools/perf/util/stat.c | 406 +- + tools/perf/util/stat.h | 41 +- + tools/perf/util/symbol-elf.c | 2 +- + tools/perf/util/symbol.h | 2 + + tools/perf/util/synthetic-events.c | 9 +- + tools/perf/util/thread.h | 3 + + tools/perf/util/thread_map.c | 1 + + tools/perf/util/thread_map.h | 2 - + tools/perf/util/trace-event-info.c | 14 +- + tools/perf/util/trace-event-parse.c | 2 + + tools/perf/util/trace-event-read.c | 4 +- + tools/perf/util/trace-event-scripting.c | 3 +- + tools/perf/util/trace-event.c | 1 - + tools/perf/util/trace-event.h | 13 +- + tools/perf/util/util.h | 25 +- + 374 files changed, 11403 insertions(+), 26461 deletions(-) + create mode 100644 tools/lib/symbol/Build + create mode 100644 tools/lib/symbol/Makefile + delete mode 100644 tools/lib/traceevent/.gitignore + delete mode 100644 tools/lib/traceevent/Build + delete mode 100644 tools/lib/traceevent/Documentation/Makefile + delete mode 100644 tools/lib/traceevent/Documentation/asciidoc.conf + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-commands.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-cpus.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-endian_read.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-event_find.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-event_get.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-event_list.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-event_print.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-field_find.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-field_get_val.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-field_print.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-field_read.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-fields.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-file_endian.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-filter.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-func_apis.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-func_find.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-handle.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-header_page.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-host_endian.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-long_size.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-page_size.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-parse_event.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-parse_head.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-plugins.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-record_parse.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-reg_event_handler.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-reg_print_func.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-set_flag.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-strerror.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent-tseq.txt + delete mode 100644 tools/lib/traceevent/Documentation/libtraceevent.txt + delete mode 100644 tools/lib/traceevent/Documentation/manpage-1.72.xsl + delete mode 100644 tools/lib/traceevent/Documentation/manpage-base.xsl + delete mode 100644 tools/lib/traceevent/Documentation/manpage-bold-literal.xsl + delete mode 100644 tools/lib/traceevent/Documentation/manpage-normal.xsl + delete mode 100644 tools/lib/traceevent/Documentation/manpage-suppress-sp.xsl + delete mode 100644 tools/lib/traceevent/Makefile + delete mode 100644 tools/lib/traceevent/event-parse-api.c + delete mode 100644 tools/lib/traceevent/event-parse-local.h + delete mode 100644 tools/lib/traceevent/event-parse.c + delete mode 100644 tools/lib/traceevent/event-parse.h + delete mode 100644 tools/lib/traceevent/event-plugin.c + delete mode 100644 tools/lib/traceevent/event-utils.h + delete mode 100644 tools/lib/traceevent/kbuffer-parse.c + delete mode 100644 tools/lib/traceevent/kbuffer.h + delete mode 100644 tools/lib/traceevent/libtraceevent.pc.template + delete mode 100644 tools/lib/traceevent/parse-filter.c + delete mode 100644 tools/lib/traceevent/parse-utils.c + delete mode 100644 tools/lib/traceevent/plugins/Build + delete mode 100644 tools/lib/traceevent/plugins/Makefile + delete mode 100644 tools/lib/traceevent/plugins/plugin_cfg80211.c + delete mode 100644 tools/lib/traceevent/plugins/plugin_function.c + delete mode 100644 tools/lib/traceevent/plugins/plugin_futex.c + delete mode 100644 tools/lib/traceevent/plugins/plugin_hrtimer.c + delete mode 100644 tools/lib/traceevent/plugins/plugin_jbd2.c + delete mode 100644 tools/lib/traceevent/plugins/plugin_kmem.c + delete mode 100644 tools/lib/traceevent/plugins/plugin_kvm.c + delete mode 100644 tools/lib/traceevent/plugins/plugin_mac80211.c + delete mode 100644 tools/lib/traceevent/plugins/plugin_sched_switch.c + delete mode 100644 tools/lib/traceevent/plugins/plugin_scsi.c + delete mode 100644 tools/lib/traceevent/plugins/plugin_tlb.c + delete mode 100644 tools/lib/traceevent/plugins/plugin_xen.c + delete mode 100644 tools/lib/traceevent/tep_strerror.c + delete mode 100644 tools/lib/traceevent/trace-seq.c + delete mode 100644 tools/lib/traceevent/trace-seq.h + create mode 100644 tools/perf/arch/riscv/util/header.c + rename tools/perf/arch/x86/tests/{intel-pt-pkt-decoder-test.c => intel-pt-test.c} (80%) + delete mode 100644 tools/perf/examples/bpf/augmented_syscalls.c + delete mode 100644 tools/perf/examples/bpf/etcsnoop.c + delete mode 100644 tools/perf/include/bpf/bpf.h + delete mode 100644 tools/perf/include/bpf/linux/socket.h + delete mode 100644 tools/perf/include/bpf/pid_filter.h + delete mode 100644 tools/perf/include/bpf/stdio.h + delete mode 100644 tools/perf/include/bpf/unistd.h + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/branch.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/bus.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/cache.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/exception.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/instruction.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/memory.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/pipeline.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/spe.json (100%) + rename tools/perf/pmu-events/arch/arm64/arm/{neoverse-n2 => neoverse-n2-v2}/trace.json (100%) + create mode 100644 tools/perf/pmu-events/arch/riscv/mapfile.csv + create mode 100644 tools/perf/pmu-events/arch/riscv/riscv-sbi-firmware.json + create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/u74/firmware.json + create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/u74/instructions.json + create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/u74/memory.json + create mode 100644 tools/perf/pmu-events/arch/riscv/sifive/u74/microarch.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/adln-metrics.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/uncore-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/uncore-other.json + create mode 100644 tools/perf/pmu-events/arch/x86/alderlaken/virtual-memory.json + create mode 100644 tools/perf/pmu-events/metric.py + create mode 100644 tools/perf/pmu-events/metric_test.py + create mode 100755 tools/perf/scripts/python/bin/task-analyzer-record + create mode 100755 tools/perf/scripts/python/bin/task-analyzer-report + create mode 100755 tools/perf/scripts/python/task-analyzer.py + delete mode 100644 tools/perf/tests/attr/test-record-group + create mode 100644 tools/perf/tests/attr/test-record-user-regs-no-sve-aarch64 + create mode 100644 tools/perf/tests/attr/test-record-user-regs-old-sve-aarch64 + create mode 100644 tools/perf/tests/attr/test-record-user-regs-sve-aarch64 + delete mode 100644 tools/perf/tests/attr/test-stat-group + create mode 100644 tools/perf/tests/event_groups.c + create mode 100755 tools/perf/tests/shell/test_task_analyzer.sh + create mode 100644 tools/perf/tests/workloads/Build + create mode 100644 tools/perf/tests/workloads/brstack.c + create mode 100644 tools/perf/tests/workloads/datasym.c + create mode 100644 tools/perf/tests/workloads/leafloop.c + create mode 100644 tools/perf/tests/workloads/noploop.c + create mode 100644 tools/perf/tests/workloads/sqrtloop.c + create mode 100644 tools/perf/tests/workloads/thloop.c + create mode 100644 tools/perf/trace/beauty/timespec.c + create mode 100644 tools/perf/util/bpf_skel/lock_data.h + create mode 100644 tools/perf/util/cs-etm-base.c + create mode 100644 tools/perf/util/pmus.c + create mode 100644 tools/perf/util/pmus.h + create mode 100644 tools/perf/util/sample.h +Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attributes: Introduce __access_*() function attribute) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Merge made by the 'ort' strategy. + include/linux/compiler_attributes.h | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) +Merging dma-mapping/for-next (ffcb75458460 dma-mapping: reject __GFP_COMP in dma_alloc_attrs) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Already up to date. +Merging asm-generic/master (5e5ff73c2e58 asm-generic/io: Add _RET_IP_ to MMIO trace for more accurate debug info) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Merge made by the 'ort' strategy. + include/asm-generic/io.h | 80 +++++++++++++++++++++---------------------- + include/trace/events/rwmmio.h | 43 ++++++++++++++--------- + include/uapi/linux/swab.h | 2 +- + lib/trace_readwrite.c | 16 ++++----- + 4 files changed, 76 insertions(+), 65 deletions(-) +Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (1907710cab84 Merge branches 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging arch/arm/mm/dump.c +Auto-merging arch/arm/mm/fault.c +Auto-merging drivers/amba/bus.c +Merge made by the 'ort' strategy. +Merging arm64/for-next/core (c0cd1d541704 Revert "arm64: errata: Workaround possible Cortex-A715 [ESR|FAR]_ELx corruption") +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging arch/Kconfig +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/arm64/mm/mmu.c +Merge made by the 'ort' strategy. + Documentation/arm64/silicon-errata.rst | 2 -- + arch/Kconfig | 2 +- + arch/arm64/Kconfig | 16 ---------------- + arch/arm64/include/asm/hugetlb.h | 9 --------- + arch/arm64/include/asm/pgtable.h | 9 --------- + arch/arm64/kernel/cpu_errata.c | 7 ------- + arch/arm64/mm/hugetlbpage.c | 21 --------------------- + arch/arm64/mm/mmu.c | 21 --------------------- + arch/arm64/tools/cpucaps | 1 - + 9 files changed, 1 insertion(+), 87 deletions(-) +Merging arm-perf/for-next/perf (4361251cef46 arm_pmu: Drop redundant armpmu->map_event() in armpmu_event_init()) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (9e86b8206ade Merge branch 'soc/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/arm/boot/dts/sama7g5-pinfunc.h +Auto-merging arch/arm/boot/dts/ste-ux500-samsung-codina-tmo.dts +Auto-merging arch/arm/boot/dts/ste-ux500-samsung-codina.dts +Auto-merging arch/arm/boot/dts/ste-ux500-samsung-gavini.dts +Auto-merging arch/arm/boot/dts/ste-ux500-samsung-janice.dts +Auto-merging arch/arm/boot/dts/ste-ux500-samsung-kyle.dts +Auto-merging arch/arm/mach-mxs/mach-mxs.c +Auto-merging arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mn.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-evk.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx93.dtsi +Auto-merging arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts +Auto-merging arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts +Auto-merging drivers/base/power/domain.c +Merge made by the 'ort' strategy. + arch/arm/arm-soc-for-next-contents.txt | 193 +++++++++++++++++++++++++++++++++ + 1 file changed, 193 insertions(+) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt +Merging actions/for-next (444d018d8d38 ARM: dts: owl-s500-roseapplepi: Add ATC2603C PMIC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/linux-actions.git actions/for-next +Auto-merging arch/arm/boot/dts/owl-s500-roseapplepi.dts +Merge made by the 'ort' strategy. +Merging amlogic/for-next (e57e6bb6476d Merge branch 'v6.2/arm64-dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git amlogic/for-next +Merge made by the 'ort' strategy. + drivers/firmware/meson/meson_sm.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging asahi-soc/asahi-soc/for-next (296921e39d36 Merge branch 'asahi-soc/dt' 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 +Merge made by the 'ort' strategy. +Merging aspeed/for-next (45c86167adde soc: nuvoton: Add SoC info driver for WPCM450) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts +CONFLICT (content): Merge conflict in arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts +Auto-merging drivers/soc/Kconfig +Auto-merging drivers/soc/Makefile +Resolved 'arch/arm/boot/dts/nuvoton-wpcm450-supermicro-x9sci-ln4f.dts' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1c823b84d338] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 1 + + arch/arm/configs/wpcm450_defconfig | 213 +++++++++++++++++++++++++++++++++++++ + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 1 + + drivers/soc/nuvoton/Kconfig | 11 ++ + drivers/soc/nuvoton/Makefile | 2 + + drivers/soc/nuvoton/wpcm450-soc.c | 109 +++++++++++++++++++ + 7 files changed, 338 insertions(+) + create mode 100644 arch/arm/configs/wpcm450_defconfig + create mode 100644 drivers/soc/nuvoton/Kconfig + create mode 100644 drivers/soc/nuvoton/Makefile + create mode 100644 drivers/soc/nuvoton/wpcm450-soc.c +Merging at91/at91-next (fb18447f4da5 Merge branch 'at91-defconfig' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Auto-merging arch/arm/boot/dts/sama7g5-pinfunc.h +Merge made by the 'ort' strategy. +Merging broadcom/next (64610429f8de Merge branch 'drivers/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. +Merging davinci/davinci/for-next (53ad523ac435 ARM: davinci: fix repeated words in comments) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 7 +++---- + arch/arm/mach-davinci/board-dm365-evm.c | 2 +- + 2 files changed, 4 insertions(+), 5 deletions(-) +Merging drivers-memory/for-next (8dd7e4af5853 memory: omap-gpmc: fix coverity issue "Control flow issues") +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Already up to date. +Merging imx-mxs/for-next (e114f7b74f59 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Auto-merging arch/arm/mach-mxs/mach-mxs.c +Auto-merging arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mm.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mn.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-evk.dts +Auto-merging arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi +Auto-merging arch/arm64/boot/dts/freescale/imx93.dtsi +Merge made by the 'ort' strategy. +Merging keystone/next (cb293d3b430e Merge branch 'for_5.15/drivers-soc' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ssantosh/linux-keystone.git keystone/next +Merge made by the 'ort' strategy. +Merging mediatek/for-next (6b6221595e05 Merge branch 'v6.2-tmp/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/mt7629.dtsi | 3 +- + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 380 +++++++++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 4 +- + drivers/soc/mediatek/mtk-pm-domains.c | 2 +- + 4 files changed, 384 insertions(+), 5 deletions(-) +Merging mvebu/for-next (ce88856dec4f Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Merge made by the 'ort' strategy. +Merging omap/for-next (6435241fd536 Merge branch 'musb-for-v6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. + arch/arm/mach-omap1/Kconfig | 22 +++++++++++----------- + arch/arm/mach-omap1/timer.c | 2 +- + arch/arm/mach-omap2/omap4-common.c | 1 + + drivers/bus/ti-sysc.c | 3 +++ + 4 files changed, 16 insertions(+), 12 deletions(-) +Merging qcom/for-next (7608329e874c Merge branches 'arm64-defconfig-for-6.2', 'arm64-for-6.2', 'clk-for-6.2', 'defconfig-for-6.2', 'drivers-for-6.2' and 'dts-for-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging Documentation/devicetree/bindings/arm/cpus.yaml +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Auto-merging Documentation/devicetree/bindings/arm/qcom.yaml +Merge made by the 'ort' strategy. +Merging raspberrypi/for-next (c5915b53d4c2 dt-bindings: soc: bcm: Convert brcm,bcm2835-vchiq to json-schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nsaenz/linux-rpi.git raspberrypi/for-next +Auto-merging arch/arm/boot/dts/bcm2711-rpi-4-b.dts +Auto-merging arch/arm/boot/dts/bcm2711-rpi-400.dts +Merge made by the 'ort' strategy. +Merging renesas/next (00841e945654 Merge branch 'renesas-arm-dt-for-v6.2' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. +Merging reset/reset/next (d985db836226 reset: tps380x: Fix spelling mistake "Voltags" -> "Voltage") +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (554ba1ec66f2 Merge branch 'v6.2-armsoc/dtsfixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 18 + + .../devicetree/bindings/arm/rockchip/pmu.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 2 +- + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/rk3128-evb.dts | 109 +++ + arch/arm/boot/dts/rk3128.dtsi | 916 +++++++++++++++++++++ + arch/arm/boot/dts/rv1126-edgeble-neu2-io.dts | 42 + + arch/arm/boot/dts/rv1126-edgeble-neu2.dtsi | 338 ++++++++ + arch/arm/boot/dts/rv1126-pinctrl.dtsi | 211 +++++ + arch/arm/boot/dts/rv1126.dtsi | 438 ++++++++++ + arch/arm64/boot/dts/rockchip/Makefile | 1 + + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 4 +- + .../arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 416 ++++++++++ + arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 229 ++++++ + 15 files changed, 2727 insertions(+), 3 deletions(-) + create mode 100644 arch/arm/boot/dts/rk3128-evb.dts + create mode 100644 arch/arm/boot/dts/rk3128.dtsi + create mode 100644 arch/arm/boot/dts/rv1126-edgeble-neu2-io.dts + create mode 100644 arch/arm/boot/dts/rv1126-edgeble-neu2.dtsi + create mode 100644 arch/arm/boot/dts/rv1126-pinctrl.dtsi + create mode 100644 arch/arm/boot/dts/rv1126.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts +Merging samsung-krzk/for-next (4407a1eb1faf Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 4 ++++ + arch/arm64/boot/dts/exynos/exynos7.dtsi | 2 ++ + arch/arm64/boot/dts/tesla/fsd.dtsi | 2 ++ + 3 files changed, 8 insertions(+) +Merging scmi/for-linux-next (76dcd734eca2 Linux 6.1-rc8) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Already up to date. +Merging stm32/stm32-next (4cca342b840e ARM: dts: stm32: Rename mdio0 to mdio on DHCOR Testbench board) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Auto-merging arch/arm/configs/multi_v7_defconfig +Merge made by the 'ort' strategy. +Merging sunxi/sunxi/for-next (47be7c123211 Merge branch 'sunxi/clk-for-6.2' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. +Merging tee/next (4a56b125ba20 Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Merge made by the 'ort' strategy. +Merging tegra/for-next (65de8bad744b Merge branch for-6.2/arm64/defconfig into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Auto-merging include/soc/tegra/ivc.h +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/usb/nvidia,tegra124-xusb.yaml | 4 +--- + Documentation/devicetree/bindings/usb/nvidia,tegra186-xusb.yaml | 4 +--- + Documentation/devicetree/bindings/usb/nvidia,tegra194-xusb.yaml | 8 ++------ + Documentation/devicetree/bindings/usb/nvidia,tegra210-xusb.yaml | 8 ++------ + 4 files changed, 6 insertions(+), 18 deletions(-) +Merging ti/ti-next (6a5ab20fb961 Merge branches 'ti-drivers-soc-next' and 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. +Merging xilinx/for-next (aa95ef0c258b Merge branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Auto-merging arch/arm64/boot/dts/xilinx/zynqmp.dtsi +Auto-merging drivers/firmware/xilinx/zynqmp.c +Auto-merging include/linux/firmware/xlnx-zynqmp.h +Merge made by the 'ort' strategy. + arch/arm/boot/dts/zynq-7000.dtsi | 12 ++++++++++ + arch/arm/mach-zynq/slcr.c | 1 + + ...sck-kv-g-revA.dts => zynqmp-sck-kv-g-revA.dtso} | 0 + ...sck-kv-g-revB.dts => zynqmp-sck-kv-g-revB.dtso} | 0 + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 2 +- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 4 +++- + drivers/firmware/xilinx/zynqmp.c | 27 ++++++++++++++++++++-- + drivers/soc/xilinx/xlnx_event_manager.c | 4 +++- + drivers/soc/xilinx/zynqmp_pm_domains.c | 2 +- + include/linux/firmware/xlnx-zynqmp.h | 4 ++++ + 10 files changed, 50 insertions(+), 6 deletions(-) + rename arch/arm64/boot/dts/xilinx/{zynqmp-sck-kv-g-revA.dts => zynqmp-sck-kv-g-revA.dtso} (100%) + rename arch/arm64/boot/dts/xilinx/{zynqmp-sck-kv-g-revB.dts => zynqmp-sck-kv-g-revB.dtso} (100%) +Merging clk/clk-next (0e2c9884cbba Merge branches 'clk-mediatek', 'clk-trace', 'clk-qcom' and 'clk-microchip' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (8178e245fa95 clk: imx: rename imx_obtain_fixed_clk_hw() to imx_get_clk_hw_by_name()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Already up to date. +Merging clk-renesas/renesas-clk (777bcc85e1fb clk: renesas: r8a779f0: Fix Ethernet Switch clocks) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (7e2004906fb5 Revert "csky: Add support for restartable sequence") +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Merge made by the 'ort' strategy. + arch/csky/Kconfig | 4 ++-- + arch/csky/include/asm/processor.h | 2 ++ + arch/csky/kernel/entry.S | 11 +---------- + arch/csky/kernel/signal.c | 2 -- + arch/csky/kernel/stacktrace.c | 6 ++---- + 5 files changed, 7 insertions(+), 18 deletions(-) +Merging loongarch/loongarch-next (5535f4f70cfc LoongArch: Update Loongson-3 default config file) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging arch/loongarch/Kconfig +Auto-merging arch/loongarch/include/asm/efi.h +Auto-merging arch/loongarch/include/asm/irq.h +Auto-merging arch/loongarch/kernel/efi.c +Auto-merging arch/loongarch/kernel/numa.c +Auto-merging arch/loongarch/kernel/process.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/iommu/intel/iommu.h +Auto-merging drivers/pci/controller/pci-hyperv.c +Auto-merging scripts/mod/modpost.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 8 +- + arch/loongarch/Kconfig | 20 ++ + arch/loongarch/Makefile | 8 + + arch/loongarch/configs/loongson3_defconfig | 56 +-- + arch/loongarch/include/asm/acpi.h | 10 + + arch/loongarch/include/asm/alternative-asm.h | 82 +++++ + arch/loongarch/include/asm/alternative.h | 111 ++++++ + arch/loongarch/include/asm/asm-extable.h | 65 ++++ + arch/loongarch/include/asm/bootinfo.h | 1 + + arch/loongarch/include/asm/bugs.h | 15 + + arch/loongarch/include/asm/efi.h | 1 + + arch/loongarch/include/asm/extable.h | 47 +++ + arch/loongarch/include/asm/ftrace.h | 68 ++++ + arch/loongarch/include/asm/futex.h | 27 +- + arch/loongarch/include/asm/gpr-num.h | 22 ++ + arch/loongarch/include/asm/inst.h | 46 +++ + arch/loongarch/include/asm/loongson.h | 3 + + arch/loongarch/include/asm/module.h | 27 +- + arch/loongarch/include/asm/module.lds.h | 1 + + arch/loongarch/include/asm/setup.h | 1 + + arch/loongarch/include/asm/stackprotector.h | 38 ++ + arch/loongarch/include/asm/string.h | 5 + + arch/loongarch/include/asm/thread_info.h | 2 +- + arch/loongarch/include/asm/time.h | 1 + + arch/loongarch/include/asm/uaccess.h | 24 +- + arch/loongarch/include/asm/unwind.h | 3 +- + arch/loongarch/kernel/Makefile | 16 +- + arch/loongarch/kernel/acpi.c | 17 +- + arch/loongarch/kernel/alternative.c | 246 +++++++++++++ + arch/loongarch/kernel/asm-offsets.c | 15 + + arch/loongarch/kernel/efi.c | 15 +- + arch/loongarch/kernel/env.c | 2 + + arch/loongarch/kernel/fpu.S | 5 +- + arch/loongarch/kernel/ftrace.c | 73 ++++ + arch/loongarch/kernel/ftrace_dyn.c | 273 +++++++++++++++ + arch/loongarch/kernel/inst.c | 127 +++++++ + arch/loongarch/kernel/mcount.S | 96 ++++++ + arch/loongarch/kernel/mcount_dyn.S | 149 ++++++++ + arch/loongarch/kernel/module-sections.c | 64 ++-- + arch/loongarch/kernel/module.c | 75 +++- + arch/loongarch/kernel/numa.c | 17 +- + arch/loongarch/kernel/process.c | 6 + + arch/loongarch/kernel/reset.c | 5 + + arch/loongarch/kernel/setup.c | 149 +++++++- + arch/loongarch/kernel/smp.c | 35 ++ + arch/loongarch/kernel/switch.S | 5 + + arch/loongarch/kernel/time.c | 11 +- + arch/loongarch/kernel/traps.c | 27 ++ + arch/loongarch/kernel/unaligned.c | 499 +++++++++++++++++++++++++++ + arch/loongarch/kernel/unwind_guess.c | 4 +- + arch/loongarch/kernel/unwind_prologue.c | 50 ++- + arch/loongarch/kernel/vmlinux.lds.S | 13 +- + arch/loongarch/lib/Makefile | 3 +- + arch/loongarch/lib/clear_user.S | 85 ++++- + arch/loongarch/lib/copy_user.S | 108 +++++- + arch/loongarch/lib/memcpy.S | 95 +++++ + arch/loongarch/lib/memmove.S | 121 +++++++ + arch/loongarch/lib/memset.S | 91 +++++ + arch/loongarch/lib/unaligned.S | 84 +++++ + arch/loongarch/mm/extable.c | 59 +++- + arch/loongarch/net/bpf_jit.c | 86 ++++- + arch/loongarch/net/bpf_jit.h | 2 + + arch/loongarch/pci/acpi.c | 7 +- + arch/loongarch/power/Makefile | 4 + + arch/loongarch/power/hibernate.c | 62 ++++ + arch/loongarch/power/hibernate_asm.S | 66 ++++ + arch/loongarch/power/platform.c | 57 +++ + arch/loongarch/power/suspend.c | 73 ++++ + arch/loongarch/power/suspend_asm.S | 89 +++++ + scripts/mod/modpost.c | 13 + + scripts/recordmcount.c | 39 +++ + scripts/sorttable.c | 2 +- + 72 files changed, 3645 insertions(+), 187 deletions(-) + create mode 100644 arch/loongarch/include/asm/alternative-asm.h + create mode 100644 arch/loongarch/include/asm/alternative.h + create mode 100644 arch/loongarch/include/asm/asm-extable.h + create mode 100644 arch/loongarch/include/asm/bugs.h + create mode 100644 arch/loongarch/include/asm/extable.h + create mode 100644 arch/loongarch/include/asm/ftrace.h + create mode 100644 arch/loongarch/include/asm/gpr-num.h + create mode 100644 arch/loongarch/include/asm/stackprotector.h + create mode 100644 arch/loongarch/kernel/alternative.c + create mode 100644 arch/loongarch/kernel/ftrace.c + create mode 100644 arch/loongarch/kernel/ftrace_dyn.c + create mode 100644 arch/loongarch/kernel/mcount.S + create mode 100644 arch/loongarch/kernel/mcount_dyn.S + create mode 100644 arch/loongarch/kernel/unaligned.c + create mode 100644 arch/loongarch/lib/memcpy.S + create mode 100644 arch/loongarch/lib/memmove.S + create mode 100644 arch/loongarch/lib/memset.S + create mode 100644 arch/loongarch/lib/unaligned.S + create mode 100644 arch/loongarch/power/Makefile + create mode 100644 arch/loongarch/power/hibernate.c + create mode 100644 arch/loongarch/power/hibernate_asm.S + create mode 100644 arch/loongarch/power/platform.c + create mode 100644 arch/loongarch/power/suspend.c + create mode 100644 arch/loongarch/power/suspend_asm.S +Merging m68k/for-next (553b20b211c4 m68k: defconfig: Update defconfigs for v6.1-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (af5d74e32eb8 m68k: use strscpy() to instead of strncpy()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/kernel/setup_no.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging microblaze/next (5cfe469c2654 microblaze/PCI: Moving PCI iounmap and dependent code) +$ git merge -m Merge branch 'next' of git://git.monstr.eu/linux-2.6-microblaze.git microblaze/next +Already up to date. +Merging mips/mips-next (4c587a982603 MIPS: OCTEON: warn only once if deprecated link status is being used) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging nios2/for-next (7f7bc20bc41a nios2: Don't use _end for calculating min_low_pfn) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lftan/nios2.git nios2/for-next +Already up to date. +Merging openrisc/for-next (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (887e81335731 parisc: Drop PMD_SHIFT from calculation in pgtable.h) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Auto-merging arch/parisc/include/asm/pgtable.h +Merge made by the 'ort' strategy. + arch/parisc/include/asm/pgtable.h | 4 ++-- + arch/parisc/include/uapi/asm/mman.h | 29 ++++++++++++------------- + arch/parisc/kernel/firmware.c | 23 ++++++++++---------- + arch/parisc/kernel/hpmc.S | 8 ++----- + arch/parisc/kernel/kgdb.c | 10 ++++++++- + arch/parisc/kernel/pdc_cons.c | 36 ------------------------------- + arch/parisc/kernel/setup.c | 26 +++++++++++----------- + arch/parisc/kernel/sys_parisc.c | 28 ++++++++++++++++++++++++ + arch/parisc/kernel/syscalls/syscall.tbl | 2 +- + drivers/parisc/led.c | 3 +++ + tools/arch/parisc/include/uapi/asm/mman.h | 12 +++++------ + tools/perf/bench/bench.h | 12 ----------- + 12 files changed, 89 insertions(+), 104 deletions(-) +Merging powerpc/next (13959373e9c9 powerpc/qspinlock: Fix 32-bit build) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Makefile +Auto-merging arch/powerpc/include/asm/ftrace.h +Auto-merging arch/powerpc/kernel/process.c +Auto-merging arch/powerpc/kexec/file_load_64.c +Auto-merging arch/powerpc/kvm/book3s_64_mmu_hv.c +Auto-merging arch/x86/Kconfig +Auto-merging kernel/module/main.c +Auto-merging kernel/trace/Kconfig +Auto-merging scripts/Makefile.lib +Auto-merging tools/objtool/arch/x86/decode.c +Auto-merging tools/objtool/builtin-check.c +Auto-merging tools/objtool/check.c +CONFLICT (content): Merge conflict in tools/objtool/check.c +Auto-merging tools/objtool/elf.c +Auto-merging tools/objtool/include/objtool/arch.h +Auto-merging tools/objtool/include/objtool/builtin.h +Auto-merging tools/objtool/include/objtool/elf.h +Resolved 'tools/objtool/check.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7122ae6557de] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 5 + + Documentation/powerpc/cpu_families.rst | 13 + + Makefile | 4 +- + arch/powerpc/Kconfig | 51 +- + arch/powerpc/boot/dts/fsl/t1024qds.dts | 2 +- + arch/powerpc/boot/dts/fsl/t1024rdb.dts | 2 +- + arch/powerpc/boot/dts/fsl/t104xqds.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t104xrdb.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t208xqds.dtsi | 2 +- + arch/powerpc/boot/dts/fsl/t208xrdb.dtsi | 2 +- + arch/powerpc/boot/dts/microwatt.dts | 22 + + arch/powerpc/boot/dts/turris1x.dts | 14 + + arch/powerpc/boot/dts/warp.dts | 4 +- + arch/powerpc/boot/wrapper | 17 +- + arch/powerpc/include/asm/asm.h | 7 + + arch/powerpc/include/asm/book3s/32/tlbflush.h | 9 + + arch/powerpc/include/asm/book3s/64/tlbflush-hash.h | 50 -- + arch/powerpc/include/asm/book3s/64/tlbflush.h | 41 +- + arch/powerpc/include/asm/bug.h | 3 +- + arch/powerpc/include/asm/cmpxchg.h | 231 ++++- + arch/powerpc/include/asm/code-patching.h | 2 - + arch/powerpc/include/asm/cputime.h | 17 +- + arch/powerpc/include/asm/debug.h | 2 + + arch/powerpc/include/asm/ftrace.h | 19 +- + arch/powerpc/include/asm/hvcall.h | 3 +- + arch/powerpc/include/asm/irqflags.h | 58 -- + arch/powerpc/include/asm/kvm_book3s_asm.h | 2 +- + arch/powerpc/include/asm/kvm_ppc.h | 12 + + arch/powerpc/include/asm/linkage.h | 3 + + arch/powerpc/include/asm/mmu_context.h | 6 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 10 +- + arch/powerpc/include/asm/nohash/pgtable.h | 2 +- + arch/powerpc/include/asm/nohash/tlbflush.h | 7 + + arch/powerpc/include/asm/ppc_asm.h | 19 + + arch/powerpc/include/asm/processor.h | 15 +- + arch/powerpc/include/asm/prom.h | 1 + + arch/powerpc/include/asm/ps3.h | 4 - + arch/powerpc/include/asm/pte-walk.h | 25 - + arch/powerpc/include/asm/ptrace.h | 36 +- + arch/powerpc/include/asm/qspinlock.h | 192 ++-- + arch/powerpc/include/asm/qspinlock_paravirt.h | 7 - + arch/powerpc/include/asm/qspinlock_types.h | 72 ++ + arch/powerpc/include/asm/rtas.h | 15 - + arch/powerpc/include/asm/spinlock.h | 2 +- + arch/powerpc/include/asm/spinlock_types.h | 2 +- + arch/powerpc/kernel/asm-offsets.c | 34 +- + arch/powerpc/kernel/cpu_setup_6xx.S | 26 +- + arch/powerpc/kernel/cpu_setup_e500.S | 8 +- + arch/powerpc/kernel/entry_32.S | 23 +- + arch/powerpc/kernel/entry_64.S | 2 + + arch/powerpc/kernel/exceptions-64e.S | 48 +- + arch/powerpc/kernel/exceptions-64s.S | 120 +-- + arch/powerpc/kernel/head_32.h | 4 +- + arch/powerpc/kernel/head_40x.S | 7 +- + arch/powerpc/kernel/head_44x.S | 6 +- + arch/powerpc/kernel/head_64.S | 13 +- + arch/powerpc/kernel/head_85xx.S | 13 +- + arch/powerpc/kernel/head_8xx.S | 7 +- + arch/powerpc/kernel/head_book3s_32.S | 33 +- + arch/powerpc/kernel/head_booke.h | 4 +- + arch/powerpc/kernel/hw_breakpoint.c | 2 +- + arch/powerpc/kernel/interrupt_64.S | 54 +- + arch/powerpc/kernel/irq.c | 4 +- + arch/powerpc/kernel/kgdb.c | 2 +- + arch/powerpc/kernel/kprobes.c | 14 +- + arch/powerpc/kernel/misc_32.S | 2 +- + arch/powerpc/kernel/misc_64.S | 8 +- + arch/powerpc/kernel/module_64.c | 10 + + arch/powerpc/kernel/optprobes.c | 2 +- + arch/powerpc/kernel/optprobes_head.S | 4 +- + arch/powerpc/kernel/ppc_save_regs.S | 57 +- + arch/powerpc/kernel/process.c | 97 +- + arch/powerpc/kernel/prom.c | 4 + + arch/powerpc/kernel/rtas.c | 192 ++-- + arch/powerpc/kernel/rtasd.c | 7 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/powerpc/kernel/stacktrace.c | 10 +- + arch/powerpc/kernel/swsusp_32.S | 5 +- + arch/powerpc/kernel/time.c | 23 +- + arch/powerpc/kernel/tm.S | 8 +- + arch/powerpc/kernel/trace/ftrace_mprofile.S | 2 +- + arch/powerpc/kernel/vdso/Makefile | 2 + + arch/powerpc/kernel/vector.S | 4 +- + arch/powerpc/kexec/file_load_64.c | 59 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 7 +- + arch/powerpc/kvm/book3s_64_vio.c | 6 +- + arch/powerpc/kvm/book3s_hv_interrupts.S | 4 +- + arch/powerpc/kvm/book3s_hv_rmhandlers.S | 27 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 5 +- + arch/powerpc/kvm/book3s_xive.c | 12 +- + arch/powerpc/kvm/book3s_xive.h | 3 +- + arch/powerpc/kvm/book3s_xive_native.c | 3 +- + arch/powerpc/kvm/booke.c | 3 + + arch/powerpc/kvm/bookehv_interrupts.S | 9 - + arch/powerpc/kvm/fpu.S | 17 +- + arch/powerpc/lib/Makefile | 4 +- + arch/powerpc/lib/code-patching.c | 234 ++++- + arch/powerpc/lib/feature-fixups.c | 173 ++-- + arch/powerpc/lib/qspinlock.c | 997 +++++++++++++++++++++ + arch/powerpc/lib/sstep.c | 21 +- + arch/powerpc/lib/test_emulate_step_exec_instr.S | 2 +- + arch/powerpc/mm/book3s64/hash_4k.c | 5 + + arch/powerpc/mm/book3s64/hash_64k.c | 10 + + arch/powerpc/mm/book3s64/hash_utils.c | 130 ++- + arch/powerpc/mm/book3s64/internal.h | 11 + + arch/powerpc/mm/book3s64/pgtable.c | 4 +- + arch/powerpc/mm/mem.c | 1 - + arch/powerpc/mm/nohash/kaslr_booke.c | 1 - + arch/powerpc/mm/nohash/tlb.c | 8 + + arch/powerpc/perf/callchain.c | 9 +- + arch/powerpc/perf/hv-gpci-requests.h | 4 + + arch/powerpc/perf/hv-gpci.c | 35 +- + arch/powerpc/perf/hv-gpci.h | 1 + + arch/powerpc/perf/req-gen/perf.h | 20 + + arch/powerpc/platforms/44x/warp.c | 105 ++- + arch/powerpc/platforms/52xx/lite5200_sleep.S | 15 +- + arch/powerpc/platforms/52xx/mpc52xx_lpbfifo.c | 15 +- + arch/powerpc/platforms/83xx/mpc832x_rdb.c | 2 +- + arch/powerpc/platforms/85xx/sgy_cts1000.c | 132 ++- + arch/powerpc/platforms/Kconfig.cputype | 9 +- + arch/powerpc/platforms/pasemi/gpio_mdio.c | 4 +- + arch/powerpc/platforms/powermac/setup.c | 18 +- + arch/powerpc/platforms/ps3/system-bus.c | 2 +- + arch/powerpc/platforms/pseries/eeh_pseries.c | 15 +- + arch/powerpc/platforms/pseries/hotplug-cpu.c | 1 + + arch/powerpc/platforms/pseries/hvCall.S | 38 +- + arch/powerpc/platforms/pseries/iommu.c | 2 +- + arch/powerpc/platforms/pseries/mobility.c | 7 +- + arch/powerpc/platforms/pseries/plpks.c | 50 +- + arch/powerpc/platforms/pseries/plpks.h | 2 +- + arch/powerpc/sysdev/fsl_pci.c | 13 + + arch/powerpc/sysdev/mpic_msgr.c | 4 +- + arch/powerpc/sysdev/xive/native.c | 6 +- + arch/powerpc/sysdev/xive/spapr.c | 1 + + arch/powerpc/xmon/xmon.c | 17 +- + arch/x86/Kconfig | 1 + + drivers/cpuidle/cpuidle-powernv.c | 5 +- + drivers/cpuidle/cpuidle-pseries.c | 8 +- + drivers/crypto/vmx/Makefile | 14 +- + drivers/crypto/vmx/ppc-xlate.pl | 10 +- + drivers/macintosh/adb.c | 4 +- + drivers/macintosh/ams/ams-i2c.c | 8 +- + drivers/macintosh/ams/ams.h | 5 + + drivers/macintosh/macio-adb.c | 11 +- + drivers/macintosh/macio_asic.c | 2 +- + drivers/macintosh/therm_adt746x.c | 6 +- + drivers/macintosh/therm_windtunnel.c | 5 +- + drivers/macintosh/via-pmu-backlight.c | 7 +- + drivers/macintosh/via-pmu.c | 4 + + drivers/macintosh/windfarm_ad7417_sensor.c | 5 +- + drivers/macintosh/windfarm_fcu_controls.c | 5 +- + drivers/macintosh/windfarm_lm75_sensor.c | 8 +- + drivers/macintosh/windfarm_lm87_sensor.c | 5 +- + drivers/macintosh/windfarm_max6690_sensor.c | 5 +- + drivers/macintosh/windfarm_pid.h | 5 + + drivers/macintosh/windfarm_pm121.c | 4 +- + drivers/macintosh/windfarm_pm81.c | 4 +- + drivers/macintosh/windfarm_pm91.c | 2 +- + drivers/macintosh/windfarm_smu_controls.c | 10 +- + drivers/macintosh/windfarm_smu_sat.c | 5 +- + drivers/misc/cxl/guest.c | 24 +- + drivers/misc/cxl/pci.c | 21 +- + drivers/misc/cxl/vphb.c | 7 - + drivers/misc/ocxl/config.c | 20 +- + drivers/misc/ocxl/file.c | 7 +- + drivers/ps3/ps3-lpm.c | 2 +- + include/linux/moduleloader.h | 3 + + include/misc/cxl.h | 2 +- + kernel/module/main.c | 10 + + kernel/trace/Kconfig | 7 + + scripts/Makefile.lib | 3 + + tools/objtool/arch/powerpc/Build | 2 + + tools/objtool/arch/powerpc/decode.c | 110 +++ + tools/objtool/arch/powerpc/include/arch/cfi_regs.h | 11 + + tools/objtool/arch/powerpc/include/arch/elf.h | 10 + + tools/objtool/arch/powerpc/include/arch/special.h | 21 + + tools/objtool/arch/powerpc/special.c | 19 + + tools/objtool/arch/x86/decode.c | 5 + + tools/objtool/arch/x86/include/arch/elf.h | 2 + + tools/objtool/arch/x86/include/arch/endianness.h | 9 - + tools/objtool/builtin-check.c | 14 + + tools/objtool/check.c | 53 +- + tools/objtool/elf.c | 8 +- + tools/objtool/include/objtool/arch.h | 2 + + tools/objtool/include/objtool/builtin.h | 1 + + tools/objtool/include/objtool/elf.h | 8 + + tools/objtool/include/objtool/endianness.h | 32 +- + tools/objtool/orc_dump.c | 11 +- + tools/objtool/orc_gen.c | 4 +- + tools/objtool/special.c | 3 +- + tools/testing/selftests/powerpc/dscr/dscr.h | 17 +- + .../selftests/powerpc/dscr/dscr_sysfs_test.c | 5 +- + tools/testing/selftests/powerpc/include/pkeys.h | 2 +- + tools/testing/selftests/powerpc/ptrace/core-pkey.c | 6 +- + .../selftests/powerpc/ptrace/perf-hwbreak.c | 78 +- + .../selftests/powerpc/ptrace/ptrace-hwbreak.c | 6 +- + tools/testing/selftests/powerpc/ptrace/ptrace.h | 5 +- + tools/testing/selftests/powerpc/scripts/hmi.sh | 2 +- + .../selftests/powerpc/security/flush_utils.c | 3 +- + 199 files changed, 3587 insertions(+), 1278 deletions(-) + create mode 100644 arch/powerpc/include/asm/asm.h + delete mode 100644 arch/powerpc/include/asm/qspinlock_paravirt.h + create mode 100644 arch/powerpc/include/asm/qspinlock_types.h + create mode 100644 arch/powerpc/lib/qspinlock.c + create mode 100644 tools/objtool/arch/powerpc/Build + create mode 100644 tools/objtool/arch/powerpc/decode.c + create mode 100644 tools/objtool/arch/powerpc/include/arch/cfi_regs.h + create mode 100644 tools/objtool/arch/powerpc/include/arch/elf.h + create mode 100644 tools/objtool/arch/powerpc/include/arch/special.h + create mode 100644 tools/objtool/arch/powerpc/special.c + delete mode 100644 tools/objtool/arch/x86/include/arch/endianness.h +Merging powerpc-objtool/topic/objtool (a39818a3fb2b objtool/powerpc: Implement arch_pc_relative_reloc()) +$ git merge -m Merge branch 'topic/objtool' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-objtool/topic/objtool +Already up to date. +Merging soc-fsl/next (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl/next +Already up to date. +Merging risc-v/for-next (6e66e96e31b8 Merge patch series "Documentation: RISC-V: patch-acceptance changes") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging riscv-dt/riscv-dt-for-next (4563db4b7988 Merge branch 'riscv-thead_c9xx' into riscv-dt-for-next) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Already up to date. +Merging riscv-soc/riscv-soc-for-next (8fbf94fea0b4 soc: sifive: ccache: fix missing of_node_put() in sifive_ccache_init()) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Already up to date. +Merging s390/for-next (286c89ef3b34 Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/s390/Kconfig +Auto-merging arch/s390/kernel/perf_pai_ext.c +Merge made by the 'ort' strategy. +Merging sh/for-next (8518e694203d sh: pgtable-3level: Fix cast to pointer from integer of different size) +$ git merge -m Merge branch 'for-next' of git://git.libc.org/linux-sh sh/for-next +Already up to date. +Merging sparc-next/master (dd0d718152e4 Merge tag 'spi-fix-v5.8-rc2' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc-next.git sparc-next/master +Already up to date. +Merging uml/next (43ee0357e15b um: vector: Fix memory leak in vector_config) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Merge made by the 'ort' strategy. + arch/um/drivers/vector_kern.c | 1 + + arch/um/drivers/virtio_uml.c | 2 +- + arch/um/kernel/tlb.c | 2 ++ + arch/um/os-Linux/irq.c | 4 +--- + fs/hostfs/hostfs_kern.c | 15 ++++++++------- + 5 files changed, 13 insertions(+), 11 deletions(-) +Merging xtensa/xtensa-for-next (8939c58d68f9 xtensa: add __umulsidi3 helper) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (6a857ab5b57c Merge branch 'fs.idmapped.overlay.acl' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Auto-merging MAINTAINERS +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. +Merging vfs-idmapping/for-next (e175af42241c Merge branch 'fs.acl.rework' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/ctree.h +Auto-merging fs/btrfs/inode.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/exec.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/fuse/file.c +Auto-merging fs/ksmbd/vfs.c +Auto-merging fs/namei.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/posix_acl.c +Auto-merging fs/xattr.c +Auto-merging fs/xattr.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/xattr.h +Auto-merging mm/shmem.c +Auto-merging mm/shmem.c +Auto-merging security/commoncap.c +Merge made by the 'ort' strategy. + tools/testing/selftests/mount_setattr/mount_setattr_test.c | 1 + + 1 file changed, 1 insertion(+) +Merging fscrypt/master (41952551acb4 fscrypt: add additional documentation for SM4 support) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fscrypt/master +Already up to date. +Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +Merging afs/afs-next (1dd7bb25658d afs: remove afs_cache_netfs and afs_zap_permits() declarations) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Auto-merging fs/afs/dir.c +Auto-merging fs/afs/file.c +Auto-merging fs/afs/internal.h +Auto-merging fs/afs/write.c +Merge made by the 'ort' strategy. + fs/afs/dir.c | 1 + + fs/afs/file.c | 3 +- + fs/afs/internal.h | 8 ------ + fs/afs/volume.c | 6 +--- + fs/afs/write.c | 83 +++++++++++++++++++++++++++++++------------------------ + 5 files changed, 51 insertions(+), 50 deletions(-) +Merging btrfs/for-next (d1a1795bb77b Merge branch 'for-next-next-v6.1-20221205' into for-next-20221205) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Merge made by the 'ort' strategy. +Merging ceph/master (68c62bee9d08 ceph: try to check caps immediately after async creating finishes) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (b2a20a5bd269 cifs: use fs_context for automounts) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/cifsproto.h +Auto-merging fs/cifs/connect.c +Auto-merging fs/cifs/file.c +Auto-merging fs/cifs/smb2ops.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cifs/usage.rst | 2 +- + fs/cifs/cifs_dfs_ref.c | 100 +++++++---------- + fs/cifs/cifs_ioctl.h | 2 +- + fs/cifs/cifsfs.c | 8 +- + fs/cifs/cifsfs.h | 4 +- + fs/cifs/cifsglob.h | 76 ++++++++++++- + fs/cifs/cifspdu.h | 50 ++++----- + fs/cifs/cifsproto.h | 6 +- + fs/cifs/connect.c | 1 + + fs/cifs/file.c | 36 ++++--- + fs/cifs/fs_context.c | 11 +- + fs/cifs/inode.c | 13 ++- + fs/cifs/misc.c | 4 +- + fs/cifs/smb2inode.c | 68 +++++++++--- + fs/cifs/smb2ops.c | 179 +++++++++++++++---------------- + fs/cifs/smb2proto.h | 5 +- + 16 files changed, 339 insertions(+), 226 deletions(-) +Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (c1cc2db21607 ecryptfs: keystore: Fix typo 'the the' in comment) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Merge made by the 'ort' strategy. + fs/ecryptfs/crypto.c | 8 ++++---- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/read_write.c | 8 ++++---- + 3 files changed, 9 insertions(+), 9 deletions(-) +Merging erofs/dev (c505feba4c0d erofs: validate the extent length for uncompressed pclusters) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (36955d368dc1 exfat: reuse exfat_find_location() to simplify exfat_get_dentry_set()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Auto-merging fs/exfat/inode.c +Merge made by the 'ort' strategy. + fs/exfat/dir.c | 184 +++++++++++++++++++++++++++++----------------------- + fs/exfat/exfat_fs.h | 56 +++++++++++----- + fs/exfat/file.c | 12 ++-- + fs/exfat/inode.c | 17 +++-- + fs/exfat/namei.c | 63 +++++++++--------- + 5 files changed, 187 insertions(+), 145 deletions(-) +Merging ext3/for_next (1acc506685db Merge UDF hole handling fixes.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Auto-merging MAINTAINERS +Auto-merging fs/udf/namei.c +Merge made by the 'ort' strategy. +Merging ext4/dev (1da18e38cb97 ext4: fix reserved cluster accounting in __es_remove_extent()) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (041fae9c105a Merge tag 'f2fs-for-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/fsverity (a4bbf53d88c7 fsverity: simplify fsverity_get_digest()) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Already up to date. +Merging fuse/for-next (1b0e94993dbe fuse: optional supplementary group in create requests) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/dev.c +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/fuse_i.h +Merge made by the 'ort' strategy. + fs/fuse/dev.c | 2 + + fs/fuse/dir.c | 124 +++++++++++++++++++++++++++++++++++----------- + fs/fuse/fuse_i.h | 9 +++- + fs/fuse/inode.c | 4 +- + include/uapi/linux/fuse.h | 45 ++++++++++++++++- + 5 files changed, 152 insertions(+), 32 deletions(-) +Merging gfs2/for-next (6b46a06100dd gfs2: Remove support for glock holder auto-demotion (2)) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/gfs2/inode.c +Merge made by the 'ort' strategy. + fs/gfs2/aops.c | 2 - + fs/gfs2/bmap.c | 3 - + fs/gfs2/file.c | 3 +- + fs/gfs2/glock.c | 269 ++++++++++++++++++++---------------------------------- + fs/gfs2/glock.h | 65 +------------ + fs/gfs2/glops.c | 44 +++++---- + fs/gfs2/incore.h | 1 - + fs/gfs2/inode.c | 64 +++++++------ + fs/gfs2/meta_io.c | 6 ++ + fs/gfs2/super.c | 84 +++++++++-------- + fs/gfs2/xattr.c | 26 +++--- + 11 files changed, 234 insertions(+), 333 deletions(-) +Merging jfs/jfs-next (a60dca73a1a8 jfs: makes diUnmount/diMount in jfs_mount_rw atomic) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (504a73d46bad Merge tag '6.2-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Already up to date. +Merging nfs/linux-next (405ab45b5afa SUNRPC: ensure the matching upcall is in-flight upon downcall) +$ 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. + include/linux/sunrpc/rpc_pipe_fs.h | 5 +++++ + net/sunrpc/auth_gss/auth_gss.c | 19 +++++++++++++++++-- + 2 files changed, 22 insertions(+), 2 deletions(-) +Merging nfs-anna/linux-next (7e8436728e22 nfs4: Fix kmemleak when allocate slot failed) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/for-next (75333d48f922 NFSD: fix use-after-free in __nfs42_ssc_open()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/for-next +Auto-merging fs/nfsd/nfs4callback.c +Merge made by the 'ort' strategy. + fs/nfsd/filecache.c | 318 ++++++++++++++++++++++++++----------------------- + fs/nfsd/nfs4callback.c | 4 +- + fs/nfsd/nfs4proc.c | 20 +--- + fs/nfsd/trace.h | 51 +++----- + 4 files changed, 197 insertions(+), 196 deletions(-) +Merging ntfs3/master (36963cf225f8 fs/ntfs3: Make if more readable) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/bitmap.c +CONFLICT (content): Merge conflict in fs/ntfs3/bitmap.c +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/fslog.c +Auto-merging fs/ntfs3/inode.c +CONFLICT (content): Merge conflict in fs/ntfs3/inode.c +Auto-merging fs/ntfs3/namei.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/xattr.c +CONFLICT (content): Merge conflict in fs/ntfs3/xattr.c +Resolved 'fs/ntfs3/bitmap.c' using previous resolution. +Resolved 'fs/ntfs3/inode.c' using previous resolution. +Resolved 'fs/ntfs3/xattr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7bc67a16819f] Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/ntfs3.rst | 19 ++ + fs/ntfs3/attrib.c | 392 ++++++++++++++++++++++-------------- + fs/ntfs3/attrlist.c | 5 + + fs/ntfs3/bitfunc.c | 4 +- + fs/ntfs3/bitmap.c | 168 ++++++++++++---- + fs/ntfs3/dir.c | 4 +- + fs/ntfs3/file.c | 203 +++++-------------- + fs/ntfs3/frecord.c | 40 +++- + fs/ntfs3/fslog.c | 62 +++--- + fs/ntfs3/fsntfs.c | 190 +++++++++++++---- + fs/ntfs3/index.c | 127 ++++++++++-- + fs/ntfs3/inode.c | 215 ++++++++++++++++---- + fs/ntfs3/namei.c | 238 ++++++++++++++++++++++ + fs/ntfs3/ntfs.h | 6 +- + fs/ntfs3/ntfs_fs.h | 41 +++- + fs/ntfs3/record.c | 13 ++ + fs/ntfs3/run.c | 28 +-- + fs/ntfs3/super.c | 143 ++++++++----- + fs/ntfs3/upcase.c | 12 ++ + fs/ntfs3/xattr.c | 158 +++++++++------ + 20 files changed, 1440 insertions(+), 628 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-fs-rename-current-get-acl-method.patch +Applying: fix up for "fs: rename current get acl method" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/ntfs3/namei.c +$ git add -A . +$ git commit -v -a --amend +[master 6f447a8f1450] Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git + Date: Fri Dec 16 09:20:32 2022 +1100 +Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (637d13b57d85 ovl: Kconfig: Fix spelling mistake "undelying" -> "underlying") +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Already up to date. +Merging ubifs/next (8d0960731a26 jffs2: Fix list_del corruption if compressors initialized failed) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Auto-merging drivers/mtd/ubi/debug.c +Auto-merging fs/jffs2/fs.c +Merge made by the 'ort' strategy. + drivers/mtd/ubi/block.c | 9 +++++--- + drivers/mtd/ubi/build.c | 25 ++++++++++++++++++---- + drivers/mtd/ubi/debug.c | 19 +++++++++-------- + drivers/mtd/ubi/fastmap-wl.c | 12 ++++++----- + drivers/mtd/ubi/fastmap.c | 2 +- + drivers/mtd/ubi/vmt.c | 18 +++++++++------- + drivers/mtd/ubi/wl.c | 25 +++++++++++++++++++--- + fs/jffs2/compr.c | 50 +++++++++++++++++++++++++------------------- + fs/jffs2/compr.h | 26 +++++++++++++++++------ + fs/jffs2/fs.c | 2 +- + fs/ubifs/budget.c | 9 ++++---- + fs/ubifs/dir.c | 18 +++++++++++++++- + fs/ubifs/file.c | 31 ++++++++++++++++++++------- + fs/ubifs/io.c | 6 +++--- + fs/ubifs/journal.c | 8 +++++-- + fs/ubifs/super.c | 17 +++++++++++---- + fs/ubifs/sysfs.c | 2 ++ + fs/ubifs/tnc.c | 24 ++++++++++++++++++++- + fs/ubifs/ubifs.h | 5 +++++ + 19 files changed, 223 insertions(+), 85 deletions(-) +Merging v9fs/9p-next (093af6393d21 9p/virtio: add a read barrier in p9_virtio_zc_request) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Auto-merging fs/9p/vfs_addr.c +Auto-merging fs/9p/vfs_dir.c +Auto-merging fs/9p/vfs_inode_dotl.c +Auto-merging net/9p/client.c +Auto-merging net/9p/trans_fd.c +Merge made by the 'ort' strategy. + fs/9p/fid.c | 1 - + fs/9p/v9fs.c | 1 - + fs/9p/vfs_addr.c | 1 - + fs/9p/vfs_dentry.c | 1 - + fs/9p/vfs_dir.c | 1 - + fs/9p/vfs_file.c | 1 - + fs/9p/vfs_inode.c | 1 - + fs/9p/vfs_inode_dotl.c | 1 - + fs/9p/vfs_super.c | 1 - + include/net/9p/9p.h | 2 ++ + net/9p/client.c | 33 ++++++++++++++++++++++----------- + net/9p/trans_fd.c | 13 ++++++------- + net/9p/trans_rdma.c | 5 ++--- + net/9p/trans_virtio.c | 16 +++++++++++----- + net/9p/trans_xen.c | 8 +++++--- + 15 files changed, 48 insertions(+), 38 deletions(-) +Merging xfs/for-next (4883f57a2d86 xfs: remove restrictions for fsdax and reflink) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/xfs_iops.c +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/page-flags.h +Merge made by the 'ort' strategy. +Merging zonefs/for-next (6bac30bb8ff8 zonefs: Call page_address() on page acquired with GFP_KERNEL flag) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (f1bd37a47352 iomap: directly use logical block size) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (f2f2494c8aa3 Add process name and pid to locks warning) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging iversion/iversion-next (2b3319b35573 nfsd: remove fetch_iversion export operation) +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Auto-merging fs/ceph/inode.c +Auto-merging fs/libfs.c +Auto-merging fs/nfs/inode.c +Auto-merging fs/nfsd/nfs4xdr.c +Auto-merging fs/nfsd/nfsfh.c +Auto-merging fs/nfsd/nfsfh.h +Auto-merging fs/nfsd/vfs.h +Auto-merging fs/stat.c +Merge made by the 'ort' strategy. + fs/ceph/inode.c | 16 ++++++++----- + fs/libfs.c | 36 ++++++++++++++++++++++++++++++ + fs/nfs/export.c | 7 ------ + fs/nfs/inode.c | 16 +++++++++---- + fs/nfsd/nfs4xdr.c | 4 +++- + fs/nfsd/nfsfh.c | 42 +++++++++++++++++++++++++++++++++++ + fs/nfsd/nfsfh.h | 29 +----------------------- + fs/nfsd/vfs.h | 7 +++++- + fs/stat.c | 17 ++++++++++++-- + include/linux/exportfs.h | 1 - + include/linux/iversion.h | 58 +++++++++++++++++------------------------------- + include/linux/stat.h | 9 ++++++++ + 12 files changed, 155 insertions(+), 87 deletions(-) +Merging vfs/for-next (9ea606dbbc50 Merge branch 'work.misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Auto-merging fs/binfmt_elf.c +Auto-merging fs/coredump.c +Auto-merging fs/super.c +Merge made by the 'ort' strategy. +Merging printk/for-next (348af86ecc06 Merge branch 'rework/console-list-lock' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging kernel/printk/printk.c +Merge made by the 'ort' strategy. +Merging pci/next (f826afe5eae8 Merge branch 'pci/kbuild') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Already up to date. +Merging pstore/for-next/pstore (76d62f24db07 pstore: Switch pmsg_lock to an rt_mutex to avoid priority inversion) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Merge made by the 'ort' strategy. + fs/pstore/pmsg.c | 7 ++++--- + 1 file changed, 4 insertions(+), 3 deletions(-) +Merging hid/for-next (d9beee49918d Merge branch 'for-6.2/hid-bpf' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/hid/hid-hyperv.c +Auto-merging drivers/hid/hid-logitech-hidpp.c +Auto-merging drivers/hid/hid-uclogic-rdesc.c +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + Documentation/hid/hid-bpf.rst | 512 +++++++++++++ + Documentation/hid/index.rst | 1 + + MAINTAINERS | 3 + + drivers/Makefile | 2 +- + drivers/hid/Kconfig | 19 +- + drivers/hid/Makefile | 2 + + drivers/hid/amd-sfh-hid/Kconfig | 2 +- + drivers/hid/bpf/Kconfig | 18 + + drivers/hid/bpf/Makefile | 11 + + drivers/hid/bpf/entrypoints/Makefile | 93 +++ + drivers/hid/bpf/entrypoints/README | 4 + + drivers/hid/bpf/entrypoints/entrypoints.bpf.c | 34 + + drivers/hid/bpf/entrypoints/entrypoints.lskel.h | 330 ++++++++ + drivers/hid/bpf/hid_bpf_dispatch.c | 547 +++++++++++++ + drivers/hid/bpf/hid_bpf_dispatch.h | 28 + + drivers/hid/bpf/hid_bpf_jmp_table.c | 564 ++++++++++++++ + drivers/hid/hid-core.c | 34 +- + include/linux/hid.h | 5 + + include/linux/hid_bpf.h | 163 ++++ + net/bluetooth/hidp/Kconfig | 2 +- + samples/hid/.gitignore | 8 + + samples/hid/Makefile | 250 ++++++ + samples/hid/Makefile.target | 75 ++ + samples/hid/hid_bpf_attach.bpf.c | 18 + + samples/hid/hid_bpf_attach.h | 14 + + samples/hid/hid_bpf_helpers.h | 21 + + samples/hid/hid_mouse.bpf.c | 112 +++ + samples/hid/hid_mouse.c | 155 ++++ + samples/hid/hid_surface_dial.bpf.c | 134 ++++ + samples/hid/hid_surface_dial.c | 226 ++++++ + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/hid/.gitignore | 4 + + tools/testing/selftests/hid/Makefile | 231 ++++++ + tools/testing/selftests/hid/config | 21 + + tools/testing/selftests/hid/hid_bpf.c | 845 +++++++++++++++++++++ + tools/testing/selftests/hid/progs/hid.c | 196 +++++ + .../testing/selftests/hid/progs/hid_bpf_helpers.h | 21 + + 37 files changed, 4697 insertions(+), 9 deletions(-) + create mode 100644 Documentation/hid/hid-bpf.rst + create mode 100644 drivers/hid/bpf/Kconfig + create mode 100644 drivers/hid/bpf/Makefile + create mode 100644 drivers/hid/bpf/entrypoints/Makefile + create mode 100644 drivers/hid/bpf/entrypoints/README + create mode 100644 drivers/hid/bpf/entrypoints/entrypoints.bpf.c + create mode 100644 drivers/hid/bpf/entrypoints/entrypoints.lskel.h + create mode 100644 drivers/hid/bpf/hid_bpf_dispatch.c + create mode 100644 drivers/hid/bpf/hid_bpf_dispatch.h + create mode 100644 drivers/hid/bpf/hid_bpf_jmp_table.c + create mode 100644 include/linux/hid_bpf.h + create mode 100644 samples/hid/.gitignore + create mode 100644 samples/hid/Makefile + create mode 100644 samples/hid/Makefile.target + create mode 100644 samples/hid/hid_bpf_attach.bpf.c + create mode 100644 samples/hid/hid_bpf_attach.h + create mode 100644 samples/hid/hid_bpf_helpers.h + create mode 100644 samples/hid/hid_mouse.bpf.c + create mode 100644 samples/hid/hid_mouse.c + create mode 100644 samples/hid/hid_surface_dial.bpf.c + create mode 100644 samples/hid/hid_surface_dial.c + create mode 100644 tools/testing/selftests/hid/.gitignore + create mode 100644 tools/testing/selftests/hid/Makefile + create mode 100644 tools/testing/selftests/hid/config + create mode 100644 tools/testing/selftests/hid/hid_bpf.c + create mode 100644 tools/testing/selftests/hid/progs/hid.c + create mode 100644 tools/testing/selftests/hid/progs/hid_bpf_helpers.h +Merging i2c/i2c/for-next (38cf3e4fa7d0 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/i2c/i2c-core-base.c +Merge made by the 'ort' strategy. + .../bindings/i2c/hisilicon,ascend910-i2c.yaml | 73 +++++++ + .../devicetree/bindings/i2c/i2c-mt65xx.yaml | 1 + + .../bindings/i2c/marvell,mv64xxx-i2c.yaml | 1 + + .../bindings/i2c/qcom,i2c-geni-qcom.yaml | 64 +++++- + .../devicetree/bindings/i2c/renesas,riic.yaml | 2 +- + .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 44 +++- + MAINTAINERS | 1 + + drivers/i2c/busses/Kconfig | 2 +- + drivers/i2c/busses/i2c-amd-mp2-pci.c | 30 ++- + drivers/i2c/busses/i2c-amd-mp2.h | 1 + + drivers/i2c/busses/i2c-designware-common.c | 5 - + drivers/i2c/busses/i2c-designware-core.h | 235 ++++++++++----------- + drivers/i2c/busses/i2c-designware-master.c | 44 ++-- + drivers/i2c/busses/i2c-designware-slave.c | 77 +++---- + drivers/i2c/busses/i2c-gpio.c | 4 +- + drivers/i2c/busses/i2c-hisi.c | 22 +- + drivers/i2c/busses/i2c-imx.c | 3 +- + drivers/i2c/busses/i2c-ismt.c | 3 + + drivers/i2c/busses/i2c-mt65xx.c | 14 ++ + drivers/i2c/busses/i2c-npcm7xx.c | 87 ++++---- + drivers/i2c/busses/i2c-pasemi-core.c | 32 ++- + drivers/i2c/busses/i2c-pasemi-core.h | 5 + + drivers/i2c/busses/i2c-pasemi-platform.c | 6 + + drivers/i2c/busses/i2c-pxa-pci.c | 10 +- + drivers/i2c/busses/i2c-qcom-geni.c | 58 ++++- + drivers/i2c/busses/i2c-tegra.c | 1 + + drivers/i2c/busses/i2c-xiic.c | 9 +- + drivers/i2c/i2c-core-base.c | 5 +- + drivers/i2c/i2c-slave-eeprom.c | 5 +- + drivers/i2c/i2c-smbus.c | 11 +- + drivers/i2c/muxes/i2c-mux-pca9541.c | 5 +- + drivers/i2c/muxes/i2c-mux-pca954x.c | 6 +- + drivers/i2c/muxes/i2c-mux-reg.c | 5 +- + drivers/soc/qcom/qcom-geni-se.c | 79 +++++-- + 34 files changed, 623 insertions(+), 327 deletions(-) + create mode 100644 Documentation/devicetree/bindings/i2c/hisilicon,ascend910-i2c.yaml +Merging i3c/i3c/next (08dcf0732cb4 MAINTAINERS: mark I3C DRIVER FOR SYNOPSYS DESIGNWARE orphan) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (364ffd2537c4 hwmon: (emc2305) fix pwm never being able to set lower) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (c2016863bbfd Merge branch 'docs-mw' into docs-next) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Merge made by the 'ort' strategy. +Merging v4l-dvb/master (d4acfa22b634 media: sun6i-isp: params: Unregister pending buffer on cleanup) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Merge made by the 'ort' strategy. +Merging v4l-dvb-next/master (d4acfa22b634 media: sun6i-isp: params: Unregister pending buffer on cleanup) +$ 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 (02f29b079520 Merge branch 'thermal-next' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging MAINTAINERS +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/acpi_pad.c +Auto-merging drivers/acpi/battery.c +Auto-merging drivers/acpi/ec.c +Auto-merging drivers/acpi/thermal.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging include/linux/acpi.h +Merge made by the 'ort' strategy. +Merging cpufreq-arm/cpufreq/arm/linux-next (8ff150aa6fe2 dt-bindings: cpufreq: cpufreq-qcom-hw: Add QDU1000/QRU1000 cpufreq) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (8c37df3d635e cpupower: rapl monitor - shows the used power consumption in uj for each rapl domain) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (7fc7f25419f5 PM / devfreq: event: use devm_platform_get_and_ioremap_resource()) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging opp/opp/linux-next (dba79b78ecc1 dt-bindings: opp-v2: Fix clock-latency-ns prop in example) +$ git merge -m Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git opp/opp/linux-next +Already up to date. +Merging thermal/thermal/linux-next (5011a110295d thermal/drivers/imx_sc_thermal: Drop empty platform remove function) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging ieee1394/for-next (54b3bd99f094 firewire: nosy: switch from 'pci_' to 'dma_' API) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Already up to date. +Merging dlm/next (7a5e9f1f83e3 fs: dlm: fix building without lockdep) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Already up to date. +Merging rdma/for-next (dbc94a0fb817 IB/IPoIB: Fix queue count inconsistency for PKEY child interfaces) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/master (7e68dd7d07a2 Merge tag 'net-next-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Already up to date. +Merging bpf-next/for-next (7e68dd7d07a2 Merge tag 'net-next-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Already up to date. +Merging ipsec-next/master (7e68dd7d07a2 Merge tag 'net-next-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf-next.git netfilter-next/master +Already up to date. +Merging ipvs-next/master (677fb7525331 Merge git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/master +Already up to date. +Merging bluetooth/master (becee9f3220c Bluetooth: Fix a buffer overflow in mgmt_mesh_add()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + net/bluetooth/mgmt_util.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging wireless-next/for-next (d1c722867f80 net: lan966x: Remove a useless test in lan966x_ptp_add_trap()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging mtd/mtd/next (a34506e08db7 Merge tag 'spi-nor/for-6.2' into mtd/next) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (6408cc05a50a mtd: rawnand: Drop obsolete dependencies on COMPILE_TEST) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (1799cd8540b6 mtd: spi-nor: add SFDP fixups for Quad Page Program) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (453de3eb08c4 crypto: ux500/cryp - delete driver) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (66efff515a65 Merge tag 'amd-drm-next-6.2-2022-12-07' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Already up to date. +Merging drm-misc/for-linux-next (b02897e56b4e Revert "drm/fb-helper: Perform damage handling in deferred-I/O helper") +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (e4f665de417d drm/amdgpu: Add poison mode query for df v4_3) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 212 ++++++++++++++------- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_hmm.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 88 +++++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_job.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 28 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 40 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 82 ++++---- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 24 +-- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.h | 6 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 44 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 79 +++----- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 6 +- + drivers/gpu/drm/amd/amdgpu/df_v4_3.c | 61 ++++++ + drivers/gpu/drm/amd/amdgpu/df_v4_3.h | 31 +++ + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.c | 6 + + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 1 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.c | 6 + + drivers/gpu/drm/amd/amdgpu/mxgpu_nv.h | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 38 ++-- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 7 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 153 ++++++++------- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 26 ++- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 38 +--- + drivers/gpu/drm/amd/display/dc/core/dc.c | 5 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 6 - + drivers/gpu/drm/amd/display/dc/core/dc_link_ddc.c | 1 - + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 80 ++++---- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 15 +- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 1 + + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 4 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.c | 8 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 +- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 4 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_hubbub.c | 8 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_hubbub.c | 8 +- + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 40 ---- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.h | 4 - + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.c | 29 +-- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_optc.h | 5 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 4 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 3 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 1 + + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 16 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 1 + + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 25 ++- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 37 ++-- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 2 +- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 3 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 83 ++++++++ + .../gpu/drm/amd/display/dmub/src/dmub_srv_stat.c | 21 ++ + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 5 +- + .../drm/amd/display/include/link_service_types.h | 7 +- + .../drm/amd/include/asic_reg/df/df_4_3_offset.h | 30 +++ + .../drm/amd/include/asic_reg/df/df_4_3_sh_mask.h | 157 +++++++++++++++ + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 2 + + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 10 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.c | 16 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 76 ++++++-- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 16 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 31 ++- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 22 +++ + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 20 +- + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 8 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 3 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 54 ++---- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 96 +++++++++- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 4 + + drivers/gpu/drm/radeon/atombios.h | 10 +- + include/drm/display/drm_dp.h | 6 + + include/uapi/drm/amdgpu_drm.h | 6 + + 95 files changed, 1431 insertions(+), 686 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v4_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/df_v4_3.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_4_3_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/df/df_4_3_sh_mask.h +Merging drm-intel/for-linux-next (ad0fca2dceea drm/i915/ttm: consider CCS for backup objects) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/g4x_dp.c | 4 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 25 +++++++--- + drivers/gpu/drm/i915/display/intel_dp.c | 59 ------------------------ + drivers/gpu/drm/i915/gem/i915_gem_object.c | 3 ++ + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 10 ++-- + drivers/gpu/drm/i915/gem/i915_gem_ttm_pm.c | 18 +++++++- + drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 2 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 53 ++++++++++++++++----- + drivers/gpu/drm/i915/i915_perf.c | 6 ++- + drivers/gpu/drm/i915/intel_uncore.c | 4 +- + 10 files changed, 96 insertions(+), 88 deletions(-) +Merging drm-tegra/for-next (08fef75f5e17 gpu: host1x: Staticize host1x_syncpt_fence_ops) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (d73b1d02de08 drm/msm: Hangcheck progress detection) +$ 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 (1eca2464c1db dt-bindings: msm/dsi: Don't require vcca-supply on 14nm PHY) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/display/msm/dsi-phy-14nm.yaml | 1 - + Documentation/devicetree/bindings/display/msm/qcom,qcm2290-mdss.yaml | 2 +- + Documentation/devicetree/bindings/display/msm/qcom,sm6115-mdss.yaml | 2 +- + 3 files changed, 2 insertions(+), 3 deletions(-) +Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (30527af2bed1 drm/etnaviv: Remove #ifdef guards for PM related functions) +$ git merge -m Merge branch 'etnaviv/next' of https://git.pengutronix.de/git/lst/linux etnaviv/etnaviv/next +Merge made by the 'ort' strategy. + drivers/gpu/drm/etnaviv/etnaviv_drv.h | 1 + + drivers/gpu/drm/etnaviv/etnaviv_gem_submit.c | 9 +-- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 64 +++++++++++++-------- + drivers/gpu/drm/etnaviv/etnaviv_gpu.h | 8 ++- + drivers/gpu/drm/etnaviv/etnaviv_hwdb.c | 35 +++++++++++ + drivers/gpu/drm/etnaviv/etnaviv_sched.c | 18 +++--- + drivers/gpu/drm/etnaviv/state_hi.xml.h | 86 ++++++++++++++++++++++------ + 7 files changed, 165 insertions(+), 56 deletions(-) +Merging fbdev/for-next (3c3bfb8586f8 fbdev: fbcon: release buffer when fbcon_do_set_font() failed) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Already up to date. +Merging regmap/for-next (e6bc64403134 Merge remote-tracking branch 'regmap/for-6.2' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Auto-merging drivers/base/regmap/regmap-irq.c +Merge made by the 'ort' strategy. +Merging sound/for-next (ee0b089d6600 ALSA: hda/hdmi: fix stream-id config keep-alive for rt suspend) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Merge made by the 'ort' strategy. + include/sound/hda_codec.h | 1 + + sound/hda/hdac_stream.c | 3 ++ + sound/pci/hda/hda_codec.c | 3 +- + sound/pci/hda/patch_hdmi.c | 120 ++++++++++++++++++++++++++++++++++++++++-- + sound/pci/hda/patch_realtek.c | 27 ++++++++++ + sound/usb/quirks-table.h | 2 + + 6 files changed, 152 insertions(+), 4 deletions(-) +Merging sound-asoc/for-next (a12a383e59ce ASoC: lochnagar: Fix unused lochnagar_of_match warning) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (b7d23abc80f1 livepatch: Call klp_match_callback() in klp_find_callback() to avoid code duplication) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging kernel/module/main.c +Merge made by the 'ort' strategy. + kernel/module/main.c | 26 +++++++++++++++++++++----- + 1 file changed, 21 insertions(+), 5 deletions(-) +Merging input/next (c3991107a28a Input: elants_i2c - delay longer with reset asserted) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Already up to date. +Merging block/for-next (0c1f0737ef7a Merge branch 'io_uring-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Merge made by the 'ort' strategy. + block/bfq-cgroup.c | 16 +++++++--------- + block/bfq-iosched.c | 13 ++++++++++--- + block/bfq-iosched.h | 4 ++++ + block/bfq-wf2q.c | 8 ++++---- + block/blk-cgroup.c | 2 ++ + block/blk-core.c | 9 +++++---- + block/blk-iocost.c | 2 ++ + drivers/block/loop.c | 28 ++++++++++++---------------- + fs/fs-writeback.c | 17 ++++++++++++++--- + io_uring/io_uring.c | 29 ++++++++++++++++++++--------- + io_uring/io_uring.h | 11 ----------- + io_uring/rw.c | 2 +- + io_uring/timeout.c | 14 +++++++++----- + 13 files changed, 90 insertions(+), 65 deletions(-) +Merging device-mapper/for-next (7991dbff6849 dm thin: Use last transaction's pmd->root when commit failed) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (f07788079f51 ata: ahci: fix enum constants for gcc-13) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Already up to date. +Merging pcmcia/pcmcia-next (15e74c6c1ce2 pcmcia: remove AT91RM9200 Compact Flash driver) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Already up to date. +Merging mmc/next (ff874dbc4f86 mmc: sdhci-sprd: Disable CLK_AUTO when the clock is less than 400K) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Already up to date. +Merging mfd/for-mfd-next (37fecbb80721 dt-bindings: mfd: da9062: Correct file name for watchdog) +$ git merge -m Merge branch 'for-mfd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd/for-mfd-next +Auto-merging Documentation/devicetree/bindings/leds/rohm,bd71828-leds.yaml +Auto-merging Documentation/devicetree/bindings/mfd/qcom,spmi-pmic.yaml +Auto-merging Documentation/devicetree/bindings/regulator/rohm,bd9576-regulator.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/input/misc/Kconfig +Auto-merging drivers/mfd/palmas.c +Merge made by the 'ort' strategy. + .../bindings/leds/rohm,bd71828-leds.yaml | 2 +- + .../devicetree/bindings/mfd/ampere,smpro.yaml | 42 ++ + .../devicetree/bindings/mfd/brcm,twd.yaml | 8 + + Documentation/devicetree/bindings/mfd/da9062.txt | 13 +- + .../devicetree/bindings/mfd/mscc,ocelot.yaml | 4 +- + Documentation/devicetree/bindings/mfd/mt6397.txt | 1 + + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 34 +- + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 2 + + .../devicetree/bindings/mfd/qcom-pm8xxx.yaml | 33 +- + .../devicetree/bindings/mfd/rohm,bd71815-pmic.yaml | 2 +- + .../devicetree/bindings/mfd/rohm,bd71828-pmic.yaml | 2 +- + .../devicetree/bindings/mfd/rohm,bd71837-pmic.yaml | 2 +- + .../devicetree/bindings/mfd/rohm,bd71847-pmic.yaml | 2 +- + .../devicetree/bindings/mfd/rohm,bd9576-pmic.yaml | 2 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 1 + + .../devicetree/bindings/mfd/ti,am3359-tscadc.yaml | 3 + + .../bindings/mfd/ti,j721e-system-controller.yaml | 2 + + .../bindings/power/supply/rohm,bd99954.yaml | 2 +- + .../bindings/regulator/rohm,bd71815-regulator.yaml | 2 +- + .../bindings/regulator/rohm,bd71828-regulator.yaml | 2 +- + .../bindings/regulator/rohm,bd71837-regulator.yaml | 2 +- + .../bindings/regulator/rohm,bd71847-regulator.yaml | 2 +- + .../bindings/regulator/rohm,bd9576-regulator.yaml | 2 +- + .../bindings/timer/brcm,bcmbca-timer.yaml | 40 ++ + MAINTAINERS | 1 + + drivers/input/misc/Kconfig | 21 +- + drivers/input/misc/Makefile | 2 +- + drivers/input/misc/dm355evm_keys.c | 238 -------- + drivers/input/misc/tps65219-pwrbutton.c | 148 +++++ + drivers/mfd/88pm800.c | 10 +- + drivers/mfd/88pm805.c | 7 +- + drivers/mfd/88pm80x.c | 5 +- + drivers/mfd/88pm860x-core.c | 6 +- + drivers/mfd/Kconfig | 69 +-- + drivers/mfd/Makefile | 6 +- + drivers/mfd/aat2870-core.c | 13 +- + drivers/mfd/act8945a.c | 5 +- + drivers/mfd/adp5520.c | 12 +- + drivers/mfd/arizona-core.c | 19 +- + drivers/mfd/arizona-i2c.c | 8 +- + drivers/mfd/arizona-spi.c | 2 +- + drivers/mfd/as3711.c | 5 +- + drivers/mfd/as3722.c | 5 +- + drivers/mfd/atc260x-core.c | 6 +- + drivers/mfd/atc260x-i2c.c | 5 +- + drivers/mfd/axp20x-i2c.c | 5 +- + drivers/mfd/axp20x.c | 23 +- + drivers/mfd/bcm590xx.c | 5 +- + drivers/mfd/bd9571mwv.c | 5 +- + drivers/mfd/da903x.c | 6 +- + drivers/mfd/da9052-i2c.c | 6 +- + drivers/mfd/da9055-i2c.c | 5 +- + drivers/mfd/da9062-core.c | 6 +- + drivers/mfd/da9063-i2c.c | 6 +- + drivers/mfd/da9150-core.c | 5 +- + drivers/mfd/davinci_voicecodec.c | 136 ----- + drivers/mfd/dm355evm_msp.c | 454 --------------- + drivers/mfd/fsl-imx25-tsadc.c | 4 +- + drivers/mfd/gateworks-gsc.c | 3 +- + drivers/mfd/htc-i2cpld.c | 627 --------------------- + drivers/mfd/khadas-mcu.c | 5 +- + drivers/mfd/lm3533-core.c | 5 +- + drivers/mfd/lp3943.c | 4 +- + drivers/mfd/lp873x.c | 5 +- + drivers/mfd/lp87565.c | 5 +- + drivers/mfd/lp8788.c | 4 +- + drivers/mfd/madera-core.c | 3 +- + drivers/mfd/madera-i2c.c | 6 +- + drivers/mfd/max14577.c | 19 +- + drivers/mfd/max77620.c | 15 +- + drivers/mfd/max77650.c | 1 - + drivers/mfd/max77686.c | 6 +- + drivers/mfd/max77693.c | 12 +- + drivers/mfd/max77843.c | 7 +- + drivers/mfd/max8907.c | 5 +- + drivers/mfd/max8925-i2c.c | 12 +- + drivers/mfd/max8997.c | 6 +- + drivers/mfd/max8998.c | 6 +- + drivers/mfd/mc13xxx-i2c.c | 7 +- + drivers/mfd/mc13xxx-spi.c | 3 +- + drivers/mfd/mcp-sa11x0.c | 6 +- + drivers/mfd/menelaus.c | 5 +- + drivers/mfd/menf21bmc.c | 4 +- + drivers/mfd/motorola-cpcap.c | 8 +- + drivers/mfd/mt6360-core.c | 14 +- + drivers/mfd/mt6397-irq.c | 6 +- + drivers/mfd/palmas.c | 5 +- + drivers/mfd/pcf50633-core.c | 27 +- + drivers/mfd/pcf50633-irq.c | 13 +- + drivers/mfd/qcom-pm8008.c | 4 +- + drivers/mfd/qcom-pm8xxx.c | 1 - + drivers/mfd/qcom_rpm.c | 16 +- + drivers/mfd/rc5t583-irq.c | 7 +- + drivers/mfd/rc5t583.c | 5 +- + drivers/mfd/retu-mfd.c | 4 +- + drivers/mfd/rk808.c | 31 +- + drivers/mfd/rn5t618.c | 3 +- + drivers/mfd/rohm-bd71828.c | 29 +- + drivers/mfd/rohm-bd718x7.c | 27 +- + drivers/mfd/rohm-bd9576.c | 22 +- + drivers/mfd/rsmu_i2c.c | 6 +- + drivers/mfd/rt5033.c | 8 +- + drivers/mfd/rt5120.c | 3 +- + drivers/mfd/sec-core.c | 12 +- + drivers/mfd/si476x-i2c.c | 6 +- + drivers/mfd/sky81452.c | 5 +- + drivers/mfd/sm501.c | 10 +- + drivers/mfd/smpro-core.c | 138 +++++ + drivers/mfd/sprd-sc27xx-spi.c | 10 +- + drivers/mfd/stm32-lptimer.c | 4 +- + drivers/mfd/stmfx.c | 11 +- + drivers/mfd/stmpe-i2c.c | 9 +- + drivers/mfd/stmpe-spi.c | 4 +- + drivers/mfd/stmpe.c | 8 +- + drivers/mfd/stpmic1.c | 16 +- + drivers/mfd/stw481x.c | 5 +- + drivers/mfd/sun4i-gpadc.c | 3 +- + drivers/mfd/t7l66xb.c | 9 +- + drivers/mfd/tc3589x.c | 13 +- + drivers/mfd/tc6387xb.c | 9 +- + drivers/mfd/tc6393xb.c | 9 +- + drivers/mfd/ti-lmu.c | 5 +- + drivers/mfd/timberdale.c | 1 - + drivers/mfd/tps6105x.c | 5 +- + drivers/mfd/tps65010.c | 6 +- + drivers/mfd/tps6507x.c | 5 +- + drivers/mfd/tps65086.c | 5 +- + drivers/mfd/tps65090.c | 8 +- + drivers/mfd/tps65218.c | 5 +- + drivers/mfd/tps65219.c | 299 ++++++++++ + drivers/mfd/tps6586x.c | 11 +- + drivers/mfd/tps65910.c | 6 +- + drivers/mfd/tps65912-i2c.c | 5 +- + drivers/mfd/twl-core.c | 5 +- + drivers/mfd/twl6040.c | 34 +- + drivers/mfd/ucb1x00-core.c | 7 +- + drivers/mfd/wcd934x.c | 11 +- + drivers/mfd/wl1273-core.c | 5 +- + drivers/mfd/wm831x-i2c.c | 6 +- + drivers/mfd/wm8350-i2c.c | 5 +- + drivers/mfd/wm8400-core.c | 5 +- + drivers/mfd/wm8994-core.c | 12 +- + drivers/rtc/Kconfig | 6 - + drivers/rtc/Makefile | 1 - + drivers/rtc/rtc-dm355evm.c | 151 ----- + include/linux/htcpld.h | 23 - + include/linux/mfd/dm355evm_msp.h | 79 --- + include/linux/mfd/palmas.h | 1 - + include/linux/mfd/pcf50633/core.h | 6 +- + include/linux/mfd/stmfx.h | 2 - + include/linux/mfd/tps65219.h | 345 ++++++++++++ + include/linux/mfd/twl6040.h | 32 +- + 152 files changed, 1505 insertions(+), 2359 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/ampere,smpro.yaml + create mode 100644 Documentation/devicetree/bindings/timer/brcm,bcmbca-timer.yaml + delete mode 100644 drivers/input/misc/dm355evm_keys.c + create mode 100644 drivers/input/misc/tps65219-pwrbutton.c + delete mode 100644 drivers/mfd/davinci_voicecodec.c + delete mode 100644 drivers/mfd/dm355evm_msp.c + delete mode 100644 drivers/mfd/htc-i2cpld.c + create mode 100644 drivers/mfd/smpro-core.c + create mode 100644 drivers/mfd/tps65219.c + delete mode 100644 drivers/rtc/rtc-dm355evm.c + delete mode 100644 include/linux/htcpld.h + delete mode 100644 include/linux/mfd/dm355evm_msp.h + create mode 100644 include/linux/mfd/tps65219.h +Merging backlight/for-backlight-next (0de796b6047d backlight: tosa: Convert to i2c's .probe_new()) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Merge made by the 'ort' strategy. + drivers/video/backlight/adp8860_bl.c | 6 +++--- + drivers/video/backlight/adp8870_bl.c | 6 +++--- + drivers/video/backlight/arcxcnn_bl.c | 4 ++-- + drivers/video/backlight/bd6107.c | 5 ++--- + drivers/video/backlight/lm3630a_bl.c | 5 ++--- + drivers/video/backlight/lm3639_bl.c | 5 ++--- + drivers/video/backlight/lp855x_bl.c | 5 +++-- + drivers/video/backlight/lv5207lp.c | 5 ++--- + drivers/video/backlight/tosa_bl.c | 5 ++--- + 9 files changed, 21 insertions(+), 25 deletions(-) +Merging battery/for-next (104bb8a66345 power: supply: fix null pointer dereferencing in power_supply_get_battery_info) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Auto-merging Documentation/devicetree/bindings/power/supply/rohm,bd99954.yaml +Auto-merging drivers/power/supply/rk817_charger.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/ene-kb930.yaml | 6 +- + .../devicetree/bindings/mfd/rockchip,rk817.yaml | 2 + + .../bindings/power/reset/gpio-restart.yaml | 13 +- + .../bindings/power/reset/restart-handler.yaml | 30 +++ + .../devicetree/bindings/power/supply/bq25890.yaml | 16 +- + .../devicetree/bindings/power/supply/bq27xxx.yaml | 2 - + .../bindings/power/supply/ingenic,battery.yaml | 4 +- + .../bindings/power/supply/maxim,max17042.yaml | 2 + + .../bindings/power/supply/power-supply.yaml | 6 + + .../bindings/power/supply/rohm,bd99954.yaml | 1 + + .../bindings/power/supply/sc2731-charger.yaml | 1 - + drivers/power/supply/88pm860x_charger.c | 38 +-- + drivers/power/supply/ab8500_charger.c | 11 +- + drivers/power/supply/adp5061.c | 5 +- + drivers/power/supply/bd99954-charger.c | 84 +------ + drivers/power/supply/bq2415x_charger.c | 6 +- + drivers/power/supply/bq24190_charger.c | 6 +- + drivers/power/supply/bq24257_charger.c | 6 +- + drivers/power/supply/bq24735-charger.c | 5 +- + drivers/power/supply/bq2515x_charger.c | 6 +- + drivers/power/supply/bq256xx_charger.c | 6 +- + drivers/power/supply/bq25890_charger.c | 277 +++++++++++++++------ + drivers/power/supply/bq25980_charger.c | 6 +- + drivers/power/supply/bq27xxx_battery_i2c.c | 6 +- + drivers/power/supply/cw2015_battery.c | 3 + + drivers/power/supply/ds2782_battery.c | 6 +- + drivers/power/supply/lp8727_charger.c | 4 +- + drivers/power/supply/lp8788-charger.c | 2 +- + drivers/power/supply/ltc2941-battery-gauge.c | 5 +- + drivers/power/supply/ltc4162-l-charger.c | 5 +- + drivers/power/supply/max14656_charger_detector.c | 5 +- + drivers/power/supply/max17040_battery.c | 6 +- + drivers/power/supply/max17042_battery.c | 6 +- + drivers/power/supply/mt6360_charger.c | 15 +- + drivers/power/supply/power_supply_core.c | 8 +- + drivers/power/supply/rk817_charger.c | 4 +- + drivers/power/supply/rt5033_battery.c | 5 +- + drivers/power/supply/rt9455_charger.c | 5 +- + drivers/power/supply/sbs-charger.c | 5 +- + drivers/power/supply/sbs-manager.c | 6 +- + drivers/power/supply/smb347-charger.c | 6 +- + drivers/power/supply/ucs1002_power.c | 5 +- + drivers/power/supply/z2_battery.c | 11 +- + 43 files changed, 372 insertions(+), 285 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/reset/restart-handler.yaml +Merging regulator/for-next (f56a82a2d6ae Merge remote-tracking branch 'regulator/for-6.1' into regulator-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Already up to date. +Merging security/next (577cc1434e4c lsm: Fix description of fs_context_parse_param) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (4295c60bbe9e apparmor: Fix uninitialized symbol 'array_size' in policy_unpack_test.c) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (b6018af440a0 ima: Fix hash dependency to correct algorithm) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging keys/keys-next (2d743660786e Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs) +$ git merge -m Merge branch 'keys-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git keys/keys-next +Already up to date. +Merging safesetid/safesetid-next (64b634830c91 LSM: SafeSetID: add setgroups() testing to selftest) +$ git merge -m Merge branch 'safesetid-next' of https://github.com/micah-morton/linux.git safesetid/safesetid-next +Already up to date. +Merging selinux/next (048be156491f selinux: remove the sidtab context conversion indirect calls) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (1a3065e92046 smack_lsm: remove unnecessary type casting) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Auto-merging security/smack/smack_lsm.c +Merge made by the 'ort' strategy. + security/smack/smack_lsm.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging tomoyo/master (be9c59066d8e workqueue: Emit runtime message when flush_scheduled_work() is called) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 2 ++ + kernel/workqueue.c | 2 ++ + 2 files changed, 4 insertions(+) +Merging tpmdd/next (eaabc245b02a tpm: st33zp24: remove pointless checks on probe) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (9ec0b7e06835 watchdog: aspeed: Enable pre-timeout interrupt) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Merge made by the 'ort' strategy. + .../bindings/watchdog/mediatek,mtk-wdt.yaml | 80 ++++++++ + .../devicetree/bindings/watchdog/mtk-wdt.txt | 42 ----- + drivers/watchdog/Kconfig | 7 + + drivers/watchdog/Makefile | 1 + + drivers/watchdog/advantech_ec_wdt.c | 205 +++++++++++++++++++++ + drivers/watchdog/aspeed_wdt.c | 104 +++++++++-- + drivers/watchdog/at91rm9200_wdt.c | 11 +- + drivers/watchdog/db8500_wdt.c | 9 +- + drivers/watchdog/iTCO_wdt.c | 21 ++- + drivers/watchdog/kempld_wdt.c | 11 +- + drivers/watchdog/mtk_wdt.c | 12 ++ + drivers/watchdog/omap_wdt.c | 11 +- + drivers/watchdog/rn5t618_wdt.c | 12 ++ + drivers/watchdog/twl4030_wdt.c | 9 +- + include/dt-bindings/reset/mt8188-resets.h | 36 ++++ + include/linux/mfd/rn5t618.h | 9 + + 16 files changed, 474 insertions(+), 106 deletions(-) + create mode 100644 Documentation/devicetree/bindings/watchdog/mediatek,mtk-wdt.yaml + delete mode 100644 Documentation/devicetree/bindings/watchdog/mtk-wdt.txt + create mode 100644 drivers/watchdog/advantech_ec_wdt.c + create mode 100644 include/dt-bindings/reset/mt8188-resets.h +Merging iommu/next (e3eca2e4f648 Merge branches 'arm/allwinner', 'arm/exynos', 'arm/mediatek', 'arm/rockchip', 'arm/smmu', 'ppc/pamu', 's390', 'x86/vt-d', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging drivers/dma/idxd/cdev.c +Auto-merging drivers/dma/idxd/init.c +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/iommu/intel/dmar.c +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/iommu/intel/iommu.h +Auto-merging drivers/iommu/intel/iommu.h +Auto-merging drivers/iommu/intel/pasid.c +Auto-merging drivers/iommu/intel/svm.c +Auto-merging drivers/iommu/iommu.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 27 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 178 +++++++++- + .../devicetree/bindings/iommu/mediatek,iommu.yaml | 2 + + arch/s390/include/asm/pci.h | 5 +- + arch/s390/kvm/pci.c | 6 +- + arch/s390/pci/pci.c | 13 +- + arch/s390/pci/pci_dma.c | 77 +++-- + drivers/iommu/amd/init.c | 88 +++-- + drivers/iommu/amd/iommu.c | 3 +- + drivers/iommu/amd/iommu_v2.c | 5 +- + drivers/iommu/arm/arm-smmu/arm-smmu-impl.c | 3 + + drivers/iommu/arm/arm-smmu/arm-smmu-qcom-debug.c | 91 ----- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 157 ++++++--- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.h | 21 +- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 14 +- + drivers/iommu/exynos-iommu.c | 26 +- + drivers/iommu/fsl_pamu.c | 6 +- + drivers/iommu/intel/iommu.c | 169 ++++----- + drivers/iommu/intel/iommu.h | 15 +- + drivers/iommu/io-pgtable-arm-v7s.c | 41 +-- + drivers/iommu/io-pgtable-arm.c | 42 +-- + drivers/iommu/iommu.c | 28 +- + drivers/iommu/ipmmu-vmsa.c | 18 +- + drivers/iommu/msm_iommu.c | 18 +- + drivers/iommu/mtk_iommu.c | 149 +++++--- + drivers/iommu/mtk_iommu_v1.c | 30 +- + drivers/iommu/rockchip-iommu.c | 10 +- + drivers/iommu/s390-iommu.c | 377 ++++++++++++--------- + drivers/iommu/sprd-iommu.c | 25 +- + drivers/iommu/sun50i-iommu.c | 89 ++++- + .../dt-bindings/memory/mediatek,mt8365-larb-port.h | 90 +++++ + include/linux/io-pgtable.h | 6 - + 32 files changed, 1172 insertions(+), 657 deletions(-) + create mode 100644 include/dt-bindings/memory/mediatek,mt8365-larb-port.h +Merging audit/next (50979953c0c4 audit: unify audit_filter_{uring(), inode_name(), syscall()}) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (580f9896e088 dt-bindings: leds: Add missing references to common LED schema) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging dt-krzk/for-next (0c2cd289d0bd Merge branch 'next/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. +Merging mailbox/mailbox-for-next (b8ae88e1e75e mailbox: qcom-ipcc: flag IRQ NO_THREAD) +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Already up to date. +Merging spi/for-next (45b3cd900bf8 Merge remote-tracking branch 'spi/for-6.1' into spi-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Already up to date. +Merging tip/master (892cd97d2c73 Merge branch into tip/master: 'locking/urgent') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Makefile +Auto-merging Makefile +Auto-merging arch/arm64/include/asm/mmu_context.h +Auto-merging arch/arm64/kernel/traps.c +Auto-merging arch/arm64/mm/fault.c +Auto-merging arch/loongarch/include/asm/irq.h +Auto-merging arch/powerpc/include/asm/nohash/32/pgtable.h +Auto-merging arch/powerpc/kernel/kprobes.c +Auto-merging arch/s390/kernel/perf_pai_ext.c +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/boot/compressed/head_64.S +Auto-merging arch/x86/entry/entry_64_compat.S +Auto-merging arch/x86/events/amd/ibs.c +Auto-merging arch/x86/events/intel/core.c +Auto-merging arch/x86/events/intel/ds.c +Auto-merging arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/include/asm/cpufeatures.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/include/asm/cpufeatures.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/include/asm/disabled-features.h +Auto-merging arch/x86/include/asm/msr-index.h +Auto-merging arch/x86/include/asm/msr-index.h +Auto-merging arch/x86/include/asm/nospec-branch.h +Auto-merging arch/x86/include/asm/paravirt_types.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/paravirt_types.h +Auto-merging arch/x86/include/asm/processor.h +Auto-merging arch/x86/kernel/Makefile +Auto-merging arch/x86/kernel/alternative.c +Auto-merging arch/x86/kernel/alternative.c +Auto-merging arch/x86/kernel/cpu/amd.c +Auto-merging arch/x86/kernel/cpu/bugs.c +Auto-merging arch/x86/kernel/cpu/bugs.c +Auto-merging arch/x86/kernel/cpu/common.c +Auto-merging arch/x86/kernel/cpu/hygon.c +Auto-merging arch/x86/kernel/cpu/intel.c +Auto-merging arch/x86/kernel/cpu/microcode/amd.c +Auto-merging arch/x86/kernel/cpu/sgx/ioctl.c +Auto-merging arch/x86/kernel/fpu/core.c +Auto-merging arch/x86/kernel/module.c +Auto-merging arch/x86/kernel/process.c +Auto-merging arch/x86/kernel/process_64.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging arch/x86/kernel/traps.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/mm/pat/set_memory.c +Auto-merging arch/x86/power/cpu.c +Auto-merging arch/x86/xen/enlighten_pv.c +Auto-merging drivers/clocksource/arm_arch_timer.c +CONFLICT (content): Merge conflict in drivers/clocksource/arm_arch_timer.c +Auto-merging drivers/clocksource/arm_arch_timer.c +CONFLICT (content): Merge conflict in drivers/clocksource/arm_arch_timer.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/hv/vmbus_drv.c +Auto-merging drivers/iommu/intel/iommu.h +CONFLICT (modify/delete): drivers/iommu/iommu-sva-lib.c deleted in HEAD and modified in tip/master. Version tip/master of drivers/iommu/iommu-sva-lib.c left in tree. +Auto-merging drivers/media/common/videobuf2/frame_vector.c +Auto-merging drivers/media/v4l2-core/videobuf-dma-contig.c +Auto-merging drivers/pci/controller/pci-hyperv.c +Auto-merging drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +CONFLICT (content): Merge conflict in drivers/staging/media/atomisp/pci/hmm/hmm_bo.c +Auto-merging drivers/virt/coco/sev-guest/sev-guest.c +Auto-merging fs/proc/task_mmu.c +Auto-merging include/linux/filter.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/pgtable.h +Auto-merging include/linux/sched.h +Auto-merging init/main.c +Auto-merging kernel/bpf/core.c +Auto-merging kernel/bpf/trampoline.c +Auto-merging kernel/events/core.c +Auto-merging kernel/events/core.c +Auto-merging kernel/events/core.c +CONFLICT (content): Merge conflict in kernel/events/core.c +Auto-merging kernel/events/core.c +Auto-merging kernel/fork.c +Auto-merging kernel/sched/core.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Kconfig.debug +Auto-merging mm/Kconfig +Auto-merging mm/gup.c +Auto-merging mm/khugepaged.c +Auto-merging mm/madvise.c +Auto-merging mm/migrate.c +Auto-merging mm/mincore.c +Auto-merging mm/mmap.c +Auto-merging mm/mprotect.c +Auto-merging mm/userfaultfd.c +Auto-merging mm/vmscan.c +Auto-merging net/bpf/bpf_dummy_struct_ops.c +Auto-merging virt/kvm/kvm_main.c +Resolved 'arch/x86/include/asm/cpufeatures.h' using previous resolution. +Resolved 'drivers/clocksource/arm_arch_timer.c' using previous resolution. +Resolved 'drivers/staging/media/atomisp/pci/hmm/hmm_bo.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/iommu/iommu-sva-lib.c +rm 'drivers/iommu/iommu-sva-lib.c' +$ git commit --no-edit -v -a +[master f28daef4c2f0] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-omap1/sram-init.c | 8 +- + arch/arm/mach-omap2/sram.c | 8 +- + arch/arm64/include/asm/memory.h | 4 +- + arch/arm64/include/asm/mmu_context.h | 6 + + arch/arm64/include/asm/signal.h | 2 +- + arch/arm64/include/asm/uaccess.h | 2 +- + arch/arm64/kernel/hw_breakpoint.c | 2 +- + arch/arm64/kernel/traps.c | 4 +- + arch/arm64/mm/fault.c | 10 +- + arch/mips/Kconfig | 2 +- + arch/powerpc/include/asm/nohash/32/pgtable.h | 2 +- + arch/powerpc/kernel/kprobes.c | 9 +- + arch/sh/Kconfig | 2 +- + arch/sh/include/asm/pgtable-3level.h | 10 +- + arch/sparc/include/asm/mmu_context_64.h | 6 + + arch/sparc/include/asm/pgtable_64.h | 2 +- + arch/sparc/include/asm/uaccess_64.h | 2 + + arch/um/include/asm/pgtable-3level.h | 8 - + arch/x86/Kconfig | 2 +- + arch/x86/include/asm/cmpxchg_32.h | 28 - + arch/x86/include/asm/cmpxchg_64.h | 5 - + arch/x86/include/asm/cpu_entry_area.h | 4 - + arch/x86/include/asm/cpufeatures.h | 1 + + arch/x86/include/asm/kasan.h | 3 + + arch/x86/include/asm/mmu.h | 12 +- + arch/x86/include/asm/mmu_context.h | 47 + + arch/x86/include/asm/page_types.h | 12 +- + arch/x86/include/asm/pgtable-3level.h | 171 +--- + arch/x86/include/asm/pgtable-3level_types.h | 7 + + arch/x86/include/asm/pgtable_64_types.h | 1 + + arch/x86/include/asm/pgtable_areas.h | 8 +- + arch/x86/include/asm/pgtable_types.h | 4 +- + arch/x86/include/asm/processor-flags.h | 4 +- + arch/x86/include/asm/set_memory.h | 3 + + arch/x86/include/asm/tlbflush.h | 34 + + arch/x86/include/asm/uaccess.h | 42 +- + arch/x86/include/uapi/asm/prctl.h | 5 + + arch/x86/include/uapi/asm/processor-flags.h | 6 + + arch/x86/kernel/alternative.c | 10 - + arch/x86/kernel/amd_gart_64.c | 2 +- + arch/x86/kernel/ftrace.c | 7 +- + arch/x86/kernel/head64.c | 2 +- + arch/x86/kernel/hw_breakpoint.c | 2 +- + arch/x86/kernel/kprobes/core.c | 10 +- + arch/x86/kernel/process.c | 3 + + arch/x86/kernel/process_64.c | 87 +- + arch/x86/kernel/traps.c | 6 +- + arch/x86/mm/cpu_entry_area.c | 50 +- + arch/x86/mm/init.c | 2 +- + arch/x86/mm/kasan_init_64.c | 53 +- + arch/x86/mm/mem_encrypt_boot.S | 4 +- + arch/x86/mm/mem_encrypt_identity.c | 18 +- + arch/x86/mm/pat/set_memory.c | 105 +- + arch/x86/mm/pti.c | 2 +- + arch/x86/mm/tlb.c | 53 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/radeon/radeon_gem.c | 2 +- + drivers/infiniband/hw/mlx4/mr.c | 2 +- + drivers/iommu/intel/irq_remapping.c | 13 +- + drivers/media/common/videobuf2/frame_vector.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-contig.c | 2 +- + drivers/misc/sram-exec.c | 7 +- + drivers/tee/tee_shm.c | 2 +- + drivers/vfio/vfio_iommu_type1.c | 2 +- + fs/proc/array.c | 6 + + fs/proc/task_mmu.c | 2 +- + include/linux/filter.h | 3 +- + include/linux/ioasid.h | 9 - + include/linux/mm.h | 11 - + include/linux/mmu_context.h | 14 + + include/linux/pgtable.h | 73 +- + include/linux/sched/mm.h | 8 +- + include/linux/sched/task.h | 2 +- + include/linux/set_memory.h | 10 + + include/linux/uaccess.h | 15 + + init/main.c | 4 +- + kernel/bpf/bpf_struct_ops.c | 3 +- + kernel/bpf/core.c | 6 +- + kernel/bpf/trampoline.c | 3 +- + kernel/events/core.c | 2 +- + kernel/fork.c | 37 +- + kernel/locking/rtmutex.c | 55 +- + kernel/locking/rtmutex_api.c | 6 +- + lib/strncpy_from_user.c | 2 +- + lib/strnlen_user.c | 2 +- + mm/Kconfig | 2 +- + mm/gup.c | 8 +- + mm/hmm.c | 3 +- + mm/khugepaged.c | 2 +- + mm/madvise.c | 2 +- + mm/mapping_dirty_helpers.c | 2 +- + mm/mempolicy.c | 6 +- + mm/migrate.c | 2 +- + mm/mincore.c | 2 +- + mm/mlock.c | 4 +- + mm/mmap.c | 2 +- + mm/mprotect.c | 4 +- + mm/mremap.c | 2 +- + mm/msync.c | 2 +- + mm/userfaultfd.c | 2 +- + mm/vmscan.c | 5 +- + net/bpf/bpf_dummy_struct_ops.c | 3 +- + tools/testing/selftests/x86/Makefile | 2 +- + tools/testing/selftests/x86/lam.c | 1149 ++++++++++++++++++++++ + virt/kvm/kvm_main.c | 14 +- + 106 files changed, 1936 insertions(+), 495 deletions(-) + create mode 100644 tools/testing/selftests/x86/lam.c +$ git am -3 ../patches/0001-fix-up-for-iommu-Rename-iommu-sva-lib.-c-h.patch +Applying: fix up for "iommu: Rename iommu-sva-lib.{c,h}" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/iommu/iommu-sva.c +$ git add -A . +$ git commit -v -a --amend +[master 7e7c02bc4715] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Date: Fri Dec 16 10:05:44 2022 +1100 +$ git am -3 ../patches/0001-fix-up-for-mm-Pass-down-mm_struct-to-untagged_addr.patch +Applying: fix up for "mm: Pass down mm_struct to untagged_addr()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/media/common/videobuf2/frame_vector.c +$ git add -A . +$ git commit -v -a --amend +[master da588d069cd6] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Date: Fri Dec 16 10:05:44 2022 +1100 +$ git am -3 ../patches/0001-Revert-x86-mm-Fix-sparse-warnings-in-untagged_ptr.patch +Applying: Revert "x86/mm: Fix sparse warnings in untagged_ptr()" +$ git reset HEAD^ +Unstaged changes after reset: +M arch/x86/include/asm/uaccess.h +$ git add -A . +$ git commit -v -a --amend +[master 158a6c6622b0] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git + Date: Fri Dec 16 10:05:44 2022 +1100 +Merging clockevents/timers/drivers/next (2eff537b37ca dt-bindings: timer: rk-timer: Add rktimer for rv1126) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/timer/rockchip,rk-timer.yaml | 1 + + 1 file changed, 1 insertion(+) +Merging edac/edac-for-next (ad5befcd0e1d Merge branch 'edac-misc' into edac-for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging drivers/edac/Kconfig +Auto-merging drivers/edac/i10nm_base.c +Merge made by the 'ort' strategy. +Merging irqchip/irq/irqchip-next (6ed54e1789a2 Merge branch irq/misc-6.2 into irq/irqchip-next) +$ git merge -m Merge branch 'irq/irqchip-next' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip/irq/irqchip-next +Already up to date. +Merging ftrace/for-next (14b7bc94a4f6 Merge branch 'trace/trace/for-next' into trace/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging MAINTAINERS +Auto-merging arch/x86/kernel/ftrace.c +Auto-merging kernel/trace/Kconfig +Auto-merging kernel/trace/ftrace.c +Auto-merging kernel/trace/trace_events_user.c +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 19 ++ + Documentation/trace/histogram.rst | 10 +- + Documentation/trace/osnoise-tracer.rst | 32 +++- + MAINTAINERS | 9 + + arch/x86/kernel/ftrace.c | 2 + + arch/x86/mm/kmmio.c | 50 +++-- + include/linux/ring_buffer.h | 3 +- + include/linux/trace_events.h | 4 +- + include/linux/trace_seq.h | 3 +- + include/trace/bpf_probe.h | 6 + + include/trace/perf.h | 6 + + include/trace/stages/stage1_struct_define.h | 6 + + include/trace/stages/stage2_data_offsets.h | 6 + + include/trace/stages/stage3_trace_output.h | 6 + + include/trace/stages/stage4_event_fields.h | 12 ++ + include/trace/stages/stage5_get_offsets.h | 6 + + include/trace/stages/stage6_event_callback.h | 20 ++ + include/trace/stages/stage7_class_define.h | 2 + + kernel/kprobes.c | 16 +- + kernel/trace/Kconfig | 2 + + kernel/trace/ftrace.c | 28 ++- + kernel/trace/ring_buffer.c | 44 +++-- + kernel/trace/ring_buffer_benchmark.c | 2 +- + kernel/trace/trace.c | 104 ++++++---- + kernel/trace/trace.h | 31 +-- + kernel/trace/trace_event_perf.c | 16 +- + kernel/trace/trace_events.c | 66 ++++++- + kernel/trace/trace_events_hist.c | 190 +++++++++++++++--- + kernel/trace/trace_events_synth.c | 2 +- + kernel/trace/trace_events_trigger.c | 19 +- + kernel/trace/trace_events_user.c | 1 + + kernel/trace/trace_kprobe.c | 2 - + kernel/trace/trace_osnoise.c | 244 +++++++++++++++++++++++- + kernel/trace/trace_output.c | 71 ++----- + kernel/trace/trace_probe.c | 2 +- + samples/trace_events/trace-events-sample.c | 2 +- + samples/trace_events/trace-events-sample.h | 34 +++- + 37 files changed, 851 insertions(+), 227 deletions(-) +Merging rcu/rcu/next (1ab6c3f2e923 Merge branch 'nolibc.2022.10.28a' into HEAD) +$ git merge -m Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git rcu/rcu/next +Auto-merging include/linux/rcutiny.h +Auto-merging kernel/rcu/Kconfig +Auto-merging kernel/rcu/rcu.h +Auto-merging kernel/rcu/tree.c +Merge made by the 'ort' strategy. +Merging kvm/next (549a715b98a1 KVM: x86: Add proper ReST tables for userspace MSR exits/flags) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (753d734f3f34 Merge remote-tracking branch 'arm64/for-next/sysregs' into kvmarm-master/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm.git kvm-arm/next +Already up to date. +Merging kvms390/next (bedac519eefa s390/vfio-ap: check TAPQ response code when waiting for queue reset) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Auto-merging drivers/s390/crypto/vfio_ap_ops.c +Merge made by the 'ort' strategy. + drivers/s390/crypto/vfio_ap_ops.c | 54 +++++++++++++++++++++++++++++++-------- + 1 file changed, 44 insertions(+), 10 deletions(-) +Merging xen-tip/linux-next (7cffcade57a4 xen: make remove callback of xen driver void returned) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging drivers/block/xen-blkfront.c +Auto-merging drivers/net/xen-netfront.c +Auto-merging drivers/video/fbdev/xen-fbfront.c +Auto-merging drivers/xen/pvcalls-back.c +Auto-merging net/9p/trans_xen.c +Merge made by the 'ort' strategy. + drivers/block/xen-blkback/xenbus.c | 4 +--- + drivers/block/xen-blkfront.c | 3 +-- + drivers/char/tpm/xen-tpmfront.c | 3 +-- + drivers/gpu/drm/xen/xen_drm_front.c | 3 +-- + drivers/input/misc/xen-kbdfront.c | 5 ++--- + drivers/net/xen-netback/xenbus.c | 3 +-- + drivers/net/xen-netfront.c | 4 +--- + drivers/pci/xen-pcifront.c | 4 +--- + drivers/scsi/xen-scsifront.c | 4 +--- + drivers/tty/hvc/hvc_xen.c | 4 ++-- + drivers/usb/host/xen-hcd.c | 4 +--- + drivers/video/fbdev/xen-fbfront.c | 6 ++---- + drivers/xen/pvcalls-back.c | 3 +-- + drivers/xen/pvcalls-front.c | 3 +-- + drivers/xen/xen-pciback/xenbus.c | 4 +--- + drivers/xen/xen-scsiback.c | 4 +--- + include/xen/xenbus.h | 2 +- + net/9p/trans_xen.c | 3 +-- + sound/xen/xen_snd_front.c | 3 +-- + 19 files changed, 22 insertions(+), 47 deletions(-) +Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (c0feea594e05 workqueue: don't skip lockdep work dependency in cancel_work_sync()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Already up to date. +Merging drivers-x86/for-next (b0b698b80c56 platform/mellanox: mlxbf-pmc: Fix event typo) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (c88d317f7473 platform/chrome: use sysfs_emit() instead of scnprintf()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Merge made by the 'ort' strategy. + drivers/platform/chrome/cros_ec_lightbar.c | 14 ++++++-------- + drivers/platform/chrome/cros_ec_sysfs.c | 4 ++-- + drivers/platform/chrome/wilco_ec/sysfs.c | 3 +-- + 3 files changed, 9 insertions(+), 12 deletions(-) +Merging hsi/for-next (3ffa9f713c39 HSI: omap_ssi_core: Fix error handling in ssi_init()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Merge made by the 'ort' strategy. + drivers/hsi/clients/ssi_protocol.c | 6 +++--- + drivers/hsi/controllers/omap_ssi_core.c | 14 +++++++++++--- + include/uapi/linux/hsi/cs-protocol.h | 14 -------------- + include/uapi/linux/hsi/hsi_char.h | 14 -------------- + 4 files changed, 14 insertions(+), 34 deletions(-) +Merging leds/for-next (7cb092a0336c leds: MAINTAINERS: include dt-bindings headers) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Auto-merging Documentation/devicetree/bindings/mfd/qcom-pm8xxx.yaml +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/leds/common.yaml | 1 + + .../devicetree/bindings/leds/leds-pm8058.txt | 67 ---------------------- + .../devicetree/bindings/leds/qcom,pm8058-led.yaml | 57 ++++++++++++++++++ + .../devicetree/bindings/mfd/qcom-pm8xxx.yaml | 4 ++ + MAINTAINERS | 2 + + drivers/leds/leds-blinkm.c | 8 +-- + drivers/leds/leds-is31fl319x.c | 3 +- + drivers/leds/leds-lm3533.c | 12 ++-- + drivers/leds/leds-lp5521.c | 2 +- + drivers/leds/leds-lp5523.c | 27 +++++---- + drivers/leds/leds-lp55xx-common.c | 7 +-- + drivers/leds/leds-max8997.c | 7 +-- + drivers/leds/leds-pca955x.c | 6 -- + drivers/leds/rgb/leds-qcom-lpg.c | 18 +++--- + drivers/leds/trigger/ledtrig-pattern.c | 2 +- + 15 files changed, 108 insertions(+), 115 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/leds/leds-pm8058.txt + create mode 100644 Documentation/devicetree/bindings/leds/qcom,pm8058-led.yaml +Merging ipmi/for-next (041fae9c105a Merge tag 'f2fs-for-6.2-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (f18caf261398 device property: Fix documentation for fwnode_get_next_parent()) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging Documentation/driver-api/driver-model/devres.rst +Auto-merging arch/x86/kernel/cpu/resctrl/pseudo_lock.c +Auto-merging block/bsg.c +Auto-merging block/genhd.c +CONFLICT (modify/delete): drivers/block/pktcdvd.c deleted in HEAD and modified in driver-core/driver-core-next. Version driver-core/driver-core-next of drivers/block/pktcdvd.c left in tree. +Auto-merging drivers/dma-buf/dma-buf-sysfs-stats.c +Auto-merging drivers/dma-buf/dma-heap.c +Auto-merging drivers/gpu/drm/drm_sysfs.c +Auto-merging drivers/infiniband/core/device.c +Auto-merging drivers/input/input.c +Auto-merging drivers/media/dvb-core/dvbdev.c +Auto-merging drivers/misc/ocxl/file.c +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/vfio/vfio_main.c +CONFLICT (content): Merge conflict in drivers/vfio/vfio_main.c +Auto-merging fs/nfs/sysfs.c +Auto-merging fs/pstore/pmsg.c +Auto-merging include/asm-generic/vmlinux.lds.h +Auto-merging include/linux/blkdev.h +CONFLICT (content): Merge conflict in include/linux/blkdev.h +Auto-merging include/linux/device.h +Auto-merging include/linux/ioport.h +Auto-merging include/linux/property.h +Auto-merging include/linux/usb.h +Auto-merging kernel/params.c +Auto-merging kernel/resource.c +Auto-merging lib/kobject.c +Auto-merging net/core/net-sysfs.c +Resolved 'drivers/vfio/vfio_main.c' using previous resolution. +Resolved 'include/linux/blkdev.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/block/pktcdvd.c +rm 'drivers/block/pktcdvd.c' +$ git commit --no-edit -v -a +[master bbeff4672afd] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git +$ git diff -M --stat --summary HEAD^.. + .../ABI/testing/sysfs-kernel-cpu_byteorder | 12 ++ + Documentation/driver-api/driver-model/devres.rst | 1 + + arch/powerpc/platforms/book3s/vas-api.c | 2 +- + arch/x86/kernel/cpu/resctrl/pseudo_lock.c | 4 +- + arch/x86/kernel/cpuid.c | 2 +- + arch/x86/kernel/msr.c | 2 +- + block/bsg.c | 2 +- + block/genhd.c | 4 +- + drivers/base/base.h | 1 - + drivers/base/bus.c | 2 +- + drivers/base/cacheinfo.c | 19 +- + drivers/base/class.c | 7 +- + drivers/base/core.c | 66 ++---- + drivers/base/dd.c | 8 +- + drivers/base/devres.c | 3 + + drivers/base/firmware_loader/sysfs.c | 6 +- + drivers/base/firmware_loader/sysfs.h | 6 +- + drivers/base/platform.c | 4 +- + drivers/base/property.c | 36 ++-- + drivers/base/test/Kconfig | 1 + + drivers/block/aoe/aoechr.c | 2 +- + drivers/char/mem.c | 2 +- + drivers/char/misc.c | 4 +- + drivers/dma-buf/dma-buf-sysfs-stats.c | 2 +- + drivers/dma-buf/dma-heap.c | 2 +- + drivers/firmware/dmi-id.c | 2 +- + drivers/gnss/core.c | 6 +- + drivers/gpu/drm/drm_sysfs.c | 2 +- + drivers/hid/usbhid/hiddev.c | 2 +- + drivers/infiniband/core/device.c | 6 +- + drivers/infiniband/core/user_mad.c | 2 +- + drivers/infiniband/core/uverbs_main.c | 2 +- + drivers/infiniband/hw/hfi1/device.c | 4 +- + drivers/input/input.c | 2 +- + drivers/isdn/mISDN/core.c | 4 +- + drivers/media/dvb-core/dvbdev.c | 8 +- + drivers/media/pci/ddbridge/ddbridge-core.c | 4 +- + drivers/media/rc/rc-main.c | 2 +- + drivers/mfd/vexpress-sysreg.c | 16 +- + drivers/misc/cxl/file.c | 2 +- + drivers/misc/genwqe/card_base.c | 2 +- + drivers/misc/ocxl/file.c | 2 +- + drivers/net/ipvlan/ipvtap.c | 4 +- + drivers/net/macvtap.c | 4 +- + drivers/nvme/host/core.c | 4 +- + drivers/of/device.c | 6 +- + drivers/pcmcia/cs.c | 4 +- + drivers/power/supply/power_supply.h | 2 +- + drivers/power/supply/power_supply_sysfs.c | 8 +- + drivers/s390/char/hmcdrv_dev.c | 2 +- + drivers/scsi/cxlflash/main.c | 2 +- + drivers/tty/tty_io.c | 2 +- + drivers/usb/class/usblp.c | 2 +- + drivers/usb/core/file.c | 2 +- + drivers/usb/gadget/udc/core.c | 4 +- + drivers/usb/misc/iowarrior.c | 2 +- + drivers/usb/misc/legousbtower.c | 2 +- + drivers/usb/roles/class.c | 2 +- + drivers/usb/typec/mux.c | 8 +- + drivers/usb/typec/retimer.c | 2 +- + drivers/vdpa/vdpa_user/vduse_dev.c | 2 +- + fs/kernfs/dir.c | 106 ++++++---- + fs/kernfs/file.c | 18 +- + fs/kernfs/inode.c | 12 +- + fs/kernfs/kernfs-internal.h | 2 +- + fs/kernfs/mount.c | 10 +- + fs/kernfs/symlink.c | 2 +- + fs/nfs/sysfs.c | 4 +- + fs/pstore/pmsg.c | 2 +- + include/asm-generic/vmlinux.lds.h | 234 +++++++++------------ + include/linux/container_of.h | 24 +-- + include/linux/device.h | 9 +- + include/linux/device/class.h | 8 +- + include/linux/ioport.h | 2 +- + include/linux/kobject.h | 18 +- + include/linux/kobject_ns.h | 4 +- + include/linux/mISDNif.h | 2 +- + include/linux/of_device.h | 4 +- + include/linux/property.h | 84 ++++---- + include/linux/usb.h | 19 +- + kernel/ksysfs.c | 18 ++ + kernel/params.c | 2 +- + kernel/resource.c | 17 +- + lib/kobject.c | 29 ++- + net/atm/atm_sysfs.c | 4 +- + net/bridge/br_if.c | 2 +- + net/core/net-sysfs.c | 20 +- + net/rfkill/core.c | 2 +- + net/sunrpc/sysfs.c | 8 +- + net/wireless/sysfs.c | 2 +- + sound/sound_core.c | 2 +- + 91 files changed, 498 insertions(+), 504 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-cpu_byteorder +$ git am -3 ../patches/0001-fix-up-for-drivers-accel-define-kconfig-and-register.patch +Applying: fix up for "drivers/accel: define kconfig and register a new major" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/accel/drm_accel.c +$ git add -A . +$ git commit -v -a --amend +[master df634248deb2] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git + Date: Fri Dec 16 10:25:30 2022 +1100 +$ git am -3 ../patches/0001-vfio-fix-up-for-driver-core-make-struct-class.devnod.patch +Applying: vfio: fix up for "driver core: make struct class.devnode() take a const *" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/vfio/group.c +$ git add -A . +$ git commit -v -a --amend +[master ae296276ffa9] Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git + Date: Fri Dec 16 10:25:30 2022 +1100 +Merging usb/usb-next (81c25247a2a0 usb: gadget: uvc: Rename bmInterfaceFlags -> bmInterlaceFlags) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging Documentation/driver-api/driver-model/devres.rst +Auto-merging MAINTAINERS +Auto-merging arch/powerpc/configs/ppc6xx_defconfig +Auto-merging drivers/platform/chrome/cros_ec_typec.c +Auto-merging drivers/usb/gadget/udc/core.c +Auto-merging drivers/usb/host/fhci-hcd.c +Auto-merging drivers/usb/roles/class.c +Auto-merging drivers/usb/typec/retimer.c +Auto-merging include/linux/usb.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/configfs-usb-gadget-uvc | 4 +- + Documentation/ABI/testing/sysfs-bus-usb | 11 + + .../bindings/phy/fsl,imx8mq-usb-phy.yaml | 3 + + Documentation/devicetree/bindings/usb/dwc2.yaml | 3 + + .../devicetree/bindings/usb/genesys,gl850g.yaml | 48 + + .../devicetree/bindings/usb/mediatek,mtk-xhci.yaml | 1 + + .../devicetree/bindings/usb/mediatek,mtu3.yaml | 1 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 3 + + Documentation/devicetree/bindings/usb/usb-drd.yaml | 1 + + .../devicetree/bindings/usb/usb-nop-xceiv.yaml | 5 + + Documentation/devicetree/bindings/usb/usb251xb.txt | 89 -- + .../devicetree/bindings/usb/usb251xb.yaml | 271 ++++ + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/driver-api/driver-model/devres.rst | 2 + + MAINTAINERS | 8 +- + arch/powerpc/configs/ppc6xx_defconfig | 1 - + arch/sh/configs/landisk_defconfig | 1 - + drivers/extcon/extcon-usbc-tusb320.c | 17 +- + drivers/platform/chrome/cros_ec_typec.c | 2 +- + drivers/thunderbolt/acpi.c | 12 +- + drivers/thunderbolt/switch.c | 5 +- + drivers/thunderbolt/tb_regs.h | 2 + + drivers/thunderbolt/usb4.c | 33 +- + drivers/thunderbolt/usb4_port.c | 3 + + drivers/thunderbolt/xdomain.c | 4 +- + drivers/usb/Kconfig | 4 + + drivers/usb/Makefile | 2 + + drivers/usb/cdns3/cdnsp-pci.c | 8 +- + drivers/usb/cdns3/cdnsp-ring.c | 42 +- + drivers/usb/chipidea/ci.h | 4 + + drivers/usb/chipidea/ci_hdrc_imx.c | 51 +- + drivers/usb/chipidea/ci_hdrc_imx.h | 4 +- + drivers/usb/chipidea/core.c | 143 +- + drivers/usb/chipidea/host.c | 16 + + drivers/usb/chipidea/otg.c | 2 +- + drivers/usb/chipidea/otg.h | 1 + + drivers/usb/chipidea/udc.c | 32 + + drivers/usb/chipidea/usbmisc_imx.c | 160 +- + drivers/usb/common/ulpi.c | 2 +- + drivers/usb/core/config.c | 82 +- + drivers/usb/core/hcd-pci.c | 13 + + drivers/usb/core/hcd.c | 6 +- + drivers/usb/core/hub.c | 60 + + drivers/usb/core/hub.h | 4 + + drivers/usb/core/port.c | 30 +- + drivers/usb/core/sysfs.c | 7 +- + drivers/usb/dwc2/gadget.c | 6 +- + drivers/usb/dwc2/params.c | 4 + + drivers/usb/dwc2/platform.c | 5 +- + drivers/usb/dwc3/Kconfig | 4 +- + drivers/usb/dwc3/core.c | 23 +- + drivers/usb/dwc3/dwc3-pci.c | 2 +- + drivers/usb/dwc3/dwc3-qcom.c | 13 +- + drivers/usb/dwc3/gadget.c | 14 +- + drivers/usb/fotg210/Kconfig | 38 + + drivers/usb/fotg210/Makefile | 10 + + drivers/usb/fotg210/fotg210-core.c | 166 +++ + drivers/usb/{host => fotg210}/fotg210-hcd.c | 51 +- + .../usb/{host/fotg210.h => fotg210/fotg210-hcd.h} | 0 + drivers/usb/{gadget/udc => fotg210}/fotg210-udc.c | 164 ++- + .../udc/fotg210.h => fotg210/fotg210-udc.h} | 3 + + drivers/usb/fotg210/fotg210.h | 42 + + drivers/usb/gadget/configfs.c | 3 +- + drivers/usb/gadget/function/f_ecm.c | 22 +- + drivers/usb/gadget/function/f_hid.c | 60 +- + drivers/usb/gadget/function/f_mass_storage.c | 3 +- + drivers/usb/gadget/function/f_printer.c | 9 +- + drivers/usb/gadget/function/f_uvc.c | 20 +- + drivers/usb/gadget/function/storage_common.c | 9 +- + drivers/usb/gadget/function/u_ether.c | 4 - + drivers/usb/gadget/function/u_serial.c | 3 +- + drivers/usb/gadget/function/uvc_configfs.c | 12 +- + drivers/usb/gadget/legacy/serial.c | 3 +- + drivers/usb/gadget/legacy/webcam.c | 4 +- + drivers/usb/gadget/udc/Kconfig | 15 +- + drivers/usb/gadget/udc/Makefile | 1 - + drivers/usb/gadget/udc/aspeed-vhub/core.c | 2 +- + drivers/usb/gadget/udc/aspeed-vhub/epn.c | 16 +- + drivers/usb/gadget/udc/at91_udc.c | 5 +- + drivers/usb/gadget/udc/core.c | 12 +- + drivers/usb/host/Kconfig | 13 +- + drivers/usb/host/Makefile | 1 - + drivers/usb/host/ehci-grlib.c | 2 +- + drivers/usb/host/ehci-pci.c | 7 +- + drivers/usb/host/ehci-ppc-of.c | 2 +- + drivers/usb/host/ehci.h | 2 +- + drivers/usb/host/fhci-hcd.c | 2 +- + drivers/usb/host/ohci-ppc-of.c | 2 +- + drivers/usb/host/uhci-grlib.c | 2 +- + drivers/usb/host/xhci-hub.c | 22 +- + drivers/usb/host/xhci-mtk.c | 73 +- + drivers/usb/host/xhci-pci.c | 63 +- + drivers/usb/host/xhci-ring.c | 42 +- + drivers/usb/host/xhci.h | 2 +- + drivers/usb/misc/Kconfig | 2 +- + drivers/usb/misc/ftdi-elan.c | 4 - + drivers/usb/misc/onboard_usb_hub.c | 2 + + drivers/usb/misc/onboard_usb_hub.h | 5 + + drivers/usb/misc/sisusbvga/Kconfig | 34 - + drivers/usb/misc/sisusbvga/Makefile | 3 - + drivers/usb/misc/sisusbvga/sisusb.h | 21 - + drivers/usb/misc/sisusbvga/sisusb_con.c | 1496 ------------------- + drivers/usb/misc/sisusbvga/sisusb_init.c | 955 ------------ + drivers/usb/misc/sisusbvga/sisusb_init.h | 180 --- + .../usb/misc/sisusbvga/{sisusb.c => sisusbvga.c} | 289 +--- + drivers/usb/misc/usb251xb.c | 5 +- + drivers/usb/misc/usb3503.c | 5 +- + drivers/usb/misc/usb4604.c | 5 +- + drivers/usb/musb/Kconfig | 18 - + drivers/usb/musb/Makefile | 3 - + drivers/usb/musb/am35x.c | 610 -------- + drivers/usb/musb/cppi_dma.c | 1547 -------------------- + drivers/usb/musb/davinci.c | 606 -------- + drivers/usb/musb/davinci.h | 103 -- + drivers/usb/musb/jz4740.c | 62 +- + drivers/usb/musb/musb_core.c | 107 +- + drivers/usb/musb/musb_core.h | 24 + + drivers/usb/musb/musb_debugfs.c | 6 +- + drivers/usb/musb/musb_dma.h | 13 +- + drivers/usb/musb/musb_gadget.c | 61 +- + drivers/usb/musb/musb_host.c | 18 +- + drivers/usb/musb/musb_virthub.c | 33 +- + drivers/usb/musb/omap2430.c | 54 + + drivers/usb/phy/Kconfig | 14 +- + drivers/usb/phy/Makefile | 1 - + drivers/usb/phy/phy-generic.c | 18 +- + drivers/usb/phy/phy-gpio-vbus-usb.c | 12 + + drivers/usb/phy/phy-isp1301-omap.c | 4 +- + drivers/usb/phy/phy-isp1301.c | 5 +- + drivers/usb/phy/phy-jz4770.c | 353 ----- + drivers/usb/roles/class.c | 5 +- + drivers/usb/serial/cp210x.c | 21 +- + drivers/usb/serial/option.c | 3 + + drivers/usb/serial/xr_serial.c | 2 - + drivers/usb/storage/alauda.c | 2 + + drivers/usb/typec/anx7411.c | 5 +- + drivers/usb/typec/bus.c | 2 +- + drivers/usb/typec/class.c | 19 + + drivers/usb/typec/hd3ss3220.c | 5 +- + drivers/usb/typec/retimer.c | 16 +- + drivers/usb/typec/retimer.h | 4 + + drivers/usb/typec/tcpm/fusb302.c | 5 +- + drivers/usb/typec/tcpm/tcpci.c | 10 +- + drivers/usb/typec/tcpm/tcpci_maxim.c | 4 +- + drivers/usb/typec/tcpm/tcpci_rt1711h.c | 5 +- + drivers/usb/typec/tipd/core.c | 20 +- + drivers/usb/typec/ucsi/ucsi.c | 17 +- + drivers/usb/typec/ucsi/ucsi.h | 1 + + drivers/usb/typec/ucsi/ucsi_ccg.c | 5 +- + drivers/usb/typec/ucsi/ucsi_stm32g0.c | 4 +- + drivers/usb/typec/wusb3801.c | 2 +- + drivers/usb/usb-skeleton.c | 1 - + drivers/usb/usbip/stub_dev.c | 4 +- + drivers/usb/usbip/vudc_rx.c | 4 +- + drivers/usb/usbip/vudc_sysfs.c | 2 +- + include/linux/usb.h | 12 + + include/linux/usb/hcd.h | 3 + + include/linux/usb/typec.h | 4 + + include/uapi/linux/usb/g_uvc.h | 3 + + include/uapi/linux/usb/video.h | 4 +- + .../ffs-aio-example/simple/device_app/aio_simple.c | 44 +- + 161 files changed, 2065 insertions(+), 7039 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/genesys,gl850g.yaml + delete mode 100644 Documentation/devicetree/bindings/usb/usb251xb.txt + create mode 100644 Documentation/devicetree/bindings/usb/usb251xb.yaml + create mode 100644 drivers/usb/fotg210/Kconfig + create mode 100644 drivers/usb/fotg210/Makefile + create mode 100644 drivers/usb/fotg210/fotg210-core.c + rename drivers/usb/{host => fotg210}/fotg210-hcd.c (99%) + rename drivers/usb/{host/fotg210.h => fotg210/fotg210-hcd.h} (100%) + rename drivers/usb/{gadget/udc => fotg210}/fotg210-udc.c (89%) + rename drivers/usb/{gadget/udc/fotg210.h => fotg210/fotg210-udc.h} (99%) + create mode 100644 drivers/usb/fotg210/fotg210.h + delete mode 100644 drivers/usb/misc/sisusbvga/sisusb_con.c + delete mode 100644 drivers/usb/misc/sisusbvga/sisusb_init.c + delete mode 100644 drivers/usb/misc/sisusbvga/sisusb_init.h + rename drivers/usb/misc/sisusbvga/{sisusb.c => sisusbvga.c} (91%) + delete mode 100644 drivers/usb/musb/am35x.c + delete mode 100644 drivers/usb/musb/cppi_dma.c + delete mode 100644 drivers/usb/musb/davinci.c + delete mode 100644 drivers/usb/musb/davinci.h + delete mode 100644 drivers/usb/phy/phy-jz4770.c +Merging thunderbolt/next (a5cfc9d65879 thunderbolt: Add wake on connect/disconnect on USB4 ports) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-gadget/next (e49d033bddf5 Linux 5.12-rc6) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/balbi/usb.git usb-gadget/next +Already up to date. +Merging usb-serial/usb-next (63b8ed26cd09 USB: serial: xr: avoid requesting zero DTE rate) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial/usb-next +Already up to date. +Merging tty/tty-next (6373ab4dfee7 serial: atmel: don't stop the transmitter when doing PIO) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging drivers/tty/serial/8250/8250_core.c +Auto-merging drivers/tty/serial/pic32_uart.c +Auto-merging drivers/tty/serial/samsung_tty.c +Auto-merging drivers/tty/serial/sh-sci.c +Auto-merging drivers/tty/serial/xilinx_uartps.c +Auto-merging drivers/tty/tty_io.c +Auto-merging include/linux/serial_core.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/serial/ingenic,uart.yaml | 4 + + .../devicetree/bindings/serial/renesas,scif.yaml | 1 + + .../bindings/serial/xlnx,opb-uartlite.yaml | 3 +- + Documentation/driver-api/serial/driver.rst | 3 + + Documentation/driver-api/serial/serial-rs485.rst | 56 +-- + drivers/tty/Kconfig | 19 + + drivers/tty/ehv_bytechan.c | 4 +- + drivers/tty/hvc/hvc_rtas.c | 2 +- + drivers/tty/n_gsm.c | 402 +++++++++++++++++++-- + drivers/tty/n_tty.c | 6 +- + drivers/tty/serial/21285.c | 32 +- + drivers/tty/serial/8250/8250_bcm7271.c | 14 +- + drivers/tty/serial/8250/8250_core.c | 5 +- + drivers/tty/serial/8250/8250_dma.c | 19 +- + drivers/tty/serial/8250/8250_ingenic.c | 32 +- + drivers/tty/serial/8250/8250_omap.c | 85 ++++- + drivers/tty/serial/8250/8250_port.c | 3 +- + drivers/tty/serial/Kconfig | 2 + + drivers/tty/serial/altera_jtaguart.c | 112 ++---- + drivers/tty/serial/altera_uart.c | 34 +- + drivers/tty/serial/amba-pl010.c | 32 +- + drivers/tty/serial/amba-pl011.c | 17 +- + drivers/tty/serial/apbuart.c | 34 +- + drivers/tty/serial/ar933x_uart.c | 3 +- + drivers/tty/serial/arc_uart.c | 3 +- + drivers/tty/serial/atmel_serial.c | 80 ++-- + drivers/tty/serial/bcm63xx_uart.c | 47 +-- + drivers/tty/serial/clps711x.c | 3 +- + drivers/tty/serial/cpm_uart/cpm_uart_core.c | 3 +- + drivers/tty/serial/digicolor-usart.c | 3 +- + drivers/tty/serial/dz.c | 3 +- + drivers/tty/serial/fsl_linflexuart.c | 3 +- + drivers/tty/serial/fsl_lpuart.c | 386 ++++++++++++++------ + drivers/tty/serial/imx.c | 71 +++- + drivers/tty/serial/ip22zilog.c | 6 +- + drivers/tty/serial/lantiq.c | 36 +- + drivers/tty/serial/liteuart.c | 3 +- + drivers/tty/serial/lpc32xx_hs.c | 33 +- + drivers/tty/serial/max3100.c | 4 +- + drivers/tty/serial/max310x.c | 5 +- + drivers/tty/serial/mcf.c | 34 +- + drivers/tty/serial/men_z135_uart.c | 5 +- + drivers/tty/serial/meson_uart.c | 3 +- + drivers/tty/serial/milbeaut_usio.c | 3 +- + drivers/tty/serial/mpc52xx_uart.c | 39 +- + drivers/tty/serial/mps2-uart.c | 26 +- + drivers/tty/serial/msm_serial.c | 13 +- + drivers/tty/serial/mux.c | 45 +-- + drivers/tty/serial/mvebu-uart.c | 41 +-- + drivers/tty/serial/mxs-auart.c | 32 +- + drivers/tty/serial/omap-serial.c | 32 +- + drivers/tty/serial/owl-uart.c | 32 +- + drivers/tty/serial/pch_uart.c | 16 +- + drivers/tty/serial/pic32_uart.c | 3 +- + drivers/tty/serial/pmac_zilog.c | 6 +- + drivers/tty/serial/pxa.c | 33 +- + drivers/tty/serial/qcom_geni_serial.c | 35 ++ + drivers/tty/serial/rda-uart.c | 3 +- + drivers/tty/serial/rp2.c | 31 +- + drivers/tty/serial/sa1100.c | 34 +- + drivers/tty/serial/samsung_tty.c | 10 +- + drivers/tty/serial/sb1250-duart.c | 3 +- + drivers/tty/serial/sc16is7xx.c | 5 +- + drivers/tty/serial/sccnxp.c | 3 +- + drivers/tty/serial/serial-tegra.c | 9 +- + drivers/tty/serial/serial_txx9.c | 32 +- + drivers/tty/serial/sh-sci.c | 5 +- + drivers/tty/serial/sifive.c | 31 +- + drivers/tty/serial/sprd_serial.c | 40 +- + drivers/tty/serial/st-asc.c | 48 +-- + drivers/tty/serial/stm32-usart.c | 54 ++- + drivers/tty/serial/sunhv.c | 6 +- + drivers/tty/serial/sunplus-uart.c | 4 +- + drivers/tty/serial/sunsab.c | 14 +- + drivers/tty/serial/sunsu.c | 3 +- + drivers/tty/serial/sunzilog.c | 6 +- + drivers/tty/serial/timbuart.c | 3 +- + drivers/tty/serial/uartlite.c | 3 +- + drivers/tty/serial/ucc_uart.c | 3 +- + drivers/tty/serial/vt8500_serial.c | 32 +- + drivers/tty/serial/xilinx_uartps.c | 4 +- + drivers/tty/serial/zs.c | 3 +- + drivers/tty/synclink_gt.c | 19 +- + drivers/tty/tty.h | 2 +- + drivers/tty/tty_buffer.c | 32 +- + drivers/tty/tty_io.c | 45 ++- + drivers/tty/tty_ldisc.c | 38 +- + include/linux/serdev.h | 13 +- + include/linux/serial_core.h | 80 ++++ + include/linux/tty_buffer.h | 5 +- + include/linux/tty_flip.h | 4 +- + include/uapi/linux/serial.h | 55 ++- + 92 files changed, 1447 insertions(+), 1246 deletions(-) +Merging char-misc/char-misc-next (f361c96c7518 Merge tag 'extcon-next-for-6.2' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon into char-misc-next) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml +Auto-merging Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/char/misc.c +Auto-merging drivers/extcon/extcon-usbc-tusb320.c +Auto-merging drivers/firmware/raspberrypi.c +CONFLICT (content): Merge conflict in drivers/firmware/raspberrypi.c +Auto-merging drivers/fpga/Kconfig +Auto-merging drivers/misc/cxl/pci.c +Auto-merging drivers/misc/fastrpc.c +Auto-merging drivers/misc/genwqe/card_base.c +Auto-merging drivers/misc/habanalabs/common/memory.c +Auto-merging drivers/misc/mei/bus.c +Auto-merging drivers/misc/mei/client.c +Auto-merging drivers/misc/mei/mei_dev.h +Auto-merging drivers/misc/ocxl/file.c +Auto-merging scripts/kallsyms.c +Resolved 'Documentation/devicetree/bindings/iio/adc/qcom,spmi-vadc.yaml' using previous resolution. +Resolved 'Documentation/devicetree/bindings/iio/addac/adi,ad74413r.yaml' using previous resolution. +Resolved 'drivers/firmware/raspberrypi.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 53903ccd2766] Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-driver-speakup | 9 + + .../ABI/testing/debugfs-driver-habanalabs | 7 + + Documentation/ABI/testing/sysfs-bus-coreboot | 45 + + Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130 | 46 + + .../ABI/testing/sysfs-bus-iio-adc-max11410 | 13 + + .../sysfs-bus-platform-devices-ampere-smpro | 312 +++ + .../bus/fsl,imx8qxp-pixel-link-msi-bus.yaml | 232 +++ + Documentation/devicetree/bindings/eeprom/at24.yaml | 5 +- + Documentation/devicetree/bindings/eeprom/at25.yaml | 1 + + .../bindings/eeprom/microchip,93lc46b.yaml | 1 + + .../bindings/fpga/lattice,sysconfig.yaml | 81 + + .../devicetree/bindings/iio/accel/adi,adxl355.yaml | 8 +- + .../bindings/iio/accel/kionix,kx022a.yaml | 65 + + .../devicetree/bindings/iio/adc/adi,ad4130.yaml | 262 +++ + .../devicetree/bindings/iio/adc/adi,ad7923.yaml | 26 +- + .../devicetree/bindings/iio/adc/adi,max11410.yaml | 177 ++ + .../bindings/iio/adc/qcom,spmi-iadc.yaml | 7 +- + .../bindings/iio/adc/qcom,spmi-vadc.yaml | 12 +- + .../bindings/iio/adc/renesas,rzg2l-adc.yaml | 2 +- + .../bindings/iio/adc/rockchip-saradc.yaml | 1 + + .../devicetree/bindings/iio/adc/st,stm32-adc.yaml | 68 +- + .../devicetree/bindings/iio/addac/adi,ad74115.yaml | 373 ++++ + .../bindings/iio/addac/adi,ad74413r.yaml | 15 +- + .../devicetree/bindings/iio/dac/adi,ad5758.yaml | 3 +- + .../devicetree/bindings/iio/dac/adi,ad5766.yaml | 2 +- + .../bindings/iio/frequency/adi,adf4350.yaml | 7 +- + .../bindings/iio/frequency/adi,adf4377.yaml | 92 + + .../bindings/iio/frequency/adi,admv1013.yaml | 5 +- + .../bindings/iio/frequency/adi,admv1014.yaml | 5 +- + .../bindings/iio/frequency/adi,admv4420.yaml | 8 +- + .../bindings/iio/frequency/adi,adrf6780.yaml | 5 +- + .../bindings/iio/gyroscope/adi,adxrs290.yaml | 5 +- + .../bindings/iio/gyroscope/nxp,fxas21002c.yaml | 5 +- + .../devicetree/bindings/iio/imu/adi,adis16475.yaml | 3 +- + .../bindings/iio/imu/invensense,icm42600.yaml | 1 + + .../devicetree/bindings/iio/imu/st,lsm6dsx.yaml | 8 + + .../bindings/iio/pressure/meas,ms5611.yaml | 6 +- + .../bindings/iio/pressure/murata,zpa2326.yaml | 5 +- + .../bindings/iio/proximity/ams,as3935.yaml | 5 +- + .../bindings/iio/resolver/adi,ad2s90.yaml | 7 +- + .../bindings/iio/temperature/adi,ltc2983.yaml | 336 ++-- + .../bindings/interconnect/qcom,msm8998-bwmon.yaml | 5 + + .../bindings/interconnect/qcom,osm-l3.yaml | 24 +- + .../devicetree/bindings/misc/qcom,fastrpc.yaml | 2 +- + .../bindings/nvmem/layouts/kontron,sl28-vpd.yaml | 64 + + .../bindings/nvmem/layouts/nvmem-layout.yaml | 34 + + .../bindings/nvmem/layouts/onie,tlv-layout.yaml | 147 ++ + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 8 + + .../devicetree/bindings/nvmem/st,stm32-romem.yaml | 1 + + Documentation/devicetree/bindings/slimbus/bus.txt | 60 - + .../devicetree/bindings/slimbus/qcom,slim-ngd.yaml | 120 ++ + .../devicetree/bindings/slimbus/qcom,slim.yaml | 86 + + .../bindings/slimbus/slim-ngd-qcom-ctrl.txt | 84 - + .../devicetree/bindings/slimbus/slim-qcom-ctrl.txt | 39 - + .../devicetree/bindings/slimbus/slimbus.yaml | 95 + + .../bindings/spmi/qcom,spmi-pmic-arb.yaml | 10 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 41 +- + drivers/accessibility/speakup/Makefile | 4 +- + drivers/accessibility/speakup/kobjects.c | 3 + + drivers/accessibility/speakup/main.c | 72 +- + drivers/accessibility/speakup/makemapdata.c | 7 +- + drivers/accessibility/speakup/speakup.h | 1 + + drivers/accessibility/speakup/speakup_acntpc.c | 38 +- + drivers/accessibility/speakup/speakup_acntsa.c | 37 +- + drivers/accessibility/speakup/speakup_apollo.c | 46 +- + drivers/accessibility/speakup/speakup_audptr.c | 42 +- + drivers/accessibility/speakup/speakup_bns.c | 36 +- + drivers/accessibility/speakup/speakup_decext.c | 44 +- + drivers/accessibility/speakup/speakup_decpc.c | 48 +- + drivers/accessibility/speakup/speakup_dectlk.c | 45 +- + drivers/accessibility/speakup/speakup_dtlk.c | 50 +- + drivers/accessibility/speakup/speakup_dummy.c | 53 +- + drivers/accessibility/speakup/speakup_keypc.c | 29 +- + drivers/accessibility/speakup/speakup_ltlk.c | 53 +- + drivers/accessibility/speakup/speakup_soft.c | 59 +- + drivers/accessibility/speakup/speakup_spkout.c | 43 +- + drivers/accessibility/speakup/speakup_txprt.c | 45 +- + drivers/accessibility/speakup/spk_types.h | 2 +- + drivers/accessibility/speakup/varhandlers.c | 1 + + drivers/bus/mhi/host/boot.c | 4 +- + drivers/bus/mhi/host/pci_generic.c | 25 +- + drivers/bus/mhi/host/pm.c | 3 +- + drivers/char/misc.c | 41 +- + drivers/char/virtio_console.c | 26 +- + drivers/char/xillybus/xillybus_class.c | 7 +- + drivers/char/xillybus/xillyusb.c | 22 +- + drivers/dio/dio.c | 8 + + drivers/extcon/extcon-fsa9480.c | 5 +- + drivers/extcon/extcon-max77843.c | 3 +- + drivers/extcon/extcon-rt8973a.c | 5 +- + drivers/extcon/extcon-usbc-tusb320.c | 5 +- + drivers/firmware/google/Kconfig | 15 + + drivers/firmware/google/Makefile | 3 + + drivers/firmware/google/cbmem.c | 129 ++ + drivers/firmware/google/coreboot_table.c | 11 +- + drivers/firmware/google/coreboot_table.h | 18 + + drivers/firmware/raspberrypi.c | 8 +- + drivers/fpga/Kconfig | 11 + + drivers/fpga/Makefile | 2 + + drivers/fpga/lattice-sysconfig-spi.c | 152 ++ + drivers/fpga/lattice-sysconfig.c | 397 ++++ + drivers/fpga/lattice-sysconfig.h | 39 + + drivers/fpga/zynq-fpga.c | 8 +- + drivers/greybus/svc.c | 3 +- + drivers/hwtracing/coresight/coresight-cti-core.c | 2 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 155 +- + drivers/hwtracing/coresight/coresight-trbe.c | 1 + + drivers/iio/TODO | 3 - + drivers/iio/accel/Kconfig | 21 + + drivers/iio/accel/Makefile | 3 + + drivers/iio/accel/adis16201.c | 2 +- + drivers/iio/accel/adis16209.c | 2 +- + drivers/iio/accel/adxl355.h | 20 +- + drivers/iio/accel/adxl355_core.c | 93 +- + drivers/iio/accel/adxl355_i2c.c | 22 +- + drivers/iio/accel/adxl355_spi.c | 19 +- + drivers/iio/accel/adxl367.c | 57 +- + drivers/iio/accel/adxl367_i2c.c | 5 +- + drivers/iio/accel/adxl372.c | 29 +- + drivers/iio/accel/adxl372_i2c.c | 6 +- + drivers/iio/accel/bma180.c | 6 +- + drivers/iio/accel/bma400_core.c | 10 +- + drivers/iio/accel/bma400_i2c.c | 6 +- + drivers/iio/accel/bmc150-accel-core.c | 31 +- + drivers/iio/accel/bmc150-accel-i2c.c | 6 +- + drivers/iio/accel/da280.c | 6 +- + drivers/iio/accel/da311.c | 5 +- + drivers/iio/accel/dmard06.c | 5 +- + drivers/iio/accel/dmard09.c | 5 +- + drivers/iio/accel/dmard10.c | 5 +- + drivers/iio/accel/fxls8962af-core.c | 40 +- + drivers/iio/accel/fxls8962af-i2c.c | 2 +- + drivers/iio/accel/fxls8962af-spi.c | 2 +- + drivers/iio/accel/kionix-kx022a-i2c.c | 51 + + drivers/iio/accel/kionix-kx022a-spi.c | 58 + + drivers/iio/accel/kionix-kx022a.c | 1142 +++++++++++ + drivers/iio/accel/kionix-kx022a.h | 82 + + drivers/iio/accel/kxcjk-1013.c | 31 +- + drivers/iio/accel/kxsd9-i2c.c | 5 +- + drivers/iio/accel/mc3230.c | 5 +- + drivers/iio/accel/mma7455_i2c.c | 6 +- + drivers/iio/accel/mma7660.c | 5 +- + drivers/iio/accel/mma8452.c | 6 +- + drivers/iio/accel/mma9551.c | 6 +- + drivers/iio/accel/mma9553.c | 6 +- + drivers/iio/accel/msa311.c | 21 +- + drivers/iio/accel/mxc4005.c | 5 +- + drivers/iio/accel/mxc6255.c | 5 +- + drivers/iio/accel/sca3300.c | 12 +- + drivers/iio/accel/stk8312.c | 5 +- + drivers/iio/accel/stk8ba50.c | 5 +- + drivers/iio/adc/Kconfig | 40 + + drivers/iio/adc/Makefile | 3 + + drivers/iio/adc/ad4130.c | 2100 ++++++++++++++++++++ + drivers/iio/adc/ad7091r5.c | 6 +- + drivers/iio/adc/ad7124.c | 10 + + drivers/iio/adc/ad7192.c | 27 +- + drivers/iio/adc/ad7291.c | 6 +- + drivers/iio/adc/ad7476.c | 11 +- + drivers/iio/adc/ad7606.c | 22 +- + drivers/iio/adc/ad7606.h | 2 - + drivers/iio/adc/ad7606_par.c | 3 +- + drivers/iio/adc/ad799x.c | 26 +- + drivers/iio/adc/ad9467.c | 11 + + drivers/iio/adc/ad_sigma_delta.c | 8 +- + drivers/iio/adc/at91-sama5d2_adc.c | 33 +- + drivers/iio/adc/axp288_adc.c | 9 +- + drivers/iio/adc/cc10001_adc.c | 89 +- + drivers/iio/adc/imx7d_adc.c | 14 +- + drivers/iio/adc/ina2xx-adc.c | 6 +- + drivers/iio/adc/lpc32xx_adc.c | 11 +- + drivers/iio/adc/ltc2471.c | 6 +- + drivers/iio/adc/ltc2485.c | 6 +- + drivers/iio/adc/ltc2497-core.c | 7 +- + drivers/iio/adc/ltc2497.c | 6 +- + drivers/iio/adc/ltc2497.h | 2 + + drivers/iio/adc/max11410.c | 1050 ++++++++++ + drivers/iio/adc/max1241.c | 28 +- + drivers/iio/adc/max1363.c | 18 +- + drivers/iio/adc/max9611.c | 5 +- + drivers/iio/adc/mcp3422.c | 6 +- + drivers/iio/adc/mcp3911.c | 104 +- + drivers/iio/adc/meson_saradc.c | 11 +- + drivers/iio/adc/mt6370-adc.c | 305 +++ + drivers/iio/adc/rockchip_saradc.c | 15 +- + drivers/iio/adc/sc27xx_adc.c | 14 +- + drivers/iio/adc/stm32-adc-core.c | 30 +- + drivers/iio/adc/stm32-adc-core.h | 31 + + drivers/iio/adc/stm32-adc.c | 307 ++- + drivers/iio/adc/ti-adc081c.c | 6 +- + drivers/iio/adc/ti-adc128s052.c | 14 +- + drivers/iio/adc/ti-ads1015.c | 6 +- + drivers/iio/adc/ti-ads131e08.c | 11 + + drivers/iio/adc/vf610_adc.c | 104 +- + drivers/iio/addac/Kconfig | 14 + + drivers/iio/addac/Makefile | 1 + + drivers/iio/addac/ad74115.c | 1943 ++++++++++++++++++ + drivers/iio/addac/ad74413r.c | 32 +- + drivers/iio/amplifiers/hmc425a.c | 17 +- + drivers/iio/buffer/industrialio-buffer-dmaengine.c | 4 +- + drivers/iio/buffer/industrialio-triggered-buffer.c | 4 +- + drivers/iio/buffer/kfifo_buf.c | 2 +- + drivers/iio/cdc/ad7150.c | 24 +- + drivers/iio/cdc/ad7746.c | 6 +- + drivers/iio/chemical/ams-iaq-core.c | 5 +- + drivers/iio/chemical/atlas-ezo-sensor.c | 6 +- + drivers/iio/chemical/atlas-sensor.c | 6 +- + drivers/iio/chemical/bme680_i2c.c | 6 +- + drivers/iio/chemical/ccs811.c | 6 +- + drivers/iio/chemical/scd4x.c | 4 +- + drivers/iio/chemical/sgp30.c | 6 +- + drivers/iio/chemical/sgp40.c | 6 +- + drivers/iio/chemical/vz89x.c | 6 +- + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 6 +- + .../iio/common/hid-sensors/hid-sensor-trigger.c | 8 +- + drivers/iio/common/scmi_sensors/scmi_iio.c | 9 +- + drivers/iio/common/st_sensors/st_sensors_core.c | 39 +- + drivers/iio/dac/ad5064.c | 6 +- + drivers/iio/dac/ad5380.c | 6 +- + drivers/iio/dac/ad5446.c | 6 +- + drivers/iio/dac/ad5593r.c | 6 +- + drivers/iio/dac/ad5696-i2c.c | 6 +- + drivers/iio/dac/ds4424.c | 6 +- + drivers/iio/dac/ltc2688.c | 23 +- + drivers/iio/dac/m62332.c | 5 +- + drivers/iio/dac/max517.c | 6 +- + drivers/iio/dac/max5821.c | 6 +- + drivers/iio/dac/mcp4725.c | 6 +- + drivers/iio/dac/ti-dac5571.c | 6 +- + drivers/iio/filter/admv8818.c | 4 +- + drivers/iio/frequency/Kconfig | 10 + + drivers/iio/frequency/Makefile | 1 + + drivers/iio/frequency/ad9523.c | 22 +- + drivers/iio/frequency/adf4377.c | 994 +++++++++ + drivers/iio/gyro/adis16136.c | 2 +- + drivers/iio/gyro/adis16260.c | 2 +- + drivers/iio/gyro/bmg160_core.c | 24 +- + drivers/iio/gyro/bmg160_i2c.c | 6 +- + drivers/iio/gyro/fxas21002c_core.c | 21 +- + drivers/iio/gyro/fxas21002c_i2c.c | 3 +- + drivers/iio/gyro/fxas21002c_spi.c | 3 +- + drivers/iio/gyro/itg3200_core.c | 15 +- + drivers/iio/gyro/mpu3050-i2c.c | 6 +- + drivers/iio/gyro/st_gyro_i2c.c | 5 +- + drivers/iio/health/afe4404.c | 5 +- + drivers/iio/health/max30100.c | 20 +- + drivers/iio/health/max30102.c | 25 +- + drivers/iio/humidity/am2315.c | 5 +- + drivers/iio/humidity/hdc100x.c | 5 +- + drivers/iio/humidity/hdc2010.c | 5 +- + drivers/iio/humidity/hts221.h | 2 - + drivers/iio/humidity/hts221_core.c | 27 +- + drivers/iio/humidity/hts221_i2c.c | 5 +- + drivers/iio/humidity/htu21.c | 6 +- + drivers/iio/humidity/si7005.c | 5 +- + drivers/iio/humidity/si7020.c | 5 +- + drivers/iio/imu/adis.c | 28 +- + drivers/iio/imu/adis16400.c | 2 +- + drivers/iio/imu/bmi160/bmi160_i2c.c | 6 +- + drivers/iio/imu/fxos8700_i2c.c | 6 +- + drivers/iio/imu/inv_icm42600/inv_icm42600.h | 2 + + drivers/iio/imu/inv_icm42600/inv_icm42600_core.c | 26 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_i2c.c | 6 +- + drivers/iio/imu/inv_icm42600/inv_icm42600_spi.c | 6 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 17 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_i2c.c | 10 +- + drivers/iio/imu/inv_mpu6050/inv_mpu_spi.c | 3 +- + drivers/iio/imu/kmx61.c | 6 +- + drivers/iio/imu/st_lsm6dsx/Kconfig | 3 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 24 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_buffer.c | 16 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_core.c | 465 ++++- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_i2c.c | 26 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 4 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_spi.c | 20 + + drivers/iio/imu/st_lsm9ds0/st_lsm9ds0_core.c | 65 +- + drivers/iio/industrialio-buffer.c | 40 +- + drivers/iio/industrialio-core.c | 58 +- + drivers/iio/industrialio-event.c | 8 +- + drivers/iio/industrialio-trigger.c | 12 +- + drivers/iio/light/adjd_s311.c | 5 +- + drivers/iio/light/adux1020.c | 5 +- + drivers/iio/light/al3010.c | 5 +- + drivers/iio/light/al3320a.c | 5 +- + drivers/iio/light/apds9300.c | 5 +- + drivers/iio/light/apds9960.c | 25 +- + drivers/iio/light/bh1750.c | 6 +- + drivers/iio/light/bh1780.c | 5 +- + drivers/iio/light/cm3232.c | 6 +- + drivers/iio/light/cm3323.c | 5 +- + drivers/iio/light/cm36651.c | 6 +- + drivers/iio/light/gp2ap002.c | 5 +- + drivers/iio/light/gp2ap020a00f.c | 6 +- + drivers/iio/light/isl29018.c | 6 +- + drivers/iio/light/isl29028.c | 6 +- + drivers/iio/light/isl29125.c | 5 +- + drivers/iio/light/jsa1212.c | 5 +- + drivers/iio/light/ltr501.c | 33 +- + drivers/iio/light/lv0104cs.c | 5 +- + drivers/iio/light/max44000.c | 5 +- + drivers/iio/light/noa1305.c | 31 +- + drivers/iio/light/opt3001.c | 5 +- + drivers/iio/light/pa12203001.c | 5 +- + drivers/iio/light/rpr0521.c | 5 +- + drivers/iio/light/si1133.c | 6 +- + drivers/iio/light/si1145.c | 6 +- + drivers/iio/light/st_uvis25_i2c.c | 5 +- + drivers/iio/light/stk3310.c | 5 +- + drivers/iio/light/tcs3414.c | 5 +- + drivers/iio/light/tcs3472.c | 5 +- + drivers/iio/light/tsl2563.c | 5 +- + drivers/iio/light/tsl2583.c | 5 +- + drivers/iio/light/tsl2772.c | 6 +- + drivers/iio/light/tsl4531.c | 5 +- + drivers/iio/light/us5182d.c | 5 +- + drivers/iio/light/vcnl4000.c | 191 +- + drivers/iio/light/vcnl4035.c | 5 +- + drivers/iio/light/veml6030.c | 5 +- + drivers/iio/light/veml6070.c | 5 +- + drivers/iio/light/vl6180.c | 5 +- + drivers/iio/light/zopt2201.c | 5 +- + drivers/iio/magnetometer/ak8974.c | 5 +- + drivers/iio/magnetometer/ak8975.c | 6 +- + drivers/iio/magnetometer/bmc150_magn_i2c.c | 6 +- + drivers/iio/magnetometer/hmc5843_i2c.c | 6 +- + drivers/iio/magnetometer/mag3110.c | 6 +- + drivers/iio/magnetometer/mmc35240.c | 5 +- + drivers/iio/magnetometer/st_magn_i2c.c | 5 +- + drivers/iio/magnetometer/yamaha-yas530.c | 6 +- + drivers/iio/multiplexer/iio-mux.c | 8 +- + drivers/iio/potentiometer/ad5272.c | 6 +- + drivers/iio/potentiometer/ds1803.c | 5 +- + drivers/iio/potentiometer/max5432.c | 5 +- + drivers/iio/potentiometer/tpl0102.c | 6 +- + drivers/iio/potentiostat/lmp91000.c | 5 +- + drivers/iio/pressure/abp060mg.c | 6 +- + drivers/iio/pressure/bmp280-i2c.c | 6 +- + drivers/iio/pressure/dlhl60d.c | 6 +- + drivers/iio/pressure/dps310.c | 6 +- + drivers/iio/pressure/hp03.c | 6 +- + drivers/iio/pressure/hp206c.c | 6 +- + drivers/iio/pressure/icp10100.c | 5 +- + drivers/iio/pressure/mpl115.c | 62 +- + drivers/iio/pressure/mpl115.h | 5 + + drivers/iio/pressure/mpl115_i2c.c | 7 +- + drivers/iio/pressure/mpl115_spi.c | 1 + + drivers/iio/pressure/mpl3115.c | 6 +- + drivers/iio/pressure/ms5611_i2c.c | 6 +- + drivers/iio/pressure/ms5637.c | 6 +- + drivers/iio/pressure/st_pressure_i2c.c | 5 +- + drivers/iio/pressure/t5403.c | 6 +- + drivers/iio/pressure/zpa2326_i2c.c | 6 +- + drivers/iio/proximity/isl29501.c | 5 +- + drivers/iio/proximity/mb1232.c | 6 +- + drivers/iio/proximity/pulsedlight-lidar-lite-v2.c | 5 +- + drivers/iio/proximity/rfd77402.c | 5 +- + drivers/iio/proximity/srf08.c | 6 +- + drivers/iio/proximity/sx9360.c | 1 + + drivers/iio/proximity/sx9500.c | 5 +- + drivers/iio/proximity/sx_common.c | 23 +- + drivers/iio/proximity/sx_common.h | 2 - + drivers/iio/temperature/Kconfig | 10 + + drivers/iio/temperature/Makefile | 1 + + drivers/iio/temperature/ltc2983.c | 193 +- + drivers/iio/temperature/max30208.c | 252 +++ + drivers/iio/temperature/mlx90614.c | 6 +- + drivers/iio/temperature/mlx90632.c | 480 ++++- + drivers/iio/temperature/tmp006.c | 5 +- + drivers/iio/temperature/tmp007.c | 6 +- + drivers/iio/temperature/tsys01.c | 5 +- + drivers/iio/temperature/tsys02d.c | 6 +- + drivers/iio/trigger/iio-trig-sysfs.c | 14 +- + drivers/interconnect/qcom/icc-rpm.c | 5 +- + drivers/interconnect/qcom/osm-l3.c | 126 +- + drivers/interconnect/qcom/sc7180.c | 4 +- + drivers/interconnect/qcom/sc8180x.c | 2 +- + drivers/mcb/mcb-core.c | 4 +- + drivers/mcb/mcb-parse.c | 2 +- + drivers/misc/Kconfig | 22 + + drivers/misc/Makefile | 2 + + drivers/misc/apds9802als.c | 5 +- + drivers/misc/apds990x.c | 5 +- + drivers/misc/bh1770glc.c | 5 +- + drivers/misc/ds1682.c | 5 +- + drivers/misc/eeprom/eeprom.c | 5 +- + drivers/misc/eeprom/idt_89hpesx.c | 4 +- + drivers/misc/eeprom/max6875.c | 5 +- + drivers/misc/fastrpc.c | 260 ++- + drivers/misc/genwqe/card_base.c | 2 +- + .../misc/habanalabs/common/command_submission.c | 62 +- + drivers/misc/habanalabs/common/context.c | 54 +- + drivers/misc/habanalabs/common/debugfs.c | 5 + + drivers/misc/habanalabs/common/device.c | 452 ++++- + drivers/misc/habanalabs/common/firmware_if.c | 54 +- + drivers/misc/habanalabs/common/habanalabs.h | 127 +- + drivers/misc/habanalabs/common/habanalabs_drv.c | 42 +- + drivers/misc/habanalabs/common/habanalabs_ioctl.c | 70 +- + drivers/misc/habanalabs/common/memory.c | 16 +- + drivers/misc/habanalabs/common/mmu/mmu.c | 24 +- + drivers/misc/habanalabs/common/sysfs.c | 4 +- + drivers/misc/habanalabs/gaudi/gaudi.c | 124 +- + drivers/misc/habanalabs/gaudi2/gaudi2.c | 643 ++++-- + drivers/misc/habanalabs/gaudi2/gaudi2P.h | 2 - + drivers/misc/habanalabs/gaudi2/gaudi2_security.c | 1 + + drivers/misc/habanalabs/goya/goya.c | 4 +- + .../include/gaudi2/gaudi2_async_events.h | 1 + + .../include/gaudi2/gaudi2_async_ids_map_extended.h | 4 +- + .../habanalabs/include/hw_ip/pci/pci_general.h | 7 + + drivers/misc/hmc6352.c | 5 +- + drivers/misc/ics932s401.c | 8 +- + drivers/misc/isl29003.c | 5 +- + drivers/misc/isl29020.c | 5 +- + drivers/misc/lis3lv02d/lis3lv02d_i2c.c | 5 +- + drivers/misc/mei/bus-fixup.c | 14 +- + drivers/misc/mei/bus.c | 22 +- + drivers/misc/mei/client.c | 20 +- + drivers/misc/mei/client.h | 2 +- + drivers/misc/mei/main.c | 2 +- + drivers/misc/mei/mei_dev.h | 2 + + drivers/misc/sgi-gru/grufault.c | 13 +- + drivers/misc/sgi-gru/grumain.c | 22 +- + drivers/misc/sgi-gru/grutables.h | 2 +- + drivers/misc/smpro-errmon.c | 529 +++++ + drivers/misc/smpro-misc.c | 145 ++ + drivers/misc/tifm_7xx1.c | 2 +- + drivers/misc/tsl2550.c | 5 +- + drivers/nvmem/Kconfig | 2 +- + drivers/nvmem/stm32-romem.c | 27 +- + drivers/nvmem/u-boot-env.c | 14 + + drivers/slimbus/qcom-ctrl.c | 5 +- + drivers/slimbus/qcom-ngd-ctrl.c | 97 +- + drivers/slimbus/stream.c | 17 +- + drivers/spmi/spmi-pmic-arb.c | 242 ++- + drivers/staging/iio/accel/adis16203.c | 2 +- + drivers/staging/iio/accel/adis16240.c | 2 +- + drivers/staging/iio/addac/adt7316-i2c.c | 6 +- + drivers/staging/iio/frequency/ad9834.c | 6 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 6 +- + drivers/staging/iio/meter/ade7854-i2c.c | 10 +- + drivers/uio/uio_dmem_genirq.c | 22 +- + drivers/uio/uio_fsl_elbc_gpcm.c | 6 +- + drivers/virt/fsl_hypervisor.c | 2 +- + fs/char_dev.c | 15 +- + include/linux/iio/buffer_impl.h | 2 +- + include/linux/iio/common/st_sensors.h | 4 - + include/linux/iio/gyro/itg3200.h | 2 + + include/linux/iio/iio-opaque.h | 2 + + include/linux/iio/iio.h | 5 +- + include/linux/iio/imu/adis.h | 11 +- + include/linux/iio/kfifo_buf.h | 3 +- + include/linux/iio/sysfs.h | 11 + + include/linux/iio/triggered_buffer.h | 6 +- + include/uapi/linux/acrn.h | 5 +- + include/uapi/misc/fastrpc.h | 7 + + include/uapi/misc/habanalabs.h | 93 +- + lib/test_firmware.c | 5 +- + samples/acrn/vm-sample.c | 3 - + scripts/kallsyms.c | 3 +- + 459 files changed, 18007 insertions(+), 3044 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-coreboot + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-ad4130 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-max11410 + create mode 100644 Documentation/ABI/testing/sysfs-bus-platform-devices-ampere-smpro + create mode 100644 Documentation/devicetree/bindings/bus/fsl,imx8qxp-pixel-link-msi-bus.yaml + create mode 100644 Documentation/devicetree/bindings/fpga/lattice,sysconfig.yaml + create mode 100644 Documentation/devicetree/bindings/iio/accel/kionix,kx022a.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,ad4130.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/adi,max11410.yaml + create mode 100644 Documentation/devicetree/bindings/iio/addac/adi,ad74115.yaml + create mode 100644 Documentation/devicetree/bindings/iio/frequency/adi,adf4377.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/layouts/kontron,sl28-vpd.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/layouts/nvmem-layout.yaml + create mode 100644 Documentation/devicetree/bindings/nvmem/layouts/onie,tlv-layout.yaml + delete mode 100644 Documentation/devicetree/bindings/slimbus/bus.txt + create mode 100644 Documentation/devicetree/bindings/slimbus/qcom,slim-ngd.yaml + create mode 100644 Documentation/devicetree/bindings/slimbus/qcom,slim.yaml + delete mode 100644 Documentation/devicetree/bindings/slimbus/slim-ngd-qcom-ctrl.txt + delete mode 100644 Documentation/devicetree/bindings/slimbus/slim-qcom-ctrl.txt + create mode 100644 Documentation/devicetree/bindings/slimbus/slimbus.yaml + create mode 100644 drivers/firmware/google/cbmem.c + create mode 100644 drivers/fpga/lattice-sysconfig-spi.c + create mode 100644 drivers/fpga/lattice-sysconfig.c + create mode 100644 drivers/fpga/lattice-sysconfig.h + create mode 100644 drivers/iio/accel/kionix-kx022a-i2c.c + create mode 100644 drivers/iio/accel/kionix-kx022a-spi.c + create mode 100644 drivers/iio/accel/kionix-kx022a.c + create mode 100644 drivers/iio/accel/kionix-kx022a.h + create mode 100644 drivers/iio/adc/ad4130.c + create mode 100644 drivers/iio/adc/max11410.c + create mode 100644 drivers/iio/adc/mt6370-adc.c + create mode 100644 drivers/iio/addac/ad74115.c + create mode 100644 drivers/iio/frequency/adf4377.c + create mode 100644 drivers/iio/temperature/max30208.c + create mode 100644 drivers/misc/smpro-errmon.c + create mode 100644 drivers/misc/smpro-misc.c +Merging accel/habanalabs-next (2012e010cbbd habanalabs: pass-through request from user to f/w) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Auto-merging drivers/misc/habanalabs/common/memory.c +Merge made by the 'ort' strategy. + drivers/misc/habanalabs/common/command_buffer.c | 22 + + .../misc/habanalabs/common/command_submission.c | 48 +- + drivers/misc/habanalabs/common/device.c | 15 +- + drivers/misc/habanalabs/common/firmware_if.c | 166 +++++- + drivers/misc/habanalabs/common/habanalabs.h | 33 +- + drivers/misc/habanalabs/common/habanalabs_drv.c | 2 +- + drivers/misc/habanalabs/common/habanalabs_ioctl.c | 51 ++ + drivers/misc/habanalabs/common/irq.c | 6 +- + drivers/misc/habanalabs/common/memory.c | 350 +++++++----- + drivers/misc/habanalabs/common/memory_mgr.c | 7 +- + drivers/misc/habanalabs/common/mmu/mmu_v1.c | 1 - + drivers/misc/habanalabs/gaudi/gaudi.c | 13 +- + drivers/misc/habanalabs/gaudi2/gaudi2.c | 629 +++++++++++++-------- + drivers/misc/habanalabs/gaudi2/gaudi2_coresight.c | 8 +- + drivers/misc/habanalabs/goya/goya.c | 6 + + drivers/misc/habanalabs/include/common/cpucp_if.h | 65 ++- + .../misc/habanalabs/include/common/hl_boot_if.h | 50 +- + .../include/gaudi2/gaudi2_async_events.h | 1 + + .../include/gaudi2/gaudi2_async_ids_map_extended.h | 2 + + include/trace/events/habanalabs.h | 36 ++ + include/uapi/misc/habanalabs.h | 25 +- + 21 files changed, 1065 insertions(+), 471 deletions(-) +Merging coresight/next (c767c3474013 coresight: etm4x: fix repeated words in comments) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fpga/for-next (ee31d5038c06 dt-bindings: fpga: document Lattice sysCONFIG FPGA manager) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Already up to date. +Merging icc/icc-next (26e90ec7a840 Merge branch 'icc-sc8280xp-l3' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (0dec19b344b5 iio: light: tsl2563: Keep Makefile sorted by module name) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/iio/adc/ti,adc081c.yaml | 55 ++ + .../devicetree/bindings/iio/adc/ti,lmp92064.yaml | 70 ++ + .../devicetree/bindings/iio/dac/adi,ad5686.yaml | 1 + + .../bindings/iio/magnetometer/ti,tmag5273.yaml | 75 +++ + MAINTAINERS | 15 + + drivers/iio/accel/bma400.h | 4 - + drivers/iio/accel/bma400_core.c | 29 +- + drivers/iio/adc/Kconfig | 10 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/at91-sama5d2_adc.c | 4 +- + drivers/iio/adc/ti-lmp92064.c | 332 +++++++++ + drivers/iio/common/scmi_sensors/scmi_iio.c | 4 +- + drivers/iio/dac/Kconfig | 8 +- + drivers/iio/dac/ad5686.c | 7 + + drivers/iio/dac/ad5686.h | 1 + + drivers/iio/dac/ad5696-i2c.c | 2 + + drivers/iio/light/Makefile | 2 +- + drivers/iio/light/max44009.c | 5 +- + drivers/iio/light/tsl2563.c | 189 +++--- + drivers/iio/magnetometer/Kconfig | 12 + + drivers/iio/magnetometer/Makefile | 2 + + drivers/iio/magnetometer/tmag5273.c | 743 +++++++++++++++++++++ + drivers/iio/pressure/ms5611.h | 4 - + drivers/iio/pressure/ms5611_core.c | 49 +- + drivers/iio/pressure/ms5611_i2c.c | 6 - + drivers/iio/pressure/ms5611_spi.c | 6 - + include/linux/iio/iio.h | 5 + + include/linux/platform_data/tsl2563.h | 9 - + 28 files changed, 1440 insertions(+), 210 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,adc081c.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,lmp92064.yaml + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/ti,tmag5273.yaml + create mode 100644 drivers/iio/adc/ti-lmp92064.c + create mode 100644 drivers/iio/magnetometer/tmag5273.c + delete mode 100644 include/linux/platform_data/tsl2563.h +Merging phy-next/next (bea3ce759b46 phy: ti: phy-j721e-wiz: add j721s2-wiz-10g module support) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging drivers/pci/controller/dwc/pcie-qcom.c +Merge made by the 'ort' strategy. + .../phy/allwinner,sun6i-a31-mipi-dphy.yaml | 11 + + .../bindings/phy/allwinner,sun8i-h3-usb-phy.yaml | 26 + + .../devicetree/bindings/phy/fsl,imx8-pcie-phy.yaml | 16 +- + ...cie-phy.yaml => qcom,ipq8074-qmp-pcie-phy.yaml} | 7 +- + ...-ufs-phy.yaml => qcom,msm8996-qmp-ufs-phy.yaml} | 17 +- + ...usb-phy.yaml => qcom,msm8996-qmp-usb3-phy.yaml} | 20 +- + ...p-phy.yaml => qcom,sc7180-qmp-usb3-dp-phy.yaml} | 25 +- + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 165 ++ + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 83 + + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 102 ++ + .../phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml | 99 ++ + .../phy/renesas,r8a779f0-ether-serdes.yaml | 54 + + .../devicetree/bindings/phy/ti,phy-gmii-sel.yaml | 48 +- + .../devicetree/bindings/phy/ti,phy-j721e-wiz.yaml | 2 + + Documentation/driver-api/phy/phy.rst | 25 +- + drivers/pci/controller/dwc/pcie-qcom-ep.c | 5 + + drivers/pci/controller/dwc/pcie-qcom.c | 5 + + drivers/phy/allwinner/phy-sun4i-usb.c | 71 + + drivers/phy/allwinner/phy-sun6i-mipi-dphy.c | 236 ++- + drivers/phy/broadcom/phy-brcm-usb-init-synopsys.c | 95 +- + drivers/phy/broadcom/phy-brcm-usb-init.c | 90 +- + drivers/phy/broadcom/phy-brcm-usb-init.h | 11 +- + drivers/phy/broadcom/phy-brcm-usb.c | 32 +- + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 142 +- + drivers/phy/marvell/phy-mmp3-hsic.c | 4 +- + drivers/phy/marvell/phy-mvebu-a3700-comphy.c | 3 + + drivers/phy/qualcomm/Kconfig | 1 + + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 1709 +++++++++----------- + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 103 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 1443 ++++++++++------- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5.h | 2 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-pcie-v5_20.h | 2 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5_20.h | 14 + + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 482 +++--- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 737 ++++----- + drivers/phy/qualcomm/phy-qcom-qmp.h | 1 + + drivers/phy/renesas/Kconfig | 8 + + drivers/phy/renesas/Makefile | 1 + + drivers/phy/renesas/r8a779f0-ether-serdes.c | 417 +++++ + drivers/phy/tegra/phy-tegra194-p2u.c | 14 + + drivers/phy/tegra/xusb-tegra124.c | 1 - + drivers/phy/tegra/xusb-tegra186.c | 1 - + drivers/phy/tegra/xusb-tegra210.c | 1 - + drivers/phy/tegra/xusb.c | 10 +- + drivers/phy/tegra/xusb.h | 2 - + drivers/phy/ti/phy-gmii-sel.c | 42 +- + drivers/phy/ti/phy-j721e-wiz.c | 38 + + include/dt-bindings/phy/phy-qcom-qmp.h | 20 + + 48 files changed, 3914 insertions(+), 2529 deletions(-) + rename Documentation/devicetree/bindings/phy/{qcom,qmp-pcie-phy.yaml => qcom,ipq8074-qmp-pcie-phy.yaml} (96%) + rename Documentation/devicetree/bindings/phy/{qcom,qmp-ufs-phy.yaml => qcom,msm8996-qmp-ufs-phy.yaml} (93%) + rename Documentation/devicetree/bindings/phy/{qcom,qmp-usb-phy.yaml => qcom,msm8996-qmp-usb3-phy.yaml} (95%) + rename Documentation/devicetree/bindings/phy/{qcom,qmp-usb3-dp-phy.yaml => qcom,sc7180-qmp-usb3-dp-phy.yaml} (91%) + create mode 100644 Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb43dp-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/renesas,r8a779f0-ether-serdes.yaml + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5_20.h + create mode 100644 drivers/phy/renesas/r8a779f0-ether-serdes.c + create mode 100644 include/dt-bindings/phy/phy-qcom-qmp.h +Merging soundwire/next (7cbf00bd4142 soundwire: intel: split auxdevice to different file) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Auto-merging drivers/soundwire/intel_init.c +Auto-merging include/linux/soundwire/sdw_intel.h +Auto-merging sound/soc/sof/intel/hda.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/soundwire/qcom,sdw.txt | 214 ------ + .../bindings/soundwire/qcom,soundwire.yaml | 270 ++++++++ + drivers/soundwire/Makefile | 2 +- + drivers/soundwire/cadence_master.c | 50 +- + drivers/soundwire/cadence_master.h | 9 +- + drivers/soundwire/dmi-quirks.c | 8 + + drivers/soundwire/intel.c | 769 ++------------------- + drivers/soundwire/intel.h | 96 ++- + drivers/soundwire/intel_auxdevice.c | 678 ++++++++++++++++++ + drivers/soundwire/intel_auxdevice.h | 18 + + drivers/soundwire/intel_init.c | 2 + + drivers/soundwire/qcom.c | 25 +- + include/linux/soundwire/sdw_intel.h | 44 ++ + sound/soc/sof/intel/hda.c | 2 + + 14 files changed, 1237 insertions(+), 950 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/soundwire/qcom,sdw.txt + create mode 100644 Documentation/devicetree/bindings/soundwire/qcom,soundwire.yaml + create mode 100644 drivers/soundwire/intel_auxdevice.c + create mode 100644 drivers/soundwire/intel_auxdevice.h +Merging extcon/extcon-next (5313121b22fd extcon: usbc-tusb320: Convert to i2c's .probe_new()) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (247f34f7b803 Linux 6.1-rc2) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (70be6f322860 vfio/mlx5: error pointer dereference in error handling) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +Merging staging/staging-next (37aa6b982370 vme: Use root_device_register() not underlined version) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Auto-merging drivers/staging/iio/meter/ade7854-i2c.c +Auto-merging drivers/staging/rtl8192e/rtllib_softmac_wx.c +Auto-merging drivers/staging/sm750fb/Kconfig +Merge made by the 'ort' strategy. + arch/mips/include/asm/octeon/cvmx.h | 4 +- + drivers/staging/emxx_udc/emxx_udc.c | 5 +- + drivers/staging/fieldbus/dev_core.c | 17 +- + drivers/staging/gdm724x/gdm_tty.c | 13 +- + drivers/staging/greybus/tools/loopback_test.c | 15 +- + drivers/staging/ks7010/TODO | 3 + + drivers/staging/ks7010/ks_wlan_net.c | 248 +++---- + drivers/staging/most/dim2/dim2.c | 4 +- + drivers/staging/most/dim2/hal.c | 4 +- + drivers/staging/most/dim2/hal.h | 6 +- + drivers/staging/most/i2c/i2c.c | 4 +- + drivers/staging/octeon/ethernet-tx.c | 2 - + drivers/staging/octeon/octeon-stubs.h | 2 +- + drivers/staging/olpc_dcon/olpc_dcon.c | 4 +- + drivers/staging/r8188eu/core/rtw_ap.c | 7 +- + drivers/staging/r8188eu/core/rtw_br_ext.c | 126 ++-- + drivers/staging/r8188eu/core/rtw_cmd.c | 34 +- + drivers/staging/r8188eu/core/rtw_ioctl_set.c | 6 +- + drivers/staging/r8188eu/core/rtw_led.c | 79 +-- + drivers/staging/r8188eu/core/rtw_mlme.c | 51 +- + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 747 ++++++++------------- + drivers/staging/r8188eu/core/rtw_p2p.c | 19 +- + drivers/staging/r8188eu/core/rtw_pwrctrl.c | 2 +- + drivers/staging/r8188eu/core/rtw_recv.c | 27 +- + drivers/staging/r8188eu/core/rtw_security.c | 4 +- + drivers/staging/r8188eu/core/rtw_sta_mgt.c | 16 +- + drivers/staging/r8188eu/core/rtw_wlan_util.c | 36 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 54 +- + drivers/staging/r8188eu/hal/HalPhyRf_8188e.c | 12 +- + drivers/staging/r8188eu/hal/hal_intf.c | 19 +- + drivers/staging/r8188eu/hal/odm_RTL8188E.c | 6 +- + drivers/staging/r8188eu/hal/rtl8188e_hal_init.c | 8 +- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 16 +- + drivers/staging/r8188eu/hal/rtl8188e_rxdesc.c | 28 +- + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 3 +- + drivers/staging/r8188eu/include/Hal8188EPhyReg.h | 4 +- + drivers/staging/r8188eu/include/drv_types.h | 1 - + drivers/staging/r8188eu/include/odm.h | 10 +- + drivers/staging/r8188eu/include/odm_RTL8188E.h | 7 + + drivers/staging/r8188eu/include/odm_types.h | 16 - + drivers/staging/r8188eu/include/osdep_intf.h | 6 +- + drivers/staging/r8188eu/include/osdep_service.h | 6 +- + drivers/staging/r8188eu/include/rtl8188e_hal.h | 7 +- + drivers/staging/r8188eu/include/rtl8188e_spec.h | 18 +- + drivers/staging/r8188eu/include/rtw_ap.h | 2 +- + drivers/staging/r8188eu/include/rtw_cmd.h | 71 +- + drivers/staging/r8188eu/include/rtw_io.h | 16 +- + drivers/staging/r8188eu/include/rtw_ioctl_set.h | 6 +- + drivers/staging/r8188eu/include/rtw_led.h | 3 - + drivers/staging/r8188eu/include/rtw_mlme.h | 29 +- + drivers/staging/r8188eu/include/rtw_mlme_ext.h | 58 +- + drivers/staging/r8188eu/include/rtw_recv.h | 4 +- + drivers/staging/r8188eu/include/rtw_xmit.h | 4 +- + drivers/staging/r8188eu/include/sta_info.h | 18 +- + drivers/staging/r8188eu/include/wifi.h | 77 +-- + drivers/staging/r8188eu/include/wlan_bssdef.h | 51 -- + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 28 +- + drivers/staging/r8188eu/os_dep/os_intfs.c | 41 +- + drivers/staging/rtl8192e/TODO | 18 +- + drivers/staging/rtl8192e/rtl8192e/r8190P_def.h | 15 - + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 55 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 50 +- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 43 +- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 191 +++--- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 36 +- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 123 ++-- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 10 +- + drivers/staging/rtl8192e/rtl8192e/rtl_eeprom.c | 2 +- + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 95 ++- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 94 ++- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 38 +- + drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 405 ++++++----- + drivers/staging/rtl8192e/rtl819x_Qos.h | 7 - + drivers/staging/rtl8192e/rtl819x_TSProc.c | 2 +- + drivers/staging/rtl8192e/rtllib.h | 51 +- + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 52 +- + drivers/staging/rtl8192e/rtllib_crypt_wep.c | 8 - + drivers/staging/rtl8192e/rtllib_module.c | 8 +- + drivers/staging/rtl8192e/rtllib_rx.c | 38 +- + drivers/staging/rtl8192e/rtllib_softmac.c | 173 +++-- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 19 +- + drivers/staging/rtl8192e/rtllib_tx.c | 120 ++-- + drivers/staging/rtl8192e/rtllib_wx.c | 6 +- + drivers/staging/rtl8192u/TODO | 16 + + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 64 -- + .../rtl8192u/ieee80211/ieee80211_crypt_tkip.c | 6 - + .../staging/rtl8192u/ieee80211/ieee80211_module.c | 3 - + drivers/staging/rtl8192u/ieee80211/ieee80211_rx.c | 6 +- + drivers/staging/rtl8712/os_intfs.c | 27 +- + drivers/staging/rtl8712/recv_osdep.h | 8 +- + drivers/staging/rtl8712/rtl8712_recv.c | 7 +- + drivers/staging/rtl8712/rtl8712_xmit.c | 3 +- + drivers/staging/rtl8712/rtl871x_recv.c | 16 +- + drivers/staging/rtl8723bs/core/rtw_efuse.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_ieee80211.c | 12 +- + drivers/staging/rtl8723bs/core/rtw_ioctl_set.c | 17 +- + drivers/staging/rtl8723bs/core/rtw_mlme.c | 30 +- + drivers/staging/rtl8723bs/core/rtw_mlme_ext.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_recv.c | 6 +- + drivers/staging/rtl8723bs/core/rtw_sta_mgt.c | 2 +- + drivers/staging/rtl8723bs/core/rtw_wlan_util.c | 12 +- + drivers/staging/rtl8723bs/hal/HalPhyRf_8723B.c | 21 +- + drivers/staging/rtl8723bs/hal/odm.h | 12 +- + drivers/staging/rtl8723bs/hal/odm_DIG.c | 5 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 2 +- + drivers/staging/rts5208/sd.c | 3 +- + drivers/staging/sm750fb/Kconfig | 2 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 30 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 18 +- + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.h | 6 +- + drivers/staging/vme_user/vme.h | 2 - + drivers/staging/vme_user/vme_fake.c | 9 +- + drivers/staging/vme_user/vme_tsi148.c | 7 +- + drivers/staging/vme_user/vme_tsi148.h | 7 - + drivers/staging/vt6655/rxtx.c | 36 +- + drivers/staging/wlan-ng/TODO | 16 + + drivers/staging/wlan-ng/p80211mgmt.h | 301 --------- + drivers/staging/wlan-ng/p80211netdev.c | 22 - + drivers/staging/wlan-ng/p80211types.h | 6 - + 120 files changed, 1737 insertions(+), 2782 deletions(-) + delete mode 100644 drivers/staging/r8188eu/include/odm_types.h + create mode 100644 drivers/staging/rtl8192u/TODO + create mode 100644 drivers/staging/wlan-ng/TODO +Merging counter-next/counter-next (30a0b95b1335 Linux 6.1-rc3) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Already up to date. +Merging mux/for-next (ea327624ae52 mux: mmio: drop obsolete dependency on COMPILE_TEST) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Merge made by the 'ort' strategy. + drivers/mux/Kconfig | 2 +- + drivers/mux/mmio.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging dmaengine/next (25483dedd2f5 dmaengine: Revert "dmaengine: remove s3c24xx driver") +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging Documentation/driver-api/driver-model/devres.rst +Auto-merging MAINTAINERS +Auto-merging drivers/dma/Kconfig +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 12 + + .../devicetree/bindings/dma/ingenic,dma.yaml | 1 + + .../bindings/dma/nvidia,tegra186-gpc-dma.yaml | 7 +- + .../devicetree/bindings/dma/qcom,gpi.yaml | 26 +- + Documentation/driver-api/driver-model/devres.rst | 1 + + MAINTAINERS | 6 - + drivers/dma/Kconfig | 9 +- + drivers/dma/Makefile | 1 - + drivers/dma/apple-admac.c | 102 +- + drivers/dma/at_hdmac.c | 1854 +++++++++++--------- + drivers/dma/at_hdmac_regs.h | 478 ----- + drivers/dma/dma-jz4780.c | 8 + + drivers/dma/idma64.c | 8 +- + drivers/dma/idxd/device.c | 1 - + drivers/dma/idxd/sysfs.c | 68 + + drivers/dma/ioat/dma.c | 2 +- + drivers/dma/iop-adma.c | 1554 ---------------- + drivers/dma/iop-adma.h | 914 ---------- + drivers/dma/qcom/gpi.c | 7 +- + drivers/dma/sh/shdma-arm.h | 48 - + drivers/dma/tegra186-gpc-dma.c | 37 +- + drivers/dma/ti/Kconfig | 7 +- + drivers/dma/ti/Makefile | 15 +- + drivers/dma/ti/k3-psil.c | 2 + + drivers/dma/ti/k3-udma-glue.c | 5 +- + drivers/dma/ti/k3-udma.c | 40 +- + drivers/dma/xilinx/xilinx_dma.c | 4 +- + drivers/of/irq.c | 1 + + include/uapi/linux/idxd.h | 2 +- + 29 files changed, 1268 insertions(+), 3952 deletions(-) + delete mode 100644 drivers/dma/at_hdmac_regs.h + delete mode 100644 drivers/dma/iop-adma.c + delete mode 100644 drivers/dma/iop-adma.h + delete mode 100644 drivers/dma/sh/shdma-arm.h +Merging cgroup/for-next (674b745e22b3 cgroup: remove rcu_read_lock()/rcu_read_unlock() in critical section of spin_lock_irq()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Already up to date. +Merging scsi/for-next (1dbc54a8c0b6 Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging drivers/nvme/host/core.c +Auto-merging drivers/scsi/lpfc/lpfc_init.c +Auto-merging drivers/scsi/megaraid/megaraid_sas_base.c +Auto-merging drivers/scsi/pm8001/pm8001_init.c +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/scsi/scsi_sysfs.c +Auto-merging drivers/scsi/scsi_transport_iscsi.c +Auto-merging drivers/scsi/sg.c +Auto-merging drivers/target/target_core_device.c +Auto-merging drivers/target/target_core_iblock.c +Auto-merging drivers/ufs/core/ufshcd.c +Auto-merging drivers/ufs/core/ufshpb.c +Merge made by the 'ort' strategy. + drivers/nvme/host/core.c | 33 +++++++++++++++- + drivers/scsi/libfc/fc_disc.c | 2 +- + drivers/scsi/qla2xxx/qla_init.c | 14 +++++-- + drivers/scsi/scsi_ioctl.c | 2 +- + drivers/scsi/sd.c | 35 ++++++++++++++++- + drivers/scsi/sd_trace.h | 84 +++++++++++++++++++++++++++++++++++++++++ + drivers/scsi/sd_zbc.c | 6 +++ + drivers/scsi/sg.c | 2 +- + include/scsi/scsi.h | 1 + + include/scsi/sg.h | 2 +- + include/uapi/linux/pr.h | 17 +++++++++ + 11 files changed, 187 insertions(+), 11 deletions(-) + create mode 100644 drivers/scsi/sd_trace.h +Merging scsi-mkp/for-next (1a5665fc8d7a scsi: ufs: core: WLUN suspend SSU/enter hibern8 fail recovery) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Auto-merging drivers/scsi/scsi_debug.c +Auto-merging drivers/scsi/scsi_error.c +Auto-merging drivers/scsi/scsi_transport_iscsi.c +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + drivers/scsi/mpi3mr/Makefile | 2 +- + drivers/scsi/scsi_debug.c | 2 -- + drivers/scsi/scsi_error.c | 5 ++++ + drivers/scsi/scsi_transport_iscsi.c | 50 +++++++++++++++++++++++++++++++++---- + drivers/scsi/storvsc_drv.c | 3 +++ + drivers/ufs/core/ufshcd.c | 26 +++++++++++++++++++ + include/scsi/scsi_transport_iscsi.h | 9 +++++++ + 7 files changed, 89 insertions(+), 8 deletions(-) +Merging vhost/linux-next (be8ddea9e75e vdpa/ifcvf: add reviewer) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (b3af356e6243 Merge branches 'rproc-next' and 'hwspinlock-next' for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Auto-merging arch/arm64/boot/dts/xilinx/zynqmp.dtsi +Auto-merging drivers/firmware/xilinx/zynqmp.c +Auto-merging include/linux/firmware/xlnx-zynqmp.h +CONFLICT (content): Merge conflict in include/linux/firmware/xlnx-zynqmp.h +Resolved 'include/linux/firmware/xlnx-zynqmp.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 7dfbaaed3bfc] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/remoteproc/fsl,imx-rproc.yaml | 16 + + .../bindings/remoteproc/xlnx,zynqmp-r5fss.yaml | 135 +++ + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 33 + + drivers/firmware/xilinx/zynqmp.c | 97 ++ + drivers/remoteproc/Kconfig | 13 + + drivers/remoteproc/Makefile | 1 + + drivers/remoteproc/imx_dsp_rproc.c | 12 +- + drivers/remoteproc/imx_rproc.c | 298 +++++- + drivers/remoteproc/qcom_q6v5_pas.c | 4 + + drivers/remoteproc/qcom_q6v5_wcss.c | 6 +- + drivers/remoteproc/qcom_sysmon.c | 13 +- + drivers/remoteproc/remoteproc_core.c | 19 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 1067 ++++++++++++++++++++ + include/dt-bindings/power/xlnx-zynqmp-power.h | 6 + + include/linux/firmware/xlnx-zynqmp.h | 60 ++ + 15 files changed, 1760 insertions(+), 20 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/xlnx,zynqmp-r5fss.yaml + create mode 100644 drivers/remoteproc/xlnx_r5_remoteproc.c +Merging gpio/for-next (e73f0f0ee754 Linux 5.14-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git gpio/for-next +Already up to date. +Merging gpio-brgl/gpio/for-next (11e47bbd700f gpio: sim: set a limit on the number of GPIOs) +$ git merge -m Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl/gpio/for-next +Already up to date. +Merging gpio-intel/for-next (8d259847243d gpiolib: cdev: Fix typo in kernel doc for struct line) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging gpio-sim/gpio/gpio-sim (0fcfb00b28c0 Linux 5.16-rc4) +$ git merge -m Merge branch 'gpio/gpio-sim' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-sim/gpio/gpio-sim +Already up to date. +Merging pinctrl/for-next (6c19feafb377 Merge branch 'devel' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/pinctrl/intel/pinctrl-intel.c +Auto-merging drivers/pinctrl/mediatek/pinctrl-mt7986.c +Auto-merging drivers/pinctrl/mediatek/pinctrl-mt8365.c +Auto-merging drivers/pinctrl/pinctrl-ingenic.c +Auto-merging drivers/pinctrl/pinctrl-ocelot.c +Auto-merging drivers/pinctrl/pinctrl-single.c +Auto-merging drivers/pinctrl/pinctrl-zynqmp.c +Auto-merging drivers/pinctrl/qcom/pinctrl-msm.c +Merge made by the 'ort' strategy. +Merging pinctrl-intel/for-next (b14ef61314b3 pinctrl: intel: Add Intel Moorefield pin controller support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Already up to date. +Merging pinctrl-renesas/renesas-pinctrl (80d34260f36c pinctrl: renesas: gpio: Use dynamic GPIO base if no function GPIOs) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Already up to date. +Merging pinctrl-samsung/for-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (8fa22f4b88e8 pwm: pca9685: Convert to i2c's .probe_new()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Auto-merging drivers/gpu/drm/bridge/ti-sn65dsi86.c +Auto-merging drivers/leds/rgb/leds-qcom-lpg.c +Auto-merging drivers/pwm/pwm-lpss.c +Auto-merging include/linux/pwm.h +Merge made by the 'ort' strategy. + .../devicetree/bindings/pwm/renesas,pwm-rcar.yaml | 1 + + .../devicetree/bindings/pwm/renesas,tpu-pwm.yaml | 1 + + drivers/gpio/gpio-mvebu.c | 9 ++- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 14 +++-- + drivers/leds/rgb/leds-qcom-lpg.c | 14 +++-- + drivers/pwm/Kconfig | 6 +- + drivers/pwm/core.c | 68 ++++++++++++---------- + drivers/pwm/pwm-atmel.c | 6 +- + drivers/pwm/pwm-bcm-iproc.c | 8 ++- + drivers/pwm/pwm-crc.c | 10 ++-- + drivers/pwm/pwm-cros-ec.c | 8 ++- + drivers/pwm/pwm-dwc.c | 6 +- + drivers/pwm/pwm-fsl-ftm.c | 18 +++--- + drivers/pwm/pwm-hibvt.c | 6 +- + drivers/pwm/pwm-img.c | 15 +++-- + drivers/pwm/pwm-imx-tpm.c | 8 ++- + drivers/pwm/pwm-imx27.c | 8 ++- + drivers/pwm/pwm-intel-lgm.c | 6 +- + drivers/pwm/pwm-iqs620a.c | 10 ++-- + drivers/pwm/pwm-jz4740.c | 20 +++---- + drivers/pwm/pwm-keembay.c | 6 +- + drivers/pwm/pwm-lpc18xx-sct.c | 2 +- + drivers/pwm/pwm-lpss.c | 6 +- + drivers/pwm/pwm-mediatek.c | 9 ++- + drivers/pwm/pwm-meson.c | 8 ++- + drivers/pwm/pwm-mtk-disp.c | 17 +++--- + drivers/pwm/pwm-pca9685.c | 13 +++-- + drivers/pwm/pwm-pxa.c | 58 ++++++++---------- + drivers/pwm/pwm-raspberrypi-poe.c | 8 ++- + drivers/pwm/pwm-rockchip.c | 12 ++-- + drivers/pwm/pwm-sifive.c | 11 +++- + drivers/pwm/pwm-sl28cpld.c | 8 ++- + drivers/pwm/pwm-sprd.c | 8 ++- + drivers/pwm/pwm-stm32-lp.c | 13 +++-- + drivers/pwm/pwm-stm32.c | 34 +++++------ + drivers/pwm/pwm-sun4i.c | 14 +++-- + drivers/pwm/pwm-sunplus.c | 6 +- + drivers/pwm/pwm-tegra.c | 15 ++++- + drivers/pwm/pwm-visconti.c | 6 +- + drivers/pwm/pwm-xilinx.c | 8 ++- + include/linux/pwm.h | 4 +- + include/trace/events/pwm.h | 20 +++---- + 42 files changed, 299 insertions(+), 229 deletions(-) +Merging userns/for-next (05bd6e0242b4 Merge of unpriv-ipc-sysctls-for-v6.2, and fix-atomic_lock_inc_below-for-v6.2 for testing in linux-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git userns/for-next +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++--- + ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++-- + ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++ + kernel/ucount.c | 16 ++++++------- + 4 files changed, 89 insertions(+), 14 deletions(-) +Merging ktest/for-next (88a51b4f2e65 ktest.pl: Add shell commands to variables) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (d5ba85d6d8be selftests/ftrace: Use long for synthetic event probe test) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (054be257f28c Documentation: dev-tools: Clarify requirements for result description) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Already up to date. +Merging livepatching/for-next (cad81ab73997 Merge branch 'for-6.2/core' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching livepatching/for-next +Merge made by the 'ort' strategy. +Merging rtc/rtc-next (e88f319a2546 rtc: ds1742: use devm_platform_get_and_ioremap_resource()) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Auto-merging drivers/rtc/Kconfig +Auto-merging drivers/rtc/Makefile +Merge made by the 'ort' strategy. + .../bindings/rtc/amlogic,meson6-rtc.yaml | 62 +++ + .../devicetree/bindings/rtc/haoyu,hym8563.txt | 30 -- + .../devicetree/bindings/rtc/haoyu,hym8563.yaml | 56 +++ + .../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 16 +- + .../devicetree/bindings/rtc/rtc-m41t80.txt | 39 -- + .../devicetree/bindings/rtc/rtc-meson.txt | 35 -- + .../devicetree/bindings/rtc/st,m41t80.yaml | 73 +++ + drivers/rtc/Kconfig | 12 +- + drivers/rtc/Makefile | 1 - + drivers/rtc/class.c | 4 +- + drivers/rtc/interface.c | 2 +- + drivers/rtc/rtc-abx80x.c | 37 +- + drivers/rtc/rtc-at91rm9200.c | 2 +- + drivers/rtc/rtc-bq32k.c | 1 + + drivers/rtc/rtc-cmos.c | 378 +++++++-------- + drivers/rtc/rtc-cros-ec.c | 35 +- + drivers/rtc/rtc-davinci.c | 512 --------------------- + drivers/rtc/rtc-ds1302.c | 6 - + drivers/rtc/rtc-ds1307.c | 4 +- + drivers/rtc/rtc-ds1347.c | 2 +- + drivers/rtc/rtc-ds1742.c | 3 +- + drivers/rtc/rtc-efi.c | 2 + + drivers/rtc/rtc-fsl-ftm-alarm.c | 7 +- + drivers/rtc/rtc-isl12022.c | 94 ++++ + drivers/rtc/rtc-isl1208.c | 6 +- + drivers/rtc/rtc-m41t80.c | 13 +- + drivers/rtc/rtc-msc313.c | 12 +- + drivers/rtc/rtc-mxc_v2.c | 4 +- + drivers/rtc/rtc-nct3018y.c | 5 +- + drivers/rtc/rtc-pcf2127.c | 22 +- + drivers/rtc/rtc-pcf85063.c | 10 +- + drivers/rtc/rtc-pcf8523.c | 20 +- + drivers/rtc/rtc-pcf8563.c | 2 + + drivers/rtc/rtc-pic32.c | 8 +- + drivers/rtc/rtc-pm8xxx.c | 1 - + drivers/rtc/rtc-rk808.c | 47 +- + drivers/rtc/rtc-rs5c313.c | 6 +- + drivers/rtc/rtc-rs5c372.c | 13 +- + drivers/rtc/rtc-rv3028.c | 13 +- + drivers/rtc/rtc-rv3029c2.c | 1 + + drivers/rtc/rtc-rv8803.c | 30 +- + drivers/rtc/rtc-rx6110.c | 2 +- + drivers/rtc/rtc-rx8025.c | 7 +- + drivers/rtc/rtc-rzn1.c | 4 +- + drivers/rtc/rtc-s35390a.c | 6 +- + drivers/rtc/rtc-s3c.c | 11 +- + drivers/rtc/rtc-snvs.c | 16 +- + drivers/rtc/rtc-st-lpc.c | 1 + + drivers/rtc/sysfs.c | 1 + + 49 files changed, 674 insertions(+), 1000 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/amlogic,meson6-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/haoyu,hym8563.txt + create mode 100644 Documentation/devicetree/bindings/rtc/haoyu,hym8563.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-m41t80.txt + delete mode 100644 Documentation/devicetree/bindings/rtc/rtc-meson.txt + create mode 100644 Documentation/devicetree/bindings/rtc/st,m41t80.yaml + delete mode 100644 drivers/rtc/rtc-davinci.c +Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (1a3f7484e076 NTB: ntb_transport: fix possible memory leak while device_register() fails) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/pci/endpoint/functions/pci-epf-vntb.c +Merge made by the 'ort' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 7 ++++++- + drivers/ntb/hw/idt/ntb_hw_idt.c | 7 ++++++- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 7 ++++++- + drivers/ntb/ntb_transport.c | 2 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + + 5 files changed, 20 insertions(+), 4 deletions(-) +Merging seccomp/for-next/seccomp (b9069728a70c seccomp: document the "filter_count" field) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging cisco/for-next (9e98c678c2d6 Linux 5.1-rc1) +$ git merge -m Merge branch 'for-next' of https://github.com/daniel-walker/cisco-linux.git cisco/for-next +Already up to date. +Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (94c40c9882f1 slimbus: qcom-ngd: Add check for platform_driver_register) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Auto-merging drivers/slimbus/qcom-ngd-ctrl.c +Merge made by the 'ort' strategy. + drivers/slimbus/qcom-ngd-ctrl.c | 5 ++++- + 1 file changed, 4 insertions(+), 1 deletion(-) +Merging nvmem/for-next (18133a57a935 dt-bindings: nvmem: add YAML schema for the ONIE tlv layout) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging drivers/nvmem/u-boot-env.c +Merge made by the 'ort' strategy. + drivers/nvmem/u-boot-env.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging xarray/main (69cb69ea5542 ida: Remove assertions that an ID was allocated) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Merge made by the 'ort' strategy. + lib/idr.c | 14 ++++---------- + 1 file changed, 4 insertions(+), 10 deletions(-) +Merging hyperv/hyperv-next (32c97d980e2e x86/hyperv: Remove unregister syscore call from Hyper-V cleanup) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (ddf75a86aba2 auxdisplay: hd44780: Fix potential memory leak in hd44780_remove()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Merge made by the 'ort' strategy. + drivers/auxdisplay/hd44780.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (094226ad94f4 Linux 6.1-rc5) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (5562c6a9657e bus: mhi: host: pci_generic: Add definition for some VIDs) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (80c2fe022ef5 memblock tests: remove completed TODO item) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Already up to date. +Merging init/init-user-pointers (38b082236e77 initramfs: use vfs_utimes in do_copy) +$ git merge -m Merge branch 'init-user-pointers' of git://git.infradead.org/users/hch/misc.git init/init-user-pointers +Already up to date. +Merging cxl/next (f04facfb993d cxl/region: Fix memdev reuse check) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging folio-iomap/folio-iomap (4d7bd0eb72e5 iomap: Inline __iomap_zero_iter into its caller) +$ git merge -m Merge branch 'folio-iomap' of git://git.infradead.org/users/willy/linux.git folio-iomap/folio-iomap +Already up to date. +Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (c2530a04a73e arm64: efi: Account for the EFI runtime stack in stack unwinder) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging arch/arm64/include/asm/stacktrace.h +Auto-merging arch/arm64/kernel/stacktrace.c +CONFLICT (content): Merge conflict in arch/arm64/kernel/stacktrace.c +Resolved 'arch/arm64/kernel/stacktrace.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bb0f3b708074] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git +$ git diff -M --stat --summary HEAD^.. + arch/arm64/include/asm/efi.h | 5 +++++ + arch/arm64/include/asm/stacktrace.h | 15 +++++++++++++++ + arch/arm64/kernel/efi.c | 3 ++- + arch/arm64/kernel/stacktrace.c | 12 ++++++++++++ + 4 files changed, 34 insertions(+), 1 deletion(-) +Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/for-next (dc19745ad0e4 Merge branch 'slub-tiny-v1r6' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Already up to date. +Merging random/master (1ca06f1c1ace Merge tag 'xtensa-20221213' of https://github.com/jcmvbkbc/linux-xtensa) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (4dd6da345ac2 landlock: Explain file descriptor access rights) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Merge made by the 'ort' strategy. + Documentation/security/landlock.rst | 34 +++++++++++++++++++++++++++++++--- + 1 file changed, 31 insertions(+), 3 deletions(-) +Merging rust/rust-next (b9ecf9b9ac59 rust: types: add `Opaque` type) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging sysctl/sysctl-next (0dff89c4488f sched: Move numa_balancing sysctls to its own file) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Already up to date. +Merging folio/for-next (03b33c09ea22 fs: remove the NULL get_block case in mpage_writepages) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git folio/for-next +Auto-merging Documentation/filesystems/locking.rst +Auto-merging Documentation/filesystems/vfs.rst +Auto-merging block/fops.c +Auto-merging block/partitions/core.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_userptr.c +Auto-merging drivers/misc/vmw_balloon.c +Auto-merging drivers/virtio/virtio_balloon.c +Auto-merging fs/aio.c +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/buffer.c +Auto-merging fs/ext2/dir.c +Auto-merging fs/ext2/inode.c +Auto-merging fs/ext2/namei.c +Auto-merging fs/ext2/super.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/f2fs/checkpoint.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/node.c +Auto-merging fs/gfs2/aops.c +Auto-merging fs/gfs2/lops.c +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/hugetlbfs/inode.c +CONFLICT (content): Merge conflict in fs/hugetlbfs/inode.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/jfs/inode.c +Auto-merging fs/mpage.c +Auto-merging fs/nfs/file.c +Auto-merging fs/nfs/internal.h +Auto-merging fs/nfs/write.c +Auto-merging fs/ntfs/aops.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ocfs2/aops.c +Auto-merging fs/ocfs2/refcounttree.c +Auto-merging fs/squashfs/file.c +Auto-merging fs/ubifs/file.c +Auto-merging fs/xfs/xfs_aops.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/buffer_head.h +Auto-merging include/linux/fs.h +Auto-merging include/linux/iomap.h +Auto-merging include/linux/migrate.h +CONFLICT (content): Merge conflict in include/linux/migrate.h +Auto-merging include/linux/page-flags.h +Auto-merging include/linux/pagemap.h +Auto-merging mm/compaction.c +Auto-merging mm/folio-compat.c +Auto-merging mm/ksm.c +Auto-merging mm/migrate.c +CONFLICT (content): Merge conflict in mm/migrate.c +Auto-merging mm/migrate_device.c +CONFLICT (content): Merge conflict in mm/migrate_device.c +Auto-merging mm/secretmem.c +Auto-merging mm/shmem.c +Auto-merging mm/swap_state.c +Auto-merging mm/util.c +Auto-merging mm/z3fold.c +Auto-merging mm/zsmalloc.c +CONFLICT (content): Merge conflict in mm/zsmalloc.c +Resolved 'fs/hugetlbfs/inode.c' using previous resolution. +Resolved 'include/linux/migrate.h' using previous resolution. +Resolved 'mm/migrate.c' using previous resolution. +Resolved 'mm/migrate_device.c' using previous resolution. +Resolved 'mm/zsmalloc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 87085b8fa92e] Merge branch 'for-next' of git://git.infradead.org/users/willy/pagecache.git +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/disk-io.c | 19 ++++++++----------- + 1 file changed, 8 insertions(+), 11 deletions(-) +Merging execve/for-next/execve (6a46bf558803 binfmt_misc: fix shift-out-of-bounds in check_special_flags) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (2386459394d2 lib/cpumask: update comment for cpumask_local_spread()) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/eq.c +Auto-merging include/linux/nodemask.h +Merge made by the 'ort' strategy. + drivers/net/ethernet/mellanox/mlx5/core/eq.c | 18 ++- + include/asm-generic/bitsperlong.h | 12 ++ + include/linux/bitmap.h | 46 ++++---- + include/linux/cpumask.h | 164 +++++++++++++++------------ + include/linux/find.h | 118 +++++++++++-------- + include/linux/nodemask.h | 86 +++++++------- + include/linux/topology.h | 33 ++++++ + kernel/sched/topology.c | 90 +++++++++++++++ + lib/cpumask.c | 52 +++++---- + lib/find_bit.c | 9 ++ + lib/test_bitmap.c | 23 +++- + 11 files changed, 438 insertions(+), 213 deletions(-) +Merging hte/for-next (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (d6a9fb87e9d1 security: Restrict CONFIG_ZERO_CALL_USED_REGS to gcc or clang > 15.0.6) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git kspp/for-next/kspp +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-kernel-warn_count | 2 +- + drivers/misc/lkdtm/cfi.c | 6 ++++- + security/Kconfig.hardening | 3 +++ + security/loadpin/loadpin.c | 30 ++++++++++++++--------- + 4 files changed, 27 insertions(+), 14 deletions(-) +Merging kspp-gustavo/for-next/kspp (0811296c55b7 exportfs: Replace zero-length array with DECLARE_FLEX_ARRAY() helper) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging drivers/net/can/usb/etas_es58x/es58x_core.h +Auto-merging include/linux/exportfs.h +Auto-merging include/linux/memremap.h +Merge made by the 'ort' strategy. + include/linux/exportfs.h | 2 +- + include/linux/memremap.h | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging iommufd/for-next (d6c55c0a20e5 iommufd: Change the order of MSI setup) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. +Merging mm-stable/mm-stable (8fa590bf3448 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (8fa590bf3448 Merge tag 'for-linus' of git://git.kernel.org/pub/scm/virt/kvm/kvm) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm/mm-everything (1d63c4bab97c Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging MAINTAINERS +Auto-merging fs/gfs2/glops.c +Auto-merging fs/gfs2/meta_io.c +Auto-merging include/linux/mm.h +Auto-merging lib/Kconfig.debug +Auto-merging mm/mempolicy.c +Auto-merging mm/mprotect.c +Auto-merging mm/userfaultfd.c +Merge made by the 'ort' strategy. + CREDITS | 4 + + Documentation/fault-injection/fault-injection.rst | 65 ++++ + Documentation/mm/highmem.rst | 41 ++- + MAINTAINERS | 6 +- + arch/alpha/kernel/process.c | 2 +- + arch/alpha/kernel/smp.c | 4 +- + arch/x86/include/asm/pgtable.h | 24 +- + fs/buffer.c | 54 ++-- + fs/gfs2/glops.c | 2 +- + fs/gfs2/log.c | 2 +- + fs/gfs2/meta_io.c | 2 +- + fs/hfs/bnode.c | 1 + + fs/jbd2/commit.c | 8 +- + fs/jbd2/journal.c | 2 +- + fs/mpage.c | 2 +- + fs/nilfs2/btnode.c | 2 +- + fs/nilfs2/btree.c | 2 +- + fs/nilfs2/gcinode.c | 2 +- + fs/nilfs2/mdt.c | 4 +- + fs/nilfs2/segment.c | 2 +- + fs/reiserfs/journal.c | 4 +- + fs/reiserfs/tail_conversion.c | 2 +- + include/asm-generic/error-injection.h | 7 +- + include/asm-generic/hugetlb.h | 16 +- + include/linux/buffer_head.h | 5 +- + include/linux/error-injection.h | 2 +- + include/linux/mm.h | 16 - + include/linux/pid_namespace.h | 19 ++ + include/uapi/linux/fcntl.h | 1 + + include/uapi/linux/memfd.h | 4 + + kernel/pid_namespace.c | 5 + + kernel/pid_sysctl.h | 59 ++++ + lib/Kconfig.debug | 2 +- + lib/error-inject.c | 2 +- + lib/fault-inject.c | 22 +- + lib/maple_tree.c | 2 +- + mm/gup_test.c | 4 +- + mm/huge_memory.c | 8 +- + mm/hugetlb.c | 345 ++++++++++------------ + mm/internal.h | 19 ++ + mm/kmemleak.c | 131 ++++---- + mm/kmsan/hooks.c | 1 + + mm/kmsan/kmsan_test.c | 1 + + mm/ksm.c | 8 +- + mm/memfd.c | 56 +++- + mm/memory.c | 25 +- + mm/mempolicy.c | 1 + + mm/mprotect.c | 14 +- + mm/page_io.c | 1 - + mm/shmem.c | 6 + + mm/swapfile.c | 20 +- + mm/userfaultfd.c | 18 +- + tools/testing/radix-tree/maple.c | 5 +- + tools/testing/selftests/memfd/fuse_test.c | 1 + + tools/testing/selftests/memfd/memfd_test.c | 341 ++++++++++++++++++++- + 55 files changed, 983 insertions(+), 421 deletions(-) + create mode 100644 kernel/pid_sysctl.h +$ git am -3 ../patches/0001-Revert-docs-fault-injection-add-requirements-of-erro.patch +Applying: Revert "docs: fault-injection: add requirements of error injectable functions" +$ git am -3 ../patches/0002-Revert-error-injection-remove-EI_ETYPE_NONE.patch +Applying: Revert "error-injection: remove EI_ETYPE_NONE" +$ git am -3 ../patches/0001-Revert-selftests-memfd-add-tests-for-MFD_NOEXEC_SEAL.patch +Applying: Revert "selftests/memfd: add tests for MFD_NOEXEC_SEAL MFD_EXEC" +$ git am -3 ../patches/0002-Revert-mm-memfd-Add-write-seals-when-apply-SEAL_EXEC.patch +Applying: Revert "mm/memfd: Add write seals when apply SEAL_EXEC to executable memfd" +$ git am -3 ../patches/0003-Revert-mm-memfd-add-MFD_NOEXEC_SEAL-and-MFD_EXEC.patch +Applying: Revert "mm/memfd: add MFD_NOEXEC_SEAL and MFD_EXEC" diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..e97c890e7915 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20221216 |