diff options
| author | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-01-16 15:15:06 +1100 |
|---|---|---|
| committer | Stephen Rothwell <sfr@canb.auug.org.au> | 2023-01-16 15:15:06 +1100 |
| commit | c12e2e5b76b2e739ccdf196bee960412b45d5f85 (patch) | |
| tree | 2d5624a4b467e2a307414006a20de7203bbf6d0e | |
| parent | 5d2e1943d3df9a82ad954ee2e0d97d51a4b2dfcd (diff) | |
Add linux-next specific files for 20230116next-20230116
Signed-off-by: Stephen Rothwell <sfr@canb.auug.org.au>
| -rw-r--r-- | Next/SHA1s | 356 | ||||
| -rw-r--r-- | Next/Trees | 358 | ||||
| -rw-r--r-- | Next/merge.log | 9384 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 10099 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..28c519a9fc59 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,356 @@ +Name SHA1 +---- ---- +origin 5dc4c995db9eb45f6373a956eb1f69460e69e6d4 +fixes 9c9155a3509a2ebdb06d77c7a621e9685c802eac +mm-hotfixes 6ffcf6252f32e9221dcc21e01622cafc2c06e1a7 +kbuild-current aedee9e8d9224de35081e73e63333a402907c53c +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 3cb0f23039e0e3395a96e0f52bd69910ced2f720 +arm64-fixes 68a63a412d18bd2e2577c8928139f92541afa7a6 +arm-soc-fixes 45c734817847e580163d85635fb4ea442056d489 +davinci-current 1b929c02afd37871d5afb9d498426f83432e71c2 +drivers-memory-fixes cb8fd6f75775165390ededea8799b60d93d9fe3e +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current 553b20b211c4153f8af6096fd52069bbdf955e23 +powerpc-fixes f12cd06109f47c2fb4b23a45ab55404c47ef7fae +s390-fixes 1ecf7bd9c267ab85aff3c4a17fe56bc9754a13be +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current ccd30a476f8e864732de220bd50e6f372f5ebcab +net a22b7388d658ecfcd226600c8c34ce4481e88655 +bpf e4f4db47794c9f474b184ee1418f42e6a07412b6 +ipsec b0355dbbf13c0052931dd14c38c789efed64d3de +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs 696e1a48b1a1b01edad542a1ef293665864a4dd0 +wireless f216033d770f7ca0eda491fe01a9f02e7af59576 +rdma-fixes b3deec25847bda34e34d5d7be02f633caf000bd8 +sound-current 56b88b50565cd8b946a2d00b0c83927b7ebb055e +sound-asoc-fixes f89d783d68dcc6b2ce4fe3bda972ae0f84df0dca +regmap-fixes f309b44844bd1785171b6a7dd66568e27dee8c4b +regulator-fixes f528fe213a6ad21a6e8644dbd5de10dc264a89fd +spi-fixes 50028988403ab8e031093655af9c6919ecba3aa6 +pci-current fd3a8cff4d4a4acb0af49dd947c822717c053cf7 +driver-core.current b7bfaa761d760e72a969d116517eaa12e404c262 +tty.current b7bfaa761d760e72a969d116517eaa12e404c262 +usb.current b7bfaa761d760e72a969d116517eaa12e404c262 +usb-serial-fixes 8a43bf34c8629622c8470ec6317ca3b56a38d205 +phy b574baa64cf84e7793fe79f4491ae36c16e65a0b +staging.current b7bfaa761d760e72a969d116517eaa12e404c262 +iio-fixes eb50cd5bfdac61627a5026566cf3b90ced7b141c +counter-current 1b929c02afd37871d5afb9d498426f83432e71c2 +char-misc.current b7bfaa761d760e72a969d116517eaa12e404c262 +soundwire-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +thunderbolt-fixes 84ee211c83212f4d35b56e0603acdcc41f860f1b +input-current 3c44e2b6cde674797b76e76d3a903a63ce8a18bb +crypto-current 736f88689c6912f05d0116917910603a7ba97de7 +vfio-fixes 895c0747f726bb50c9b7a805613a61d1b6f9fa06 +kselftest-fixes 9fdaca2c1e157dc0a3c0faecf3a6a68e7d8d0c7b +modules-fixes da35048f2600633a7f9ba5fa7d6e3b1d0195938b +dmaengine-fixes f96a483f8e131de50ebf30589ffba1a4f6bd12f7 +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes c0f7ae27539fbac267384a7bfc58296ea7550d52 +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes 542d3c03fd895eb8370992293498332ea383a3b9 +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +at91-fixes 9bfa2544dbd1133f0b0af4e967de3bb9c1e3a497 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes 310bc39546a435c83cc27a0eba878afac0d74714 +kvms390-fixes 0dd4cdccdab3d74bd86b868768a7dca216bcce7e +hwmon-fixes 2fbb848b65cde5b876cce52ebcb34de4aaa5a94a +nvdimm-fixes 472faf72b33d80aa8e7a99c9410c1a23d3bf0cd8 +cxl-fixes 2ec1b17f745b08526220f3c169d2eb9799a9be39 +btrfs-fixes 41a230615a6b1040d215c1ee2b48dc4c4eaab49e +vfs-fixes 9c7417b5ec440242bb5b64521acd53d4e19130c1 +dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6 +drivers-x86-fixes fde5f74ccfc771941b018b5415fa9664426e10ad +samsung-krzk-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +pinctrl-samsung-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +devicetree-fixes 064e32dc5b03114d0767893fecdaf7b5dfd8c286 +dt-krzk-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +scsi-fixes 84ed64b1a7a7fcd507598dee7708c1f225123711 +drm-fixes e695bc7e542358978434c8489a5a164d2bbefae8 +drm-intel-fixes 58fc14e14d288d728bf48377b81bb77fd17bfe3f +mmc-fixes 8509419758f2cc28dd05370385af0d91573b76b4 +rtc-fixes 51b3802e79606b2326f4a8cac0f2766a2e15338b +gnss-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +hyperv-fixes 25c94b051592c010abe92c85b0485f1faedc83f3 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes b9b916aee6715cd7f3318af6dc360c4729417b94 +riscv-dt-fixes 43d5f5d63699724d47f0d9e0eae516a260d232b4 +riscv-soc-fixes 730892135b7db8260195a31a676ef28e0972fe48 +fpga-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +spdx 1b929c02afd37871d5afb9d498426f83432e71c2 +gpio-brgl-fixes 694175cd8a1643cde3acb45c9294bca44a8e08e9 +gpio-intel-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +pinctrl-intel-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +erofs-fixes 35626ac92db0300691a60c8061da2146c0943ba3 +kunit-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +ubifs-fixes 7bdd6967fec5dda9c828ba5050a9f91540f59749 +memblock-fixes 115d9d77bb0f9152c60b6e8646369fa7f6167593 +cel-fixes 7c24fa225081f31bc6da6a355c1ba801889ab29a +irqchip-fixes 6c9f7434159b96231f5b27ab938f4766e3586b48 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current c757fc92a3f73734872c7793b97f06434773d65d +efi-fixes 8118d6171a5f68caa56b3f4af6f49cf7ad481f41 +zstd-fixes 8cbf4bb547b763643a68f674b742d2fe063de918 +battery-fixes d137900f237ad41cf432f1e09c6ee3e584146757 +uml-fixes bd71558d585ac61cfd799db7f25e78dca404dd7a +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +rust-fixes b7bfaa761d760e72a969d116517eaa12e404c262 +drm-misc-fixes 83a7f8e4899fb4cd77c787a3373f3e82b49a080f +kbuild 83344be3eb46da045c4716f1d96b3f04692a874d +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf 69b41ac87e4a664de78a395ff97166f0b2943210 +compiler-attributes 6cf1ab89c9e75ed8f3432563c212d688b6d3563b +dma-mapping 3622b86f49f84e52fb41fee9eb55f9290613dfc3 +asm-generic 32975c491ee410598b33201344c123fcc81a7c33 +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm 28ee13271c06dd82192565bcfd88413a2557aaa4 +arm64 aaf846bef4e0c9998e653cfaf2d5bcccda6eea26 +arm-perf 4361251cef466839795691e2628285e3f5093a98 +arm-soc 94ac29dc59d029c6ff61509e3b58fa0beb1f2966 +amlogic 340433d89d1ee801a246b5f3297cd026930131af +asahi-soc 1b929c02afd37871d5afb9d498426f83432e71c2 +aspeed 45c86167addee931ef0f6f541b2f59e151991bd6 +at91 dac8e2394ccc492e5b93ff9a89933cf9f70786bc +broadcom 64610429f8deb8cbed9aac62ecd054934c461608 +davinci eaafab7e8e268c18a66e6dfbd5ecea55a7a129c2 +drivers-memory 13f35b3c72f4075e13a974f439b20b9e26f8f243 +imx-mxs beb902cee34c902d1a96df67c74c592dac3639de +mediatek c7a343cf181199df22abda04855fb7f59471e807 +mvebu 80502ffab2fa92ba9777e381efea2efddc348d13 +omap 6435241fd536e18dfc9b844aace8fed0bffbdc6d +qcom 4166ff125e67f2725abe701997d14c35f4ec8a87 +renesas 1f57de01e0be7bd12dba400abd81d17840768a1b +reset 1b929c02afd37871d5afb9d498426f83432e71c2 +rockchip a488884a40ae40cff3f5681913e4f2635ec51477 +samsung-krzk 65ffd17e529d47e984840abf2872e0f5174f8721 +scmi 67cc475d3c42e6c406c0e02d58bea0ee9b74277d +stm32 3f5ea53d79778ef4e07ff0e2a4f7bbb5ad44ae59 +sunxi 7879da4e62f19471a919792c2e965de52c95c8b7 +tee 4a56b125ba20784fe2f24830019a369dd898c98a +tegra 1b929c02afd37871d5afb9d498426f83432e71c2 +ti 1b929c02afd37871d5afb9d498426f83432e71c2 +xilinx a7669037d43839f4305213f3f2da67bd4e45020f +clk 1b929c02afd37871d5afb9d498426f83432e71c2 +clk-imx 1b929c02afd37871d5afb9d498426f83432e71c2 +clk-renesas fbfd614aeaa2853c2c575299dfe2458db8eff67e +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 4a3ec00957fdf182be705d46e77acacc430f7d65 +loongarch 5535f4f70cfc15ef55b6ea7c7e17337b17337cb6 +m68k 553b20b211c4153f8af6096fd52069bbdf955e23 +m68knommu 8fbf1bb2410e6f1c9785d4616d27c2eb0b8c08e3 +microblaze 5cfe469c2654c3a4dda8504b1209abdd8b379e95 +mips 88603b6dc419445847923fcb7fe5080067a30f98 +openrisc 34a0bac084e49324c29e6d0984d24096e02c6314 +parisc-hd 32125c5c95f2086e7069969dbc6d55907071adb1 +powerpc 53ab112a95086d10dc353ea4f979abb01644bbb6 +powerpc-objtool 1b929c02afd37871d5afb9d498426f83432e71c2 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v b07de94d4501c61a3015cb0035227e449c51d87e +riscv-dt 093ee97e24f8555fbe678a20401de91fcd305ce4 +riscv-soc 6635e91648ce0868481fd6dd591d5ac796d8a635 +s390 81927e347be0d000a3f4709ed1fc702d2f2bff48 +uml 43ee0357e15b0cfd0a9e331494ef88c92fadac7d +xtensa 4414c1f5c7a375eaa108676a56e12cc8234eb647 +pidfd 6a857ab5b57cdeb16d7ea75591a0ae3c6ec0750a +vfs-idmapping 4e1da8fe031303599e78f88e0dad9f44272e4f99 +fscrypt 41952551acb405080726aa38a8a7ce317d9de4bb +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs a9eb558a5bea66cc43950632f5fffec6b5795233 +btrfs ea8846a3a63f90dcef2453dbd90afcf894045503 +ceph 8e1858710d9a71d88acd922f2e95d1eddb90eea0 +cifs ee3ba46152557231f547d052ffcb12029737836d +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs c1cc2db216078f9b1e29c991b1b9177c26757162 +erofs b7bfaa761d760e72a969d116517eaa12e404c262 +exfat ef85ccafff6a73d316f40a96d8bb4acfbcd8dd1f +ext3 1fb40763a58c1f8130c0131c624060c6bbb929b8 +ext4 1da18e38cb97e9521e93d63034521a9649524f64 +f2fs 7a2b15cfa8dbbd54beb4e2ce7b2f42eb0ad00425 +fsverity db85d14dc5c566879a01c4928b2f6f4d5cf0f939 +fuse 1b0e94993dbe282b2a6b778c0f18ab96e5e86d0c +gfs2 6b46a06100dd0e0ebe400573e94ccd09163bfd5b +jfs a60dca73a1a8079d867b2c2e9549440346c1ba83 +ksmbd 83dcedd5540d4ac61376ddff5362f7d9f866a6ec +nfs 5dc4c995db9eb45f6373a956eb1f69460e69e6d4 +nfs-anna 7e8436728e22181c3f12a5dbabd35ed3a8b8c593 +nfsd 24b868a84f6e630a3d4cdba812903d78a837df4b +ntfs3 57c94236401b8a918b1153f2dfc68f077481bd97 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 637d13b57d853dfc7f5743dfdfb9995c266a6031 +ubifs 8d0960731a26abae7b3479b5c7dd2a23cf622718 +v9fs 1a4f69ef15ec29b213e2b086b2502644e8ef76ee +xfs 601a27ea09a317d0fe2895df7d875381fb393041 +zonefs 6bac30bb8ff8195cbcfc177b3b6b0732929170c1 +iomap f1bd37a4735286585751dbd9db330b48525cb193 +djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763 +file-locks c65454a947263dfdf482076388aaed60af84ca2f +iversion 2b3319b355731c721dd43a2735e08737299e426a +vfs 557e0248a8a0e3d448ef1e92e6509ec56e21a981 +printk 146e448200be8cfa98418967eea67df520abefde +pci 1b929c02afd37871d5afb9d498426f83432e71c2 +pstore 88603b6dc419445847923fcb7fe5080067a30f98 +hid bd92d2065ad16ddc86ffeba0a7b0ffa5f1e80f26 +i2c 59b3484a571eacfa08aa0ac2d3cbfbfdbce0e892 +i3c e826acc18bc7bdf4278bf8928caa3a0cd4065432 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 774dccfe77dcd8cf1d82df1f61fe95a720dc76e4 +jc_docs 2d4e6fe22edbb4790a9782a43e18de98d7e25c84 +v4l-dvb 6599e683db1bf22fee74302c47e31b9a42a1c3d2 +v4l-dvb-next d4acfa22b634347be33d5906744366742fccd151 +pm 837dc62247d5e50a0724af2001f070962300c87e +cpufreq-arm 08f0adb193c008de640fde34a2e00a666c01d77c +cpupower 1b929c02afd37871d5afb9d498426f83432e71c2 +devfreq 497e92ab8c8ea709edd846ebb8907e784ed00bf5 +opp 67052d09900b77a42a17f642dd093acf1eade1ba +thermal 3a151494dc04c76add577ae66e8a04f900638aaf +dlm aa7f4a21f6e5b0fa256b4de0924fea506ad801ef +rdma 1ec82317a1daac78c04b0c15af89018ccf9fa2b7 +net-next 298bfe27d1127a8e41fbf668d3e4ce04fa7b1ecc +bpf-next dfff86f8eb6a23b1ba3f0c88d52bd85a443bb4f0 +ipsec-next 7e68dd7d07a28faa2e6574dd6b9dbd90cdeaae91 +mlx5-next 9b2e3723728efe03433be5c13b31da451d88ee3d +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next 60d86034b14eed902b3f2bea97d0c237cf2f9499 +bluetooth 7ed38304a6332c9e182fea91463bd1142877e568 +wireless-next d1c722867f8022a27182b9a1d84e9bca75486c9a +mtd a30144c02c84614ed160ab70e38fcf7b024a1bb0 +nand a2cfa6a24c61bf2178048397f6512ebb15e1ebfe +spi-nor 55398beb0846a9eca38db5250c9e7b3e59d407ca +crypto c970d42001f2dffd587cc38458fea4130796be43 +drm 03a0a1040895711e12c15ab28d4d1812928e171d +drm-misc da7faee2a15893596ae2da3fd2f719055070f74f +amdgpu dbc2309cac2a550a94357c31b3dacd69647a3f46 +drm-intel c52f523756608e52ab916fc62b537b90a027d3de +drm-tegra 08fef75f5e17c80cdb9ab56d65685cb43c8e44d3 +drm-msm d73b1d02de0858b96f743e1e8b767fb092ae4c1b +drm-msm-lumag 4102e58923f1941233e9785de801873a0f5cefb5 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 30527af2bed11a81afdbc70e999e290a27c86f26 +fbdev 88c6dda5f77cd2df8749ef62aa3d5661d97cc4e2 +regmap 861fa35db66c719bed12f41c663edcbdd11286fb +sound acdebd8b4c0c90ec3debe3def0460f07d27504bb +sound-asoc 2e60e59ce37f026850192ebcaf6003e316452528 +modules 4836b450b000381c472a09f7d9d271ba16abb5e1 +input 407da561244b9d51e6a794d6305ba38ec2c9d907 +block b0ebcbdf977b2d4d5489213b573f147213fd8b0f +device-mapper 7991dbff6849f67e823b7cc0c15e5a90b0549b9f +libata 38d431229bfbe175b41274faa856e5b0a1ebe70d +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc 1cb6f443cbdc260a8dae56c8f0d9d1c95eb467eb +mfd 153e461670b97d42225399aecadd838e7b7a941d +backlight 73516cbcf8d96834de57db32418fc62c320df3d3 +battery 4e9498b835ab31b83fc32fae4f77426f668010ac +regulator e44f08c1c68d60a41c2d25cd7b5e072a834877f5 +security 88603b6dc419445847923fcb7fe5080067a30f98 +apparmor 1b929c02afd37871d5afb9d498426f83432e71c2 +integrity b6018af440a07bd0d74b58c4e18045f4a8dbfe6b +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 88603b6dc419445847923fcb7fe5080067a30f98 +smack 1a3065e92046e57f60d7c9a48acae0d0badefe36 +tomoyo fa17087e244263627a01d6a9b76b8fdaf410de34 +tpmdd ceb626750358da0fc87e3cd546225e3fa9b88633 +watchdog 1b929c02afd37871d5afb9d498426f83432e71c2 +iommu 6a399c3b99eea8621f0f68fa07d95a348aff5e16 +audit 88603b6dc419445847923fcb7fe5080067a30f98 +devicetree 8ffbaa98ccf82383c9092cf3afa4d8512e52e612 +dt-krzk d3897e5e296e618230a1c763229778278d9f88fb +mailbox 53c60d1004270045d63cdee91aa77c145282d7e4 +spi 401b0e2570590240bbb108937103746e17ffef2c +tip df1bebcf81d63ba0a52d5cf42070beb085551f1f +clockevents 2eff537b37ca2c7f250350b2439c5542d7d3ae27 +edac fed431d5c33acebad42b98b6ef88a668b02a9046 +irqchip 6ed54e1789a29d3f1557454cc7d2eb9c10d1d37b +ftrace 14b7bc94a4f6fee3fcfba0177c697cba08cf18fc +rcu 5d8a515b71f0cce1376dfcf52fc20c4eda69b53c +kvm fc471e831016c1741f3e8042997969ace0b5a013 +kvm-arm 753d734f3f347e7fc49b819472bbf61dcfc1a16f +kvms390 bedac519eefac999c31468a2dc174768d47ad4fa +xen-tip f57034cedeb6e00256313a2a6ee67f974d709b0b +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues c63a2e52d5e08f01140d7b76c08a78e15e801f03 +drivers-x86 1b929c02afd37871d5afb9d498426f83432e71c2 +chrome-platform 961a325becd9a142ae5c8b258e5c2f221f8bfac8 +hsi 1b929c02afd37871d5afb9d498426f83432e71c2 +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 6e04532c0848fa0bf2d0d17ef75a6d7247072a60 +ipmi 041fae9c105ae342a4245cf1e0dc56a23fbb9d3c +driver-core 7bbb89b420d9e290cb34864832de8fcdf2c140dc +usb c2fb9a214da1efc3f8968daa795a1bbbf50cbfc8 +thunderbolt 953ff25fc9fb831a675259ce1e738c94fb6202b6 +usb-serial b7bfaa761d760e72a969d116517eaa12e404c262 +tty b7bfaa761d760e72a969d116517eaa12e404c262 +char-misc b7bfaa761d760e72a969d116517eaa12e404c262 +accel be5fff22e7873b2615ce19a7d8c45535161bb039 +coresight 9266af7545d4c7caa24ab27a537631559cfd5381 +fpga 3afe90d5b7a456033dd41b11a7d40cff479a48e1 +icc dbdbdf891e39abb154497e6f9b6d42955e2f316e +iio bfcae956d9b50ea0e221cefc171604c569017d7e +phy-next 43108bb2f34715b40535178ffceba88e5c7d0a0f +soundwire 545c365185a47672b1d5cc13c84057a1e874993c +extcon 2e85d0a0201d0cb466313ad434f7b25f14135300 +gnss 1b929c02afd37871d5afb9d498426f83432e71c2 +vfio 70be6f322860d322ebcd120cf0c05402ead5c6de +staging b7bfaa761d760e72a969d116517eaa12e404c262 +counter-next dfeef15e73ca22455c1dd51c0ebc477145081630 +mux ea327624ae52936b2c0eccffd9369983ca2d08e3 +dmaengine ab223bc0edd29d84dbdfaebcc142a108d0ae7d4f +cgroup 32a47817d07557ffca9992964c514fd79bda6fba +scsi 4be502c27dba8c0d451e550f71fab8e6061c78c3 +scsi-mkp 201e0a7c7f36ccb70b532e04ea2f48031f219e74 +vhost 66c78aa2b9ba0b1c504e15e636351f94b340fd1d +rpmsg f9721c6a43b63f6428e71b23a435f7f4f4e17af2 +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 06bbaa64908fcaa5051232ec5f9e5a6b1d083475 +gpio-intel 1b929c02afd37871d5afb9d498426f83432e71c2 +pinctrl 8f18c3f3e3ac73659929225820b2994af6cad17d +pinctrl-intel afa349bbb5d75e072e641234f1cb5d2264bd6ed0 +pinctrl-renesas 80d34260f36c6c55f03c3c33be4a11ec06202e98 +pinctrl-samsung 1b929c02afd37871d5afb9d498426f83432e71c2 +pwm 8fa22f4b88e877c0811d2a0e506cf56755add554 +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 88a51b4f2e65ca4378a81ff0925fad076e82e177 +kselftest 1b929c02afd37871d5afb9d498426f83432e71c2 +kunit 1b929c02afd37871d5afb9d498426f83432e71c2 +kunit-next 88603b6dc419445847923fcb7fe5080067a30f98 +livepatching cad81ab739979d3d628250e763eace86ad2514e5 +rtc 4cd0ca1fe9a79d81a001ff14f14035531773fe43 +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 1b929c02afd37871d5afb9d498426f83432e71c2 +ntb 1a3f7484e0763d10d9a75c3d8f9fbd351e1cacb2 +seccomp 0fb0624b15d21622c214617fda5c05a203b04564 +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus 1b929c02afd37871d5afb9d498426f83432e71c2 +nvmem ad80e15904ec66028ad17f63efacc8789fdfe94b +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv 26520c34e621aac035c2926a44226714cec02c7d +auxdisplay ddf75a86aba2cfb7ec4497e8692b60c8c8fe0ee7 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 1b929c02afd37871d5afb9d498426f83432e71c2 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi ccf27a84fe9a578c1cae9fc454bd784fe1716b31 +memblock 80c2fe022ef5d29f3bafee90c37dbcff18cab57a +cxl 589c3357370a596ef7c99c00baca8ac799fce531 +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi 2a5b4ccf0de17e47e9ad13ee0fda9436d5de0a35 +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 001aa6a1f0a0d32827e4dfbdce1ad7b81a47d9e4 +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock 366617a69e60610912836570546f118006ebc7cb +rust b9ecf9b9ac5969d7b7ea786ce5c76e24246df2c5 +sysctl 0dff89c4488f90c01807d9c12023433703206523 +folio 03b33c09ea22fa89dd204ad0a2058e512c691b9f +execve 88603b6dc419445847923fcb7fe5080067a30f98 +bitmap 2386459394d2a46964829a00c48a08a23ead94ed +hte 1b929c02afd37871d5afb9d498426f83432e71c2 +kspp e80c0e628e889c37bbbad74252e49fa8e4dc4040 +kspp-gustavo b942a520d9e43bc31f0808d2f2267a1ddba75518 +iommufd b062007c63eb4452f1122384e86d402531fb1d52 +mm-stable 12b98f333f6b4b582cc37d287db5bbdaf5e154e7 +mm-nonmm-stable 18e6340365eab44339a0aadab76c3d26a2406a72 +mm aaca8e59ba2b2e4cedc093bd650917bebe136271 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..4d342de38239 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,358 @@ +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-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git git://linuxtv.org/mchehab/media-next.git#fixes +reset-fixes git https://git.pengutronix.de/git/pza/linux#reset/fixes +mips-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-fixes +at91-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-fixes +omap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#fixes +kvm-fixes git git://git.kernel.org/pub/scm/virt/kvm/kvm.git#master +kvms390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git#master +hwmon-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon +nvdimm-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-fixes +cxl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#fixes +btrfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#next-fixes +vfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#fixes +dma-mapping-fixes git git://git.infradead.org/users/hch/dma-mapping.git#for-linus +drivers-x86-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#fixes +samsung-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#fixes +pinctrl-samsung-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#fixes +devicetree-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git#dt/linus +dt-krzk-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git#fixes +scsi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#fixes +drm-fixes git git://git.freedesktop.org/git/drm/drm.git#drm-fixes +drm-intel-fixes git git://anongit.freedesktop.org/drm-intel#for-linux-next-fixes +mmc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git#fixes +rtc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-fixes +gnss-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-linus +hyperv-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-fixes +soc-fsl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#fix +risc-v-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#fixes +riscv-dt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-fixes +riscv-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-fixes +fpga-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#fixes +spdx git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git#spdx-linus +gpio-brgl-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-current +gpio-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#fixes +pinctrl-intel-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#fixes +erofs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#fixes +kunit-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit-fixes +ubifs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#fixes +memblock-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#fixes +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 +rust-fixes git https://github.com/Rust-for-Linux/linux.git#rust-fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/core +compiler-attributes git https://github.com/ojeda/linux.git#compiler-attributes +dma-mapping git git://git.infradead.org/users/hch/dma-mapping.git#for-next +asm-generic git git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git#master +arc git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-next +arm git git://git.armlinux.org.uk/~rmk/linux-arm.git#for-next +arm64 git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/core +arm-perf git git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git#for-next/perf +arm-soc git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#for-next +amlogic git git://git.kernel.org/pub/scm/linux/kernel/git/amlogic/linux.git#for-next +asahi-soc git https://github.com/AsahiLinux/linux.git#asahi-soc/for-next +aspeed git git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git#for-next +at91 git git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git#at91-next +broadcom git https://github.com/Broadcom/stblinux.git#next +davinci git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-next +drivers-memory git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#for-next +imx-mxs git git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git#for-next +mediatek git git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git#for-next +mvebu git git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git#for-next +omap git git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git#for-next +qcom git git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git#for-next +renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#next +reset git https://git.pengutronix.de/git/pza/linux#reset/next +rockchip git git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git#for-next +samsung-krzk git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git#for-next +scmi git git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git#for-linux-next +stm32 git git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git#stm32-next +sunxi git git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git#sunxi/for-next +tee git https://git.linaro.org/people/jens.wiklander/linux-tee.git#next +tegra git git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git#for-next +ti git git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git#ti-next +xilinx git git://github.com/Xilinx/linux-xlnx.git#for-next +clk git git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git#clk-next +clk-imx git git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git#for-next +clk-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-clk +clk-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git#for-next +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +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 +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 +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 +leds-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +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..8008ce0d1b4d --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,9384 @@ +$ date -R +Mon, 16 Jan 2023 08:45:39 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at c757fc92a3f7 Merge tag 'spi-fix-v6.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi +Merging origin/master (5dc4c995db9e Linux 6.2-rc4) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating c757fc92a3f7..5dc4c995db9e +Fast-forward (no commit created; -m option ignored) + Documentation/arm64/silicon-errata.rst | 2 + + Documentation/conf.py | 12 +- + .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 11 + + .../bindings/display/msm/dsi-controller-main.yaml | 4 +- + .../bindings/display/msm/dsi-phy-10nm.yaml | 1 - + .../bindings/display/msm/dsi-phy-14nm.yaml | 1 - + .../bindings/display/msm/dsi-phy-28nm.yaml | 4 + + .../bindings/display/msm/qcom,qcm2290-mdss.yaml | 2 +- + .../bindings/display/msm/qcom,sm6115-mdss.yaml | 2 +- + .../sound/mt8186-mt6366-rt1019-rt5682s.yaml | 1 + + .../bindings/sound/qcom,lpass-tx-macro.yaml | 4 +- + .../bindings/sound/qcom,lpass-wsa-macro.yaml | 58 +- + Documentation/networking/rxrpc.rst | 4 +- + Documentation/sphinx/load_config.py | 6 +- + Documentation/virt/kvm/api.rst | 22 + + Documentation/virt/kvm/locking.rst | 25 +- + MAINTAINERS | 5 +- + Makefile | 2 +- + arch/arm64/Kconfig | 18 +- + arch/arm64/include/asm/atomic_ll_sc.h | 2 +- + arch/arm64/include/asm/atomic_lse.h | 2 +- + arch/arm64/include/asm/cputype.h | 4 + + arch/arm64/include/asm/esr.h | 9 + + arch/arm64/include/asm/hugetlb.h | 9 + + arch/arm64/include/asm/kvm_arm.h | 15 - + arch/arm64/include/asm/kvm_emulate.h | 42 +- + arch/arm64/include/asm/pgtable.h | 16 +- + arch/arm64/include/asm/uprobes.h | 2 +- + arch/arm64/kernel/cpu_errata.c | 7 + + arch/arm64/kernel/efi-rt-wrapper.S | 1 + + arch/arm64/kernel/elfcore.c | 61 +- + arch/arm64/kernel/fpsimd.c | 2 +- + arch/arm64/kernel/ptrace.c | 2 +- + arch/arm64/kernel/signal.c | 9 +- + arch/arm64/kvm/hyp/include/hyp/fault.h | 2 +- + arch/arm64/kvm/hyp/include/hyp/switch.h | 2 +- + arch/arm64/kvm/mmu.c | 21 +- + arch/arm64/kvm/sys_regs.c | 2 +- + arch/arm64/kvm/vgic/vgic-v3.c | 2 + + arch/arm64/mm/hugetlbpage.c | 21 + + arch/arm64/mm/mmu.c | 21 + + arch/arm64/tools/cpucaps | 1 + + arch/ia64/kernel/elfcore.c | 4 +- + arch/powerpc/boot/wrapper | 4 + + arch/powerpc/include/asm/imc-pmu.h | 2 +- + arch/powerpc/mm/book3s64/hash_utils.c | 2 +- + arch/powerpc/perf/imc-pmu.c | 136 ++-- + arch/s390/boot/decompressor.c | 4 +- + arch/s390/configs/debug_defconfig | 7 +- + arch/s390/configs/defconfig | 6 +- + arch/s390/configs/zfcpdump_defconfig | 2 +- + arch/s390/include/asm/cpu_mf.h | 31 +- + arch/s390/include/asm/debug.h | 6 +- + arch/s390/include/asm/percpu.h | 2 +- + arch/s390/kernel/machine_kexec_file.c | 5 +- + arch/s390/kernel/perf_cpum_sf.c | 101 +-- + arch/s390/kernel/vmlinux.lds.S | 4 + + arch/s390/kvm/interrupt.c | 12 +- + arch/x86/boot/bioscall.S | 4 +- + arch/x86/events/intel/cstate.c | 21 +- + arch/x86/events/intel/uncore.c | 1 + + arch/x86/events/msr.c | 3 + + arch/x86/include/asm/kvm_host.h | 1 + + arch/x86/kernel/cpu/resctrl/monitor.c | 49 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 12 +- + arch/x86/kvm/cpuid.c | 32 +- + arch/x86/kvm/svm/nested.c | 12 +- + arch/x86/kvm/xen.c | 90 +-- + arch/x86/mm/init.c | 4 + + arch/x86/mm/pat/memtype.c | 3 +- + arch/x86/pci/mmconfig-shared.c | 44 +- + arch/x86/um/elfcore.c | 4 +- + arch/x86/xen/p2m.c | 5 - + block/blk-core.c | 3 - + drivers/acpi/glue.c | 14 +- + drivers/acpi/resource.c | 7 + + drivers/acpi/scan.c | 7 +- + drivers/acpi/video_detect.c | 4 + + drivers/ata/Kconfig | 1 + + drivers/block/xen-blkback/xenbus.c | 4 +- + drivers/block/xen-blkfront.c | 3 +- + drivers/char/tpm/xen-tpmfront.c | 3 +- + drivers/cpufreq/amd-pstate.c | 1 + + drivers/cpufreq/apple-soc-cpufreq.c | 3 +- + drivers/cpufreq/armada-37xx-cpufreq.c | 2 +- + drivers/cpufreq/cppc_cpufreq.c | 11 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 2 + + drivers/cpufreq/qcom-cpufreq-hw.c | 22 +- + drivers/edac/edac_device.c | 17 +- + drivers/edac/edac_module.h | 2 +- + drivers/edac/highbank_mc_edac.c | 7 +- + drivers/firmware/efi/efi.c | 9 +- + drivers/firmware/efi/runtime-wrappers.c | 1 + + drivers/firmware/google/coreboot_table.c | 9 +- + drivers/firmware/google/coreboot_table.h | 1 + + drivers/firmware/psci/psci.c | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 8 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 6 - + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sync.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 2 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 9 + + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 8 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 1 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 1 + + drivers/gpu/drm/drm_buddy.c | 81 ++- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 6 + + drivers/gpu/drm/i915/gem/i915_gem_context.c | 24 +- + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 4 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 34 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 4 +- + drivers/gpu/drm/i915/i915_vma.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 15 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 7 + + drivers/gpu/drm/msm/adreno/a6xx_gpu.h | 1 + + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 10 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 3 +- + drivers/gpu/drm/msm/dp/dp_aux.c | 4 + + drivers/gpu/drm/msm/hdmi/hdmi.c | 12 +- + drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/msm/msm_mdss.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_fbcon.c | 613 ------------------ + drivers/gpu/drm/ttm/ttm_bo_util.c | 2 +- + drivers/gpu/drm/virtio/virtgpu_ioctl.c | 19 +- + drivers/gpu/drm/vmwgfx/ttm_object.c | 41 +- + drivers/gpu/drm/vmwgfx/ttm_object.h | 14 - + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 38 -- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 18 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 176 +++-- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 33 - + drivers/gpu/drm/xen/xen_drm_front.c | 3 +- + drivers/input/misc/xen-kbdfront.c | 5 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 4 +- + drivers/iommu/arm/arm-smmu/arm-smmu.c | 32 +- + drivers/iommu/iommu.c | 8 +- + drivers/iommu/iova.c | 4 +- + drivers/iommu/mtk_iommu_v1.c | 4 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 4 +- + .../ethernet/hisilicon/hns3/hns3vf/hclgevf_main.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 2 +- + drivers/net/ethernet/intel/ice/ice_gnss.c | 24 +- + drivers/net/ethernet/intel/igc/igc_defines.h | 2 + + drivers/net/ethernet/intel/igc/igc_ptp.c | 10 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 14 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 4 +- + drivers/net/ethernet/marvell/octeontx2/af/cgx.h | 1 - + .../net/ethernet/marvell/octeontx2/nic/otx2_vf.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 13 +- + .../ethernet/mellanox/mlx5/core/en/tc/act/police.c | 6 - + .../ethernet/mellanox/mlx5/core/en/tc/post_meter.c | 1 + + .../ethernet/mellanox/mlx5/core/en/tc_tun_vxlan.c | 2 + + .../ethernet/mellanox/mlx5/core/en_accel/macsec.c | 19 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 3 + + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 6 +- + .../ethernet/mellanox/mlx5/core/ipoib/ethtool.c | 16 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 38 ++ + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.h | 6 + + .../ethernet/mellanox/mlx5/core/ipoib/ipoib_vlan.c | 18 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 2 +- + .../ethernet/mellanox/mlx5/core/steering/dr_rule.c | 11 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 2 +- + .../net/ethernet/microchip/lan966x/lan966x_ptp.c | 3 + + .../ethernet/microchip/lan966x/lan966x_vcap_impl.c | 3 - + drivers/net/ethernet/realtek/r8169_main.c | 5 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 26 - + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 5 +- + drivers/net/ipa/data/ipa_data-v4.7.c | 2 +- + drivers/net/usb/cdc_ether.c | 6 + + drivers/net/usb/r8152.c | 1 + + .../net/wireless/broadcom/brcm80211/brcmfmac/of.c | 5 +- + drivers/net/xen-netback/xenbus.c | 3 +- + drivers/net/xen-netfront.c | 4 +- + drivers/nfc/pn533/usb.c | 44 +- + drivers/nvme/host/apple.c | 2 +- + drivers/nvme/host/ioctl.c | 110 ++-- + drivers/nvme/host/pci.c | 12 +- + drivers/pci/controller/dwc/Kconfig | 2 +- + drivers/pci/xen-pcifront.c | 4 +- + drivers/platform/surface/aggregator/controller.c | 4 +- + .../surface/aggregator/ssh_request_layer.c | 14 + + drivers/platform/x86/amd/pmc.c | 2 +- + drivers/platform/x86/asus-nb-wmi.c | 15 + + drivers/platform/x86/asus-wmi.c | 7 +- + drivers/platform/x86/asus-wmi.h | 1 + + drivers/platform/x86/dell/dell-wmi-privacy.c | 41 +- + drivers/platform/x86/ideapad-laptop.c | 6 + + .../platform/x86/intel/int3472/clk_and_regulator.c | 3 + + drivers/platform/x86/intel/int3472/discrete.c | 4 + + drivers/platform/x86/intel/pmc/core.c | 1 + + drivers/platform/x86/simatic-ipc.c | 3 +- + drivers/platform/x86/sony-laptop.c | 21 +- + drivers/platform/x86/thinkpad_acpi.c | 23 +- + drivers/platform/x86/touchscreen_dmi.c | 25 + + drivers/scsi/hisi_sas/hisi_sas_main.c | 4 +- + drivers/scsi/xen-scsifront.c | 4 +- + drivers/tty/hvc/hvc_xen.c | 50 +- + 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 | 7 +- + drivers/xen/xen-pciback/xenbus.c | 4 +- + drivers/xen/xen-scsiback.c | 4 +- + fs/afs/cmservice.c | 6 +- + fs/afs/rxrpc.c | 24 +- + fs/binfmt_elf.c | 4 +- + fs/binfmt_elf_fdpic.c | 4 +- + fs/cifs/cifsencrypt.c | 1 + + fs/cifs/connect.c | 9 +- + fs/cifs/dfs_cache.c | 1 - + fs/cifs/link.c | 1 + + fs/cifs/sess.c | 2 + + fs/cifs/smb1ops.c | 63 +- + fs/cifs/smb2pdu.c | 6 +- + include/acpi/acpi_bus.h | 3 +- + include/linux/elfcore.h | 8 +- + include/linux/mlx5/driver.h | 2 +- + include/linux/platform_data/x86/simatic-ipc.h | 3 +- + include/linux/tpm_eventlog.h | 4 +- + include/net/af_rxrpc.h | 3 +- + include/trace/events/rxrpc.h | 160 +++-- + include/uapi/linux/psci.h | 4 +- + include/xen/xenbus.h | 2 +- + init/Makefile | 1 + + io_uring/fdinfo.c | 12 +- + io_uring/io-wq.c | 7 +- + io_uring/poll.c | 48 +- + io_uring/rw.c | 6 +- + kernel/kallsyms_selftest.c | 21 +- + kernel/sched/core.c | 69 +- + kernel/time/tick-oneshot.c | 4 +- + kernel/time/time.c | 8 +- + kernel/time/timekeeping.c | 8 +- + lib/lockref.c | 1 - + mm/memblock.c | 8 +- + net/9p/trans_xen.c | 3 +- + net/core/gro.c | 5 +- + net/ipv6/raw.c | 4 + + net/rxrpc/Makefile | 1 + + net/rxrpc/af_rxrpc.c | 27 +- + net/rxrpc/ar-internal.h | 212 +++--- + net/rxrpc/call_accept.c | 57 +- + net/rxrpc/call_event.c | 86 ++- + net/rxrpc/call_object.c | 116 ++-- + net/rxrpc/call_state.c | 69 ++ + net/rxrpc/conn_client.c | 709 ++++++--------------- + net/rxrpc/conn_event.c | 382 ++++------- + net/rxrpc/conn_object.c | 67 +- + net/rxrpc/conn_service.c | 1 - + net/rxrpc/input.c | 175 ++--- + net/rxrpc/insecure.c | 20 +- + net/rxrpc/io_thread.c | 204 +++--- + net/rxrpc/local_object.c | 35 +- + net/rxrpc/net_ns.c | 17 - + net/rxrpc/output.c | 60 +- + net/rxrpc/peer_object.c | 23 +- + net/rxrpc/proc.c | 17 +- + net/rxrpc/recvmsg.c | 256 ++------ + net/rxrpc/rxkad.c | 356 +++++------ + net/rxrpc/rxperf.c | 17 +- + net/rxrpc/security.c | 53 +- + net/rxrpc/sendmsg.c | 195 +++--- + net/sched/act_mpls.c | 8 +- + net/sched/sch_api.c | 5 + + net/tipc/node.c | 12 +- + scripts/Makefile.vmlinux | 1 + + sound/core/control.c | 24 +- + sound/core/control_led.c | 5 +- + sound/pci/hda/cs35l41_hda.c | 20 +- + sound/pci/hda/patch_hdmi.c | 1 + + sound/pci/hda/patch_realtek.c | 55 +- + sound/soc/amd/yc/acp6x-mach.c | 14 + + sound/soc/codecs/rt9120.c | 12 + + sound/soc/codecs/wm8904.c | 7 + + sound/soc/fsl/fsl-asoc-card.c | 8 +- + sound/soc/fsl/fsl_micfil.c | 16 +- + sound/soc/fsl/fsl_ssi.c | 4 +- + sound/soc/intel/boards/Kconfig | 2 + + sound/soc/intel/boards/sof_nau8825.c | 31 +- + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 20 +- + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 50 ++ + sound/soc/mediatek/Kconfig | 4 +- + .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 22 +- + sound/soc/qcom/Kconfig | 21 +- + sound/soc/qcom/Makefile | 2 + + sound/soc/qcom/common.c | 114 ---- + sound/soc/qcom/common.h | 10 - + sound/soc/qcom/lpass-cpu.c | 5 +- + sound/soc/qcom/sc8280xp.c | 1 + + sound/soc/qcom/sdw.c | 123 ++++ + sound/soc/qcom/sdw.h | 18 + + sound/soc/qcom/sm8250.c | 1 + + sound/soc/sof/debug.c | 4 +- + sound/soc/sof/pm.c | 9 +- + sound/usb/implicit.c | 3 +- + sound/usb/pcm.c | 222 ++++--- + sound/usb/stream.c | 6 + + sound/xen/xen_snd_front.c | 3 +- + tools/include/nolibc/arch-mips.h | 2 + + tools/include/nolibc/arch-riscv.h | 14 +- + tools/include/nolibc/ctype.h | 3 + + tools/include/nolibc/errno.h | 3 + + tools/include/nolibc/signal.h | 3 + + tools/include/nolibc/stdio.h | 3 + + tools/include/nolibc/stdlib.h | 3 + + tools/include/nolibc/string.h | 8 +- + tools/include/nolibc/sys.h | 2 + + tools/include/nolibc/time.h | 3 + + tools/include/nolibc/types.h | 70 +- + tools/include/nolibc/unistd.h | 3 + + tools/objtool/check.c | 9 + + tools/testing/memblock/internal.h | 4 + + .../testing/selftests/net/af_unix/test_unix_oob.c | 2 +- + tools/testing/selftests/net/l2_tos_ttl_inherit.sh | 202 +++--- + virt/kvm/kvm_main.c | 7 + + 320 files changed, 4210 insertions(+), 3891 deletions(-) + delete mode 100644 drivers/gpu/drm/nouveau/nouveau_fbcon.c + create mode 100644 net/rxrpc/call_state.c + create mode 100644 sound/soc/qcom/sdw.c + create mode 100644 sound/soc/qcom/sdw.h +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 (6ffcf6252f32 Revert "mm/compaction: fix set skip in fast_find_migrateblock") +$ git merge -m Merge branch 'mm-hotfixes-unstable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-hotfixes/mm-hotfixes-unstable +Auto-merging .mailmap +Auto-merging MAINTAINERS +Auto-merging init/Kconfig +Merge made by the 'ort' strategy. + .mailmap | 1 + + Documentation/admin-guide/cgroup-v2.rst | 15 +- + Documentation/admin-guide/mm/zswap.rst | 4 +- + MAINTAINERS | 6 +- + fs/aio.c | 20 ++- + fs/nilfs2/btree.c | 15 +- + fs/userfaultfd.c | 28 +++- + include/linux/mm.h | 6 +- + include/linux/mm_inline.h | 3 +- + include/linux/mm_types.h | 2 +- + include/linux/page_ref.h | 2 +- + include/linux/swap.h | 3 +- + init/Kconfig | 2 +- + lib/maple_tree.c | 17 +- + lib/test_maple_tree.c | 89 ++++++++++ + lib/win_minmax.c | 2 +- + mm/compaction.c | 1 + + mm/hugetlb.c | 102 ++++++++---- + mm/kasan/report.c | 2 +- + mm/khugepaged.c | 30 ++-- + mm/ksm.c | 8 +- + mm/madvise.c | 2 +- + mm/memcontrol.c | 67 ++------ + mm/memory.c | 17 +- + mm/mmap.c | 8 +- + mm/mprotect.c | 8 +- + mm/nommu.c | 9 +- + mm/shmem.c | 6 +- + mm/swapfile.c | 20 ++- + mm/vmscan.c | 4 +- + mm/zsmalloc.c | 237 +++++++++++++++++++++++---- + tools/testing/selftests/proc/proc-empty-vm.c | 12 +- + tools/testing/selftests/proc/proc-pid-vm.c | 9 +- + 33 files changed, 534 insertions(+), 223 deletions(-) +Merging kbuild-current/fixes (aedee9e8d922 kconfig: Update all declared targets) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Auto-merging Makefile +Auto-merging init/Kconfig +Merge made by the 'ort' strategy. + Documentation/kbuild/makefiles.rst | 2 +- + Makefile | 15 ++++++++++++++- + init/Kconfig | 2 +- + init/version-timestamp.c | 1 - + scripts/kconfig/.gitignore | 2 +- + scripts/kconfig/Makefile | 2 +- + scripts/package/mkspec | 2 +- + 7 files changed, 19 insertions(+), 7 deletions(-) +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 (3cb0f23039e0 ARM: 9284/1: include <asm/pgtable.h> from proc-macros.S to fix -Wundef warnings) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Merge made by the 'ort' strategy. + arch/arm/mm/nommu.c | 2 +- + arch/arm/mm/proc-macros.S | 1 + + 2 files changed, 2 insertions(+), 1 deletion(-) +Merging arm64-fixes/for-next/fixes (68a63a412d18 arm64: Fix build with CC=clang, CONFIG_FTRACE=y and CONFIG_STACK_TRACER=y) +$ 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 (45c734817847 Merge tag 'arm-soc/for-6.2/drivers-fixes' of https://github.com/Broadcom/stblinux into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. + .../bindings/soc/qcom/qcom,apr-services.yaml | 5 +- + arch/arm/boot/dts/imx53-ppd.dts | 2 +- + arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 1 - + arch/arm/boot/dts/imx6ul-pico-dwarf.dts | 2 +- + arch/arm/boot/dts/imx7d-pico-dwarf.dts | 4 +- + arch/arm/boot/dts/imx7d-pico-nymph.dts | 4 +- + arch/arm/boot/dts/qcom-apq8084-ifc6540.dts | 20 +++--- + arch/arm/boot/dts/qcom-apq8084.dtsi | 4 +- + arch/arm/boot/dts/vf610-zii-dev-rev-b.dts | 2 +- + arch/arm/boot/dts/vf610-zii-dev-rev-c.dts | 2 +- + arch/arm/mach-footbridge/isa-rtc.c | 1 - + arch/arm/mach-imx/cpu-imx25.c | 1 + + arch/arm/mach-imx/cpu-imx27.c | 1 + + arch/arm/mach-imx/cpu-imx31.c | 1 + + arch/arm/mach-imx/cpu-imx35.c | 1 + + arch/arm/mach-imx/cpu-imx5.c | 1 + + arch/arm/mach-omap1/Kconfig | 5 +- + arch/arm/mach-omap1/Makefile | 4 -- + arch/arm/mach-omap1/gpio15xx.c | 1 + + arch/arm/mach-omap1/io.c | 32 ++++----- + arch/arm/mach-omap1/mcbsp.c | 21 ------ + arch/arm/mach-omap1/pm.h | 7 -- + arch/arm/mach-pxa/Kconfig | 2 + + .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 8 +-- + arch/arm64/boot/dts/freescale/fsl-ls1012a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1043a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1046a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-qds.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls1088a-rdb.dts | 2 +- + .../arm64/boot/dts/freescale/fsl-ls1088a-ten64.dts | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-qds.dtsi | 2 +- + arch/arm64/boot/dts/freescale/fsl-ls208xa-rdb.dtsi | 2 +- + .../arm64/boot/dts/freescale/fsl-lx2160a-cex7.dtsi | 2 +- + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 4 +- + .../dts/freescale/imx8mm-data-modul-edm-sbc.dts | 2 +- + .../boot/dts/freescale/imx8mm-nitrogen-r2.dts | 2 +- + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 1 + + .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 1 + + .../boot/dts/freescale/imx8mm-verdin-dev.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 4 +- + .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 10 --- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 15 ++-- + arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8mq-thor96.dts | 4 +- + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 2 +- + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 6 +- + arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 6 ++ + arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 77 ++++++++++++++++----- + arch/arm64/boot/dts/qcom/msm8992.dtsi | 4 -- + .../dts/qcom/msm8994-huawei-angler-rev-101.dts | 19 +++++- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 79 +++++++--------------- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 1 - + arch/arm64/boot/dts/qcom/sm8350.dtsi | 4 +- + drivers/firmware/arm_scmi/driver.c | 2 + + drivers/firmware/arm_scmi/shmem.c | 9 ++- + drivers/firmware/arm_scmi/virtio.c | 7 +- + drivers/memory/atmel-sdramc.c | 6 +- + drivers/memory/mvebu-devbus.c | 3 +- + drivers/memory/omap-gpmc.c | 3 +- + drivers/memory/tegra/tegra186.c | 36 ---------- + drivers/reset/Kconfig | 2 +- + drivers/reset/reset-uniphier-glue.c | 4 +- + drivers/soc/imx/imx8mp-blk-ctrl.c | 7 +- + drivers/soc/imx/soc-imx8m.c | 4 +- + drivers/soc/qcom/apr.c | 3 +- + drivers/soc/qcom/cpr.c | 6 +- + include/linux/soc/ti/omap1-io.h | 4 +- + include/soc/bcm2835/raspberrypi-firmware.h | 2 +- + 68 files changed, 227 insertions(+), 267 deletions(-) +Merging davinci-current/davinci/for-current (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'davinci/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci-current/davinci/for-current +Already up to date. +Merging drivers-memory-fixes/fixes (cb8fd6f75775 memory: mvebu-devbus: Fix missing clk_disable_unprepare in mvebu_devbus_probe()) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging tee-fixes/fixes (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 (f12cd06109f4 powerpc/64s/hash: Make stress_hpt_timer_fn() static) +$ 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 (1ecf7bd9c267 s390: update defconfigs) +$ 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 (a22b7388d658 sch_htb: Avoid grafting on htb_destroy_class_offload when destroying htb) +$ 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. + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 23 ++- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 24 +++ + drivers/net/ethernet/amd/xgbe/xgbe.h | 2 + + drivers/net/ethernet/freescale/enetc/enetc.c | 4 +- + .../net/ethernet/microchip/lan966x/lan966x_main.c | 13 +- + drivers/net/wan/fsl_ucc_hdlc.c | 6 +- + include/net/mac80211.h | 4 - + net/ethtool/rss.c | 11 +- + net/mac80211/agg-tx.c | 8 +- + net/mac80211/cfg.c | 7 + + net/mac80211/debugfs_sta.c | 5 +- + net/mac80211/driver-ops.c | 3 + + net/mac80211/driver-ops.h | 2 +- + net/mac80211/ht.c | 31 +++ + net/mac80211/ieee80211_i.h | 2 +- + net/mac80211/iface.c | 4 +- + net/mac80211/rx.c | 225 ++++++++++----------- + net/mac80211/tx.c | 34 ++-- + net/mac80211/util.c | 42 +--- + net/mptcp/pm.c | 25 +++ + net/mptcp/pm_userspace.c | 7 + + net/mptcp/protocol.c | 2 +- + net/mptcp/protocol.h | 6 +- + net/mptcp/subflow.c | 9 +- + net/nfc/llcp_core.c | 1 + + net/rxrpc/call_object.c | 2 +- + net/sched/sch_htb.c | 27 ++- + tools/testing/selftests/net/mptcp/userspace_pm.sh | 47 +++++ + 28 files changed, 346 insertions(+), 230 deletions(-) +Merging bpf/master (e4f4db47794c bpf: Fix pointer-leak due to insufficient speculative store bypass mitigation) +$ 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. + include/linux/bpf.h | 2 +- + kernel/bpf/hashtab.c | 4 ++-- + kernel/bpf/offload.c | 3 --- + kernel/bpf/syscall.c | 24 +++++++----------------- + kernel/bpf/verifier.c | 10 +++++++++- + kernel/trace/bpf_trace.c | 3 +++ + 6 files changed, 22 insertions(+), 24 deletions(-) +Merging ipsec/master (b0355dbbf13c Fix XFRM-I support for nested ESP tunnels) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Merge made by the 'ort' strategy. + net/xfrm/xfrm_interface_core.c | 54 ++++++++++++++++++++++++++++++++++++++---- + net/xfrm/xfrm_policy.c | 3 +++ + 2 files changed, 53 insertions(+), 4 deletions(-) +Merging netfilter/master (7fb0269720d7 Merge tag 'for-net-2022-05-23' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/pablo/nf.git netfilter/master +Already up to date. +Merging ipvs/master (696e1a48b1a1 netfilter: nft_payload: incorrect arithmetics when fetching VLAN header bits) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Merge made by the 'ort' strategy. + net/netfilter/ipset/ip_set_bitmap_ip.c | 4 ++-- + net/netfilter/nft_payload.c | 2 +- + tools/testing/selftests/netfilter/nft_trans_stress.sh | 16 +++++++++------- + tools/testing/selftests/netfilter/settings | 1 + + 4 files changed, 13 insertions(+), 10 deletions(-) + create mode 100644 tools/testing/selftests/netfilter/settings +Merging wireless/for-next (f216033d770f wifi: mac80211: fix MLO + AP_VLAN check) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging rdma-fixes/for-rc (b3deec25847b IB/hfi1: Remove user expected buffer invalidate race) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Merge made by the 'ort' strategy. + drivers/infiniband/core/verbs.c | 7 +- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 200 +++++++++++++++++++++--------- + drivers/infiniband/hw/hfi1/user_exp_rcv.h | 3 + + drivers/infiniband/sw/rxe/rxe_param.h | 10 +- + drivers/infiniband/sw/rxe/rxe_pool.c | 22 ++-- + 5 files changed, 164 insertions(+), 78 deletions(-) +Merging sound-current/for-linus (56b88b50565c ALSA: pcm: Move rwsem lock inside snd_ctl_elem_read to prevent UAF) +$ 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 (f89d783d68dc ASoC: Intel: avs: Implement PCI shutdown) +$ 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. + sound/soc/amd/acp-es8336.c | 6 ++++-- + sound/soc/amd/yc/acp6x-mach.c | 14 ++++++++++++++ + sound/soc/intel/avs/core.c | 24 ++++++++++++++++++++++++ + sound/soc/intel/boards/bytcht_es8316.c | 20 ++++++++++++-------- + sound/soc/intel/boards/bytcr_rt5640.c | 12 ++++++------ + sound/soc/intel/boards/bytcr_rt5651.c | 2 +- + sound/soc/intel/boards/bytcr_wm5102.c | 2 +- + sound/soc/intel/boards/sof_es8336.c | 14 ++++++++------ + 8 files changed, 70 insertions(+), 24 deletions(-) +Merging regmap-fixes/for-linus (f309b44844bd Merge remote-tracking branch 'regmap/for-6.1' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Auto-merging drivers/base/regmap/regmap-irq.c +Merge made by the 'ort' strategy. +Merging regulator-fixes/for-linus (f528fe213a6a regulator: qcom-rpmh: PM8550 ldo11 regulator is an nldo) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (50028988403a spi: spidev: remove debug messages that access spidev->spi without locking) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. +Merging pci-current/for-linus (fd3a8cff4d4a x86/pci: Treat EfiMemoryMappedIO as reservation of ECAM space) +$ 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 (b7bfaa761d76 Linux 6.2-rc3) +$ 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 (b7bfaa761d76 Linux 6.2-rc3) +$ 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 (b7bfaa761d76 Linux 6.2-rc3) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (8a43bf34c862 USB: serial: cp210x: add SCALANCE LPE-9000 device id) +$ 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/cp210x.c | 1 + + drivers/usb/serial/option.c | 11 +++++++++++ + 2 files changed, 12 insertions(+) +Merging phy/fixes (b574baa64cf8 phy: freescale: imx8m-pcie: Add one missing error return) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/phy/qcom,usb-hs-28nm.yaml | 1 - + drivers/phy/freescale/phy-fsl-imx8m-pcie.c | 2 +- + drivers/phy/qualcomm/phy-qcom-usb-hs-28nm.c | 13 ------------- + drivers/phy/renesas/r8a779f0-ether-serdes.c | 2 +- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 4 +++- + drivers/phy/sunplus/phy-sunplus-usb2.c | 3 +++ + drivers/phy/ti/Kconfig | 4 ++-- + 7 files changed, 10 insertions(+), 19 deletions(-) +Merging staging.current/staging-linus (b7bfaa761d76 Linux 6.2-rc3) +$ 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 (eb50cd5bfdac iio: hid: fix the retval in gyro_3d_capture_sample) +$ 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/accel/hid-sensor-accel-3d.c | 1 + + 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/gyro/hid-sensor-gyro-3d.c | 1 + + drivers/iio/imu/fxos8700_core.c | 90 ++++++++++++++++++++++++++++----- + drivers/iio/imu/st_lsm6dsx/Kconfig | 1 + + 9 files changed, 127 insertions(+), 16 deletions(-) +Merging counter-current/counter-current (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'counter-current' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-current/counter-current +Already up to date. +Merging char-misc.current/char-misc-linus (b7bfaa761d76 Linux 6.2-rc3) +$ git merge -m Merge branch 'char-misc-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc.current/char-misc-linus +Already up to date. +Merging soundwire-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire-fixes/fixes +Already up to date. +Merging thunderbolt-fixes/fixes (84ee211c8321 thunderbolt: Disable XDomain lane 1 only in software connection manager) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Merge made by the 'ort' strategy. + drivers/thunderbolt/retimer.c | 20 ++++---------------- + drivers/thunderbolt/tb.c | 20 +++++++++++++++----- + drivers/thunderbolt/tunnel.c | 2 +- + drivers/thunderbolt/xdomain.c | 17 ++++++++++++----- + 4 files changed, 32 insertions(+), 27 deletions(-) +Merging input-current/for-linus (3c44e2b6cde6 Revert "Input: synaptics - switch touchpad on HP Laptop 15-da3001TU to RMI mode") +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Merge made by the 'ort' strategy. + drivers/input/mouse/synaptics.c | 1 - + 1 file changed, 1 deletion(-) +Merging crypto-current/master (736f88689c69 crypto: arm64/sm4 - fix possible crash with CFI enabled) +$ 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 (895c0747f726 vfio/type1: Respect IOMMU reserved regions in vfio_test_domain_fgsp()) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/vfio/vfio_iommu_type1.c | 31 ++++++++++++++++++++----------- + 1 file changed, 20 insertions(+), 11 deletions(-) +Merging kselftest-fixes/fixes (9fdaca2c1e15 kselftest: Fix error message for unconfigured LLVM builds) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Merge made by the 'ort' strategy. + tools/testing/selftests/lib.mk | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging modules-fixes/modules-linus (da35048f2600 kallsyms: Fix scheduling with interrupts disabled in self-test) +$ 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 (f96a483f8e13 MAINTAINERS: update Jie Hai's email address) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/dma/idxd/device.c | 16 +++++++++++++--- + drivers/dma/qcom/gpi.c | 1 + + drivers/dma/ti/k3-udma.c | 5 +++-- + 4 files changed, 18 insertions(+), 6 deletions(-) +Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (c0f7ae27539f MAINTAINERS: Update email of Tudor Ambarus) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (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 +Already up to date. +Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (9bfa2544dbd1 ARM: dts: at91: sam9x60: fix the ddr clock for sam9x60) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/sam9x60.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (310bc39546a4 KVM: x86/xen: Avoid deadlock by adding kvm->arch.xen.xen_lock leaf node lock) +$ 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 (2fbb848b65cd hwmon: (nct6775) Fix incorrect parenthesization in nct6775_write_fan_div()) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Merge made by the 'ort' strategy. + Documentation/hwmon/ftsteutates.rst | 4 ++++ + drivers/hwmon/ftsteutates.c | 19 +++++++++++++------ + drivers/hwmon/nct6775-core.c | 2 +- + 3 files changed, 18 insertions(+), 7 deletions(-) +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 (2ec1b17f745b cxl: fix cxl_report_and_clear() RAS UE addr mis-assignment) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Merge made by the 'ort' strategy. + drivers/cxl/pci.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging btrfs-fixes/next-fixes (41a230615a6b Merge branch 'misc-6.2' into next-fixes) +$ git merge -m Merge branch 'next-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs-fixes/next-fixes +Merge made by the 'ort' strategy. + fs/btrfs/disk-io.c | 9 ++++++++- + fs/btrfs/fs.h | 6 ++++++ + fs/btrfs/qgroup.c | 14 ++++++++++++-- + fs/btrfs/space-info.c | 3 ++- + fs/btrfs/tree-log.c | 47 +++++++++++++++++++++++++++++++---------------- + fs/btrfs/volumes.c | 11 ++++++++++- + fs/btrfs/zoned.c | 2 ++ + 7 files changed, 71 insertions(+), 21 deletions(-) +Merging vfs-fixes/fixes (9c7417b5ec44 coredump: Move dump_emit_page() to kill unused warning) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Merge made by the 'ort' strategy. + fs/coredump.c | 48 ++++++++++++++++++++++++------------------------ + 1 file changed, 24 insertions(+), 24 deletions(-) +Merging dma-mapping-fixes/for-linus (3be4562584bb dma-direct: use the correct size for dma_set_encrypted()) +$ git merge -m Merge branch 'for-linus' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping-fixes/for-linus +Already up to date. +Merging drivers-x86-fixes/fixes (fde5f74ccfc7 platform/x86: thinkpad_acpi: Fix profile mode display in AMT mode) +$ 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 (1b929c02afd3 Linux 6.2-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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung-fixes/fixes +Already up to date. +Merging devicetree-fixes/dt/linus (064e32dc5b03 of: fdt: Honor CONFIG_CMDLINE* even without /chosen node, take 2) +$ git merge -m Merge branch 'dt/linus' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree-fixes/dt/linus +Already up to date. +Merging dt-krzk-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk-fixes/fixes +Already up to date. +Merging scsi-fixes/fixes (84ed64b1a7a7 scsi: target: core: Fix warning on RT kernels) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Merge made by the 'ort' strategy. + drivers/target/target_core_tmr.c | 4 ++-- + 1 file changed, 2 insertions(+), 2 deletions(-) +Merging drm-fixes/drm-fixes (e695bc7e5423 Merge tag 'drm-msm-fixes-2023-01-12' of https://gitlab.freedesktop.org/drm/msm 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 drm-intel-fixes/for-linux-next-fixes (58fc14e14d28 drm/i915/gt: Cover rest of SVG unit MCR registers) +$ 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 (8509419758f2 mmc: sunxi-mmc: Fix clock refcount imbalance during unbind) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + drivers/mmc/host/sdhci-esdhc-imx.c | 22 +++++++++++++++------- + drivers/mmc/host/sunxi-mmc.c | 8 +++++--- + 2 files changed, 20 insertions(+), 10 deletions(-) +Merging rtc-fixes/rtc-fixes (51b3802e7960 dt-bindings: rtc: qcom-pm8xxx: allow 'wakeup-source' property) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Merge made by the 'ort' strategy. + .../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 2 + + drivers/rtc/rtc-efi.c | 48 ++++++++++++---------- + include/linux/efi.h | 3 +- + 3 files changed, 31 insertions(+), 22 deletions(-) +Merging gnss-fixes/gnss-linus (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'gnss-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss-fixes/gnss-linus +Already up to date. +Merging hyperv-fixes/hyperv-fixes (25c94b051592 Drivers: hv: vmbus: fix possible memory leak in vmbus_device_register()) +$ git merge -m Merge branch 'hyperv-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv-fixes/hyperv-fixes +Already up to date. +Merging soc-fsl-fixes/fix (4b0986a3613c Linux 5.18) +$ git merge -m Merge branch 'fix' of git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git soc-fsl-fixes/fix +Already up to date. +Merging risc-v-fixes/fixes (b9b916aee671 riscv: uaccess: fix type of 0 variable on error in get_user()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging riscv-dt-fixes/riscv-dt-fixes (43d5f5d63699 riscv: dts: sifive: fu740: fix size of pcie 32bit memory) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sifive/fu740-c000.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging riscv-soc-fixes/riscv-soc-fixes (730892135b7d soc: microchip: mpfs: handle failed system service requests) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Merge made by the 'ort' strategy. + drivers/soc/microchip/mpfs-sys-controller.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging fpga-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'spdx-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/spdx.git spdx/spdx-linus +Already up to date. +Merging gpio-brgl-fixes/gpio/for-current (694175cd8a16 gpio: sifive: Fix refcount leak in sifive_gpio_probe) +$ 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 (1b929c02afd3 Linux 6.2-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 (1b929c02afd3 Linux 6.2-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 (35626ac92db0 erofs: clean up parsing of fscache related options) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Merge made by the 'ort' strategy. + Documentation/filesystems/erofs.rst | 2 ++ + fs/erofs/super.c | 13 ++++++------- + fs/erofs/zdata.c | 12 ++++++------ + fs/erofs/zmap.c | 10 +++++++--- + 4 files changed, 21 insertions(+), 16 deletions(-) +Merging kunit-fixes/kunit-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (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 (115d9d77bb0f mm: Always release pages to the buddy allocator in memblock_free_late().) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock-fixes/fixes +Already up to date. +Merging cel-fixes/for-rc (7c24fa225081 NFSD: replace delayed_work with work_struct for nfsd_client_shrinker) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux cel-fixes/for-rc +Auto-merging fs/nfsd/nfs4state.c +Merge made by the 'ort' strategy. + fs/nfsd/netns.h | 2 +- + fs/nfsd/nfs4proc.c | 1 + + fs/nfsd/nfs4state.c | 30 +++++++++++++++--------------- + fs/nfsd/nfsctl.c | 7 +------ + fs/nfsd/nfsd.h | 6 ++---- + 5 files changed, 20 insertions(+), 26 deletions(-) +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 (c757fc92a3f7 Merge tag 'spi-fix-v6.2-rc3' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi) +$ 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 (8118d6171a5f arm64: efi: Account for the EFI runtime stack in stack unwinder) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Merge made by the 'ort' strategy. + arch/arm64/include/asm/efi.h | 9 +++++++++ + arch/arm64/include/asm/stacktrace.h | 15 +++++++++++++++ + arch/arm64/kernel/efi-rt-wrapper.S | 6 ++++++ + arch/arm64/kernel/efi.c | 3 ++- + arch/arm64/kernel/stacktrace.c | 12 ++++++++++++ + 5 files changed, 44 insertions(+), 1 deletion(-) +Merging zstd-fixes/zstd-linus (8cbf4bb547b7 lib: zstd: Fix -Wstringop-overflow warning) +$ git merge -m Merge branch 'zstd-linus' of https://github.com/terrelln/linux.git zstd-fixes/zstd-linus +Merge made by the 'ort' strategy. + lib/zstd/decompress/huf_decompress.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging battery-fixes/fixes (d137900f237a power: supply: axp288_fuel_gauge: Added check for negative values) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Merge made by the 'ort' strategy. + drivers/power/supply/axp288_fuel_gauge.c | 2 ++ + drivers/power/supply/cros_usbpd-charger.c | 2 +- + drivers/power/supply/rk817_charger.c | 4 ---- + 3 files changed, 3 insertions(+), 5 deletions(-) +Merging uml-fixes/fixes (bd71558d585a arch: um: Mark the stack non-executable to fix a binutils warning) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml-fixes/fixes +Already up to date. +Merging asahi-soc-fixes/asahi-soc/fixes (568035b01cfb Linux 6.0-rc1) +$ git merge -m Merge branch 'asahi-soc/fixes' of https://github.com/AsahiLinux/linux.git asahi-soc-fixes/asahi-soc/fixes +Already up to date. +Merging iommufd-fixes/for-rc (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd-fixes/for-rc +Already up to date. +Merging rust-fixes/rust-fixes (b7bfaa761d76 Linux 6.2-rc3) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (83a7f8e4899f drm/vc4: bo: Fix unused variable warning) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/vc4/vc4_bo.c | 6 ++---- + 1 file changed, 2 insertions(+), 4 deletions(-) +Merging kbuild/for-next (83344be3eb46 kbuild: rust: move rust/target.json to scripts/) +$ 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 Documentation/kbuild/makefiles.rst +Auto-merging Makefile +Merge made by the 'ort' strategy. + .gitignore | 2 +- + Documentation/Makefile | 2 +- + Documentation/kbuild/makefiles.rst | 4 +- + Makefile | 57 ++++--- + arch/powerpc/kernel/prom_init_check.sh | 9 +- + arch/sh/boot/compressed/Makefile | 7 - + arch/x86/tools/Makefile | 2 +- + certs/extract-cert.c | 9 +- + rust/.gitignore | 1 - + rust/Makefile | 27 +--- + scripts/.gitignore | 1 + + scripts/Kbuild.include | 42 ++--- + scripts/Makefile | 8 +- + scripts/Makefile.build | 26 +-- + scripts/Makefile.host | 24 ++- + scripts/Makefile.lib | 45 ++---- + scripts/Makefile.modfinal | 2 +- + scripts/asn1_compiler.c | 4 +- + scripts/basic/fixdep.c | 238 +++++++++++++++++++--------- + scripts/clang-tools/gen_compile_commands.py | 2 +- + scripts/kernel-doc | 4 +- + scripts/misc-check | 19 +++ + scripts/remove-stale-files | 26 +-- + scripts/tags.sh | 2 +- + 24 files changed, 305 insertions(+), 258 deletions(-) + create mode 100755 scripts/misc-check +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 (69b41ac87e4a Merge tag 'for-6.2-rc2-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Already up to date. +Merging compiler-attributes/compiler-attributes (6cf1ab89c9e7 Compiler Attributes: Introduce __access_*() function attribute) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Merge made by the 'ort' strategy. + include/linux/compiler_attributes.h | 30 ++++++++++++++++++++++++++++++ + 1 file changed, 30 insertions(+) +Merging dma-mapping/for-next (3622b86f49f8 dma-mapping: reject GFP_COMP for noncoherent allocations) +$ 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 (32975c491ee4 uapi: Add missing _UAPI prefix to <asm-generic/types.h> include guard) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date. +Merging arc/for-next (f2906aa86338 Linux 5.19-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc/for-next +Already up to date. +Merging arm/for-next (28ee13271c06 Merge branches 'misc' and 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Merge made by the 'ort' strategy. + arch/arm/Kconfig | 26 +++++++++++++++++++++----- + arch/arm/Makefile | 1 - + arch/arm/include/asm/assembler.h | 19 ++++++++++++------- + arch/arm/include/asm/simd.h | 8 ++++++++ + arch/arm/kernel/asm-offsets.c | 1 + + arch/arm/mach-rda/Makefile | 2 -- + arch/arm/vfp/entry.S | 4 ++-- + arch/arm/vfp/vfphw.S | 4 ++-- + arch/arm/vfp/vfpmodule.c | 19 ++++++++++++------- + 9 files changed, 58 insertions(+), 26 deletions(-) + create mode 100644 arch/arm/include/asm/simd.h + delete mode 100644 arch/arm/mach-rda/Makefile +Merging arm64/for-next/core (aaf846bef4e0 Merge branches 'for-next/sysreg', 'for-next/sme', 'for-next/kselftest' and 'for-next/misc' into for-next/core) +$ git merge -m Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64/for-next/core +Auto-merging arch/arm64/Kconfig +Auto-merging arch/arm64/kernel/fpsimd.c +Auto-merging arch/arm64/kernel/ptrace.c +Merge made by the 'ort' strategy. + arch/arm64/Kconfig | 15 ++- + arch/arm64/include/asm/sysreg.h | 4 +- + arch/arm64/kernel/cpufeature.c | 2 +- + arch/arm64/kernel/fpsimd.c | 5 +- + arch/arm64/kernel/ptrace.c | 4 +- + arch/arm64/kernel/syscall.c | 8 +- + arch/arm64/kvm/hyp/entry.S | 2 +- + arch/arm64/tools/sysreg | 23 +++- + .../testing/selftests/arm64/abi/syscall-abi-asm.S | 14 ++- + tools/testing/selftests/arm64/abi/syscall-abi.c | 133 +++++++++++++-------- + tools/testing/selftests/arm64/bti/test.c | 25 ++-- + tools/testing/selftests/arm64/fp/fp-stress.c | 5 +- + 12 files changed, 145 insertions(+), 95 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 (94ac29dc59d0 Merge branch 'arm/boardfile-remove-wip' of https://git.kernel.org/pub/scm/linux/kernel/git/soc/soc 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 MAINTAINERS +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Auto-merging drivers/ata/Kconfig +Auto-merging drivers/video/fbdev/Kconfig +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/davinci-vpbe.rst | 65 - + .../admin-guide/media/platform-cardlist.rst | 1 - + Documentation/admin-guide/media/v4l-drivers.rst | 1 - + Documentation/arm/index.rst | 1 - + Documentation/arm/samsung-s3c24xx/cpufreq.rst | 77 - + Documentation/arm/samsung-s3c24xx/eb2410itx.rst | 59 - + Documentation/arm/samsung-s3c24xx/gpio.rst | 172 -- + Documentation/arm/samsung-s3c24xx/h1940.rst | 41 - + Documentation/arm/samsung-s3c24xx/index.rst | 20 - + Documentation/arm/samsung-s3c24xx/nand.rst | 30 - + Documentation/arm/samsung-s3c24xx/overview.rst | 311 --- + Documentation/arm/samsung-s3c24xx/s3c2412.rst | 121 -- + Documentation/arm/samsung-s3c24xx/s3c2413.rst | 22 - + Documentation/arm/samsung-s3c24xx/smdk2440.rst | 57 - + Documentation/arm/samsung-s3c24xx/suspend.rst | 137 -- + Documentation/arm/samsung-s3c24xx/usb-host.rst | 91 - + Documentation/arm/samsung/gpio.rst | 8 - + Documentation/arm/samsung/overview.rst | 13 - + .../bindings/clock/samsung,s3c2410-clock.txt | 49 - + .../bindings/clock/samsung,s3c2412-clock.txt | 49 - + .../bindings/clock/samsung,s3c2443-clock.txt | 55 - + .../interrupt-controller/samsung,s3c24xx-irq.txt | 53 - + .../devicetree/bindings/mmc/samsung,s3cmci.txt | 42 - + .../media/drivers/davinci-vpbe-devel.rst | 39 - + Documentation/driver-api/media/drivers/index.rst | 1 - + Documentation/power/power_supply_class.rst | 4 +- + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 - + MAINTAINERS | 194 -- + arch/arm/Kconfig | 26 +- + arch/arm/Kconfig.debug | 126 +- + arch/arm/Makefile | 4 - + arch/arm/boot/compressed/head-sa1100.S | 4 - + arch/arm/boot/compressed/misc-ep93xx.h | 13 +- + arch/arm/boot/dts/Makefile | 2 - + arch/arm/boot/dts/s3c2410-pinctrl.h | 19 - + arch/arm/boot/dts/s3c2416-pinctrl.dtsi | 172 -- + arch/arm/boot/dts/s3c2416-smdk2416.dts | 77 - + arch/arm/boot/dts/s3c2416.dtsi | 124 -- + arch/arm/boot/dts/s3c24xx.dtsi | 92 - + arch/arm/configs/badge4_defconfig | 105 -- + arch/arm/configs/cerfcube_defconfig | 73 - + arch/arm/configs/cm_x300_defconfig | 163 -- + arch/arm/configs/cns3420vb_defconfig | 63 - + arch/arm/configs/colibri_pxa270_defconfig | 157 -- + arch/arm/configs/colibri_pxa300_defconfig | 60 - + arch/arm/configs/corgi_defconfig | 247 --- + arch/arm/configs/eseries_pxa_defconfig | 97 - + arch/arm/configs/ezx_defconfig | 389 ---- + arch/arm/configs/h5000_defconfig | 74 - + arch/arm/configs/hackkit_defconfig | 48 - + arch/arm/configs/iop32x_defconfig | 126 -- + arch/arm/configs/jornada720_defconfig | 1 - + arch/arm/configs/lart_defconfig | 64 - + arch/arm/configs/lpd270_defconfig | 58 - + arch/arm/configs/lubbock_defconfig | 53 - + arch/arm/configs/magician_defconfig | 151 -- + arch/arm/configs/mainstone_defconfig | 51 - + arch/arm/configs/mini2440_defconfig | 338 ---- + arch/arm/configs/mv78xx0_defconfig | 3 - + arch/arm/configs/omap1_defconfig | 2 - + arch/arm/configs/palmz72_defconfig | 75 - + arch/arm/configs/pcm027_defconfig | 90 - + arch/arm/configs/pleb_defconfig | 53 - + arch/arm/configs/pxa168_defconfig | 3 - + arch/arm/configs/pxa255-idp_defconfig | 55 - + arch/arm/configs/pxa910_defconfig | 2 - + arch/arm/configs/pxa_defconfig | 3 - + arch/arm/configs/s3c2410_defconfig | 437 ----- + arch/arm/configs/shannon_defconfig | 45 - + arch/arm/configs/simpad_defconfig | 100 - + arch/arm/configs/tct_hammer_defconfig | 59 - + arch/arm/configs/trizeps4_defconfig | 207 -- + arch/arm/configs/viper_defconfig | 160 -- + arch/arm/configs/xcep_defconfig | 90 - + arch/arm/configs/zeus_defconfig | 173 -- + arch/arm/include/debug/s3c24xx.S | 10 - + arch/arm/kernel/entry-common.S | 15 - + arch/arm/kernel/head.S | 2 +- + arch/arm/mach-cns3xxx/Kconfig | 21 - + arch/arm/mach-cns3xxx/Makefile | 6 - + arch/arm/mach-cns3xxx/cns3420vb.c | 252 --- + arch/arm/mach-cns3xxx/cns3xxx.h | 593 ------ + arch/arm/mach-cns3xxx/core.c | 410 ---- + arch/arm/mach-cns3xxx/core.h | 32 - + arch/arm/mach-cns3xxx/devices.c | 108 -- + arch/arm/mach-cns3xxx/devices.h | 17 - + arch/arm/mach-cns3xxx/pcie.c | 290 --- + arch/arm/mach-cns3xxx/pm.c | 120 -- + arch/arm/mach-cns3xxx/pm.h | 20 - + arch/arm/mach-davinci/Kconfig | 142 -- + arch/arm/mach-davinci/Makefile | 18 +- + arch/arm/mach-davinci/asp.h | 57 - + arch/arm/mach-davinci/board-da830-evm.c | 690 ------- + arch/arm/mach-davinci/board-da850-evm.c | 1550 --------------- + arch/arm/mach-davinci/board-dm355-evm.c | 444 ----- + arch/arm/mach-davinci/board-dm355-leopard.c | 278 --- + arch/arm/mach-davinci/board-dm365-evm.c | 855 --------- + arch/arm/mach-davinci/board-mityomapl138.c | 638 ------- + arch/arm/mach-davinci/board-omapl138-hawk.c | 451 ----- + arch/arm/mach-davinci/common.h | 7 +- + arch/arm/mach-davinci/cputype.h | 53 - + arch/arm/mach-davinci/da830.c | 274 --- + arch/arm/mach-davinci/da850.c | 400 +--- + arch/arm/mach-davinci/da8xx.h | 95 +- + arch/arm/mach-davinci/davinci.h | 136 -- + arch/arm/mach-davinci/devices-da8xx.c | 1095 ----------- + arch/arm/mach-davinci/devices.c | 303 --- + arch/arm/mach-davinci/dm355.c | 832 -------- + arch/arm/mach-davinci/dm365.c | 1094 ----------- + arch/arm/mach-davinci/irqs.h | 217 --- + arch/arm/mach-davinci/mux.c | 15 - + arch/arm/mach-davinci/mux.h | 315 ---- + arch/arm/mach-davinci/psc.h | 64 - + arch/arm/mach-davinci/serial.c | 92 - + arch/arm/mach-davinci/serial.h | 35 - + arch/arm/mach-davinci/usb-da8xx.c | 146 -- + arch/arm/mach-davinci/usb.c | 87 - + arch/arm/mach-dove/Kconfig | 8 - + arch/arm/mach-dove/Makefile | 1 - + arch/arm/mach-dove/dove-db-setup.c | 101 - + arch/arm/mach-ep93xx/Kconfig | 63 - + arch/arm/mach-ep93xx/Makefile | 5 - + arch/arm/mach-ep93xx/adssphere.c | 41 - + arch/arm/mach-ep93xx/gesbc9312.c | 41 - + arch/arm/mach-ep93xx/micro9.c | 125 -- + arch/arm/mach-ep93xx/simone.c | 128 -- + arch/arm/mach-ep93xx/snappercl15.c | 162 -- + arch/arm/mach-footbridge/Kconfig | 12 - + arch/arm/mach-footbridge/Makefile | 2 - + arch/arm/mach-footbridge/cats-hw.c | 98 - + arch/arm/mach-footbridge/cats-pci.c | 64 - + arch/arm/mach-footbridge/common.c | 3 - + arch/arm/mach-iop32x/Kconfig | 54 - + arch/arm/mach-iop32x/Makefile | 20 - + arch/arm/mach-iop32x/adma.c | 163 -- + arch/arm/mach-iop32x/cp6.c | 48 - + arch/arm/mach-iop32x/em7210.c | 232 --- + arch/arm/mach-iop32x/glantank.c | 214 --- + arch/arm/mach-iop32x/glantank.h | 12 - + arch/arm/mach-iop32x/gpio-iop32x.h | 11 - + arch/arm/mach-iop32x/hardware.h | 38 - + arch/arm/mach-iop32x/i2c.c | 92 - + arch/arm/mach-iop32x/iop3xx.h | 326 ---- + arch/arm/mach-iop32x/iq31244.c | 333 ---- + arch/arm/mach-iop32x/iq31244.h | 16 - + arch/arm/mach-iop32x/iq80321.c | 192 -- + arch/arm/mach-iop32x/iq80321.h | 16 - + arch/arm/mach-iop32x/irq.c | 95 - + arch/arm/mach-iop32x/irqs.h | 48 - + arch/arm/mach-iop32x/n2100.c | 367 ---- + arch/arm/mach-iop32x/n2100.h | 18 - + arch/arm/mach-iop32x/pci.c | 404 ---- + arch/arm/mach-iop32x/pmu.c | 29 - + arch/arm/mach-iop32x/restart.c | 17 - + arch/arm/mach-iop32x/setup.c | 31 - + arch/arm/mach-iop32x/time.c | 179 -- + arch/arm/mach-mmp/Kconfig | 96 - + arch/arm/mach-mmp/Makefile | 21 +- + arch/arm/mach-mmp/aspenite.c | 284 --- + arch/arm/mach-mmp/avengers_lite.c | 55 - + arch/arm/mach-mmp/brownstone.c | 237 --- + arch/arm/mach-mmp/common.c | 5 - + arch/arm/mach-mmp/common.h | 2 - + arch/arm/mach-mmp/devices.c | 359 ---- + arch/arm/mach-mmp/devices.h | 57 - + arch/arm/mach-mmp/flint.c | 131 -- + arch/arm/mach-mmp/gplugd.c | 206 -- + arch/arm/mach-mmp/irqs.h | 240 --- + arch/arm/mach-mmp/jasper.c | 185 -- + arch/arm/mach-mmp/mfp-mmp2.h | 396 ---- + arch/arm/mach-mmp/mfp-pxa168.h | 355 ---- + arch/arm/mach-mmp/mfp-pxa910.h | 170 -- + arch/arm/mach-mmp/mfp.h | 35 - + arch/arm/mach-mmp/mmp2.c | 175 -- + arch/arm/mach-mmp/mmp2.h | 104 - + arch/arm/mach-mmp/pm-mmp2.c | 248 --- + arch/arm/mach-mmp/pm-mmp2.h | 59 - + arch/arm/mach-mmp/pm-pxa910.c | 272 --- + arch/arm/mach-mmp/pm-pxa910.h | 75 - + arch/arm/mach-mmp/pxa168.c | 175 -- + arch/arm/mach-mmp/pxa168.h | 139 -- + arch/arm/mach-mmp/pxa910.c | 190 -- + arch/arm/mach-mmp/pxa910.h | 90 - + arch/arm/mach-mmp/regs-apbc.h | 19 - + arch/arm/mach-mmp/regs-apmu.h | 28 - + arch/arm/mach-mmp/regs-icu.h | 69 - + arch/arm/mach-mmp/regs-timers.h | 5 - + arch/arm/mach-mmp/regs-usb.h | 155 -- + arch/arm/mach-mmp/sram.c | 167 -- + arch/arm/mach-mmp/teton_bga.c | 100 - + arch/arm/mach-mmp/teton_bga.h | 22 - + arch/arm/mach-mmp/time.c | 9 +- + arch/arm/mach-mmp/ttc_dkb.c | 315 ---- + arch/arm/mach-mv78xx0/Kconfig | 14 +- + arch/arm/mach-mv78xx0/Makefile | 2 - + arch/arm/mach-mv78xx0/db78x00-bp-setup.c | 101 - + arch/arm/mach-mv78xx0/rd78x00-masa-setup.c | 86 - + arch/arm/mach-omap1/Kconfig | 99 - + arch/arm/mach-omap1/Makefile | 18 - + arch/arm/mach-omap1/board-ams-delta.c | 2 +- + arch/arm/mach-omap1/board-fsample.c | 366 ---- + arch/arm/mach-omap1/board-generic.c | 85 - + arch/arm/mach-omap1/board-h2-mmc.c | 74 - + arch/arm/mach-omap1/board-h2.c | 448 ----- + arch/arm/mach-omap1/board-h2.h | 38 - + arch/arm/mach-omap1/board-h3-mmc.c | 64 - + arch/arm/mach-omap1/board-h3.c | 455 ----- + arch/arm/mach-omap1/board-h3.h | 35 - + arch/arm/mach-omap1/board-htcherald.c | 585 ------ + arch/arm/mach-omap1/board-innovator.c | 481 ----- + arch/arm/mach-omap1/board-nand.c | 33 - + arch/arm/mach-omap1/board-nokia770.c | 2 +- + arch/arm/mach-omap1/board-osk.c | 269 +-- + arch/arm/mach-omap1/board-palmte.c | 2 +- + arch/arm/mach-omap1/board-palmtt.c | 285 --- + arch/arm/mach-omap1/board-palmz71.c | 300 --- + arch/arm/mach-omap1/board-perseus2.c | 333 ---- + arch/arm/mach-omap1/board-sx1.c | 2 +- + arch/arm/mach-omap1/clock_data.c | 17 +- + arch/arm/mach-omap1/common.h | 29 +- + arch/arm/mach-omap1/devices.c | 59 +- + arch/arm/mach-omap1/dma.c | 25 +- + arch/arm/mach-omap1/fpga.c | 186 -- + arch/arm/mach-omap1/fpga.h | 49 - + arch/arm/mach-omap1/gpio7xx.c | 272 --- + arch/arm/mach-omap1/hardware.h | 48 +- + arch/arm/mach-omap1/i2c.c | 14 +- + arch/arm/mach-omap1/io.c | 84 +- + arch/arm/mach-omap1/irq.c | 20 +- + arch/arm/mach-omap1/irqs.h | 9 - + arch/arm/mach-omap1/mcbsp.c | 76 - + arch/arm/mach-omap1/mtd-xip.h | 4 - + arch/arm/mach-omap1/mux.c | 52 - + arch/arm/mach-omap1/omap1510.h | 162 -- + arch/arm/mach-omap1/omap16xx.h | 201 -- + arch/arm/mach-omap1/omap7xx.h | 106 -- + arch/arm/mach-omap1/pm.c | 76 +- + arch/arm/mach-omap1/pm.h | 35 - + arch/arm/mach-omap1/serial.c | 15 - + arch/arm/mach-omap1/sleep.S | 80 - + arch/arm/mach-omap1/sram-init.c | 7 +- + arch/arm/mach-omap1/usb.c | 34 +- + arch/arm/mach-omap2/Makefile | 3 +- + arch/arm/mach-omap2/board-n8x0.c | 2 +- + arch/arm/mach-omap2/clkt2xxx_dpllcore.c | 1 + + arch/arm/mach-omap2/clkt2xxx_virt_prcm_set.c | 14 +- + arch/arm/mach-omap2/clock.c | 2 - + arch/arm/mach-omap2/clock.h | 7 - + arch/arm/mach-omap2/clock2xxx.h | 29 - + arch/arm/mach-omap2/clock3xxx.h | 21 - + arch/arm/mach-omap2/clockdomain.c | 44 +- + arch/arm/mach-omap2/clockdomain.h | 4 - + arch/arm/mach-omap2/cm2xxx.c | 101 +- + arch/arm/mach-omap2/cm2xxx.h | 7 - + arch/arm/mach-omap2/cm2xxx_3xxx.h | 5 - + arch/arm/mach-omap2/common.h | 28 - + arch/arm/mach-omap2/control.c | 73 - + arch/arm/mach-omap2/control.h | 5 - + arch/arm/mach-omap2/id.c | 2 +- + arch/arm/mach-omap2/id.h | 2 - + arch/arm/mach-omap2/io.c | 21 +- + arch/arm/mach-omap2/omap-secure.c | 7 +- + arch/arm/mach-omap2/omap-secure.h | 3 - + arch/arm/mach-omap2/omap_device.c | 74 +- + arch/arm/mach-omap2/omap_device.h | 14 - + arch/arm/mach-omap2/omap_hwmod.c | 94 +- + arch/arm/mach-omap2/omap_hwmod.h | 21 - + arch/arm/mach-omap2/omap_hwmod_2420_data.c | 1 - + .../mach-omap2/omap_hwmod_2xxx_3xxx_ipblock_data.c | 2 +- + .../mach-omap2/omap_hwmod_2xxx_interconnect_data.c | 1 - + arch/arm/mach-omap2/omap_hwmod_2xxx_ipblock_data.c | 12 +- + arch/arm/mach-omap2/omap_hwmod_3xxx_data.c | 1 - + arch/arm/mach-omap2/omap_hwmod_common_data.h | 6 - + arch/arm/mach-omap2/omap_hwmod_reset.c | 98 - + arch/arm/mach-omap2/omap_opp_data.h | 5 - + arch/arm/mach-omap2/omap_phy_internal.c | 87 - + arch/arm/mach-omap2/pm.c | 8 +- + arch/arm/mach-omap2/pm.h | 25 - + arch/arm/mach-omap2/pm24xx.c | 312 --- + arch/arm/mach-omap2/powerdomain.c | 108 +- + arch/arm/mach-omap2/powerdomain.h | 8 - + arch/arm/mach-omap2/prcm-common.h | 1 - + arch/arm/mach-omap2/prcm_mpu44xx.c | 12 - + arch/arm/mach-omap2/prcm_mpu_44xx_54xx.h | 2 - + arch/arm/mach-omap2/prm.h | 4 - + arch/arm/mach-omap2/prm2xxx_3xxx.h | 3 - + arch/arm/mach-omap2/prm3xxx.c | 5 +- + arch/arm/mach-omap2/prm3xxx.h | 2 - + arch/arm/mach-omap2/prm_common.c | 55 +- + arch/arm/mach-omap2/sdrc.c | 51 +- + arch/arm/mach-omap2/sdrc.h | 5 - + arch/arm/mach-omap2/serial.h | 66 - + arch/arm/mach-omap2/sr_device.c | 13 - + arch/arm/mach-omap2/sram.h | 4 - + arch/arm/mach-omap2/usb-tusb6010.c | 6 +- + arch/arm/mach-omap2/usb.h | 71 - + arch/arm/mach-omap2/vc.c | 15 - + arch/arm/mach-omap2/voltage.c | 2 +- + arch/arm/mach-omap2/voltage.h | 2 - + arch/arm/mach-orion5x/Kconfig | 59 - + arch/arm/mach-orion5x/Makefile | 8 - + arch/arm/mach-orion5x/common.c | 10 - + arch/arm/mach-orion5x/common.h | 2 - + arch/arm/mach-orion5x/db88f5281-setup.c | 376 ---- + arch/arm/mach-orion5x/ls_hgl-setup.c | 275 --- + arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c | 172 -- + arch/arm/mach-orion5x/rd88f5181l-ge-setup.c | 183 -- + arch/arm/mach-orion5x/rd88f5182-setup.c | 288 --- + arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c | 120 -- + arch/arm/mach-orion5x/wnr854t-setup.c | 175 -- + arch/arm/mach-orion5x/wrt350n-v2-setup.c | 263 --- + arch/arm/mach-pxa/Kconfig | 571 +----- + arch/arm/mach-pxa/Makefile | 59 +- + arch/arm/mach-pxa/balloon3-pcmcia.c | 137 -- + arch/arm/mach-pxa/balloon3.c | 821 -------- + arch/arm/mach-pxa/balloon3.h | 181 -- + arch/arm/mach-pxa/capc7117.c | 159 -- + arch/arm/mach-pxa/cm-x300.c | 883 --------- + arch/arm/mach-pxa/colibri-evalboard.c | 138 -- + arch/arm/mach-pxa/colibri-pcmcia.c | 165 -- + arch/arm/mach-pxa/colibri-pxa270-income.c | 236 --- + arch/arm/mach-pxa/colibri-pxa270.c | 330 ---- + arch/arm/mach-pxa/colibri-pxa300.c | 193 -- + arch/arm/mach-pxa/colibri-pxa320.c | 264 --- + arch/arm/mach-pxa/colibri-pxa3xx.c | 147 -- + arch/arm/mach-pxa/colibri.h | 70 - + arch/arm/mach-pxa/corgi.c | 826 -------- + arch/arm/mach-pxa/corgi.h | 110 -- + arch/arm/mach-pxa/corgi_pm.c | 221 --- + arch/arm/mach-pxa/csb701.c | 67 - + arch/arm/mach-pxa/csb726.c | 291 --- + arch/arm/mach-pxa/csb726.h | 24 - + arch/arm/mach-pxa/devices.c | 408 ---- + arch/arm/mach-pxa/devices.h | 2 - + arch/arm/mach-pxa/e740-pcmcia.c | 127 -- + arch/arm/mach-pxa/eseries-gpio.h | 63 - + arch/arm/mach-pxa/eseries-irq.h | 24 - + arch/arm/mach-pxa/eseries.c | 1001 ---------- + arch/arm/mach-pxa/ezx.c | 1254 ------------- + arch/arm/mach-pxa/h5000.c | 210 --- + arch/arm/mach-pxa/h5000.h | 109 -- + arch/arm/mach-pxa/himalaya.c | 166 -- + arch/arm/mach-pxa/hx4700-pcmcia.c | 118 -- + arch/arm/mach-pxa/hx4700.c | 942 ---------- + arch/arm/mach-pxa/hx4700.h | 129 -- + arch/arm/mach-pxa/icontrol.c | 218 --- + arch/arm/mach-pxa/idp.c | 285 --- + arch/arm/mach-pxa/idp.h | 195 -- + arch/arm/mach-pxa/littleton.c | 462 ----- + arch/arm/mach-pxa/littleton.h | 14 - + arch/arm/mach-pxa/lpd270.c | 518 ----- + arch/arm/mach-pxa/lpd270.h | 40 - + arch/arm/mach-pxa/lubbock.c | 649 ------- + arch/arm/mach-pxa/lubbock.h | 47 - + arch/arm/mach-pxa/magician.c | 1112 ----------- + arch/arm/mach-pxa/magician.h | 125 -- + arch/arm/mach-pxa/mainstone.c | 738 -------- + arch/arm/mach-pxa/mainstone.h | 140 -- + arch/arm/mach-pxa/mfp-pxa25x.h | 33 - + arch/arm/mach-pxa/mfp-pxa2xx.c | 4 - + arch/arm/mach-pxa/mfp-pxa320.h | 458 ----- + arch/arm/mach-pxa/mfp-pxa930.h | 495 ----- + arch/arm/mach-pxa/mioa701.c | 784 -------- + arch/arm/mach-pxa/mioa701.h | 76 - + arch/arm/mach-pxa/mioa701_bootresume.S | 38 - + arch/arm/mach-pxa/mp900.c | 101 - + arch/arm/mach-pxa/mxm8x10.c | 477 ----- + arch/arm/mach-pxa/mxm8x10.h | 22 - + arch/arm/mach-pxa/palm27x.c | 473 ----- + arch/arm/mach-pxa/palm27x.h | 77 - + arch/arm/mach-pxa/palmld-pcmcia.c | 111 -- + arch/arm/mach-pxa/palmld.c | 392 ---- + arch/arm/mach-pxa/palmld.h | 107 -- + arch/arm/mach-pxa/palmt5.c | 234 --- + arch/arm/mach-pxa/palmt5.h | 82 - + arch/arm/mach-pxa/palmtc-pcmcia.c | 162 -- + arch/arm/mach-pxa/palmtc.c | 539 ------ + arch/arm/mach-pxa/palmtc.h | 84 - + arch/arm/mach-pxa/palmte2.c | 383 ---- + arch/arm/mach-pxa/palmte2.h | 64 - + arch/arm/mach-pxa/palmtreo.c | 548 ------ + arch/arm/mach-pxa/palmtreo.h | 64 - + arch/arm/mach-pxa/palmtx-pcmcia.c | 111 -- + arch/arm/mach-pxa/palmtx.c | 390 ---- + arch/arm/mach-pxa/palmtx.h | 110 -- + arch/arm/mach-pxa/palmz72.c | 319 ---- + arch/arm/mach-pxa/palmz72.h | 80 - + arch/arm/mach-pxa/pcm027.c | 266 --- + arch/arm/mach-pxa/pcm027.h | 73 - + arch/arm/mach-pxa/pcm990-baseboard.c | 408 ---- + arch/arm/mach-pxa/pcm990_baseboard.h | 199 -- + arch/arm/mach-pxa/pm.c | 2 - + arch/arm/mach-pxa/pm.h | 10 - + arch/arm/mach-pxa/poodle.c | 484 ----- + arch/arm/mach-pxa/poodle.h | 92 - + arch/arm/mach-pxa/pxa25x.c | 7 - + arch/arm/mach-pxa/pxa27x.c | 18 +- + arch/arm/mach-pxa/pxa27x.h | 3 - + arch/arm/mach-pxa/pxa2xx.c | 29 - + arch/arm/mach-pxa/pxa3xx-ulpi.c | 385 ---- + arch/arm/mach-pxa/pxa3xx.c | 89 - + arch/arm/mach-pxa/pxa930.c | 217 --- + arch/arm/mach-pxa/pxa930.h | 8 - + arch/arm/mach-pxa/pxa_cplds_irqs.c | 200 -- + arch/arm/mach-pxa/regs-u2d.h | 199 -- + arch/arm/mach-pxa/regs-uart.h | 146 -- + arch/arm/mach-pxa/saar.c | 604 ------ + arch/arm/mach-pxa/sharpsl_pm.c | 4 - + arch/arm/mach-pxa/spitz.c | 23 - + arch/arm/mach-pxa/tavorevb.c | 506 ----- + arch/arm/mach-pxa/tosa-bt.c | 134 -- + arch/arm/mach-pxa/tosa.c | 946 ---------- + arch/arm/mach-pxa/tosa.h | 165 -- + arch/arm/mach-pxa/tosa_bt.h | 18 - + arch/arm/mach-pxa/trizeps4-pcmcia.c | 200 -- + arch/arm/mach-pxa/trizeps4.c | 575 ------ + arch/arm/mach-pxa/trizeps4.h | 166 -- + arch/arm/mach-pxa/viper-pcmcia.c | 180 -- + arch/arm/mach-pxa/viper-pcmcia.h | 12 - + arch/arm/mach-pxa/viper.c | 1034 ---------- + arch/arm/mach-pxa/viper.h | 91 - + arch/arm/mach-pxa/vpac270-pcmcia.c | 137 -- + arch/arm/mach-pxa/vpac270.c | 736 -------- + arch/arm/mach-pxa/vpac270.h | 38 - + arch/arm/mach-pxa/xcep.c | 190 -- + arch/arm/mach-pxa/z2.c | 781 -------- + arch/arm/mach-pxa/z2.h | 37 - + arch/arm/mach-pxa/zeus.c | 974 ---------- + arch/arm/mach-pxa/zeus.h | 82 - + arch/arm/mach-pxa/zylonite.c | 495 ----- + arch/arm/mach-pxa/zylonite.h | 45 - + arch/arm/mach-pxa/zylonite_pxa300.c | 281 --- + arch/arm/mach-pxa/zylonite_pxa320.c | 213 --- + arch/arm/mach-s3c/Kconfig | 92 +- + arch/arm/mach-s3c/Kconfig.s3c24xx | 604 ------ + arch/arm/mach-s3c/Kconfig.s3c64xx | 210 --- + arch/arm/mach-s3c/Makefile | 12 - + arch/arm/mach-s3c/Makefile.s3c24xx | 102 - + arch/arm/mach-s3c/Makefile.s3c64xx | 15 - + arch/arm/mach-s3c/adc-core.h | 24 - + arch/arm/mach-s3c/adc.c | 510 ----- + arch/arm/mach-s3c/anubis.h | 50 - + arch/arm/mach-s3c/ata-core-s3c64xx.h | 24 - + arch/arm/mach-s3c/backlight-s3c64xx.h | 22 - + arch/arm/mach-s3c/bast-ide.c | 82 - + arch/arm/mach-s3c/bast-irq.c | 137 -- + arch/arm/mach-s3c/bast.h | 194 -- + arch/arm/mach-s3c/common-smdk-s3c24xx.c | 228 --- + arch/arm/mach-s3c/common-smdk-s3c24xx.h | 11 - + arch/arm/mach-s3c/cpu.h | 47 - + arch/arm/mach-s3c/cpufreq-utils-s3c24xx.c | 94 - + arch/arm/mach-s3c/dev-audio-s3c64xx.c | 127 -- + arch/arm/mach-s3c/dev-backlight-s3c64xx.c | 137 -- + arch/arm/mach-s3c/devs.c | 726 ------- + arch/arm/mach-s3c/devs.h | 37 - + arch/arm/mach-s3c/dma-s3c24xx.h | 51 - + arch/arm/mach-s3c/dma-s3c64xx.h | 57 - + arch/arm/mach-s3c/dma.h | 9 - + arch/arm/mach-s3c/fb-core-s3c24xx.h | 24 - + arch/arm/mach-s3c/gpio-cfg-helpers.h | 124 -- + arch/arm/mach-s3c/gpio-cfg.h | 19 - + arch/arm/mach-s3c/gpio-core.h | 3 - + arch/arm/mach-s3c/gpio-samsung-s3c24xx.h | 103 - + arch/arm/mach-s3c/gpio-samsung.c | 443 +---- + arch/arm/mach-s3c/gpio-samsung.h | 7 - + arch/arm/mach-s3c/gta02.h | 20 - + arch/arm/mach-s3c/h1940-bluetooth.c | 140 -- + arch/arm/mach-s3c/h1940.h | 52 - + arch/arm/mach-s3c/hardware-s3c24xx.h | 14 - + arch/arm/mach-s3c/iic-core.h | 7 - + arch/arm/mach-s3c/init.c | 26 +- + arch/arm/mach-s3c/iotiming-s3c2410.c | 472 ----- + arch/arm/mach-s3c/iotiming-s3c2412.c | 278 --- + arch/arm/mach-s3c/irq-pm-s3c24xx.c | 115 -- + arch/arm/mach-s3c/irq-s3c24xx-fiq-exports.c | 9 - + arch/arm/mach-s3c/irq-s3c24xx-fiq.S | 112 -- + arch/arm/mach-s3c/irq-s3c24xx.c | 1352 ------------- + arch/arm/mach-s3c/irqs-s3c24xx.h | 219 --- + arch/arm/mach-s3c/irqs.h | 7 - + arch/arm/mach-s3c/mach-amlm5900.c | 248 --- + arch/arm/mach-s3c/mach-anubis.c | 422 ----- + arch/arm/mach-s3c/mach-anw6410.c | 230 --- + arch/arm/mach-s3c/mach-at2440evb.c | 233 --- + arch/arm/mach-s3c/mach-bast.c | 583 ------ + arch/arm/mach-s3c/mach-crag6410.c | 1 - + arch/arm/mach-s3c/mach-gta02.c | 588 ------ + arch/arm/mach-s3c/mach-h1940.c | 809 -------- + arch/arm/mach-s3c/mach-hmt.c | 282 --- + arch/arm/mach-s3c/mach-jive.c | 693 ------- + arch/arm/mach-s3c/mach-mini2440.c | 804 -------- + arch/arm/mach-s3c/mach-mini6410.c | 365 ---- + arch/arm/mach-s3c/mach-n30.c | 682 ------- + arch/arm/mach-s3c/mach-ncp.c | 100 - + arch/arm/mach-s3c/mach-nexcoder.c | 162 -- + arch/arm/mach-s3c/mach-osiris-dvs.c | 178 -- + arch/arm/mach-s3c/mach-osiris.c | 405 ---- + arch/arm/mach-s3c/mach-otom.c | 124 -- + arch/arm/mach-s3c/mach-qt2410.c | 375 ---- + arch/arm/mach-s3c/mach-real6410.c | 333 ---- + arch/arm/mach-s3c/mach-rx1950.c | 884 --------- + arch/arm/mach-s3c/mach-rx3715.c | 213 --- + arch/arm/mach-s3c/mach-s3c2416-dt.c | 48 - + arch/arm/mach-s3c/mach-smartq.c | 424 ----- + arch/arm/mach-s3c/mach-smartq.h | 16 - + arch/arm/mach-s3c/mach-smartq5.c | 154 -- + arch/arm/mach-s3c/mach-smartq7.c | 170 -- + arch/arm/mach-s3c/mach-smdk2410.c | 112 -- + arch/arm/mach-s3c/mach-smdk2413.c | 169 -- + arch/arm/mach-s3c/mach-smdk2416.c | 248 --- + arch/arm/mach-s3c/mach-smdk2440.c | 180 -- + arch/arm/mach-s3c/mach-smdk2443.c | 126 -- + arch/arm/mach-s3c/mach-smdk6400.c | 90 - + arch/arm/mach-s3c/mach-smdk6410.c | 706 ------- + arch/arm/mach-s3c/mach-tct_hammer.c | 157 -- + arch/arm/mach-s3c/mach-vr1000.c | 364 ---- + arch/arm/mach-s3c/mach-vstms.c | 166 -- + arch/arm/mach-s3c/map-s3c.h | 37 - + arch/arm/mach-s3c/map-s3c24xx.h | 159 -- + arch/arm/mach-s3c/map.h | 7 - + arch/arm/mach-s3c/nand-core-s3c24xx.h | 24 - + arch/arm/mach-s3c/onenand-core-s3c64xx.h | 32 - + arch/arm/mach-s3c/osiris.h | 50 - + arch/arm/mach-s3c/otom.h | 25 - + arch/arm/mach-s3c/pll-s3c2410.c | 83 - + arch/arm/mach-s3c/pll-s3c2440-12000000.c | 95 - + arch/arm/mach-s3c/pll-s3c2440-16934400.c | 122 -- + arch/arm/mach-s3c/pm-core-s3c24xx.h | 96 - + arch/arm/mach-s3c/pm-core-s3c64xx.h | 17 - + arch/arm/mach-s3c/pm-core.h | 7 - + arch/arm/mach-s3c/pm-h1940.S | 19 - + arch/arm/mach-s3c/pm-s3c2410.c | 170 -- + arch/arm/mach-s3c/pm-s3c2412.c | 126 -- + arch/arm/mach-s3c/pm-s3c2416.c | 81 - + arch/arm/mach-s3c/pm-s3c24xx.c | 121 -- + arch/arm/mach-s3c/pm-s3c64xx.c | 83 - + arch/arm/mach-s3c/pm.c | 7 +- + arch/arm/mach-s3c/pm.h | 12 - + arch/arm/mach-s3c/regs-adc.h | 64 - + arch/arm/mach-s3c/regs-clock-s3c24xx.h | 146 -- + arch/arm/mach-s3c/regs-clock.h | 7 - + arch/arm/mach-s3c/regs-dsc-s3c24xx.h | 22 - + arch/arm/mach-s3c/regs-gpio-s3c24xx.h | 608 ------ + arch/arm/mach-s3c/regs-gpio.h | 7 - + arch/arm/mach-s3c/regs-irq-s3c24xx.h | 51 - + arch/arm/mach-s3c/regs-irq.h | 7 - + arch/arm/mach-s3c/regs-mem-s3c24xx.h | 53 - + arch/arm/mach-s3c/regs-s3c2443-clock.h | 238 --- + arch/arm/mach-s3c/regs-srom-s3c64xx.h | 55 - + arch/arm/mach-s3c/rtc-core-s3c24xx.h | 23 - + arch/arm/mach-s3c/s3c2410.c | 130 -- + arch/arm/mach-s3c/s3c2412-power.h | 34 - + arch/arm/mach-s3c/s3c2412.c | 175 -- + arch/arm/mach-s3c/s3c2412.h | 25 - + arch/arm/mach-s3c/s3c2416.c | 132 -- + arch/arm/mach-s3c/s3c2440.c | 71 - + arch/arm/mach-s3c/s3c2442.c | 62 - + arch/arm/mach-s3c/s3c2443.c | 112 -- + arch/arm/mach-s3c/s3c244x.c | 128 -- + arch/arm/mach-s3c/s3c24xx.c | 687 ------- + arch/arm/mach-s3c/s3c24xx.h | 124 -- + arch/arm/mach-s3c/s3c6400.c | 90 - + arch/arm/mach-s3c/s3c6410.c | 9 - + arch/arm/mach-s3c/s3c64xx.c | 8 - + arch/arm/mach-s3c/sdhci.h | 25 - + arch/arm/mach-s3c/setup-i2c-s3c24xx.c | 23 - + arch/arm/mach-s3c/setup-ide-s3c64xx.c | 40 - + arch/arm/mach-s3c/setup-sdhci-gpio-s3c24xx.c | 31 - + arch/arm/mach-s3c/setup-spi-s3c24xx.c | 27 - + arch/arm/mach-s3c/setup-ts-s3c24xx.c | 29 - + arch/arm/mach-s3c/simtec-audio.c | 76 - + arch/arm/mach-s3c/simtec-nor.c | 74 - + arch/arm/mach-s3c/simtec-pm.c | 60 - + arch/arm/mach-s3c/simtec-usb.c | 125 -- + arch/arm/mach-s3c/simtec.h | 17 - + arch/arm/mach-s3c/sleep-s3c2410.S | 54 - + arch/arm/mach-s3c/sleep-s3c2412.S | 53 - + arch/arm/mach-s3c/sleep-s3c24xx.S | 69 - + arch/arm/mach-s3c/sleep-s3c64xx.S | 27 - + arch/arm/mach-s3c/spi-core-s3c24xx.h | 21 - + arch/arm/mach-s3c/vr1000.h | 113 -- + arch/arm/mach-sa1100/Kconfig | 112 -- + arch/arm/mach-sa1100/Makefile | 21 - + arch/arm/mach-sa1100/assabet.c | 1 - + arch/arm/mach-sa1100/badge4.c | 338 ---- + arch/arm/mach-sa1100/cerf.c | 181 -- + arch/arm/mach-sa1100/collie.c | 1 - + arch/arm/mach-sa1100/h3100.c | 140 -- + arch/arm/mach-sa1100/h3600.c | 1 - + arch/arm/mach-sa1100/hackkit.c | 184 -- + arch/arm/mach-sa1100/include/mach/badge4.h | 71 - + arch/arm/mach-sa1100/include/mach/cerf.h | 20 - + arch/arm/mach-sa1100/include/mach/nanoengine.h | 48 - + arch/arm/mach-sa1100/include/mach/shannon.h | 40 - + arch/arm/mach-sa1100/include/mach/simpad.h | 159 -- + arch/arm/mach-sa1100/lart.c | 177 -- + arch/arm/mach-sa1100/nanoengine.c | 136 -- + arch/arm/mach-sa1100/pci-nanoengine.c | 191 -- + arch/arm/mach-sa1100/pleb.c | 148 -- + arch/arm/mach-sa1100/shannon.c | 157 -- + arch/arm/mach-sa1100/simpad.c | 423 ----- + arch/arm/mach-tegra/tegra.c | 1 - + arch/arm/plat-orion/common.c | 31 - + arch/arm/plat-orion/include/plat/common.h | 3 - + drivers/ata/Kconfig | 19 - + drivers/ata/Makefile | 2 - + drivers/ata/pata_palmld.c | 137 -- + drivers/ata/pata_samsung_cf.c | 662 ------- + drivers/clk/davinci/Makefile | 4 - + drivers/clk/davinci/pll-dm355.c | 77 - + drivers/clk/davinci/pll-dm365.c | 146 -- + drivers/clk/davinci/pll.c | 8 - + drivers/clk/davinci/pll.h | 5 - + drivers/clk/davinci/psc-dm355.c | 89 - + drivers/clk/davinci/psc-dm365.c | 111 -- + drivers/clk/davinci/psc.c | 6 - + drivers/clk/davinci/psc.h | 7 - + drivers/clk/samsung/Kconfig | 32 - + drivers/clk/samsung/Makefile | 4 - + drivers/clk/samsung/clk-pll.c | 181 -- + drivers/clk/samsung/clk-pll.h | 21 - + drivers/clk/samsung/clk-s3c2410-dclk.c | 440 ----- + drivers/clk/samsung/clk-s3c2410.c | 446 ----- + drivers/clk/samsung/clk-s3c2412.c | 254 --- + drivers/clk/samsung/clk-s3c2443.c | 438 ----- + drivers/clocksource/Kconfig | 2 +- + drivers/cpufreq/Kconfig | 2 +- + drivers/cpufreq/Kconfig.arm | 81 - + drivers/cpufreq/Makefile | 7 - + drivers/cpufreq/s3c2410-cpufreq.c | 155 -- + drivers/cpufreq/s3c2412-cpufreq.c | 240 --- + drivers/cpufreq/s3c2416-cpufreq.c | 492 ----- + drivers/cpufreq/s3c2440-cpufreq.c | 321 ---- + drivers/cpufreq/s3c24xx-cpufreq-debugfs.c | 163 -- + drivers/cpufreq/s3c24xx-cpufreq.c | 648 ------- + drivers/cpufreq/sa1100-cpufreq.c | 206 -- + drivers/cpufreq/sa1110-cpufreq.c | 6 - + drivers/dma/Kconfig | 12 - + drivers/dma/Makefile | 1 - + drivers/dma/mmp_tdma.c | 7 +- + drivers/dma/s3c24xx-dma.c | 1428 -------------- + drivers/gpio/Kconfig | 17 - + drivers/gpio/Makefile | 2 - + drivers/gpio/gpio-iop.c | 59 - + drivers/gpio/gpio-ucb1400.c | 85 - + drivers/hwmon/Kconfig | 17 - + drivers/hwmon/Makefile | 1 - + drivers/hwmon/s3c-hwmon.c | 379 ---- + drivers/i2c/busses/Kconfig | 11 +- + drivers/i2c/busses/i2c-s3c2410.c | 72 - + drivers/iio/adc/Kconfig | 6 +- + drivers/input/keyboard/Kconfig | 19 - + drivers/input/keyboard/Makefile | 2 - + drivers/input/keyboard/davinci_keyscan.c | 315 ---- + drivers/input/keyboard/pxa930_rotary.c | 195 -- + drivers/input/mouse/Kconfig | 6 - + drivers/input/mouse/Makefile | 1 - + drivers/input/mouse/pxa930_trkball.c | 250 --- + drivers/input/touchscreen/Kconfig | 42 - + drivers/input/touchscreen/Makefile | 3 - + drivers/input/touchscreen/mainstone-wm97xx.c | 10 - + drivers/input/touchscreen/s3c2410_ts.c | 464 ----- + drivers/input/touchscreen/ucb1400_ts.c | 458 ----- + drivers/input/touchscreen/zylonite-wm97xx.c | 220 --- + drivers/irqchip/Kconfig | 5 - + drivers/irqchip/Makefile | 1 - + drivers/irqchip/irq-davinci-aintc.c | 163 -- + drivers/leds/Kconfig | 19 - + drivers/leds/Makefile | 2 - + drivers/leds/leds-asic3.c | 177 -- + drivers/leds/leds-s3c24xx.c | 83 - + drivers/media/platform/samsung/s3c-camif/Kconfig | 8 +- + drivers/media/platform/ti/davinci/Kconfig | 16 - + drivers/media/platform/ti/davinci/Makefile | 3 - + drivers/media/platform/ti/davinci/vpbe.c | 840 --------- + drivers/media/platform/ti/davinci/vpbe_display.c | 1510 --------------- + drivers/media/platform/ti/davinci/vpbe_osd.c | 1582 ---------------- + drivers/media/platform/ti/davinci/vpbe_osd_regs.h | 352 ---- + drivers/media/platform/ti/davinci/vpbe_venc.c | 676 ------- + drivers/media/platform/ti/davinci/vpbe_venc_regs.h | 165 -- + drivers/media/platform/ti/davinci/vpss.c | 529 ------ + drivers/mfd/Kconfig | 62 +- + drivers/mfd/Makefile | 7 - + drivers/mfd/asic3.c | 1071 ----------- + drivers/mfd/htc-pasic3.c | 210 --- + drivers/mfd/t7l66xb.c | 427 ----- + drivers/mfd/tc6387xb.c | 228 --- + drivers/mfd/tc6393xb.c | 907 --------- + drivers/mfd/tmio_core.c | 70 - + drivers/mfd/ucb1400_core.c | 158 -- + drivers/mmc/host/Kconfig | 69 +- + drivers/mmc/host/Makefile | 3 - + drivers/mmc/host/s3cmci.c | 1777 ------------------ + drivers/mmc/host/s3cmci.h | 75 - + drivers/mmc/host/sdhci-cns3xxx.c | 113 -- + drivers/mmc/host/tmio_mmc.c | 227 --- + drivers/mtd/nand/raw/Kconfig | 9 +- + drivers/mtd/nand/raw/Makefile | 1 - + drivers/mtd/nand/raw/s3c2410.c | 60 - + drivers/mtd/nand/raw/tmio_nand.c | 533 ------ + drivers/parport/Kconfig | 11 - + drivers/parport/Makefile | 1 - + drivers/parport/parport_ax88796.c | 418 ----- + drivers/pcmcia/Kconfig | 12 +- + drivers/pcmcia/Makefile | 5 - + drivers/pcmcia/pxa2xx_base.c | 8 +- + drivers/pcmcia/pxa2xx_mainstone.c | 122 -- + drivers/pcmcia/sa1100_generic.c | 5 +- + drivers/pcmcia/sa1100_h3600.c | 2 +- + drivers/pcmcia/sa1100_simpad.c | 115 -- + drivers/pcmcia/sa1111_badge4.c | 158 -- + drivers/pcmcia/sa1111_generic.c | 8 - + drivers/pcmcia/sa1111_lubbock.c | 155 -- + drivers/pinctrl/samsung/Kconfig | 5 - + drivers/pinctrl/samsung/Makefile | 1 - + drivers/pinctrl/samsung/pinctrl-s3c24xx.c | 653 ------- + drivers/pinctrl/samsung/pinctrl-samsung.c | 10 - + drivers/power/supply/Kconfig | 28 - + drivers/power/supply/Makefile | 4 - + drivers/power/supply/ds2760_battery.c | 8 - + drivers/power/supply/pda_power.c | 520 ----- + drivers/power/supply/s3c_adc_battery.c | 453 ----- + drivers/power/supply/tosa_battery.c | 512 ----- + drivers/power/supply/z2_battery.c | 318 ---- + drivers/rtc/Kconfig | 17 +- + drivers/rtc/Makefile | 1 - + drivers/rtc/rtc-v3020.c | 369 ---- + drivers/soc/samsung/Kconfig | 26 +- + drivers/soc/samsung/Makefile | 1 - + drivers/soc/samsung/s3c-pm-debug.c | 79 - + drivers/soc/ti/smartreflex.c | 4 - + drivers/spi/Kconfig | 24 - + drivers/spi/Makefile | 3 - + drivers/spi/spi-omap-100k.c | 490 ----- + drivers/spi/spi-omap-uwire.c | 16 +- + drivers/spi/spi-s3c24xx-regs.h | 41 - + drivers/spi/spi-s3c24xx.c | 596 ------ + drivers/staging/media/Kconfig | 1 - + drivers/staging/media/Makefile | 1 - + .../staging/media/deprecated/vpfe_capture/Kconfig | 58 - + .../staging/media/deprecated/vpfe_capture/Makefile | 4 - + drivers/staging/media/deprecated/vpfe_capture/TODO | 7 - + .../media/deprecated/vpfe_capture/ccdc_hw_device.h | 80 - + .../media/deprecated/vpfe_capture/dm355_ccdc.c | 934 --------- + .../media/deprecated/vpfe_capture/dm355_ccdc.h | 308 --- + .../deprecated/vpfe_capture/dm355_ccdc_regs.h | 297 --- + .../media/deprecated/vpfe_capture/dm644x_ccdc.c | 879 --------- + .../media/deprecated/vpfe_capture/dm644x_ccdc.h | 171 -- + .../deprecated/vpfe_capture/dm644x_ccdc_regs.h | 140 -- + .../staging/media/deprecated/vpfe_capture/isif.c | 1127 ----------- + .../staging/media/deprecated/vpfe_capture/isif.h | 518 ----- + .../media/deprecated/vpfe_capture/isif_regs.h | 256 --- + .../media/deprecated/vpfe_capture/vpfe_capture.c | 1902 ------------------- + drivers/tty/serial/Kconfig | 8 +- + drivers/tty/serial/samsung_tty.c | 199 -- + drivers/usb/gadget/udc/Kconfig | 27 +- + drivers/usb/gadget/udc/Makefile | 2 - + drivers/usb/gadget/udc/omap_udc.c | 24 +- + drivers/usb/gadget/udc/pxa25x_udc.c | 62 - + drivers/usb/gadget/udc/s3c-hsudc.c | 1319 ------------- + drivers/usb/gadget/udc/s3c2410_udc.c | 1980 -------------------- + drivers/usb/gadget/udc/s3c2410_udc.h | 99 - + drivers/usb/gadget/udc/s3c2410_udc_regs.h | 146 -- + drivers/usb/host/Kconfig | 33 +- + drivers/usb/host/ohci-hcd.c | 18 - + drivers/usb/host/ohci-omap.c | 6 +- + drivers/usb/host/ohci-pxa27x.c | 9 - + drivers/usb/host/ohci-sa1111.c | 5 +- + drivers/usb/host/ohci-tmio.c | 364 ---- + drivers/usb/phy/Kconfig | 17 - + drivers/usb/phy/Makefile | 1 - + drivers/usb/phy/phy-isp1301-omap.c | 1639 ---------------- + drivers/video/backlight/Kconfig | 14 - + drivers/video/backlight/Makefile | 2 - + drivers/video/backlight/locomolcd.c | 10 - + drivers/video/backlight/tosa_bl.c | 172 -- + drivers/video/backlight/tosa_bl.h | 8 - + drivers/video/backlight/tosa_lcd.c | 284 --- + drivers/video/fbdev/Kconfig | 72 +- + drivers/video/fbdev/Makefile | 3 - + drivers/video/fbdev/omap/Kconfig | 9 - + drivers/video/fbdev/omap/Makefile | 6 - + drivers/video/fbdev/omap/lcd_h3.c | 82 - + drivers/video/fbdev/omap/lcd_htcherald.c | 59 - + drivers/video/fbdev/omap/lcd_inn1510.c | 69 - + drivers/video/fbdev/omap/lcd_inn1610.c | 99 - + drivers/video/fbdev/omap/lcd_palmtt.c | 65 - + drivers/video/fbdev/omap/lcd_palmz71.c | 59 - + drivers/video/fbdev/omap/lcdc.c | 2 - + drivers/video/fbdev/s3c2410fb-regs-lcd.h | 143 -- + drivers/video/fbdev/s3c2410fb.c | 1142 ----------- + drivers/video/fbdev/s3c2410fb.h | 48 - + drivers/video/fbdev/sa1100fb.c | 1 - + drivers/video/fbdev/tmiofb.c | 1040 ---------- + drivers/video/fbdev/w100fb.c | 1644 ---------------- + drivers/video/fbdev/w100fb.h | 924 --------- + drivers/w1/masters/Kconfig | 7 - + drivers/w1/masters/Makefile | 1 - + drivers/w1/masters/ds1wm.c | 675 ------- + drivers/watchdog/Kconfig | 9 +- + drivers/watchdog/s3c2410_wdt.c | 84 +- + drivers/watchdog/wdt285.c | 2 - + include/dt-bindings/clock/s3c2410.h | 59 - + include/dt-bindings/clock/s3c2412.h | 70 - + include/dt-bindings/clock/s3c2443.h | 91 - + include/linux/amba/pl093.h | 77 - + include/linux/clk/davinci.h | 9 - + include/linux/clk/samsung.h | 32 - + include/linux/mfd/asic3.h | 313 ---- + include/linux/mfd/htc-pasic3.h | 54 - + include/linux/mfd/t7l66xb.h | 29 - + include/linux/mfd/tc6387xb.h | 19 - + include/linux/mfd/tc6393xb.h | 53 - + include/linux/mfd/tmio.h | 5 - + include/linux/parport.h | 5 - + include/linux/pda_power.h | 39 - + include/linux/platform_data/asoc-palm27x.h | 9 - + include/linux/platform_data/asoc-poodle.h | 16 - + include/linux/platform_data/asoc-s3c24xx_simtec.h | 30 - + include/linux/platform_data/ata-samsung_cf.h | 31 - + include/linux/platform_data/clk-s3c2410.h | 19 - + include/linux/platform_data/dma-mmp_tdma.h | 36 - + include/linux/platform_data/dma-s3c24xx.h | 48 - + include/linux/platform_data/fb-s3c2410.h | 99 - + include/linux/platform_data/irda-pxaficp.h | 26 - + include/linux/platform_data/irda-sa11x0.h | 17 - + .../linux/platform_data/keyboard-pxa930_rotary.h | 21 - + include/linux/platform_data/leds-omap.h | 19 - + include/linux/platform_data/leds-s3c24xx.h | 18 - + include/linux/platform_data/media/s5p_hdmi.h | 32 - + include/linux/platform_data/mmc-s3cmci.h | 51 - + include/linux/platform_data/mmp_audio.h | 18 - + include/linux/platform_data/mouse-pxa930_trkball.h | 11 - + include/linux/platform_data/rtc-v3020.h | 41 - + include/linux/platform_data/s3c-hsudc.h | 33 - + include/linux/platform_data/usb-pxa3xx-ulpi.h | 32 - + include/linux/platform_data/usb-s3c2410_udc.h | 33 - + include/linux/platform_data/voltage-omap.h | 1 - + include/linux/power/smartreflex.h | 3 - + include/linux/s3c_adc_battery.h | 39 - + include/linux/soc/mmp/cputype.h | 24 +- + include/linux/soc/samsung/s3c-adc.h | 32 - + include/linux/soc/samsung/s3c-cpufreq-core.h | 299 --- + include/linux/soc/samsung/s3c-pm.h | 58 - + include/linux/soc/ti/omap1-soc.h | 35 - + include/linux/spi/s3c24xx-fiq.h | 33 - + include/linux/spi/s3c24xx.h | 20 - + include/linux/ucb1400.h | 160 -- + include/linux/usb/musb.h | 2 - + include/linux/z2_battery.h | 17 - + include/media/davinci/vpbe.h | 184 -- + include/media/davinci/vpbe_display.h | 122 -- + include/media/davinci/vpbe_osd.h | 382 ---- + include/media/davinci/vpbe_types.h | 74 - + include/media/davinci/vpbe_venc.h | 37 - + include/media/davinci/vpfe_capture.h | 177 -- + include/media/davinci/vpss.h | 111 -- + include/sound/s3c24xx_uda134x.h | 14 - + include/video/w100fb.h | 147 -- + sound/Kconfig | 1 - + sound/pci/ac97/ac97_codec.c | 1 - + sound/pci/ac97/ac97_patch.c | 40 - + sound/soc/cirrus/Kconfig | 23 - + sound/soc/cirrus/Makefile | 6 - + sound/soc/cirrus/ep93xx-ac97.c | 446 ----- + sound/soc/cirrus/simone.c | 86 - + sound/soc/cirrus/snappercl15.c | 134 -- + sound/soc/pxa/Kconfig | 181 +- + sound/soc/pxa/Makefile | 33 - + sound/soc/pxa/brownstone.c | 133 -- + sound/soc/pxa/corgi.c | 332 ---- + sound/soc/pxa/e740_wm9705.c | 168 -- + sound/soc/pxa/e750_wm9705.c | 147 -- + sound/soc/pxa/e800_wm9712.c | 147 -- + sound/soc/pxa/em-x270.c | 92 - + sound/soc/pxa/hx4700.c | 207 -- + sound/soc/pxa/magician.c | 366 ---- + sound/soc/pxa/mioa701_wm9713.c | 201 -- + sound/soc/pxa/mmp-pcm.c | 267 --- + sound/soc/pxa/palm27x.c | 162 -- + sound/soc/pxa/poodle.c | 291 --- + sound/soc/pxa/tosa.c | 255 --- + sound/soc/pxa/ttc-dkb.c | 143 -- + sound/soc/pxa/z2.c | 218 --- + sound/soc/pxa/zylonite.c | 266 --- + sound/soc/samsung/Kconfig | 93 - + sound/soc/samsung/Makefile | 26 - + sound/soc/samsung/h1940_uda1380.c | 224 --- + sound/soc/samsung/jive_wm8750.c | 143 -- + sound/soc/samsung/neo1973_wm8753.c | 360 ---- + sound/soc/samsung/regs-i2s-v2.h | 111 -- + sound/soc/samsung/regs-iis.h | 66 - + sound/soc/samsung/rx1950_uda1380.c | 245 --- + sound/soc/samsung/s3c-i2s-v2.c | 670 ------- + sound/soc/samsung/s3c-i2s-v2.h | 108 -- + sound/soc/samsung/s3c2412-i2s.c | 251 --- + sound/soc/samsung/s3c2412-i2s.h | 22 - + sound/soc/samsung/s3c24xx-i2s.c | 463 ----- + sound/soc/samsung/s3c24xx-i2s.h | 31 - + sound/soc/samsung/s3c24xx_simtec.c | 372 ---- + sound/soc/samsung/s3c24xx_simtec.h | 18 - + sound/soc/samsung/s3c24xx_simtec_hermes.c | 112 -- + sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c | 100 - + sound/soc/samsung/s3c24xx_uda134x.c | 257 --- + sound/soc/samsung/smartq_wm8987.c | 224 --- + sound/soc/samsung/smdk_wm8580.c | 211 --- + sound/soc/ti/Kconfig | 40 - + sound/soc/ti/Makefile | 2 - + sound/soc/ti/davinci-evm.c | 267 +-- + sound/soc/ti/davinci-vcif.c | 247 --- + 909 files changed, 255 insertions(+), 155550 deletions(-) + delete mode 100644 Documentation/admin-guide/media/davinci-vpbe.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/cpufreq.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/eb2410itx.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/gpio.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/h1940.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/index.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/nand.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/overview.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/s3c2412.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/s3c2413.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/smdk2440.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/suspend.rst + delete mode 100644 Documentation/arm/samsung-s3c24xx/usb-host.rst + delete mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2410-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2412-clock.txt + delete mode 100644 Documentation/devicetree/bindings/clock/samsung,s3c2443-clock.txt + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/samsung,s3c24xx-irq.txt + delete mode 100644 Documentation/devicetree/bindings/mmc/samsung,s3cmci.txt + delete mode 100644 Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst + delete mode 100644 arch/arm/boot/dts/s3c2410-pinctrl.h + delete mode 100644 arch/arm/boot/dts/s3c2416-pinctrl.dtsi + delete mode 100644 arch/arm/boot/dts/s3c2416-smdk2416.dts + delete mode 100644 arch/arm/boot/dts/s3c2416.dtsi + delete mode 100644 arch/arm/boot/dts/s3c24xx.dtsi + delete mode 100644 arch/arm/configs/badge4_defconfig + delete mode 100644 arch/arm/configs/cerfcube_defconfig + delete mode 100644 arch/arm/configs/cm_x300_defconfig + delete mode 100644 arch/arm/configs/cns3420vb_defconfig + delete mode 100644 arch/arm/configs/colibri_pxa270_defconfig + delete mode 100644 arch/arm/configs/colibri_pxa300_defconfig + delete mode 100644 arch/arm/configs/corgi_defconfig + delete mode 100644 arch/arm/configs/eseries_pxa_defconfig + delete mode 100644 arch/arm/configs/ezx_defconfig + delete mode 100644 arch/arm/configs/h5000_defconfig + delete mode 100644 arch/arm/configs/hackkit_defconfig + delete mode 100644 arch/arm/configs/iop32x_defconfig + delete mode 100644 arch/arm/configs/lart_defconfig + delete mode 100644 arch/arm/configs/lpd270_defconfig + delete mode 100644 arch/arm/configs/lubbock_defconfig + delete mode 100644 arch/arm/configs/magician_defconfig + delete mode 100644 arch/arm/configs/mainstone_defconfig + delete mode 100644 arch/arm/configs/mini2440_defconfig + delete mode 100644 arch/arm/configs/palmz72_defconfig + delete mode 100644 arch/arm/configs/pcm027_defconfig + delete mode 100644 arch/arm/configs/pleb_defconfig + delete mode 100644 arch/arm/configs/pxa255-idp_defconfig + delete mode 100644 arch/arm/configs/s3c2410_defconfig + delete mode 100644 arch/arm/configs/shannon_defconfig + delete mode 100644 arch/arm/configs/simpad_defconfig + delete mode 100644 arch/arm/configs/tct_hammer_defconfig + delete mode 100644 arch/arm/configs/trizeps4_defconfig + delete mode 100644 arch/arm/configs/viper_defconfig + delete mode 100644 arch/arm/configs/xcep_defconfig + delete mode 100644 arch/arm/configs/zeus_defconfig + delete mode 100644 arch/arm/mach-cns3xxx/Kconfig + delete mode 100644 arch/arm/mach-cns3xxx/Makefile + delete mode 100644 arch/arm/mach-cns3xxx/cns3420vb.c + delete mode 100644 arch/arm/mach-cns3xxx/cns3xxx.h + delete mode 100644 arch/arm/mach-cns3xxx/core.c + delete mode 100644 arch/arm/mach-cns3xxx/core.h + delete mode 100644 arch/arm/mach-cns3xxx/devices.c + delete mode 100644 arch/arm/mach-cns3xxx/devices.h + delete mode 100644 arch/arm/mach-cns3xxx/pcie.c + delete mode 100644 arch/arm/mach-cns3xxx/pm.c + delete mode 100644 arch/arm/mach-cns3xxx/pm.h + delete mode 100644 arch/arm/mach-davinci/asp.h + delete mode 100644 arch/arm/mach-davinci/board-da830-evm.c + delete mode 100644 arch/arm/mach-davinci/board-da850-evm.c + delete mode 100644 arch/arm/mach-davinci/board-dm355-evm.c + delete mode 100644 arch/arm/mach-davinci/board-dm355-leopard.c + delete mode 100644 arch/arm/mach-davinci/board-dm365-evm.c + delete mode 100644 arch/arm/mach-davinci/board-mityomapl138.c + delete mode 100644 arch/arm/mach-davinci/board-omapl138-hawk.c + delete mode 100644 arch/arm/mach-davinci/davinci.h + delete mode 100644 arch/arm/mach-davinci/devices.c + delete mode 100644 arch/arm/mach-davinci/dm355.c + delete mode 100644 arch/arm/mach-davinci/dm365.c + delete mode 100644 arch/arm/mach-davinci/serial.c + delete mode 100644 arch/arm/mach-davinci/serial.h + delete mode 100644 arch/arm/mach-davinci/usb-da8xx.c + delete mode 100644 arch/arm/mach-davinci/usb.c + delete mode 100644 arch/arm/mach-dove/dove-db-setup.c + delete mode 100644 arch/arm/mach-ep93xx/adssphere.c + delete mode 100644 arch/arm/mach-ep93xx/gesbc9312.c + delete mode 100644 arch/arm/mach-ep93xx/micro9.c + delete mode 100644 arch/arm/mach-ep93xx/simone.c + delete mode 100644 arch/arm/mach-ep93xx/snappercl15.c + delete mode 100644 arch/arm/mach-footbridge/cats-hw.c + delete mode 100644 arch/arm/mach-footbridge/cats-pci.c + delete mode 100644 arch/arm/mach-iop32x/Kconfig + delete mode 100644 arch/arm/mach-iop32x/Makefile + delete mode 100644 arch/arm/mach-iop32x/adma.c + delete mode 100644 arch/arm/mach-iop32x/cp6.c + delete mode 100644 arch/arm/mach-iop32x/em7210.c + delete mode 100644 arch/arm/mach-iop32x/glantank.c + delete mode 100644 arch/arm/mach-iop32x/glantank.h + delete mode 100644 arch/arm/mach-iop32x/gpio-iop32x.h + delete mode 100644 arch/arm/mach-iop32x/hardware.h + delete mode 100644 arch/arm/mach-iop32x/i2c.c + delete mode 100644 arch/arm/mach-iop32x/iop3xx.h + delete mode 100644 arch/arm/mach-iop32x/iq31244.c + delete mode 100644 arch/arm/mach-iop32x/iq31244.h + delete mode 100644 arch/arm/mach-iop32x/iq80321.c + delete mode 100644 arch/arm/mach-iop32x/iq80321.h + delete mode 100644 arch/arm/mach-iop32x/irq.c + delete mode 100644 arch/arm/mach-iop32x/irqs.h + delete mode 100644 arch/arm/mach-iop32x/n2100.c + delete mode 100644 arch/arm/mach-iop32x/n2100.h + delete mode 100644 arch/arm/mach-iop32x/pci.c + delete mode 100644 arch/arm/mach-iop32x/pmu.c + delete mode 100644 arch/arm/mach-iop32x/restart.c + delete mode 100644 arch/arm/mach-iop32x/setup.c + delete mode 100644 arch/arm/mach-iop32x/time.c + delete mode 100644 arch/arm/mach-mmp/aspenite.c + delete mode 100644 arch/arm/mach-mmp/avengers_lite.c + delete mode 100644 arch/arm/mach-mmp/brownstone.c + delete mode 100644 arch/arm/mach-mmp/devices.c + delete mode 100644 arch/arm/mach-mmp/devices.h + delete mode 100644 arch/arm/mach-mmp/flint.c + delete mode 100644 arch/arm/mach-mmp/gplugd.c + delete mode 100644 arch/arm/mach-mmp/irqs.h + delete mode 100644 arch/arm/mach-mmp/jasper.c + delete mode 100644 arch/arm/mach-mmp/mfp-mmp2.h + delete mode 100644 arch/arm/mach-mmp/mfp-pxa168.h + delete mode 100644 arch/arm/mach-mmp/mfp-pxa910.h + delete mode 100644 arch/arm/mach-mmp/mfp.h + delete mode 100644 arch/arm/mach-mmp/mmp2.c + delete mode 100644 arch/arm/mach-mmp/mmp2.h + delete mode 100644 arch/arm/mach-mmp/pm-mmp2.c + delete mode 100644 arch/arm/mach-mmp/pm-mmp2.h + delete mode 100644 arch/arm/mach-mmp/pm-pxa910.c + delete mode 100644 arch/arm/mach-mmp/pm-pxa910.h + delete mode 100644 arch/arm/mach-mmp/pxa168.c + delete mode 100644 arch/arm/mach-mmp/pxa168.h + delete mode 100644 arch/arm/mach-mmp/pxa910.c + delete mode 100644 arch/arm/mach-mmp/pxa910.h + delete mode 100644 arch/arm/mach-mmp/regs-apbc.h + delete mode 100644 arch/arm/mach-mmp/regs-apmu.h + delete mode 100644 arch/arm/mach-mmp/regs-icu.h + delete mode 100644 arch/arm/mach-mmp/regs-usb.h + delete mode 100644 arch/arm/mach-mmp/sram.c + delete mode 100644 arch/arm/mach-mmp/teton_bga.c + delete mode 100644 arch/arm/mach-mmp/teton_bga.h + delete mode 100644 arch/arm/mach-mmp/ttc_dkb.c + delete mode 100644 arch/arm/mach-mv78xx0/db78x00-bp-setup.c + delete mode 100644 arch/arm/mach-mv78xx0/rd78x00-masa-setup.c + delete mode 100644 arch/arm/mach-omap1/board-fsample.c + delete mode 100644 arch/arm/mach-omap1/board-generic.c + delete mode 100644 arch/arm/mach-omap1/board-h2-mmc.c + delete mode 100644 arch/arm/mach-omap1/board-h2.c + delete mode 100644 arch/arm/mach-omap1/board-h2.h + delete mode 100644 arch/arm/mach-omap1/board-h3-mmc.c + delete mode 100644 arch/arm/mach-omap1/board-h3.c + delete mode 100644 arch/arm/mach-omap1/board-h3.h + delete mode 100644 arch/arm/mach-omap1/board-htcherald.c + delete mode 100644 arch/arm/mach-omap1/board-innovator.c + delete mode 100644 arch/arm/mach-omap1/board-nand.c + delete mode 100644 arch/arm/mach-omap1/board-palmtt.c + delete mode 100644 arch/arm/mach-omap1/board-palmz71.c + delete mode 100644 arch/arm/mach-omap1/board-perseus2.c + delete mode 100644 arch/arm/mach-omap1/fpga.c + delete mode 100644 arch/arm/mach-omap1/fpga.h + delete mode 100644 arch/arm/mach-omap1/gpio7xx.c + delete mode 100644 arch/arm/mach-omap1/omap1510.h + delete mode 100644 arch/arm/mach-omap1/omap16xx.h + delete mode 100644 arch/arm/mach-omap1/omap7xx.h + delete mode 100644 arch/arm/mach-omap2/clock3xxx.h + delete mode 100644 arch/arm/mach-omap2/omap_hwmod_reset.c + delete mode 100644 arch/arm/mach-omap2/pm24xx.c + delete mode 100644 arch/arm/mach-omap2/serial.h + delete mode 100644 arch/arm/mach-omap2/usb.h + delete mode 100644 arch/arm/mach-orion5x/db88f5281-setup.c + delete mode 100644 arch/arm/mach-orion5x/ls_hgl-setup.c + delete mode 100644 arch/arm/mach-orion5x/rd88f5181l-fxo-setup.c + delete mode 100644 arch/arm/mach-orion5x/rd88f5181l-ge-setup.c + delete mode 100644 arch/arm/mach-orion5x/rd88f5182-setup.c + delete mode 100644 arch/arm/mach-orion5x/rd88f6183ap-ge-setup.c + delete mode 100644 arch/arm/mach-orion5x/wnr854t-setup.c + delete mode 100644 arch/arm/mach-orion5x/wrt350n-v2-setup.c + delete mode 100644 arch/arm/mach-pxa/balloon3-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/balloon3.c + delete mode 100644 arch/arm/mach-pxa/balloon3.h + delete mode 100644 arch/arm/mach-pxa/capc7117.c + delete mode 100644 arch/arm/mach-pxa/cm-x300.c + delete mode 100644 arch/arm/mach-pxa/colibri-evalboard.c + delete mode 100644 arch/arm/mach-pxa/colibri-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/colibri-pxa270-income.c + delete mode 100644 arch/arm/mach-pxa/colibri-pxa270.c + delete mode 100644 arch/arm/mach-pxa/colibri-pxa300.c + delete mode 100644 arch/arm/mach-pxa/colibri-pxa320.c + delete mode 100644 arch/arm/mach-pxa/colibri-pxa3xx.c + delete mode 100644 arch/arm/mach-pxa/colibri.h + delete mode 100644 arch/arm/mach-pxa/corgi.c + delete mode 100644 arch/arm/mach-pxa/corgi.h + delete mode 100644 arch/arm/mach-pxa/corgi_pm.c + delete mode 100644 arch/arm/mach-pxa/csb701.c + delete mode 100644 arch/arm/mach-pxa/csb726.c + delete mode 100644 arch/arm/mach-pxa/csb726.h + delete mode 100644 arch/arm/mach-pxa/e740-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/eseries-gpio.h + delete mode 100644 arch/arm/mach-pxa/eseries-irq.h + delete mode 100644 arch/arm/mach-pxa/eseries.c + delete mode 100644 arch/arm/mach-pxa/ezx.c + delete mode 100644 arch/arm/mach-pxa/h5000.c + delete mode 100644 arch/arm/mach-pxa/h5000.h + delete mode 100644 arch/arm/mach-pxa/himalaya.c + delete mode 100644 arch/arm/mach-pxa/hx4700-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/hx4700.c + delete mode 100644 arch/arm/mach-pxa/hx4700.h + delete mode 100644 arch/arm/mach-pxa/icontrol.c + delete mode 100644 arch/arm/mach-pxa/idp.c + delete mode 100644 arch/arm/mach-pxa/idp.h + delete mode 100644 arch/arm/mach-pxa/littleton.c + delete mode 100644 arch/arm/mach-pxa/littleton.h + delete mode 100644 arch/arm/mach-pxa/lpd270.c + delete mode 100644 arch/arm/mach-pxa/lpd270.h + delete mode 100644 arch/arm/mach-pxa/lubbock.c + delete mode 100644 arch/arm/mach-pxa/lubbock.h + delete mode 100644 arch/arm/mach-pxa/magician.c + delete mode 100644 arch/arm/mach-pxa/magician.h + delete mode 100644 arch/arm/mach-pxa/mainstone.c + delete mode 100644 arch/arm/mach-pxa/mainstone.h + delete mode 100644 arch/arm/mach-pxa/mfp-pxa320.h + delete mode 100644 arch/arm/mach-pxa/mfp-pxa930.h + delete mode 100644 arch/arm/mach-pxa/mioa701.c + delete mode 100644 arch/arm/mach-pxa/mioa701.h + delete mode 100644 arch/arm/mach-pxa/mioa701_bootresume.S + delete mode 100644 arch/arm/mach-pxa/mp900.c + delete mode 100644 arch/arm/mach-pxa/mxm8x10.c + delete mode 100644 arch/arm/mach-pxa/mxm8x10.h + delete mode 100644 arch/arm/mach-pxa/palm27x.c + delete mode 100644 arch/arm/mach-pxa/palm27x.h + delete mode 100644 arch/arm/mach-pxa/palmld-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/palmld.c + delete mode 100644 arch/arm/mach-pxa/palmld.h + delete mode 100644 arch/arm/mach-pxa/palmt5.c + delete mode 100644 arch/arm/mach-pxa/palmt5.h + delete mode 100644 arch/arm/mach-pxa/palmtc-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/palmtc.c + delete mode 100644 arch/arm/mach-pxa/palmtc.h + delete mode 100644 arch/arm/mach-pxa/palmte2.c + delete mode 100644 arch/arm/mach-pxa/palmte2.h + delete mode 100644 arch/arm/mach-pxa/palmtreo.c + delete mode 100644 arch/arm/mach-pxa/palmtreo.h + delete mode 100644 arch/arm/mach-pxa/palmtx-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/palmtx.c + delete mode 100644 arch/arm/mach-pxa/palmtx.h + delete mode 100644 arch/arm/mach-pxa/palmz72.c + delete mode 100644 arch/arm/mach-pxa/palmz72.h + delete mode 100644 arch/arm/mach-pxa/pcm027.c + delete mode 100644 arch/arm/mach-pxa/pcm027.h + delete mode 100644 arch/arm/mach-pxa/pcm990-baseboard.c + delete mode 100644 arch/arm/mach-pxa/pcm990_baseboard.h + delete mode 100644 arch/arm/mach-pxa/poodle.c + delete mode 100644 arch/arm/mach-pxa/poodle.h + delete mode 100644 arch/arm/mach-pxa/pxa3xx-ulpi.c + delete mode 100644 arch/arm/mach-pxa/pxa930.c + delete mode 100644 arch/arm/mach-pxa/pxa930.h + delete mode 100644 arch/arm/mach-pxa/pxa_cplds_irqs.c + delete mode 100644 arch/arm/mach-pxa/regs-u2d.h + delete mode 100644 arch/arm/mach-pxa/regs-uart.h + delete mode 100644 arch/arm/mach-pxa/saar.c + delete mode 100644 arch/arm/mach-pxa/tavorevb.c + delete mode 100644 arch/arm/mach-pxa/tosa-bt.c + delete mode 100644 arch/arm/mach-pxa/tosa.c + delete mode 100644 arch/arm/mach-pxa/tosa.h + delete mode 100644 arch/arm/mach-pxa/tosa_bt.h + delete mode 100644 arch/arm/mach-pxa/trizeps4-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/trizeps4.c + delete mode 100644 arch/arm/mach-pxa/trizeps4.h + delete mode 100644 arch/arm/mach-pxa/viper-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/viper-pcmcia.h + delete mode 100644 arch/arm/mach-pxa/viper.c + delete mode 100644 arch/arm/mach-pxa/viper.h + delete mode 100644 arch/arm/mach-pxa/vpac270-pcmcia.c + delete mode 100644 arch/arm/mach-pxa/vpac270.c + delete mode 100644 arch/arm/mach-pxa/vpac270.h + delete mode 100644 arch/arm/mach-pxa/xcep.c + delete mode 100644 arch/arm/mach-pxa/z2.c + delete mode 100644 arch/arm/mach-pxa/z2.h + delete mode 100644 arch/arm/mach-pxa/zeus.c + delete mode 100644 arch/arm/mach-pxa/zeus.h + delete mode 100644 arch/arm/mach-pxa/zylonite.c + delete mode 100644 arch/arm/mach-pxa/zylonite.h + delete mode 100644 arch/arm/mach-pxa/zylonite_pxa300.c + delete mode 100644 arch/arm/mach-pxa/zylonite_pxa320.c + delete mode 100644 arch/arm/mach-s3c/Kconfig.s3c24xx + delete mode 100644 arch/arm/mach-s3c/Makefile.s3c24xx + delete mode 100644 arch/arm/mach-s3c/adc-core.h + delete mode 100644 arch/arm/mach-s3c/adc.c + delete mode 100644 arch/arm/mach-s3c/anubis.h + delete mode 100644 arch/arm/mach-s3c/ata-core-s3c64xx.h + delete mode 100644 arch/arm/mach-s3c/backlight-s3c64xx.h + delete mode 100644 arch/arm/mach-s3c/bast-ide.c + delete mode 100644 arch/arm/mach-s3c/bast-irq.c + delete mode 100644 arch/arm/mach-s3c/bast.h + delete mode 100644 arch/arm/mach-s3c/common-smdk-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/common-smdk-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/cpufreq-utils-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/dev-backlight-s3c64xx.c + delete mode 100644 arch/arm/mach-s3c/dma-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/dma-s3c64xx.h + delete mode 100644 arch/arm/mach-s3c/dma.h + delete mode 100644 arch/arm/mach-s3c/fb-core-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/gpio-samsung-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/gta02.h + delete mode 100644 arch/arm/mach-s3c/h1940-bluetooth.c + delete mode 100644 arch/arm/mach-s3c/h1940.h + delete mode 100644 arch/arm/mach-s3c/hardware-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/iotiming-s3c2410.c + delete mode 100644 arch/arm/mach-s3c/iotiming-s3c2412.c + delete mode 100644 arch/arm/mach-s3c/irq-pm-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/irq-s3c24xx-fiq-exports.c + delete mode 100644 arch/arm/mach-s3c/irq-s3c24xx-fiq.S + delete mode 100644 arch/arm/mach-s3c/irq-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/irqs-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/mach-amlm5900.c + delete mode 100644 arch/arm/mach-s3c/mach-anubis.c + delete mode 100644 arch/arm/mach-s3c/mach-anw6410.c + delete mode 100644 arch/arm/mach-s3c/mach-at2440evb.c + delete mode 100644 arch/arm/mach-s3c/mach-bast.c + delete mode 100644 arch/arm/mach-s3c/mach-gta02.c + delete mode 100644 arch/arm/mach-s3c/mach-h1940.c + delete mode 100644 arch/arm/mach-s3c/mach-hmt.c + delete mode 100644 arch/arm/mach-s3c/mach-jive.c + delete mode 100644 arch/arm/mach-s3c/mach-mini2440.c + delete mode 100644 arch/arm/mach-s3c/mach-mini6410.c + delete mode 100644 arch/arm/mach-s3c/mach-n30.c + delete mode 100644 arch/arm/mach-s3c/mach-ncp.c + delete mode 100644 arch/arm/mach-s3c/mach-nexcoder.c + delete mode 100644 arch/arm/mach-s3c/mach-osiris-dvs.c + delete mode 100644 arch/arm/mach-s3c/mach-osiris.c + delete mode 100644 arch/arm/mach-s3c/mach-otom.c + delete mode 100644 arch/arm/mach-s3c/mach-qt2410.c + delete mode 100644 arch/arm/mach-s3c/mach-real6410.c + delete mode 100644 arch/arm/mach-s3c/mach-rx1950.c + delete mode 100644 arch/arm/mach-s3c/mach-rx3715.c + delete mode 100644 arch/arm/mach-s3c/mach-s3c2416-dt.c + delete mode 100644 arch/arm/mach-s3c/mach-smartq.c + delete mode 100644 arch/arm/mach-s3c/mach-smartq.h + delete mode 100644 arch/arm/mach-s3c/mach-smartq5.c + delete mode 100644 arch/arm/mach-s3c/mach-smartq7.c + delete mode 100644 arch/arm/mach-s3c/mach-smdk2410.c + delete mode 100644 arch/arm/mach-s3c/mach-smdk2413.c + delete mode 100644 arch/arm/mach-s3c/mach-smdk2416.c + delete mode 100644 arch/arm/mach-s3c/mach-smdk2440.c + delete mode 100644 arch/arm/mach-s3c/mach-smdk2443.c + delete mode 100644 arch/arm/mach-s3c/mach-smdk6400.c + delete mode 100644 arch/arm/mach-s3c/mach-smdk6410.c + delete mode 100644 arch/arm/mach-s3c/mach-tct_hammer.c + delete mode 100644 arch/arm/mach-s3c/mach-vr1000.c + delete mode 100644 arch/arm/mach-s3c/mach-vstms.c + delete mode 100644 arch/arm/mach-s3c/map-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/nand-core-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/onenand-core-s3c64xx.h + delete mode 100644 arch/arm/mach-s3c/osiris.h + delete mode 100644 arch/arm/mach-s3c/otom.h + delete mode 100644 arch/arm/mach-s3c/pll-s3c2410.c + delete mode 100644 arch/arm/mach-s3c/pll-s3c2440-12000000.c + delete mode 100644 arch/arm/mach-s3c/pll-s3c2440-16934400.c + delete mode 100644 arch/arm/mach-s3c/pm-core-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/pm-h1940.S + delete mode 100644 arch/arm/mach-s3c/pm-s3c2410.c + delete mode 100644 arch/arm/mach-s3c/pm-s3c2412.c + delete mode 100644 arch/arm/mach-s3c/pm-s3c2416.c + delete mode 100644 arch/arm/mach-s3c/pm-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/regs-adc.h + delete mode 100644 arch/arm/mach-s3c/regs-clock-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/regs-dsc-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/regs-gpio-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/regs-irq-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/regs-mem-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/regs-s3c2443-clock.h + delete mode 100644 arch/arm/mach-s3c/regs-srom-s3c64xx.h + delete mode 100644 arch/arm/mach-s3c/rtc-core-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/s3c2410.c + delete mode 100644 arch/arm/mach-s3c/s3c2412-power.h + delete mode 100644 arch/arm/mach-s3c/s3c2412.c + delete mode 100644 arch/arm/mach-s3c/s3c2412.h + delete mode 100644 arch/arm/mach-s3c/s3c2416.c + delete mode 100644 arch/arm/mach-s3c/s3c2440.c + delete mode 100644 arch/arm/mach-s3c/s3c2442.c + delete mode 100644 arch/arm/mach-s3c/s3c2443.c + delete mode 100644 arch/arm/mach-s3c/s3c244x.c + delete mode 100644 arch/arm/mach-s3c/s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/s3c6400.c + delete mode 100644 arch/arm/mach-s3c/setup-i2c-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/setup-ide-s3c64xx.c + delete mode 100644 arch/arm/mach-s3c/setup-sdhci-gpio-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/setup-spi-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/setup-ts-s3c24xx.c + delete mode 100644 arch/arm/mach-s3c/simtec-audio.c + delete mode 100644 arch/arm/mach-s3c/simtec-nor.c + delete mode 100644 arch/arm/mach-s3c/simtec-pm.c + delete mode 100644 arch/arm/mach-s3c/simtec-usb.c + delete mode 100644 arch/arm/mach-s3c/simtec.h + delete mode 100644 arch/arm/mach-s3c/sleep-s3c2410.S + delete mode 100644 arch/arm/mach-s3c/sleep-s3c2412.S + delete mode 100644 arch/arm/mach-s3c/sleep-s3c24xx.S + delete mode 100644 arch/arm/mach-s3c/spi-core-s3c24xx.h + delete mode 100644 arch/arm/mach-s3c/vr1000.h + delete mode 100644 arch/arm/mach-sa1100/badge4.c + delete mode 100644 arch/arm/mach-sa1100/cerf.c + delete mode 100644 arch/arm/mach-sa1100/h3100.c + delete mode 100644 arch/arm/mach-sa1100/hackkit.c + delete mode 100644 arch/arm/mach-sa1100/include/mach/badge4.h + delete mode 100644 arch/arm/mach-sa1100/include/mach/cerf.h + delete mode 100644 arch/arm/mach-sa1100/include/mach/nanoengine.h + delete mode 100644 arch/arm/mach-sa1100/include/mach/shannon.h + delete mode 100644 arch/arm/mach-sa1100/include/mach/simpad.h + delete mode 100644 arch/arm/mach-sa1100/lart.c + delete mode 100644 arch/arm/mach-sa1100/nanoengine.c + delete mode 100644 arch/arm/mach-sa1100/pci-nanoengine.c + delete mode 100644 arch/arm/mach-sa1100/pleb.c + delete mode 100644 arch/arm/mach-sa1100/shannon.c + delete mode 100644 arch/arm/mach-sa1100/simpad.c + delete mode 100644 drivers/ata/pata_palmld.c + delete mode 100644 drivers/ata/pata_samsung_cf.c + delete mode 100644 drivers/clk/davinci/pll-dm355.c + delete mode 100644 drivers/clk/davinci/pll-dm365.c + delete mode 100644 drivers/clk/davinci/psc-dm355.c + delete mode 100644 drivers/clk/davinci/psc-dm365.c + delete mode 100644 drivers/clk/samsung/clk-s3c2410-dclk.c + delete mode 100644 drivers/clk/samsung/clk-s3c2410.c + delete mode 100644 drivers/clk/samsung/clk-s3c2412.c + delete mode 100644 drivers/clk/samsung/clk-s3c2443.c + delete mode 100644 drivers/cpufreq/s3c2410-cpufreq.c + delete mode 100644 drivers/cpufreq/s3c2412-cpufreq.c + delete mode 100644 drivers/cpufreq/s3c2416-cpufreq.c + delete mode 100644 drivers/cpufreq/s3c2440-cpufreq.c + delete mode 100644 drivers/cpufreq/s3c24xx-cpufreq-debugfs.c + delete mode 100644 drivers/cpufreq/s3c24xx-cpufreq.c + delete mode 100644 drivers/cpufreq/sa1100-cpufreq.c + delete mode 100644 drivers/dma/s3c24xx-dma.c + delete mode 100644 drivers/gpio/gpio-iop.c + delete mode 100644 drivers/gpio/gpio-ucb1400.c + delete mode 100644 drivers/hwmon/s3c-hwmon.c + delete mode 100644 drivers/input/keyboard/davinci_keyscan.c + delete mode 100644 drivers/input/keyboard/pxa930_rotary.c + delete mode 100644 drivers/input/mouse/pxa930_trkball.c + delete mode 100644 drivers/input/touchscreen/s3c2410_ts.c + delete mode 100644 drivers/input/touchscreen/ucb1400_ts.c + delete mode 100644 drivers/input/touchscreen/zylonite-wm97xx.c + delete mode 100644 drivers/irqchip/irq-davinci-aintc.c + delete mode 100644 drivers/leds/leds-asic3.c + delete mode 100644 drivers/leds/leds-s3c24xx.c + delete mode 100644 drivers/media/platform/ti/davinci/vpbe.c + delete mode 100644 drivers/media/platform/ti/davinci/vpbe_display.c + delete mode 100644 drivers/media/platform/ti/davinci/vpbe_osd.c + delete mode 100644 drivers/media/platform/ti/davinci/vpbe_osd_regs.h + delete mode 100644 drivers/media/platform/ti/davinci/vpbe_venc.c + delete mode 100644 drivers/media/platform/ti/davinci/vpbe_venc_regs.h + delete mode 100644 drivers/media/platform/ti/davinci/vpss.c + delete mode 100644 drivers/mfd/asic3.c + delete mode 100644 drivers/mfd/htc-pasic3.c + delete mode 100644 drivers/mfd/t7l66xb.c + delete mode 100644 drivers/mfd/tc6387xb.c + delete mode 100644 drivers/mfd/tc6393xb.c + delete mode 100644 drivers/mfd/tmio_core.c + delete mode 100644 drivers/mfd/ucb1400_core.c + delete mode 100644 drivers/mmc/host/s3cmci.c + delete mode 100644 drivers/mmc/host/s3cmci.h + delete mode 100644 drivers/mmc/host/sdhci-cns3xxx.c + delete mode 100644 drivers/mmc/host/tmio_mmc.c + delete mode 100644 drivers/mtd/nand/raw/tmio_nand.c + delete mode 100644 drivers/parport/parport_ax88796.c + delete mode 100644 drivers/pcmcia/pxa2xx_mainstone.c + delete mode 100644 drivers/pcmcia/sa1100_simpad.c + delete mode 100644 drivers/pcmcia/sa1111_badge4.c + delete mode 100644 drivers/pcmcia/sa1111_lubbock.c + delete mode 100644 drivers/pinctrl/samsung/pinctrl-s3c24xx.c + delete mode 100644 drivers/power/supply/pda_power.c + delete mode 100644 drivers/power/supply/s3c_adc_battery.c + delete mode 100644 drivers/power/supply/tosa_battery.c + delete mode 100644 drivers/power/supply/z2_battery.c + delete mode 100644 drivers/rtc/rtc-v3020.c + delete mode 100644 drivers/soc/samsung/s3c-pm-debug.c + delete mode 100644 drivers/spi/spi-omap-100k.c + delete mode 100644 drivers/spi/spi-s3c24xx-regs.h + delete mode 100644 drivers/spi/spi-s3c24xx.c + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/Kconfig + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/Makefile + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/TODO + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/ccdc_hw_device.h + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.c + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc.h + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm355_ccdc_regs.h + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.c + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc.h + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/dm644x_ccdc_regs.h + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif.c + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif.h + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/isif_regs.h + delete mode 100644 drivers/staging/media/deprecated/vpfe_capture/vpfe_capture.c + delete mode 100644 drivers/usb/gadget/udc/s3c-hsudc.c + delete mode 100644 drivers/usb/gadget/udc/s3c2410_udc.c + delete mode 100644 drivers/usb/gadget/udc/s3c2410_udc.h + delete mode 100644 drivers/usb/gadget/udc/s3c2410_udc_regs.h + delete mode 100644 drivers/usb/host/ohci-tmio.c + delete mode 100644 drivers/usb/phy/phy-isp1301-omap.c + delete mode 100644 drivers/video/backlight/tosa_bl.c + delete mode 100644 drivers/video/backlight/tosa_bl.h + delete mode 100644 drivers/video/backlight/tosa_lcd.c + delete mode 100644 drivers/video/fbdev/omap/lcd_h3.c + delete mode 100644 drivers/video/fbdev/omap/lcd_htcherald.c + delete mode 100644 drivers/video/fbdev/omap/lcd_inn1510.c + delete mode 100644 drivers/video/fbdev/omap/lcd_inn1610.c + delete mode 100644 drivers/video/fbdev/omap/lcd_palmtt.c + delete mode 100644 drivers/video/fbdev/omap/lcd_palmz71.c + delete mode 100644 drivers/video/fbdev/s3c2410fb-regs-lcd.h + delete mode 100644 drivers/video/fbdev/s3c2410fb.c + delete mode 100644 drivers/video/fbdev/s3c2410fb.h + delete mode 100644 drivers/video/fbdev/tmiofb.c + delete mode 100644 drivers/video/fbdev/w100fb.c + delete mode 100644 drivers/video/fbdev/w100fb.h + delete mode 100644 drivers/w1/masters/ds1wm.c + delete mode 100644 include/dt-bindings/clock/s3c2410.h + delete mode 100644 include/dt-bindings/clock/s3c2412.h + delete mode 100644 include/dt-bindings/clock/s3c2443.h + delete mode 100644 include/linux/amba/pl093.h + delete mode 100644 include/linux/mfd/asic3.h + delete mode 100644 include/linux/mfd/htc-pasic3.h + delete mode 100644 include/linux/mfd/t7l66xb.h + delete mode 100644 include/linux/mfd/tc6387xb.h + delete mode 100644 include/linux/mfd/tc6393xb.h + delete mode 100644 include/linux/pda_power.h + delete mode 100644 include/linux/platform_data/asoc-palm27x.h + delete mode 100644 include/linux/platform_data/asoc-poodle.h + delete mode 100644 include/linux/platform_data/asoc-s3c24xx_simtec.h + delete mode 100644 include/linux/platform_data/ata-samsung_cf.h + delete mode 100644 include/linux/platform_data/clk-s3c2410.h + delete mode 100644 include/linux/platform_data/dma-mmp_tdma.h + delete mode 100644 include/linux/platform_data/dma-s3c24xx.h + delete mode 100644 include/linux/platform_data/fb-s3c2410.h + delete mode 100644 include/linux/platform_data/irda-pxaficp.h + delete mode 100644 include/linux/platform_data/irda-sa11x0.h + delete mode 100644 include/linux/platform_data/keyboard-pxa930_rotary.h + delete mode 100644 include/linux/platform_data/leds-omap.h + delete mode 100644 include/linux/platform_data/leds-s3c24xx.h + delete mode 100644 include/linux/platform_data/media/s5p_hdmi.h + delete mode 100644 include/linux/platform_data/mmc-s3cmci.h + delete mode 100644 include/linux/platform_data/mmp_audio.h + delete mode 100644 include/linux/platform_data/mouse-pxa930_trkball.h + delete mode 100644 include/linux/platform_data/rtc-v3020.h + delete mode 100644 include/linux/platform_data/s3c-hsudc.h + delete mode 100644 include/linux/platform_data/usb-pxa3xx-ulpi.h + delete mode 100644 include/linux/platform_data/usb-s3c2410_udc.h + delete mode 100644 include/linux/s3c_adc_battery.h + delete mode 100644 include/linux/soc/samsung/s3c-adc.h + delete mode 100644 include/linux/soc/samsung/s3c-cpufreq-core.h + delete mode 100644 include/linux/spi/s3c24xx-fiq.h + delete mode 100644 include/linux/spi/s3c24xx.h + delete mode 100644 include/linux/ucb1400.h + delete mode 100644 include/linux/z2_battery.h + delete mode 100644 include/media/davinci/vpbe.h + delete mode 100644 include/media/davinci/vpbe_display.h + delete mode 100644 include/media/davinci/vpbe_osd.h + delete mode 100644 include/media/davinci/vpbe_types.h + delete mode 100644 include/media/davinci/vpbe_venc.h + delete mode 100644 include/media/davinci/vpfe_capture.h + delete mode 100644 include/media/davinci/vpss.h + delete mode 100644 include/sound/s3c24xx_uda134x.h + delete mode 100644 include/video/w100fb.h + delete mode 100644 sound/soc/cirrus/ep93xx-ac97.c + delete mode 100644 sound/soc/cirrus/simone.c + delete mode 100644 sound/soc/cirrus/snappercl15.c + delete mode 100644 sound/soc/pxa/brownstone.c + delete mode 100644 sound/soc/pxa/corgi.c + delete mode 100644 sound/soc/pxa/e740_wm9705.c + delete mode 100644 sound/soc/pxa/e750_wm9705.c + delete mode 100644 sound/soc/pxa/e800_wm9712.c + delete mode 100644 sound/soc/pxa/em-x270.c + delete mode 100644 sound/soc/pxa/hx4700.c + delete mode 100644 sound/soc/pxa/magician.c + delete mode 100644 sound/soc/pxa/mioa701_wm9713.c + delete mode 100644 sound/soc/pxa/mmp-pcm.c + delete mode 100644 sound/soc/pxa/palm27x.c + delete mode 100644 sound/soc/pxa/poodle.c + delete mode 100644 sound/soc/pxa/tosa.c + delete mode 100644 sound/soc/pxa/ttc-dkb.c + delete mode 100644 sound/soc/pxa/z2.c + delete mode 100644 sound/soc/pxa/zylonite.c + delete mode 100644 sound/soc/samsung/h1940_uda1380.c + delete mode 100644 sound/soc/samsung/jive_wm8750.c + delete mode 100644 sound/soc/samsung/neo1973_wm8753.c + delete mode 100644 sound/soc/samsung/regs-i2s-v2.h + delete mode 100644 sound/soc/samsung/regs-iis.h + delete mode 100644 sound/soc/samsung/rx1950_uda1380.c + delete mode 100644 sound/soc/samsung/s3c-i2s-v2.c + delete mode 100644 sound/soc/samsung/s3c-i2s-v2.h + delete mode 100644 sound/soc/samsung/s3c2412-i2s.c + delete mode 100644 sound/soc/samsung/s3c2412-i2s.h + delete mode 100644 sound/soc/samsung/s3c24xx-i2s.c + delete mode 100644 sound/soc/samsung/s3c24xx-i2s.h + delete mode 100644 sound/soc/samsung/s3c24xx_simtec.c + delete mode 100644 sound/soc/samsung/s3c24xx_simtec.h + delete mode 100644 sound/soc/samsung/s3c24xx_simtec_hermes.c + delete mode 100644 sound/soc/samsung/s3c24xx_simtec_tlv320aic23.c + delete mode 100644 sound/soc/samsung/s3c24xx_uda134x.c + delete mode 100644 sound/soc/samsung/smartq_wm8987.c + delete mode 100644 sound/soc/samsung/smdk_wm8580.c + delete mode 100644 sound/soc/ti/davinci-vcif.c +Merging amlogic/for-next (340433d89d1e Merge branch 'v6.3/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. + .../bindings/firmware/amlogic,meson-gxbb-sm.yaml | 39 ++++++++++++++++++++++ + .../bindings/firmware/meson/meson_sm.txt | 15 --------- + .../bindings/power/amlogic,meson-gx-pwrc.txt | 4 +-- + arch/arm/boot/dts/meson8-minix-neo-x8.dts | 2 +- + arch/arm/boot/dts/meson8b-ec100.dts | 2 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 2 +- + .../dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 6 ++-- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 12 ++++++- + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 4 +++ + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 4 +-- + .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 4 +-- + .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 4 +-- + arch/arm64/boot/dts/amlogic/meson-sm1.dtsi | 4 +++ + drivers/firmware/meson/meson_sm.c | 2 +- + drivers/soc/amlogic/meson-ee-pwrc.c | 17 ++++++++++ + include/dt-bindings/power/meson-g12a-power.h | 1 + + .../dt-bindings/reset/amlogic,meson-g12a-reset.h | 4 ++- + 17 files changed, 94 insertions(+), 32 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/amlogic,meson-gxbb-sm.yaml + delete mode 100644 Documentation/devicetree/bindings/firmware/meson/meson_sm.txt +Merging asahi-soc/asahi-soc/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Already up to date. +Merging 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 4dde80e5b149] 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 (dac8e2394ccc Merge branch 'at91-fixes' into at91-next) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/sama7g5.dtsi | 51 ++++++++++++++++++++++++++++++++++++ + drivers/clk/at91/Makefile | 16 +++++------ + drivers/clk/at91/at91rm9200.c | 2 +- + drivers/clk/at91/at91sam9260.c | 2 +- + drivers/clk/at91/at91sam9g45.c | 10 +++++-- + drivers/clk/at91/at91sam9n12.c | 12 ++++++--- + drivers/clk/at91/at91sam9rl.c | 2 +- + drivers/clk/at91/at91sam9x5.c | 17 ++++++++---- + drivers/clk/at91/clk-peripheral.c | 8 +++--- + drivers/clk/at91/clk-system.c | 4 +-- + drivers/clk/at91/dt-compat.c | 25 ++++++++++++++++-- + drivers/clk/at91/pmc.h | 4 +-- + drivers/clk/at91/sam9x60.c | 20 +++++++++++--- + drivers/clk/at91/sama5d2.c | 22 ++++++++++++---- + drivers/clk/at91/sama5d3.c | 20 +++++++++++--- + drivers/clk/at91/sama5d4.c | 22 ++++++++++++---- + drivers/clk/at91/sama7g5.c | 4 +-- + drivers/clk/microchip/clk-mpfs-ccc.c | 10 +++---- + drivers/soc/atmel/soc.c | 9 +++++++ + drivers/soc/atmel/soc.h | 3 +++ + 20 files changed, 206 insertions(+), 57 deletions(-) +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 (eaafab7e8e26 MAINTAINERS: make me the maintainer of DaVinci platforms) +$ 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 +++---- + 1 file changed, 3 insertions(+), 4 deletions(-) +Merging drivers-memory/for-next (13f35b3c72f4 Merge branch 'for-v6.3/renesas-rpc-if' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + drivers/memory/renesas-rpc-if.c | 153 ++++++++++++++++++++++++++-------------- + drivers/memory/ti-emif-pm.c | 7 +- + drivers/mtd/hyperbus/rpc-if.c | 18 ++--- + drivers/spi/spi-rpc-if.c | 14 ++-- + include/memory/renesas-rpc-if.h | 34 ++------- + 5 files changed, 120 insertions(+), 106 deletions(-) +Merging imx-mxs/for-next (beb902cee34c 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/boot/dts/Makefile +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/fsl.yaml | 22 +- + .../bindings/soc/imx/fsl,imx-iomuxc-gpr.yaml | 57 +++ + .../bindings/soc/imx/fsl,imx8mp-hsio-blk-ctrl.yaml | 4 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/imx23.dtsi | 2 - + arch/arm/boot/dts/imx28.dtsi | 8 - + arch/arm/boot/dts/imx50-kobo-aura.dts | 2 +- + arch/arm/boot/dts/imx51.dtsi | 3 + + arch/arm/boot/dts/imx53-cx9020.dts | 10 +- + arch/arm/boot/dts/imx53-m53evk.dts | 4 +- + arch/arm/boot/dts/imx53-m53menlo.dts | 6 +- + arch/arm/boot/dts/imx53-sk-imx53.dts | 357 +++++++++++++++ + arch/arm/boot/dts/imx53-tx53.dtsi | 2 +- + arch/arm/boot/dts/imx53-usbarmory.dts | 2 +- + arch/arm/boot/dts/imx53.dtsi | 3 + + arch/arm/boot/dts/imx6dl-b1x5pv2.dtsi | 6 +- + arch/arm/boot/dts/imx6dl-colibri-aster.dts | 2 + + arch/arm/boot/dts/imx6dl-colibri-eval-v3.dts | 2 + + arch/arm/boot/dts/imx6dl-colibri-iris.dts | 2 + + arch/arm/boot/dts/imx6dl-riotboard.dts | 4 +- + arch/arm/boot/dts/imx6dl-yapp4-common.dtsi | 6 +- + arch/arm/boot/dts/imx6q-apalis-eval.dts | 2 + + arch/arm/boot/dts/imx6q-apalis-ixora-v1.2.dts | 2 + + arch/arm/boot/dts/imx6q-apalis-ixora.dts | 2 + + arch/arm/boot/dts/imx6q-gw5400-a.dts | 6 +- + arch/arm/boot/dts/imx6q-h100.dts | 6 +- + arch/arm/boot/dts/imx6q-kp.dtsi | 4 +- + arch/arm/boot/dts/imx6q-marsboard.dts | 4 +- + arch/arm/boot/dts/imx6q-tbs2910.dts | 2 +- + arch/arm/boot/dts/imx6qdl-apalis.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 1 - + arch/arm/boot/dts/imx6qdl-emcon.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw51xx.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw52xx.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw53xx.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw54xx.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw551x.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw552x.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw553x.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw560x.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw5903.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-gw5904.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw5907.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-gw5910.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw5912.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-gw5913.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-nit6xlite.dtsi | 10 +- + arch/arm/boot/dts/imx6qdl-nitrogen6_max.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-phytec-mira.dtsi | 6 +- + arch/arm/boot/dts/imx6qdl-phytec-pfla02.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-rex.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabreauto.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-sabresd.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl-ts7970.dtsi | 4 +- + arch/arm/boot/dts/imx6qdl-tx6.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl.dtsi | 7 +- + arch/arm/boot/dts/imx6sl-evk.dts | 2 +- + arch/arm/boot/dts/imx6sll-evk.dts | 2 +- + arch/arm/boot/dts/imx6sx-sabreauto.dts | 2 +- + arch/arm/boot/dts/imx6sx-udoo-neo.dtsi | 4 +- + arch/arm/boot/dts/imx6sx.dtsi | 1 - + arch/arm/boot/dts/imx6ul-phytec-phycore-som.dtsi | 2 +- + arch/arm/boot/dts/imx6ul-tqma6ul-common.dtsi | 4 +- + arch/arm/boot/dts/imx6ul-tx6ul.dtsi | 2 +- + arch/arm/boot/dts/imx6ul.dtsi | 1 - + arch/arm/boot/dts/imx6ull-colibri-aster.dtsi | 2 + + arch/arm/boot/dts/imx6ull-colibri-eval-v3.dtsi | 2 + + arch/arm/boot/dts/imx6ull-colibri-iris.dtsi | 2 + + arch/arm/boot/dts/imx7-colibri-aster.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri-eval-v3.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri-iris-v2.dtsi | 1 + + arch/arm/boot/dts/imx7-colibri-iris.dtsi | 1 + + arch/arm/boot/dts/imx7d-colibri-aster.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-aster.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-eval-v3.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-iris-v2.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc-iris.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-emmc.dtsi | 1 + + arch/arm/boot/dts/imx7d-colibri-eval-v3.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-iris-v2.dts | 1 + + arch/arm/boot/dts/imx7d-colibri-iris.dts | 1 + + arch/arm/boot/dts/imx7s.dtsi | 3 +- + arch/arm/boot/dts/imxrt1050.dtsi | 2 +- + arch/arm/boot/dts/mba6ulx.dtsi | 2 +- + arch/arm/boot/dts/vf610-bk4.dts | 2 +- + arch/arm/boot/dts/vf610-zii-dev.dtsi | 2 +- + arch/arm/boot/dts/vf610-zii-scu4-aib.dts | 2 +- + arch/arm64/boot/dts/freescale/Makefile | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1088a.dtsi | 1 + + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 1 + + arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8dxl.dtsi | 2 +- + .../dts/freescale/imx8mm-data-modul-edm-sbc.dts | 1 + + arch/arm64/boot/dts/freescale/imx8mm-emcon.dtsi | 4 +- + .../arm64/boot/dts/freescale/imx8mm-kontron-bl.dts | 4 +- + .../boot/dts/freescale/imx8mm-kontron-osm-s.dtsi | 7 +- + arch/arm64/boot/dts/freescale/imx8mm-mx8menlo.dts | 1 + + .../arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 1 - + .../imx8mm-venice-gw72xx-0x-rs232-rts.dtso | 1 - + .../imx8mm-venice-gw73xx-0x-rs232-rts.dtso | 1 - + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 1 - + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 3 - + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 3 - + .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 1 - + .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 2 + + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 8 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 30 +- + .../arm64/boot/dts/freescale/imx8mn-tqma8mqnl.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mn-var-som.dtsi | 2 +- + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 1 - + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 28 +- + .../boot/dts/freescale/imx8mp-debix-model-a.dts | 506 +++++++++++++++++++++ + .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 9 - + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 7 - + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 5 +- + .../arm64/boot/dts/freescale/imx8mp-tqma8mpql.dtsi | 5 +- + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 8 - + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 284 +++++++----- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 32 +- + arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 22 +- + arch/arm64/boot/dts/freescale/imx93.dtsi | 28 ++ + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 4 +- + arch/arm64/configs/defconfig | 6 +- + drivers/bus/imx-weim.c | 4 +- + drivers/soc/imx/Kconfig | 11 + + drivers/soc/imx/Makefile | 6 +- + drivers/soc/imx/imx8m-blk-ctrl.c | 27 +- + drivers/soc/imx/imx8mp-blk-ctrl.c | 105 +++++ + drivers/soc/imx/imx93-pd.c | 1 - + drivers/soc/imx/imx93-src.c | 1 - + 135 files changed, 1554 insertions(+), 344 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/imx/fsl,imx-iomuxc-gpr.yaml + create mode 100644 arch/arm/boot/dts/imx53-sk-imx53.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-debix-model-a.dts +Merging mediatek/for-next (c7a343cf1811 Merge branch 'v6.2-next/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/matthias.bgg/linux.git mediatek/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/mediatek.yaml | 4 + + .../bindings/arm/mediatek/mediatek,mmsys.yaml | 1 + + .../bindings/soc/mediatek/mediatek,mutex.yaml | 1 + + arch/arm/boot/dts/mt2701.dtsi | 1 - + arch/arm/boot/dts/mt7623.dtsi | 1 - + arch/arm/boot/dts/mt7629.dtsi | 3 +- + arch/arm/boot/dts/mt8135.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt6795.dtsi | 50 +++ + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 1 - + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 2 +- + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 2 + + .../boot/dts/mediatek/mt8183-kukui-kakadu.dtsi | 6 + + .../boot/dts/mediatek/mt8183-kukui-kodama.dtsi | 6 + + .../boot/dts/mediatek/mt8183-kukui-krane.dtsi | 6 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 86 +++- + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 453 +++++++++++++++++++- + .../mt8192-asurada-audio-rt1015p-rt5682.dtsi | 19 + + .../dts/mediatek/mt8192-asurada-audio-rt1015p.dtsi | 26 ++ + .../dts/mediatek/mt8192-asurada-audio-rt5682.dtsi | 21 + + .../boot/dts/mediatek/mt8192-asurada-hayato-r1.dts | 1 + + .../dts/mediatek/mt8192-asurada-spherion-r0.dts | 1 + + arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 465 +++++++++++++++++++++ + arch/arm64/boot/dts/mediatek/mt8192.dtsi | 70 +++- + .../boot/dts/mediatek/mt8195-cherry-tomato-r1.dts | 10 + + .../boot/dts/mediatek/mt8195-cherry-tomato-r2.dts | 10 + + .../boot/dts/mediatek/mt8195-cherry-tomato-r3.dts | 10 + + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 109 +++++ + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 74 +++- + arch/arm64/boot/dts/mediatek/mt8516.dtsi | 1 - + drivers/soc/mediatek/Kconfig | 2 +- + drivers/soc/mediatek/mt8186-pm-domains.h | 4 +- + drivers/soc/mediatek/mt8188-mmsys.h | 149 +++++++ + drivers/soc/mediatek/mtk-mmsys.c | 29 +- + drivers/soc/mediatek/mtk-mutex.c | 76 +++- + 38 files changed, 1668 insertions(+), 37 deletions(-) + create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682.dtsi + create mode 100644 drivers/soc/mediatek/mt8188-mmsys.h +Merging mvebu/for-next (80502ffab2fa arm64: dts: marvell: AC5/AC5X: Fix address for UART1) +$ 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. + arch/arm/boot/dts/armada-38x.dtsi | 4 ++-- + arch/arm/boot/dts/armada-39x.dtsi | 4 ++-- + arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 2 +- + 3 files changed, 5 insertions(+), 5 deletions(-) +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 +Auto-merging arch/arm/mach-omap1/Kconfig +CONFLICT (content): Merge conflict in arch/arm/mach-omap1/Kconfig +Resolved 'arch/arm/mach-omap1/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d29cfceb4510] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git +$ git diff -M --stat --summary HEAD^.. + arch/arm/mach-omap1/Kconfig | 2 +- + arch/arm/mach-omap1/timer.c | 2 +- + arch/arm/mach-omap2/omap4-common.c | 1 + + drivers/bus/ti-sysc.c | 3 +++ + 4 files changed, 6 insertions(+), 2 deletions(-) +Merging qcom/for-next (4166ff125e67 Merge branches 'arm64-defconfig-for-6.3', 'arm64-fixes-for-6.2', 'arm64-for-6.3', 'clk-for-6.3', 'drivers-fixes-for-6.2', 'drivers-for-6.3', 'dts-fixes-for-6.2' and 'dts-for-6.3' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-driver-dcc | 127 + + Documentation/devicetree/bindings/arm/qcom.yaml | 52 + + .../bindings/clock/qcom,gcc-msm8998.yaml | 6 +- + .../devicetree/bindings/clock/qcom,gcc-qcs404.yaml | 38 +- + .../bindings/clock/qcom,gcc-sc8280xp.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sdx55.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-sdx65.yaml | 8 +- + .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 2 - + .../devicetree/bindings/clock/qcom,mmcc.yaml | 2 - + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 + + .../bindings/clock/qcom,sm6350-camcc.yaml | 49 + + .../bindings/clock/qcom,sm8550-dispcc.yaml | 105 + + .../bindings/clock/qcom,sm8550-tcsr.yaml | 55 + + .../devicetree/bindings/clock/qcom,spmi-clkdiv.txt | 59 - + .../bindings/clock/qcom,spmi-clkdiv.yaml | 71 + + .../devicetree/bindings/firmware/qcom,scm.yaml | 46 +- + .../bindings/interconnect/qcom,sm8550-rpmh.yaml | 139 + + Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 283 -- + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + .../bindings/reserved-memory/qcom,rmtfs-mem.yaml | 6 +- + .../devicetree/bindings/soc/qcom/qcom,dcc.yaml | 44 + + .../soc/qcom/qcom,msm8976-ramp-controller.yaml | 36 + + .../devicetree/bindings/soc/qcom/qcom,rpm.yaml | 101 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 8 + + .../boot/dts/qcom-apq8026-samsung-matisse-wifi.dts | 71 +- + arch/arm/boot/dts/qcom-apq8064-asus-nexus7-flo.dts | 2 +- + arch/arm/boot/dts/qcom-apq8064.dtsi | 16 +- + arch/arm/boot/dts/qcom-ipq4019.dtsi | 2 +- + arch/arm/boot/dts/qcom-ipq8064.dtsi | 7 +- + arch/arm/boot/dts/qcom-mdm9615.dtsi | 10 +- + arch/arm/boot/dts/qcom-msm8960.dtsi | 7 +- + .../dts/qcom-msm8974-lge-nexus5-hammerhead.dts | 11 + + .../boot/dts/qcom-msm8974-sony-xperia-rhine.dtsi | 11 + + arch/arm/boot/dts/qcom-msm8974.dtsi | 110 +- + .../qcom-msm8974pro-sony-xperia-shinano-castor.dts | 38 +- + arch/arm/boot/dts/qcom-pm8226.dtsi | 46 +- + arch/arm/boot/dts/qcom-sdx55-mtp.dts | 4 + + arch/arm/boot/dts/qcom-sdx55.dtsi | 3 +- + arch/arm/boot/dts/qcom-sdx65.dtsi | 3 +- + arch/arm64/boot/dts/qcom/Makefile | 13 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 4 - + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 8 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 295 ++ + arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 299 ++ + .../boot/dts/qcom/msm8916-samsung-grandmax.dts | 6 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 24 +- + .../boot/dts/qcom/msm8953-motorola-potter.dts | 305 ++ + arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts | 325 ++ + arch/arm64/boot/dts/qcom/msm8953-xiaomi-mido.dts | 329 ++ + arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dts | 325 ++ + arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts | 361 ++ + arch/arm64/boot/dts/qcom/msm8953.dtsi | 88 +- + .../boot/dts/qcom/msm8996-oneplus-common.dtsi | 1 - + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 38 +- + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 6 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 40 +- + arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 21 +- + .../boot/dts/qcom/msm8998-oneplus-cheeseburger.dts | 4 +- + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 6 +- + .../dts/qcom/msm8998-sony-xperia-yoshino-maple.dts | 4 +- + .../boot/dts/qcom/msm8998-sony-xperia-yoshino.dtsi | 27 +- + arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts | 4 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 38 +- + arch/arm64/boot/dts/qcom/pm6125.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm6150.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm6150l.dtsi | 10 +- + arch/arm64/boot/dts/qcom/pm7250b.dtsi | 8 + + arch/arm64/boot/dts/qcom/pm8005.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pm8010.dtsi | 84 + + arch/arm64/boot/dts/qcom/pm8150.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pm8550.dtsi | 59 + + arch/arm64/boot/dts/qcom/pm8550b.dtsi | 59 + + arch/arm64/boot/dts/qcom/pm8550ve.dtsi | 59 + + arch/arm64/boot/dts/qcom/pm8550vs.dtsi | 194 + + arch/arm64/boot/dts/qcom/pm8916.dtsi | 3 +- + arch/arm64/boot/dts/qcom/pm8950.dtsi | 6 +- + arch/arm64/boot/dts/qcom/pm8998.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pmi8950.dtsi | 6 +- + arch/arm64/boot/dts/qcom/pmi8998.dtsi | 4 +- + arch/arm64/boot/dts/qcom/pmk8550.dtsi | 55 + + arch/arm64/boot/dts/qcom/pmm8155au_1.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmp8074.dtsi | 2 +- + arch/arm64/boot/dts/qcom/pmr735d.dtsi | 104 + + arch/arm64/boot/dts/qcom/pms405.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qcs404.dtsi | 79 +- + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 2 +- + arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 322 +- + .../dts/qcom/{pm8450a.dtsi => sa8540p-pmics.dtsi} | 33 +- + arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 98 +- + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 22 +- + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 18 + + .../dts/qcom/sc7180-trogdor-parade-ps8640.dtsi | 20 + + .../boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi | 19 + + .../boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 20 + + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 32 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 315 +- + .../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 22 + + .../boot/dts/qcom/sc7280-herobrine-nvme-sku.dtsi | 14 + + .../dts/qcom/sc7280-herobrine-zombie-nvme-lte.dts | 17 + + .../boot/dts/qcom/sc7280-herobrine-zombie-nvme.dts | 17 + + .../boot/dts/qcom/sc7280-herobrine-zombie.dtsi | 12 +- + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 5 - + arch/arm64/boot/dts/qcom/sc7280.dtsi | 56 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 75 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 382 +- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 1205 ++++++- + arch/arm64/boot/dts/qcom/sdm450-motorola-ali.dts | 252 ++ + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 29 +- + arch/arm64/boot/dts/qcom/sdm632-fairphone-fp3.dts | 15 + + arch/arm64/boot/dts/qcom/sdm632-motorola-ocean.dts | 291 ++ + arch/arm64/boot/dts/qcom/sdm660.dtsi | 17 +- + arch/arm64/boot/dts/qcom/sdm670-google-sargo.dts | 1 + + arch/arm64/boot/dts/qcom/sdm670.dtsi | 14 + + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 401 +-- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 128 +- + arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 75 +- + arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 77 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 107 +- + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 165 +- + .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 80 +- + .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 31 +- + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 36 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 1325 ++++--- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 64 +- + arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 123 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 377 +- + arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 289 ++ + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 214 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 643 +++- + .../dts/qcom/sm6350-sony-xperia-lena-pdx213.dts | 18 +- + arch/arm64/boot/dts/qcom/sm6350.dtsi | 18 +- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 18 +- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 42 + + .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 86 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 358 +- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 40 +- + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 139 +- + .../dts/qcom/sm8350-sony-xperia-sagami-pdx214.dts | 23 + + .../dts/qcom/sm8350-sony-xperia-sagami-pdx215.dts | 87 + + .../boot/dts/qcom/sm8350-sony-xperia-sagami.dtsi | 107 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 67 +- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 128 + + arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 7 + + .../dts/qcom/sm8450-sony-xperia-nagara-pdx223.dts | 61 + + .../dts/qcom/sm8450-sony-xperia-nagara-pdx224.dts | 38 +- + .../boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi | 188 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 431 ++- + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 404 +++ + arch/arm64/boot/dts/qcom/sm8550.dtsi | 3754 ++++++++++++++++++++ + arch/arm64/configs/defconfig | 11 + + drivers/base/power/domain.c | 26 + + drivers/clk/clk.c | 57 +- + drivers/clk/qcom/Kconfig | 23 + + drivers/clk/qcom/Makefile | 3 + + drivers/clk/qcom/camcc-sc7280.c | 268 +- + drivers/clk/qcom/camcc-sdm845.c | 1 + + drivers/clk/qcom/camcc-sm6350.c | 1906 ++++++++++ + drivers/clk/qcom/camcc-sm8450.c | 324 +- + drivers/clk/qcom/clk-alpha-pll.h | 1 + + drivers/clk/qcom/clk-rpmh.c | 57 + + drivers/clk/qcom/clk-smd-rpm.c | 1441 ++++---- + drivers/clk/qcom/clk-spmi-pmic-div.c | 10 +- + drivers/clk/qcom/dispcc-qcm2290.c | 6 - + drivers/clk/qcom/dispcc-sc7180.c | 8 +- + drivers/clk/qcom/dispcc-sdm845.c | 1 + + drivers/clk/qcom/dispcc-sm6115.c | 4 +- + drivers/clk/qcom/dispcc-sm6125.c | 2 +- + drivers/clk/qcom/dispcc-sm6375.c | 4 +- + drivers/clk/qcom/dispcc-sm8250.c | 9 +- + drivers/clk/qcom/dispcc-sm8450.c | 221 +- + drivers/clk/qcom/dispcc-sm8550.c | 1807 ++++++++++ + drivers/clk/qcom/gcc-msm8939.c | 32 +- + drivers/clk/qcom/gcc-msm8974.c | 10 +- + drivers/clk/qcom/gcc-msm8976.c | 30 +- + drivers/clk/qcom/gcc-msm8998.c | 13 - + drivers/clk/qcom/gcc-qcs404.c | 841 +++-- + drivers/clk/qcom/gcc-sc7180.c | 19 +- + drivers/clk/qcom/gcc-sc7280.c | 10 +- + drivers/clk/qcom/gcc-sdm845.c | 1 + + drivers/clk/qcom/gcc-sdx55.c | 64 +- + drivers/clk/qcom/gcc-sdx65.c | 109 +- + drivers/clk/qcom/gcc-sm6115.c | 4 +- + drivers/clk/qcom/gcc-sm6375.c | 257 +- + drivers/clk/qcom/gcc-sm8150.c | 17 - + drivers/clk/qcom/gcc-sm8250.c | 10 +- + drivers/clk/qcom/gcc-sm8350.c | 15 - + drivers/clk/qcom/gcc-sm8450.c | 236 +- + drivers/clk/qcom/gcc-sm8550.c | 252 +- + drivers/clk/qcom/gdsc.c | 11 +- + drivers/clk/qcom/gpucc-msm8998.c | 8 +- + drivers/clk/qcom/gpucc-sc7180.c | 4 +- + drivers/clk/qcom/gpucc-sdm845.c | 1 + + drivers/clk/qcom/krait-cc.c | 4 +- + drivers/clk/qcom/lpasscc-sc7280.c | 10 +- + drivers/clk/qcom/lpasscorecc-sc7180.c | 20 +- + drivers/clk/qcom/mmcc-msm8998.c | 25 - + drivers/clk/qcom/tcsrcc-sm8550.c | 192 + + drivers/clk/qcom/videocc-sm8250.c | 9 +- + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/sm8550.c | 2318 ++++++++++++ + drivers/interconnect/qcom/sm8550.h | 178 + + drivers/soc/qcom/Kconfig | 17 + + drivers/soc/qcom/Makefile | 2 + + drivers/soc/qcom/dcc.c | 1300 +++++++ + drivers/soc/qcom/ramp_controller.c | 343 ++ + drivers/soc/qcom/rmtfs_mem.c | 29 +- + drivers/soc/qcom/rpmhpd.c | 34 + + drivers/soc/qcom/socinfo.c | 16 + + include/dt-bindings/clock/qcom,gcc-qcs404.h | 4 + + include/dt-bindings/clock/qcom,gcc-sm8350.h | 1 - + include/dt-bindings/clock/qcom,gcc-sm8450.h | 1 - + include/dt-bindings/clock/qcom,rpmcc.h | 2 + + include/dt-bindings/clock/qcom,sm6350-camcc.h | 109 + + include/dt-bindings/clock/qcom,sm8550-dispcc.h | 101 + + include/dt-bindings/clock/qcom,sm8550-tcsr.h | 18 + + include/dt-bindings/firmware/qcom,scm.h | 16 + + .../dt-bindings/interconnect/qcom,sm8550-rpmh.h | 189 + + include/dt-bindings/power/qcom-rpmpd.h | 20 + + include/linux/clk-provider.h | 1 + + include/linux/pm_domain.h | 5 + + include/linux/qcom_scm.h | 6 +- + include/linux/soc/qcom/apr.h | 2 +- + include/linux/soc/qcom/smd-rpm.h | 1 - + sound/soc/qcom/qdsp6/q6core.c | 4 +- + 231 files changed, 26459 insertions(+), 5083 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-driver-dcc + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm6350-camcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8550-dispcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm8550-tcsr.yaml + delete mode 100644 Documentation/devicetree/bindings/clock/qcom,spmi-clkdiv.txt + create mode 100644 Documentation/devicetree/bindings/clock/qcom,spmi-clkdiv.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sm8550-rpmh.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/qcom-rpm.txt + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,dcc.yaml + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,msm8976-ramp-controller.yaml + create mode 100644 Documentation/devicetree/bindings/soc/qcom/qcom,rpm.yaml + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-motorola-potter.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-xiaomi-daisy.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-xiaomi-mido.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-xiaomi-tissot.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8953-xiaomi-vince.dts + create mode 100644 arch/arm64/boot/dts/qcom/pm8010.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8550.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8550b.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8550ve.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pm8550vs.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmk8550.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/pmr735d.dtsi + rename arch/arm64/boot/dts/qcom/{pm8450a.dtsi => sa8540p-pmics.dtsi} (69%) + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-nvme-sku.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-nvme-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7280-herobrine-zombie-nvme.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm450-motorola-ali.dts + create mode 100644 arch/arm64/boot/dts/qcom/sdm632-motorola-ocean.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8550-mtp.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm8550.dtsi + create mode 100644 drivers/clk/qcom/camcc-sm6350.c + create mode 100644 drivers/clk/qcom/dispcc-sm8550.c + create mode 100644 drivers/clk/qcom/tcsrcc-sm8550.c + create mode 100644 drivers/interconnect/qcom/sm8550.c + create mode 100644 drivers/interconnect/qcom/sm8550.h + create mode 100644 drivers/soc/qcom/dcc.c + create mode 100644 drivers/soc/qcom/ramp_controller.c + create mode 100644 include/dt-bindings/clock/qcom,sm6350-camcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8550-dispcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8550-tcsr.h + create mode 100644 include/dt-bindings/firmware/qcom,scm.h + create mode 100644 include/dt-bindings/interconnect/qcom,sm8550-rpmh.h +Merging renesas/next (1f57de01e0be Merge branch 'renesas-dts-for-v6.3' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + arch/arm/configs/shmobile_defconfig | 1 + + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 19 +++ + .../boot/dts/renesas/r8a774a1-beacon-rzg2m-kit.dts | 21 ---- + .../boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dts | 21 ---- + .../boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dts | 21 ---- + arch/arm64/boot/dts/renesas/r8a77980a-condor-i.dts | 4 + + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 62 ++++++++++ + .../boot/dts/renesas/r8a779g0-white-hawk-cpu.dtsi | 94 +++++++++++++++ + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 130 +++++++++++++++++++++ + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 48 ++++++++ + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 4 +- + arch/arm64/configs/defconfig | 3 + + arch/riscv/boot/dts/renesas/rzfive-smarc-som.dtsi | 12 -- + drivers/soc/renesas/r8a779g0-sysc.c | 1 + + include/dt-bindings/power/r8a779g0-sysc.h | 1 + + 15 files changed, 365 insertions(+), 77 deletions(-) +Merging reset/reset/next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'reset/next' of https://git.pengutronix.de/git/pza/linux reset/reset/next +Already up to date. +Merging rockchip/for-next (a488884a40ae Merge branch 'v6.3-armsoc/dts64' 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 Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 61 + + .../devicetree/bindings/arm/rockchip/pmu.yaml | 2 + + .../devicetree/bindings/soc/rockchip/grf.yaml | 5 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + MAINTAINERS | 2 +- + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/rk3066a-mk808.dts | 7 + + arch/arm/boot/dts/rk3128-evb.dts | 109 + + arch/arm/boot/dts/rk3128.dtsi | 916 ++++++ + arch/arm/boot/dts/rk3288.dtsi | 1 + + arch/arm/boot/dts/rv1126-edgeble-neu2-io.dts | 79 + + arch/arm/boot/dts/rv1126-edgeble-neu2.dtsi | 338 ++ + arch/arm/boot/dts/rv1126-pinctrl.dtsi | 253 ++ + arch/arm/boot/dts/rv1126.dtsi | 487 +++ + arch/arm64/boot/dts/rockchip/Makefile | 9 + + arch/arm64/boot/dts/rockchip/px30.dtsi | 33 +- + arch/arm64/boot/dts/rockchip/rk3326-odroid-go.dtsi | 41 +- + .../boot/dts/rockchip/rk3328-orangepi-r1-plus.dts | 373 +++ + arch/arm64/boot/dts/rockchip/rk3328-roc-cc.dts | 2 - + .../boot/dts/rockchip/rk3399-pinephone-pro.dts | 7 + + arch/arm64/boot/dts/rockchip/rk3399-roc-pc.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 +- + .../boot/dts/rockchip/rk3566-anbernic-rg353p.dts | 19 + + .../boot/dts/rockchip/rk3566-anbernic-rg353v.dts | 12 + + arch/arm64/boot/dts/rockchip/rk3566-box-demo.dts | 35 +- + arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts | 595 ++++ + .../boot/dts/rockchip/rk3566-radxa-cm3-io.dts | 179 + + arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi | 345 ++ + arch/arm64/boot/dts/rockchip/rk3566-roc-pc.dts | 44 +- + arch/arm64/boot/dts/rockchip/rk3568-bpi-r2-pro.dts | 13 + + arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts | 733 +++++ + .../arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi | 416 +++ + arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts | 229 ++ + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 3 +- + arch/arm64/boot/dts/rockchip/rk356x.dtsi | 6 +- + .../boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts | 27 + + .../boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi | 32 + + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 129 + + arch/arm64/boot/dts/rockchip/rk3588-pinctrl.dtsi | 516 +++ + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 44 + + arch/arm64/boot/dts/rockchip/rk3588.dtsi | 58 + + arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi | 3403 ++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts | 73 + + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 1703 ++++++++++ + drivers/clk/rockchip/clk-rk3399.c | 2 +- + 45 files changed, 11321 insertions(+), 34 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/rk3328-orangepi-r1-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-lubancat-1.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3-io.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3566-radxa-cm3.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-lubancat-2.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-radxa-cm3i.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3568-radxa-e25.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a-io.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-edgeble-neu6a.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-rock-5a.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s.dtsi +Merging samsung-krzk/for-next (65ffd17e529d Merge branch 'next/drivers' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mfd/syscon.yaml | 6 -- + .../soc/samsung/samsung,exynos-sysreg.yaml | 87 +++++++++++++++++++++ + MAINTAINERS | 2 +- + .../arm/boot/dts/exynos5420-galaxy-tab-common.dtsi | 1 - + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 11 ++- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 24 +++--- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 2 - + arch/arm64/boot/dts/exynos/exynos7.dtsi | 2 + + arch/arm64/boot/dts/exynos/exynos850.dtsi | 6 +- + arch/arm64/boot/dts/exynos/exynosautov9.dtsi | 9 ++- + arch/arm64/boot/dts/tesla/fsd-evb.dts | 16 ++++ + arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 40 ++++++++-- + arch/arm64/boot/dts/tesla/fsd.dtsi | 90 ++++++++++++++++++++++ + 13 files changed, 257 insertions(+), 39 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/samsung/samsung,exynos-sysreg.yaml +Merging scmi/for-linux-next (67cc475d3c42 Merge branch 'for-next/scmi' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-scmi | 70 ++ + Documentation/ABI/testing/debugfs-scmi-raw | 109 +++ + drivers/firmware/arm_scmi/Kconfig | 32 + + drivers/firmware/arm_scmi/Makefile | 9 +- + drivers/firmware/arm_scmi/bus.c | 395 ++++++-- + drivers/firmware/arm_scmi/common.h | 100 +- + drivers/firmware/arm_scmi/driver.c | 1235 +++++++++++++++--------- + drivers/firmware/arm_scmi/mailbox.c | 6 +- + drivers/firmware/arm_scmi/optee.c | 6 +- + drivers/firmware/arm_scmi/protocols.h | 7 + + drivers/firmware/arm_scmi/raw_mode.c | 1443 ++++++++++++++++++++++++++++ + drivers/firmware/arm_scmi/raw_mode.h | 31 + + drivers/firmware/arm_scmi/smc.c | 6 +- + drivers/firmware/arm_scmi/virtio.c | 4 +- + fs/debugfs/file.c | 1 + + include/linux/scmi_protocol.h | 5 - + include/trace/events/scmi.h | 18 +- + 17 files changed, 2904 insertions(+), 573 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-scmi + create mode 100644 Documentation/ABI/testing/debugfs-scmi-raw + create mode 100644 drivers/firmware/arm_scmi/raw_mode.c + create mode 100644 drivers/firmware/arm_scmi/raw_mode.h +Merging stm32/stm32-next (3f5ea53d7977 ARM: dts: stm32: add dfsdm node on stm32mp131) +$ git merge -m Merge branch 'stm32-next' of git://git.kernel.org/pub/scm/linux/kernel/git/atorgue/stm32.git stm32/stm32-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/stm32f4-pinctrl.dtsi | 1 - + arch/arm/boot/dts/stm32f7-pinctrl.dtsi | 1 - + arch/arm/boot/dts/stm32h743.dtsi | 1 - + arch/arm/boot/dts/stm32mp131.dtsi | 150 ++++++++++++++++++++++- + arch/arm/boot/dts/stm32mp151.dtsi | 2 - + arch/arm/boot/dts/stm32mp151a-prtt1l.dtsi | 8 +- + arch/arm/boot/dts/stm32mp157c-emstamp-argon.dtsi | 8 +- + arch/arm/boot/dts/stm32mp15xx-dhcom-som.dtsi | 8 +- + arch/arm/boot/dts/stm32mp15xx-dhcor-som.dtsi | 8 +- + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 4 +- + 10 files changed, 174 insertions(+), 17 deletions(-) +Merging sunxi/sunxi/for-next (7879da4e62f1 Merge branch 'sunxi/drivers-for-6.3' into sunxi/for-next) +$ git merge -m Merge branch 'sunxi/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sunxi/linux.git sunxi/sunxi/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/sun5i-gr8-chip-pro.dts | 2 +- + arch/arm/boot/dts/sun5i-r8-chip.dts | 2 +- + arch/arm/boot/dts/sun6i-a31s-sina31s.dts | 2 +- + arch/arm/boot/dts/sun8i-a33.dtsi | 1 + + arch/arm/boot/dts/sun8i-h3-beelink-x2.dts | 2 +- + arch/arm/boot/dts/sun8i-h3-nanopi-duo2.dts | 2 +- + arch/arm64/boot/dts/allwinner/sun50i-a64.dtsi | 1 + + drivers/bus/sunxi-rsb.c | 8 ++- + drivers/clk/sunxi-ng/Kconfig | 71 ++++++++++++++------------- + drivers/clk/sunxi-ng/ccu-sun20i-d1.c | 13 ++++- + drivers/clk/sunxi-ng/ccu-sun20i-d1.h | 2 +- + drivers/clk/sunxi-ng/ccu-sun8i-h3.c | 15 ++++-- + drivers/clk/sunxi-ng/ccu_mmc_timing.c | 8 +-- + drivers/clk/sunxi-ng/ccu_mp.c | 11 +++-- + drivers/clk/sunxi-ng/ccu_nk.c | 9 ++-- + drivers/clk/sunxi-ng/ccu_nkm.c | 10 ++-- + drivers/clk/sunxi-ng/ccu_nkmp.c | 10 ++-- + drivers/clk/sunxi-ng/ccu_nm.c | 9 ++-- + drivers/soc/sunxi/sunxi_sram.c | 3 ++ + include/dt-bindings/clock/sun20i-d1-ccu.h | 2 + + include/dt-bindings/reset/sun20i-d1-ccu.h | 2 + + 21 files changed, 110 insertions(+), 75 deletions(-) +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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Already up to date. +Merging ti/ti-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Already up to date. +Merging xilinx/for-next (a7669037d438 Merge remote-tracking branch 'git/zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/zynq-7000.dtsi | 12 ++++++++++ + arch/arm/mach-zynq/slcr.c | 1 + + arch/arm64/boot/dts/xilinx/zynqmp-clk-ccf.dtsi | 4 ---- + ...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 | 20 ++++++++++++---- + 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 ++++ + 11 files changed, 62 insertions(+), 14 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 (1b929c02afd3 Linux 6.2-rc1) +$ 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 (1b929c02afd3 Linux 6.2-rc1) +$ 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 (fbfd614aeaa2 clk: renesas: cpg-mssr: Fix use after free if cpg_mssr_common_init() failed) +$ 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 +Merge made by the 'ort' strategy. + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 17 ++++++-- + drivers/clk/renesas/r9a07g044-cpg.c | 26 +++++++++++- + drivers/clk/renesas/r9a09g011-cpg.c | 73 +++++++++++++++++++++++++++++++++ + drivers/clk/renesas/rcar-gen4-cpg.h | 2 +- + drivers/clk/renesas/renesas-cpg-mssr.c | 3 +- + 5 files changed, 114 insertions(+), 7 deletions(-) +Merging clk-samsung/for-next (b35f27fe73d8 clk: samsung: exynosautov9: add cmu_peric1 clock support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/snawrocki/clk.git clk-samsung/for-next +Already up to date. +Merging csky/linux-next (4a3ec00957fd csky: delay: Add function alignment) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Merge made by the 'ort' strategy. + arch/csky/lib/delay.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging loongarch/loongarch-next (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 +Already up to date. +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 (8fbf1bb2410e m68k: nommu: Fix misspellings of "DragonEngine") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git m68knommu/for-next +Merge made by the 'ort' strategy. + arch/m68k/68000/dragen2.c | 2 +- + arch/m68k/Kconfig.machine | 8 ++++---- + 2 files changed, 5 insertions(+), 5 deletions(-) +Merging microblaze/next (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 (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Already up to date. +Merging openrisc/for-next (34a0bac084e4 MAINTAINERS: git://github -> https://github.com for openrisc) +$ git merge -m Merge branch 'for-next' of git://github.com/openrisc/linux.git openrisc/for-next +Already up to date. +Merging parisc-hd/for-next (32125c5c95f2 parisc: Limit amount of kgdb breakpoints on parisc) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git parisc-hd/for-next +Merge made by the 'ort' strategy. + arch/parisc/include/asm/kgdb.h | 2 ++ + arch/parisc/kernel/firmware.c | 5 +++-- + drivers/parisc/pdc_stable.c | 9 +++------ + 3 files changed, 8 insertions(+), 8 deletions(-) +Merging powerpc/next (53ab112a9508 Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Merge made by the 'ort' strategy. +Merging powerpc-objtool/topic/objtool (1b929c02afd3 Linux 6.2-rc1) +$ 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 (b07de94d4501 Merge patch series "Allow calls in alternatives") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/kernel/probes/simulate-insn.h +CONFLICT (content): Merge conflict in arch/riscv/kernel/probes/simulate-insn.h +Resolved 'arch/riscv/kernel/probes/simulate-insn.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 66c0af542032] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + arch/riscv/Kconfig.socs | 39 ++-- + arch/riscv/Makefile | 2 +- + arch/riscv/boot/dts/Makefile | 2 +- + arch/riscv/boot/dts/canaan/Makefile | 14 +- + arch/riscv/boot/dts/microchip/Makefile | 8 +- + arch/riscv/boot/dts/sifive/Makefile | 4 +- + arch/riscv/boot/dts/starfive/Makefile | 2 +- + arch/riscv/include/asm/alternative.h | 3 + + arch/riscv/include/asm/insn.h | 340 +++++++++++++++++++++++++++++++ + arch/riscv/include/asm/parse_asm.h | 219 -------------------- + arch/riscv/kernel/alternative.c | 56 +++++ + arch/riscv/kernel/cpufeature.c | 5 +- + arch/riscv/kernel/kgdb.c | 63 ++---- + arch/riscv/kernel/probes/simulate-insn.c | 19 +- + arch/riscv/kernel/probes/simulate-insn.h | 26 +-- + 15 files changed, 478 insertions(+), 324 deletions(-) + create mode 100644 arch/riscv/include/asm/insn.h + delete mode 100644 arch/riscv/include/asm/parse_asm.h +Merging riscv-dt/riscv-dt-for-next (093ee97e24f8 Merge tag 'soc2arch-immutable' 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/riscv/starfive.yaml | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging riscv-soc/riscv-soc-for-next (6635e91648ce soc: sifive: ccache: Add StarFive JH7110 support) +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Auto-merging drivers/soc/Makefile +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/riscv/sifive,ccache0.yaml | 9 ++++++++- + drivers/soc/Makefile | 2 +- + drivers/soc/sifive/Kconfig | 2 +- + 3 files changed, 10 insertions(+), 3 deletions(-) +Merging s390/for-next (81927e347be0 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 +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-css | 15 +- + Documentation/s390/vfio-ccw.rst | 4 +- + arch/s390/boot/Makefile | 2 +- + arch/s390/boot/boot.h | 36 +- + arch/s390/boot/decompressor.c | 1 + + arch/s390/boot/decompressor.h | 26 - + arch/s390/boot/startup.c | 65 +- + arch/s390/boot/vmem.c | 293 ++++ + arch/s390/crypto/arch_random.c | 1 + + arch/s390/include/asm/abs_lowcore.h | 16 +- + arch/s390/include/asm/cputime.h | 15 - + arch/s390/include/asm/diag.h | 16 +- + arch/s390/include/asm/idals.h | 12 + + arch/s390/include/asm/kasan.h | 4 - + arch/s390/include/asm/maccess.h | 2 +- + arch/s390/include/asm/pgtable.h | 7 + + arch/s390/include/asm/ptrace.h | 2 +- + arch/s390/include/asm/setup.h | 4 + + arch/s390/include/uapi/asm/fs3270.h | 25 + + arch/s390/include/uapi/asm/raw3270.h | 75 + + arch/s390/kernel/abs_lowcore.c | 49 - + arch/s390/kernel/diag.c | 26 + + arch/s390/kernel/early.c | 6 +- + arch/s390/kernel/entry.h | 1 - + arch/s390/kernel/head64.S | 1 + + arch/s390/kernel/idle.c | 4 +- + arch/s390/kernel/ipl.c | 5 +- + arch/s390/kernel/machine_kexec.c | 5 +- + arch/s390/kernel/os_info.c | 5 +- + arch/s390/kernel/perf_cpum_cf.c | 35 +- + arch/s390/kernel/process.c | 4 +- + arch/s390/kernel/setup.c | 90 +- + arch/s390/kernel/smp.c | 14 +- + arch/s390/kernel/text_amode31.S | 13 + + arch/s390/kernel/vmlinux.lds.S | 3 + + arch/s390/mm/init.c | 35 +- + arch/s390/mm/kasan_init.c | 164 +-- + arch/s390/mm/maccess.c | 28 +- + arch/s390/mm/vmem.c | 96 +- + drivers/s390/char/Kconfig | 11 +- + drivers/s390/char/Makefile | 4 +- + drivers/s390/char/con3270.c | 2409 +++++++++++++++++++++++++------ + drivers/s390/char/fs3270.c | 124 +- + drivers/s390/char/raw3270.c | 376 ++--- + drivers/s390/char/raw3270.h | 227 +-- + drivers/s390/char/sclp_early.c | 2 +- + drivers/s390/char/tty3270.c | 1963 ------------------------- + drivers/s390/char/tty3270.h | 15 - + drivers/s390/cio/vfio_ccw_cp.c | 365 ++--- + drivers/s390/cio/vfio_ccw_cp.h | 3 +- + drivers/s390/cio/vfio_ccw_fsm.c | 2 +- + drivers/s390/crypto/vfio_ap_ops.c | 10 +- + drivers/s390/crypto/zcrypt_api.c | 6 +- + 53 files changed, 3301 insertions(+), 3421 deletions(-) + create mode 100644 arch/s390/boot/vmem.c + create mode 100644 arch/s390/include/uapi/asm/fs3270.h + create mode 100644 arch/s390/include/uapi/asm/raw3270.h + delete mode 100644 drivers/s390/char/tty3270.c + delete mode 100644 drivers/s390/char/tty3270.h +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 (4414c1f5c7a3 xtensa: drop unused members of struct thread_struct) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Already up to date. +Merging pidfd/for-next (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 (4e1da8fe0313 posix_acl: Use try_cmpxchg in get_acl) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Merge made by the 'ort' strategy. + fs/posix_acl.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (a9eb558a5bea afs: Stop implementing ->writepage()) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (ea8846a3a63f Merge branch 'for-next-next-v6.2-20230113' into for-next-20230113) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git btrfs/for-next +Auto-merging fs/btrfs/disk-io.c +Auto-merging fs/btrfs/tree-log.c +CONFLICT (content): Merge conflict in fs/btrfs/tree-log.c +Resolved 'fs/btrfs/tree-log.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 44837033334a] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git +$ git diff -M --stat --summary HEAD^.. + fs/btrfs/Makefile | 6 +- + fs/btrfs/block-group.c | 246 ++++++++++++++-- + fs/btrfs/block-group.h | 21 +- + fs/btrfs/compression.c | 2 +- + fs/btrfs/defrag.c | 4 +- + fs/btrfs/delayed-ref.c | 24 +- + fs/btrfs/delayed-ref.h | 2 +- + fs/btrfs/discard.c | 27 +- + fs/btrfs/disk-io.c | 16 +- + fs/btrfs/extent-io-tree.c | 8 +- + fs/btrfs/extent-tree.c | 171 ++++------- + fs/btrfs/extent-tree.h | 81 ++++++ + fs/btrfs/file.c | 15 +- + fs/btrfs/inode.c | 17 +- + fs/btrfs/locking.c | 25 +- + fs/btrfs/locking.h | 5 +- + fs/btrfs/lru_cache.c | 163 +++++++++++ + fs/btrfs/lru_cache.h | 80 ++++++ + fs/btrfs/lzo.c | 2 +- + fs/btrfs/messages.c | 30 -- + fs/btrfs/messages.h | 34 --- + fs/btrfs/ordered-data.c | 25 +- + fs/btrfs/ordered-data.h | 2 +- + fs/btrfs/qgroup.c | 25 +- + fs/btrfs/relocation.c | 2 +- + fs/btrfs/scrub.c | 49 +++- + fs/btrfs/send.c | 657 ++++++++++++++++++++++--------------------- + fs/btrfs/super.c | 1 + + fs/btrfs/transaction.c | 29 ++ + fs/btrfs/transaction.h | 31 ++ + fs/btrfs/tree-log.c | 60 ++-- + fs/btrfs/tree-log.h | 11 +- + fs/btrfs/volumes.c | 50 ++-- + fs/btrfs/zoned.c | 9 +- + include/trace/events/btrfs.h | 127 +++++++-- + 35 files changed, 1340 insertions(+), 717 deletions(-) + create mode 100644 fs/btrfs/lru_cache.c + create mode 100644 fs/btrfs/lru_cache.h +Merging ceph/master (8e1858710d9a ceph: avoid use-after-free in ceph_fl_release_lock()) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (ee3ba4615255 cifs: Replace zero-length arrays with flexible-array members) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/cifs/cifs_debug.c | 5 +++-- + fs/cifs/ntlmssp.h | 4 ++-- + 2 files changed, 5 insertions(+), 4 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 (b7bfaa761d76 Linux 6.2-rc3) +$ 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 (ef85ccafff6a exfat: handle unreconized benign secondary entries) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/dir.c | 90 ++++++++++++++++++++++++++++++++++------------------ + fs/exfat/exfat_fs.h | 4 ++- + fs/exfat/exfat_raw.h | 21 ++++++++++++ + fs/exfat/file.c | 3 +- + fs/exfat/inode.c | 6 ++-- + fs/exfat/namei.c | 2 +- + fs/exfat/super.c | 3 +- + 7 files changed, 89 insertions(+), 40 deletions(-) +Merging ext3/for_next (1fb40763a58c udf: remove redundant variable netype) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. + fs/ext2/dir.c | 4 +- + fs/udf/dir.c | 148 ++------ + fs/udf/directory.c | 567 +++++++++++++++++++++------- + fs/udf/file.c | 26 +- + fs/udf/inode.c | 189 +++------- + fs/udf/namei.c | 1066 ++++++++++++++++++---------------------------------- + fs/udf/super.c | 1 + + fs/udf/truncate.c | 4 +- + fs/udf/udf_i.h | 3 +- + fs/udf/udf_sb.h | 2 + + fs/udf/udfdecl.h | 45 +-- + 11 files changed, 924 insertions(+), 1131 deletions(-) +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 (7a2b15cfa8db f2fs: support accounting iostat count and avg_bytes) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-fs-f2fs | 39 +++ + Documentation/filesystems/f2fs.rst | 2 +- + MAINTAINERS | 1 + + fs/f2fs/checkpoint.c | 5 +- + fs/f2fs/compress.c | 9 +- + fs/f2fs/data.c | 592 ++++++++++++++++---------------- + fs/f2fs/dir.c | 4 +- + fs/f2fs/extent_cache.c | 11 + + fs/f2fs/f2fs.h | 99 ++---- + fs/f2fs/file.c | 39 +-- + fs/f2fs/gc.c | 14 +- + fs/f2fs/gc.h | 2 +- + fs/f2fs/inline.c | 1 - + fs/f2fs/inode.c | 4 +- + fs/f2fs/iostat.c | 129 ++++--- + fs/f2fs/node.c | 7 +- + fs/f2fs/segment.c | 47 ++- + fs/f2fs/segment.h | 17 +- + fs/f2fs/super.c | 23 +- + fs/f2fs/sysfs.c | 4 +- + include/trace/events/f2fs.h | 13 +- + 21 files changed, 533 insertions(+), 529 deletions(-) +Merging fsverity/fsverity (db85d14dc5c5 ext4: allow verity with fs block size < PAGE_SIZE) +$ git merge -m Merge branch 'fsverity' of git://git.kernel.org/pub/scm/fs/fscrypt/fscrypt.git fsverity/fsverity +Auto-merging fs/f2fs/data.c +Merge made by the 'ort' strategy. + Documentation/filesystems/fsverity.rst | 76 ++++---- + fs/btrfs/verity.c | 19 +- + fs/buffer.c | 67 ++++++- + fs/ext4/readpage.c | 3 +- + fs/ext4/super.c | 5 - + fs/ext4/verity.c | 6 +- + fs/f2fs/data.c | 3 +- + fs/f2fs/verity.c | 6 +- + fs/verity/Kconfig | 8 - + fs/verity/enable.c | 271 ++++++++++++-------------- + fs/verity/fsverity_private.h | 24 +-- + fs/verity/hash_algs.c | 24 ++- + fs/verity/init.c | 1 - + fs/verity/open.c | 163 +++++++++------- + fs/verity/signature.c | 2 - + fs/verity/verify.c | 337 ++++++++++++++++++++++----------- + include/linux/fsverity.h | 88 +++++++-- + 17 files changed, 647 insertions(+), 456 deletions(-) +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 +Already up to date. +Merging jfs/jfs-next (a60dca73a1a8 jfs: makes diUnmount/diMount in jfs_mount_rw atomic) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (83dcedd5540d ksmbd: fix infinite loop in ksmbd_conn_handler_loop()) +$ 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 (5dc4c995db9e Linux 6.2-rc4) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Already up to date. +Merging nfs-anna/linux-next (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 (24b868a84f6e SUNRPC: Replace pool stats with per-CPU variables) + a4fd7d01a21e ("NFSD: register/unregister of nfsd-client shrinker at nfsd startup/shutdown time") +$ 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/nfs4proc.c +Auto-merging fs/nfsd/nfs4state.c +CONFLICT (content): Merge conflict in fs/nfsd/nfs4state.c +Auto-merging fs/nfsd/nfsctl.c +CONFLICT (content): Merge conflict in fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/nfsd.h +Resolved 'fs/nfsd/nfs4state.c' using previous resolution. +Resolved 'fs/nfsd/nfsctl.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5028636ae051] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux +$ git diff -M --stat --summary HEAD^.. + fs/lockd/svc.c | 21 +- + fs/namei.c | 6 +- + fs/nfs/callback_xdr.c | 13 +- + fs/nfs/export.c | 2 +- + fs/nfsd/filecache.c | 49 +- + fs/nfsd/nfs2acl.c | 5 +- + fs/nfsd/nfs3acl.c | 5 +- + fs/nfsd/nfs3proc.c | 5 +- + fs/nfsd/nfs4proc.c | 118 ++--- + fs/nfsd/nfs4state.c | 19 +- + fs/nfsd/nfscache.c | 4 +- + fs/nfsd/nfsctl.c | 8 - + fs/nfsd/nfsd.h | 2 +- + fs/nfsd/nfsproc.c | 6 +- + fs/nfsd/nfssvc.c | 21 +- + fs/nfsd/vfs.c | 8 +- + fs/nfsd/xdr4.h | 2 +- + include/linux/lockd/lockd.h | 4 +- + include/linux/namei.h | 2 +- + include/linux/nfs_ssc.h | 2 +- + include/linux/sunrpc/msg_prot.h | 5 + + include/linux/sunrpc/svc.h | 133 ++--- + include/linux/sunrpc/xdr.h | 28 +- + include/trace/events/rpcgss.h | 22 + + net/sunrpc/auth_gss/svcauth_gss.c | 1015 +++++++++++++++++++------------------ + net/sunrpc/stats.c | 11 +- + net/sunrpc/svc.c | 158 +++--- + net/sunrpc/svc_xprt.c | 19 +- + net/sunrpc/svcauth.c | 13 +- + net/sunrpc/svcauth_unix.c | 172 +++++-- + net/sunrpc/xdr.c | 79 ++- + 31 files changed, 1082 insertions(+), 875 deletions(-) +Merging ntfs3/master (57c94236401b fs/ntfs3: Refactoring of various minor issues) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Merge made by the 'ort' strategy. + fs/ntfs3/bitmap.c | 3 ++- + fs/ntfs3/frecord.c | 5 ++++- + fs/ntfs3/fslog.c | 6 +++++- + fs/ntfs3/fsntfs.c | 23 +++++++++++++++-------- + fs/ntfs3/index.c | 23 +++++++++++++++++++++-- + fs/ntfs3/inode.c | 16 ++++++++++++++-- + fs/ntfs3/namei.c | 10 ++++++++++ + fs/ntfs3/ntfs.h | 3 --- + fs/ntfs3/ntfs_fs.h | 1 + + fs/ntfs3/record.c | 6 +++--- + fs/ntfs3/super.c | 10 +++++++++- + fs/ntfs3/xattr.c | 6 +++--- + 12 files changed, 87 insertions(+), 25 deletions(-) +Merging orangefs/for-next (31720a2b109b orangefs: Fix kmemleak in orangefs_{kernel,client}_debug_init()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux orangefs/for-next +Already up to date. +Merging overlayfs/overlayfs-next (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 (1a4f69ef15ec 9p/client: fix data race on req->status) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging xfs/for-next (601a27ea09a3 xfs: fix extent busy updating) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Already up to date. +Merging zonefs/for-next (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 (c65454a94726 fs: remove locks_inode) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Auto-merging fs/ksmbd/smb2pdu.c +Auto-merging fs/namei.c +Auto-merging fs/nfsd/netns.h +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/posix_acl.c +Auto-merging include/linux/lockd/lockd.h +Merge made by the 'ort' strategy. + arch/arm/kernel/sys_oabi-compat.c | 1 + + fs/9p/vfs_file.c | 1 + + fs/afs/flock.c | 14 +- + fs/afs/internal.h | 1 + + fs/attr.c | 1 + + fs/ceph/caps.c | 1 + + fs/ceph/locks.c | 1 + + fs/cifs/cifsfs.c | 1 + + fs/cifs/cifsglob.h | 1 + + fs/cifs/cifssmb.c | 1 + + fs/cifs/file.c | 1 + + fs/cifs/smb2file.c | 1 + + fs/dlm/plock.c | 1 + + fs/fcntl.c | 1 + + fs/file_table.c | 1 + + fs/fuse/file.c | 1 + + fs/gfs2/file.c | 1 + + fs/inode.c | 1 + + fs/ksmbd/smb2pdu.c | 1 + + fs/ksmbd/vfs.c | 1 + + fs/ksmbd/vfs_cache.c | 1 + + fs/lockd/clntlock.c | 2 +- + fs/lockd/clntproc.c | 3 +- + fs/lockd/netns.h | 1 + + fs/locks.c | 29 +-- + fs/namei.c | 1 + + fs/nfs/file.c | 1 + + fs/nfs/nfs4_fs.h | 1 + + fs/nfs/pagelist.c | 1 + + fs/nfs/write.c | 1 + + fs/nfs_common/grace.c | 1 + + fs/nfsd/netns.h | 1 + + fs/nfsd/nfs4state.c | 4 +- + fs/ocfs2/locks.c | 1 + + fs/ocfs2/stack_user.c | 1 + + fs/open.c | 3 +- + fs/orangefs/file.c | 1 + + fs/posix_acl.c | 1 + + fs/proc/fd.c | 1 + + fs/utimes.c | 1 + + fs/xattr.c | 1 + + fs/xfs/xfs_linux.h | 1 + + include/linux/filelock.h | 439 ++++++++++++++++++++++++++++++++++++++ + include/linux/fs.h | 429 ------------------------------------- + include/linux/lockd/lockd.h | 4 +- + include/linux/lockd/xdr.h | 1 + + 46 files changed, 507 insertions(+), 457 deletions(-) + create mode 100644 include/linux/filelock.h +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/export.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 (557e0248a8a0 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 +Merge made by the 'ort' strategy. + arch/alpha/boot/bootp.c | 2 +- + arch/alpha/boot/bootpz.c | 2 +- + arch/alpha/boot/main.c | 2 +- + arch/alpha/boot/misc.c | 2 -- + arch/alpha/boot/stdio.c | 4 ++-- + arch/alpha/boot/tools/objstrip.c | 2 +- + arch/alpha/kernel/traps.c | 30 +++++++++++++++--------------- + fs/cramfs/inode.c | 9 ++++----- + fs/nsfs.c | 3 ++- + 9 files changed, 27 insertions(+), 29 deletions(-) +Merging printk/for-next (c02bfc11c76b 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 +Merge made by the 'ort' strategy. + Documentation/admin-guide/kdump/gdbmacros.txt | 2 +- + drivers/tty/serial/kgdboc.c | 20 +- + drivers/tty/serial/serial_core.c | 5 + + include/linux/console.h | 100 ++++++--- + include/linux/printk.h | 2 - + kernel/printk/internal.h | 45 ++++ + kernel/printk/printk.c | 308 +++++++++++++++----------- + 7 files changed, 308 insertions(+), 174 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 2cdfcf8884e1 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git +Merging next-20230113 version of printk +$ git merge -m next-20230113/printk 146e448200be8cfa98418967eea67df520abefde +Merge made by the 'ort' strategy. + Documentation/admin-guide/kdump/gdbmacros.txt | 2 +- + include/linux/console.h | 100 ++++++--- + include/linux/printk.h | 2 - + kernel/printk/internal.h | 45 ++++ + kernel/printk/printk.c | 308 +++++++++++++++----------- + 5 files changed, 298 insertions(+), 159 deletions(-) +Merging pci/next (25cfdd48a4bd Merge branch 'remotes/lorenzo/pci/switchtec') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Auto-merging include/acpi/acpi_bus.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 +- + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 6 +- + .../devicetree/bindings/pci/qcom,pcie.yaml | 98 ++++++++++++++-------- + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 76 +++++++++++------ + drivers/acpi/device_pm.c | 19 +++++ + drivers/pci/controller/dwc/pcie-qcom.c | 1 + + drivers/pci/iov.c | 2 +- + drivers/pci/pci-acpi.c | 45 ++++++---- + drivers/pci/pcie/aer.c | 3 + + drivers/pci/switch/switchtec.c | 12 ++- + include/acpi/acpi_bus.h | 1 + + 11 files changed, 179 insertions(+), 88 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at c1b65ab6ac2e next-20230113/printk +Merging next-20230113 version of pci +$ git merge -m next-20230113/pci 1b929c02afd37871d5afb9d498426f83432e71c2 +Already up to date. +Merging pstore/for-next/pstore (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Already up to date. +Merging hid/for-next (bd92d2065ad1 Merge branch 'for-6.2/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Auto-merging MAINTAINERS +Auto-merging kernel/bpf/verifier.c +Auto-merging net/bpf/test_run.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/amd-sfh-hid/amd_sfh_client.c | 2 +- + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_init.c | 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 +- + drivers/hid/hid-sensor-custom.c | 242 ++++-- + drivers/hid/intel-ish-hid/ishtp/dma-if.c | 10 + + drivers/iio/light/hid-sensor-als.c | 27 +- + drivers/iio/light/hid-sensor-prox.c | 37 +- + include/linux/hid-sensor-ids.h | 1 + + 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 + + 44 files changed, 4916 insertions(+), 111 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 (59b3484a571e Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 47 ++++++++++++++-------- + drivers/i2c/busses/i2c-designware-common.c | 11 +++-- + drivers/i2c/busses/i2c-designware-core.h | 2 +- + drivers/i2c/busses/i2c-designware-pcidrv.c | 2 + + drivers/i2c/busses/i2c-designware-platdrv.c | 20 +-------- + drivers/i2c/busses/i2c-mxs.c | 4 +- + drivers/i2c/busses/i2c-qcom-cci.c | 8 +++- + drivers/i2c/busses/i2c-qcom-geni.c | 2 +- + 8 files changed, 52 insertions(+), 44 deletions(-) +Merging i3c/i3c/next (e826acc18bc7 i3c: transfer pid from boardinfo to device info) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Merge made by the 'ort' strategy. + drivers/i3c/master.c | 1 + + 1 file changed, 1 insertion(+) +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 (774dccfe77dc hwmon: (ftsteutates) Add support for fanX_fault attributes) +$ 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 +Auto-merging MAINTAINERS +Auto-merging drivers/hwmon/Kconfig +Auto-merging drivers/hwmon/Makefile +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-class-hwmon | 9 + + .../bindings/hwmon/hpe,gxp-fan-ctrl.yaml | 45 ++ + Documentation/hwmon/aquacomputer_d5next.rst | 5 + + Documentation/hwmon/ftsteutates.rst | 5 + + Documentation/hwmon/gxp-fan-ctrl.rst | 28 ++ + Documentation/hwmon/hwmon-kernel-api.rst | 2 +- + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/oxp-sensors.rst | 17 +- + MAINTAINERS | 5 + + drivers/hwmon/Kconfig | 11 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/aht10.c | 3 +- + drivers/hwmon/aquacomputer_d5next.c | 242 +++++++-- + drivers/hwmon/coretemp.c | 132 +++-- + drivers/hwmon/emc2305.c | 24 +- + drivers/hwmon/ftsteutates.c | 560 ++++++++------------- + drivers/hwmon/gxp-fan-ctrl.c | 255 ++++++++++ + drivers/hwmon/hih6130.c | 4 +- + drivers/hwmon/ibmpex.c | 2 +- + drivers/hwmon/it87.c | 61 ++- + drivers/hwmon/nct6775-platform.c | 150 ++++-- + drivers/hwmon/nzxt-smart2.c | 1 + + drivers/hwmon/oxp-sensors.c | 52 +- + drivers/hwmon/pmbus/Kconfig | 16 + + drivers/hwmon/pmbus/Makefile | 1 + + drivers/hwmon/pmbus/ltc2978.c | 16 +- + drivers/hwmon/pmbus/mpq7932.c | 156 ++++++ + drivers/hwmon/pmbus/pmbus.h | 5 +- + drivers/hwmon/sht15.c | 8 +- + drivers/hwmon/sht21.c | 4 +- + 30 files changed, 1277 insertions(+), 544 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/hpe,gxp-fan-ctrl.yaml + create mode 100644 Documentation/hwmon/gxp-fan-ctrl.rst + create mode 100644 drivers/hwmon/gxp-fan-ctrl.c + create mode 100644 drivers/hwmon/pmbus/mpq7932.c +Merging jc_docs/docs-next (2d4e6fe22edb 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. + Documentation/admin-guide/kernel-parameters.txt | 122 +++++----- + Documentation/filesystems/proc.rst | 1 + + Documentation/mm/page_owner.rst | 4 +- + Documentation/process/botching-up-ioctls.rst | 2 +- + Documentation/process/deprecated.rst | 26 +++ + Documentation/process/email-clients.rst | 20 ++ + Documentation/process/maintainer-pgp-guide.rst | 102 +++------ + Documentation/trace/events.rst | 4 +- + .../translations/it_IT/admin-guide/README.rst | 2 +- + .../translations/it_IT/doc-guide/kernel-doc.rst | 2 + + .../translations/it_IT/doc-guide/sphinx.rst | 14 +- + Documentation/translations/it_IT/index.rst | 89 ++++---- + .../translations/it_IT/kernel-hacking/hacking.rst | 2 +- + .../translations/it_IT/process/2.Process.rst | 15 +- + .../it_IT/process/7.AdvancedTopics.rst | 8 +- + .../it_IT/process/botching-up-ioctls.rst | 249 +++++++++++++++++++++ + .../translations/it_IT/process/changes.rst | 11 + + .../translations/it_IT/process/email-clients.rst | 69 ++++-- + Documentation/translations/it_IT/process/index.rst | 1 + + .../translations/it_IT/process/kernel-docs.rst | 4 +- + .../it_IT/process/maintainer-pgp-guide.rst | 6 +- + .../it_IT/process/submitting-patches.rst | 2 +- + .../translations/sp_SP/process/code-of-conduct.rst | 97 ++++++++ + Documentation/translations/sp_SP/process/index.rst | 2 + + .../sp_SP/process/kernel-enforcement-statement.rst | 174 ++++++++++++++ + Documentation/translations/zh_CN/PCI/msi-howto.rst | 11 + + .../zh_CN/accounting/delay-accounting.rst | 7 +- + .../zh_CN/admin-guide/mm/damon/reclaim.rst | 4 - + .../zh_CN/admin-guide/mm/damon/start.rst | 12 +- + .../zh_CN/admin-guide/mm/damon/usage.rst | 68 ++++-- + .../translations/zh_CN/admin-guide/mm/ksm.rst | 50 +++++ + .../translations/zh_CN/core-api/kernel-api.rst | 10 +- + .../translations/zh_CN/core-api/mm-api.rst | 2 +- + .../translations/zh_CN/dev-tools/kasan.rst | 74 +++--- + .../zh_CN/dev-tools/testing-overview.rst | 27 +++ + Documentation/translations/zh_CN/mm/highmem.rst | 20 +- + Documentation/translations/zh_CN/mm/page_owner.rst | 17 +- + .../translations/zh_CN/power/energy-model.rst | 36 ++- + Documentation/translations/zh_CN/process/howto.rst | 2 +- + Documentation/x86/x86_64/mm.rst | 2 +- + 40 files changed, 1041 insertions(+), 329 deletions(-) + create mode 100644 Documentation/translations/it_IT/process/botching-up-ioctls.rst + create mode 100644 Documentation/translations/sp_SP/process/code-of-conduct.rst + create mode 100644 Documentation/translations/sp_SP/process/kernel-enforcement-statement.rst +Merging v4l-dvb/master (6599e683db1b Merge tag 'v6.2-rc1' into media_tree) +$ 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 (837dc62247d5 Merge branch 'pm-cpuidle' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + Documentation/firmware-guide/acpi/index.rst | 1 - + .../firmware-guide/acpi/method-customizing.rst | 89 --------- + drivers/acpi/Kconfig | 14 -- + drivers/acpi/Makefile | 1 - + drivers/acpi/acpi_lpit.c | 1 + + drivers/acpi/acpica/hwvalid.c | 7 +- + drivers/acpi/acpica/nsrepair.c | 12 +- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/custom_method.c | 103 ---------- + drivers/acpi/ioapic.c | 1 + + drivers/acpi/pmic/intel_pmic_bytcrc.c | 1 + + drivers/acpi/processor_idle.c | 2 +- + drivers/acpi/processor_perflib.c | 38 +++- + drivers/acpi/tables.c | 3 +- + drivers/cpufreq/intel_pstate.c | 14 -- + drivers/cpuidle/governors/teo.c | 102 +++++++++- + drivers/net/ethernet/chelsio/cxgb4/cxgb4.h | 2 - + drivers/net/ethernet/chelsio/cxgb4/cxgb4_thermal.c | 39 +--- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 209 +++++---------------- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 2 +- + drivers/net/wireless/intel/iwlwifi/mvm/tt.c | 71 ++----- + drivers/platform/x86/acerhdf.c | 73 +++---- + drivers/thermal/armada_thermal.c | 40 ++-- + drivers/thermal/broadcom/bcm2835_thermal.c | 8 +- + drivers/thermal/da9062-thermal.c | 52 +---- + drivers/thermal/gov_bang_bang.c | 37 ++-- + drivers/thermal/gov_fair_share.c | 18 +- + drivers/thermal/gov_power_allocator.c | 51 +++-- + drivers/thermal/gov_step_wise.c | 22 +-- + drivers/thermal/hisi_thermal.c | 11 +- + drivers/thermal/imx_thermal.c | 72 +++---- + drivers/thermal/intel/Kconfig | 7 + + drivers/thermal/intel/Makefile | 1 + + drivers/thermal/intel/int340x_thermal/Kconfig | 1 + + .../intel/int340x_thermal/int340x_thermal_zone.c | 33 ++-- + .../intel/int340x_thermal/int340x_thermal_zone.h | 4 +- + .../int340x_thermal/processor_thermal_device.c | 129 +++---------- + drivers/thermal/intel/intel_soc_dts_iosf.c | 35 +--- + drivers/thermal/intel/intel_tcc.c | 139 ++++++++++++++ + drivers/thermal/intel/intel_tcc_cooling.c | 37 +--- + drivers/thermal/intel/x86_pkg_temp_thermal.c | 176 ++++++++--------- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 44 ++--- + drivers/thermal/rcar_gen3_thermal.c | 2 +- + drivers/thermal/rcar_thermal.c | 53 +----- + drivers/thermal/samsung/exynos_tmu.c | 62 +++--- + drivers/thermal/st/st_thermal.c | 47 +---- + drivers/thermal/tegra/soctherm.c | 35 ++-- + drivers/thermal/tegra/tegra30-tsensor.c | 17 +- + drivers/thermal/thermal_core.c | 154 ++++++++++++--- + drivers/thermal/thermal_core.h | 24 +-- + drivers/thermal/thermal_helpers.c | 28 +-- + drivers/thermal/thermal_netlink.c | 19 +- + drivers/thermal/thermal_of.c | 116 ------------ + drivers/thermal/thermal_sysfs.c | 135 +++++-------- + drivers/thermal/ti-soc-thermal/ti-thermal.h | 15 -- + drivers/thermal/uniphier_thermal.c | 27 ++- + include/acpi/acpixf.h | 2 +- + include/acpi/actbl1.h | 2 + + include/linux/intel_tcc.h | 18 ++ + include/linux/thermal.h | 12 ++ + 60 files changed, 989 insertions(+), 1483 deletions(-) + delete mode 100644 Documentation/firmware-guide/acpi/method-customizing.rst + delete mode 100644 drivers/acpi/custom_method.c + create mode 100644 drivers/thermal/intel/intel_tcc.c + create mode 100644 include/linux/intel_tcc.h +Merging cpufreq-arm/cpufreq/arm/linux-next (08f0adb193c0 cpufreq: armada-37xx: stop using 0 as NULL pointer) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'cpupower' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git cpupower/cpupower +Already up to date. +Merging devfreq/devfreq-next (497e92ab8c8e PM / devfreq: Remove "select SRCU") +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Merge made by the 'ort' strategy. + drivers/devfreq/Kconfig | 1 - + 1 file changed, 1 deletion(-) +Merging opp/opp/linux-next (67052d09900b dt-bindings: cpufreq: cpufreq-qcom-hw: Add missing compatibles) +$ 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 +Auto-merging Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/cpufreq/cpufreq-qcom-hw.yaml | 4 ++++ + Documentation/devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 2 ++ + drivers/opp/Kconfig | 1 - + 3 files changed, 6 insertions(+), 1 deletion(-) +Merging thermal/thermal/linux-next (0a6d1825cb5c dt-bindings: thermal: qcom-spmi-adc-tm5: add qcom,adc-tm7) +$ 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 +Merge made by the 'ort' strategy. + .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 1 + + drivers/thermal/mtk_thermal.c | 2 +- + drivers/thermal/qcom/tsens.c | 46 +--------------------- + drivers/thermal/rockchip_thermal.c | 6 +-- + drivers/thermal/uniphier_thermal.c | 2 +- + 5 files changed, 7 insertions(+), 50 deletions(-) +$ git reset --hard HEAD^ +HEAD is now at 41570fbd0e55 Merge branch 'opp/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git +Merging next-20230113 version of thermal +$ git merge -m next-20230113/thermal 3a151494dc04c76add577ae66e8a04f900638aaf +Already up to date. +Merging dlm/next (aa7f4a21f6e5 fs/dlm: Remove "select SRCU") +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'ort' strategy. + fs/dlm/Kconfig | 1 - + fs/dlm/memory.c | 2 +- + 2 files changed, 1 insertion(+), 2 deletions(-) +Merging rdma/for-next (1ec82317a1da IB/hfi1: Use dma_mmap_coherent for matching buffers) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Auto-merging drivers/infiniband/hw/hfi1/user_exp_rcv.c +Merge made by the 'ort' strategy. + drivers/infiniband/core/cma.c | 283 +++++++++++++++------------- + drivers/infiniband/core/sa_query.c | 171 ++++++----------- + drivers/infiniband/hw/cxgb4/cq.c | 2 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 4 +- + drivers/infiniband/hw/hfi1/chip.c | 59 +++--- + drivers/infiniband/hw/hfi1/exp_rcv.h | 5 +- + drivers/infiniband/hw/hfi1/file_ops.c | 81 +++++--- + drivers/infiniband/hw/hfi1/init.c | 2 +- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 55 +++--- + drivers/infiniband/hw/hfi1/verbs.c | 81 ++++---- + drivers/infiniband/hw/hns/hns_roce_device.h | 19 +- + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 109 ++++------- + drivers/infiniband/hw/hns/hns_roce_hw_v2.h | 3 +- + drivers/infiniband/hw/hns/hns_roce_main.c | 17 +- + drivers/infiniband/hw/hns/hns_roce_qp.c | 66 +------ + drivers/infiniband/hw/irdma/verbs.c | 5 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 2 +- + include/rdma/ib_sa.h | 2 +- + include/rdma/rdma_cm.h | 1 - + include/uapi/rdma/hns-abi.h | 4 + + 21 files changed, 415 insertions(+), 558 deletions(-) +Merging net-next/master (298bfe27d112 Merge branch 'mlxbf_gige-add-bluefield-3-support') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/master +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/net/ethernet/amd/xgbe/xgbe-dev.c +Auto-merging drivers/net/ethernet/amd/xgbe/xgbe-mdio.c +Auto-merging drivers/net/ethernet/amd/xgbe/xgbe.h +Auto-merging drivers/net/ethernet/freescale/enetc/enetc.c +Auto-merging include/linux/bpf.h +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging net/mptcp/protocol.c +Auto-merging net/mptcp/protocol.h +Merge made by the 'ort' strategy. + Documentation/bpf/map_sockmap.rst | 498 +++++++ + .../bindings/net/amlogic,g12a-mdio-mux.yaml | 80 + + .../devicetree/bindings/net/maxlinear,gpy2xx.yaml | 47 + + .../bindings/net/mdio-mux-meson-g12a.txt | 48 - + .../devicetree/bindings/net/rockchip-dwmac.yaml | 2 +- + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 33 +- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/networking/ethtool-netlink.rst | 155 ++ + MAINTAINERS | 19 +- + arch/x86/net/bpf_jit_comp.c | 70 +- + drivers/net/Kconfig | 13 +- + drivers/net/Makefile | 4 +- + drivers/net/dsa/microchip/Kconfig | 11 + + drivers/net/dsa/microchip/Makefile | 5 + + drivers/net/dsa/microchip/ksz_common.c | 44 +- + drivers/net/dsa/microchip/ksz_common.h | 48 + + drivers/net/dsa/microchip/ksz_ptp.c | 1199 +++++++++++++++ + drivers/net/dsa/microchip/ksz_ptp.h | 86 ++ + drivers/net/dsa/microchip/ksz_ptp_reg.h | 142 ++ + drivers/net/dsa/mv88e6xxx/Makefile | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 195 ++- + drivers/net/dsa/mv88e6xxx/chip.h | 22 + + drivers/net/dsa/mv88e6xxx/global1_atu.c | 24 +- + drivers/net/dsa/mv88e6xxx/global2.c | 66 +- + drivers/net/dsa/mv88e6xxx/global2.h | 18 +- + drivers/net/dsa/mv88e6xxx/phy.c | 32 + + drivers/net/dsa/mv88e6xxx/phy.h | 4 + + drivers/net/dsa/mv88e6xxx/serdes.c | 8 +- + drivers/net/dsa/mv88e6xxx/switchdev.c | 83 ++ + drivers/net/dsa/mv88e6xxx/switchdev.h | 19 + + drivers/net/dsa/ocelot/felix_vsc9959.c | 6 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 3 + + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 24 + + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 107 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 2 + + drivers/net/ethernet/atheros/alx/main.c | 10 +- + drivers/net/ethernet/freescale/enetc/Kconfig | 4 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 38 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 1 - + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 2 - + drivers/net/ethernet/freescale/enetc/enetc_mdio.c | 119 +- + .../net/ethernet/freescale/enetc/enetc_pci_mdio.c | 6 +- + drivers/net/ethernet/freescale/enetc/enetc_pf.c | 12 +- + drivers/net/ethernet/freescale/fec_main.c | 153 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 148 +- + drivers/net/ethernet/fungible/funeth/Kconfig | 2 +- + drivers/net/ethernet/intel/e1000e/ethtool.c | 10 +- + drivers/net/ethernet/intel/e1000e/phy.c | 9 + + drivers/net/ethernet/intel/igc/igc_base.c | 29 + + drivers/net/ethernet/intel/igc/igc_base.h | 2 + + drivers/net/ethernet/intel/igc/igc_defines.h | 1 + + drivers/net/ethernet/intel/igc/igc_main.c | 8 +- + drivers/net/ethernet/intel/igc/igc_tsn.c | 56 +- + drivers/net/ethernet/marvell/mvmdio.c | 24 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 178 ++- + drivers/net/ethernet/mediatek/mtk_wed_wo.c | 11 - + drivers/net/ethernet/mediatek/mtk_wed_wo.h | 1 - + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 118 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 6 + + drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 8 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en/port.c | 72 + + drivers/net/ethernet/mellanox/mlx5/core/en/port.h | 6 + + .../ethernet/mellanox/mlx5/core/en/port_buffer.c | 222 ++- + .../ethernet/mellanox/mlx5/core/en/port_buffer.h | 1 + + .../net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 2 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 6 +- + .../ethernet/mellanox/mlx5/core/en_accel/ktls.c | 22 + + .../ethernet/mellanox/mlx5/core/en_accel/ktls.h | 8 + + .../ethernet/mellanox/mlx5/core/en_accel/ktls_tx.c | 22 + + drivers/net/ethernet/mellanox/mlx5/core/en_fs.c | 22 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 169 ++- + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 3 +- + .../ethernet/mellanox/mlx5/core/steering/dr_send.c | 5 +- + .../net/ethernet/mellanox/mlxbf_gige/mlxbf_gige.h | 27 + + .../mellanox/mlxbf_gige/mlxbf_gige_ethtool.c | 1 + + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 109 +- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio.c | 172 ++- + .../mellanox/mlxbf_gige/mlxbf_gige_mdio_bf2.h | 53 + + .../mellanox/mlxbf_gige/mlxbf_gige_mdio_bf3.h | 54 + + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_regs.h | 22 + + drivers/net/ethernet/microchip/lan743x_main.c | 106 +- + drivers/net/ethernet/netronome/Kconfig | 2 +- + drivers/net/ethernet/netronome/nfp/Makefile | 2 + + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 1 + + drivers/net/ethernet/netronome/nfp/nic/dcb.c | 571 ++++++++ + drivers/net/ethernet/netronome/nfp/nic/main.c | 39 +- + drivers/net/ethernet/netronome/nfp/nic/main.h | 46 + + drivers/net/ethernet/qlogic/qed/qed_sriov.c | 2 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.c | 5 + + drivers/net/ethernet/qualcomm/rmnet/rmnet_config.h | 20 + + .../net/ethernet/qualcomm/rmnet/rmnet_handlers.c | 18 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_map.h | 6 + + .../net/ethernet/qualcomm/rmnet/rmnet_map_data.c | 191 +++ + drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.c | 54 +- + drivers/net/ethernet/qualcomm/rmnet/rmnet_vnd.h | 1 + + drivers/net/ethernet/realtek/r8169_main.c | 14 +- + drivers/net/ethernet/renesas/sh_eth.c | 37 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 331 +++-- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 76 + + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 1 + + drivers/net/ethernet/ti/davinci_mdio.c | 50 +- + drivers/net/ethernet/wangxun/Kconfig | 1 + + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 504 ++++--- + drivers/net/ethernet/wangxun/libwx/wx_hw.h | 37 +- + drivers/net/ethernet/wangxun/libwx/wx_type.h | 81 +- + drivers/net/ethernet/wangxun/ngbe/Makefile | 2 +- + drivers/net/ethernet/wangxun/ngbe/ngbe.h | 79 - + drivers/net/ethernet/wangxun/ngbe/ngbe_hw.c | 74 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_hw.h | 5 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 333 ++--- + drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c | 286 ++++ + drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.h | 12 + + drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 80 +- + drivers/net/ethernet/wangxun/txgbe/txgbe.h | 43 - + drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c | 116 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_hw.h | 6 +- + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 335 ++--- + drivers/net/ethernet/wangxun/txgbe/txgbe_type.h | 14 +- + drivers/net/hamradio/baycom_epp.c | 8 +- + drivers/net/ipa/ipa_interrupt.c | 107 +- + drivers/net/ipa/ipa_interrupt.h | 48 +- + drivers/net/ipa/ipa_power.c | 19 +- + drivers/net/ipa/ipa_power.h | 12 + + drivers/net/ipa/ipa_uc.c | 21 +- + drivers/net/ipa/ipa_uc.h | 8 + + drivers/net/macsec.c | 125 +- + drivers/net/mdio/mdio-aspeed.c | 47 +- + drivers/net/mdio/mdio-bitbang.c | 77 +- + drivers/net/mdio/mdio-cavium.c | 111 +- + drivers/net/mdio/mdio-cavium.h | 9 +- + drivers/net/mdio/mdio-i2c.c | 32 +- + drivers/net/mdio/mdio-ipq4019.c | 154 +- + drivers/net/mdio/mdio-mux-bcm-iproc.c | 54 +- + drivers/net/mdio/mdio-octeon.c | 6 +- + drivers/net/mdio/mdio-thunder.c | 6 +- + drivers/net/netdevsim/dev.c | 15 +- + drivers/net/pcs/pcs-lynx.c | 20 +- + drivers/net/pcs/pcs-xpcs.c | 4 +- + drivers/net/phy/Kconfig | 7 + + drivers/net/phy/Makefile | 1 + + drivers/net/phy/mdio-open-alliance.h | 46 + + drivers/net/phy/mdio_bus.c | 270 +++- + drivers/net/phy/micrel.c | 38 +- + drivers/net/phy/mxl-gpy.c | 5 + + drivers/net/phy/ncn26000.c | 171 +++ + drivers/net/phy/phy-c45.c | 193 +++ + drivers/net/phy/phy-core.c | 5 +- + drivers/net/phy/phy.c | 192 +++ + drivers/net/phy/phy_device.c | 24 + + drivers/net/phy/phylink.c | 6 +- + drivers/net/thunderbolt/Kconfig | 12 + + drivers/net/thunderbolt/Makefile | 6 + + drivers/net/{thunderbolt.c => thunderbolt/main.c} | 48 +- + drivers/net/thunderbolt/trace.c | 10 + + drivers/net/thunderbolt/trace.h | 141 ++ + drivers/net/usb/cdc_ether.c | 114 -- + drivers/net/usb/r8152.c | 115 +- + drivers/net/usb/usbnet.c | 29 +- + include/linux/bpf.h | 16 +- + include/linux/bpf_verifier.h | 40 +- + include/linux/dsa/ksz_common.h | 53 + + include/linux/ethtool.h | 24 +- + include/linux/fsl/enetc_mdio.h | 21 +- + include/linux/mdio-bitbang.h | 6 +- + include/linux/mdio.h | 48 +- + include/linux/mlx5/driver.h | 8 + + include/linux/mlx5/mlx5_ifc.h | 61 + + include/linux/netlink.h | 4 + + include/linux/phy.h | 92 ++ + include/linux/ptp_classify.h | 73 + + include/linux/u64_stats_sync.h | 12 - + include/net/devlink.h | 2 + + include/net/dst_ops.h | 2 +- + include/trace/events/sock.h | 45 + + include/uapi/linux/bpf.h | 4 + + include/uapi/linux/ethtool.h | 5 +- + include/uapi/linux/ethtool_netlink.h | 28 + + include/uapi/linux/ioam6.h | 2 +- + include/uapi/linux/rpl.h | 4 +- + kernel/bpf/bpf_local_storage.c | 4 +- + kernel/bpf/btf.c | 21 +- + kernel/bpf/helpers.c | 71 +- + kernel/bpf/syscall.c | 1 - + kernel/bpf/verifier.c | 153 +- + kernel/trace/bpf_trace.c | 56 +- + net/Makefile | 1 + + net/caif/caif_socket.c | 4 - + net/core/Makefile | 1 - + net/core/dev.c | 2 +- + net/core/dst.c | 8 +- + net/core/filter.c | 5 +- + net/core/skbuff.c | 8 +- + net/core/sysctl_net_core.c | 5 - + net/devlink/Makefile | 3 + + net/devlink/core.c | 344 +++++ + net/devlink/devl_internal.h | 206 +++ + net/{core/devlink.c => devlink/leftover.c} | 1534 ++++++-------------- + net/devlink/netlink.c | 251 ++++ + net/dsa/tag_ksz.c | 201 ++- + net/ethtool/Makefile | 2 +- + net/ethtool/coalesce.c | 22 +- + net/ethtool/common.c | 8 + + net/ethtool/netlink.c | 29 + + net/ethtool/netlink.h | 6 + + net/ethtool/plca.c | 277 ++++ + net/ipv6/route.c | 13 +- + net/ipv6/rpl_iptunnel.c | 2 +- + net/mptcp/options.c | 3 +- + net/mptcp/pm_netlink.c | 5 +- + net/mptcp/protocol.c | 38 +- + net/mptcp/protocol.h | 2 +- + net/mptcp/sockopt.c | 2 +- + net/mptcp/token.c | 14 +- + net/mptcp/token_test.c | 3 + + net/netfilter/nf_conntrack_netlink.c | 2 +- + net/socket.c | 33 +- + net/vmw_vsock/af_vsock.c | 3 +- + samples/bpf/Makefile | 10 +- + samples/bpf/gnu/stubs.h | 1 + + .../{map_perf_test_kern.c => map_perf_test.bpf.c} | 48 +- + samples/bpf/map_perf_test_user.c | 2 +- + ...kern.c => test_current_task_under_cgroup.bpf.c} | 11 +- + samples/bpf/test_current_task_under_cgroup_user.c | 8 +- + samples/bpf/test_lru_dist.c | 5 - + samples/bpf/test_map_in_map_kern.c | 1 - + ...ite_user_kern.c => test_probe_write_user.bpf.c} | 20 +- + samples/bpf/test_probe_write_user_user.c | 2 +- + samples/bpf/trace_common.h | 13 - + .../{trace_output_kern.c => trace_output.bpf.c} | 6 +- + samples/bpf/trace_output_user.c | 2 +- + samples/bpf/{tracex2_kern.c => tracex2.bpf.c} | 13 +- + samples/bpf/tracex2_user.c | 2 +- + samples/bpf/tracex4_user.c | 4 +- + tools/bpf/bpftool/Makefile | 3 + + tools/bpf/resolve_btfids/Makefile | 8 +- + tools/include/uapi/linux/bpf.h | 4 + + tools/lib/bpf/bpf_tracing.h | 25 +- + tools/lib/bpf/btf.c | 16 +- + tools/lib/bpf/btf_dump.c | 199 ++- + tools/lib/bpf/libbpf.c | 2 +- + tools/lib/bpf/libbpf.h | 29 +- + tools/lib/bpf/libbpf.map | 3 + + tools/lib/bpf/libbpf_errno.c | 16 +- + tools/lib/bpf/libbpf_internal.h | 1 + + tools/lib/bpf/libbpf_version.h | 2 +- + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + tools/testing/selftests/bpf/Makefile | 3 + + .../selftests/bpf/prog_tests/jit_probe_mem.c | 28 + + .../bpf/progs/btf_dump_test_case_bitfields.c | 2 +- + .../bpf/progs/btf_dump_test_case_packing.c | 80 +- + .../bpf/progs/btf_dump_test_case_padding.c | 162 ++- + .../bpf/progs/btf_dump_test_case_syntax.c | 36 + + tools/testing/selftests/bpf/progs/jit_probe_mem.c | 61 + + .../testing/selftests/bpf/progs/test_tunnel_kern.c | 21 + + tools/testing/selftests/bpf/test_tunnel.sh | 40 +- + tools/testing/selftests/net/mptcp/diag.sh | 56 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 4 +- + tools/testing/vsock/Makefile | 3 +- + tools/testing/vsock/README | 34 + + tools/testing/vsock/control.c | 28 + + tools/testing/vsock/control.h | 2 + + tools/testing/vsock/util.c | 13 + + tools/testing/vsock/util.h | 1 + + tools/testing/vsock/vsock_perf.c | 427 ++++++ + tools/testing/vsock/vsock_test.c | 197 ++- + 270 files changed, 12603 insertions(+), 3944 deletions(-) + create mode 100644 Documentation/bpf/map_sockmap.rst + create mode 100644 Documentation/devicetree/bindings/net/amlogic,g12a-mdio-mux.yaml + create mode 100644 Documentation/devicetree/bindings/net/maxlinear,gpy2xx.yaml + delete mode 100644 Documentation/devicetree/bindings/net/mdio-mux-meson-g12a.txt + create mode 100644 drivers/net/dsa/microchip/ksz_ptp.c + create mode 100644 drivers/net/dsa/microchip/ksz_ptp.h + create mode 100644 drivers/net/dsa/microchip/ksz_ptp_reg.h + create mode 100644 drivers/net/dsa/mv88e6xxx/switchdev.c + create mode 100644 drivers/net/dsa/mv88e6xxx/switchdev.h + create mode 100644 drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio_bf2.h + create mode 100644 drivers/net/ethernet/mellanox/mlxbf_gige/mlxbf_gige_mdio_bf3.h + create mode 100644 drivers/net/ethernet/netronome/nfp/nic/dcb.c + create mode 100644 drivers/net/ethernet/netronome/nfp/nic/main.h + delete mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe.h + create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c + create mode 100644 drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.h + delete mode 100644 drivers/net/ethernet/wangxun/txgbe/txgbe.h + create mode 100644 drivers/net/phy/mdio-open-alliance.h + create mode 100644 drivers/net/phy/ncn26000.c + create mode 100644 drivers/net/thunderbolt/Kconfig + create mode 100644 drivers/net/thunderbolt/Makefile + rename drivers/net/{thunderbolt.c => thunderbolt/main.c} (96%) + create mode 100644 drivers/net/thunderbolt/trace.c + create mode 100644 drivers/net/thunderbolt/trace.h + create mode 100644 include/linux/dsa/ksz_common.h + create mode 100644 net/devlink/Makefile + create mode 100644 net/devlink/core.c + create mode 100644 net/devlink/devl_internal.h + rename net/{core/devlink.c => devlink/leftover.c} (90%) + create mode 100644 net/devlink/netlink.c + create mode 100644 net/ethtool/plca.c + create mode 100644 samples/bpf/gnu/stubs.h + rename samples/bpf/{map_perf_test_kern.c => map_perf_test.bpf.c} (85%) + rename samples/bpf/{test_current_task_under_cgroup_kern.c => test_current_task_under_cgroup.bpf.c} (84%) + rename samples/bpf/{test_probe_write_user_kern.c => test_probe_write_user.bpf.c} (71%) + delete mode 100644 samples/bpf/trace_common.h + rename samples/bpf/{trace_output_kern.c => trace_output.bpf.c} (82%) + rename samples/bpf/{tracex2_kern.c => tracex2.bpf.c} (89%) + create mode 100644 tools/testing/selftests/bpf/prog_tests/jit_probe_mem.c + create mode 100644 tools/testing/selftests/bpf/progs/jit_probe_mem.c + create mode 100644 tools/testing/vsock/vsock_perf.c +Merging bpf-next/for-next (dfff86f8eb6a Merge branch 'samples/bpf: modernize BPF functionality test programs') +$ 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 +Auto-merging include/linux/bpf.h +Merge made by the 'ort' strategy. + arch/x86/net/bpf_jit_comp.c | 101 ++- + include/linux/bpf.h | 6 +- + include/uapi/linux/bpf.h | 7 + + kernel/bpf/btf.c | 38 +- + net/core/filter.c | 37 +- + samples/bpf/Makefile | 14 +- + .../{lwt_len_hist_kern.c => lwt_len_hist.bpf.c} | 29 +- + samples/bpf/lwt_len_hist.sh | 4 +- + samples/bpf/net_shared.h | 32 + + .../bpf/{sock_flags_kern.c => sock_flags.bpf.c} | 24 +- + samples/bpf/tc_l2_redirect.sh | 3 + + samples/bpf/test_cgrp2_sock.sh | 16 +- + samples/bpf/test_cgrp2_sock2.sh | 9 +- + .../{test_cgrp2_tc_kern.c => test_cgrp2_tc.bpf.c} | 34 +- + samples/bpf/test_cgrp2_tc.sh | 8 +- + samples/bpf/test_lwt_bpf.c | 50 +- + samples/bpf/test_lwt_bpf.sh | 19 +- + ...est_map_in_map_kern.c => test_map_in_map.bpf.c} | 7 +- + samples/bpf/test_map_in_map_user.c | 2 +- + ...ad_kprobe_kern.c => test_overhead_kprobe.bpf.c} | 6 +- + ...ad_raw_tp_kern.c => test_overhead_raw_tp.bpf.c} | 4 +- + ...t_overhead_tp_kern.c => test_overhead_tp.bpf.c} | 29 +- + samples/bpf/test_overhead_user.c | 34 +- + samples/bpf/xdp_sample.bpf.h | 22 +- + scripts/bpf_doc.py | 2 +- + tools/bpf/bpftool/Makefile | 5 +- + tools/bpf/bpftool/feature.c | 8 +- + tools/include/uapi/linux/bpf.h | 7 + + tools/lib/bpf/libbpf.c | 9 +- + tools/lib/bpf/libbpf_internal.h | 4 +- + tools/testing/selftests/bpf/Makefile | 6 +- + tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 91 ++- + tools/testing/selftests/bpf/progs/test_xdp_vlan.c | 2 +- + tools/testing/selftests/bpf/progs/xsk_xdp_progs.c | 30 + + tools/testing/selftests/bpf/test_tc_tunnel.sh | 15 +- + tools/testing/selftests/bpf/test_xsk.sh | 42 +- + tools/testing/selftests/bpf/xsk.c | 677 ++------------------- + tools/testing/selftests/bpf/xsk.h | 97 +-- + tools/testing/selftests/bpf/xsk_prereqs.sh | 12 +- + tools/testing/selftests/bpf/xskxceiver.c | 382 ++++++------ + tools/testing/selftests/bpf/xskxceiver.h | 17 +- + 41 files changed, 734 insertions(+), 1207 deletions(-) + rename samples/bpf/{lwt_len_hist_kern.c => lwt_len_hist.bpf.c} (75%) + create mode 100644 samples/bpf/net_shared.h + rename samples/bpf/{sock_flags_kern.c => sock_flags.bpf.c} (66%) + rename samples/bpf/{test_cgrp2_tc_kern.c => test_cgrp2_tc.bpf.c} (70%) + rename samples/bpf/{test_map_in_map_kern.c => test_map_in_map.bpf.c} (97%) + rename samples/bpf/{test_overhead_kprobe_kern.c => test_overhead_kprobe.bpf.c} (92%) + rename samples/bpf/{test_overhead_raw_tp_kern.c => test_overhead_raw_tp.bpf.c} (82%) + rename samples/bpf/{test_overhead_tp_kern.c => test_overhead_tp.bpf.c} (61%) + create mode 100644 tools/testing/selftests/bpf/progs/xsk_xdp_progs.c +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 (9b2e3723728e net/mlx5: Introduce CQE error syndrome) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'ort' strategy. + include/linux/mlx5/mlx5_ifc.h | 47 ++++++++++++++++++++++++++++++++++++++----- + 1 file changed, 42 insertions(+), 5 deletions(-) +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 (60d86034b14e Merge tag 'mlx5-updates-2023-01-10' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ 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 (7ed38304a633 Bluetooth: Fix possible deadlock in rfcomm_sk_state_change) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Auto-merging drivers/bluetooth/hci_qca.c +Merge made by the 'ort' strategy. + drivers/bluetooth/btusb.c | 16 ++++++++++++ + drivers/bluetooth/hci_qca.c | 11 ++++++-- + include/net/bluetooth/hci.h | 4 +-- + net/bluetooth/hci_conn.c | 18 ++++++++++--- + net/bluetooth/hci_event.c | 5 +++- + net/bluetooth/hci_sync.c | 19 +++++--------- + net/bluetooth/iso.c | 64 ++++++++++++++++++--------------------------- + net/bluetooth/mgmt_util.h | 2 +- + net/bluetooth/rfcomm/sock.c | 7 ++++- + 9 files changed, 84 insertions(+), 62 deletions(-) +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 (a30144c02c84 mtd: dataflash: remove duplicate SPI ID table) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Merge made by the 'ort' strategy. + drivers/mtd/devices/mtd_dataflash.c | 9 --------- + 1 file changed, 9 deletions(-) +Merging nand/nand/next (a2cfa6a24c61 mtd: rawnand: vf610_nfc: use regular comments for functions) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Auto-merging drivers/mtd/nand/raw/Kconfig +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/marvell_nand.c | 7 ++ + drivers/mtd/nand/raw/nand_base.c | 149 +++++++++++++++++++++++++++++++++++- + drivers/mtd/nand/raw/nand_jedec.c | 3 +- + drivers/mtd/nand/raw/nand_onfi.c | 3 +- + drivers/mtd/nand/raw/pasemi_nand.c | 63 ++++++++------- + drivers/mtd/nand/raw/sunxi_nand.c | 49 ++++++------ + drivers/mtd/nand/raw/vf610_nfc.c | 4 +- + include/linux/mtd/rawnand.h | 17 ++++ + 8 files changed, 230 insertions(+), 65 deletions(-) +Merging spi-nor/spi-nor/next (55398beb0846 mtd: spi-nor: sfdp: Use SFDP_DWORD() macro for optional parameter tables) +$ 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 +Merge made by the 'ort' strategy. + drivers/mtd/spi-nor/issi.c | 2 +- + drivers/mtd/spi-nor/macronix.c | 2 +- + drivers/mtd/spi-nor/sfdp.c | 72 ++++++++++++++++++++++-------------------- + drivers/mtd/spi-nor/sfdp.h | 9 +++--- + 4 files changed, 44 insertions(+), 41 deletions(-) +Merging crypto/master (f81c1d4a6d3f crypto: sun8i-ce - Add TRNG clock to the D1 variant) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/bus/aspeed,ast2600-ahbc.yaml | 37 + + .../bindings/crypto/allwinner,sun8i-ce.yaml | 33 +- + .../bindings/crypto/aspeed,ast2600-acry.yaml | 49 + + MAINTAINERS | 2 +- + arch/arm/boot/dts/aspeed-g6.dtsi | 13 + + arch/arm/crypto/sha1_glue.c | 14 +- + arch/powerpc/crypto/Kconfig | 11 + + arch/powerpc/crypto/Makefile | 10 + + arch/powerpc/crypto/aesp8-ppc.pl | 3846 ++++++++++++++++++++ + arch/powerpc/crypto/ghashp8-ppc.pl | 370 ++ + arch/powerpc/crypto/p10-aes-gcm-glue.c | 345 ++ + arch/powerpc/crypto/p10_aes_gcm.S | 1519 ++++++++ + arch/powerpc/crypto/ppc-xlate.pl | 229 ++ + arch/s390/crypto/aes_s390.c | 4 - + arch/s390/crypto/paes_s390.c | 2 +- + arch/x86/crypto/Kconfig | 38 + + arch/x86/crypto/Makefile | 6 + + arch/x86/crypto/aria-aesni-avx-asm_64.S | 26 +- + arch/x86/crypto/aria-aesni-avx2-asm_64.S | 1433 ++++++++ + arch/x86/crypto/aria-avx.h | 48 +- + arch/x86/crypto/aria-gfni-avx512-asm_64.S | 971 +++++ + arch/x86/crypto/aria_aesni_avx2_glue.c | 252 ++ + arch/x86/crypto/aria_aesni_avx_glue.c | 45 +- + arch/x86/crypto/aria_gfni_avx512_glue.c | 250 ++ + arch/x86/crypto/ghash-clmulni-intel_asm.S | 6 +- + arch/x86/crypto/ghash-clmulni-intel_glue.c | 45 +- + arch/x86/kernel/asm-offsets.c | 8 + + crypto/ahash.c | 4 +- + crypto/aria_generic.c | 4 + + crypto/shash.c | 4 +- + crypto/skcipher.c | 22 +- + crypto/testmgr.c | 4 +- + crypto/wp512.c | 2 +- + drivers/crypto/allwinner/sun8i-ce/sun8i-ce-core.c | 1 + + drivers/crypto/allwinner/sun8i-ce/sun8i-ce.h | 2 +- + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 4 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 13 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 4 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 11 +- + drivers/crypto/aspeed/Kconfig | 11 + + drivers/crypto/aspeed/Makefile | 2 + + drivers/crypto/aspeed/aspeed-acry.c | 828 +++++ + drivers/crypto/atmel-aes.c | 3 +- + drivers/crypto/atmel-sha.c | 1 + + drivers/crypto/axis/artpec6_crypto.c | 2 +- + drivers/crypto/caam/blob_gen.c | 2 +- + drivers/crypto/caam/caamalg.c | 16 +- + drivers/crypto/caam/caamalg_qi.c | 16 +- + drivers/crypto/caam/caamalg_qi2.c | 48 +- + drivers/crypto/caam/caamalg_qi2.h | 10 +- + drivers/crypto/caam/caamhash.c | 14 +- + drivers/crypto/caam/caampkc.c | 31 +- + drivers/crypto/caam/caamprng.c | 12 +- + drivers/crypto/caam/caamrng.c | 11 +- + drivers/crypto/caam/ctrl.c | 4 +- + drivers/crypto/caam/desc_constr.h | 3 +- + drivers/crypto/caam/key_gen.c | 2 +- + drivers/crypto/caam/qi.c | 4 +- + drivers/crypto/caam/qi.h | 12 +- + drivers/crypto/cavium/cpt/cptvf_algs.c | 8 +- + drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 8 +- + drivers/crypto/ccp/sev-dev.c | 9 +- + drivers/crypto/ccree/cc_cipher.c | 2 +- + drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | 2 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 2 +- + drivers/crypto/talitos.c | 2 +- + drivers/crypto/ux500/Kconfig | 7 +- + include/crypto/scatterwalk.h | 4 +- + include/crypto/xts.h | 25 +- + lib/crypto/blake2s-selftest.c | 25 +- + lib/mpi/mpicoder.c | 3 +- + 71 files changed, 10597 insertions(+), 219 deletions(-) + create mode 100644 Documentation/devicetree/bindings/bus/aspeed,ast2600-ahbc.yaml + create mode 100644 Documentation/devicetree/bindings/crypto/aspeed,ast2600-acry.yaml + create mode 100644 arch/powerpc/crypto/aesp8-ppc.pl + create mode 100644 arch/powerpc/crypto/ghashp8-ppc.pl + create mode 100644 arch/powerpc/crypto/p10-aes-gcm-glue.c + create mode 100644 arch/powerpc/crypto/p10_aes_gcm.S + create mode 100644 arch/powerpc/crypto/ppc-xlate.pl + create mode 100644 arch/x86/crypto/aria-aesni-avx2-asm_64.S + create mode 100644 arch/x86/crypto/aria-gfni-avx512-asm_64.S + create mode 100644 arch/x86/crypto/aria_aesni_avx2_glue.c + create mode 100644 arch/x86/crypto/aria_gfni_avx512_glue.c + create mode 100644 drivers/crypto/aspeed/aspeed-acry.c +$ git reset --hard HEAD^ +HEAD is now at 32656d6c33ff Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git +Merging next-20230113 version of crypto +$ git merge -m next-20230113/crypto c970d42001f2dffd587cc38458fea4130796be43 +Merge made by the 'ort' strategy. + arch/arm/crypto/sha1_glue.c | 14 +- + arch/s390/crypto/aes_s390.c | 4 - + arch/s390/crypto/paes_s390.c | 2 +- + arch/x86/crypto/Kconfig | 38 + + arch/x86/crypto/Makefile | 6 + + arch/x86/crypto/aria-aesni-avx-asm_64.S | 26 +- + arch/x86/crypto/aria-aesni-avx2-asm_64.S | 1433 ++++++++++++++++++++ + arch/x86/crypto/aria-avx.h | 48 +- + arch/x86/crypto/aria-gfni-avx512-asm_64.S | 971 +++++++++++++ + arch/x86/crypto/aria_aesni_avx2_glue.c | 252 ++++ + arch/x86/crypto/aria_aesni_avx_glue.c | 45 +- + arch/x86/crypto/aria_gfni_avx512_glue.c | 250 ++++ + arch/x86/crypto/ghash-clmulni-intel_asm.S | 6 +- + arch/x86/crypto/ghash-clmulni-intel_glue.c | 45 +- + arch/x86/kernel/asm-offsets.c | 8 + + crypto/ahash.c | 4 +- + crypto/aria_generic.c | 4 + + crypto/shash.c | 4 +- + crypto/testmgr.c | 4 +- + crypto/wp512.c | 2 +- + .../crypto/allwinner/sun8i-ss/sun8i-ss-cipher.c | 4 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-core.c | 13 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-hash.c | 4 +- + drivers/crypto/allwinner/sun8i-ss/sun8i-ss-prng.c | 11 +- + drivers/crypto/atmel-aes.c | 3 +- + drivers/crypto/atmel-sha.c | 1 + + drivers/crypto/axis/artpec6_crypto.c | 2 +- + drivers/crypto/caam/blob_gen.c | 2 +- + drivers/crypto/caam/caamalg.c | 16 +- + drivers/crypto/caam/caamalg_qi.c | 16 +- + drivers/crypto/caam/caamalg_qi2.c | 48 +- + drivers/crypto/caam/caamalg_qi2.h | 10 +- + drivers/crypto/caam/caamhash.c | 14 +- + drivers/crypto/caam/caampkc.c | 31 +- + drivers/crypto/caam/caamprng.c | 12 +- + drivers/crypto/caam/caamrng.c | 11 +- + drivers/crypto/caam/ctrl.c | 4 +- + drivers/crypto/caam/desc_constr.h | 3 +- + drivers/crypto/caam/key_gen.c | 2 +- + drivers/crypto/caam/qi.c | 4 +- + drivers/crypto/caam/qi.h | 12 +- + drivers/crypto/cavium/cpt/cptvf_algs.c | 8 +- + drivers/crypto/cavium/nitrox/nitrox_skcipher.c | 8 +- + drivers/crypto/ccp/sev-dev.c | 9 +- + drivers/crypto/ccree/cc_cipher.c | 2 +- + drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | 2 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 2 +- + drivers/crypto/talitos.c | 2 +- + drivers/crypto/ux500/Kconfig | 7 +- + include/crypto/scatterwalk.h | 4 +- + include/crypto/xts.h | 25 +- + lib/crypto/blake2s-selftest.c | 25 +- + lib/mpi/mpicoder.c | 3 +- + 53 files changed, 3295 insertions(+), 191 deletions(-) + create mode 100644 arch/x86/crypto/aria-aesni-avx2-asm_64.S + create mode 100644 arch/x86/crypto/aria-gfni-avx512-asm_64.S + create mode 100644 arch/x86/crypto/aria_aesni_avx2_glue.c + create mode 100644 arch/x86/crypto/aria_gfni_avx512_glue.c +Merging drm/drm-next (03a0a1040895 Merge tag 'drm-misc-next-2023-01-03' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging MAINTAINERS +Auto-merging drivers/dma-buf/dma-buf.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/drm_panel_orientation_quirks.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c +Auto-merging drivers/gpu/drm/tests/Makefile +Auto-merging drivers/gpu/drm/ttm/ttm_bo_util.c +Auto-merging drivers/gpu/drm/vc4/vc4_bo.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +Merge made by the 'ort' strategy. + .../bindings/display/bridge/ite,it6505.yaml | 68 +- + .../bindings/display/bridge/ite,it66121.yaml | 4 +- + .../bindings/display/panel/focaltech,gpt3.yaml | 56 ++ + .../bindings/display/panel/panel-mipi-dbi-spi.yaml | 8 +- + Documentation/fb/modedb.rst | 5 + + Documentation/gpu/drm-kms-helpers.rst | 7 + + Documentation/gpu/drm-kms.rst | 6 + + Documentation/gpu/drm-uapi.rst | 12 +- + Documentation/gpu/todo.rst | 13 +- + Documentation/gpu/vc4.rst | 19 + + .../userspace-api/media/v4l/subdev-formats.rst | 111 +++ + MAINTAINERS | 2 +- + drivers/dma-buf/dma-buf.c | 14 +- + drivers/dma-buf/udmabuf.c | 28 + + drivers/gpu/drm/Kconfig | 7 + + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_debugfs.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 1 + + drivers/gpu/drm/ast/ast_mode.c | 2 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 9 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 5 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 5 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 6 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 5 +- + drivers/gpu/drm/bridge/chrontel-ch7033.c | 5 +- + drivers/gpu/drm/bridge/ite-it6505.c | 132 ++- + drivers/gpu/drm/bridge/ite-it66121.c | 320 +++--- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 26 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 5 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 6 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 5 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 16 +- + drivers/gpu/drm/bridge/nxp-ptn3460.c | 5 +- + drivers/gpu/drm/bridge/panel.c | 4 + + drivers/gpu/drm/bridge/parade-ps8622.c | 6 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 22 +- + drivers/gpu/drm/bridge/sii902x.c | 31 +- + drivers/gpu/drm/bridge/sii9234.c | 5 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 5 +- + drivers/gpu/drm/bridge/tc358767.c | 4 +- + drivers/gpu/drm/bridge/tc358768.c | 5 +- + drivers/gpu/drm/bridge/tc358775.c | 4 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 8 +- + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 5 +- + drivers/gpu/drm/bridge/ti-tfp410.c | 5 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 12 +- + drivers/gpu/drm/drm_atomic.c | 23 +- + drivers/gpu/drm/drm_atomic_state_helper.c | 124 +++ + drivers/gpu/drm/drm_atomic_uapi.c | 4 + + drivers/gpu/drm/drm_bridge.c | 294 +++--- + drivers/gpu/drm/drm_client.c | 11 +- + drivers/gpu/drm/drm_client_modeset.c | 4 - + drivers/gpu/drm/drm_connector.c | 173 +++- + drivers/gpu/drm/drm_debugfs.c | 102 +- + drivers/gpu/drm/drm_drv.c | 7 +- + drivers/gpu/drm/drm_fbdev_generic.c | 15 +- + drivers/gpu/drm/drm_fourcc.c | 4 + + drivers/gpu/drm/drm_framebuffer.c | 11 +- + drivers/gpu/drm/drm_gem.c | 19 +- + drivers/gpu/drm/drm_gem_atomic_helper.c | 31 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 4 +- + drivers/gpu/drm/drm_gem_ttm_helper.c | 2 + + drivers/gpu/drm/drm_gem_vram_helper.c | 12 +- + drivers/gpu/drm/drm_internal.h | 5 + + drivers/gpu/drm/drm_mipi_dbi.c | 158 ++- + drivers/gpu/drm/drm_mode_config.c | 10 +- + drivers/gpu/drm/drm_modes.c | 546 +++++++++- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 33 +- + drivers/gpu/drm/drm_probe_helper.c | 82 ++ + drivers/gpu/drm/drm_simple_kms_helper.c | 2 +- + drivers/gpu/drm/exynos/exynos5433_drm_decon.c | 13 +- + drivers/gpu/drm/exynos/exynos7_drm_decon.c | 12 +- + drivers/gpu/drm/exynos/exynos_dp.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_fimc.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_fimd.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_g2d.c | 10 +- + drivers/gpu/drm/exynos/exynos_drm_mic.c | 11 +- + drivers/gpu/drm/exynos/exynos_drm_rotator.c | 12 +- + drivers/gpu/drm/exynos/exynos_drm_scaler.c | 12 +- + drivers/gpu/drm/gud/gud_connector.c | 10 +- + drivers/gpu/drm/gud/gud_drv.c | 1 + + drivers/gpu/drm/gud/gud_internal.h | 1 + + drivers/gpu/drm/gud/gud_pipe.c | 223 +++-- + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 4 +- + drivers/gpu/drm/i2c/ch7006_drv.c | 8 +- + drivers/gpu/drm/i915/display/intel_tv.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 11 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 2 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 8 +- + drivers/gpu/drm/i915/i915_deps.c | 2 +- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 2 +- + drivers/gpu/drm/i915/intel_region_ttm.c | 3 +- + drivers/gpu/drm/imx/Kconfig | 41 +- + drivers/gpu/drm/imx/Makefile | 10 +- + drivers/gpu/drm/imx/dcss/dcss-dev.c | 17 +- + drivers/gpu/drm/imx/dcss/dcss-dev.h | 7 +- + drivers/gpu/drm/imx/dcss/dcss-drv.c | 8 +- + drivers/gpu/drm/imx/ipuv3/Kconfig | 41 + + drivers/gpu/drm/imx/ipuv3/Makefile | 11 + + drivers/gpu/drm/imx/{ => ipuv3}/dw_hdmi-imx.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/imx-drm-core.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/imx-drm.h | 0 + drivers/gpu/drm/imx/{ => ipuv3}/imx-ldb.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/imx-tve.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-crtc.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-plane.c | 0 + drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-plane.h | 0 + drivers/gpu/drm/imx/{ => ipuv3}/parallel-display.c | 0 + drivers/gpu/drm/logicvc/logicvc_drm.c | 13 +- + drivers/gpu/drm/mediatek/mtk_dp.c | 4 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +- + drivers/gpu/drm/mxsfb/Kconfig | 2 + + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 6 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 1 + + drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_mem.c | 3 +- + drivers/gpu/drm/nouveau/nouveau_mem.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_prime.c | 1 + + drivers/gpu/drm/nouveau/nouveau_sgdma.c | 1 + + drivers/gpu/drm/omapdrm/dss/dispc.c | 5 - + drivers/gpu/drm/omapdrm/dss/dsi.c | 26 +- + drivers/gpu/drm/panel/Kconfig | 9 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-edp.c | 8 +- + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 6 +- + drivers/gpu/drm/panel/panel-orisetech-ota5601a.c | 364 +++++++ + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 10 +- + drivers/gpu/drm/panel/panel-simple.c | 6 +- + drivers/gpu/drm/panfrost/panfrost_device.c | 10 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 4 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 7 +- + drivers/gpu/drm/qxl/qxl_cmd.c | 16 +- + drivers/gpu/drm/qxl/qxl_drv.h | 3 +- + drivers/gpu/drm/qxl/qxl_ttm.c | 4 +- + drivers/gpu/drm/radeon/radeon.h | 3 +- + drivers/gpu/drm/radeon/radeon_device.c | 5 - + drivers/gpu/drm/radeon/radeon_pm.c | 4 +- + drivers/gpu/drm/radeon/radeon_prime.c | 2 + + drivers/gpu/drm/radeon/radeon_ttm.c | 4 +- + drivers/gpu/drm/rcar-du/rcar_du_drv.c | 9 +- + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 9 +- + drivers/gpu/drm/solomon/ssd130x.c | 4 +- + drivers/gpu/drm/sprd/sprd_dpu.c | 4 +- + drivers/gpu/drm/sun4i/sun4i_tv.c | 141 +-- + drivers/gpu/drm/tests/Makefile | 8 +- + drivers/gpu/drm/tests/drm_client_modeset_test.c | 110 ++- + drivers/gpu/drm/tests/drm_cmdline_parser_test.c | 68 ++ + drivers/gpu/drm/tests/drm_connector_test.c | 76 ++ + drivers/gpu/drm/tests/drm_kunit_helpers.c | 105 +- + drivers/gpu/drm/tests/drm_kunit_helpers.h | 11 - + drivers/gpu/drm/tests/drm_managed_test.c | 71 ++ + drivers/gpu/drm/tests/drm_modes_test.c | 158 +++ + drivers/gpu/drm/tests/drm_probe_helper_test.c | 218 ++++ + drivers/gpu/drm/tidss/tidss_dispc.c | 6 +- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 9 +- + drivers/gpu/drm/tiny/cirrus.c | 2 +- + drivers/gpu/drm/tiny/gm12u320.c | 15 +- + drivers/gpu/drm/tiny/hx8357d.c | 5 +- + drivers/gpu/drm/tiny/ili9163.c | 6 +- + drivers/gpu/drm/tiny/ili9225.c | 36 +- + drivers/gpu/drm/tiny/ili9341.c | 5 +- + drivers/gpu/drm/tiny/ili9486.c | 20 +- + drivers/gpu/drm/tiny/mi0283qt.c | 5 +- + drivers/gpu/drm/tiny/ofdrm.c | 13 +- + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 10 +- + drivers/gpu/drm/tiny/simpledrm.c | 4 +- + drivers/gpu/drm/tiny/st7586.c | 39 +- + drivers/gpu/drm/tiny/st7735r.c | 5 +- + drivers/gpu/drm/ttm/ttm_bo.c | 211 ++-- + drivers/gpu/drm/ttm/ttm_bo_util.c | 111 ++- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 19 +- + drivers/gpu/drm/ttm/ttm_device.c | 26 +- + drivers/gpu/drm/ttm/ttm_execbuf_util.c | 6 +- + drivers/gpu/drm/ttm/ttm_pool.c | 3 +- + drivers/gpu/drm/ttm/ttm_range_manager.c | 2 +- + drivers/gpu/drm/ttm/ttm_resource.c | 3 +- + drivers/gpu/drm/ttm/ttm_tt.c | 3 +- + drivers/gpu/drm/v3d/v3d_debugfs.c | 22 +- + drivers/gpu/drm/v3d/v3d_gem.c | 55 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 6 +- + drivers/gpu/drm/vc4/Kconfig | 16 + + drivers/gpu/drm/vc4/Makefile | 7 + + drivers/gpu/drm/vc4/tests/.kunitconfig | 13 + + drivers/gpu/drm/vc4/tests/vc4_mock.c | 200 ++++ + drivers/gpu/drm/vc4/tests/vc4_mock.h | 63 ++ + drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c | 41 + + drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 138 +++ + drivers/gpu/drm/vc4/tests/vc4_mock_plane.c | 47 + + drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c | 1039 ++++++++++++++++++++ + drivers/gpu/drm/vc4/vc4_bo.c | 10 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 144 ++- + drivers/gpu/drm/vc4/vc4_debugfs.c | 36 +- + drivers/gpu/drm/vc4/vc4_dpi.c | 34 +- + drivers/gpu/drm/vc4/vc4_drv.c | 5 +- + drivers/gpu/drm/vc4/vc4_drv.h | 148 ++- + drivers/gpu/drm/vc4/vc4_dsi.c | 186 ++-- + drivers/gpu/drm/vc4/vc4_hdmi.c | 23 +- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 4 + + drivers/gpu/drm/vc4/vc4_hvs.c | 97 +- + drivers/gpu/drm/vc4/vc4_kms.c | 138 +-- + drivers/gpu/drm/vc4/vc4_txp.c | 62 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 14 +- + drivers/gpu/drm/vc4/vc4_vec.c | 361 +++++-- + drivers/gpu/drm/virtio/virtgpu_drv.h | 3 + + drivers/gpu/drm/virtio/virtgpu_trace.h | 26 +- + drivers/gpu/drm/virtio/virtgpu_vq.c | 13 +- + drivers/gpu/drm/vkms/vkms_drv.c | 27 +- + drivers/gpu/drm/vkms/vkms_drv.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_cmdbuf.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gmr.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_gmrid_manager.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_system_manager.c | 1 - + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_buffer.c | 1 - + drivers/gpu/ipu-v3/ipu-common.c | 1 + + include/drm/drm_atomic.h | 32 +- + include/drm/drm_atomic_state_helper.h | 4 + + include/drm/drm_audio_component.h | 3 + + include/drm/drm_bridge.h | 36 +- + include/drm/drm_connector.h | 82 +- + include/drm/drm_debugfs.h | 41 + + include/drm/drm_device.h | 15 + + include/drm/drm_gem.h | 1 + + include/drm/drm_gem_atomic_helper.h | 2 - + include/drm/drm_gem_ttm_helper.h | 3 +- + include/drm/drm_gem_vram_helper.h | 4 +- + include/drm/drm_kunit_helpers.h | 91 ++ + include/drm/drm_mipi_dbi.h | 43 +- + include/drm/drm_mode_config.h | 12 +- + include/drm/drm_modes.h | 17 + + include/drm/drm_panel.h | 10 + + include/drm/drm_plane.h | 4 +- + include/drm/drm_probe_helper.h | 1 + + include/drm/drm_simple_kms_helper.h | 4 +- + include/drm/ttm/{ttm_bo_api.h => ttm_bo.h} | 371 ++++--- + include/drm/ttm/ttm_bo_driver.h | 303 ------ + include/drm/ttm/ttm_device.h | 7 +- + include/drm/ttm/ttm_execbuf_util.h | 4 +- + include/linux/dma-buf.h | 4 +- + include/uapi/linux/media-bus-format.h | 5 +- + 259 files changed, 6959 insertions(+), 2517 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/focaltech,gpt3.yaml + create mode 100644 drivers/gpu/drm/imx/ipuv3/Kconfig + create mode 100644 drivers/gpu/drm/imx/ipuv3/Makefile + rename drivers/gpu/drm/imx/{ => ipuv3}/dw_hdmi-imx.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/imx-drm-core.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/imx-drm.h (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/imx-ldb.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/imx-tve.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-crtc.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-plane.c (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/ipuv3-plane.h (100%) + rename drivers/gpu/drm/imx/{ => ipuv3}/parallel-display.c (100%) + create mode 100644 drivers/gpu/drm/panel/panel-orisetech-ota5601a.c + create mode 100644 drivers/gpu/drm/tests/drm_connector_test.c + delete mode 100644 drivers/gpu/drm/tests/drm_kunit_helpers.h + create mode 100644 drivers/gpu/drm/tests/drm_managed_test.c + create mode 100644 drivers/gpu/drm/tests/drm_modes_test.c + create mode 100644 drivers/gpu/drm/tests/drm_probe_helper_test.c + create mode 100644 drivers/gpu/drm/vc4/tests/.kunitconfig + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock.c + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock.h + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_output.c + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_mock_plane.c + create mode 100644 drivers/gpu/drm/vc4/tests/vc4_test_pv_muxing.c + create mode 100644 include/drm/drm_kunit_helpers.h + rename include/drm/ttm/{ttm_bo_api.h => ttm_bo.h} (66%) + delete mode 100644 include/drm/ttm/ttm_bo_driver.h +Merging drm-misc/for-linux-next (da7faee2a158 drm/radeon: Do not include <drm/drm_fb_helper.h>) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/Makefile +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/drm_file.c +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/i2c/tda998x_drv.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi.c +Auto-merging drivers/gpu/drm/tests/drm_format_helper_test.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/tests/drm_format_helper_test.c +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging drivers/video/fbdev/hyperv_fb.c +Auto-merging include/drm/drm_device.h +Auto-merging include/drm/drm_drv.h +Auto-merging samples/vfio-mdev/mdpy-fb.c +Resolved 'drivers/gpu/drm/tests/drm_format_helper_test.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6b49a9999b60] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/panel/himax,hx8394.yaml | 76 + + .../bindings/display/panel/visionox,vtdr6130.yaml | 53 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + MAINTAINERS | 38 +- + drivers/firmware/sysfb_simplefb.c | 43 +- + drivers/gpu/drm/Kconfig | 60 +- + drivers/gpu/drm/Makefile | 7 - + drivers/gpu/drm/amd/amdgpu/Kconfig | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 1 - + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 1 - + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 1 - + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 1 + + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c | 1 - + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 1 - + .../pm/powerplay/hwmgr/vega10_processpptables.c | 1 - + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 1 - + .../pm/powerplay/hwmgr/vega12_processpptables.c | 1 - + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 1 - + .../pm/powerplay/hwmgr/vega20_processpptables.c | 1 - + .../gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 1 - + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 1 + + drivers/gpu/drm/arm/hdlcd_drv.c | 24 +- + drivers/gpu/drm/ast/Kconfig | 2 + + drivers/gpu/drm/bridge/panel.c | 9 +- + drivers/gpu/drm/drm_blend.c | 13 +- + drivers/gpu/drm/drm_bridge_connector.c | 27 +- + drivers/gpu/drm/drm_bufs.c | 12 +- + drivers/gpu/drm/drm_context.c | 36 +- + drivers/gpu/drm/drm_debugfs.c | 12 +- + drivers/gpu/drm/drm_fb_helper.c | 276 +- + drivers/gpu/drm/drm_file.c | 18 +- + drivers/gpu/drm/drm_format_helper.c | 462 ++- + drivers/gpu/drm/drm_gem_dma_helper.c | 4 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +- + drivers/gpu/drm/drm_ioc32.c | 13 +- + drivers/gpu/drm/drm_ioctl.c | 25 +- + drivers/gpu/drm/drm_lease.c | 64 +- + drivers/gpu/drm/drm_modes.c | 5 +- + drivers/gpu/drm/drm_plane.c | 5 + + drivers/gpu/drm/drm_probe_helper.c | 40 +- + drivers/gpu/drm/gma500/Kconfig | 2 + + drivers/gpu/drm/gma500/backlight.c | 2 + + drivers/gpu/drm/gma500/framebuffer.c | 5 - + drivers/gpu/drm/gud/gud_drv.c | 17 +- + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 + + drivers/gpu/drm/i2c/ch7006_drv.c | 4 +- + drivers/gpu/drm/i2c/sil164_drv.c | 4 +- + drivers/gpu/drm/i2c/tda9950.c | 5 +- + drivers/gpu/drm/i2c/tda998x_drv.c | 4 +- + drivers/gpu/drm/i810/Makefile | 8 - + drivers/gpu/drm/i810/i810_dma.c | 1266 ------- + drivers/gpu/drm/i810/i810_drv.c | 101 - + drivers/gpu/drm/i810/i810_drv.h | 246 -- + drivers/gpu/drm/i915/Kconfig | 2 + + drivers/gpu/drm/i915/display/intel_fbdev.c | 7 - + drivers/gpu/drm/imx/dcss/dcss-dev.c | 6 - + drivers/gpu/drm/imx/dcss/dcss-drv.c | 7 - + drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 - + drivers/gpu/drm/meson/meson_dw_hdmi.c | 2 +- + drivers/gpu/drm/mga/Makefile | 11 - + drivers/gpu/drm/mga/mga_dma.c | 1168 ------- + drivers/gpu/drm/mga/mga_drv.c | 104 - + drivers/gpu/drm/mga/mga_drv.h | 685 ---- + drivers/gpu/drm/mga/mga_ioc32.c | 197 -- + drivers/gpu/drm/mga/mga_irq.c | 169 - + drivers/gpu/drm/mga/mga_state.c | 1099 ------ + drivers/gpu/drm/mga/mga_warp.c | 167 - + drivers/gpu/drm/mgag200/Kconfig | 2 + + drivers/gpu/drm/msm/hdmi/hdmi.c | 2 - + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 10 +- + drivers/gpu/drm/nouveau/Kconfig | 14 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 1 - + drivers/gpu/drm/nouveau/nouveau_drm.c | 11 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 41 - + drivers/gpu/drm/panel/Kconfig | 20 + + drivers/gpu/drm/panel/Makefile | 2 + + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 96 +- + drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c | 42 +- + drivers/gpu/drm/panel/panel-edp.c | 3 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 46 +- + drivers/gpu/drm/panel/panel-himax-hx8394.c | 451 +++ + drivers/gpu/drm/panel/panel-ilitek-ili9881c.c | 1 - + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 58 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 106 +- + drivers/gpu/drm/panel/panel-mantix-mlaf057we51.c | 24 +- + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 14 +- + drivers/gpu/drm/panel/panel-olimex-lcd-olinuxino.c | 5 +- + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 6 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 2 +- + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 44 +- + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 24 +- + drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 19 +- + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 341 +- + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 398 ++- + drivers/gpu/drm/panel/panel-visionox-vtdr6130.c | 358 ++ + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 112 +- + drivers/gpu/drm/r128/Makefile | 10 - + drivers/gpu/drm/r128/ati_pcigart.c | 228 -- + drivers/gpu/drm/r128/ati_pcigart.h | 31 - + drivers/gpu/drm/r128/r128_cce.c | 944 ----- + drivers/gpu/drm/r128/r128_drv.c | 116 - + drivers/gpu/drm/r128/r128_drv.h | 544 --- + drivers/gpu/drm/r128/r128_ioc32.c | 199 -- + drivers/gpu/drm/r128/r128_irq.c | 118 - + drivers/gpu/drm/r128/r128_state.c | 1641 --------- + drivers/gpu/drm/radeon/Kconfig | 2 + + drivers/gpu/drm/radeon/atombios_crtc.c | 1 - + drivers/gpu/drm/radeon/radeon_acpi.c | 2 +- + drivers/gpu/drm/radeon/radeon_connectors.c | 1 - + drivers/gpu/drm/radeon/radeon_drv.c | 1 - + drivers/gpu/drm/radeon/radeon_fb.c | 4 - + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 3 +- + drivers/gpu/drm/savage/Makefile | 9 - + drivers/gpu/drm/savage/savage_bci.c | 1082 ------ + drivers/gpu/drm/savage/savage_drv.c | 91 - + drivers/gpu/drm/savage/savage_drv.h | 580 ---- + drivers/gpu/drm/savage/savage_state.c | 1169 ------- + drivers/gpu/drm/sis/Makefile | 10 - + drivers/gpu/drm/sis/sis_drv.c | 143 - + drivers/gpu/drm/sis/sis_drv.h | 80 - + drivers/gpu/drm/sis/sis_mm.c | 363 -- + drivers/gpu/drm/tdfx/Makefile | 8 - + drivers/gpu/drm/tdfx/tdfx_drv.c | 90 - + drivers/gpu/drm/tdfx/tdfx_drv.h | 47 - + drivers/gpu/drm/tests/drm_format_helper_test.c | 386 ++- + drivers/gpu/drm/tiny/ofdrm.c | 27 +- + drivers/gpu/drm/tiny/simpledrm.c | 28 +- + drivers/gpu/drm/v3d/v3d_gem.c | 7 +- + drivers/gpu/drm/vc4/vc4_crtc.c | 71 +- + drivers/gpu/drm/vc4/vc4_dsi.c | 1 - + drivers/gpu/drm/vc4/vc4_hdmi.c | 5 +- + drivers/gpu/drm/vc4/vc4_hvs.c | 175 +- + drivers/gpu/drm/vc4/vc4_kms.c | 1 + + drivers/gpu/drm/vc4/vc4_plane.c | 139 +- + drivers/gpu/drm/vc4/vc4_regs.h | 20 +- + drivers/gpu/drm/vc4/vc4_vec.c | 4 +- + drivers/gpu/drm/via/Makefile | 8 - + drivers/gpu/drm/via/via_3d_reg.h | 1771 ---------- + drivers/gpu/drm/via/via_dri1.c | 3630 -------------------- + drivers/gpu/drm/vkms/vkms_plane.c | 36 +- + drivers/video/fbdev/clps711x-fb.c | 10 +- + drivers/video/fbdev/core/fbcon.c | 41 +- + drivers/video/fbdev/core/fbmem.c | 33 - + drivers/video/fbdev/core/fbsysfs.c | 1 - + drivers/video/fbdev/efifb.c | 35 +- + drivers/video/fbdev/hyperv_fb.c | 17 +- + drivers/video/fbdev/offb.c | 33 +- + drivers/video/fbdev/simplefb.c | 19 +- + drivers/video/fbdev/vesafb.c | 37 +- + drivers/video/fbdev/vga16fb.c | 15 +- + include/drm/drm_bridge_connector.h | 2 - + include/drm/drm_crtc_helper.h | 2 - + include/drm/drm_debugfs.h | 18 + + include/drm/drm_device.h | 17 +- + include/drm/drm_drv.h | 7 - + include/drm/drm_fb_helper.h | 5 - + include/drm/drm_format_helper.h | 16 +- + include/drm/drm_mipi_dsi.h | 39 +- + include/drm/drm_modeset_helper_vtables.h | 28 +- + include/drm/drm_pciids.h | 112 - + include/linux/fb.h | 22 - + include/uapi/drm/drm_fourcc.h | 12 + + include/uapi/drm/i810_drm.h | 292 -- + include/uapi/drm/mga_drm.h | 429 --- + include/uapi/drm/r128_drm.h | 336 -- + include/uapi/drm/savage_drm.h | 220 -- + include/uapi/drm/sis_drm.h | 77 - + include/uapi/drm/via_drm.h | 282 -- + samples/vfio-mdev/mdpy-fb.c | 8 - + 172 files changed, 3255 insertions(+), 21627 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/visionox,vtdr6130.yaml + delete mode 100644 drivers/gpu/drm/i810/Makefile + delete mode 100644 drivers/gpu/drm/i810/i810_dma.c + delete mode 100644 drivers/gpu/drm/i810/i810_drv.c + delete mode 100644 drivers/gpu/drm/i810/i810_drv.h + delete mode 100644 drivers/gpu/drm/mga/Makefile + delete mode 100644 drivers/gpu/drm/mga/mga_dma.c + delete mode 100644 drivers/gpu/drm/mga/mga_drv.c + delete mode 100644 drivers/gpu/drm/mga/mga_drv.h + delete mode 100644 drivers/gpu/drm/mga/mga_ioc32.c + delete mode 100644 drivers/gpu/drm/mga/mga_irq.c + delete mode 100644 drivers/gpu/drm/mga/mga_state.c + delete mode 100644 drivers/gpu/drm/mga/mga_warp.c + create mode 100644 drivers/gpu/drm/panel/panel-himax-hx8394.c + create mode 100644 drivers/gpu/drm/panel/panel-visionox-vtdr6130.c + delete mode 100644 drivers/gpu/drm/r128/Makefile + delete mode 100644 drivers/gpu/drm/r128/ati_pcigart.c + delete mode 100644 drivers/gpu/drm/r128/ati_pcigart.h + delete mode 100644 drivers/gpu/drm/r128/r128_cce.c + delete mode 100644 drivers/gpu/drm/r128/r128_drv.c + delete mode 100644 drivers/gpu/drm/r128/r128_drv.h + delete mode 100644 drivers/gpu/drm/r128/r128_ioc32.c + delete mode 100644 drivers/gpu/drm/r128/r128_irq.c + delete mode 100644 drivers/gpu/drm/r128/r128_state.c + delete mode 100644 drivers/gpu/drm/savage/Makefile + delete mode 100644 drivers/gpu/drm/savage/savage_bci.c + delete mode 100644 drivers/gpu/drm/savage/savage_drv.c + delete mode 100644 drivers/gpu/drm/savage/savage_drv.h + delete mode 100644 drivers/gpu/drm/savage/savage_state.c + delete mode 100644 drivers/gpu/drm/sis/Makefile + delete mode 100644 drivers/gpu/drm/sis/sis_drv.c + delete mode 100644 drivers/gpu/drm/sis/sis_drv.h + delete mode 100644 drivers/gpu/drm/sis/sis_mm.c + delete mode 100644 drivers/gpu/drm/tdfx/Makefile + delete mode 100644 drivers/gpu/drm/tdfx/tdfx_drv.c + delete mode 100644 drivers/gpu/drm/tdfx/tdfx_drv.h + delete mode 100644 drivers/gpu/drm/via/Makefile + delete mode 100644 drivers/gpu/drm/via/via_3d_reg.h + delete mode 100644 drivers/gpu/drm/via/via_dri1.c + delete mode 100644 include/uapi/drm/i810_drm.h + delete mode 100644 include/uapi/drm/mga_drm.h + delete mode 100644 include/uapi/drm/r128_drm.h + delete mode 100644 include/uapi/drm/savage_drm.h + delete mode 100644 include/uapi/drm/sis_drm.h + delete mode 100644 include/uapi/drm/via_drm.h +Merging amdgpu/drm-next (dbc2309cac2a drm/amd/display: add hubbub_init related) + 08e60fac1d8c ("drm/amdgpu: Fix potential NULL dereference") + 3693c1aea9b7 ("drm/amd/pm: add the missing mapping for PPT feature on SMU13.0.0 and 13.0.7") + 40794dfd20e0 ("drm/amdgpu: Fixed bug on error when unloading amdgpu") + 45bf79719f1f ("drm/amd/pm/smu13: BACO is supported when it's in BACO state") + 7f347e3f8217 ("drm/amdkfd: Fix NULL pointer error for GC 11.0.1 on mGPU") + 8ce1d255147a ("drm/amdkfd: Add sync after creating vram bo") + b7cdb41e7d25 ("drm/amd: Delay removal of the firmware framebuffer") + c595637f8a7c ("drm/amd/pm: correct the reference clock for fan speed(rpm) calculation") +$ 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.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v6_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/dce_v8_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/mes_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_process.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/smu7_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c +Auto-merging drivers/gpu/drm/radeon/radeon_device.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_process.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c'. +[master 99a6be06a71d] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + drivers/gpu/drm/amd/amdgpu/Makefile | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 30 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 86 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 59 +++ + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 325 +++++++------- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 187 +++++--- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_rlc.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 23 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 259 +++++++++++- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 44 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 21 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vce.c | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 91 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.h | 1 + + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/df_v4_3.c | 61 +++ + drivers/gpu/drm/amd/amdgpu/df_v4_3.h | 31 ++ + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 155 ++----- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 157 +++---- + drivers/gpu/drm/amd/amdgpu/gfx_v6_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/gfx_v7_0.c | 71 +--- + drivers/gpu/drm/amd/amdgpu/gfx_v8_0.c | 97 ++--- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 148 ++----- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 39 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 16 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 39 +- + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 108 +---- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 107 ++--- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v1_7.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 36 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +- + 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/amdgpu/psp_v10_0.c | 80 +--- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 131 +----- + drivers/gpu/drm/amd/amdgpu/psp_v12_0.c | 78 +--- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 27 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c | 14 +- + drivers/gpu/drm/amd/amdgpu/psp_v3_1.c | 16 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 18 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 47 +-- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 30 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 63 +-- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 35 +- + drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h | 24 +- + drivers/gpu/drm/amd/amdgpu/umc_v8_10.c | 24 +- + drivers/gpu/drm/amd/amdgpu/vcn_v1_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 5 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 11 - + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 12 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 468 ++++++++++++++------- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 7 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 163 +++---- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.h | 26 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crtc.c | 3 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 110 ++--- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 14 + + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 28 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 3 + + drivers/gpu/drm/amd/display/dc/Makefile | 6 +- + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 1 - + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 1 - + .../amd/display/dc/clk_mgr/dcn30/dcn30_clk_mgr.c | 3 +- + .../drm/amd/display/dc/clk_mgr/dcn314/dcn314_smu.c | 3 + + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 3 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 112 ++--- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 437 +++++++++---------- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 167 ++++---- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 57 +-- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 54 ++- + drivers/gpu/drm/amd/display/dc/core/dc_stat.c | 1 + + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 11 +- + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 28 ++ + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 4 +- + drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h | 114 +++++ + drivers/gpu/drm/amd/display/dc/dc_link.h | 46 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 1 + + drivers/gpu/drm/amd/display/dc/dce/dce_aux.h | 2 +- + .../gpu/drm/amd/display/dc/dce/dce_link_encoder.c | 1 - + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 17 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 12 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 1 - + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.c | 1 - + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dsc.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 87 +++- + .../drm/amd/display/dc/dcn20/dcn20_link_encoder.c | 1 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 9 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 2 +- + .../amd/display/dc/dcn201/dcn201_link_encoder.c | 1 - + .../drm/amd/display/dc/dcn21/dcn21_link_encoder.c | 1 - + .../amd/display/dc/dcn30/dcn30_dio_link_encoder.c | 1 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 1 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 6 +- + .../display/dc/dcn301/dcn301_dio_link_encoder.c | 1 - + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 3 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 16 + + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 6 +- + .../amd/display/dc/dcn31/dcn31_dio_link_encoder.c | 1 - + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.c | 5 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 18 + + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.h | 10 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 41 -- + 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 +- + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 8 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 1 - + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 4 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 3 +- + .../amd/display/dc/dcn32/dcn32_dio_link_encoder.c | 1 - + .../display/dc/dcn32/dcn32_dio_stream_encoder.c | 30 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 29 ++ + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 17 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hubp.c | 6 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 39 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 2 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 7 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 1 + + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 16 +- + .../display/dc/dcn321/dcn321_dio_link_encoder.c | 1 - + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 7 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 23 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 2 +- + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 5 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 18 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 133 ------ + drivers/gpu/drm/amd/display/dc/inc/hw/aux_engine.h | 8 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/link.h | 84 ++++ + drivers/gpu/drm/amd/display/dc/inc/resource.h | 9 + + .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 5 - + drivers/gpu/drm/amd/display/dc/link/Makefile | 3 +- + .../dc/{core/dc_link_ddc.c => link/link_ddc.c} | 410 +++--------------- + .../i2caux_interface.h => dc/link/link_ddc.h} | 69 +-- + .../{core/dc_link_dpia.c => link/link_dp_dpia.c} | 5 +- + .../dc/{inc/dc_link_dpia.h => link/link_dp_dpia.h} | 4 +- + .../gpu/drm/amd/display/dc/link/link_dp_dpia_bw.h | 47 ++- + .../dc/{core/dc_link_dpcd.c => link/link_dpcd.c} | 13 +- + .../drm/amd/display/dc/{inc => link}/link_dpcd.h | 4 +- + drivers/gpu/drm/amd/display/dc/link/link_hpd.c | 240 +++++++++++ + drivers/gpu/drm/amd/display/dc/link/link_hpd.h | 47 +++ + .../gpu/drm/amd/display/dc/link/link_hwss_hpo_dp.c | 37 -- + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 17 + + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 86 ++++ + .../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/display/modules/power/power_helpers.c | 31 ++ + .../drm/amd/display/modules/power/power_helpers.h | 3 + + .../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/legacy-dpm/si_dpm.c | 11 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 13 +- + .../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 + + .../gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c | 10 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 20 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 5 - + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 51 +-- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 7 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 67 +-- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 47 ++- + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 6 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.h | 3 + + drivers/gpu/drm/radeon/atombios.h | 10 +- + drivers/gpu/drm/radeon/radeon_device.c | 1 + + include/drm/display/drm_dp.h | 6 + + include/uapi/drm/amdgpu_drm.h | 6 + + 227 files changed, 4060 insertions(+), 3478 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/display/dc/dc_hdmi_types.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/link.h + rename drivers/gpu/drm/amd/display/dc/{core/dc_link_ddc.c => link/link_ddc.c} (57%) + rename drivers/gpu/drm/amd/display/{include/i2caux_interface.h => dc/link/link_ddc.h} (52%) + rename drivers/gpu/drm/amd/display/dc/{core/dc_link_dpia.c => link/link_dp_dpia.c} (99%) + rename drivers/gpu/drm/amd/display/dc/{inc/dc_link_dpia.h => link/link_dp_dpia.h} (98%) + rename drivers/gpu/drm/amd/display/dc/{core/dc_link_dpcd.c => link/link_dpcd.c} (97%) + rename drivers/gpu/drm/amd/display/dc/{inc => link}/link_dpcd.h (95%) + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hpd.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_hpd.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 (c52f52375660 drm/i915/fbc: Avoid full proxy f_ops for FBC debug attributes) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm-intel drm-intel/for-linux-next +Auto-merging drivers/gpu/drm/i915/Kconfig +Auto-merging drivers/gpu/drm/i915/i915_irq.c +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_reg.h +Auto-merging include/drm/display/drm_dp.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/Kconfig | 15 +- + drivers/gpu/drm/i915/Makefile | 7 +- + drivers/gpu/drm/i915/display/dvo_ch7xxx.c | 22 +- + drivers/gpu/drm/i915/display/dvo_sil164.c | 13 +- + drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 85 +- + drivers/gpu/drm/i915/display/intel_audio.c | 11 + + drivers/gpu/drm/i915/display/intel_audio.h | 2 + + drivers/gpu/drm/i915/display/intel_backlight.c | 539 ++++----- + .../gpu/drm/i915/display/intel_backlight_regs.h | 27 +- + drivers/gpu/drm/i915/display/intel_bios.c | 56 +- + drivers/gpu/drm/i915/display/intel_bios.h | 11 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 216 +++- + drivers/gpu/drm/i915/display/intel_color.c | 1269 ++++++++++++++++---- + drivers/gpu/drm/i915/display/intel_color.h | 10 +- + drivers/gpu/drm/i915/display/intel_connector.c | 2 +- + drivers/gpu/drm/i915/display/intel_crt.c | 53 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 26 +- + drivers/gpu/drm/i915/display/intel_de.h | 39 +- + drivers/gpu/drm/i915/display/intel_display.c | 60 +- + drivers/gpu/drm/i915/display/intel_display.h | 8 + + drivers/gpu/drm/i915/display/intel_display_power.c | 2 +- + drivers/gpu/drm/i915/display/intel_display_types.h | 26 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 45 +- + drivers/gpu/drm/i915/display/intel_dmc.h | 1 - + drivers/gpu/drm/i915/display/intel_dp.c | 215 ++-- + drivers/gpu/drm/i915/display/intel_dp.h | 19 + + drivers/gpu/drm/i915/display/intel_dp_aux.c | 41 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 235 +++- + drivers/gpu/drm/i915/display/intel_drrs.c | 8 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 328 +++-- + drivers/gpu/drm/i915/display/intel_dsb.h | 14 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 410 ++++--- + drivers/gpu/drm/i915/display/intel_dvo_dev.h | 7 +- + drivers/gpu/drm/i915/display/intel_dvo_regs.h | 54 + + drivers/gpu/drm/i915/display/intel_fb.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 22 +- + drivers/gpu/drm/i915/display/intel_gmbus.c | 46 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 21 +- + drivers/gpu/drm/i915/display/intel_hti.c | 3 + + drivers/gpu/drm/i915/display/intel_lvds.c | 4 +- + drivers/gpu/drm/i915/display/intel_panel.c | 9 + + drivers/gpu/drm/i915/display/intel_panel.h | 1 + + drivers/gpu/drm/i915/display/intel_pps.c | 360 ++++-- + drivers/gpu/drm/i915/display/intel_pps.h | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 44 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 15 +- + drivers/gpu/drm/i915/display/intel_tc.c | 55 +- + drivers/gpu/drm/i915/display/intel_vdsc.c | 11 +- + drivers/gpu/drm/i915/display/intel_vrr.c | 55 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 40 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 2 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 42 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- + drivers/gpu/drm/i915/i915_driver.c | 3 +- + drivers/gpu/drm/i915/i915_drv.h | 8 +- + drivers/gpu/drm/i915/i915_irq.c | 28 +- + drivers/gpu/drm/i915/i915_params.c | 2 +- + drivers/gpu/drm/i915/i915_pci.c | 50 +- + drivers/gpu/drm/i915/i915_reg.h | 102 +- + drivers/gpu/drm/i915/intel_wakeref.h | 21 +- + drivers/gpu/drm/i915/{ => soc}/intel_dram.c | 0 + drivers/gpu/drm/i915/{ => soc}/intel_dram.h | 0 + drivers/gpu/drm/i915/{ => soc}/intel_pch.c | 0 + drivers/gpu/drm/i915/{ => soc}/intel_pch.h | 0 + include/drm/display/drm_dp.h | 9 +- + 67 files changed, 3232 insertions(+), 1607 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_dvo_regs.h + rename drivers/gpu/drm/i915/{ => soc}/intel_dram.c (100%) + rename drivers/gpu/drm/i915/{ => soc}/intel_dram.h (100%) + rename drivers/gpu/drm/i915/{ => soc}/intel_pch.c (100%) + rename drivers/gpu/drm/i915/{ => soc}/intel_pch.h (100%) +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 (4102e58923f1 Merge branches 'msm-next-lumag-core', 'msm-next-lumag-dpu', 'msm-next-lumag-dp', 'msm-next-lumag-dsi', 'msm-next-lumag-hdmi', 'msm-next-lumag-mdp5' and 'msm-next-lumag-mdp4' into msm-next-lumag) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Auto-merging Documentation/devicetree/bindings/display/msm/gpu.yaml +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c +Auto-merging drivers/gpu/drm/msm/dp/dp_display.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Merge made by the 'ort' strategy. + .../bindings/display/msm/dp-controller.yaml | 28 +- + .../bindings/display/msm/dpu-common.yaml | 4 - + .../bindings/display/msm/dsi-phy-28nm.yaml | 1 + + .../bindings/display/msm/dsi-phy-7nm.yaml | 3 + + .../bindings/display/msm/dsi-phy-common.yaml | 7 +- + .../devicetree/bindings/display/msm/gpu.yaml | 2 + + .../bindings/display/msm/mdss-common.yaml | 1 - + .../bindings/display/msm/qcom,msm8998-dpu.yaml | 12 +- + .../bindings/display/msm/qcom,msm8998-mdss.yaml | 6 +- + .../bindings/display/msm/qcom,qcm2290-dpu.yaml | 12 +- + .../bindings/display/msm/qcom,qcm2290-mdss.yaml | 6 +- + .../bindings/display/msm/qcom,sc7180-dpu.yaml | 12 +- + .../bindings/display/msm/qcom,sc7180-mdss.yaml | 6 +- + .../bindings/display/msm/qcom,sc7280-dpu.yaml | 9 +- + .../bindings/display/msm/qcom,sc7280-mdss.yaml | 3 + + .../bindings/display/msm/qcom,sc8280xp-dpu.yaml | 122 +++ + .../bindings/display/msm/qcom,sc8280xp-mdss.yaml | 143 ++++ + .../bindings/display/msm/qcom,sdm845-dpu.yaml | 12 +- + .../bindings/display/msm/qcom,sdm845-mdss.yaml | 12 +- + .../bindings/display/msm/qcom,sm6115-dpu.yaml | 5 +- + .../bindings/display/msm/qcom,sm6115-mdss.yaml | 3 +- + .../bindings/display/msm/qcom,sm8150-dpu.yaml | 92 +++ + .../bindings/display/msm/qcom,sm8150-mdss.yaml | 330 ++++++++ + .../bindings/display/msm/qcom,sm8250-dpu.yaml | 7 + + .../bindings/display/msm/qcom,sm8250-mdss.yaml | 6 +- + .../bindings/display/msm/qcom,sm8350-dpu.yaml | 120 +++ + .../bindings/display/msm/qcom,sm8350-mdss.yaml | 221 ++++++ + .../bindings/display/msm/qcom,sm8450-dpu.yaml | 139 ++++ + .../bindings/display/msm/qcom,sm8450-mdss.yaml | 343 +++++++++ + drivers/gpu/drm/msm/Kconfig | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 12 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 1 + + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 842 ++++++++++++++++++++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 16 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.c | 27 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_dsc.h | 4 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 30 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 3 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_mdss.h | 7 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_top.c | 25 - + drivers/gpu/drm/msm/disp/dpu1/dpu_hwio.h | 21 + + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 15 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 9 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_writeback.c | 2 + + drivers/gpu/drm/msm/disp/mdp4/mdp4_irq.c | 9 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c | 9 +- + drivers/gpu/drm/msm/dp/dp_display.c | 155 ++-- + drivers/gpu/drm/msm/dp/dp_display.h | 1 + + drivers/gpu/drm/msm/dp/dp_drm.c | 3 + + drivers/gpu/drm/msm/dp/dp_drm.h | 4 + + drivers/gpu/drm/msm/dp/dp_panel.c | 7 +- + drivers/gpu/drm/msm/dp/dp_panel.h | 1 + + drivers/gpu/drm/msm/dp/dp_parser.c | 50 +- + drivers/gpu/drm/msm/dp/dp_parser.h | 2 + + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 18 + + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 2 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 7 +- + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 6 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 3 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 223 +++++- + drivers/gpu/drm/msm/hdmi/hdmi.c | 4 + + drivers/gpu/drm/msm/msm_drv.c | 2 +- + drivers/gpu/drm/msm/msm_drv.h | 3 +- + drivers/gpu/drm/msm/msm_mdss.c | 16 + + 65 files changed, 3012 insertions(+), 201 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sc8280xp-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sc8280xp-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8150-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8150-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8350-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8350-mdss.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8450-dpu.yaml + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,sm8450-mdss.yaml +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 (88c6dda5f77c fbdev: omapfb: Use kstrtobool() instead of strtobool()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging include/linux/fb.h +CONFLICT (content): Merge conflict in include/linux/fb.h +Recorded preimage for 'include/linux/fb.h' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'include/linux/fb.h'. +[master 96b4f51cd227] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git +$ git diff -M --stat --summary HEAD^.. + drivers/video/fbdev/atmel_lcdfb.c | 22 +--------------------- + drivers/video/fbdev/aty/aty128fb.c | 6 ++---- + drivers/video/fbdev/aty/atyfb_base.c | 8 +------- + drivers/video/fbdev/aty/radeon_backlight.c | 6 +----- + drivers/video/fbdev/core/fbmon.c | 2 +- + drivers/video/fbdev/mx3fb.c | 7 +------ + drivers/video/fbdev/nvidia/nv_backlight.c | 8 +------- + .../fbdev/omap2/omapfb/displays/panel-dsi-cm.c | 8 +------- + .../video/fbdev/omap2/omapfb/dss/display-sysfs.c | 7 ++++--- + .../video/fbdev/omap2/omapfb/dss/manager-sysfs.c | 7 ++++--- + .../video/fbdev/omap2/omapfb/dss/overlay-sysfs.c | 3 ++- + drivers/video/fbdev/omap2/omapfb/omapfb-sysfs.c | 3 ++- + drivers/video/fbdev/riva/fbdev.c | 8 +------- + 13 files changed, 22 insertions(+), 73 deletions(-) +Merging regmap/for-next (861fa35db66c Merge branch 'regmap-linus' 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 (acdebd8b4c0c ALSA: fireface: implement message parser for Fireface 400) +$ 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/uapi/sound/firewire.h | 24 ++ + sound/firewire/amdtp-am824.c | 60 ++-- + sound/firewire/amdtp-stream-trace.h | 9 +- + sound/firewire/amdtp-stream.c | 310 ++++++++++++++------- + sound/firewire/amdtp-stream.h | 34 ++- + sound/firewire/digi00x/amdtp-dot.c | 28 +- + sound/firewire/fireface/amdtp-ff.c | 28 +- + sound/firewire/fireface/ff-hwdep.c | 41 ++- + sound/firewire/fireface/ff-protocol-former.c | 186 ++++++++++--- + sound/firewire/fireface/ff-protocol-latter.c | 6 +- + sound/firewire/fireface/ff-transaction.c | 17 +- + sound/firewire/fireface/ff.c | 10 + + sound/firewire/fireface/ff.h | 9 +- + sound/firewire/motu/amdtp-motu.c | 58 ++-- + .../motu/motu-command-dsp-message-parser.c | 11 +- + .../motu/motu-register-dsp-message-parser.c | 11 +- + sound/firewire/motu/motu.h | 8 +- + sound/firewire/tascam/amdtp-tascam.c | 28 +- + tools/testing/selftests/alsa/Makefile | 2 +- + tools/testing/selftests/alsa/alsa-local.h | 3 + + tools/testing/selftests/alsa/conf.c | 26 +- + .../alsa/conf.d/Lenovo_ThinkPad_P1_Gen2.conf | 43 +-- + tools/testing/selftests/alsa/pcm-test.c | 205 +++++++++----- + tools/testing/selftests/alsa/pcm-test.conf | 63 +++++ + 24 files changed, 834 insertions(+), 386 deletions(-) + create mode 100644 tools/testing/selftests/alsa/pcm-test.conf +Merging sound-asoc/for-next (2e60e59ce37f Merge remote-tracking branch 'asoc/for-6.3' into asoc-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Auto-merging sound/soc/pxa/Kconfig +CONFLICT (modify/delete): sound/soc/pxa/e740_wm9705.c deleted in HEAD and modified in sound-asoc/for-next. Version sound-asoc/for-next of sound/soc/pxa/e740_wm9705.c left in tree. +CONFLICT (modify/delete): sound/soc/pxa/e750_wm9705.c deleted in HEAD and modified in sound-asoc/for-next. Version sound-asoc/for-next of sound/soc/pxa/e750_wm9705.c left in tree. +CONFLICT (modify/delete): sound/soc/pxa/e800_wm9712.c deleted in HEAD and modified in sound-asoc/for-next. Version sound-asoc/for-next of sound/soc/pxa/e800_wm9712.c left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f sound/soc/pxa/e740_wm9705.c sound/soc/pxa/e750_wm9705.c sound/soc/pxa/e800_wm9712.c +rm 'sound/soc/pxa/e740_wm9705.c' +rm 'sound/soc/pxa/e750_wm9705.c' +rm 'sound/soc/pxa/e800_wm9712.c' +$ git commit --no-edit -v -a +[master 7a766e79ddc1] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/dsp/mediatek,mt8186-dsp.yaml | 4 +- + .../devicetree/bindings/sound/adi,adau7002.txt | 19 - + .../devicetree/bindings/sound/adi,adau7002.yaml | 40 ++ + .../devicetree/bindings/sound/cirrus,cs35l41.yaml | 43 +- + .../devicetree/bindings/sound/fsl,xcvr.yaml | 1 + + ...,i2s-mcc.yaml => microchip,sama7g5-i2smcc.yaml} | 2 +- + ...ochip,pdmc.yaml => microchip,sama7g5-pdmc.yaml} | 2 +- + ...spdifrx.yaml => microchip,sama7g5-spdifrx.yaml} | 2 +- + ...spdiftx.yaml => microchip,sama7g5-spdiftx.yaml} | 2 +- + .../devicetree/bindings/sound/nau8822.txt | 16 - + .../devicetree/bindings/sound/nuvoton,nau8822.yaml | 46 ++ + .../devicetree/bindings/sound/qcom,lpass-cpu.yaml | 136 +++--- + Documentation/devicetree/bindings/sound/rt5640.txt | 3 + + .../devicetree/bindings/sound/simple-card.yaml | 12 +- + .../devicetree/bindings/sound/ti,tlv320aic3x.yaml | 165 ++++++++ + .../devicetree/bindings/sound/tlv320aic3x.txt | 97 ----- + include/uapi/sound/intel/avs/tokens.h | 4 + + sound/soc/amd/acp/acp-legacy-mach.c | 13 + + sound/soc/amd/acp/acp-mach-common.c | 465 ++++++++++++++++----- + sound/soc/amd/acp/acp-mach.h | 4 + + sound/soc/amd/acp/acp-sof-mach.c | 14 + + sound/soc/amd/ps/acp63.h | 12 +- + sound/soc/amd/ps/pci-ps.c | 211 ++++++---- + sound/soc/amd/ps/ps-pdm-dma.c | 32 +- + sound/soc/amd/raven/acp3x-i2s.c | 8 - + sound/soc/atmel/atmel-classd.c | 6 - + sound/soc/atmel/atmel-pdmic.c | 6 - + sound/soc/atmel/mchp-pdmc.c | 145 ++++--- + sound/soc/atmel/mchp-spdiftx.c | 8 +- + sound/soc/codecs/88pm860x-codec.c | 6 - + sound/soc/codecs/Kconfig | 1 - + sound/soc/codecs/ac97.c | 6 - + sound/soc/codecs/adau7002.c | 6 - + sound/soc/codecs/bt-sco.c | 6 - + sound/soc/codecs/cq93vc.c | 6 - + sound/soc/codecs/da7213.c | 30 +- + sound/soc/codecs/da7213.h | 3 + + sound/soc/codecs/mc13783.c | 6 - + sound/soc/codecs/nau8822.c | 9 + + sound/soc/codecs/nau8822.h | 9 + + sound/soc/codecs/rt5640.c | 4 + + sound/soc/codecs/rt5640.h | 2 + + sound/soc/codecs/rt711-sdca.c | 15 + + sound/soc/codecs/rt711-sdca.h | 8 +- + sound/soc/codecs/wl1273.c | 6 - + sound/soc/codecs/wm8940.c | 116 ++++- + sound/soc/codecs/wm8940.h | 3 + + sound/soc/fsl/fsl-asoc-card.c | 2 +- + sound/soc/fsl/fsl_xcvr.c | 155 ++++--- + sound/soc/fsl/fsl_xcvr.h | 7 + + sound/soc/intel/avs/Makefile | 2 +- + sound/soc/intel/avs/boards/rt286.c | 2 +- + sound/soc/intel/avs/boards/rt298.c | 2 +- + sound/soc/intel/avs/control.c | 105 +++++ + sound/soc/intel/avs/control.h | 23 + + sound/soc/intel/avs/messages.c | 29 ++ + sound/soc/intel/avs/messages.h | 33 ++ + sound/soc/intel/avs/path.c | 62 +++ + sound/soc/intel/avs/pcm.c | 30 +- + sound/soc/intel/avs/topology.c | 76 ++++ + sound/soc/intel/avs/topology.h | 3 + + sound/soc/intel/avs/trace.c | 2 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 2 +- + sound/soc/intel/boards/bytcht_da7213.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 2 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 2 +- + sound/soc/intel/boards/sof_ssp_amp.c | 4 - + sound/soc/intel/boards/sof_wm8804.c | 2 +- + .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 2 +- + sound/soc/pxa/spitz.c | 6 - + sound/soc/sof/amd/acp-dsp-offset.h | 4 + + sound/soc/sof/amd/acp-loader.c | 7 + + sound/soc/sof/amd/acp.h | 2 + + sound/soc/sof/control.c | 44 +- + sound/soc/sof/core.c | 3 + + sound/soc/sof/ipc3-topology.c | 7 +- + sound/soc/sof/mediatek/mt8186/mt8186.c | 20 + + sound/soc/sof/mediatek/mt8186/mt8186.h | 10 +- + sound/soc/sof/mediatek/mt8195/mt8195.c | 6 +- + sound/soc/sof/mediatek/mt8195/mt8195.h | 2 - + sound/soc/sof/nocodec.c | 6 - + sound/soc/sof/pcm.c | 18 +- + sound/soc/sof/pm.c | 12 +- + sound/soc/sof/sof-audio.c | 57 +-- + sound/soc/sof/sof-audio.h | 6 +- + sound/soc/sof/sof-priv.h | 6 +- + sound/soc/sof/topology.c | 91 ++-- + sound/soc/sof/trace.c | 8 +- + 88 files changed, 1852 insertions(+), 772 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/adi,adau7002.txt + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau7002.yaml + rename Documentation/devicetree/bindings/sound/{mchp,i2s-mcc.yaml => microchip,sama7g5-i2smcc.yaml} (97%) + rename Documentation/devicetree/bindings/sound/{microchip,pdmc.yaml => microchip,sama7g5-pdmc.yaml} (97%) + rename Documentation/devicetree/bindings/sound/{mchp,spdifrx.yaml => microchip,sama7g5-spdifrx.yaml} (95%) + rename Documentation/devicetree/bindings/sound/{mchp,spdiftx.yaml => microchip,sama7g5-spdiftx.yaml} (95%) + delete mode 100644 Documentation/devicetree/bindings/sound/nau8822.txt + create mode 100644 Documentation/devicetree/bindings/sound/nuvoton,nau8822.yaml + create mode 100644 Documentation/devicetree/bindings/sound/ti,tlv320aic3x.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/tlv320aic3x.txt + create mode 100644 sound/soc/intel/avs/control.c + create mode 100644 sound/soc/intel/avs/control.h +Merging modules/modules-next (4836b450b000 test_kmod: stop kernel-doc warnings) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Merge made by the 'ort' strategy. + kernel/module/main.c | 26 +++++++++++++++++++++----- + lib/test_kmod.c | 11 +++++------ + scripts/Makefile.modinst | 2 +- + 3 files changed, 27 insertions(+), 12 deletions(-) +Merging input/next (407da561244b Merge tag 'v6.2-rc3' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +CONFLICT (modify/delete): drivers/input/touchscreen/ucb1400_ts.c deleted in HEAD and modified in input/next. Version input/next of drivers/input/touchscreen/ucb1400_ts.c left in tree. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/input/touchscreen/ucb1400_ts.c +rm 'drivers/input/touchscreen/ucb1400_ts.c' +$ git commit --no-edit -v -a +[master 1105aaeaac68] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git +$ git diff -M --stat --summary HEAD^.. + drivers/input/misc/88pm860x_onkey.c | 9 +++++---- + drivers/input/misc/da7280.c | 8 ++++---- + drivers/input/misc/drv260x.c | 8 ++++---- + drivers/input/misc/drv2665.c | 8 ++++---- + drivers/input/misc/drv2667.c | 8 ++++---- + drivers/input/misc/e3x0-button.c | 10 +++++----- + drivers/input/misc/gpio-vibra.c | 10 +++++----- + drivers/input/misc/iqs269a.c | 8 ++++---- + drivers/input/misc/iqs626a.c | 8 ++++---- + drivers/input/misc/kxtj9.c | 8 ++++---- + drivers/input/misc/max77693-haptic.c | 11 ++++++----- + drivers/input/misc/max8925_onkey.c | 9 +++++---- + drivers/input/misc/max8997_haptic.c | 7 ++++--- + drivers/input/misc/palmas-pwrbutton.c | 10 +++++----- + drivers/input/misc/pcf8574_keypad.c | 16 +++------------- + drivers/input/misc/pm8941-pwrkey.c | 10 +++++----- + drivers/input/misc/pm8xxx-vibrator.c | 6 +++--- + drivers/input/misc/pmic8xxx-pwrkey.c | 8 ++++---- + drivers/input/misc/pwm-beeper.c | 10 +++++----- + drivers/input/misc/pwm-vibra.c | 10 +++++----- + drivers/input/misc/regulator-haptic.c | 8 ++++---- + drivers/input/misc/rotary_encoder.c | 10 +++++----- + drivers/input/misc/stpmic1_onkey.c | 12 ++++++------ + drivers/input/misc/twl4030-vibra.c | 10 +++++----- + drivers/input/misc/twl6040-vibra.c | 7 ++++--- + drivers/input/mouse/elan_i2c_core.c | 8 ++++---- + drivers/input/mouse/navpoint.c | 9 +++++---- + drivers/input/mouse/synaptics_i2c.c | 10 +++++----- + drivers/input/serio/ambakmi.c | 6 +++--- + drivers/input/touchscreen/ad7877.c | 8 ++++---- + drivers/input/touchscreen/ads7846.c | 8 ++++---- + drivers/input/touchscreen/ar1021_i2c.c | 9 +++++---- + drivers/input/touchscreen/atmel_mxt_ts.c | 8 ++++---- + drivers/input/touchscreen/auo-pixcir-ts.c | 10 +++++----- + drivers/input/touchscreen/bu21013_ts.c | 8 ++++---- + drivers/input/touchscreen/bu21029_ts.c | 8 ++++---- + drivers/input/touchscreen/chipone_icn8318.c | 6 ++---- + drivers/input/touchscreen/chipone_icn8505.c | 8 ++++---- + drivers/input/touchscreen/cy8ctma140.c | 9 +++++---- + drivers/input/touchscreen/cy8ctmg110_ts.c | 9 +++++---- + drivers/input/touchscreen/edt-ft5x06.c | 10 +++++----- + drivers/input/touchscreen/eeti_ts.c | 8 ++++---- + drivers/input/touchscreen/egalax_ts.c | 9 +++++---- + drivers/input/touchscreen/ektf2127.c | 10 +++++----- + drivers/input/touchscreen/elants_i2c.c | 10 +++++----- + drivers/input/touchscreen/goodix.c | 8 ++++---- + drivers/input/touchscreen/hideep.c | 8 ++++---- + drivers/input/touchscreen/ilitek_ts_i2c.c | 8 ++++---- + drivers/input/touchscreen/imagis.c | 8 ++++---- + drivers/input/touchscreen/imx6ul_tsc.c | 10 +++++----- + drivers/input/touchscreen/ipaq-micro-ts.c | 11 +++++------ + drivers/input/touchscreen/iqs5xx.c | 8 ++++---- + drivers/input/touchscreen/mcs5000_ts.c | 9 +++++---- + drivers/input/touchscreen/melfas_mip4.c | 8 ++++---- + drivers/input/touchscreen/migor_ts.c | 8 ++++---- + drivers/input/touchscreen/mms114.c | 8 ++++---- + drivers/input/touchscreen/msg2638.c | 8 ++++---- + drivers/input/touchscreen/pixcir_i2c_ts.c | 10 +++++----- + drivers/input/touchscreen/raydium_i2c_ts.c | 12 ++++++------ + drivers/input/touchscreen/silead.c | 8 ++++---- + drivers/input/touchscreen/st1232.c | 10 +++++----- + drivers/input/touchscreen/surface3_spi.c | 12 ++++++------ + drivers/input/touchscreen/ti_am335x_tsc.c | 8 ++++---- + drivers/input/touchscreen/wacom_i2c.c | 8 ++++---- + drivers/input/touchscreen/wdt87xx_i2c.c | 8 ++++---- + drivers/input/touchscreen/wm97xx-core.c | 10 +++++----- + drivers/input/touchscreen/zforce_ts.c | 8 ++++---- + drivers/input/touchscreen/zinitix.c | 8 ++++---- + 68 files changed, 301 insertions(+), 303 deletions(-) +Merging block/for-next (b0ebcbdf977b Merge branch 'for-6.3/io_uring' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-block | 3 +- + MAINTAINERS | 1 + + block/bfq-cgroup.c | 93 +++--- + block/bfq-iosched.c | 587 ++++++++++++++++++++++++----------- + block/bfq-iosched.h | 142 +++++++-- + block/bfq-wf2q.c | 2 +- + block/bio.c | 2 + + block/blk-map.c | 8 +- + block/blk-settings.c | 9 +- + block/blk-sysfs.c | 21 +- + drivers/block/drbd/Makefile | 2 +- + drivers/block/drbd/drbd_buildtag.c | 22 ++ + drivers/block/drbd/drbd_debugfs.c | 2 +- + drivers/block/drbd/drbd_int.h | 13 +- + drivers/block/drbd/drbd_interval.c | 6 +- + drivers/block/drbd/drbd_main.c | 20 +- + drivers/block/drbd/drbd_proc.c | 2 +- + drivers/block/drbd/drbd_vli.h | 2 +- + drivers/block/null_blk/main.c | 3 +- + include/linux/blkdev.h | 4 +- + include/linux/drbd.h | 7 - + include/linux/drbd_config.h | 16 + + include/linux/drbd_genl_api.h | 2 +- + include/linux/drbd_limits.h | 204 ++++++------ + include/linux/io_uring_types.h | 15 +- + include/linux/uio.h | 1 + + include/uapi/linux/io_uring.h | 2 + + io_uring/io_uring.c | 296 ++++++++++++------ + io_uring/io_uring.h | 53 +--- + io_uring/msg_ring.c | 23 +- + io_uring/net.c | 17 +- + io_uring/rw.c | 11 +- + io_uring/sqpoll.c | 3 +- + io_uring/sqpoll.h | 2 +- + lib/iov_iter.c | 15 +- + 35 files changed, 1021 insertions(+), 590 deletions(-) + create mode 100644 drivers/block/drbd/drbd_buildtag.c + create mode 100644 include/linux/drbd_config.h +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 (38d431229bfb ata: libata: exclude FUA support for known buggy drives) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging block/blk-core.c +Auto-merging drivers/scsi/libsas/sas_ata.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 3 + + block/blk-core.c | 14 +- + drivers/ata/acard-ahci.c | 8 +- + drivers/ata/ahci_octeon.c | 6 - + drivers/ata/libahci.c | 171 ++++++++++++++++++------ + drivers/ata/libata-core.c | 81 +++++++---- + drivers/ata/libata-eh.c | 117 ++++++++-------- + drivers/ata/libata-sata.c | 7 +- + drivers/ata/libata-scsi.c | 41 ++---- + drivers/ata/libata-sff.c | 10 +- + drivers/ata/libata-trace.c | 2 +- + drivers/ata/sata_fsl.c | 5 +- + drivers/ata/sata_inic162x.c | 14 +- + drivers/ata/sata_promise.c | 2 +- + drivers/ata/sata_sil24.c | 7 +- + drivers/ata/sata_sx4.c | 2 +- + drivers/scsi/ipr.c | 11 +- + drivers/scsi/libsas/sas_ata.c | 11 +- + include/linux/libata.h | 61 ++++++--- + 19 files changed, 342 insertions(+), 231 deletions(-) +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 (1cb6f443cbdc Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 6 ++ + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 1 + + drivers/mmc/core/pwrseq_simple.c | 4 +- + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 11 ++++ + drivers/mmc/host/sdhci-esdhc-imx.c | 66 +++++++++++++++++++--- + 5 files changed, 77 insertions(+), 11 deletions(-) +Merging mfd/for-mfd-next (153e461670b9 mfd: simple-mfd-i2c: Fix incoherent comment regarding DT registration) +$ 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/mfd/syscon.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/mfd/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/google,cros-ec.yaml | 20 ++++++++++++++++ + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 7 ++++++ + Documentation/devicetree/bindings/mfd/syscon.yaml | 1 + + MAINTAINERS | 2 +- + drivers/mfd/Kconfig | 1 + + drivers/mfd/axp20x.c | 27 +++++++++------------- + drivers/mfd/kempld-core.c | 7 +++--- + drivers/mfd/lm3533-core.c | 2 +- + drivers/mfd/max8925-core.c | 6 ----- + drivers/mfd/pcf50633-adc.c | 7 +++++- + drivers/mfd/qcom-pm8xxx.c | 3 --- + drivers/mfd/rk808.c | 1 + + drivers/mfd/simple-mfd-i2c.c | 3 ++- + drivers/mfd/twl-core.c | 9 ++++---- + drivers/mfd/twl4030-power.c | 6 ----- + include/linux/mfd/axp20x.h | 15 ++++++++---- + include/linux/mfd/core.h | 2 +- + include/linux/mfd/twl.h | 2 ++ + 18 files changed, 71 insertions(+), 50 deletions(-) +Merging backlight/for-backlight-next (73516cbcf8d9 backlight: pwm_bl: Drop support for legacy PWM probing) +$ 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. + .../devicetree/bindings/leds/backlight/qcom-wled.yaml | 1 + + drivers/video/backlight/backlight.c | 2 +- + 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(+), 20 deletions(-) +Merging battery/for-next (4e9498b835ab power: supply: bq25890: Support boards with more then one charger IC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Merge made by the 'ort' strategy. + drivers/platform/x86/x86-android-tablets.c | 2 +- + drivers/power/supply/ab8500_fg.c | 22 +++--- + drivers/power/supply/bq2415x_charger.c | 42 ++++++------ + drivers/power/supply/bq24190_charger.c | 2 +- + drivers/power/supply/bq24257_charger.c | 8 +-- + drivers/power/supply/bq25890_charger.c | 105 ++++++++++++++++++++++------- + drivers/power/supply/charger-manager.c | 6 +- + drivers/power/supply/da9150-charger.c | 9 +-- + drivers/power/supply/ds2780_battery.c | 8 +-- + drivers/power/supply/ds2781_battery.c | 8 +-- + drivers/power/supply/lp8788-charger.c | 7 +- + drivers/power/supply/ltc4162-l-charger.c | 12 ++-- + drivers/power/supply/max14577_charger.c | 2 +- + drivers/power/supply/max77693_charger.c | 6 +- + drivers/power/supply/mp2629_charger.c | 2 +- + drivers/power/supply/olpc_battery.c | 2 +- + drivers/power/supply/pcf50633-charger.c | 6 +- + drivers/power/supply/power_supply_sysfs.c | 10 +-- + drivers/power/supply/twl4030_charger.c | 6 +- + drivers/power/supply/wm8350_power.c | 2 +- + 20 files changed, 155 insertions(+), 112 deletions(-) +Merging regulator/for-next (e44f08c1c68d Merge remote-tracking branch 'regulator/for-6.3' into regulator-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator/for-next +Merge made by the 'ort' strategy. + .../bindings/regulator/act8865-regulator.txt | 117 ---------- + .../bindings/regulator/act8945a-regulator.txt | 113 --------- + .../bindings/regulator/active-semi,act8600.yaml | 139 +++++++++++ + .../bindings/regulator/active-semi,act8846.yaml | 205 ++++++++++++++++ + .../bindings/regulator/active-semi,act8865.yaml | 158 +++++++++++++ + .../bindings/regulator/active-semi,act8945a.yaml | 258 +++++++++++++++++++++ + .../devicetree/bindings/regulator/fan53555.txt | 24 -- + .../bindings/regulator/fcs,fan53555.yaml | 64 +++++ + .../bindings/regulator/qcom,rpm-regulator.yaml | 128 ++++++++++ + .../regulator/qcom,usb-vbus-regulator.yaml | 2 +- + drivers/regulator/act8945a-regulator.c | 6 +- + drivers/regulator/fixed-helper.c | 2 +- + drivers/regulator/tps65219-regulator.c | 2 +- + 13 files changed, 958 insertions(+), 260 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/regulator/act8865-regulator.txt + delete mode 100644 Documentation/devicetree/bindings/regulator/act8945a-regulator.txt + create mode 100644 Documentation/devicetree/bindings/regulator/active-semi,act8600.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/active-semi,act8846.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/active-semi,act8865.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/active-semi,act8945a.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/fan53555.txt + create mode 100644 Documentation/devicetree/bindings/regulator/fcs,fan53555.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/qcom,rpm-regulator.yaml +Merging security/next (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Already up to date. +Merging apparmor/apparmor-next (1b929c02afd3 Linux 6.2-rc1) +$ 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 (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Already up to date. +Merging smack/next (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 (fa17087e2442 tomoyo: Update website link) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Merge made by the 'ort' strategy. + security/tomoyo/Kconfig | 4 +--- + security/tomoyo/Makefile | 19 +++++++++++-------- + 2 files changed, 12 insertions(+), 11 deletions(-) +Merging tpmdd/next (ceb626750358 crypto: certs: fix FIPS selftest dependency) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Merge made by the 'ort' strategy. + crypto/asymmetric_keys/Kconfig | 2 +- + crypto/asymmetric_keys/pkcs7_verify.c | 1 + + drivers/char/tpm/st33zp24/i2c.c | 5 ++--- + 3 files changed, 4 insertions(+), 4 deletions(-) +Merging watchdog/master (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Already up to date. +Merging iommu/next (6a399c3b99ee Merge branches 'iommu/fixes', '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 +Merge made by the 'ort' strategy. + drivers/iommu/Kconfig | 18 ++++--- + drivers/iommu/amd/iommu.c | 42 ++++----------- + drivers/iommu/apple-dart.c | 24 --------- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 23 -------- + drivers/iommu/exynos-iommu.c | 1 - + drivers/iommu/fsl_pamu_domain.c | 6 +-- + drivers/iommu/iommu-traces.c | 1 - + drivers/iommu/iommu.c | 94 +++++++++++++++------------------ + drivers/iommu/ipmmu-vmsa.c | 28 ---------- + drivers/iommu/msm_iommu.c | 6 +-- + drivers/iommu/mtk_iommu.c | 9 ---- + drivers/iommu/mtk_iommu_v1.c | 4 +- + drivers/iommu/omap-iommu.c | 6 +-- + drivers/iommu/rockchip-iommu.c | 1 - + drivers/iommu/s390-iommu.c | 7 +-- + drivers/iommu/sprd-iommu.c | 16 ------ + drivers/iommu/sun50i-iommu.c | 1 - + drivers/iommu/tegra-gart.c | 6 +-- + drivers/iommu/tegra-smmu.c | 5 +- + include/linux/iommu.h | 8 ++- + include/trace/events/iommu.h | 7 --- + 21 files changed, 92 insertions(+), 221 deletions(-) +Merging audit/next (88603b6dc419 Linux 6.2-rc2) +$ 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 (8ffbaa98ccf8 dt-bindings: ufs: qcom,ufs: document required-opps) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Auto-merging MAINTAINERS +Auto-merging Makefile +Merge made by the 'ort' strategy. + .../bindings/clock/socionext,uniphier-clock.yaml | 39 +------ + .../devicetree/bindings/i2c/i2c-synquacer.txt | 29 ------ + .../bindings/i2c/socionext,synquacer-i2c.yaml | 58 +++++++++++ + .../socionext,synquacer-exiu.txt | 31 ------ + .../socionext,synquacer-exiu.yaml | 53 ++++++++++ + .../bindings/memory-controllers/ti,gpmc.yaml | 2 +- + .../bindings/nvmem/socionext,uniphier-efuse.yaml | 101 +++++++++--------- + .../bindings/phy/socionext,uniphier-ahci-phy.yaml | 24 ++--- + .../bindings/phy/socionext,uniphier-usb2-phy.yaml | 41 ++++---- + .../phy/socionext,uniphier-usb3hs-phy.yaml | 29 ++---- + .../phy/socionext,uniphier-usb3ss-phy.yaml | 26 ++--- + .../pinctrl/socionext,uniphier-pinctrl.yaml | 17 ++- + .../regulator/socionext,uniphier-regulator.yaml | 21 ++-- + .../reset/socionext,uniphier-glue-reset.yaml | 23 ++--- + .../bindings/reset/socionext,uniphier-reset.yaml | 52 +--------- + .../soc/socionext/socionext,uniphier-adamv.yaml | 50 +++++++++ + .../socionext/socionext,uniphier-ahci-glue.yaml | 77 ++++++++++++++ + .../socionext/socionext,uniphier-dwc3-glue.yaml | 106 +++++++++++++++++++ + .../soc/socionext/socionext,uniphier-mioctrl.yaml | 65 ++++++++++++ + .../soc/socionext/socionext,uniphier-perictrl.yaml | 64 ++++++++++++ + .../soc/socionext/socionext,uniphier-sdctrl.yaml | 61 +++++++++++ + .../socionext,uniphier-soc-glue-debug.yaml | 68 ++++++++++++ + .../soc/socionext/socionext,uniphier-soc-glue.yaml | 115 +++++++++++++++++++++ + .../soc/socionext/socionext,uniphier-sysctrl.yaml | 104 +++++++++++++++++++ + .../thermal/socionext,uniphier-thermal.yaml | 15 +-- + .../devicetree/bindings/ufs/qcom,ufs.yaml | 3 + + .../bindings/watchdog/socionext,uniphier-wdt.yaml | 10 +- + MAINTAINERS | 3 +- + Makefile | 9 +- + drivers/of/base.c | 3 +- + drivers/of/overlay.c | 2 +- + 31 files changed, 969 insertions(+), 332 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/i2c/i2c-synquacer.txt + create mode 100644 Documentation/devicetree/bindings/i2c/socionext,synquacer-i2c.yaml + delete mode 100644 Documentation/devicetree/bindings/interrupt-controller/socionext,synquacer-exiu.txt + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/socionext,synquacer-exiu.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-adamv.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-ahci-glue.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-dwc3-glue.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-mioctrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-perictrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-sdctrl.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-soc-glue-debug.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-soc-glue.yaml + create mode 100644 Documentation/devicetree/bindings/soc/socionext/socionext,uniphier-sysctrl.yaml +Merging dt-krzk/for-next (d3897e5e296e Merge branch 'next/qcom-pinctrl' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-dt.git dt-krzk/for-next +Merge made by the 'ort' strategy. + .../bindings/pinctrl/qcom,ipq6018-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,ipq8074-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,mdm9607-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,mdm9615-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8660-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8909-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8916-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8953-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8960-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8974-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8976-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8994-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8996-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,msm8998-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,qcm2290-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,qcs404-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,sc7180-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,sc8180x-tlmm.yaml | 4 +++- + .../pinctrl/qcom,sc8280xp-lpass-lpi-pinctrl.yaml | 8 +++---- + .../bindings/pinctrl/qcom,sc8280xp-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,sdm630-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,sdm670-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,sdm845-pinctrl.yaml | 15 +++++++++++- + .../bindings/pinctrl/qcom,sdx55-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,sdx65-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,sm6115-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,sm6125-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,sm6350-tlmm.yaml | 27 ++++++++++++++++++---- + .../bindings/pinctrl/qcom,sm6375-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,sm8150-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,sm8250-pinctrl.yaml | 4 +++- + .../bindings/pinctrl/qcom,sm8350-tlmm.yaml | 15 +++++++++--- + .../bindings/pinctrl/qcom,sm8450-tlmm.yaml | 4 +++- + .../bindings/pinctrl/qcom,tlmm-common.yaml | 5 ++-- + arch/arm/boot/dts/at91-gatwick.dts | 12 +++++----- + arch/arm/boot/dts/at91-sama5d27_som1_ek.dts | 6 ++--- + arch/arm/boot/dts/at91-sama5d27_wlsom1_ek.dts | 6 ++--- + arch/arm/boot/dts/at91-sama5d2_icp.dts | 6 ++--- + arch/arm/boot/dts/at91-sama5d2_ptc_ek.dts | 6 ++--- + arch/arm/boot/dts/at91-sama5d2_xplained.dts | 6 ++--- + arch/arm/boot/dts/at91-sama5d3_xplained.dts | 4 ++-- + arch/arm/boot/dts/at91-sama5d4_ma5d4evk.dts | 6 ++--- + arch/arm/boot/dts/at91-sama5d4_xplained.dts | 4 ++-- + arch/arm/boot/dts/at91-sama5d4ek.dts | 6 ++--- + arch/arm/boot/dts/at91-tse850-3.dts | 16 ++++++------- + arch/arm/boot/dts/dove-cm-a510.dtsi | 2 +- + arch/arm/boot/dts/dove-cubox.dts | 2 +- + arch/arm/boot/dts/dove-d2plug.dts | 6 ++--- + arch/arm/boot/dts/dove-d3plug.dts | 6 ++--- + arch/arm/boot/dts/keystone-k2hk-evm.dts | 8 +++---- + arch/arm/boot/dts/sama5d31ek.dts | 2 +- + arch/arm/boot/dts/sama5d34ek.dts | 2 +- + arch/arm/boot/dts/sama5d3xcm.dtsi | 2 +- + arch/arm/boot/dts/sama5d3xcm_cmp.dtsi | 2 +- + arch/arm/boot/dts/socfpga.dtsi | 2 +- + arch/arm/boot/dts/stih410.dtsi | 2 +- + arch/arm64/boot/dts/hisilicon/hi3660-hikey960.dts | 12 +++++----- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 12 +++++----- + arch/arm64/boot/dts/microchip/sparx5.dtsi | 2 +- + 60 files changed, 215 insertions(+), 115 deletions(-) +Merging mailbox/mailbox-for-next (53c60d100427 dt-bindings: mailbox: qcom-ipcc: Add compatible for SM8550) +$ 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 (401b0e257059 Merge remote-tracking branch 'spi/for-6.3' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. + .../bindings/spi/spi-peripheral-props.yaml | 10 + + .../devicetree/bindings/trivial-devices.yaml | 4 + + drivers/spi/spi-altera-core.c | 30 +-- + drivers/spi/spi-altera-dfl.c | 36 ++-- + drivers/spi/spi-altera-platform.c | 36 ++-- + drivers/spi/spi-ar934x.c | 10 +- + drivers/spi/spi-armada-3700.c | 98 +++++----- + drivers/spi/spi-ath79.c | 40 ++-- + drivers/spi/spi-geni-qcom.c | 211 ++++++++++++++++----- + drivers/spi/spi-loopback-test.c | 8 +- + drivers/spi/spi-pl022.c | 1 - + drivers/spi/spi.c | 25 ++- + drivers/spi/spidev.c | 4 + + include/linux/spi/altera.h | 4 +- + 14 files changed, 337 insertions(+), 180 deletions(-) +Merging tip/master (df1bebcf81d6 Merge branch into tip/master: 'x86/platform') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging arch/arm/mach-omap2/common.h +Auto-merging arch/arm/mach-omap2/pm.h +CONFLICT (modify/delete): arch/arm/mach-omap2/pm24xx.c deleted in HEAD and modified in tip/master. Version tip/master of arch/arm/mach-omap2/pm24xx.c left in tree. +Auto-merging arch/arm/mach-omap2/powerdomain.c +Auto-merging arch/s390/kernel/idle.c +Auto-merging arch/s390/kernel/vmlinux.lds.S +Auto-merging drivers/acpi/processor_idle.c +Auto-merging drivers/clk/clk.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/mm_types.h +Auto-merging init/Kconfig +Auto-merging kernel/printk/printk.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/arm/mach-omap2/pm24xx.c +rm 'arch/arm/mach-omap2/pm24xx.c' +$ git commit --no-edit -v -a +[master dfc81b9e33fe] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/cgroup-v2.rst | 3 + + Documentation/kernel-hacking/locking.rst | 4 +- + Documentation/scheduler/index.rst | 1 + + Documentation/scheduler/sched-util-clamp.rst | 741 ++++++++++++ + .../translations/it_IT/kernel-hacking/locking.rst | 4 +- + arch/alpha/kernel/process.c | 1 - + arch/alpha/kernel/vmlinux.lds.S | 1 - + arch/arc/kernel/process.c | 3 + + arch/arc/kernel/vmlinux.lds.S | 1 - + arch/arm/include/asm/vmlinux.lds.h | 1 - + arch/arm/kernel/cpuidle.c | 4 +- + arch/arm/kernel/process.c | 1 - + arch/arm/kernel/smp.c | 6 +- + arch/arm/mach-davinci/cpuidle.c | 4 +- + arch/arm/mach-gemini/board-dt.c | 3 +- + arch/arm/mach-imx/cpuidle-imx5.c | 4 +- + arch/arm/mach-imx/cpuidle-imx6q.c | 8 +- + arch/arm/mach-imx/cpuidle-imx6sl.c | 4 +- + arch/arm/mach-imx/cpuidle-imx6sx.c | 9 +- + arch/arm/mach-imx/cpuidle-imx7ulp.c | 4 +- + arch/arm/mach-omap2/common.h | 6 +- + arch/arm/mach-omap2/cpuidle34xx.c | 16 +- + arch/arm/mach-omap2/cpuidle44xx.c | 29 +- + arch/arm/mach-omap2/omap-mpuss-lowpower.c | 12 +- + arch/arm/mach-omap2/pm.h | 2 +- + arch/arm/mach-omap2/pm34xx.c | 14 +- + arch/arm/mach-omap2/pm44xx.c | 2 +- + arch/arm/mach-omap2/powerdomain.c | 10 +- + arch/arm/mach-s3c/cpuidle-s3c64xx.c | 5 +- + arch/arm64/kernel/cpuidle.c | 2 +- + arch/arm64/kernel/idle.c | 1 - + arch/arm64/kernel/smp.c | 4 +- + arch/arm64/kernel/vmlinux.lds.S | 1 - + arch/csky/kernel/process.c | 1 - + arch/csky/kernel/smp.c | 2 +- + arch/csky/kernel/vmlinux.lds.S | 1 - + arch/hexagon/kernel/process.c | 1 - + arch/hexagon/kernel/vmlinux.lds.S | 1 - + arch/ia64/kernel/process.c | 1 + + arch/ia64/kernel/time.c | 1 + + arch/ia64/kernel/vmlinux.lds.S | 1 - + arch/loongarch/kernel/idle.c | 1 + + arch/loongarch/kernel/vmlinux.lds.S | 1 - + arch/m68k/kernel/vmlinux-nommu.lds | 1 - + arch/m68k/kernel/vmlinux-std.lds | 1 - + arch/m68k/kernel/vmlinux-sun3.lds | 1 - + arch/microblaze/kernel/process.c | 1 - + arch/microblaze/kernel/vmlinux.lds.S | 1 - + arch/mips/kernel/idle.c | 14 +- + arch/mips/kernel/vmlinux.lds.S | 1 - + arch/nios2/kernel/process.c | 1 - + arch/nios2/kernel/vmlinux.lds.S | 1 - + arch/openrisc/kernel/process.c | 1 + + arch/openrisc/kernel/vmlinux.lds.S | 1 - + arch/parisc/kernel/process.c | 2 - + arch/parisc/kernel/vmlinux.lds.S | 1 - + arch/powerpc/kernel/idle.c | 5 +- + arch/powerpc/kernel/vmlinux.lds.S | 1 - + arch/riscv/kernel/process.c | 1 - + arch/riscv/kernel/vmlinux-xip.lds.S | 1 - + arch/riscv/kernel/vmlinux.lds.S | 1 - + arch/s390/kernel/idle.c | 3 +- + arch/s390/kernel/vmlinux.lds.S | 1 - + arch/s390/kernel/vtime.c | 2 +- + arch/sh/kernel/idle.c | 1 + + arch/sh/kernel/vmlinux.lds.S | 1 - + arch/sparc/kernel/leon_pmc.c | 4 + + arch/sparc/kernel/process_32.c | 1 - + arch/sparc/kernel/process_64.c | 3 +- + arch/sparc/kernel/vmlinux.lds.S | 1 - + arch/um/kernel/dyn.lds.S | 1 - + arch/um/kernel/process.c | 1 - + arch/um/kernel/uml.lds.S | 1 - + arch/x86/boot/compressed/head_32.S | 2 +- + arch/x86/boot/compressed/head_64.S | 2 +- + arch/x86/boot/compressed/misc.c | 18 +- + arch/x86/boot/compressed/vmlinux.lds.S | 1 + + arch/x86/coco/tdx/tdcall.S | 15 +- + arch/x86/coco/tdx/tdx.c | 25 +- + arch/x86/entry/entry_64.S | 2 +- + arch/x86/events/amd/brs.c | 13 +- + arch/x86/events/intel/core.c | 193 +++- + arch/x86/events/intel/ds.c | 74 +- + arch/x86/events/intel/lbr.c | 4 +- + arch/x86/events/perf_event.h | 23 +- + arch/x86/include/asm/alternative.h | 132 ++- + arch/x86/include/asm/asm-prototypes.h | 1 + + arch/x86/include/asm/cpufeatures.h | 2 + + arch/x86/include/asm/fpu/xcr.h | 4 +- + arch/x86/include/asm/gsseg.h | 66 ++ + arch/x86/include/asm/irqflags.h | 11 +- + arch/x86/include/asm/mce.h | 3 + + arch/x86/include/asm/mmu_context.h | 1 + + arch/x86/include/asm/msr-index.h | 7 + + arch/x86/include/asm/mwait.h | 14 +- + arch/x86/include/asm/nospec-branch.h | 2 +- + arch/x86/include/asm/paravirt.h | 6 +- + arch/x86/include/asm/perf_event.h | 10 +- + arch/x86/include/asm/shared/io.h | 4 +- + arch/x86/include/asm/shared/tdx.h | 1 - + arch/x86/include/asm/special_insns.h | 29 +- + arch/x86/include/asm/xen/hypercall.h | 2 +- + arch/x86/kernel/Makefile | 1 - + arch/x86/kernel/acpi/boot.c | 19 +- + arch/x86/kernel/alternative.c | 14 +- + arch/x86/kernel/cpu/bugs.c | 13 +- + arch/x86/kernel/cpu/common.c | 3 +- + arch/x86/kernel/cpu/cpu.h | 2 - + arch/x86/kernel/cpu/mce/amd.c | 12 +- + arch/x86/kernel/cpu/mce/core.c | 32 +- + arch/x86/kernel/cpu/mce/dev-mcelog.c | 3 +- + arch/x86/kernel/cpu/mce/internal.h | 44 + + arch/x86/kernel/cpu/microcode/amd.c | 21 +- + arch/x86/kernel/cpu/tsx.c | 1 + + arch/x86/kernel/e820.c | 6 +- + arch/x86/kernel/fpu/core.c | 4 +- + arch/x86/kernel/kprobes/core.c | 34 +- + arch/x86/kernel/paravirt.c | 15 +- + arch/x86/kernel/process.c | 65 +- + arch/x86/kernel/rtc.c | 9 +- + arch/x86/kernel/setup.c | 10 +- + arch/x86/kernel/signal.c | 2 +- + arch/x86/kernel/signal_32.c | 128 +++ + arch/x86/kernel/signal_64.c | 127 +++ + arch/x86/kernel/signal_compat.c | 191 ---- + arch/x86/kernel/tls.c | 1 + + arch/x86/kernel/vmlinux.lds.S | 1 - + arch/x86/lib/cmdline.c | 4 +- + arch/x86/lib/memcpy_64.S | 5 +- + arch/x86/lib/memmove_64.S | 4 +- + arch/x86/lib/memset_64.S | 4 +- + arch/x86/lib/misc.c | 2 + + arch/x86/lib/x86-opcode-map.txt | 1 + + arch/x86/xen/enlighten_pv.c | 3 +- + arch/x86/xen/irq.c | 2 +- + arch/xtensa/kernel/process.c | 1 + + arch/xtensa/kernel/vmlinux.lds.S | 1 - + drivers/acpi/processor_idle.c | 28 +- + drivers/base/power/runtime.c | 24 +- + drivers/clk/clk.c | 8 +- + drivers/cpuidle/cpuidle-arm.c | 4 +- + drivers/cpuidle/cpuidle-big_little.c | 12 +- + drivers/cpuidle/cpuidle-mvebu-v7.c | 13 +- + drivers/cpuidle/cpuidle-psci.c | 26 +- + drivers/cpuidle/cpuidle-qcom-spm.c | 4 +- + drivers/cpuidle/cpuidle-riscv-sbi.c | 19 +- + drivers/cpuidle/cpuidle-tegra.c | 31 +- + drivers/cpuidle/cpuidle.c | 70 +- + drivers/cpuidle/dt_idle_states.c | 2 +- + drivers/cpuidle/poll_state.c | 10 +- + drivers/edac/skx_common.c | 2 +- + drivers/idle/intel_idle.c | 19 +- + drivers/irqchip/irq-apple-aic.c | 4 +- + drivers/irqchip/irq-armada-370-xp.c | 3 +- + drivers/irqchip/irq-bcm2836.c | 5 +- + drivers/irqchip/irq-gic-v3.c | 4 +- + drivers/irqchip/irq-gic-v4.c | 9 +- + drivers/irqchip/irq-gic.c | 4 +- + drivers/perf/arm_pmu.c | 11 +- + drivers/perf/riscv_pmu_sbi.c | 8 +- + fs/binfmt_elf.c | 5 + + fs/exec.c | 4 + + include/asm-generic/vmlinux.lds.h | 9 +- + include/linux/auxvec.h | 2 +- + include/linux/clockchips.h | 4 +- + include/linux/compiler_types.h | 18 +- + include/linux/cpu.h | 3 - + include/linux/cpuidle.h | 32 + + include/linux/cpumask.h | 4 +- + include/linux/mm.h | 25 + + include/linux/mm_types.h | 43 +- + include/linux/percpu-defs.h | 2 +- + include/linux/perf_event.h | 39 +- + include/linux/sched.h | 9 + + include/linux/sched/cputime.h | 9 - + include/linux/sched/idle.h | 40 +- + include/linux/thread_info.h | 18 +- + include/linux/tracepoint.h | 15 +- + include/trace/events/rseq.h | 7 +- + include/uapi/linux/auxvec.h | 2 + + include/uapi/linux/membarrier.h | 4 + + include/uapi/linux/rseq.h | 22 + + init/Kconfig | 4 + + kernel/context_tracking.c | 12 +- + kernel/cpu_pm.c | 9 - + kernel/fork.c | 8 +- + kernel/irq/manage.c | 5 +- + kernel/locking/qspinlock.c | 4 +- + kernel/printk/printk.c | 2 +- + kernel/ptrace.c | 2 +- + kernel/rseq.c | 65 +- + kernel/sched/core.c | 134 ++- + kernel/sched/cpufreq_schedutil.c | 43 +- + kernel/sched/cputime.c | 4 + + kernel/sched/fair.c | 233 +++- + kernel/sched/idle.c | 47 +- + kernel/sched/membarrier.c | 39 +- + kernel/sched/sched.h | 88 +- + kernel/sched/topology.c | 4 +- + kernel/signal.c | 2 + + kernel/time/hrtimer.c | 2 + + kernel/time/posix-stubs.c | 2 + + kernel/time/posix-timers.c | 2 + + kernel/time/tick-broadcast-hrtimer.c | 29 +- + kernel/time/tick-broadcast.c | 6 +- + kernel/trace/trace.c | 3 + + kernel/trace/trace_preemptirq.c | 55 +- + lib/ubsan.c | 5 +- + mm/kasan/kasan.h | 4 + + mm/kasan/shadow.c | 38 + + scripts/head-object-list.txt | 6 - + tools/arch/x86/include/asm/cpufeatures.h | 1 + + tools/arch/x86/lib/x86-opcode-map.txt | 1 + + tools/objtool/arch/x86/include/arch/special.h | 6 +- + tools/objtool/check.c | 19 + + .../selftests/membarrier/membarrier_test_impl.h | 33 + + .../membarrier/membarrier_test_multi_thread.c | 2 +- + .../membarrier/membarrier_test_single_thread.c | 6 +- + tools/testing/selftests/rseq/.gitignore | 4 + + tools/testing/selftests/rseq/Makefile | 20 +- + .../testing/selftests/rseq/basic_percpu_ops_test.c | 46 +- + tools/testing/selftests/rseq/basic_test.c | 4 + + tools/testing/selftests/rseq/compiler.h | 6 + + tools/testing/selftests/rseq/param_test.c | 157 ++- + tools/testing/selftests/rseq/rseq-abi.h | 22 + + tools/testing/selftests/rseq/rseq-arm-bits.h | 505 +++++++++ + tools/testing/selftests/rseq/rseq-arm.h | 701 +----------- + tools/testing/selftests/rseq/rseq-arm64-bits.h | 392 +++++++ + tools/testing/selftests/rseq/rseq-arm64.h | 520 +-------- + tools/testing/selftests/rseq/rseq-bits-reset.h | 11 + + tools/testing/selftests/rseq/rseq-bits-template.h | 41 + + tools/testing/selftests/rseq/rseq-mips-bits.h | 462 ++++++++ + tools/testing/selftests/rseq/rseq-mips.h | 646 +---------- + tools/testing/selftests/rseq/rseq-ppc-bits.h | 454 ++++++++ + tools/testing/selftests/rseq/rseq-ppc.h | 617 +--------- + tools/testing/selftests/rseq/rseq-riscv-bits.h | 410 +++++++ + tools/testing/selftests/rseq/rseq-riscv.h | 529 +-------- + tools/testing/selftests/rseq/rseq-s390-bits.h | 474 ++++++++ + tools/testing/selftests/rseq/rseq-s390.h | 495 +------- + tools/testing/selftests/rseq/rseq-skip.h | 65 -- + tools/testing/selftests/rseq/rseq-x86-bits.h | 993 ++++++++++++++++ + tools/testing/selftests/rseq/rseq-x86.h | 1193 +------------------- + tools/testing/selftests/rseq/rseq.c | 91 +- + tools/testing/selftests/rseq/rseq.h | 215 +++- + tools/testing/selftests/rseq/run_param_test.sh | 5 + + 245 files changed, 7329 insertions(+), 5740 deletions(-) + create mode 100644 Documentation/scheduler/sched-util-clamp.rst + create mode 100644 arch/x86/include/asm/gsseg.h + delete mode 100644 arch/x86/kernel/signal_compat.c + create mode 100644 tools/testing/selftests/rseq/rseq-arm-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-arm64-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-bits-reset.h + create mode 100644 tools/testing/selftests/rseq/rseq-bits-template.h + create mode 100644 tools/testing/selftests/rseq/rseq-mips-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-ppc-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-riscv-bits.h + create mode 100644 tools/testing/selftests/rseq/rseq-s390-bits.h + delete mode 100644 tools/testing/selftests/rseq/rseq-skip.h + create mode 100644 tools/testing/selftests/rseq/rseq-x86-bits.h +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 (fed431d5c33a Merge ras/edac-drivers into for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../memory-controllers/xlnx,zynqmp-ocmc-1.0.yaml | 45 ++ + MAINTAINERS | 7 + + drivers/edac/Kconfig | 8 + + drivers/edac/Makefile | 1 + + drivers/edac/zynqmp_edac.c | 467 +++++++++++++++++++++ + 5 files changed, 528 insertions(+) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/xlnx,zynqmp-ocmc-1.0.yaml + create mode 100644 drivers/edac/zynqmp_edac.c +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 +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (5d8a515b71f0 rcutorture: Add SRCU deadlock scenarios) + 7d470a3572f9 ("fs/dlm: Remove "select SRCU"") + 836dc5db1d87 ("context_tracking: Use arch_atomic_*() in __ct_user_enter and __ct_user_exit") +$ 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging drivers/cpufreq/Kconfig +Auto-merging drivers/net/Kconfig +Auto-merging fs/locks.c +Auto-merging init/Kconfig +Auto-merging kernel/sched/core.c +Auto-merging security/tomoyo/Kconfig +CONFLICT (content): Merge conflict in security/tomoyo/Kconfig +Recorded preimage for 'security/tomoyo/Kconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'security/tomoyo/Kconfig'. +[master d2c32abb9b25] Merge branch 'rcu/next' of git://git.kernel.org/pub/scm/linux/kernel/git/paulmck/linux-rcu.git +$ git diff -M --stat --summary HEAD^.. + Documentation/RCU/NMI-RCU.rst | 4 +- + Documentation/RCU/UP.rst | 13 +- + Documentation/RCU/checklist.rst | 2 +- + Documentation/RCU/lockdep.rst | 13 +- + Documentation/RCU/rcu.rst | 6 +- + Documentation/RCU/rcu_dereference.rst | 21 +- + Documentation/RCU/rcubarrier.rst | 357 ++++++----- + Documentation/RCU/rculist_nulls.rst | 109 ++-- + Documentation/RCU/stallwarn.rst | 135 ++++- + Documentation/RCU/torture.rst | 89 ++- + Documentation/RCU/whatisRCU.rst | 193 +++--- + Documentation/admin-guide/kernel-parameters.txt | 27 +- + Documentation/atomic_t.txt | 2 +- + .../litmus-tests/locking/DCL-broken.litmus | 55 ++ + .../litmus-tests/locking/DCL-fixed.litmus | 56 ++ + .../litmus-tests/locking/RM-broken.litmus | 42 ++ + Documentation/litmus-tests/locking/RM-fixed.litmus | 42 ++ + Documentation/memory-barriers.txt | 22 +- + arch/arm64/kvm/Kconfig | 1 - + arch/mips/kvm/Kconfig | 1 - + arch/powerpc/kvm/Kconfig | 1 - + arch/riscv/kvm/Kconfig | 1 - + arch/s390/kvm/Kconfig | 1 - + arch/x86/Kconfig | 2 - + arch/x86/include/asm/time.h | 1 + + arch/x86/kernel/hpet.c | 2 + + arch/x86/kernel/nmi.c | 108 +++- + arch/x86/kernel/tsc.c | 39 +- + arch/x86/kvm/Kconfig | 1 - + drivers/base/core.c | 42 -- + drivers/clocksource/acpi_pm.c | 6 +- + drivers/cpufreq/Kconfig | 1 - + drivers/dax/Kconfig | 1 - + drivers/hwtracing/stm/Kconfig | 1 - + drivers/md/Kconfig | 1 - + drivers/net/Kconfig | 1 - + drivers/pci/controller/Kconfig | 2 +- + fs/btrfs/Kconfig | 1 - + fs/locks.c | 25 - + fs/notify/Kconfig | 1 - + fs/quota/Kconfig | 1 - + include/linux/kernel_stat.h | 14 +- + include/linux/lockdep.h | 8 +- + include/linux/nmi.h | 8 + + include/linux/rculist_nulls.h | 2 +- + include/linux/rcupdate.h | 16 +- + include/linux/rcutiny.h | 12 +- + include/linux/rcutree.h | 2 +- + include/linux/srcu.h | 68 ++- + include/linux/srcutree.h | 35 +- + include/trace/events/rcu.h | 4 +- + include/trace/events/timer.h | 3 +- + init/Kconfig | 1 - + kernel/entry/common.c | 3 +- + kernel/locking/lockdep.c | 64 +- + kernel/locking/locktorture.c | 101 ++-- + kernel/notifier.c | 3 - + kernel/pid_namespace.c | 17 + + kernel/power/Kconfig | 1 - + kernel/rcu/Kconfig | 3 - + kernel/rcu/Kconfig.debug | 15 +- + kernel/rcu/rcu.h | 8 + + kernel/rcu/rcu_segcblist.c | 2 +- + kernel/rcu/rcu_segcblist.h | 2 + + kernel/rcu/rcutorture.c | 172 +++++- + kernel/rcu/refscale.c | 250 +++++++- + kernel/rcu/srcutiny.c | 2 + + kernel/rcu/srcutree.c | 100 +++- + kernel/rcu/tasks.h | 116 +++- + kernel/rcu/tiny.c | 9 +- + kernel/rcu/tree.c | 664 ++++++++++++--------- + kernel/rcu/tree.h | 19 + + kernel/rcu/tree_exp.h | 59 +- + kernel/rcu/tree_stall.h | 37 +- + kernel/rcu/update.c | 49 +- + kernel/sched/core.c | 5 + + kernel/smp.c | 2 +- + kernel/time/Kconfig | 18 +- + kernel/time/clocksource.c | 83 ++- + kernel/time/tick-sched.c | 5 + + kernel/torture.c | 4 +- + lib/Kconfig.debug | 20 + + lib/nmi_backtrace.c | 2 + + mm/Kconfig | 1 - + tools/include/nolibc/arch-aarch64.h | 52 +- + tools/include/nolibc/arch-arm.h | 138 +++-- + tools/include/nolibc/arch-i386.h | 60 +- + tools/include/nolibc/arch-mips.h | 79 +-- + tools/include/nolibc/arch-riscv.h | 62 +- + tools/include/nolibc/arch-s390.h | 226 +++++++ + tools/include/nolibc/arch-x86_64.h | 52 +- + tools/include/nolibc/arch.h | 2 + + tools/include/nolibc/errno.h | 4 +- + tools/include/nolibc/stdlib.h | 27 + + tools/include/nolibc/sys.h | 24 + + tools/memory-model/Documentation/explanation.txt | 39 +- + tools/memory-model/Documentation/locking.txt | 320 ++++++++++ + tools/memory-model/linux-kernel.bell | 24 +- + tools/memory-model/linux-kernel.cat | 5 +- + tools/memory-model/litmus-tests/.gitignore | 2 +- + tools/memory-model/litmus-tests/dep+plain.litmus | 31 + + tools/memory-model/scripts/README | 16 +- + tools/memory-model/scripts/checkalllitmus.sh | 29 +- + tools/memory-model/scripts/checkghlitmus.sh | 15 +- + tools/memory-model/scripts/checklitmus.sh | 25 +- + tools/memory-model/scripts/checklitmushist.sh | 2 +- + tools/memory-model/scripts/checktheselitmus.sh | 43 ++ + tools/memory-model/scripts/cmplitmushist.sh | 49 +- + tools/memory-model/scripts/hwfnseg.sh | 20 + + tools/memory-model/scripts/initlitmushist.sh | 2 +- + tools/memory-model/scripts/judgelitmus.sh | 120 +++- + tools/memory-model/scripts/newlitmushist.sh | 4 +- + tools/memory-model/scripts/parseargs.sh | 21 +- + tools/memory-model/scripts/runlitmus.sh | 80 +++ + tools/memory-model/scripts/runlitmushist.sh | 29 +- + tools/memory-model/scripts/simpletest.sh | 35 ++ + tools/rcu/extract-stall.sh | 26 +- + tools/testing/selftests/nolibc/Makefile | 7 +- + tools/testing/selftests/nolibc/nolibc-test.c | 30 + + .../selftests/rcutorture/bin/configcheck.sh | 5 +- + .../selftests/rcutorture/bin/console-badness.sh | 2 +- + .../testing/selftests/rcutorture/bin/functions.sh | 6 + + .../testing/selftests/rcutorture/bin/kvm-again.sh | 2 +- + .../testing/selftests/rcutorture/bin/kvm-build.sh | 4 +- + .../selftests/rcutorture/bin/kvm-find-errors.sh | 10 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 6 +- + tools/testing/selftests/rcutorture/bin/mkinitrd.sh | 2 +- + .../selftests/rcutorture/bin/parse-build.sh | 2 +- + .../selftests/rcutorture/bin/parse-console.sh | 10 +- + .../selftests/rcutorture/configs/rcu/TREE01 | 1 + + .../selftests/rcutorture/configs/rcu/TREE04 | 1 + + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 4 - + 132 files changed, 3938 insertions(+), 1255 deletions(-) + create mode 100644 Documentation/litmus-tests/locking/DCL-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/DCL-fixed.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-broken.litmus + create mode 100644 Documentation/litmus-tests/locking/RM-fixed.litmus + create mode 100644 tools/include/nolibc/arch-s390.h + create mode 100644 tools/memory-model/Documentation/locking.txt + create mode 100644 tools/memory-model/litmus-tests/dep+plain.litmus + create mode 100755 tools/memory-model/scripts/checktheselitmus.sh + create mode 100755 tools/memory-model/scripts/hwfnseg.sh + create mode 100755 tools/memory-model/scripts/runlitmus.sh + create mode 100755 tools/memory-model/scripts/simpletest.sh + mode change 100644 => 100755 tools/rcu/extract-stall.sh +Merging kvm/next (fc471e831016 Merge branch 'kvm-late-6.1' into HEAD) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging MAINTAINERS +Auto-merging arch/x86/include/asm/kvm_host.h +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/x86.c +Merge made by the 'ort' strategy. + arch/x86/include/asm/hyperv-tlfs.h | 3 + + arch/x86/include/asm/kvm_host.h | 14 +- + arch/x86/kernel/cpu/mshyperv.c | 2 +- + arch/x86/kvm/cpuid.c | 11 +- + arch/x86/kvm/hyperv.c | 19 ++ + arch/x86/kvm/hyperv.h | 27 ++ + arch/x86/kvm/mmu.h | 6 +- + arch/x86/kvm/mmu/mmu.c | 271 +++++++++++------ + arch/x86/kvm/mmu/mmu_internal.h | 8 +- + arch/x86/kvm/mmu/paging_tmpl.h | 12 +- + arch/x86/kvm/mmu/tdp_mmu.c | 13 +- + arch/x86/kvm/mmu/tdp_mmu.h | 25 +- + arch/x86/kvm/reverse_cpuid.h | 7 + + arch/x86/kvm/vmx/hyperv.c | 88 ++++-- + arch/x86/kvm/vmx/hyperv.h | 93 +++++- + arch/x86/kvm/vmx/vmx.c | 5 + + arch/x86/kvm/x86.c | 4 +- + .../testing/selftests/kvm/include/x86_64/hyperv.h | 144 ++++++--- + .../selftests/kvm/include/x86_64/processor.h | 1 + + .../testing/selftests/kvm/kvm_binary_stats_test.c | 11 +- + .../testing/selftests/kvm/x86_64/hyperv_features.c | 330 ++++++++++++--------- + tools/testing/selftests/kvm/x86_64/tsc_msrs_test.c | 16 +- + 22 files changed, 730 insertions(+), 380 deletions(-) +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 (f57034cedeb6 xen/pvcalls: free active map buffer on pvcalls_front_free_map) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (c63a2e52d5e0 workqueue: Fold rebind_worker() within rebind_workers()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 1 + + kernel/workqueue.c | 280 ++++++++++++++++++++++++++++++++++------------ + 2 files changed, 210 insertions(+), 71 deletions(-) +Merging drivers-x86/for-next (1b929c02afd3 Linux 6.2-rc1) +$ 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 (961a325becd9 platform/chrome: cros_ec: Use per-device lockdep key) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 10 +- + drivers/mfd/cros_ec_dev.c | 5 - + drivers/platform/chrome/Kconfig | 12 +- + drivers/platform/chrome/Makefile | 4 +- + drivers/platform/chrome/cros_ec.c | 15 +- + drivers/platform/chrome/cros_ec_debugfs.c | 25 ++ + drivers/platform/chrome/cros_ec_lightbar.c | 14 +- + drivers/platform/chrome/cros_ec_lpc.c | 12 +- + drivers/platform/chrome/cros_ec_proto_test.c | 3 +- + drivers/platform/chrome/cros_ec_sysfs.c | 40 ++- + drivers/platform/chrome/cros_ec_typec.c | 91 ++----- + drivers/platform/chrome/cros_ec_typec.h | 85 ++++++ + drivers/platform/chrome/cros_ec_uart.c | 361 +++++++++++++++++++++++++ + drivers/platform/chrome/cros_typec_switch.c | 16 +- + drivers/platform/chrome/cros_typec_vdm.c | 106 ++++++++ + drivers/platform/chrome/cros_typec_vdm.h | 12 + + drivers/platform/chrome/wilco_ec/sysfs.c | 3 +- + include/linux/platform_data/cros_ec_commands.h | 59 +++- + include/linux/platform_data/cros_ec_proto.h | 24 +- + 19 files changed, 763 insertions(+), 134 deletions(-) + create mode 100644 drivers/platform/chrome/cros_ec_typec.h + create mode 100644 drivers/platform/chrome/cros_ec_uart.c + create mode 100644 drivers/platform/chrome/cros_typec_vdm.c + create mode 100644 drivers/platform/chrome/cros_typec_vdm.h +Merging hsi/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git hsi/for-next +Already up to date. +Merging leds/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git leds/for-next +Already up to date. +Merging leds-lj/for-leds-next (6e04532c0848 leds: is31fl319x: Wrap mutex_destroy() for devm_add_action_or_rest()) +$ git merge -m Merge branch 'for-leds-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git leds-lj/for-leds-next +Merge made by the 'ort' strategy. + drivers/leds/led-class.c | 1 + + drivers/leds/leds-bd2802.c | 5 ++--- + drivers/leds/leds-blinkm.c | 5 ++--- + drivers/leds/leds-is31fl319x.c | 7 ++++++- + drivers/leds/leds-is31fl32xx.c | 5 ++--- + drivers/leds/leds-lm3530.c | 5 ++--- + drivers/leds/leds-lm3532.c | 5 ++--- + drivers/leds/leds-lm355x.c | 6 +++--- + drivers/leds/leds-lm3642.c | 5 ++--- + drivers/leds/leds-lm3692x.c | 6 +++--- + drivers/leds/leds-lm3697.c | 5 ++--- + drivers/leds/leds-lp3944.c | 5 ++--- + drivers/leds/leds-lp3952.c | 5 ++--- + drivers/leds/leds-lp5521.c | 6 +++--- + drivers/leds/leds-lp5523.c | 6 +++--- + drivers/leds/leds-lp5562.c | 5 ++--- + drivers/leds/leds-lp8501.c | 6 +++--- + drivers/leds/leds-lp8860.c | 5 ++--- + drivers/leds/leds-pca9532.c | 9 ++++----- + drivers/leds/leds-pca963x.c | 6 +++--- + drivers/leds/leds-pwm.c | 4 ++-- + drivers/leds/leds-tca6507.c | 5 ++--- + drivers/leds/leds-tlc591xx.c | 5 ++--- + drivers/leds/leds-turris-omnia.c | 5 ++--- + 24 files changed, 59 insertions(+), 68 deletions(-) +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 (7bbb89b420d9 driver core: change to_subsys_private() to use container_of_const()) +$ git merge -m Merge branch 'driver-core-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git driver-core/driver-core-next +Auto-merging drivers/base/core.c +Merge made by the 'ort' strategy. + drivers/base/base.h | 2 +- + drivers/base/bus.c | 60 ++++++++----------------------------------- + drivers/base/class.c | 2 +- + drivers/base/core.c | 1 + + drivers/base/dd.c | 6 ++--- + include/linux/device/bus.h | 14 ---------- + include/linux/device/driver.h | 1 - + lib/kobject.c | 12 +++++++-- + 8 files changed, 25 insertions(+), 73 deletions(-) +Merging usb/usb-next (c2fb9a214da1 Merge 6.2-rc3 into usb-next) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-driver-typec-displayport | 15 ++ + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 15 +- + drivers/usb/chipidea/usbmisc_imx.c | 6 - + drivers/usb/gadget/function/f_fs.c | 8 +- + drivers/usb/gadget/legacy/hid.c | 7 +- + drivers/usb/gadget/udc/bcm63xx_udc.c | 11 +- + drivers/usb/gadget/udc/fusb300_udc.c | 10 +- + drivers/usb/host/xhci-ring.c | 7 +- + drivers/usb/musb/da8xx.c | 4 +- + drivers/usb/typec/altmodes/displayport.c | 10 ++ + drivers/usb/typec/ucsi/ucsi.c | 163 +++++++++++++++++++-- + drivers/usb/typec/ucsi/ucsi.h | 8 + + include/linux/list.h | 15 ++ + 13 files changed, 221 insertions(+), 58 deletions(-) +Merging thunderbolt/next (953ff25fc9fb thunderbolt: Refactor tb_acpi_add_link()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Merge made by the 'ort' strategy. + drivers/thunderbolt/acpi.c | 13 +++++-------- + drivers/thunderbolt/tb.h | 2 +- + 2 files changed, 6 insertions(+), 9 deletions(-) +Merging usb-serial/usb-next (b7bfaa761d76 Linux 6.2-rc3) +$ 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 (b7bfaa761d76 Linux 6.2-rc3) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (b7bfaa761d76 Linux 6.2-rc3) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging accel/habanalabs-next (be5fff22e787 habanalabe/gaudi2: add cfg base when displaying razwi addresses) +$ 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 MAINTAINERS +Auto-merging drivers/Makefile +Merge made by the 'ort' strategy. + MAINTAINERS | 6 +- + drivers/Makefile | 1 + + drivers/accel/Kconfig | 2 + + drivers/accel/Makefile | 3 + + drivers/{misc => accel}/habanalabs/Kconfig | 8 +- + drivers/{misc => accel}/habanalabs/Makefile | 2 +- + drivers/{misc => accel}/habanalabs/common/Makefile | 0 + drivers/{misc => accel}/habanalabs/common/asid.c | 0 + .../habanalabs/common/command_buffer.c | 22 +- + .../habanalabs/common/command_submission.c | 121 +- + .../{misc => accel}/habanalabs/common/context.c | 0 + .../{misc => accel}/habanalabs/common/debugfs.c | 0 + .../{misc => accel}/habanalabs/common/decoder.c | 0 + drivers/{misc => accel}/habanalabs/common/device.c | 95 +- + .../habanalabs/common/firmware_if.c | 170 ++- + .../{misc => accel}/habanalabs/common/habanalabs.h | 87 +- + .../habanalabs/common/habanalabs_drv.c | 6 +- + .../habanalabs/common/habanalabs_ioctl.c | 101 +- + .../{misc => accel}/habanalabs/common/hw_queue.c | 0 + drivers/{misc => accel}/habanalabs/common/hwmon.c | 0 + drivers/{misc => accel}/habanalabs/common/irq.c | 6 +- + drivers/{misc => accel}/habanalabs/common/memory.c | 369 +++--- + .../{misc => accel}/habanalabs/common/memory_mgr.c | 3 +- + .../{misc => accel}/habanalabs/common/mmu/Makefile | 0 + .../{misc => accel}/habanalabs/common/mmu/mmu.c | 2 +- + .../{misc => accel}/habanalabs/common/mmu/mmu_v1.c | 1 - + .../habanalabs/common/mmu/mmu_v2_hr.c | 0 + .../{misc => accel}/habanalabs/common/pci/Makefile | 0 + .../{misc => accel}/habanalabs/common/pci/pci.c | 10 +- + .../{misc => accel}/habanalabs/common/security.c | 0 + .../{misc => accel}/habanalabs/common/state_dump.c | 2 +- + drivers/{misc => accel}/habanalabs/common/sysfs.c | 0 + drivers/{misc => accel}/habanalabs/gaudi/Makefile | 0 + drivers/{misc => accel}/habanalabs/gaudi/gaudi.c | 27 +- + drivers/{misc => accel}/habanalabs/gaudi/gaudiP.h | 2 +- + .../habanalabs/gaudi/gaudi_coresight.c | 3 +- + .../habanalabs/gaudi/gaudi_security.c | 0 + drivers/{misc => accel}/habanalabs/gaudi2/Makefile | 0 + drivers/{misc => accel}/habanalabs/gaudi2/gaudi2.c | 953 +++++++++------- + .../{misc => accel}/habanalabs/gaudi2/gaudi2P.h | 2 +- + .../habanalabs/gaudi2/gaudi2_coresight.c | 10 +- + .../habanalabs/gaudi2/gaudi2_coresight_regs.h | 0 + .../habanalabs/gaudi2/gaudi2_masks.h | 0 + .../habanalabs/gaudi2/gaudi2_security.c | 36 +- + drivers/{misc => accel}/habanalabs/goya/Makefile | 0 + drivers/{misc => accel}/habanalabs/goya/goya.c | 12 + + drivers/{misc => accel}/habanalabs/goya/goyaP.h | 2 +- + .../habanalabs/goya/goya_coresight.c | 2 +- + .../{misc => accel}/habanalabs/goya/goya_hwmgr.c | 0 + .../habanalabs/goya/goya_security.c | 0 + .../habanalabs/include/common/cpucp_if.h | 96 +- + .../habanalabs/include/common/hl_boot_if.h | 151 ++- + .../habanalabs/include/common/qman_if.h | 0 + .../include/gaudi/asic_reg/cpu_if_regs.h | 0 + .../include/gaudi/asic_reg/dma0_core_masks.h | 0 + .../include/gaudi/asic_reg/dma0_core_regs.h | 0 + .../include/gaudi/asic_reg/dma0_qm_masks.h | 0 + .../include/gaudi/asic_reg/dma0_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma1_core_regs.h | 0 + .../include/gaudi/asic_reg/dma1_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma2_core_regs.h | 0 + .../include/gaudi/asic_reg/dma2_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma3_core_regs.h | 0 + .../include/gaudi/asic_reg/dma3_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma4_core_regs.h | 0 + .../include/gaudi/asic_reg/dma4_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma5_core_regs.h | 0 + .../include/gaudi/asic_reg/dma5_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma6_core_regs.h | 0 + .../include/gaudi/asic_reg/dma6_qm_regs.h | 0 + .../include/gaudi/asic_reg/dma7_core_regs.h | 0 + .../include/gaudi/asic_reg/dma7_qm_regs.h | 0 + .../gaudi/asic_reg/dma_if_e_n_down_ch0_regs.h | 0 + .../gaudi/asic_reg/dma_if_e_n_down_ch1_regs.h | 0 + .../include/gaudi/asic_reg/dma_if_e_n_regs.h | 0 + .../gaudi/asic_reg/dma_if_e_s_down_ch0_regs.h | 0 + .../gaudi/asic_reg/dma_if_e_s_down_ch1_regs.h | 0 + .../include/gaudi/asic_reg/dma_if_e_s_regs.h | 0 + .../gaudi/asic_reg/dma_if_w_n_down_ch0_regs.h | 0 + .../gaudi/asic_reg/dma_if_w_n_down_ch1_regs.h | 0 + .../include/gaudi/asic_reg/dma_if_w_n_regs.h | 0 + .../gaudi/asic_reg/dma_if_w_s_down_ch0_regs.h | 0 + .../gaudi/asic_reg/dma_if_w_s_down_ch1_regs.h | 0 + .../include/gaudi/asic_reg/dma_if_w_s_regs.h | 0 + .../include/gaudi/asic_reg/gaudi_blocks.h | 0 + .../habanalabs/include/gaudi/asic_reg/gaudi_regs.h | 2 + + .../include/gaudi/asic_reg/mme0_ctrl_regs.h | 0 + .../include/gaudi/asic_reg/mme0_qm_masks.h | 0 + .../include/gaudi/asic_reg/mme0_qm_regs.h | 0 + .../include/gaudi/asic_reg/mme1_ctrl_regs.h | 0 + .../include/gaudi/asic_reg/mme2_ctrl_regs.h | 0 + .../include/gaudi/asic_reg/mme2_qm_regs.h | 0 + .../include/gaudi/asic_reg/mme3_ctrl_regs.h | 0 + .../include/gaudi/asic_reg/mmu_up_regs.h | 0 + .../include/gaudi/asic_reg/nic0_qm0_masks.h | 0 + .../include/gaudi/asic_reg/nic0_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic0_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nic1_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic1_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nic2_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic2_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nic3_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic3_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nic4_qm0_regs.h | 0 + .../include/gaudi/asic_reg/nic4_qm1_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_0_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_1_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_2_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_3_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_4_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_5_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_6_regs.h | 0 + .../include/gaudi/asic_reg/nif_rtr_ctrl_7_regs.h | 0 + .../include/gaudi/asic_reg/psoc_cpu_pll_regs.h | 0 + .../include/gaudi/asic_reg/psoc_etr_regs.h | 0 + .../gaudi/asic_reg/psoc_global_conf_masks.h | 0 + .../include/gaudi/asic_reg/psoc_global_conf_regs.h | 0 + .../include/gaudi/asic_reg/psoc_timestamp_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_0_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_1_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_2_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_3_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_4_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_5_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_6_regs.h | 0 + .../include/gaudi/asic_reg/sif_rtr_ctrl_7_regs.h | 0 + .../habanalabs/include/gaudi/asic_reg/stlb_regs.h | 0 + .../include/gaudi/asic_reg/tpc0_cfg_masks.h | 0 + .../include/gaudi/asic_reg/tpc0_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc0_qm_masks.h | 0 + .../include/gaudi/asic_reg/tpc0_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc1_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc1_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc2_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc2_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc3_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc3_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc4_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc4_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc5_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc5_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc6_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc6_qm_regs.h | 0 + .../include/gaudi/asic_reg/tpc7_cfg_regs.h | 0 + .../include/gaudi/asic_reg/tpc7_qm_regs.h | 0 + .../habanalabs/include/gaudi/gaudi.h | 0 + .../habanalabs/include/gaudi/gaudi_async_events.h | 0 + .../include/gaudi/gaudi_async_ids_map_extended.h | 0 + .../habanalabs/include/gaudi/gaudi_coresight.h | 0 + .../habanalabs/include/gaudi/gaudi_fw_if.h | 0 + .../habanalabs/include/gaudi/gaudi_masks.h | 0 + .../habanalabs/include/gaudi/gaudi_packets.h | 0 + .../habanalabs/include/gaudi/gaudi_reg_map.h | 0 + .../include/gaudi2/arc/gaudi2_arc_common_packets.h | 211 ++++ + .../gaudi2/asic_reg/arc_farm_arc0_acp_eng_regs.h | 0 + .../gaudi2/asic_reg/arc_farm_arc0_aux_masks.h | 0 + .../gaudi2/asic_reg/arc_farm_arc0_aux_regs.h | 0 + .../asic_reg/arc_farm_arc0_dup_eng_axuser_regs.h | 0 + .../gaudi2/asic_reg/arc_farm_arc0_dup_eng_regs.h | 0 + .../asic_reg/arc_farm_kdma_ctx_axuser_masks.h | 0 + .../asic_reg/arc_farm_kdma_ctx_axuser_regs.h | 0 + .../gaudi2/asic_reg/arc_farm_kdma_ctx_masks.h | 0 + .../gaudi2/asic_reg/arc_farm_kdma_ctx_regs.h | 0 + .../gaudi2/asic_reg/arc_farm_kdma_kdma_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/arc_farm_kdma_masks.h | 0 + .../include/gaudi2/asic_reg/arc_farm_kdma_regs.h | 0 + .../include/gaudi2/asic_reg/cpu_if_regs.h | 0 + .../gaudi2/asic_reg/dcore0_dec0_cmd_masks.h | 0 + .../include/gaudi2/asic_reg/dcore0_dec0_cmd_regs.h | 0 + .../asic_reg/dcore0_edma0_core_ctx_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_core_ctx_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_core_masks.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_core_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_qm_arc_aux_regs.h | 0 + .../dcore0_edma0_qm_axuser_nonsecured_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_qm_cgm_regs.h | 0 + .../gaudi2/asic_reg/dcore0_edma0_qm_masks.h | 0 + .../include/gaudi2/asic_reg/dcore0_edma0_qm_regs.h | 0 + .../asic_reg/dcore0_edma1_core_ctx_axuser_regs.h | 0 + .../dcore0_edma1_qm_axuser_nonsecured_regs.h | 0 + .../gaudi2/asic_reg/dcore0_hmmu0_mmu_masks.h | 15 +- + .../gaudi2/asic_reg/dcore0_hmmu0_mmu_regs.h | 0 + .../gaudi2/asic_reg/dcore0_hmmu0_stlb_masks.h | 41 +- + .../gaudi2/asic_reg/dcore0_hmmu0_stlb_regs.h | 0 + .../include/gaudi2/asic_reg/dcore0_mme_acc_regs.h | 0 + ...dcore0_mme_ctrl_lo_arch_agu_cout0_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_cout0_slave_regs.h | 0 + ...dcore0_mme_ctrl_lo_arch_agu_cout1_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_cout1_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in0_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in0_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in1_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in1_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in2_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in2_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in3_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in3_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in4_master_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_agu_in4_slave_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_base_addr_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_non_tensor_end_regs.h | 6 +- + ...dcore0_mme_ctrl_lo_arch_non_tensor_start_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_tensor_a_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_tensor_b_regs.h | 0 + .../dcore0_mme_ctrl_lo_arch_tensor_cout_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_ctrl_lo_masks.h | 9 +- + .../asic_reg/dcore0_mme_ctrl_lo_mme_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_ctrl_lo_regs.h | 0 + .../asic_reg/dcore0_mme_qm_arc_acp_eng_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_qm_arc_aux_regs.h | 0 + .../dcore0_mme_qm_arc_dup_eng_axuser_regs.h | 0 + .../asic_reg/dcore0_mme_qm_arc_dup_eng_regs.h | 0 + .../dcore0_mme_qm_axuser_nonsecured_regs.h | 0 + .../asic_reg/dcore0_mme_qm_axuser_secured_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_qm_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/dcore0_mme_qm_regs.h | 0 + .../gaudi2/asic_reg/dcore0_mme_sbte0_masks.h | 0 + .../dcore0_mme_sbte0_mstr_if_axuser_regs.h | 0 + .../asic_reg/dcore0_mme_wb0_mstr_if_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_rtr0_ctrl_regs.h | 0 + .../dcore0_rtr0_mstr_if_rr_prvt_hbw_regs.h | 0 + .../dcore0_rtr0_mstr_if_rr_prvt_lbw_regs.h | 0 + .../dcore0_rtr0_mstr_if_rr_shrd_hbw_regs.h | 0 + .../dcore0_rtr0_mstr_if_rr_shrd_lbw_regs.h | 0 + .../gaudi2/asic_reg/dcore0_sync_mngr_glbl_masks.h | 0 + .../gaudi2/asic_reg/dcore0_sync_mngr_glbl_regs.h | 0 + .../dcore0_sync_mngr_mstr_if_axuser_masks.h | 0 + .../dcore0_sync_mngr_mstr_if_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_sync_mngr_objs_masks.h | 0 + .../gaudi2/asic_reg/dcore0_sync_mngr_objs_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_axuser_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_kernel_regs.h | 0 + .../dcore0_tpc0_cfg_kernel_tensor_0_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_masks.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_qm_regs.h | 0 + .../asic_reg/dcore0_tpc0_cfg_qm_sync_object_regs.h | 0 + .../asic_reg/dcore0_tpc0_cfg_qm_tensor_0_regs.h | 0 + .../include/gaudi2/asic_reg/dcore0_tpc0_cfg_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_cfg_special_regs.h | 0 + .../asic_reg/dcore0_tpc0_eml_busmon_0_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_eml_etf_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_eml_funnel_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_eml_spmu_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_eml_stm_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_qm_arc_aux_regs.h | 0 + .../dcore0_tpc0_qm_axuser_nonsecured_regs.h | 0 + .../gaudi2/asic_reg/dcore0_tpc0_qm_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/dcore0_tpc0_qm_regs.h | 0 + .../dcore0_vdec0_brdg_ctrl_axuser_dec_regs.h | 0 + ...dcore0_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h | 0 + .../dcore0_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h | 0 + .../dcore0_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h | 0 + .../dcore0_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h | 0 + .../gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_masks.h | 6 +- + .../gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_regs.h | 0 + .../asic_reg/dcore0_vdec0_ctrl_special_regs.h | 0 + .../gaudi2/asic_reg/dcore1_mme_ctrl_lo_regs.h | 0 + .../gaudi2/asic_reg/dcore1_sync_mngr_glbl_regs.h | 1203 ++++++++++++++++++++ + .../gaudi2/asic_reg/dcore3_mme_ctrl_lo_regs.h | 0 + .../gaudi2/asic_reg/gaudi2_blocks_linux_driver.h | 0 + .../include/gaudi2/asic_reg/gaudi2_regs.h | 1 + + .../include/gaudi2/asic_reg/nic0_qm0_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/nic0_qm0_regs.h | 0 + .../gaudi2/asic_reg/nic0_qm_arc_aux0_regs.h | 0 + .../include/gaudi2/asic_reg/nic0_qpc0_regs.h | 0 + .../nic0_umr0_0_completion_queue_ci_1_regs.h | 0 + .../asic_reg/nic0_umr0_0_unsecure_doorbell0_regs.h | 0 + .../include/gaudi2/asic_reg/pcie_aux_regs.h | 0 + .../include/gaudi2/asic_reg/pcie_dbi_regs.h | 3 +- + .../include/gaudi2/asic_reg/pcie_dec0_cmd_masks.h | 0 + .../include/gaudi2/asic_reg/pcie_dec0_cmd_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_dec_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h | 0 + .../pcie_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h | 0 + .../gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_masks.h | 3 +- + .../gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_regs.h | 0 + .../gaudi2/asic_reg/pcie_vdec0_ctrl_special_regs.h | 0 + .../include/gaudi2/asic_reg/pcie_wrap_regs.h | 0 + .../gaudi2/asic_reg/pcie_wrap_special_regs.h | 0 + .../gaudi2/asic_reg/pdma0_core_ctx_axuser_regs.h | 0 + .../include/gaudi2/asic_reg/pdma0_core_ctx_regs.h | 0 + .../include/gaudi2/asic_reg/pdma0_core_masks.h | 0 + .../include/gaudi2/asic_reg/pdma0_core_regs.h | 0 + .../gaudi2/asic_reg/pdma0_core_special_masks.h | 0 + .../gaudi2/asic_reg/pdma0_qm_arc_aux_regs.h | 0 + .../asic_reg/pdma0_qm_axuser_nonsecured_regs.h | 0 + .../gaudi2/asic_reg/pdma0_qm_axuser_secured_regs.h | 0 + .../include/gaudi2/asic_reg/pdma0_qm_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/pdma0_qm_masks.h | 0 + .../include/gaudi2/asic_reg/pdma0_qm_regs.h | 0 + .../gaudi2/asic_reg/pdma1_core_ctx_axuser_regs.h | 0 + .../asic_reg/pdma1_qm_axuser_nonsecured_regs.h | 0 + .../include/gaudi2/asic_reg/pmmu_hbw_stlb_masks.h | 3 +- + .../include/gaudi2/asic_reg/pmmu_hbw_stlb_regs.h | 0 + .../include/gaudi2/asic_reg/pmmu_pif_regs.h | 0 + .../include/gaudi2/asic_reg/psoc_etr_masks.h | 0 + .../include/gaudi2/asic_reg/psoc_etr_regs.h | 0 + .../gaudi2/asic_reg/psoc_global_conf_masks.h | 27 +- + .../gaudi2/asic_reg/psoc_global_conf_regs.h | 0 + .../gaudi2/asic_reg/psoc_reset_conf_masks.h | 0 + .../include/gaudi2/asic_reg/psoc_reset_conf_regs.h | 0 + .../include/gaudi2/asic_reg/psoc_timestamp_regs.h | 0 + .../include/gaudi2/asic_reg/rot0_desc_regs.h | 0 + .../include/gaudi2/asic_reg/rot0_masks.h | 0 + .../include/gaudi2/asic_reg/rot0_qm_arc_aux_regs.h | 0 + .../asic_reg/rot0_qm_axuser_nonsecured_regs.h | 0 + .../include/gaudi2/asic_reg/rot0_qm_cgm_regs.h | 0 + .../include/gaudi2/asic_reg/rot0_qm_regs.h | 0 + .../habanalabs/include/gaudi2/asic_reg/rot0_regs.h | 0 + .../include/gaudi2/asic_reg/xbar_edge_0_regs.h | 0 + .../include/gaudi2/asic_reg/xbar_mid_0_regs.h | 0 + .../habanalabs/include/gaudi2/gaudi2.h | 0 + .../include/gaudi2/gaudi2_async_events.h | 1 + + .../include/gaudi2/gaudi2_async_ids_map_extended.h | 2 + + .../habanalabs/include/gaudi2/gaudi2_coresight.h | 0 + .../habanalabs/include/gaudi2/gaudi2_fw_if.h | 23 +- + .../habanalabs/include/gaudi2/gaudi2_packets.h | 4 +- + .../habanalabs/include/gaudi2/gaudi2_reg_map.h | 16 +- + .../include/goya/asic_reg/cpu_ca53_cfg_masks.h | 0 + .../include/goya/asic_reg/cpu_ca53_cfg_regs.h | 0 + .../habanalabs/include/goya/asic_reg/cpu_if_regs.h | 0 + .../include/goya/asic_reg/cpu_pll_regs.h | 0 + .../include/goya/asic_reg/dma_ch_0_masks.h | 0 + .../include/goya/asic_reg/dma_ch_0_regs.h | 0 + .../include/goya/asic_reg/dma_ch_1_regs.h | 0 + .../include/goya/asic_reg/dma_ch_2_regs.h | 0 + .../include/goya/asic_reg/dma_ch_3_regs.h | 0 + .../include/goya/asic_reg/dma_ch_4_regs.h | 0 + .../include/goya/asic_reg/dma_macro_masks.h | 0 + .../include/goya/asic_reg/dma_macro_regs.h | 0 + .../include/goya/asic_reg/dma_nrtr_masks.h | 0 + .../include/goya/asic_reg/dma_nrtr_regs.h | 0 + .../include/goya/asic_reg/dma_qm_0_masks.h | 0 + .../include/goya/asic_reg/dma_qm_0_regs.h | 0 + .../include/goya/asic_reg/dma_qm_1_regs.h | 0 + .../include/goya/asic_reg/dma_qm_2_regs.h | 0 + .../include/goya/asic_reg/dma_qm_3_regs.h | 0 + .../include/goya/asic_reg/dma_qm_4_regs.h | 0 + .../habanalabs/include/goya/asic_reg/goya_blocks.h | 0 + .../habanalabs/include/goya/asic_reg/goya_masks.h | 0 + .../habanalabs/include/goya/asic_reg/goya_regs.h | 0 + .../habanalabs/include/goya/asic_reg/ic_pll_regs.h | 0 + .../habanalabs/include/goya/asic_reg/mc_pll_regs.h | 0 + .../include/goya/asic_reg/mme1_rtr_masks.h | 0 + .../include/goya/asic_reg/mme1_rtr_regs.h | 0 + .../include/goya/asic_reg/mme2_rtr_regs.h | 0 + .../include/goya/asic_reg/mme3_rtr_regs.h | 0 + .../include/goya/asic_reg/mme4_rtr_regs.h | 0 + .../include/goya/asic_reg/mme5_rtr_regs.h | 0 + .../include/goya/asic_reg/mme6_rtr_regs.h | 0 + .../include/goya/asic_reg/mme_cmdq_masks.h | 0 + .../include/goya/asic_reg/mme_cmdq_regs.h | 0 + .../habanalabs/include/goya/asic_reg/mme_masks.h | 0 + .../include/goya/asic_reg/mme_qm_masks.h | 0 + .../habanalabs/include/goya/asic_reg/mme_qm_regs.h | 0 + .../habanalabs/include/goya/asic_reg/mme_regs.h | 0 + .../habanalabs/include/goya/asic_reg/mmu_masks.h | 0 + .../habanalabs/include/goya/asic_reg/mmu_regs.h | 0 + .../include/goya/asic_reg/pci_nrtr_masks.h | 0 + .../include/goya/asic_reg/pci_nrtr_regs.h | 0 + .../include/goya/asic_reg/pcie_aux_regs.h | 0 + .../include/goya/asic_reg/pcie_wrap_regs.h | 0 + .../include/goya/asic_reg/psoc_emmc_pll_regs.h | 0 + .../include/goya/asic_reg/psoc_etr_regs.h | 0 + .../include/goya/asic_reg/psoc_global_conf_masks.h | 0 + .../include/goya/asic_reg/psoc_global_conf_regs.h | 0 + .../include/goya/asic_reg/psoc_mme_pll_regs.h | 0 + .../include/goya/asic_reg/psoc_pci_pll_regs.h | 0 + .../include/goya/asic_reg/psoc_spi_regs.h | 0 + .../include/goya/asic_reg/psoc_timestamp_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x0_rtr_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x1_rtr_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x2_rtr_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x3_rtr_regs.h | 0 + .../include/goya/asic_reg/sram_y0_x4_rtr_regs.h | 0 + .../habanalabs/include/goya/asic_reg/stlb_masks.h | 0 + .../habanalabs/include/goya/asic_reg/stlb_regs.h | 0 + .../include/goya/asic_reg/tpc0_cfg_masks.h | 0 + .../include/goya/asic_reg/tpc0_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc0_cmdq_masks.h | 0 + .../include/goya/asic_reg/tpc0_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc0_eml_cfg_masks.h | 0 + .../include/goya/asic_reg/tpc0_eml_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc0_nrtr_masks.h | 0 + .../include/goya/asic_reg/tpc0_nrtr_regs.h | 0 + .../include/goya/asic_reg/tpc0_qm_masks.h | 0 + .../include/goya/asic_reg/tpc0_qm_regs.h | 0 + .../include/goya/asic_reg/tpc1_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc1_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc1_qm_regs.h | 0 + .../include/goya/asic_reg/tpc1_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc2_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc2_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc2_qm_regs.h | 0 + .../include/goya/asic_reg/tpc2_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc3_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc3_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc3_qm_regs.h | 0 + .../include/goya/asic_reg/tpc3_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc4_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc4_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc4_qm_regs.h | 0 + .../include/goya/asic_reg/tpc4_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc5_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc5_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc5_qm_regs.h | 0 + .../include/goya/asic_reg/tpc5_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc6_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc6_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc6_qm_regs.h | 0 + .../include/goya/asic_reg/tpc6_rtr_regs.h | 0 + .../include/goya/asic_reg/tpc7_cfg_regs.h | 0 + .../include/goya/asic_reg/tpc7_cmdq_regs.h | 0 + .../include/goya/asic_reg/tpc7_nrtr_regs.h | 0 + .../include/goya/asic_reg/tpc7_qm_regs.h | 0 + .../include/goya/asic_reg/tpc_pll_regs.h | 0 + .../{misc => accel}/habanalabs/include/goya/goya.h | 0 + .../habanalabs/include/goya/goya_async_events.h | 0 + .../habanalabs/include/goya/goya_coresight.h | 0 + .../habanalabs/include/goya/goya_fw_if.h | 0 + .../habanalabs/include/goya/goya_packets.h | 0 + .../habanalabs/include/goya/goya_reg_map.h | 0 + .../habanalabs/include/hw_ip/mmu/mmu_general.h | 0 + .../habanalabs/include/hw_ip/mmu/mmu_v1_0.h | 0 + .../habanalabs/include/hw_ip/mmu/mmu_v1_1.h | 0 + .../habanalabs/include/hw_ip/mmu/mmu_v2_0.h | 0 + .../habanalabs/include/hw_ip/pci/pci_general.h | 0 + drivers/misc/Kconfig | 1 - + drivers/misc/Makefile | 1 - + .../include/gaudi2/arc/gaudi2_arc_common_packets.h | 213 ---- + include/trace/events/habanalabs.h | 75 ++ + .../{misc/habanalabs.h => drm/habanalabs_accel.h} | 33 +- + 434 files changed, 3132 insertions(+), 1080 deletions(-) + create mode 100644 drivers/accel/Makefile + rename drivers/{misc => accel}/habanalabs/Kconfig (81%) + rename drivers/{misc => accel}/habanalabs/Makefile (88%) + rename drivers/{misc => accel}/habanalabs/common/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/common/asid.c (100%) + rename drivers/{misc => accel}/habanalabs/common/command_buffer.c (95%) + rename drivers/{misc => accel}/habanalabs/common/command_submission.c (97%) + rename drivers/{misc => accel}/habanalabs/common/context.c (100%) + rename drivers/{misc => accel}/habanalabs/common/debugfs.c (100%) + rename drivers/{misc => accel}/habanalabs/common/decoder.c (100%) + rename drivers/{misc => accel}/habanalabs/common/device.c (96%) + rename drivers/{misc => accel}/habanalabs/common/firmware_if.c (94%) + rename drivers/{misc => accel}/habanalabs/common/habanalabs.h (97%) + rename drivers/{misc => accel}/habanalabs/common/habanalabs_drv.c (98%) + rename drivers/{misc => accel}/habanalabs/common/habanalabs_ioctl.c (93%) + rename drivers/{misc => accel}/habanalabs/common/hw_queue.c (100%) + rename drivers/{misc => accel}/habanalabs/common/hwmon.c (100%) + rename drivers/{misc => accel}/habanalabs/common/irq.c (99%) + rename drivers/{misc => accel}/habanalabs/common/memory.c (92%) + rename drivers/{misc => accel}/habanalabs/common/memory_mgr.c (99%) + rename drivers/{misc => accel}/habanalabs/common/mmu/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/common/mmu/mmu.c (99%) + rename drivers/{misc => accel}/habanalabs/common/mmu/mmu_v1.c (99%) + rename drivers/{misc => accel}/habanalabs/common/mmu/mmu_v2_hr.c (100%) + rename drivers/{misc => accel}/habanalabs/common/pci/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/common/pci/pci.c (97%) + rename drivers/{misc => accel}/habanalabs/common/security.c (100%) + rename drivers/{misc => accel}/habanalabs/common/state_dump.c (99%) + rename drivers/{misc => accel}/habanalabs/common/sysfs.c (100%) + rename drivers/{misc => accel}/habanalabs/gaudi/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/gaudi/gaudi.c (99%) + rename drivers/{misc => accel}/habanalabs/gaudi/gaudiP.h (99%) + rename drivers/{misc => accel}/habanalabs/gaudi/gaudi_coresight.c (99%) + rename drivers/{misc => accel}/habanalabs/gaudi/gaudi_security.c (100%) + rename drivers/{misc => accel}/habanalabs/gaudi2/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2.c (94%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2P.h (99%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2_coresight.c (99%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2_coresight_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2_security.c (99%) + rename drivers/{misc => accel}/habanalabs/goya/Makefile (100%) + rename drivers/{misc => accel}/habanalabs/goya/goya.c (99%) + rename drivers/{misc => accel}/habanalabs/goya/goyaP.h (99%) + rename drivers/{misc => accel}/habanalabs/goya/goya_coresight.c (99%) + rename drivers/{misc => accel}/habanalabs/goya/goya_hwmgr.c (100%) + rename drivers/{misc => accel}/habanalabs/goya/goya_security.c (100%) + rename drivers/{misc => accel}/habanalabs/include/common/cpucp_if.h (94%) + rename drivers/{misc => accel}/habanalabs/include/common/hl_boot_if.h (83%) + rename drivers/{misc => accel}/habanalabs/include/common/qman_if.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/cpu_if_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma0_core_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma0_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma1_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma1_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma2_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma2_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma3_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma3_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma4_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma4_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma5_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma5_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma6_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma6_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma7_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma7_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_n_down_ch0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_n_down_ch1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_n_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_s_down_ch0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_s_down_ch1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_e_s_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_n_down_ch0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_n_down_ch1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_n_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_s_down_ch0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_s_down_ch1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/dma_if_w_s_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/gaudi_blocks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/gaudi_regs.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme0_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme1_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme2_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme2_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mme3_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/mmu_up_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic0_qm0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic0_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic0_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic1_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic1_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic2_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic2_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic3_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic3_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic4_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nic4_qm1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_2_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_3_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_4_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_5_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_6_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/nif_rtr_ctrl_7_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_cpu_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_etr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_global_conf_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_global_conf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/psoc_timestamp_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_2_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_3_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_4_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_5_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_6_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/sif_rtr_ctrl_7_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/stlb_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc0_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc0_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc1_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc1_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc2_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc2_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc3_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc3_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc4_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc4_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc5_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc5_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc6_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc6_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc7_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/asic_reg/tpc7_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_async_events.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_async_ids_map_extended.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_coresight.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_fw_if.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_packets.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi/gaudi_reg_map.h (100%) + create mode 100644 drivers/accel/habanalabs/include/gaudi2/arc/gaudi2_arc_common_packets.h + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_acp_eng_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_aux_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_dup_eng_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_arc0_dup_eng_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_axuser_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_ctx_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_kdma_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/arc_farm_kdma_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/cpu_if_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_dec0_cmd_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_dec0_cmd_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_ctx_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma1_core_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_edma1_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_mmu_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_mmu_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_stlb_masks.h (97%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_hmmu0_stlb_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_acc_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout0_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout0_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout1_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_cout1_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in0_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in0_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in1_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in1_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in2_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in2_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in3_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in3_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in4_master_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_agu_in4_slave_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_base_addr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_non_tensor_end_regs.h (98%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_non_tensor_start_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_a_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_b_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_arch_tensor_cout_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_mme_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_ctrl_lo_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_acp_eng_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_dup_eng_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_arc_dup_eng_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_axuser_secured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_sbte0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_sbte0_mstr_if_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_mme_wb0_mstr_if_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_prvt_hbw_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_prvt_lbw_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_shrd_hbw_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_rtr0_mstr_if_rr_shrd_lbw_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_glbl_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_glbl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_mstr_if_axuser_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_mstr_if_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_objs_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_sync_mngr_objs_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_kernel_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_kernel_tensor_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_sync_object_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_qm_tensor_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_cfg_special_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_busmon_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_etf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_funnel_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_spmu_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_eml_stm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_tpc0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_dec_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_brdg_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore0_vdec0_ctrl_special_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore1_mme_ctrl_lo_regs.h (100%) + create mode 100644 drivers/accel/habanalabs/include/gaudi2/asic_reg/dcore1_sync_mngr_glbl_regs.h + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/dcore3_mme_ctrl_lo_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/gaudi2_blocks_linux_driver.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/gaudi2_regs.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_qm0_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_qm0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_qm_arc_aux0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_qpc0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_umr0_0_completion_queue_ci_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/nic0_umr0_0_unsecure_doorbell0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_dbi_regs.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_dec0_cmd_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_dec0_cmd_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_dec_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_abnrm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_l2c_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_nrm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_axuser_msix_vcd_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_brdg_ctrl_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_vdec0_ctrl_special_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_wrap_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pcie_wrap_special_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_ctx_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_core_special_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_axuser_secured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma1_core_ctx_axuser_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pdma1_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pmmu_hbw_stlb_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pmmu_hbw_stlb_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/pmmu_pif_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_etr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_etr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_global_conf_masks.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_global_conf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_reset_conf_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_reset_conf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/psoc_timestamp_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_desc_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_qm_arc_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_qm_axuser_nonsecured_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_qm_cgm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/rot0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/xbar_edge_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/asic_reg/xbar_mid_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_async_events.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_async_ids_map_extended.h (99%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_coresight.h (100%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_fw_if.h (82%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_packets.h (98%) + rename drivers/{misc => accel}/habanalabs/include/gaudi2/gaudi2_reg_map.h (83%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/cpu_ca53_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/cpu_if_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/cpu_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_2_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_3_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_ch_4_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_macro_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_macro_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_nrtr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_nrtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_0_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_0_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_1_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_2_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_3_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/dma_qm_4_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/goya_blocks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/goya_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/goya_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/ic_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mc_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme1_rtr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme1_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme2_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme3_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme4_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme5_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme6_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_cmdq_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mme_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mmu_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/mmu_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/pci_nrtr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/pci_nrtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/pcie_aux_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/pcie_wrap_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_emmc_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_etr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_global_conf_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_global_conf_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_mme_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_pci_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_spi_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/psoc_timestamp_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x0_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x1_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x2_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x3_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/sram_y0_x4_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/stlb_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/stlb_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_cmdq_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_eml_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_nrtr_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_nrtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_qm_masks.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc0_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc1_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc1_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc1_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc1_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc2_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc2_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc2_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc2_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc3_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc3_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc3_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc3_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc4_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc4_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc4_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc4_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc5_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc5_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc5_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc5_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc6_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc6_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc6_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc6_rtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc7_cfg_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc7_cmdq_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc7_nrtr_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc7_qm_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/asic_reg/tpc_pll_regs.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_async_events.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_coresight.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_fw_if.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_packets.h (100%) + rename drivers/{misc => accel}/habanalabs/include/goya/goya_reg_map.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/mmu/mmu_general.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/mmu/mmu_v1_0.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/mmu/mmu_v1_1.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/mmu/mmu_v2_0.h (100%) + rename drivers/{misc => accel}/habanalabs/include/hw_ip/pci/pci_general.h (100%) + delete mode 100644 drivers/misc/habanalabs/include/gaudi2/arc/gaudi2_arc_common_packets.h + rename include/uapi/{misc/habanalabs.h => drm/habanalabs_accel.h} (98%) +Merging coresight/next (9266af7545d4 coresight: etm4x: Fix accesses to TRCSEQRSTEVR and TRCSEQSTR) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Merge made by the 'ort' strategy. + drivers/hwtracing/coresight/coresight-etm4x-core.c | 18 ++++++++++++------ + 1 file changed, 12 insertions(+), 6 deletions(-) +Merging fpga/for-next (3afe90d5b7a4 fpga: dfl: kernel-doc corrections) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + drivers/fpga/dfl-fme-pr.c | 4 +- + drivers/fpga/dfl.c | 5 +- + drivers/fpga/microchip-spi.c | 145 +++++++++++++++++++++++-------------------- + 3 files changed, 84 insertions(+), 70 deletions(-) +Merging icc/icc-next (dbdbdf891e39 Merge branch 'icc-dt' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Merge made by the 'ort' strategy. + .../bindings/interconnect/qcom,qdu1000-rpmh.yaml | 70 ++ + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 24 +- + .../bindings/interconnect/qcom,rpmh.yaml | 35 - + .../bindings/interconnect/qcom,sc7280-rpmh.yaml | 71 ++ + .../bindings/interconnect/qcom,sc8280xp-rpmh.yaml | 49 + + .../bindings/interconnect/qcom,sm8450-rpmh.yaml | 124 +++ + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/icc-rpm.c | 2 +- + drivers/interconnect/qcom/msm8996.c | 19 +- + drivers/interconnect/qcom/qdu1000.c | 1067 ++++++++++++++++++++ + drivers/interconnect/qcom/qdu1000.h | 95 ++ + .../dt-bindings/interconnect/qcom,qdu1000-rpmh.h | 98 ++ + 13 files changed, 1623 insertions(+), 42 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qdu1000-rpmh.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sc7280-rpmh.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sc8280xp-rpmh.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sm8450-rpmh.yaml + create mode 100644 drivers/interconnect/qcom/qdu1000.c + create mode 100644 drivers/interconnect/qcom/qdu1000.h + create mode 100644 include/dt-bindings/interconnect/qcom,qdu1000-rpmh.h +Merging iio/togreg (bfcae956d9b5 iio: adc: stm32-dfsdm: add id registers support) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Auto-merging drivers/iio/adc/Kconfig +Merge made by the 'ort' strategy. + .../bindings/iio/adc/cirrus,ep9301-adc.yaml | 47 ++ + .../devicetree/bindings/iio/adc/maxim,max1238.yaml | 2 +- + .../devicetree/bindings/iio/adc/maxim,max1363.yaml | 2 +- + .../bindings/iio/adc/qcom,spmi-iadc.yaml | 1 + + .../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 +++ + .../devicetree/bindings/iio/st,st-sensors.yaml | 2 + + MAINTAINERS | 17 + + drivers/iio/accel/Kconfig | 2 +- + drivers/iio/accel/bma400.h | 4 - + drivers/iio/accel/bma400_core.c | 29 +- + drivers/iio/accel/st_accel.h | 1 + + drivers/iio/accel/st_accel_core.c | 1 + + drivers/iio/accel/st_accel_i2c.c | 5 + + drivers/iio/accel/st_accel_spi.c | 5 + + drivers/iio/adc/Kconfig | 13 +- + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/at91-sama5d2_adc.c | 4 +- + drivers/iio/adc/ep93xx_adc.c | 8 + + drivers/iio/adc/max11410.c | 3 +- + drivers/iio/adc/qcom-spmi-adc5.c | 8 +- + drivers/iio/adc/stm32-dfsdm-core.c | 99 ++- + drivers/iio/adc/stm32-dfsdm.h | 60 +- + drivers/iio/adc/ti-adc128s052.c | 54 +- + drivers/iio/adc/ti-lmp92064.c | 332 +++++++++ + drivers/iio/cdc/ad7746.c | 3 +- + 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/imu/kmx61.c | 2 +- + drivers/iio/light/Makefile | 2 +- + drivers/iio/light/max44009.c | 5 +- + drivers/iio/light/tsl2563.c | 189 +++--- + drivers/iio/magnetometer/Kconfig | 14 +- + drivers/iio/magnetometer/Makefile | 2 + + drivers/iio/magnetometer/st_magn.h | 1 + + drivers/iio/magnetometer/st_magn_core.c | 1 + + drivers/iio/magnetometer/st_magn_i2c.c | 5 + + drivers/iio/magnetometer/st_magn_spi.c | 5 + + 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 - + 50 files changed, 1686 insertions(+), 288 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/cirrus,ep9301-adc.yaml + 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 (43108bb2f347 dt-bindings: phy: convert meson-gxl-usb2-phy.txt to dt-schema) +$ 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/phy/renesas/r8a779f0-ether-serdes.c +Merge made by the 'ort' strategy. + .../phy/allwinner,suniv-f1c100s-usb-phy.yaml | 83 +++++++ + .../bindings/phy/amlogic,meson-gxl-usb2-phy.yaml | 56 +++++ + .../devicetree/bindings/phy/mediatek,tphy.yaml | 1 + + .../devicetree/bindings/phy/meson-gxl-usb2-phy.txt | 21 -- + .../bindings/phy/qcom,msm8996-qmp-ufs-phy.yaml | 3 + + .../bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml | 3 + + .../devicetree/bindings/phy/qcom,pcie2-phy.yaml | 86 ++++++++ + .../devicetree/bindings/phy/qcom,qusb2-phy.yaml | 160 +++++++------- + .../bindings/phy/qcom,sc7180-qmp-usb3-dp-phy.yaml | 89 ++++++-- + .../bindings/phy/qcom,sc8280xp-qmp-pcie-phy.yaml | 22 ++ + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 4 + + .../devicetree/bindings/phy/qcom,usb-hsic-phy.txt | 65 ------ + .../devicetree/bindings/phy/qcom,usb-hsic-phy.yaml | 67 ++++++ + .../bindings/phy/qcom,usb-snps-femto-v2.yaml | 33 +-- + .../devicetree/bindings/phy/qcom-pcie2-phy.txt | 42 ---- + drivers/phy/allwinner/phy-sun4i-usb.c | 59 ++--- + drivers/phy/qualcomm/phy-qcom-pcie2.c | 6 +- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 3 + + drivers/phy/qualcomm/phy-qcom-qmp-pcie-msm8996.c | 6 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcie.c | 242 ++++++++++++++++----- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v2.h | 25 +++ + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v3.h | 3 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v5.h | 4 + + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v2.h | 19 +- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v5.h | 4 + + drivers/phy/qualcomm/phy-qcom-qmp-qserdes-com.h | 2 +- + .../qualcomm/phy-qcom-qmp-qserdes-txrx-v5_5nm.h | 5 - + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 129 ++++++++--- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 81 ++++--- + drivers/phy/qualcomm/phy-qcom-qmp.h | 14 +- + drivers/phy/renesas/r8a779f0-ether-serdes.c | 65 +++--- + drivers/phy/tegra/Makefile | 1 + + drivers/phy/tegra/xusb-tegra186.c | 64 +++++- + drivers/phy/tegra/xusb.c | 23 ++ + drivers/phy/tegra/xusb.h | 23 ++ + 35 files changed, 1051 insertions(+), 462 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/allwinner,suniv-f1c100s-usb-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/amlogic,meson-gxl-usb2-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/meson-gxl-usb2-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,pcie2-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hsic-phy.txt + create mode 100644 Documentation/devicetree/bindings/phy/qcom,usb-hsic-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/qcom-pcie2-phy.txt + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-ufs-v2.h +Merging soundwire/next (545c365185a4 soundwire: stream: Move remaining register accesses over to no_pm) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + drivers/soundwire/bus.c | 21 +++---- + drivers/soundwire/cadence_master.c | 46 +++++++++------ + drivers/soundwire/cadence_master.h | 14 ++++- + drivers/soundwire/debugfs.c | 13 ++++- + drivers/soundwire/intel.c | 27 --------- + drivers/soundwire/stream.c | 30 +++++----- + include/linux/soundwire/sdw.h | 113 +++++++++++++++++++++++++++++++++---- + sound/soc/codecs/rt1316-sdw.c | 1 - + sound/soc/codecs/rt1318-sdw.c | 1 - + sound/soc/codecs/rt711-sdca-sdw.c | 1 - + 10 files changed, 180 insertions(+), 87 deletions(-) +Merging extcon/extcon-next (2e85d0a0201d extcon: qcom-spmi: Switch to platform_get_irq_byname_optional) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/extcon/qcom,pm8941-misc.yaml | 14 +++++++++----- + drivers/extcon/extcon-axp288.c | 2 +- + drivers/extcon/extcon-qcom-spmi-misc.c | 4 ++-- + 3 files changed, 12 insertions(+), 8 deletions(-) +Merging gnss/gnss-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'gnss-next' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git gnss/gnss-next +Already up to date. +Merging vfio/next (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 (b7bfaa761d76 Linux 6.2-rc3) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging counter-next/counter-next (dfeef15e73ca counter: microchip-tcp-capture: Add appropriate arch deps for TCP driver) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Merge made by the 'ort' strategy. + drivers/counter/Kconfig | 91 +++++++++++++++++++++++++------------------------ + 1 file changed, 47 insertions(+), 44 deletions(-) +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 (ab223bc0edd2 dt-bindings: dma: qcom: gpi: add compatible for sm8550) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging drivers/dma/Kconfig +Auto-merging drivers/dma/idxd/device.c +Auto-merging drivers/dma/ti/k3-udma.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/dma/fsl,imx-sdma.yaml | 149 ++++++++++++++++ + .../devicetree/bindings/dma/fsl,mxs-dma.yaml | 80 +++++++++ + .../devicetree/bindings/dma/fsl-imx-sdma.txt | 118 ------------- + .../devicetree/bindings/dma/fsl-mxs-dma.txt | 60 ------- + .../devicetree/bindings/dma/qcom,gpi.yaml | 3 + + .../devicetree/bindings/dma/ti/k3-bcdma.yaml | 77 ++++++-- + drivers/dma/Kconfig | 2 +- + drivers/dma/idxd/device.c | 2 +- + drivers/dma/idxd/dma.c | 6 - + drivers/dma/idxd/init.c | 2 +- + drivers/dma/idxd/sysfs.c | 4 +- + drivers/dma/imx-sdma.c | 38 +++- + drivers/dma/ti/Makefile | 3 +- + drivers/dma/ti/k3-psil-am62a.c | 196 +++++++++++++++++++++ + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 1 + + drivers/dma/ti/k3-udma.c | 41 ++++- + include/linux/dma/imx-dma.h | 1 + + 18 files changed, 563 insertions(+), 221 deletions(-) + create mode 100644 Documentation/devicetree/bindings/dma/fsl,imx-sdma.yaml + create mode 100644 Documentation/devicetree/bindings/dma/fsl,mxs-dma.yaml + delete mode 100644 Documentation/devicetree/bindings/dma/fsl-imx-sdma.txt + delete mode 100644 Documentation/devicetree/bindings/dma/fsl-mxs-dma.txt + create mode 100644 drivers/dma/ti/k3-psil-am62a.c +Merging cgroup/for-next (32a47817d075 cgroup/cpuset: fix a few kernel-doc warnings & coding style) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v1/cgroups.rst | 2 + + Documentation/admin-guide/cgroup-v1/memory.rst | 284 +++++++++++++----------- + kernel/cgroup/cpuset.c | 15 +- + 3 files changed, 162 insertions(+), 139 deletions(-) +Merging scsi/for-next (4be502c27dba Merge branch 'fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/scsi/libsas/sas_ata.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/ufs/sprd,ums9620-ufs.yaml | 79 ++++ + MAINTAINERS | 8 + + drivers/scsi/3w-sas.c | 12 +- + drivers/scsi/3w-sas.h | 4 +- + drivers/scsi/libsas/sas_ata.c | 88 +++- + drivers/scsi/libsas/sas_discover.c | 6 - + drivers/scsi/libsas/sas_expander.c | 125 ++---- + drivers/scsi/lpfc/lpfc.h | 4 +- + drivers/scsi/lpfc/lpfc_attr.c | 63 ++- + drivers/scsi/lpfc/lpfc_crtn.h | 4 +- + drivers/scsi/lpfc/lpfc_els.c | 33 +- + drivers/scsi/lpfc/lpfc_hbadisc.c | 17 +- + drivers/scsi/lpfc/lpfc_hw4.h | 7 +- + drivers/scsi/lpfc/lpfc_init.c | 94 ++++- + drivers/scsi/lpfc/lpfc_scsi.c | 8 +- + drivers/scsi/lpfc/lpfc_sli.c | 83 ++-- + drivers/scsi/lpfc/lpfc_sli4.h | 5 +- + drivers/scsi/lpfc/lpfc_version.h | 6 +- + drivers/scsi/lpfc/lpfc_vmid.c | 41 +- + drivers/scsi/lpfc/lpfc_vport.c | 16 +- + drivers/scsi/mvumi.c | 4 +- + drivers/scsi/mvumi.h | 6 +- + drivers/scsi/pm8001/pm8001_ctl.c | 46 +-- + drivers/scsi/qla2xxx/qla_attr.c | 5 +- + drivers/scsi/qla2xxx/qla_bsg.c | 9 +- + drivers/scsi/qla2xxx/qla_def.h | 51 ++- + drivers/scsi/qla2xxx/qla_dfs.c | 10 +- + drivers/scsi/qla2xxx/qla_edif.c | 96 +++-- + drivers/scsi/qla2xxx/qla_edif.h | 2 + + drivers/scsi/qla2xxx/qla_edif_bsg.h | 15 +- + drivers/scsi/qla2xxx/qla_gbl.h | 18 +- + drivers/scsi/qla2xxx/qla_gs.c | 407 ------------------ + drivers/scsi/qla2xxx/qla_init.c | 95 ++--- + drivers/scsi/qla2xxx/qla_inline.h | 110 ++++- + drivers/scsi/qla2xxx/qla_iocb.c | 107 ++++- + drivers/scsi/qla2xxx/qla_isr.c | 9 +- + drivers/scsi/qla2xxx/qla_mbx.c | 8 +- + drivers/scsi/qla2xxx/qla_mid.c | 302 +++++++++++++- + drivers/scsi/qla2xxx/qla_nvme.c | 38 +- + drivers/scsi/qla2xxx/qla_os.c | 61 +-- + drivers/scsi/qla2xxx/qla_target.c | 103 +---- + drivers/scsi/qla2xxx/qla_target.h | 1 - + drivers/scsi/qla2xxx/qla_version.h | 6 +- + drivers/ufs/core/ufs_bsg.c | 144 ++++--- + drivers/ufs/core/ufshcd-priv.h | 9 +- + drivers/ufs/core/ufshcd.c | 401 +++++++++++------- + drivers/ufs/core/ufshpb.c | 4 +- + drivers/ufs/host/Kconfig | 16 + + drivers/ufs/host/Makefile | 1 + + drivers/ufs/host/ufs-qcom.c | 299 ++++++-------- + drivers/ufs/host/ufs-qcom.h | 81 ++-- + drivers/ufs/host/ufs-sprd.c | 458 +++++++++++++++++++++ + drivers/ufs/host/ufs-sprd.h | 85 ++++ + include/scsi/libsas.h | 1 - + include/scsi/sas_ata.h | 20 + + include/uapi/scsi/scsi_bsg_ufs.h | 48 ++- + include/ufs/ufs.h | 30 +- + include/ufs/ufshcd.h | 49 ++- + include/ufs/ufshci.h | 10 +- + 59 files changed, 2417 insertions(+), 1451 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/sprd,ums9620-ufs.yaml + create mode 100644 drivers/ufs/host/ufs-sprd.c + create mode 100644 drivers/ufs/host/ufs-sprd.h +Merging scsi-mkp/for-next (b3e92764f1ef Merge patch series "scsi: Add struct for args to execution functions") +$ 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/ata/libata-scsi.c +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + drivers/ata/libata-scsi.c | 23 +- + drivers/hwmon/drivetemp.c | 11 +- + drivers/scsi/ch.c | 30 +- + drivers/scsi/cxlflash/superpipe.c | 34 +-- + drivers/scsi/cxlflash/vlun.c | 32 +-- + drivers/scsi/device_handler/scsi_dh_alua.c | 26 +- + drivers/scsi/device_handler/scsi_dh_emc.c | 13 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 22 +- + drivers/scsi/device_handler/scsi_dh_rdac.c | 12 +- + drivers/scsi/scsi.c | 12 +- + drivers/scsi/scsi_ioctl.c | 7 +- + drivers/scsi/scsi_lib.c | 78 ++--- + drivers/scsi/scsi_scan.c | 26 +- + drivers/scsi/scsi_transport_spi.c | 31 +- + drivers/scsi/sd.c | 83 ++++-- + drivers/scsi/sd_zbc.c | 8 +- + drivers/scsi/ses.c | 14 +- + drivers/scsi/sr.c | 11 +- + drivers/scsi/sr_ioctl.c | 17 +- + drivers/scsi/virtio_scsi.c | 4 +- + drivers/target/target_core_pscsi.c | 12 +- + drivers/ufs/core/Makefile | 2 +- + drivers/ufs/core/ufs-mcq.c | 431 ++++++++++++++++++++++++++++ + drivers/ufs/core/ufshcd-priv.h | 100 ++++++- + drivers/ufs/core/ufshcd.c | 382 ++++++++++++++++++++---- + drivers/ufs/host/ufs-qcom.c | 243 ++++++++++++++++ + drivers/ufs/host/ufs-qcom.h | 10 + + include/scsi/scsi_device.h | 38 +-- + include/uapi/scsi/scsi_bsg_fc.h | 2 +- + include/ufs/ufs.h | 7 + + include/ufs/ufshcd.h | 137 +++++++++ + include/ufs/ufshci.h | 66 +++++ + 32 files changed, 1626 insertions(+), 298 deletions(-) + create mode 100644 drivers/ufs/core/ufs-mcq.c +$ git reset --hard HEAD^ +HEAD is now at 79276ca63215 Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git +Merging next-20230113 version of scsi-mkp +$ git merge -m next-20230113/scsi-mkp 201e0a7c7f36ccb70b532e04ea2f48031f219e74 +Already up to date. +Merging vhost/linux-next (66c78aa2b9ba virtio: vdpa: new SolidNET DPU driver.) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/driver-api/index.rst | 1 + + Documentation/driver-api/virtio/index.rst | 11 + + Documentation/driver-api/virtio/virtio.rst | 144 +++ + .../driver-api/virtio/writing_virtio_drivers.rst | 197 ++++ + MAINTAINERS | 6 + + drivers/block/virtio_blk.c | 487 ++++++++- + drivers/nvdimm/virtio_pmem.c | 11 +- + drivers/pci/quirks.c | 8 + + drivers/vdpa/Kconfig | 30 + + drivers/vdpa/Makefile | 1 + + drivers/vdpa/ifcvf/ifcvf_base.c | 32 +- + drivers/vdpa/ifcvf/ifcvf_base.h | 10 +- + drivers/vdpa/ifcvf/ifcvf_main.c | 162 ++- + drivers/vdpa/mlx5/Makefile | 2 +- + drivers/vdpa/mlx5/net/debug.c | 152 +++ + drivers/vdpa/mlx5/net/mlx5_vnet.c | 172 +-- + drivers/vdpa/mlx5/net/mlx5_vnet.h | 94 ++ + drivers/vdpa/solidrun/Makefile | 6 + + drivers/vdpa/solidrun/snet_hwmon.c | 188 ++++ + drivers/vdpa/solidrun/snet_main.c | 1110 ++++++++++++++++++++ + drivers/vdpa/solidrun/snet_vdpa.h | 194 ++++ + drivers/vdpa/vdpa_sim/vdpa_sim_net.c | 1 + + include/linux/pci_ids.h | 2 + + include/linux/virtio_config.h | 8 +- + include/uapi/linux/virtio_blk.h | 133 +++ + include/uapi/linux/virtio_blk_ioctl.h | 44 + + 26 files changed, 2997 insertions(+), 209 deletions(-) + create mode 100644 Documentation/driver-api/virtio/index.rst + create mode 100644 Documentation/driver-api/virtio/virtio.rst + create mode 100644 Documentation/driver-api/virtio/writing_virtio_drivers.rst + create mode 100644 drivers/vdpa/mlx5/net/debug.c + create mode 100644 drivers/vdpa/mlx5/net/mlx5_vnet.h + create mode 100644 drivers/vdpa/solidrun/Makefile + create mode 100644 drivers/vdpa/solidrun/snet_hwmon.c + create mode 100644 drivers/vdpa/solidrun/snet_main.c + create mode 100644 drivers/vdpa/solidrun/snet_vdpa.h + create mode 100644 include/uapi/linux/virtio_blk_ioctl.h +Merging rpmsg/for-next (f9721c6a43b6 Merge branches 'rproc-next', 'rpmsg-next' and 'hwspinlock-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 419 +-------------------- + .../bindings/remoteproc/qcom,glink-edge.yaml | 24 +- + .../bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 289 ++++++++++++++ + .../bindings/remoteproc/qcom,pas-common.yaml | 97 +++++ + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 35 -- + .../bindings/remoteproc/qcom,qcs404-pas.yaml | 86 +++++ + .../bindings/remoteproc/qcom,sc7180-pas.yaml | 125 ++++++ + .../bindings/remoteproc/qcom,sc7280-adsp-pil.yaml | 195 ++++++++++ + .../bindings/remoteproc/qcom,sc8180x-pas.yaml | 87 +++++ + .../bindings/remoteproc/qcom,sc8280xp-pas.yaml | 139 +++++++ + .../bindings/remoteproc/qcom,sdx55-pas.yaml | 101 +++++ + .../bindings/remoteproc/qcom,sm6350-pas.yaml | 159 ++++++++ + .../bindings/remoteproc/qcom,sm8150-pas.yaml | 166 ++++++++ + .../bindings/remoteproc/qcom,sm8350-pas.yaml | 174 +++++++++ + .../bindings/remoteproc/qcom,wcnss-pil.txt | 177 --------- + .../bindings/remoteproc/qcom,wcnss-pil.yaml | 294 +++++++++++++++ + .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 3 + + .../bindings/remoteproc/ti,pru-consumer.yaml | 60 +++ + drivers/hwspinlock/hwspinlock_core.c | 2 +- + drivers/remoteproc/mtk_scp_ipi.c | 32 +- + drivers/remoteproc/pru_rproc.c | 230 ++++++++++- + drivers/remoteproc/qcom_q6v5.c | 4 +- + drivers/remoteproc/qcom_q6v5_adsp.c | 124 +++++- + drivers/remoteproc/qcom_q6v5_mss.c | 174 +++++++-- + drivers/remoteproc/qcom_q6v5_pas.c | 45 +-- + drivers/remoteproc/qcom_sysmon.c | 2 +- + drivers/remoteproc/qcom_wcnss.c | 12 + + drivers/remoteproc/qcom_wcnss.h | 2 - + drivers/remoteproc/ti_k3_dsp_remoteproc.c | 12 + + drivers/rpmsg/qcom_glink_ssr.c | 2 +- + drivers/rpmsg/rpmsg_char.c | 8 + + drivers/rpmsg/rpmsg_ctrl.c | 2 + + include/linux/remoteproc/pruss.h | 83 ++++ + 33 files changed, 2639 insertions(+), 725 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,qcs404-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7280-adsp-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc8180x-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc8280xp-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sdx55-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm6350-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm8150-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm8350-pas.yaml + delete mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/ti,pru-consumer.yaml + create mode 100644 include/linux/remoteproc/pruss.h +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 (06bbaa64908f gpio: Remove unused and obsoleted irq_to_gpio()) +$ 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 +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/gpio-pca953x.c +Auto-merging drivers/gpio/gpiolib.c +Merge made by the 'ort' strategy. + .../bindings/gpio/fujitsu,mb86s70-gpio.txt | 20 -- + .../bindings/gpio/fujitsu,mb86s70-gpio.yaml | 50 +++ + Documentation/driver-api/gpio/legacy.rst | 17 - + .../translations/zh_CN/driver-api/gpio/legacy.rst | 15 - + Documentation/translations/zh_TW/gpio.txt | 16 - + arch/m68k/include/asm/gpio.h | 7 - + arch/sh/include/asm/gpio.h | 5 - + drivers/gpio/Kconfig | 8 +- + drivers/gpio/TODO | 4 +- + drivers/gpio/gpio-104-dio-48e.c | 398 +++++++-------------- + drivers/gpio/gpio-104-idi-48.c | 336 ++++++----------- + drivers/gpio/gpio-davinci.c | 2 +- + drivers/gpio/gpio-gpio-mm.c | 154 ++------ + drivers/gpio/gpio-i8255.c | 320 +++++------------ + drivers/gpio/gpio-i8255.h | 54 ++- + drivers/gpio/gpio-msc313.c | 6 - + drivers/gpio/gpio-pca953x.c | 34 +- + drivers/gpio/gpio-pca9570.c | 24 +- + drivers/gpio/gpio-pcf857x.c | 79 ++-- + drivers/gpio/gpio-regmap.c | 17 +- + drivers/gpio/gpio-tegra186.c | 1 + + drivers/gpio/gpio-vf610.c | 2 +- + drivers/gpio/gpiolib-acpi.c | 10 - + drivers/gpio/gpiolib-acpi.h | 4 - + drivers/gpio/gpiolib-cdev.c | 21 +- + drivers/gpio/gpiolib-devres.c | 55 --- + drivers/gpio/gpiolib-of.c | 120 +++---- + drivers/gpio/gpiolib-of.h | 5 - + drivers/gpio/gpiolib.c | 70 ++-- + drivers/gpio/gpiolib.h | 10 + + include/asm-generic/gpio.h | 6 - + include/linux/gpio.h | 20 -- + include/linux/gpio/consumer.h | 48 --- + include/linux/gpio/driver.h | 9 +- + include/linux/of_gpio.h | 87 +---- + 35 files changed, 624 insertions(+), 1410 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/fujitsu,mb86s70-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/fujitsu,mb86s70-gpio.yaml +Merging gpio-intel/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git gpio-intel/for-next +Already up to date. +Merging pinctrl/for-next (8f18c3f3e3ac 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 Documentation/devicetree/bindings/pinctrl/qcom,msm8226-pinctrl.yaml +Auto-merging Documentation/devicetree/bindings/pinctrl/qcom,sm8450-tlmm.yaml +Merge made by the 'ort' strategy. + ...,imx8mm-pinctrl.yaml => fsl,imx8m-pinctrl.yaml} | 24 +- + .../bindings/pinctrl/fsl,imx8mn-pinctrl.yaml | 84 - + .../bindings/pinctrl/fsl,imx8mp-pinctrl.yaml | 84 - + .../bindings/pinctrl/fsl,imx8mq-pinctrl.yaml | 84 - + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 4 +- + .../bindings/pinctrl/qcom,pmic-gpio.yaml | 18 + + .../bindings/pinctrl/qcom,qdu1000-tlmm.yaml | 134 ++ + .../pinctrl/qcom,sm8450-lpass-lpi-pinctrl.yaml | 6 +- + .../bindings/pinctrl/qcom,sm8450-tlmm.yaml | 2 +- + .../bindings/pinctrl/qcom,sm8550-tlmm.yaml | 163 ++ + .../bindings/pinctrl/renesas,rzg2l-poeg.yaml | 86 + + drivers/pinctrl/freescale/pinctrl-mxs.c | 6 +- + drivers/pinctrl/freescale/pinctrl-mxs.h | 6 +- + drivers/pinctrl/nomadik/pinctrl-ab8500.c | 3 +- + drivers/pinctrl/nomadik/pinctrl-ab8505.c | 3 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 32 +- + drivers/pinctrl/nomadik/pinctrl-abx500.h | 4 + + drivers/pinctrl/nomadik/pinctrl-nomadik-db8500.c | 3 + + drivers/pinctrl/nomadik/pinctrl-nomadik-stn8815.c | 3 + + drivers/pinctrl/nomadik/pinctrl-nomadik.c | 32 +- + drivers/pinctrl/nomadik/pinctrl-nomadik.h | 5 + + drivers/pinctrl/pinctrl-amd.c | 7 + + drivers/pinctrl/pinctrl-amd.h | 1 + + drivers/pinctrl/pinctrl-at91.c | 2 +- + drivers/pinctrl/pinctrl-da850-pupd.c | 6 - + drivers/pinctrl/pinctrl-mcp23s08_i2c.c | 5 +- + drivers/pinctrl/pinctrl-rockchip.c | 1 + + drivers/pinctrl/pinctrl-thunderbay.c | 7 - + drivers/pinctrl/pinmux.c | 4 +- + drivers/pinctrl/qcom/Kconfig | 20 + + drivers/pinctrl/qcom/Makefile | 2 + + drivers/pinctrl/qcom/pinctrl-msm8226.c | 11 +- + drivers/pinctrl/qcom/pinctrl-msm8976.c | 8 +- + drivers/pinctrl/qcom/pinctrl-qdu1000.c | 1274 ++++++++++++++ + drivers/pinctrl/qcom/pinctrl-sm8550.c | 1789 ++++++++++++++++++++ + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 6 + + drivers/pinctrl/stm32/pinctrl-stm32.c | 1 + + drivers/pinctrl/sunplus/sppctl.c | 7 +- + 38 files changed, 3602 insertions(+), 335 deletions(-) + rename Documentation/devicetree/bindings/pinctrl/{fsl,imx8mm-pinctrl.yaml => fsl,imx8m-pinctrl.yaml} (76%) + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mn-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mp-pinctrl.yaml + delete mode 100644 Documentation/devicetree/bindings/pinctrl/fsl,imx8mq-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,qdu1000-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/qcom,sm8550-tlmm.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/renesas,rzg2l-poeg.yaml + create mode 100644 drivers/pinctrl/qcom/pinctrl-qdu1000.c + create mode 100644 drivers/pinctrl/qcom/pinctrl-sm8550.c +Merging pinctrl-intel/for-next (afa349bbb5d7 pinctrl: intel: Get rid of unused members in struct intel_function) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/pinctrl-alderlake.c | 18 +------ + drivers/pinctrl/intel/pinctrl-baytrail.c | 10 ++-- + drivers/pinctrl/intel/pinctrl-broxton.c | 31 +++++------- + drivers/pinctrl/intel/pinctrl-cannonlake.c | 31 +++++------- + drivers/pinctrl/intel/pinctrl-cedarfork.c | 13 +---- + drivers/pinctrl/intel/pinctrl-cherryview.c | 6 +-- + drivers/pinctrl/intel/pinctrl-denverton.c | 13 +---- + drivers/pinctrl/intel/pinctrl-elkhartlake.c | 24 +++------ + drivers/pinctrl/intel/pinctrl-emmitsburg.c | 13 +---- + drivers/pinctrl/intel/pinctrl-geminilake.c | 21 +++----- + drivers/pinctrl/intel/pinctrl-icelake.c | 35 +++++-------- + drivers/pinctrl/intel/pinctrl-intel.c | 74 ++++++++++++++-------------- + drivers/pinctrl/intel/pinctrl-intel.h | 55 ++++++++++++++------- + drivers/pinctrl/intel/pinctrl-jasperlake.c | 13 +---- + drivers/pinctrl/intel/pinctrl-lakefield.c | 13 +---- + drivers/pinctrl/intel/pinctrl-lewisburg.c | 12 +---- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 8 +-- + drivers/pinctrl/intel/pinctrl-merrifield.c | 6 +-- + drivers/pinctrl/intel/pinctrl-meteorlake.c | 23 +++------ + drivers/pinctrl/intel/pinctrl-moorefield.c | 6 +-- + drivers/pinctrl/intel/pinctrl-sunrisepoint.c | 37 +++++--------- + drivers/pinctrl/intel/pinctrl-tigerlake.c | 30 ++++------- + include/linux/pinctrl/pinctrl.h | 20 ++++++++ + 23 files changed, 197 insertions(+), 315 deletions(-) +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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Already up to date. +Merging pwm/for-next (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 +Already up to date. +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 (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'test' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit/test +Already up to date. +Merging kunit-next/kunit (88603b6dc419 Linux 6.2-rc2) +$ 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 (4cd0ca1fe9a7 rtc: ds1307: Convert to i2c's .probe_new()) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Merge made by the 'ort' strategy. + drivers/rtc/rtc-ds1307.c | 6 +++--- + 1 file changed, 3 insertions(+), 3 deletions(-) +Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (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 (0fb0624b15d2 seccomp: fix kernel-doc function name warning) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Merge made by the 'ort' strategy. + kernel/seccomp.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging fsi/next (35af9fb49bc5 fsi: core: Check error number after calling ida_simple_get) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git fsi/next +Already up to date. +Merging slimbus/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git slimbus/for-next +Already up to date. +Merging nvmem/for-next (ad80e15904ec nvmem: core: fix return value) +$ 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 MAINTAINERS +Merge made by the 'ort' strategy. + .../bindings/nvmem/layouts/onie,tlv-layout.yaml | 2 +- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 6 +- + Documentation/driver-api/nvmem.rst | 15 + + MAINTAINERS | 12 + + drivers/nvmem/Kconfig | 4 + + drivers/nvmem/Makefile | 1 + + drivers/nvmem/brcm_nvram.c | 3 + + drivers/nvmem/core.c | 341 ++++++++++++++------- + drivers/nvmem/imx-ocotp.c | 34 +- + drivers/nvmem/layouts/Kconfig | 23 ++ + drivers/nvmem/layouts/Makefile | 7 + + drivers/nvmem/layouts/onie-tlv.c | 244 +++++++++++++++ + drivers/nvmem/layouts/sl28vpd.c | 153 +++++++++ + drivers/nvmem/sunxi_sid.c | 23 +- + drivers/of/property.c | 6 +- + include/linux/etherdevice.h | 14 + + include/linux/nvmem-consumer.h | 17 +- + include/linux/nvmem-provider.h | 97 +++++- + include/linux/of.h | 25 ++ + 19 files changed, 882 insertions(+), 145 deletions(-) + create mode 100644 drivers/nvmem/layouts/Kconfig + create mode 100644 drivers/nvmem/layouts/Makefile + create mode 100644 drivers/nvmem/layouts/onie-tlv.c + create mode 100644 drivers/nvmem/layouts/sl28vpd.c +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 (26520c34e621 Drivers: hv: Enable vmbus driver for nested root partition) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Auto-merging arch/x86/include/asm/hyperv-tlfs.h +Auto-merging arch/x86/kernel/cpu/mshyperv.c +Merge made by the 'ort' strategy. + arch/x86/include/asm/hyperv-tlfs.h | 17 ++++++++- + arch/x86/include/asm/mshyperv.h | 72 +++++++++++++++++++++++--------------- + arch/x86/kernel/cpu/mshyperv.c | 72 ++++++++++++++++++++++++++++++++++++++ + drivers/hv/hv.c | 18 ++++++---- + drivers/hv/hv_common.c | 9 +++-- + drivers/hv/vmbus_drv.c | 2 +- + include/asm-generic/hyperv-tlfs.h | 1 + + include/asm-generic/mshyperv.h | 1 + + 8 files changed, 152 insertions(+), 40 deletions(-) +Merging auxdisplay/auxdisplay (ddf75a86aba2 auxdisplay: hd44780: Fix potential memory leak in hd44780_remove()) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Merge made by the 'ort' strategy. + drivers/auxdisplay/hd44780.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging kgdb/kgdb/for-next (c1cb81429df4 kdb: Fix the putarea helper function) +$ git merge -m Merge branch 'kgdb/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git kgdb/kgdb/for-next +Already up to date. +Merging hmm/hmm (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'hmm' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git hmm/hmm +Already up to date. +Merging cfi/cfi/next (312310928417 Linux 5.18-rc1) +$ git merge -m Merge branch 'cfi/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git cfi/cfi/next +Already up to date. +Merging trivial/for-next (081c8919b02b Documentation: remove trivial tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git trivial/for-next +Already up to date. +Merging mhi/mhi-next (ccf27a84fe9a bus: mhi: host: Update mhi driver description) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. + drivers/bus/mhi/Makefile | 4 ++-- + drivers/bus/mhi/host/init.c | 2 +- + 2 files changed, 3 insertions(+), 3 deletions(-) +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 cxl/next (589c3357370a PCI/CXL: Export native CXL error reporting control) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Auto-merging drivers/cxl/pci.c +CONFLICT (content): Merge conflict in drivers/cxl/pci.c +Resolved 'drivers/cxl/pci.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4bbad9ce7ff6] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git +$ git diff -M --stat --summary HEAD^.. + drivers/acpi/pci_root.c | 3 + + drivers/cxl/core/Makefile | 3 + + drivers/cxl/core/pci.c | 112 ++++++++++++++++++++ + drivers/cxl/core/trace.c | 5 + + .../trace/events/cxl.h => drivers/cxl/core/trace.h | 11 +- + drivers/cxl/cxl.h | 2 + + drivers/cxl/cxlpci.h | 3 + + drivers/cxl/pci.c | 114 --------------------- + drivers/pci/probe.c | 1 + + include/linux/pci.h | 1 + + tools/testing/cxl/Kbuild | 2 + + 11 files changed, 136 insertions(+), 121 deletions(-) + create mode 100644 drivers/cxl/core/trace.c + rename include/trace/events/cxl.h => drivers/cxl/core/trace.h (94%) +$ git am -3 ../patches/0001-fix-up-for-cxl-fix-cxl_report_and_clear-RAS-UE-addr-.patch +Applying: fix up for "cxl: fix cxl_report_and_clear() RAS UE addr mis-assignment" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/cxl/core/pci.c +$ git add -A . +$ git commit -v -a --amend +[master f08f679861c1] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git + Date: Mon Jan 16 13:50:20 2023 +1100 +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 (2a5b4ccf0de1 efi/earlycon: Speed up scrolling by disregarding empty space) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Merge made by the 'ort' strategy. + drivers/firmware/efi/earlycon.c | 41 ++++++++++++++++++++++++++++++----------- + 1 file changed, 30 insertions(+), 11 deletions(-) +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 (001aa6a1f0a0 Merge branch 'slab/for-6.3/cleanups' into slab/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/for-next +Merge made by the 'ort' strategy. + mm/slab.c | 18 +++++++----------- + mm/slub.c | 2 +- + 2 files changed, 8 insertions(+), 12 deletions(-) +Merging random/master (512dee0c00ad Merge tag 'x86-urgent-2023-01-04' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git random/master +Already up to date. +Merging landlock/next (366617a69e60 selftests/landlock: Skip overlayfs tests when not supported) +$ 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 +++++++++++++++++++-- + tools/testing/selftests/landlock/fs_test.c | 47 ++++++++++++++++++++++++++++++ + 2 files changed, 78 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 +CONFLICT (content): Merge conflict in fs/buffer.c +Auto-merging fs/cramfs/inode.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/buffer.c' using previous resolution. +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 14fda6848876] 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 (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-next/execve' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git execve/for-next/execve +Already up to date. +Merging bitmap/bitmap-for-next (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/cpumask.h +Auto-merging include/linux/nodemask.h +Auto-merging kernel/sched/topology.c +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 | 162 +++++++++++++++------------ + 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, 437 insertions(+), 212 deletions(-) +Merging hte/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (e80c0e628e88 Merge branch 'for-next/hardening' into for-next/kspp) +$ 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 +Auto-merging include/linux/compiler_attributes.h +Auto-merging lib/Kconfig.debug +Auto-merging net/rxrpc/ar-internal.h +Merge made by the 'ort' strategy. + arch/x86/include/uapi/asm/kvm.h | 4 +- + drivers/gpu/drm/nouveau/include/nvfw/hs.h | 2 +- + drivers/misc/lkdtm/heap.c | 1 + + drivers/scsi/megaraid/megaraid_sas_fusion.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 5 +- + drivers/soc/ixp4xx/ixp4xx-npe.c | 6 +- + include/linux/compiler_attributes.h | 5 ++ + include/linux/fortify-string.h | 7 +++ + lib/Kconfig.debug | 9 +++ + lib/memcpy_kunit.c | 15 ++++- + net/rxrpc/ar-internal.h | 2 +- + security/loadpin/loadpin.c | 89 +++++++++++++++++------------ + 12 files changed, 98 insertions(+), 49 deletions(-) +Merging kspp-gustavo/for-next/kspp (b942a520d9e4 bcache: Replace zero-length arrays with DECLARE_FLEX_ARRAY() helper) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Auto-merging include/linux/exportfs.h +Merge made by the 'ort' strategy. + drivers/md/bcache/bcache_ondisk.h | 8 ++++---- + include/linux/exportfs.h | 2 +- + include/linux/memremap.h | 2 +- + 3 files changed, 6 insertions(+), 6 deletions(-) +Merging iommufd/for-next (b062007c63eb iommu: Remove IOMMU_CAP_INTR_REMAP) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/iommu/iommu.c +Auto-merging drivers/iommu/s390-iommu.c +Auto-merging drivers/vfio/vfio_iommu_type1.c +Auto-merging include/linux/iommu.h +Merge made by the 'ort' strategy. + arch/s390/include/asm/msi.h | 17 ++++++++++++++++ + drivers/iommu/amd/iommu.c | 5 ++--- + drivers/iommu/intel/iommu.c | 2 -- + drivers/iommu/intel/irq_remapping.c | 3 ++- + drivers/iommu/iommu.c | 24 +++++++++++++++++++++++ + drivers/iommu/iommufd/device.c | 4 +--- + drivers/iommu/s390-iommu.c | 2 -- + drivers/irqchip/irq-gic-v3-its.c | 4 ++-- + drivers/vfio/vfio_iommu_type1.c | 16 +++------------ + include/linux/iommu.h | 2 +- + include/linux/irqdomain.h | 29 ++++----------------------- + include/linux/msi.h | 17 ++++++++++++++++ + kernel/irq/irqdomain.c | 39 ------------------------------------- + kernel/irq/msi.c | 27 +++++++++++++++++++++++++ + 14 files changed, 100 insertions(+), 91 deletions(-) + create mode 100644 arch/s390/include/asm/msi.h +Merging mm-stable/mm-stable (12b98f333f6b Merge branch 'master' into mm-stable) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Merge made by the 'ort' strategy. +Merging mm-nonmm-stable/mm-nonmm-stable (18e6340365ea Merge branch 'master' into mm-nonmm-stable) +$ 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 +Merge made by the 'ort' strategy. + tools/testing/selftests/filesystems/fat/run_fat_tests.sh | 0 + 1 file changed, 0 insertions(+), 0 deletions(-) + mode change 100644 => 100755 tools/testing/selftests/filesystems/fat/run_fat_tests.sh +Merging mm/mm-everything (aaca8e59ba2b Merge branch 'mm-nonmm-unstable' into mm-everything) + ca5716c63719 ("kernel/irq/manage.c: disable_irq() might sleep.") +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging Documentation/admin-guide/cgroup-v1/memory.rst +CONFLICT (content): Merge conflict in Documentation/admin-guide/cgroup-v1/memory.rst +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging Documentation/mm/page_owner.rst +Auto-merging Documentation/translations/zh_CN/mm/page_owner.rst +Auto-merging MAINTAINERS +Auto-merging arch/alpha/kernel/process.c +Auto-merging arch/arm64/include/asm/pgtable.h +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging drivers/iommu/tegra-smmu.c +Auto-merging fs/buffer.c +CONFLICT (content): Merge conflict in fs/buffer.c +Auto-merging fs/cifs/file.c +Auto-merging fs/cramfs/inode.c +Auto-merging fs/f2fs/checkpoint.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/ntfs3/inode.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/mm_types.h +Auto-merging io_uring/io_uring.c +Auto-merging kernel/pid_namespace.c +Auto-merging lib/Kconfig.debug +Auto-merging mm/Kconfig +Auto-merging mm/kasan/kasan.h +Auto-merging mm/slab.c +Auto-merging mm/slub.c +Auto-merging tools/perf/builtin-kmem.c +Auto-merging tools/testing/selftests/Makefile +Resolved 'Documentation/admin-guide/cgroup-v1/memory.rst' using previous resolution. +Resolved 'fs/buffer.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5d2e1943d3df] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-kernel-mm-damon | 29 + + Documentation/admin-guide/cgroup-v1/memory.rst | 13 +- + Documentation/admin-guide/mm/damon/reclaim.rst | 9 + + Documentation/admin-guide/mm/damon/usage.rst | 85 ++- + Documentation/admin-guide/mm/hugetlbpage.rst | 6 +- + .../admin-guide/mm/idle_page_tracking.rst | 2 +- + Documentation/admin-guide/mm/ksm.rst | 7 + + Documentation/admin-guide/mm/numaperf.rst | 8 +- + Documentation/admin-guide/mm/pagemap.rst | 4 +- + Documentation/admin-guide/sysctl/kernel.rst | 25 +- + Documentation/core-api/pin_user_pages.rst | 31 +- + Documentation/dev-tools/kasan.rst | 17 + + Documentation/fault-injection/fault-injection.rst | 65 ++ + Documentation/mm/balance.rst | 2 +- + Documentation/mm/damon/index.rst | 22 +- + Documentation/mm/damon/maintainer-profile.rst | 62 ++ + Documentation/mm/highmem.rst | 41 +- + Documentation/mm/multigen_lru.rst | 8 +- + Documentation/mm/page_owner.rst | 2 +- + Documentation/mm/slub.rst | 2 +- + Documentation/mm/transhuge.rst | 24 +- + Documentation/mm/unevictable-lru.rst | 30 +- + Documentation/mm/zsmalloc.rst | 168 +++++ + Documentation/translations/zh_CN/mm/page_owner.rst | 2 +- + MAINTAINERS | 14 +- + arch/alpha/include/asm/pgtable.h | 40 +- + arch/alpha/kernel/process.c | 2 +- + arch/alpha/kernel/smp.c | 4 +- + arch/arc/include/asm/pgtable-bits-arcv2.h | 26 +- + arch/arm/include/asm/pgtable-2level.h | 3 + + arch/arm/include/asm/pgtable-3level.h | 3 + + arch/arm/include/asm/pgtable.h | 34 +- + arch/arm64/include/asm/pgtable.h | 1 - + arch/arm64/kernel/vdso.c | 6 +- + arch/csky/abiv1/inc/abi/pgtable-bits.h | 13 +- + arch/csky/abiv2/inc/abi/pgtable-bits.h | 19 +- + arch/csky/include/asm/pgtable.h | 17 + + arch/hexagon/include/asm/pgtable.h | 36 +- + arch/ia64/include/asm/pgtable.h | 31 +- + arch/loongarch/include/asm/pgtable-bits.h | 4 + + arch/loongarch/include/asm/pgtable.h | 38 +- + arch/m68k/include/asm/mcf_pgtable.h | 35 +- + arch/m68k/include/asm/motorola_pgtable.h | 39 +- + arch/m68k/include/asm/pgtable_no.h | 6 - + arch/m68k/include/asm/sun3_pgtable.h | 38 +- + arch/microblaze/include/asm/pgtable.h | 44 +- + arch/mips/include/asm/pgtable-32.h | 88 ++- + arch/mips/include/asm/pgtable-64.h | 23 +- + arch/mips/include/asm/pgtable.h | 35 + + arch/nios2/include/asm/pgtable-bits.h | 3 + + arch/nios2/include/asm/pgtable.h | 37 +- + arch/openrisc/include/asm/pgtable.h | 40 +- + arch/parisc/include/asm/pgtable.h | 40 +- + arch/powerpc/include/asm/book3s/32/pgtable.h | 37 +- + arch/powerpc/include/asm/book3s/64/pgtable.h | 1 - + arch/powerpc/include/asm/nohash/32/pgtable.h | 22 +- + arch/powerpc/include/asm/nohash/32/pte-40x.h | 6 +- + arch/powerpc/include/asm/nohash/32/pte-44x.h | 18 +- + arch/powerpc/include/asm/nohash/32/pte-85xx.h | 4 +- + arch/powerpc/include/asm/nohash/64/pgtable.h | 24 +- + arch/powerpc/include/asm/nohash/pgtable.h | 15 + + arch/powerpc/include/asm/nohash/pte-e500.h | 1 - + arch/powerpc/kernel/pci_64.c | 2 +- + arch/powerpc/kernel/vdso.c | 4 +- + arch/powerpc/platforms/book3s/vas-api.c | 2 +- + arch/powerpc/platforms/pseries/vas.c | 3 +- + arch/riscv/include/asm/pgtable-bits.h | 3 + + arch/riscv/include/asm/pgtable.h | 28 +- + arch/riscv/kernel/vdso.c | 6 +- + arch/s390/include/asm/pgtable.h | 1 - + arch/s390/kernel/vdso.c | 4 +- + arch/s390/mm/gmap.c | 2 +- + arch/sh/include/asm/pgtable_32.h | 53 +- + arch/sh/kernel/cpu/sh4/sq.c | 2 +- + arch/sparc/include/asm/pgtable_32.h | 26 +- + arch/sparc/include/asm/pgtable_64.h | 37 +- + arch/sparc/include/asm/pgtsrmmu.h | 14 +- + arch/um/include/asm/pgtable.h | 36 +- + arch/x86/entry/vdso/vma.c | 4 +- + arch/x86/include/asm/pgtable-2level.h | 26 +- + arch/x86/include/asm/pgtable-3level.h | 26 +- + arch/x86/include/asm/pgtable.h | 27 +- + arch/x86/kvm/emulate.c | 8 +- + arch/x86/mm/fault.c | 23 +- + arch/xtensa/include/asm/pgtable.h | 31 +- + drivers/android/binder_alloc.c | 2 +- + drivers/block/zram/zram_drv.c | 8 +- + drivers/char/mem.c | 2 +- + drivers/iommu/tegra-smmu.c | 4 +- + drivers/misc/open-dice.c | 14 +- + fs/afs/write.c | 116 +-- + fs/btrfs/extent_io.c | 57 +- + fs/buffer.c | 54 +- + fs/ceph/addr.c | 58 +- + fs/cifs/file.c | 32 +- + fs/cramfs/inode.c | 2 +- + fs/ext4/inode.c | 65 +- + fs/ext4/move_extent.c | 46 +- + fs/f2fs/checkpoint.c | 49 +- + fs/f2fs/data.c | 84 ++- + fs/f2fs/node.c | 72 +- + fs/fat/namei_vfat.c | 4 +- + fs/freevxfs/vxfs_subr.c | 6 +- + fs/freevxfs/vxfs_super.c | 2 +- + fs/gfs2/aops.c | 64 +- + fs/gfs2/glops.c | 2 +- + fs/gfs2/log.c | 2 +- + fs/gfs2/meta_io.c | 2 +- + fs/hfs/bnode.c | 1 + + fs/hfsplus/xattr.c | 18 +- + fs/hugetlbfs/inode.c | 28 +- + fs/jbd2/commit.c | 33 +- + fs/jbd2/journal.c | 3 +- + fs/mpage.c | 16 +- + fs/nilfs2/btnode.c | 2 +- + fs/nilfs2/btree.c | 16 +- + fs/nilfs2/gcinode.c | 2 +- + fs/nilfs2/mdt.c | 4 +- + fs/nilfs2/page.c | 59 +- + fs/nilfs2/segment.c | 46 +- + fs/ntfs/aops.c | 10 +- + fs/ntfs/aops.h | 2 +- + fs/ntfs/compress.c | 6 +- + fs/ntfs/dir.c | 4 +- + fs/ntfs/inode.c | 6 +- + fs/ntfs/mft.c | 2 +- + fs/ntfs/namei.c | 4 +- + fs/ntfs/runlist.c | 2 +- + fs/ntfs/super.c | 12 +- + fs/ntfs3/inode.c | 33 +- + fs/ocfs2/journal.c | 16 +- + fs/proc/base.c | 1 + + fs/proc/cmdline.c | 1 + + fs/proc/task_mmu.c | 2 +- + fs/proc/task_nommu.c | 2 +- + fs/ramfs/file-nommu.c | 2 +- + fs/reiserfs/journal.c | 4 +- + fs/reiserfs/tail_conversion.c | 2 +- + fs/romfs/mmap-nommu.c | 2 +- + fs/userfaultfd.c | 26 +- + include/asm-generic/error-injection.h | 7 +- + include/asm-generic/hugetlb.h | 16 +- + include/linux/buffer_head.h | 5 +- + include/linux/damon.h | 62 ++ + include/linux/error-injection.h | 3 +- + include/linux/fs.h | 2 + + include/linux/gfp_types.h | 12 +- + include/linux/highmem.h | 4 +- + include/linux/huge_mm.h | 13 +- + include/linux/hugetlb.h | 87 ++- + include/linux/hugetlb_cgroup.h | 8 +- + include/linux/jbd2.h | 2 - + include/linux/kasan.h | 36 +- + include/linux/kexec.h | 3 +- + include/linux/maple_tree.h | 8 +- + include/linux/memcontrol.h | 50 +- + include/linux/migrate.h | 1 + + include/linux/mm.h | 288 +++----- + include/linux/mm_inline.h | 36 +- + include/linux/mm_types.h | 171 +++-- + include/linux/mmu_notifier.h | 13 +- + include/linux/mmzone.h | 131 +++- + include/linux/page_ext.h | 19 + + include/linux/pagemap.h | 32 +- + include/linux/pagevec.h | 13 +- + include/linux/pagewalk.h | 11 +- + include/linux/percpu_counter.h | 6 +- + include/linux/pgtable.h | 29 - + include/linux/pid_namespace.h | 19 + + include/linux/rmap.h | 11 +- + include/linux/shmem_fs.h | 10 +- + include/linux/slab_def.h | 2 +- + include/linux/slub_def.h | 2 +- + include/linux/string.h | 1 + + include/linux/swap.h | 4 +- + include/linux/swapops.h | 6 +- + include/linux/userfaultfd_k.h | 2 +- + include/linux/util_macros.h | 2 + + include/linux/vmalloc.h | 1 + + include/linux/writeback.h | 2 - + include/linux/xarray.h | 3 +- + include/trace/events/cma.h | 32 +- + include/trace/events/huge_memory.h | 3 +- + include/trace/events/mmflags.h | 1 - + include/uapi/linux/fcntl.h | 1 + + include/uapi/linux/memfd.h | 4 + + init/initramfs.c | 4 +- + io_uring/io_uring.c | 2 +- + kernel/crash_core.c | 4 +- + kernel/events/uprobes.c | 2 +- + kernel/kexec.c | 4 +- + kernel/kexec_core.c | 94 ++- + kernel/kexec_file.c | 11 +- + kernel/kthread.c | 5 + + kernel/pid_namespace.c | 5 + + kernel/pid_sysctl.h | 60 ++ + kernel/user_namespace.c | 2 +- + lib/Kconfig.debug | 35 + + lib/Makefile | 2 + + lib/dhry.h | 358 +++++++++ + lib/dhry_1.c | 283 +++++++ + lib/dhry_2.c | 175 +++++ + lib/dhry_run.c | 85 +++ + lib/error-inject.c | 2 +- + lib/maple_tree.c | 122 ++-- + lib/percpu_counter.c | 25 +- + lib/test_printf.c | 8 +- + lib/test_vmalloc.c | 8 +- + mm/Kconfig | 21 +- + mm/Kconfig.debug | 2 +- + mm/cma.c | 16 +- + mm/compaction.c | 26 +- + mm/damon/core.c | 39 + + mm/damon/ops-common.c | 38 +- + mm/damon/ops-common.h | 2 +- + mm/damon/paddr.c | 163 +++-- + mm/damon/reclaim.c | 19 + + mm/damon/sysfs-schemes.c | 373 +++++++++- + mm/damon/vaddr.c | 68 +- + mm/debug.c | 8 +- + mm/debug_vm_pgtable.c | 129 +++- + mm/fadvise.c | 5 +- + mm/filemap.c | 84 +-- + mm/folio-compat.c | 11 + + mm/gup.c | 10 +- + mm/hmm.c | 15 +- + mm/huge_memory.c | 166 +++-- + mm/hugetlb.c | 370 +++++----- + mm/hugetlb_cgroup.c | 8 +- + mm/internal.h | 90 ++- + mm/kasan/common.c | 18 +- + mm/kasan/hw_tags.c | 60 ++ + mm/kasan/kasan.h | 27 + + mm/khugepaged.c | 292 +++++--- + mm/kmemleak.c | 83 ++- + mm/kmsan/instrumentation.c | 23 + + mm/ksm.c | 188 ++++- + mm/madvise.c | 108 ++- + mm/mapping_dirty_helpers.c | 2 +- + mm/memcontrol.c | 78 +- + mm/memfd.c | 56 +- + mm/memory-failure.c | 120 +-- + mm/memory.c | 69 +- + mm/memory_hotplug.c | 2 +- + mm/mempolicy.c | 37 +- + mm/migrate.c | 813 +++++++++++++++------ + mm/migrate_device.c | 4 +- + mm/mlock.c | 280 +++---- + mm/mmap.c | 28 +- + mm/mmu_notifier.c | 10 - + mm/mprotect.c | 107 ++- + mm/mremap.c | 2 +- + mm/nommu.c | 70 +- + mm/oom_kill.c | 2 +- + mm/page-writeback.c | 103 ++- + mm/page_alloc.c | 191 +++-- + mm/page_ext.c | 14 +- + mm/page_idle.c | 47 +- + mm/page_io.c | 1 - + mm/page_owner.c | 1 + + mm/page_reporting.c | 6 +- + mm/page_table_check.c | 1 + + mm/page_vma_mapped.c | 9 +- + mm/pagewalk.c | 6 +- + mm/rmap.c | 279 ++++--- + mm/shmem.c | 65 +- + mm/slab.c | 2 +- + mm/slab.h | 8 + + mm/slab_common.c | 1 - + mm/slub.c | 2 +- + mm/swap.c | 46 +- + mm/swap_state.c | 65 +- + mm/swapfile.c | 7 +- + mm/userfaultfd.c | 49 +- + mm/util.c | 24 +- + mm/vmalloc.c | 199 +++-- + mm/vmscan.c | 738 +++++++++++++------ + mm/workingset.c | 7 +- + mm/z3fold.c | 2 - + mm/zsmalloc.c | 72 +- + net/ipv4/tcp.c | 7 +- + scripts/bloat-o-meter | 3 +- + scripts/checkpatch.pl | 2 + + scripts/gdb/linux/mm.py | 222 ++++++ + scripts/gdb/vmlinux-gdb.py | 1 + + scripts/spelling.txt | 4 + + security/apparmor/policy_unpack.c | 11 +- + tools/cgroup/memcg_shrinker.py | 3 +- + tools/{vm => mm}/.gitignore | 0 + tools/{vm => mm}/Makefile | 0 + tools/{vm => mm}/page-types.c | 0 + tools/{vm => mm}/page_owner_sort.c | 65 +- + tools/{vm => mm}/slabinfo-gnuplot.sh | 0 + tools/{vm => mm}/slabinfo.c | 0 + tools/perf/builtin-kmem.c | 1 - + tools/testing/radix-tree/maple.c | 50 +- + tools/testing/selftests/Makefile | 2 +- + .../selftests/damon/debugfs_rm_non_contexts.sh | 2 +- + tools/testing/selftests/damon/sysfs.sh | 31 +- + tools/testing/selftests/kselftest_deps.sh | 6 +- + tools/testing/selftests/memfd/fuse_test.c | 1 + + tools/testing/selftests/memfd/memfd_test.c | 341 ++++++++- + tools/testing/selftests/{vm => mm}/.gitignore | 0 + tools/testing/selftests/{vm => mm}/Makefile | 8 +- + .../{vm => mm}/charge_reserved_hugetlb.sh | 0 + tools/testing/selftests/{vm => mm}/check_config.sh | 0 + .../testing/selftests/{vm => mm}/compaction_test.c | 0 + tools/testing/selftests/{vm => mm}/config | 0 + tools/testing/selftests/{vm => mm}/cow.c | 231 ++++++ + tools/testing/selftests/{vm => mm}/gup_test.c | 0 + tools/testing/selftests/{vm => mm}/hmm-tests.c | 0 + tools/testing/selftests/{vm => mm}/hugepage-mmap.c | 0 + .../testing/selftests/{vm => mm}/hugepage-mremap.c | 0 + tools/testing/selftests/{vm => mm}/hugepage-shm.c | 0 + .../selftests/{vm => mm}/hugepage-vmemmap.c | 0 + .../testing/selftests/{vm => mm}/hugetlb-madvise.c | 0 + .../{vm => mm}/hugetlb_reparenting_test.sh | 0 + tools/testing/selftests/{vm => mm}/khugepaged.c | 0 + .../selftests/{vm => mm}/ksm_functional_tests.c | 105 ++- + tools/testing/selftests/{vm => mm}/ksm_tests.c | 0 + tools/testing/selftests/{vm => mm}/madv_populate.c | 0 + .../selftests/{vm => mm}/map_fixed_noreplace.c | 0 + tools/testing/selftests/{vm => mm}/map_hugetlb.c | 0 + tools/testing/selftests/{vm => mm}/map_populate.c | 0 + tools/testing/selftests/{vm => mm}/memfd_secret.c | 0 + tools/testing/selftests/{vm => mm}/migration.c | 0 + .../selftests/{vm => mm}/mlock-random-test.c | 0 + tools/testing/selftests/{vm => mm}/mlock2-tests.c | 0 + tools/testing/selftests/{vm => mm}/mlock2.h | 0 + tools/testing/selftests/{vm => mm}/mrelease_test.c | 0 + .../selftests/{vm => mm}/mremap_dontunmap.c | 0 + tools/testing/selftests/{vm => mm}/mremap_test.c | 119 ++- + .../testing/selftests/{vm => mm}/on-fault-limit.c | 0 + tools/testing/selftests/{vm => mm}/pkey-helpers.h | 0 + tools/testing/selftests/{vm => mm}/pkey-powerpc.h | 0 + tools/testing/selftests/{vm => mm}/pkey-x86.h | 0 + .../testing/selftests/{vm => mm}/protection_keys.c | 0 + tools/testing/selftests/{vm => mm}/run_vmtests.sh | 0 + tools/testing/selftests/{vm => mm}/settings | 0 + tools/testing/selftests/{vm => mm}/soft-dirty.c | 0 + .../selftests/{vm => mm}/split_huge_page_test.c | 0 + tools/testing/selftests/{vm => mm}/test_hmm.sh | 0 + tools/testing/selftests/{vm => mm}/test_vmalloc.sh | 0 + tools/testing/selftests/{vm => mm}/thuge-gen.c | 0 + .../selftests/{vm => mm}/transhuge-stress.c | 0 + tools/testing/selftests/{vm => mm}/userfaultfd.c | 0 + tools/testing/selftests/{vm => mm}/util.h | 0 + .../testing/selftests/{vm => mm}/va_128TBswitch.c | 0 + .../testing/selftests/{vm => mm}/va_128TBswitch.sh | 0 + .../selftests/{vm => mm}/virtual_address_range.c | 0 + tools/testing/selftests/{vm => mm}/vm_util.c | 0 + tools/testing/selftests/{vm => mm}/vm_util.h | 0 + .../selftests/{vm => mm}/write_hugetlb_memory.sh | 0 + .../selftests/{vm => mm}/write_to_hugetlbfs.c | 0 + 354 files changed, 9136 insertions(+), 3629 deletions(-) + create mode 100644 Documentation/mm/damon/maintainer-profile.rst + create mode 100644 kernel/pid_sysctl.h + create mode 100644 lib/dhry.h + create mode 100644 lib/dhry_1.c + create mode 100644 lib/dhry_2.c + create mode 100644 lib/dhry_run.c + create mode 100644 scripts/gdb/linux/mm.py + rename tools/{vm => mm}/.gitignore (100%) + rename tools/{vm => mm}/Makefile (100%) + rename tools/{vm => mm}/page-types.c (100%) + rename tools/{vm => mm}/page_owner_sort.c (95%) + rename tools/{vm => mm}/slabinfo-gnuplot.sh (100%) + rename tools/{vm => mm}/slabinfo.c (100%) + rename tools/testing/selftests/{vm => mm}/.gitignore (100%) + rename tools/testing/selftests/{vm => mm}/Makefile (96%) + rename tools/testing/selftests/{vm => mm}/charge_reserved_hugetlb.sh (100%) + rename tools/testing/selftests/{vm => mm}/check_config.sh (100%) + rename tools/testing/selftests/{vm => mm}/compaction_test.c (100%) + rename tools/testing/selftests/{vm => mm}/config (100%) + rename tools/testing/selftests/{vm => mm}/cow.c (86%) + rename tools/testing/selftests/{vm => mm}/gup_test.c (100%) + rename tools/testing/selftests/{vm => mm}/hmm-tests.c (100%) + rename tools/testing/selftests/{vm => mm}/hugepage-mmap.c (100%) + rename tools/testing/selftests/{vm => mm}/hugepage-mremap.c (100%) + rename tools/testing/selftests/{vm => mm}/hugepage-shm.c (100%) + rename tools/testing/selftests/{vm => mm}/hugepage-vmemmap.c (100%) + rename tools/testing/selftests/{vm => mm}/hugetlb-madvise.c (100%) + rename tools/testing/selftests/{vm => mm}/hugetlb_reparenting_test.sh (100%) + rename tools/testing/selftests/{vm => mm}/khugepaged.c (100%) + rename tools/testing/selftests/{vm => mm}/ksm_functional_tests.c (72%) + rename tools/testing/selftests/{vm => mm}/ksm_tests.c (100%) + rename tools/testing/selftests/{vm => mm}/madv_populate.c (100%) + rename tools/testing/selftests/{vm => mm}/map_fixed_noreplace.c (100%) + rename tools/testing/selftests/{vm => mm}/map_hugetlb.c (100%) + rename tools/testing/selftests/{vm => mm}/map_populate.c (100%) + rename tools/testing/selftests/{vm => mm}/memfd_secret.c (100%) + rename tools/testing/selftests/{vm => mm}/migration.c (100%) + rename tools/testing/selftests/{vm => mm}/mlock-random-test.c (100%) + rename tools/testing/selftests/{vm => mm}/mlock2-tests.c (100%) + rename tools/testing/selftests/{vm => mm}/mlock2.h (100%) + rename tools/testing/selftests/{vm => mm}/mrelease_test.c (100%) + rename tools/testing/selftests/{vm => mm}/mremap_dontunmap.c (100%) + rename tools/testing/selftests/{vm => mm}/mremap_test.c (84%) + rename tools/testing/selftests/{vm => mm}/on-fault-limit.c (100%) + rename tools/testing/selftests/{vm => mm}/pkey-helpers.h (100%) + rename tools/testing/selftests/{vm => mm}/pkey-powerpc.h (100%) + rename tools/testing/selftests/{vm => mm}/pkey-x86.h (100%) + rename tools/testing/selftests/{vm => mm}/protection_keys.c (100%) + rename tools/testing/selftests/{vm => mm}/run_vmtests.sh (100%) + mode change 100755 => 100644 + rename tools/testing/selftests/{vm => mm}/settings (100%) + rename tools/testing/selftests/{vm => mm}/soft-dirty.c (100%) + rename tools/testing/selftests/{vm => mm}/split_huge_page_test.c (100%) + rename tools/testing/selftests/{vm => mm}/test_hmm.sh (100%) + mode change 100755 => 100644 + rename tools/testing/selftests/{vm => mm}/test_vmalloc.sh (100%) + mode change 100755 => 100644 + rename tools/testing/selftests/{vm => mm}/thuge-gen.c (100%) + rename tools/testing/selftests/{vm => mm}/transhuge-stress.c (100%) + rename tools/testing/selftests/{vm => mm}/userfaultfd.c (100%) + rename tools/testing/selftests/{vm => mm}/util.h (100%) + rename tools/testing/selftests/{vm => mm}/va_128TBswitch.c (100%) + rename tools/testing/selftests/{vm => mm}/va_128TBswitch.sh (100%) + mode change 100755 => 100644 + rename tools/testing/selftests/{vm => mm}/virtual_address_range.c (100%) + rename tools/testing/selftests/{vm => mm}/vm_util.c (100%) + rename tools/testing/selftests/{vm => mm}/vm_util.h (100%) + rename tools/testing/selftests/{vm => mm}/write_hugetlb_memory.sh (100%) + rename tools/testing/selftests/{vm => mm}/write_to_hugetlbfs.c (100%) diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..87c48a4fe349 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230116 |