diff options
| -rw-r--r-- | Next/SHA1s | 358 | ||||
| -rw-r--r-- | Next/Trees | 360 | ||||
| -rw-r--r-- | Next/merge.log | 13585 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 14304 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..ff48d41e9cf6 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,358 @@ +Name SHA1 +---- ---- +origin 7c46948a6e9cf47ed03b0d489fde894ad46f1437 +fixes 9c9155a3509a2ebdb06d77c7a621e9685c802eac +mm-hotfixes 45bbaf86cceca8d7d8f450e3e3c9914f44d570f7 +kbuild-current 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +arc-current 30a0b95b1335e12efef89dd78518ed3e4a71a763 +arm-current 2f62847cf6ae49a54515421f67b1badffaa805f3 +arm64-fixes a428eb4b99ab80454f06ad256b25e930fe8a4954 +arm-soc-fixes d9b6c322fd33d55a254756b0269d644851899e5f +davinci-current 1b929c02afd37871d5afb9d498426f83432e71c2 +drivers-memory-fixes cb8fd6f75775165390ededea8799b60d93d9fe3e +tee-fixes 98268f2a2a9f1dddf20984f79fdc7b655d0e35fe +m68k-current 553b20b211c4153f8af6096fd52069bbdf955e23 +powerpc-fixes f12cd06109f47c2fb4b23a45ab55404c47ef7fae +s390-fixes 41e1992665a2701fa025a8b76970c43b4148446f +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 31e1be62abdebc28bd51d0999a25f0eea535b5af +fsverity-current ef7592e466ef7b2595fdfdfd23559a779f4b211a +net 7083df59abbc2b7500db312cac706493be0273ff +bpf e8c8fd9b8393d7064152c8806f5ac446d760a23e +ipsec b6ee896385380aa621102e8ea402ba12db1cabff +netfilter 7fb0269720d7d5359bc8349eef908a1c96866b65 +ipvs f2b0b5210f67c56a3bcdf92ff665fb285d6e0067 +wireless 80f8a66dede0a4b4e9e846765a97809c6fe49ce5 +rdma-fixes 6601fc0d15ffc20654e39486f9bef35567106d68 +sound-current 6a28a25d358079b7d0d144689f850aecacf63cba +sound-asoc-fixes e18c6da62edc780e4f4f3c9ce07bdacd69505182 +regmap-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +regulator-fixes 4bb3d82a1820c1b609ede8eb2332f3cb038c5840 +spi-fixes 9bab63a3e9498afd6a29cd3a43cf3ad4a4612b85 +pci-current 1b929c02afd37871d5afb9d498426f83432e71c2 +driver-core.current 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +tty.current 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +usb.current 2fa89458af9993fab8054daf827f38881e2ad473 +usb-serial-fixes 71dfd381a7c051f16a61f82fbd38a4cca563bdca +phy 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +staging.current 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +iio-fixes eb50cd5bfdac61627a5026566cf3b90ced7b141c +counter-current 1b929c02afd37871d5afb9d498426f83432e71c2 +char-misc.current 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +soundwire-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +thunderbolt-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +input-current 9c445d2637c938a800fcc8b5f0b10e60c94460c7 +crypto-current 736f88689c6912f05d0116917910603a7ba97de7 +vfio-fixes 51cdc8bc120ef6e42f6fb758341f5d91bc955952 +kselftest-fixes a49fb7218ed84a4c5e6c56b9fd933498b9730912 +modules-fixes 0254127ab977e70798707a7a2b757c9f3c971210 +dmaengine-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes c0f7ae27539fbac267384a7bfc58296ea7550d52 +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes 89c08aef8f8dcb5fc98ad8db7ca92c9dab1f26b0 +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +at91-fixes 9bfa2544dbd1133f0b0af4e967de3bb9c1e3a497 +omap-fixes 2a906db2824b75444982f5e9df870106982afca8 +kvm-fixes c2c46b10d52624376322b01654095a84611c7e09 +kvms390-fixes 0dd4cdccdab3d74bd86b868768a7dca216bcce7e +hwmon-fixes 2fbb848b65cde5b876cce52ebcb34de4aaa5a94a +nvdimm-fixes 472faf72b33d80aa8e7a99c9410c1a23d3bf0cd8 +cxl-fixes 19398821b25a9cde564265262e680ae1c2351be7 +btrfs-fixes e7757c1bc30e1e29bf201ad5e2e762273ed5e85b +vfs-fixes 9c7417b5ec440242bb5b64521acd53d4e19130c1 +dma-mapping-fixes 3be4562584bba603f33863a00c1c32eecf772ee6 +drivers-x86-fixes 1bc5d819f0b9784043ea08570e1b21107aa35739 +samsung-krzk-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +pinctrl-samsung-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +devicetree-fixes 064e32dc5b03114d0767893fecdaf7b5dfd8c286 +dt-krzk-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +scsi-fixes 0bfe63d075789456e9589457b29d6f9c279e3252 +drm-fixes 3f30a6e67ce49c0068f8058893326db46b6db11f +drm-intel-fixes 2255bbcdc39d5b0311968f86614ae4f25fdd465d +mmc-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +hyperv-fixes 25c94b051592c010abe92c85b0485f1faedc83f3 +soc-fsl-fixes 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v-fixes c1d6105869464635d8a2bcf87a43c05f4c0cfca4 +riscv-dt-fixes 43d5f5d63699724d47f0d9e0eae516a260d232b4 +riscv-soc-fixes 730892135b7db8260195a31a676ef28e0972fe48 +fpga-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +spdx 5dc4c995db9eb45f6373a956eb1f69460e69e6d4 +gpio-brgl-fixes 216f37366e86a6ddd34ed842cac3354f579ef48e +gpio-intel-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +pinctrl-intel-fixes 1b929c02afd37871d5afb9d498426f83432e71c2 +erofs-fixes e02ac3e7329f76c5de40cba2746cbe165f571dff +kunit-fixes db105c37a4d69d684c1edf2915557463d0ba172c +ubifs-fixes 7bdd6967fec5dda9c828ba5050a9f91540f59749 +memblock-fixes 115d9d77bb0f9152c60b6e8646369fa7f6167593 +nfsd-fixes 4bdbba54e9b1c769da8ded9abd209d765715e1d6 +irqchip-fixes 6c9f7434159b96231f5b27ab938f4766e3586b48 +renesas-fixes ab2866f12ca18747413ba41409231d44e0c6149b +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current f883675bf6522b52cd75dc3de791680375961769 +efi-fixes e1fabbc83cb1dd4ba63932faa86c9cacb8bf791e +zstd-fixes 0a2cbd1f53f3668f7a90284738c0ca52dd860791 +battery-fixes d137900f237ad41cf432f1e09c6ee3e584146757 +uml-fixes bd71558d585ac61cfd799db7f25e78dca404dd7a +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +rust-fixes 6618d69aa129a8fc613e64775d5019524c6f231b +drm-misc-fixes 343c700480982214dc4f834f536a49a4098e556a +kbuild fd43a7525d8017b3b7123be0b75efb144889e63e +clang-format 781121a7f6d11d7cae44982f174ea82adeec7db0 +perf 5670ebf54bd26482f57a094c53bdc562c106e0a9 +compiler-attributes 6cf1ab89c9e75ed8f3432563c212d688b6d3563b +dma-mapping 3622b86f49f84e52fb41fee9eb55f9290613dfc3 +asm-generic 32975c491ee410598b33201344c123fcc81a7c33 +arc f2906aa863381afb0015a9eb7fefad885d4e5a56 +arm c6b7e9e37e3d9966e608e086502e2a804d33f6df +arm64 f2c8f3ff5aa6b76cc14e0e725a23b2aa267349b8 +arm-perf 4998897b1e96d624bf094e5785b27023e17ba570 +arm-soc 822f49f2891e0d743ee52c05f22a98318fe91ce0 +amlogic 46b1c99fb30c6897aba2f90605644f9e26ae5f0e +asahi-soc 1b929c02afd37871d5afb9d498426f83432e71c2 +aspeed 03f90343f5b559035974ead191a9c4dedc3690f0 +at91 78712fb8154879607512945270e59c696ae592ac +broadcom 9b385edf71bd78a75c3c33f2ed2c3f413e447a05 +davinci eaafab7e8e268c18a66e6dfbd5ecea55a7a129c2 +drivers-memory 682a91c4375f853ec1be943797f530916c1b73ec +imx-mxs 6e2964c3dc83a7c9999f49e6e6e6f814de58f0f4 +mediatek eb6fd30ef65f749549d02d0fbe9063ad70f477a5 +mvebu 80502ffab2fa92ba9777e381efea2efddc348d13 +omap f68a6fc5807388854f3b54a5331c6cb3e88cc9b4 +qcom 97c57426d969ad47c009d73de9e82659bc35dd35 +renesas 5f4935f3f05dc7d4b4995c32164702f43b8cbf0a +reset 1b929c02afd37871d5afb9d498426f83432e71c2 +rockchip 4c20692e9cb96bded04483921e5d803f34fb7dee +samsung-krzk 5e8b8afd175eed020b077fb4dad7368193d8a6a7 +scmi 672583a235f626e0a63a426c392ace33878239aa +stm32 2f33df889e998c6e5eb35bfef56cf2c72d053c9a +sunxi 7879da4e62f19471a919792c2e965de52c95c8b7 +tee 4a56b125ba20784fe2f24830019a369dd898c98a +tegra dc2b15fc18a39a6aa1d4ddfe5e8cf56c4e287673 +ti 9ae21ac445e911e3541985c20052fc05d60f6879 +xilinx a18426505c2b720ab37ccb23b7eb1d52c24e0f0d +clk 71854f780c8b593cb5fb304b57e16926a4f8c5da +clk-imx 1b929c02afd37871d5afb9d498426f83432e71c2 +clk-renesas bd176e46e9c23f669b28630cc8f3fb1b89fd610e +clk-samsung b35f27fe73d8c86fe40125e063b28007e961b862 +csky 4a3ec00957fdf182be705d46e77acacc430f7d65 +loongarch 5dc4c995db9eb45f6373a956eb1f69460e69e6d4 +m68k 553b20b211c4153f8af6096fd52069bbdf955e23 +m68knommu 43558085185a4026cd4301a7f0ed8bae5398ad15 +microblaze 5cfe469c2654c3a4dda8504b1209abdd8b379e95 +mips 88603b6dc419445847923fcb7fe5080067a30f98 +openrisc 34a0bac084e49324c29e6d0984d24096e02c6314 +parisc-hd 32125c5c95f2086e7069969dbc6d55907071adb1 +powerpc 53ab112a95086d10dc353ea4f979abb01644bbb6 +powerpc-objtool 1b929c02afd37871d5afb9d498426f83432e71c2 +soc-fsl 4b0986a3613c92f4ec1bdc7f60ec66fea135991f +risc-v 9d5567ccf96fb2f1eb83d531eee23ead4aa8f2a3 +riscv-dt d9c36d016f6112e636f18a49a5f779c7f8667deb +riscv-soc f3460326e38d6a084fb5b3348125a802567a3690 +s390 fe27e533c967b718c6efeb6ec82caad58c9e9aa8 +uml 43ee0357e15b0cfd0a9e331494ef88c92fadac7d +xtensa 4414c1f5c7a375eaa108676a56e12cc8234eb647 +pidfd 6a857ab5b57cdeb16d7ea75591a0ae3c6ec0750a +vfs-idmapping f48ed993526eaa053fed60b49059123cb6eca37d +fscrypt 5dc4c995db9eb45f6373a956eb1f69460e69e6d4 +fscache 0885eacdc81f920c3e0554d5615e69a66504a28d +afs a9eb558a5bea66cc43950632f5fffec6b5795233 +btrfs 5966d38820036576f625be46f107d814e4081a68 +ceph 8e1858710d9a71d88acd922f2e95d1eddb90eea0 +cifs d11e2b43a4c3ca06522205bb22a5d59ecdf626a5 +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs c1cc2db216078f9b1e29c991b1b9177c26757162 +erofs b7bfaa761d760e72a969d116517eaa12e404c262 +exfat 5742d6a467d1073b2515255c4a90287b2e87d4e6 +ext3 085cf7b7e2ef7bdd88c8f2f56a17d756bd18f1a4 +ext4 1da18e38cb97e9521e93d63034521a9649524f64 +f2fs 7a2b15cfa8dbbd54beb4e2ce7b2f42eb0ad00425 +fsverity 245edf445c3421584f541307cd7a8cd847c3d8d7 +fuse 1cc4606d19e3710bfab3f6704b87ff9580493c69 +gfs2 2d5a4e7c82f17c2d87e616aac75e0acf087981a0 +jfs a60dca73a1a8079d867b2c2e9549440346c1ba83 +ksmbd a34dc4a9b9e2fb3a45c179a60bb0b26539c96189 +nfs 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +nfs-anna 7e8436728e22181c3f12a5dbabd35ed3a8b8c593 +nfsd f1291b416498d5a3bec6d824676ef713cef9551d +ntfs3 57c94236401b8a918b1153f2dfc68f077481bd97 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 00628764be5640efc67b22a8c08030e649e5fa0c +ubifs 8d0960731a26abae7b3479b5c7dd2a23cf622718 +v9fs 1a4f69ef15ec29b213e2b086b2502644e8ef76ee +v9fs-ericvh 32a145a90935cb4d755125c9caec0be16173bdd0 +xfs 601a27ea09a317d0fe2895df7d875381fb393041 +zonefs 43592c46375a056b411b065acf2d37fc1e3ab251 +iomap 471859f57d42537626a56312cfb50cd6acee09ae +djw-vfs a79168a0c00d710420c1758f6c38df89e12f0763 +file-locks c65454a947263dfdf482076388aaed60af84ca2f +iversion 58a033c9a3e003e048a0431a296e58c6b363b02b +vfs 557e0248a8a0e3d448ef1e92e6509ec56e21a981 +printk 930348ab0ad9a2bb688b5ed02ebdd5801ded4c9d +pci 78913b41945a256110184470dbfe4b27bfacd379 +pstore 88603b6dc419445847923fcb7fe5080067a30f98 +hid 06f8ed62c952e7aa4fd4123754eaf2ed7576d694 +i2c 726ba204f4c7178967baf650cb0b25d9e999be59 +i3c e826acc18bc7bdf4278bf8928caa3a0cd4065432 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging f9b70de51c899be761b9270ca618597ecc877402 +jc_docs a16abc68e66c86ca9d80c4a04a2103ef7ed1a40f +v4l-dvb 6599e683db1bf22fee74302c47e31b9a42a1c3d2 +v4l-dvb-next 7120d6bfd6d0b26b49958f429701996f2d3e2c2a +pm 0bb04b623f4c836a9df3199616369010dbf5ce17 +cpufreq-arm 471be3641bd758c02bd1360f1ab105689cbb4f8f +cpupower 1b929c02afd37871d5afb9d498426f83432e71c2 +devfreq 497e92ab8c8ea709edd846ebb8907e784ed00bf5 +opp 93c697b41d14387a0c6e9ed32233ce2f7d61ca9b +thermal a2c81dc59d41e92362ab7d41d0c15471ea50637d +dlm 723b197bbdf1e0adbab772b8e5e022c40db6a9fe +rdma ed73a505480d5413675a5a5a79466d5c661f88c2 +net-next 0313afe8b83a0ab888966c914f9e3812e8edcf98 +bpf-next 0164776a2ce782a342b66b7980055e96efff746c +ipsec-next 9f92752788d719a4978d31082c98300274dd6ffc +mlx5-next c4d508fbe54af3119e01672299514bfc83dfd59f +netfilter-next 677fb7525331375ba2f90f4bc94a80b9b6e697a3 +ipvs-next f5be9caf7bf022ab550f62ea68f1c1bb8f5287ee +bluetooth ef017002b93b8c5213c3a3e31fdc463bb6358cba +wireless-next 4ca69027691a0039279b64cfa0aa511d9c9fde59 +mtd a30144c02c84614ed160ab70e38fcf7b024a1bb0 +nand a2cfa6a24c61bf2178048397f6512ebb15e1ebfe +spi-nor 55398beb0846a9eca38db5250c9e7b3e59d407ca +crypto d6b7ec11062e116f44a504f73f16c97e1cc53bd0 +drm 68de345e101ce9a24e5c8849e69dd0dba2e8c9b2 +drm-misc 851a4a77a9f6441bd73625fe6dbc29c814ae681f +amdgpu f732e2b3c6b3882e0648a4e44ff4eafaf998ad47 +drm-intel d3eb347da1148fdb1c2462ae83090a4553d3f46f +drm-tegra 900cd8f065de8d867bc436c1ba05873dc893f2cb +drm-msm 1d233b1cb149ec78c20fac58331b27bb460f9558 +drm-msm-lumag 1d233b1cb149ec78c20fac58331b27bb460f9558 +imx-drm 927d8fd465adbaaad6cce82f840d489d7c378f29 +etnaviv 30527af2bed11a81afdbc70e999e290a27c86f26 +fbdev ee9fffdc3887a46eab3209bc46b228b543c75fa6 +regmap 7b3c4c370c09313e22b555e79167e73d233611d1 +sound 47c59e0c213fc87d054bda9c9e0e31e82dfae0d4 +sound-asoc 51a56d3e1a9165f7249aed6bc199844a2446616c +modules fbed4fea6422a237382bf317db88a37993955f3b +input 8aaec1177521eed07240ec5ac2bc55b2a1c35b42 +block 7d02a82b9775cef44c1a86d661aeb900e65d24de +device-mapper 6bfba8b202b0964230bbd48fcf475e44beea0bd9 +libata 38d431229bfbe175b41274faa856e5b0a1ebe70d +pcmcia 15e74c6c1ce2d388e967f32cdaa83ca034fa6452 +mmc b1d908e6c71ea7cf2d7952e97461f320a0c6277f +mfd dd77f5fa97d3b2b066743647aad080314c476d74 +backlight 718c35c8d5947633a617cded7f78961616edfc5d +battery 4e9498b835ab31b83fc32fae4f77426f668010ac +regulator e3d31788f630b7b9c2bb7739f0ad5ff9280c3c28 +security 88603b6dc419445847923fcb7fe5080067a30f98 +apparmor 1b929c02afd37871d5afb9d498426f83432e71c2 +integrity b8dc57947379ca02500540bf942ecb42a30bfe92 +keys 2d743660786ec51f5c1fefd5782bbdee7b227db0 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 88603b6dc419445847923fcb7fe5080067a30f98 +smack 1a3065e92046e57f60d7c9a48acae0d0badefe36 +tomoyo 5fc44ba8be52c92b8fc87e9a8244e0bd737de6ab +tpmdd b0474a20b153b2b640c7d60af3cdaa267742a1bc +watchdog 1b929c02afd37871d5afb9d498426f83432e71c2 +iommu 28dcba7e10b61ea4b89c960a977e8e3c6fc140ca +audit 88603b6dc419445847923fcb7fe5080067a30f98 +devicetree 8da765cca292a812988077ca8fbef8be151c2d0b +dt-krzk 9fac79ef28652a706c02de1cc978274492b93b49 +mailbox 53c60d1004270045d63cdee91aa77c145282d7e4 +spi 44eb7d6da222ee061111443debe21271343bea15 +tip 610b3c408ab575b559aa282627a11130020f5ecc +clockevents e09903cea09ece394cc8da060cc133ad76596632 +edac 4c5be17ae44513686885ad939471cc2bd758237e +irqchip 6ed54e1789a29d3f1557454cc7d2eb9c10d1d37b +ftrace 14b7bc94a4f6fee3fcfba0177c697cba08cf18fc +rcu d0df85c4fd09faf32c1081d2aae3835b8dbcc7be +kvm 7cb79f433e75b05d1635aefaa851cfcd1cb7dc4f +kvm-arm 7e819b68a4f011d8e33258d2f1fd7c70ca6d07aa +kvms390 99b63f55dc514a357c2ecf25e9aab149879329f0 +kvm-x86 503f0315c97739d3f8e645c500d81757dfbf76be +xen-tip ca0d80778e48f207d139ce91eb2371e47489f21e +percpu b9819165bb455bfdce37086c622a18cce2dd2f5e +workqueues c63a2e52d5e08f01140d7b76c08a78e15e801f03 +drivers-x86 b7233286202b21bb8313d9efb0abe997de96ecc7 +chrome-platform 478f32ab4daae8a9bae3723d1040c6e4e3a09bc5 +hsi 1b929c02afd37871d5afb9d498426f83432e71c2 +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj 83bb0ba2c46bb26415d320cf576a435f824d2847 +ipmi 041fae9c105ae342a4245cf1e0dc56a23fbb9d3c +driver-core 0b2a1a3938aad80fb19cb53cbbd4679eeb37e3a8 +usb 9e6f4c8b880bb34851c21db3869e3096d113ccbf +thunderbolt 6ce3563520be90a155706bafc186fc264a13850e +usb-serial b7bfaa761d760e72a969d116517eaa12e404c262 +tty ed0400ad547c0b88d2f06ecf22a089eb2e84c9b7 +char-misc 99ba2ad1db623df79456b8556b3f4900f394c8c2 +accel 4dc7c58023e86352abead441e2f257c752a13562 +coresight a646ca099b1811f23a7c1eee58aaf38628ec5e83 +fpga c82e5aa87205d117cc1c2bc0db0a7cdc74f71eae +icc 6f773d4b3bfec02afa382d515d41e07bfb2eb707 +iio 354f23ac2c8703d170354577738edad159a7d37b +phy-next fb1ff01307ee3133ae609ad11ebd87379ce5bd9b +soundwire 545c365185a47672b1d5cc13c84057a1e874993c +extcon 2e85d0a0201d0cb466313ad434f7b25f14135300 +gnss 1b929c02afd37871d5afb9d498426f83432e71c2 +vfio 7658aeda334a624634b2ed0538feee374e24e1e3 +staging 2529ca2114028182f3871b2a27143e61de99321e +counter-next 01f714ee022ecb2667ca8ba909138b1af4cfff2c +mux ea327624ae52936b2c0eccffd9369983ca2d08e3 +dmaengine 4b23603a251d24022f2fa48ee67610eb245a4115 +cgroup 32a47817d07557ffca9992964c514fd79bda6fba +scsi e9f87b59c685600bf02d544b9575464951821ce2 +scsi-mkp 5adca38c0b97502e35e4df00d9edf4e85ba21dab +vhost 66c78aa2b9ba0b1c504e15e636351f94b340fd1d +rpmsg 10de8156ed71d3dbd7e9099aa76e67ea2c37d4ff +gpio e73f0f0ee7541171d89f2e2491130c7771ba58d3 +gpio-brgl 5bb837ebcfe30c49fd68c4879fa086e8da71e0c5 +gpio-intel 1b929c02afd37871d5afb9d498426f83432e71c2 +pinctrl 3859bc00d62e2d378aa59e46806419b092c19617 +pinctrl-intel 88f8ac47bddc1674b2840c733f1120a548037199 +pinctrl-renesas 698485cd875be1109b2130e0ff6c927010a6b56b +pinctrl-samsung 1b929c02afd37871d5afb9d498426f83432e71c2 +pwm 8fa22f4b88e877c0811d2a0e506cf56755add554 +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 88a51b4f2e65ca4378a81ff0925fad076e82e177 +kselftest 65177e47d3035c083cff034ffbfc7ab750a4675c +kunit 1b929c02afd37871d5afb9d498426f83432e71c2 +kunit-next 5835ffc27381c2d32c3f0d7b575cb3397555ab47 +livepatching cad81ab739979d3d628250e763eace86ad2514e5 +rtc 24304a87158aab01b4ccb9b2638c2c623a9a7bd4 +nvdimm 305a72efa791c826fe84768ca55e31adc4113ea8 +at24 1b929c02afd37871d5afb9d498426f83432e71c2 +ntb 0310a30a9395cb535fd47151ae18eb6891897f2d +seccomp 0fb0624b15d21622c214617fda5c05a203b04564 +fsi 35af9fb49bc5c6d61ef70b501c3a56fe161cce3e +slimbus 1b929c02afd37871d5afb9d498426f83432e71c2 +nvmem ef26c0349eb5a615dab2272d08d1d5de4ac9cd4c +xarray 69cb69ea55420388b444ee30b1530ec15ab584f7 +hyperv 96ec2939620c48a503d9c89865c0c230d6f955e4 +auxdisplay ddf75a86aba2cfb7ec4497e8692b60c8c8fe0ee7 +kgdb c1cb81429df462eca1b6ba615cddd21dd3103c46 +hmm 1b929c02afd37871d5afb9d498426f83432e71c2 +cfi 3123109284176b1532874591f7c81f3837bbdc17 +trivial 081c8919b02bc1077279cd03972d7ec6f53a6c6b +mhi 1fd1028934567d34a6a745d4de4ec0859e748945 +memblock 80c2fe022ef5d29f3bafee90c37dbcff18cab57a +cxl 589c3357370a596ef7c99c00baca8ac799fce531 +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi 240645b94108b30043095694c49fe3ee013ffbcc +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 001aa6a1f0a0d32827e4dfbdce1ad7b81a47d9e4 +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock 366617a69e60610912836570546f118006ebc7cb +rust dec1df547d812a5ced4de29e7eadcfa0484bec1e +sysctl 0dff89c4488f90c01807d9c12023433703206523 +execve 88603b6dc419445847923fcb7fe5080067a30f98 +bitmap 2386459394d2a46964829a00c48a08a23ead94ed +hte 1b929c02afd37871d5afb9d498426f83432e71c2 +kspp be1923932d0c097012fe4b2c119e93757e3fd1cf +kspp-gustavo b942a520d9e43bc31f0808d2f2267a1ddba75518 +iommufd 84798f2849942bb5e8817417adfdfa6241df2835 +mm-stable 9a3f21fe5cb9f5654ccad7ba712d868f7de66e39 +mm-nonmm-stable 5dc4c995db9eb45f6373a956eb1f69460e69e6d4 +mm 47950d0b936865a97b0fa0a21abb6ce70258a5c5 diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..52ae9af85b76 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,360 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#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 +nfsd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-fixes +irqchip-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git#irq/irqchip-fixes +renesas-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git#fixes +broadcom-fixes git https://github.com/Broadcom/stblinux.git#fixes +perf-current git git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git#perf/urgent +efi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#urgent +zstd-fixes git https://github.com/terrelln/linux.git#zstd-linus +battery-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git#fixes +uml-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git#fixes +asahi-soc-fixes git https://github.com/AsahiLinux/linux.git#asahi-soc/fixes +iommufd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-rc +rust-fixes git https://github.com/Rust-for-Linux/linux.git#rust-fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +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/linux.git#for-next +fscache git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#fscache-next +afs git git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git#afs-next +btrfs git git://git.kernel.org/pub/scm/linux/kernel/git/kdave/linux.git#for-next +ceph git git://github.com/ceph/ceph-client.git#master +cifs git git://git.samba.org/sfrench/cifs-2.6.git#for-next +configfs git git://git.infradead.org/users/hch/configfs.git#for-next +ecryptfs git git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git#next +erofs git git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git#dev +exfat git git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git#dev +ext3 git git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git#for_next +ext4 git git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git#dev +f2fs git git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git#dev +fsverity git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-next +fuse git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git#for-next +gfs2 git git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git#for-next +jfs git git://github.com/kleikamp/linux-shaggy.git#jfs-next +ksmbd git https://github.com/smfrench/smb3-kernel.git#ksmbd-for-next +nfs git git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git#linux-next +nfs-anna git git://git.linux-nfs.org/projects/anna/linux-nfs.git#linux-next +nfsd git git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux#nfsd-next +ntfs3 git https://github.com/Paragon-Software-Group/linux-ntfs3.git#master +orangefs git git://git.kernel.org/pub/scm/linux/kernel/git/hubcap/linux#for-next +overlayfs git git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git#overlayfs-next +ubifs git git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git#next +v9fs git git://github.com/martinetd/linux#9p-next +v9fs-ericvh git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#ericvh/for-next +xfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#for-next +zonefs git git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git#for-next +iomap git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#iomap-for-next +djw-vfs git git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git#vfs-for-next +file-locks git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#locks-next +iversion git git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git#iversion-next +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/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 +kvm-x86 git https://github.com/kvm-x86/linux.git#next +xen-tip git git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git#linux-next +percpu git git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git#for-next +workqueues git git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git#for-next +drivers-x86 git git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git#for-next +chrome-platform git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-next +hsi git git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-hsi.git#for-next +leds git git://git.kernel.org/pub/scm/linux/kernel/git/pavel/linux-leds.git#for-next +leds-lj git git://git.kernel.org/pub/scm/linux/kernel/git/lee/leds.git#for-leds-next +ipmi git git://github.com/cminyard/linux-ipmi.git#for-next +driver-core git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-next +usb git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-next +thunderbolt git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#next +usb-serial git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-next +tty git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-next +char-misc git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-next +accel git git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git#habanalabs-next +coresight git git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git#next +fpga git git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git#for-next +icc git git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git#icc-next +iio git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#togreg +phy-next git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#next +soundwire git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#next +extcon git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git#extcon-next +gnss git git://git.kernel.org/pub/scm/linux/kernel/git/johan/gnss.git#gnss-next +vfio git git://github.com/awilliam/linux-vfio.git#next +staging git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-next +counter-next git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-next +mux git https://gitlab.com/peda-linux/mux.git#for-next +dmaengine git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#next +cgroup git git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git#for-next +scsi git git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git#for-next +scsi-mkp git git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git#for-next +vhost git git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git#linux-next +rpmsg git git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git#for-next +gpio git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-gpio.git#for-next +gpio-brgl git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#gpio/for-next +gpio-intel git git://git.kernel.org/pub/scm/linux/kernel/git/andy/linux-gpio-intel.git#for-next +pinctrl git git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git#for-next +pinctrl-intel git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git#for-next +pinctrl-renesas git git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git#renesas-pinctrl +pinctrl-samsung git git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git#for-next +pwm git git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git#for-next +userns git git://git.kernel.org/pub/scm/linux/kernel/git/ebiederm/user-namespace.git#for-next +ktest git git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git#for-next +kselftest git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#next +kunit git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#test +kunit-next git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#kunit +livepatching git git://git.kernel.org/pub/scm/linux/kernel/git/livepatching/livepatching#for-next +rtc git git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git#rtc-next +nvdimm git git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git#libnvdimm-for-next +at24 git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#at24/for-next +ntb git https://github.com/jonmason/ntb.git#ntb-next +seccomp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/seccomp +fsi git git://git.kernel.org/pub/scm/linux/kernel/git/joel/fsi.git#next +slimbus git git://git.kernel.org/pub/scm/linux/kernel/git/srini/slimbus.git#for-next +nvmem git git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git#for-next +xarray git git://git.infradead.org/users/willy/xarray.git#main +hyperv git git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git#hyperv-next +auxdisplay git https://github.com/ojeda/linux.git#auxdisplay +kgdb git git://git.kernel.org/pub/scm/linux/kernel/git/danielt/linux.git#kgdb/for-next +hmm git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#hmm +cfi git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#cfi/next +trivial git git://git.kernel.org/pub/scm/linux/kernel/git/jikos/trivial.git#for-next +mhi git git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git#mhi-next +memblock git git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git#for-next +cxl git git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git#next +zstd git https://github.com/terrelln/linux.git#zstd-next +efi git git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git#next +unicode git git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git#for-next +slab git git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git#for-next +random git git://git.kernel.org/pub/scm/linux/kernel/git/crng/random.git#master +landlock git git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git#next +rust git https://github.com/Rust-for-Linux/linux.git#rust-next +sysctl git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#sysctl-next +execve git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/execve +bitmap git https://github.com/norov/linux.git#bitmap-for-next +hte git git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git#for-next +kspp git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/kspp +kspp-gustavo git git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git#for-next/kspp +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next +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..84ceaab77a75 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,13585 @@ +$ date -R +Fri, 27 Jan 2023 10:23:36 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 72% (6218/8564)
Updating files: 73% (6252/8564)
Updating files: 74% (6338/8564)
Updating files: 75% (6423/8564)
Updating files: 76% (6509/8564)
Updating files: 77% (6595/8564)
Updating files: 78% (6680/8564)
Updating files: 79% (6766/8564)
Updating files: 80% (6852/8564)
Updating files: 81% (6937/8564)
Updating files: 82% (7023/8564)
Updating files: 83% (7109/8564)
Updating files: 84% (7194/8564)
Updating files: 85% (7280/8564)
Updating files: 86% (7366/8564)
Updating files: 87% (7451/8564)
Updating files: 88% (7537/8564)
Updating files: 89% (7622/8564)
Updating files: 90% (7708/8564)
Updating files: 91% (7794/8564)
Updating files: 92% (7879/8564)
Updating files: 93% (7965/8564)
Updating files: 94% (8051/8564)
Updating files: 95% (8136/8564)
Updating files: 96% (8222/8564)
Updating files: 97% (8308/8564)
Updating files: 98% (8393/8564)
Updating files: 99% (8479/8564)
Updating files: 100% (8564/8564)
Updating files: 100% (8564/8564), done. +HEAD is now at 7bf70dbb1882 Merge tag 'vfio-v6.2-rc6' of https://github.com/awilliam/linux-vfio +Merging origin/master (7c46948a6e9c Merge tag 'fs.fuse.acl.v6.2-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 7bf70dbb1882..7c46948a6e9c +Fast-forward (no commit created; -m option ignored) + MAINTAINERS | 12 ++-- + arch/arm64/kvm/guest.c | 2 +- + arch/arm64/kvm/vgic/vgic-v3.c | 25 ++++---- + arch/arm64/kvm/vgic/vgic-v4.c | 8 ++- + arch/arm64/kvm/vgic/vgic.h | 1 + + arch/x86/kvm/vmx/vmx.c | 21 +++---- + drivers/scsi/device_handler/scsi_dh_alua.c | 5 +- + drivers/scsi/hpsa.c | 2 +- + drivers/scsi/iscsi_tcp.c | 20 +++++-- + drivers/scsi/libiscsi.c | 38 +++++++++--- + drivers/target/target_core_tmr.c | 4 +- + drivers/ufs/core/ufshcd.c | 29 ++++----- + fs/ext4/xattr.c | 11 ++-- + fs/fuse/acl.c | 68 +++++++++++++++++++--- + fs/fuse/dir.c | 6 +- + fs/fuse/fuse_i.h | 6 +- + fs/fuse/inode.c | 21 ++++--- + fs/fuse/xattr.c | 51 ---------------- + fs/nfsd/filecache.c | 61 +++++++++++-------- + include/scsi/libiscsi.h | 2 + + include/ufs/ufshcd.h | 2 + + kernel/module/main.c | 26 +++++++-- + rust/kernel/print.rs | 29 +++++---- + .../selftests/kvm/x86_64/nx_huge_pages_test.c | 2 +- + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 7 +-- + 25 files changed, 268 insertions(+), 191 deletions(-) +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 (45bbaf86ccec lib: parser: optimize match_NUMBER apis to use local array) +$ 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 +- + arch/ia64/kernel/sys_ia64.c | 7 +- + drivers/of/fdt.c | 6 +- + fs/aio.c | 20 +- + fs/freevxfs/Kconfig | 2 +- + fs/squashfs/xattr_id.c | 2 +- + include/linux/swap.h | 3 +- + lib/Kconfig.debug | 2 +- + lib/Kconfig.kcsan | 2 +- + lib/maple_tree.c | 22 +- + lib/parser.c | 39 ++-- + lib/test_maple_tree.c | 89 ++++++++ + mm/compaction.c | 1 + + mm/hugetlb.c | 3 + + mm/khugepaged.c | 22 +- + mm/ksm.c | 8 +- + mm/memcontrol.c | 67 ++---- + mm/memory.c | 17 +- + mm/mprotect.c | 8 +- + mm/mremap.c | 25 ++- + mm/swapfile.c | 20 +- + mm/vmscan.c | 9 +- + mm/zsmalloc.c | 237 ++++++++++++++++++--- + .../selftests/filesystems/fat/run_fat_tests.sh | 0 + tools/testing/selftests/vm/hugetlb-madvise.c | 1 - + 26 files changed, 453 insertions(+), 175 deletions(-) + mode change 100644 => 100755 tools/testing/selftests/filesystems/fat/run_fat_tests.sh +Merging kbuild-current/fixes (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Already up to date. +Merging arc-current/for-curr (30a0b95b1335 Linux 6.1-rc3) +$ git merge -m Merge branch 'for-curr' of git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git arc-current/for-curr +Already up to date. +Merging arm-current/fixes (2f62847cf6ae ARM: 9287/1: Reduce __thumb2__ definition to crypto files that require it) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Merge made by the 'ort' strategy. + arch/arm/Makefile | 2 +- + arch/arm/crypto/Makefile | 7 ++++++- + arch/arm/mm/nommu.c | 2 +- + arch/arm/mm/proc-macros.S | 1 + + 4 files changed, 9 insertions(+), 3 deletions(-) +Merging arm64-fixes/for-next/fixes (a428eb4b99ab Partially revert "perf/arm-cmn: Optimise DTC counter accesses") +$ 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 +Merge made by the 'ort' strategy. + drivers/perf/arm-cmn.c | 7 ++++++- + 1 file changed, 6 insertions(+), 1 deletion(-) +Merging arm-soc-fixes/arm/fixes (d9b6c322fd33 ARM: dts: aspeed: Fix pca9849 compatible) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/aspeed-bmc-ibm-bonnell.dts | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +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 (41e1992665a2 s390: workaround invalid gcc-11 out of bounds read warning) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390-fixes/fixes +Already up to date. +Merging sparc/master (2d2b17d08bfc sparc: Unbreak the build) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git sparc/master +Auto-merging arch/sparc/mm/srmmu.c +Merge made by the 'ort' strategy. +Merging fscrypt-current/for-current (31e1be62abde MAINTAINERS: update fscrypt git repo) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt-current/for-current +Already up to date. +Merging fsverity-current/for-current (ef7592e466ef MAINTAINERS: update fsverity git repo, list, and patchwork) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging net/master (7083df59abbc net: mdio-mux-meson-g12a: force internal PHY off on mux switch) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/master +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + CREDITS | 7 + + Documentation/networking/bridge.rst | 2 +- + Documentation/networking/nf_conntrack-sysctl.rst | 10 +- + MAINTAINERS | 1 - + drivers/net/dsa/microchip/ksz9477_i2c.c | 2 +- + drivers/net/ethernet/adi/adin1110.c | 2 +- + drivers/net/ethernet/broadcom/tg3.c | 8 +- + drivers/net/ethernet/engleder/tsnep_main.c | 15 +- + drivers/net/ethernet/freescale/fec_main.c | 2 +- + drivers/net/ethernet/intel/iavf/iavf.h | 2 +- + drivers/net/ethernet/intel/iavf/iavf_ethtool.c | 10 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 113 ++++--- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 10 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 3 - + drivers/net/ethernet/intel/ice/ice_main.c | 25 +- + drivers/net/ethernet/microsoft/mana/gdma_main.c | 9 +- + drivers/net/ethernet/renesas/ravb_main.c | 10 +- + drivers/net/ethernet/renesas/rswitch.c | 22 +- + drivers/net/ethernet/renesas/rswitch.h | 12 + + drivers/net/mdio/mdio-mux-meson-g12a.c | 23 +- + include/net/mana/gdma.h | 3 + + include/uapi/linux/netfilter/nf_conntrack_sctp.h | 3 +- + include/uapi/linux/netfilter/nfnetlink_cttimeout.h | 3 +- + lib/nlattr.c | 3 + + net/core/net_namespace.c | 2 +- + net/ipv4/fib_semantics.c | 2 + + net/ipv4/metrics.c | 2 + + net/ipv6/ip6_output.c | 15 +- + net/mctp/af_mctp.c | 10 +- + net/mctp/route.c | 34 ++- + net/netfilter/nf_conntrack_proto_sctp.c | 170 +++++------ + net/netfilter/nf_conntrack_standalone.c | 16 - + net/netfilter/nft_set_rbtree.c | 332 +++++++++++++-------- + net/netlink/af_netlink.c | 38 ++- + net/netrom/nr_timer.c | 1 + + net/sched/sch_taprio.c | 1 - + net/sctp/bind_addr.c | 6 + + net/x25/af_x25.c | 6 + + 38 files changed, 535 insertions(+), 400 deletions(-) +Merging bpf/master (e8c8fd9b8393 Merge branch 'bpf, sockmap: Fix infinite recursion in sock_map_close') +$ 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/util_macros.h | 12 ++++ + kernel/bpf/btf.c | 4 +- + kernel/bpf/memalloc.c | 2 +- + kernel/bpf/verifier.c | 25 +++++-- + kernel/trace/bpf_trace.c | 3 +- + net/core/sock_map.c | 61 ++++++++-------- + net/ipv4/tcp_bpf.c | 4 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 81 +++++++++++++++++----- + .../selftests/bpf/verifier/search_pruning.c | 36 ++++++++++ + 9 files changed, 170 insertions(+), 58 deletions(-) +Merging ipsec/master (b6ee89638538 xfrm/compat: prevent potential spectre v1 gadget in xfrm_xlate32_attr()) +$ 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_compat.c | 4 +++- + net/xfrm/xfrm_interface_core.c | 54 ++++++++++++++++++++++++++++++++++++++---- + net/xfrm/xfrm_policy.c | 3 +++ + 3 files changed, 56 insertions(+), 5 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 (f2b0b5210f67 net/x25: Fix to not accept on connected socket) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/master +Already up to date. +Merging wireless/for-next (80f8a66dede0 Revert "wifi: mac80211: fix memory leak in ieee80211_if_add()") +$ 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 (6601fc0d15ff IB/hfi1: Restore allocated resources on failed copyout) +$ 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/hw/hfi1/file_ops.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging sound-current/for-linus (6a28a25d3580 ALSA: hda/realtek: Add Acer Predator PH315-54) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Merge made by the 'ort' strategy. + drivers/firewire/core-cdev.c | 4 +++- + sound/pci/hda/hda_bind.c | 2 ++ + sound/pci/hda/hda_codec.c | 1 - + sound/pci/hda/patch_realtek.c | 2 ++ + sound/pci/hda/patch_via.c | 3 +++ + sound/usb/quirks.c | 2 ++ + 6 files changed, 12 insertions(+), 2 deletions(-) +Merging sound-asoc-fixes/for-linus (e18c6da62edc ASoC: cs42l56: fix DT probe) +$ 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. + .../gpu/drm/bridge/synopsys/dw-hdmi-i2s-audio.c | 1 + + sound/soc/amd/acp-es8336.c | 6 ++++-- + sound/soc/amd/yc/acp6x-mach.c | 21 +++++++++++++++++++ + sound/soc/codecs/cs42l56.c | 6 ------ + sound/soc/codecs/wsa883x.c | 4 ++-- + 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_cs42l42.c | 3 +++ + sound/soc/intel/boards/sof_es8336.c | 14 +++++++------ + sound/soc/intel/boards/sof_nau8825.c | 5 +++-- + sound/soc/intel/boards/sof_rt5682.c | 5 +++-- + sound/soc/intel/boards/sof_ssp_amp.c | 5 ++--- + sound/soc/sof/ipc4-mtrace.c | 7 ++++--- + sound/soc/sof/sof-audio.c | 16 ++++++++------- + 17 files changed, 104 insertions(+), 49 deletions(-) +Merging regmap-fixes/for-linus (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Already up to date. +Merging regulator-fixes/for-linus (4bb3d82a1820 regulator: dt-bindings: samsung,s2mps14: add lost samsung,ext-control-gpios) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Merge made by the 'ort' strategy. + .../bindings/regulator/samsung,s2mps14.yaml | 21 +++++++++++++++++++-- + 1 file changed, 19 insertions(+), 2 deletions(-) +Merging spi-fixes/for-linus (9bab63a3e949 spi: spidev: fix a recursive locking error) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging drivers/spi/spidev.c +Merge made by the 'ort' strategy. + drivers/spi/spi-dw-core.c | 2 +- + drivers/spi/spidev.c | 21 ++++++++++++++++----- + 2 files changed, 17 insertions(+), 6 deletions(-) +Merging pci-current/for-linus (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (2241ab53cbb5 Linux 6.2-rc5) +$ 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 (2241ab53cbb5 Linux 6.2-rc5) +$ 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 (2fa89458af99 usb: gadget: f_uac2: Fix incorrect increment of bNumEndpoints) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/usb/dwc3/dwc3-qcom.c | 2 +- + drivers/usb/gadget/function/f_fs.c | 4 +++- + drivers/usb/gadget/function/f_uac2.c | 1 + + 4 files changed, 6 insertions(+), 2 deletions(-) +Merging usb-serial-fixes/usb-linus (71dfd381a7c0 USB: serial: option: add Quectel EM05CN modem) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (2241ab53cbb5 Linux 6.2-rc5) +$ 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 (2241ab53cbb5 Linux 6.2-rc5) +$ 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 (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Already up to date. +Merging input-current/for-linus (9c445d2637c9 Input: i8042 - add Clevo PCX0DX to i8042 quirk table) +$ 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 - + drivers/input/serio/i8042-acpipnpio.h | 7 +++++++ + 2 files changed, 7 insertions(+), 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 (51cdc8bc120e kvm/vfio: Fix potential deadlock on vfio group_lock) +$ git merge -m Merge branch 'for-linus' of git://github.com/awilliam/linux-vfio.git vfio-fixes/for-linus +Already up to date. +Merging kselftest-fixes/fixes (a49fb7218ed8 selftests: amd-pstate: Don't delete source files via Makefile) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Merge made by the 'ort' strategy. + tools/testing/selftests/amd-pstate/Makefile | 5 ----- + 1 file changed, 5 deletions(-) +Merging modules-fixes/modules-linus (0254127ab977 module: Don't wait for GOING modules) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine-fixes/fixes +Already up to date. +Merging backlight-fixes/for-backlight-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-backlight-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight-fixes/for-backlight-fixes +Already up to date. +Merging mtd-fixes/mtd/fixes (c0f7ae27539f MAINTAINERS: Update email of Tudor Ambarus) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (89c08aef8f8d media: videobuf2: set q->streaming later) +$ git merge -m Merge branch 'fixes' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-fixes/fixes +Merge made by the 'ort' strategy. + drivers/media/common/videobuf2/videobuf2-core.c | 5 ++--- + drivers/media/v4l2-core/v4l2-ctrls-api.c | 2 +- + 2 files changed, 3 insertions(+), 4 deletions(-) +Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'mips-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips-fixes/mips-fixes +Already up to date. +Merging at91-fixes/at91-fixes (9bfa2544dbd1 ARM: dts: at91: sam9x60: fix the ddr clock for sam9x60) +$ git merge -m Merge branch 'at91-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91-fixes/at91-fixes +Already up to date. +Merging omap-fixes/fixes (2a906db2824b Merge branch 'am5748-fix' into fixes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Already up to date. +Merging kvm-fixes/master (c2c46b10d526 KVM: selftests: Make reclaim_period_ms input always be positive) +$ 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 (19398821b25a cxl/pmem: Fix nvdimm unregistration when cxl_pmem driver is absent) +$ 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/acpi.c | 1 - + drivers/cxl/core/pmem.c | 42 ++++-------------------------------------- + drivers/cxl/pci.c | 7 +++++-- + drivers/cxl/pmem.c | 24 ++++++++++++++++++++++++ + 4 files changed, 33 insertions(+), 41 deletions(-) +Merging btrfs-fixes/next-fixes (e7757c1bc30e 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/raid56.c | 2 +- + fs/btrfs/volumes.c | 6 +++++- + fs/btrfs/zlib.c | 2 +- + 3 files changed, 7 insertions(+), 3 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 (1bc5d819f0b9 platform/x86: thinkpad_acpi: Fix profile modes on Intel platforms) +$ 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 +Merge made by the 'ort' strategy. + drivers/acpi/video_detect.c | 24 +------ + drivers/platform/x86/amd/pmc.c | 58 +++++++++++++++- + drivers/platform/x86/apple-gmux.c | 93 +++++-------------------- + drivers/platform/x86/asus-wmi.c | 17 +++-- + drivers/platform/x86/dell/dell-wmi-base.c | 3 + + drivers/platform/x86/gigabyte-wmi.c | 1 + + drivers/platform/x86/hp/hp-wmi.c | 6 +- + drivers/platform/x86/thinkpad_acpi.c | 11 +-- + include/linux/apple-gmux.h | 109 +++++++++++++++++++++++++++++- + 9 files changed, 211 insertions(+), 111 deletions(-) +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 (0bfe63d07578 scsi: device_handler: alua: Remove a might_sleep() annotation) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-fixes/fixes +Already up to date. +Merging drm-fixes/drm-fixes (3f30a6e67ce4 Merge tag 'amd-drm-fixes-6.2-2023-01-19' of https://gitlab.freedesktop.org/agd5f/linux 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 (2255bbcdc39d drm/i915/selftest: fix intel_selftest_modify_policy argument types) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/gt/intel_lrc.c | 37 +--------------------- + .../drm/i915/selftests/intel_scheduler_helpers.c | 3 +- + 2 files changed, 2 insertions(+), 38 deletions(-) +Merging mmc-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Already up to date. +Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Merge made by the 'ort' strategy. + .../devicetree/bindings/rtc/qcom-pm8xxx-rtc.yaml | 2 + + drivers/rtc/rtc-efi.c | 48 ++++++++++++---------- + drivers/rtc/rtc-sunplus.c | 4 +- + include/linux/efi.h | 3 +- + 4 files changed, 33 insertions(+), 24 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 (c1d610586946 riscv: Move call to init_cpu_topology() to later initialization stage) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/riscv/cpus.yaml | 2 +- + MAINTAINERS | 1 + + arch/riscv/include/asm/alternative-macros.h | 2 +- + arch/riscv/kernel/head.S | 2 +- + arch/riscv/kernel/probes/simulate-insn.c | 4 ++-- + arch/riscv/kernel/smpboot.c | 3 ++- + 6 files changed, 8 insertions(+), 6 deletions(-) +Merging riscv-dt-fixes/riscv-dt-fixes (43d5f5d63699 riscv: dts: sifive: fu740: fix size of pcie 32bit memory) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Already up to date. +Merging riscv-soc-fixes/riscv-soc-fixes (730892135b7d soc: microchip: mpfs: handle failed system service requests) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Merge made by the 'ort' strategy. + drivers/soc/microchip/mpfs-sys-controller.c | 6 ++++++ + 1 file changed, 6 insertions(+) +Merging fpga-fixes/fixes (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Already up to date. +Merging spdx/spdx-linus (5dc4c995db9e Linux 6.2-rc4) +$ 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 (216f37366e86 gpio: ep93xx: Make irqchip immutable) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpio/gpio-ep93xx.c | 36 ++++++++++++++++++++++-------------- + drivers/gpio/gpio-mxc.c | 3 ++- + drivers/gpio/gpiolib-acpi.c | 3 ++- + 3 files changed, 26 insertions(+), 16 deletions(-) +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 (e02ac3e7329f erofs: clean up parsing of fscache related options) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs-fixes/fixes +Already up to date. +Merging kunit-fixes/kunit-fixes (db105c37a4d6 kunit: Export kunit_running()) +$ 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 +Merge made by the 'ort' strategy. + lib/kunit/test.c | 1 + + 1 file changed, 1 insertion(+) +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 nfsd-fixes/nfsd-fixes (4bdbba54e9b1 nfsd: don't free files unconditionally in __nfsd_file_cache_purge) +$ git merge -m Merge branch 'nfsd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd-fixes/nfsd-fixes +Already up to date. +Merging irqchip-fixes/irq/irqchip-fixes (6c9f7434159b irqchip: IMX_MU_MSI should depend on ARCH_MXC) +$ git merge -m Merge branch 'irq/irqchip-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/maz/arm-platforms.git irqchip-fixes/irq/irqchip-fixes +Already up to date. +Merging renesas-fixes/fixes (ab2866f12ca1 arm64: dts: renesas: r8a779g0: Fix HSCIF0 interrupt number) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas-fixes/fixes +Already up to date. +Merging broadcom-fixes/fixes (9abf2313adc1 Linux 6.1-rc1) +$ git merge -m Merge branch 'fixes' of https://github.com/Broadcom/stblinux.git broadcom-fixes/fixes +Already up to date. +Merging perf-current/perf/urgent (f883675bf652 Merge tag 'gpio-fixes-for-v6.2-rc5' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux) +$ 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 (e1fabbc83cb1 efi: Remove Matthew Garrett as efivarfs maintainer) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (0a2cbd1f53f3 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 (6618d69aa129 rust: print: avoid evaluating arguments in `pr_*` macros in `unsafe` blocks) +$ 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 (343c70048098 drm/ssd130x: Init display before the SSD130X_DISPLAY_ON command) +$ 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/drm_fbdev_generic.c | 15 ++++--- + drivers/gpu/drm/drm_vma_manager.c | 76 +++++++++++++++++++++++--------- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- + drivers/gpu/drm/solomon/ssd130x.c | 18 +++----- + drivers/gpu/drm/vc4/vc4_hdmi.c | 3 +- + include/drm/drm_fb_helper.h | 12 +++++ + include/drm/drm_vma_manager.h | 1 + + 7 files changed, 85 insertions(+), 42 deletions(-) +Merging kbuild/for-next (fd43a7525d80 kbuild: fix trivial typo in comment) +$ 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 MAINTAINERS +Merge made by the 'ort' strategy. + .gitignore | 2 +- + Documentation/Makefile | 2 +- + Documentation/dontdiff | 1 - + Documentation/kbuild/makefiles.rst | 2148 +++++++++++++-------------- + MAINTAINERS | 2 +- + Makefile | 82 +- + arch/mips/Makefile | 13 +- + arch/mips/include/asm/asmmacro-32.h | 4 +- + arch/mips/include/asm/asmmacro.h | 42 +- + arch/mips/include/asm/fpregdef.h | 14 - + arch/mips/include/asm/mipsregs.h | 20 +- + arch/mips/kernel/genex.S | 2 +- + arch/mips/kernel/r2300_fpu.S | 4 +- + arch/mips/kernel/r4k_fpu.S | 12 +- + arch/mips/kvm/fpu.S | 6 +- + arch/mips/loongson2ef/Platform | 2 +- + arch/powerpc/Makefile | 2 +- + arch/powerpc/kernel/prom_init_check.sh | 9 +- + arch/powerpc/kernel/vdso/Makefile | 27 +- + arch/s390/kernel/vdso64/Makefile | 4 +- + arch/s390/purgatory/Makefile | 2 +- + arch/sh/boot/compressed/Makefile | 7 - + arch/x86/boot/compressed/Makefile | 2 +- + arch/x86/tools/Makefile | 2 +- + certs/extract-cert.c | 9 +- + drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 +- + init/Kconfig | 4 - + kernel/gen_kheaders.sh | 2 +- + rust/.gitignore | 1 - + rust/Makefile | 27 +- + scripts/.gitignore | 2 +- + scripts/Kbuild.include | 50 +- + scripts/Kconfig.include | 2 +- + scripts/Makefile | 9 +- + scripts/Makefile.build | 26 +- + scripts/Makefile.clang | 2 + + scripts/Makefile.compiler | 8 +- + scripts/Makefile.host | 24 +- + scripts/Makefile.lib | 45 +- + scripts/Makefile.modfinal | 2 +- + scripts/Makefile.package | 8 +- + scripts/as-version.sh | 2 +- + scripts/asn1_compiler.c | 4 +- + scripts/basic/fixdep.c | 238 ++- + scripts/bin2c.c | 36 - + scripts/checkkconfigsymbols.py | 13 +- + scripts/clang-tools/gen_compile_commands.py | 2 +- + scripts/clang-tools/run-clang-tools.py | 21 +- + scripts/diffconfig | 16 +- + scripts/kernel-doc | 4 +- + scripts/misc-check | 19 + + scripts/package/builddeb | 8 +- + scripts/package/mkdebian | 2 +- + scripts/package/mkspec | 6 +- + scripts/remove-stale-files | 28 +- + scripts/setlocalversion | 117 +- + scripts/tags.sh | 2 +- + 57 files changed, 1568 insertions(+), 1585 deletions(-) + delete mode 100644 scripts/bin2c.c + 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 (5670ebf54bd2 perf cs-etm: Ensure that Coresight timestamps don't go backwards) +$ git merge -m Merge branch 'perf/core' of git://git.kernel.org/pub/scm/linux/kernel/git/acme/linux.git perf/perf/core +Merge made by the 'ort' strategy. + tools/perf/Documentation/perf-c2c.txt | 2 +- + tools/perf/Documentation/perf-probe.txt | 2 +- + tools/perf/Documentation/perf-report.txt | 2 +- + tools/perf/Documentation/perf-script.txt | 2 +- + tools/perf/Documentation/perf-test.txt | 3 + + tools/perf/Documentation/perf-top.txt | 2 +- + tools/perf/Makefile.config | 4 - + tools/perf/arch/arm/util/auxtrace.c | 5 +- + tools/perf/arch/arm/util/cs-etm.c | 91 ++++++- + tools/perf/arch/arm64/util/pmu.c | 35 ++- + tools/perf/arch/x86/util/pmu.c | 12 +- + tools/perf/builtin-trace.c | 4 +- + .../arch/arm64/arm/neoverse-n2-v2/metrics.json | 273 +++++++++++++++++++++ + tools/perf/pmu-events/arch/arm64/sbsa.json | 30 +++ + tools/perf/pmu-events/arch/x86/mapfile.csv | 2 +- + tools/perf/pmu-events/jevents.py | 2 + + tools/perf/scripts/python/flamegraph.py | 107 ++++++-- + tools/perf/tests/Build | 1 + + tools/perf/tests/builtin-test.c | 3 + + tools/perf/tests/symbols.c | 150 +++++++++++ + tools/perf/tests/tests.h | 3 + + tools/perf/tests/workloads/thloop.c | 2 +- + tools/perf/util/cputopo.c | 9 +- + tools/perf/util/cs-etm-base.c | 34 ++- + tools/perf/util/cs-etm-decoder/cs-etm-decoder.c | 68 +++-- + tools/perf/util/cs-etm.c | 95 ++++++- + tools/perf/util/cs-etm.h | 16 +- + tools/perf/util/data-convert-bt.c | 4 +- + tools/perf/util/debug.c | 15 ++ + tools/perf/util/evsel.c | 4 +- + tools/perf/util/expr.c | 5 + + tools/perf/util/llvm-utils.c | 25 +- + tools/perf/util/pmu-hybrid.c | 27 +- + tools/perf/util/pmu.c | 183 ++++++-------- + tools/perf/util/pmu.h | 11 +- + tools/perf/util/python.c | 12 +- + .../perf/util/scripting-engines/trace-event-perl.c | 4 +- + .../util/scripting-engines/trace-event-python.c | 4 +- + tools/perf/util/sort.c | 5 +- + tools/perf/util/symbol-elf.c | 190 +++++++------- + tools/perf/util/symbol.c | 5 + + tools/perf/util/symbol.h | 1 + + tools/perf/util/trace-event.h | 19 ++ + 43 files changed, 1126 insertions(+), 347 deletions(-) + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-n2-v2/metrics.json + create mode 100644 tools/perf/pmu-events/arch/arm64/sbsa.json + create mode 100644 tools/perf/tests/symbols.c +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 (c6b7e9e37e3d 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/crypto/Kconfig | 2 + + arch/arm/crypto/ghash-ce-core.S | 382 +++++++++++++++++++++++++++++++++-- + arch/arm/crypto/ghash-ce-glue.c | 423 ++++++++++++++++++++++++++++++++++++++- + 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 +- + 12 files changed, 848 insertions(+), 43 deletions(-) + create mode 100644 arch/arm/include/asm/simd.h + delete mode 100644 arch/arm/mach-rda/Makefile +Merging arm64/for-next/core (f2c8f3ff5aa6 Merge branches 'for-next/sysreg', 'for-next/sme', 'for-next/kselftest', 'for-next/misc', 'for-next/sme2', 'for-next/tpidr2', 'for-next/scs', 'for-next/compat-hwcap', 'for-next/ftrace' and 'for-next/efi-boot-mmu-on' 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 +CONFLICT (content): Merge conflict in arch/arm64/Kconfig +Auto-merging arch/arm64/include/asm/efi.h +Auto-merging arch/arm64/include/asm/esr.h +Auto-merging arch/arm64/kernel/fpsimd.c +Auto-merging arch/arm64/kernel/ptrace.c +Auto-merging arch/arm64/kernel/signal.c +Auto-merging arch/arm64/tools/cpucaps +Auto-merging include/linux/compiler_attributes.h +Resolved 'arch/arm64/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master c5239ed5e370] Merge branch 'for-next/core' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/arm64/booting.rst | 10 + + Documentation/arm64/elf_hwcaps.rst | 18 + + Documentation/arm64/sme.rst | 55 +++- + arch/arm64/Kconfig | 21 +- + arch/arm64/Kconfig.platforms | 2 +- + arch/arm64/Makefile | 5 +- + arch/arm64/include/asm/cpufeature.h | 12 +- + arch/arm64/include/asm/efi.h | 2 + + arch/arm64/include/asm/el2_setup.h | 2 +- + arch/arm64/include/asm/esr.h | 1 + + arch/arm64/include/asm/fpsimd.h | 30 +- + arch/arm64/include/asm/fpsimdmacros.h | 22 ++ + arch/arm64/include/asm/ftrace.h | 15 +- + arch/arm64/include/asm/hwcap.h | 14 + + arch/arm64/include/asm/insn.h | 1 + + arch/arm64/include/asm/linkage.h | 4 +- + arch/arm64/include/asm/patching.h | 2 + + arch/arm64/include/asm/processor.h | 2 +- + arch/arm64/include/asm/scs.h | 7 +- + arch/arm64/include/asm/sysreg.h | 7 +- + arch/arm64/include/uapi/asm/hwcap.h | 6 + + arch/arm64/include/uapi/asm/sigcontext.h | 27 ++ + arch/arm64/kernel/asm-offsets.c | 4 + + arch/arm64/kernel/cpufeature.c | 59 +++- + arch/arm64/kernel/cpuinfo.c | 14 + + arch/arm64/kernel/entry-fpsimd.S | 30 +- + arch/arm64/kernel/entry-ftrace.S | 32 +- + arch/arm64/kernel/entry.S | 16 +- + arch/arm64/kernel/fpsimd.c | 52 +-- + arch/arm64/kernel/ftrace.c | 158 ++++++++- + arch/arm64/kernel/head.S | 112 +++++-- + arch/arm64/kernel/hyp-stub.S | 6 + + arch/arm64/kernel/idreg-override.c | 1 + + arch/arm64/kernel/image-vars.h | 5 +- + arch/arm64/kernel/patch-scs.c | 11 +- + arch/arm64/kernel/patching.c | 17 + + arch/arm64/kernel/process.c | 21 +- + arch/arm64/kernel/ptrace.c | 64 +++- + arch/arm64/kernel/setup.c | 17 +- + arch/arm64/kernel/signal.c | 172 +++++++++- + arch/arm64/kernel/sleep.S | 6 +- + arch/arm64/kernel/syscall.c | 8 +- + arch/arm64/kernel/vmlinux.lds.S | 2 +- + arch/arm64/kvm/fpsimd.c | 2 +- + arch/arm64/kvm/hyp/entry.S | 2 +- + arch/arm64/mm/cache.S | 1 + + arch/arm64/mm/proc.S | 2 - + arch/arm64/tools/cpucaps | 1 + + arch/arm64/tools/sysreg | 50 ++- + drivers/acpi/acpica/Makefile | 2 +- + drivers/firmware/efi/libstub/Makefile | 4 +- + drivers/firmware/efi/libstub/arm64-entry.S | 67 ---- + drivers/firmware/efi/libstub/arm64-stub.c | 26 +- + drivers/firmware/efi/libstub/arm64.c | 41 ++- + include/linux/compiler_attributes.h | 6 - + include/linux/compiler_types.h | 27 ++ + include/linux/ftrace.h | 18 +- + include/uapi/linux/elf.h | 1 + + kernel/exit.c | 9 +- + kernel/trace/Kconfig | 7 + + kernel/trace/ftrace.c | 109 +++++- + tools/testing/selftests/arm64/abi/hwcap.c | 115 +++++++ + .../testing/selftests/arm64/abi/syscall-abi-asm.S | 57 +++- + tools/testing/selftests/arm64/abi/syscall-abi.c | 179 ++++++---- + tools/testing/selftests/arm64/bti/test.c | 25 +- + tools/testing/selftests/arm64/fp/.gitignore | 2 + + tools/testing/selftests/arm64/fp/Makefile | 5 + + tools/testing/selftests/arm64/fp/assembler.h | 2 +- + tools/testing/selftests/arm64/fp/fp-pidbench.S | 1 - + tools/testing/selftests/arm64/fp/fp-stress.c | 34 +- + tools/testing/selftests/arm64/fp/fpsimd-test.S | 1 - + tools/testing/selftests/arm64/fp/sme-inst.h | 20 ++ + tools/testing/selftests/arm64/fp/sve-test.S | 1 - + tools/testing/selftests/arm64/fp/za-test.S | 1 - + tools/testing/selftests/arm64/fp/zt-ptrace.c | 365 +++++++++++++++++++++ + tools/testing/selftests/arm64/fp/zt-test.S | 317 ++++++++++++++++++ + tools/testing/selftests/arm64/mte/Makefile | 21 +- + tools/testing/selftests/arm64/signal/.gitignore | 2 + + tools/testing/selftests/arm64/signal/Makefile | 8 +- + .../testing/selftests/arm64/signal/test_signals.c | 4 +- + .../testing/selftests/arm64/signal/test_signals.h | 2 + + .../selftests/arm64/signal/test_signals_utils.c | 3 + + .../selftests/arm64/signal/testcases/ssve_regs.c | 5 + + .../arm64/signal/testcases/ssve_za_regs.c | 162 +++++++++ + .../selftests/arm64/signal/testcases/testcases.c | 40 +++ + .../selftests/arm64/signal/testcases/testcases.h | 1 + + .../arm64/signal/testcases/tpidr2_siginfo.c | 90 +++++ + .../selftests/arm64/signal/testcases/zt_no_regs.c | 51 +++ + .../selftests/arm64/signal/testcases/zt_regs.c | 85 +++++ + 89 files changed, 2677 insertions(+), 369 deletions(-) + delete mode 100644 drivers/firmware/efi/libstub/arm64-entry.S + create mode 100644 tools/testing/selftests/arm64/fp/zt-ptrace.c + create mode 100644 tools/testing/selftests/arm64/fp/zt-test.S + create mode 100644 tools/testing/selftests/arm64/signal/testcases/ssve_za_regs.c + create mode 100644 tools/testing/selftests/arm64/signal/testcases/tpidr2_siginfo.c + create mode 100644 tools/testing/selftests/arm64/signal/testcases/zt_no_regs.c + create mode 100644 tools/testing/selftests/arm64/signal/testcases/zt_regs.c +Merging arm-perf/for-next/perf (4998897b1e96 perf: arm_spe: Support new SPEv1.2/v8.7 'not taken' event) +$ 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 +Auto-merging arch/arm64/include/asm/el2_setup.h +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/tools/sysreg +Auto-merging drivers/perf/arm-cmn.c +Merge made by the 'ort' strategy. + arch/arm64/include/asm/el2_setup.h | 6 +- + arch/arm64/include/asm/sysreg.h | 99 ++---------------- + arch/arm64/kvm/debug.c | 2 +- + arch/arm64/kvm/hyp/nvhe/debug-sr.c | 2 +- + arch/arm64/tools/sysreg | 139 ++++++++++++++++++++++++++ + drivers/perf/arm-cmn.c | 1 + + drivers/perf/arm_spe_pmu.c | 111 ++++++++++---------- + drivers/perf/hisilicon/hisi_uncore_cpa_pmu.c | 16 +-- + drivers/perf/hisilicon/hisi_uncore_ddrc_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_hha_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_l3c_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_pa_pmu.c | 2 +- + drivers/perf/hisilicon/hisi_uncore_pmu.c | 9 +- + drivers/perf/hisilicon/hisi_uncore_pmu.h | 4 +- + drivers/perf/hisilicon/hisi_uncore_sllc_pmu.c | 2 +- + drivers/perf/marvell_cn10k_ddr_pmu.c | 10 ++ + drivers/perf/marvell_cn10k_tad_pmu.c | 22 ++-- + 17 files changed, 250 insertions(+), 181 deletions(-) +Merging arm-soc/for-next (822f49f2891e Merge branch 'arm/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm/Kconfig +Auto-merging arch/arm/Makefile +Auto-merging arch/arm64/Kconfig.platforms +Auto-merging arch/powerpc/Makefile +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-scmi | 70 + + Documentation/ABI/testing/debugfs-scmi-raw | 117 ++ + 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 - + Documentation/devicetree/bindings/mfd/syscon.yaml | 6 - + .../devicetree/bindings/mmc/samsung,s3cmci.txt | 42 - + .../soc/samsung/samsung,exynos-sysreg.yaml | 87 + + .../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 | 201 +- + arch/arm/Kconfig | 26 +- + arch/arm/Kconfig.debug | 129 +- + arch/arm/Makefile | 10 +- + arch/arm/arm-soc-for-next-contents.txt | 158 ++ + 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/am335x-nano.dts | 32 +- + arch/arm/boot/dts/am3874-iceboard.dts | 4 +- + 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/gemini-dlink-dns-313.dts | 19 + + arch/arm/boot/dts/gemini-wbd111.dts | 31 +- + arch/arm/boot/dts/gemini-wbd222.dts | 31 +- + arch/arm/boot/dts/gemini.dtsi | 8 +- + .../arm/boot/dts/intel-ixp42x-welltech-epbx100.dts | 18 + + arch/arm/boot/dts/keystone-k2hk-evm.dts | 8 +- + arch/arm/boot/dts/omap3-gta04a5.dts | 19 +- + arch/arm/boot/dts/omap3-n900.dts | 59 +- + 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/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/sama7g5.dtsi | 51 + + arch/arm/boot/dts/socfpga.dtsi | 2 +- + arch/arm/boot/dts/ste-dbx5x0.dtsi | 6 + + arch/arm/boot/dts/ste-href.dtsi | 12 +- + arch/arm/boot/dts/stih410.dtsi | 2 +- + 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/lpae.config | 2 + + 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/multi_v5_defconfig | 1 + + arch/arm/configs/multi_v7_defconfig | 17 + + 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/shmobile_defconfig | 1 + + 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/core.c | 13 +- + 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/timer.c | 2 +- + 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/devices.c | 1 - + 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/omap4-common.c | 1 + + 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/pm33xx-core.c | 1 - + 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/sleep34xx.S | 2 +- + arch/arm/mach-omap2/sr_device.c | 13 - + arch/arm/mach-omap2/sram.h | 4 - + arch/arm/mach-omap2/timer.c | 1 + + 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 | 34 - + arch/arm/mach-sa1100/badge4.c | 338 ---- + arch/arm/mach-sa1100/cerf.c | 181 -- + arch/arm/mach-sa1100/collie.c | 33 - + arch/arm/mach-sa1100/generic.c | 19 - + arch/arm/mach-sa1100/generic.h | 3 - + arch/arm/mach-sa1100/h3100.c | 140 -- + arch/arm/mach-sa1100/h3600.c | 38 - + 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 - + arch/arm64/Kconfig.platforms | 10 +- + .../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/hisilicon/hi3660-hikey960.dts | 12 +- + arch/arm64/boot/dts/hisilicon/hi6220-hikey.dts | 12 +- + arch/arm64/boot/dts/microchip/sparx5.dtsi | 2 +- + .../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/boot/dts/tesla/fsd-evb.dts | 69 + + arch/arm64/boot/dts/tesla/fsd-pinctrl.dtsi | 54 +- + arch/arm64/boot/dts/tesla/fsd.dtsi | 124 ++ + arch/arm64/configs/defconfig | 3 + + arch/powerpc/Makefile | 12 +- + arch/riscv/boot/dts/renesas/rzfive-smarc-som.dtsi | 12 - + 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/firmware/arm_scmi/Kconfig | 32 + + drivers/firmware/arm_scmi/Makefile | 9 +- + drivers/firmware/arm_scmi/bus.c | 395 +++- + drivers/firmware/arm_scmi/common.h | 100 +- + drivers/firmware/arm_scmi/driver.c | 1223 +++++++----- + drivers/firmware/arm_scmi/mailbox.c | 6 +- + drivers/firmware/arm_scmi/optee.c | 6 +- + drivers/firmware/arm_scmi/protocols.h | 7 + + drivers/firmware/arm_scmi/raw_mode.c | 1443 ++++++++++++++ + drivers/firmware/arm_scmi/raw_mode.h | 31 + + drivers/firmware/arm_scmi/smc.c | 6 +- + drivers/firmware/arm_scmi/virtio.c | 4 +- + drivers/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/memory/renesas-rpc-if.c | 152 +- + drivers/memory/ti-emif-pm.c | 7 +- + 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/hyperbus/rpc-if.c | 18 +- + 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/atmel/soc.c | 9 + + drivers/soc/atmel/soc.h | 3 + + drivers/soc/renesas/r8a779g0-sysc.c | 1 + + 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-rpc-if.c | 14 +- + 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 | 26 - + 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 | 32 +- + drivers/usb/host/ohci-hcd.c | 18 - + drivers/usb/host/ohci-omap.c | 14 +- + 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 - + fs/debugfs/file.c | 1 + + include/dt-bindings/clock/s3c2410.h | 59 - + include/dt-bindings/clock/s3c2412.h | 70 - + include/dt-bindings/clock/s3c2443.h | 91 - + include/dt-bindings/power/r8a779g0-sysc.h | 1 + + 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/scmi_protocol.h | 5 - + include/linux/soc/mmp/cputype.h | 24 +- + include/linux/soc/samsung/s3c-adc.h | 32 - + include/linux/soc/samsung/s3c-cpu-freq.h | 145 -- + 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/memory/renesas-rpc-if.h | 34 +- + include/sound/s3c24xx_uda134x.h | 14 - + include/trace/events/scmi.h | 18 +- + include/video/w100fb.h | 147 -- + scripts/Makefile.defconf | 15 + + 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 | 176 -- + 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 --- + 1013 files changed, 4468 insertions(+), 156835 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-scmi + create mode 100644 Documentation/ABI/testing/debugfs-scmi-raw + 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 + create mode 100644 Documentation/devicetree/bindings/soc/samsung/samsung,exynos-sysreg.yaml + delete mode 100644 Documentation/driver-api/media/drivers/davinci-vpbe-devel.rst + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + 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 + create mode 100644 arch/arm/configs/lpae.config + 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 + create mode 100644 drivers/firmware/arm_scmi/raw_mode.c + create mode 100644 drivers/firmware/arm_scmi/raw_mode.h + 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-cpu-freq.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 + create mode 100644 scripts/Makefile.defconf + 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 (46b1c99fb30c 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. + Documentation/devicetree/bindings/arm/amlogic.yaml | 1 + + .../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/meson8.dtsi | 5 +- + arch/arm/boot/dts/meson8b-ec100.dts | 2 +- + arch/arm/boot/dts/meson8b-odroidc1.dts | 2 +- + arch/arm/boot/dts/meson8b.dtsi | 5 +- + arch/arm64/boot/dts/amlogic/Makefile | 1 + + .../dts/amlogic/meson-axg-jethome-jethub-j1xx.dtsi | 10 +- + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 6 +- + arch/arm64/boot/dts/amlogic/meson-g12-common.dtsi | 16 +- + arch/arm64/boot/dts/amlogic/meson-g12a.dtsi | 20 - + .../dts/amlogic/meson-g12b-odroid-go-ultra.dts | 2 +- + .../boot/dts/amlogic/meson-g12b-odroid-n2.dtsi | 448 +-------------------- + .../boot/dts/amlogic/meson-g12b-odroid-n2l.dts | 125 ++++++ + arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi | 445 ++++++++++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12b.dtsi | 4 + + .../boot/dts/amlogic/meson-gx-libretech-pc.dtsi | 2 +- + arch/arm64/boot/dts/amlogic/meson-gx.dtsi | 6 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-kii-pro.dts | 2 +- + .../dts/amlogic/meson-gxl-s905d-phicomm-n1.dts | 2 +- + .../boot/dts/amlogic/meson-gxl-s905d-sml5442tw.dts | 1 - + .../amlogic/meson-gxl-s905w-jethome-jethub-j80.dts | 6 +- + .../dts/amlogic/meson-gxl-s905x-khadas-vim.dts | 15 - + .../boot/dts/amlogic/meson-gxl-s905x-p212.dts | 68 ++++ + .../boot/dts/amlogic/meson-gxl-s905x-p212.dtsi | 21 +- + arch/arm64/boot/dts/amlogic/meson-gxl.dtsi | 2 +- + .../boot/dts/amlogic/meson-sm1-bananapi-m5.dts | 8 +- + .../boot/dts/amlogic/meson-sm1-odroid-hc4.dts | 10 +- + 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 +- + 36 files changed, 789 insertions(+), 534 deletions(-) + create mode 100644 Documentation/devicetree/bindings/firmware/amlogic,meson-gxbb-sm.yaml + delete mode 100644 Documentation/devicetree/bindings/firmware/meson/meson_sm.txt + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid-n2l.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-odroid.dtsi +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 (03f90343f5b5 soc: nuvoton: Add SoC info driver for WPCM450) + fc8529f0609d ("ARM: dts: aspeed: Fix pca9849 compatible") +$ 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/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 2 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 1 + + arch/arm/boot/dts/Makefile | 2 + + arch/arm/boot/dts/aspeed-bmc-amd-ethanolx.dts | 25 +- + .../arm/boot/dts/aspeed-bmc-facebook-bletchley.dts | 13 +- + .../boot/dts/aspeed-bmc-facebook-greatlakes.dts | 241 ++++++++++++++ + arch/arm/boot/dts/aspeed-bmc-tyan-s8036.dts | 1 + + arch/arm/boot/dts/aspeed-bmc-ufispace-ncplite.dts | 360 +++++++++++++++++++++ + 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 +++++++ + 15 files changed, 981 insertions(+), 3 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed-bmc-facebook-greatlakes.dts + create mode 100644 arch/arm/boot/dts/aspeed-bmc-ufispace-ncplite.dts + 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 (78712fb81548 Merge branch 'clk-microchip-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. + 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 ++++------ + 17 files changed, 143 insertions(+), 57 deletions(-) +Merging broadcom/next (9b385edf71bd Merge branch 'devicetree-arm64/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/bcm11351.dtsi | 8 ++++---- + arch/arm/boot/dts/bcm21664-garnet.dts | 2 +- + arch/arm/boot/dts/bcm21664.dtsi | 6 +++--- + arch/arm/boot/dts/bcm28155-ap.dts | 2 +- + arch/arm/mach-bcm/bcm63xx_smp.c | 3 +-- + arch/arm64/boot/dts/broadcom/northstar2/ns2.dtsi | 2 +- + arch/arm64/boot/dts/broadcom/stingray/stingray.dtsi | 6 +----- + drivers/soc/bcm/bcm2835-power.c | 6 ------ + 8 files changed, 12 insertions(+), 23 deletions(-) +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 (682a91c4375f Merge branch 'mem-ctrl-next' into for-next) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory/for-next +Merge made by the 'ort' strategy. + drivers/memory/renesas-rpc-if.c | 3 +-- + 1 file changed, 1 insertion(+), 2 deletions(-) +Merging imx-mxs/for-next (6e2964c3dc83 Merge branch 'imx/defconfig' into for-next) + b82765d04e37 ("ARM: multi_v7_defconfig: Enable wm896x audio CODECs") +$ 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 Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/configs/multi_v7_defconfig +CONFLICT (content): Merge conflict in arch/arm/configs/multi_v7_defconfig +Auto-merging arch/arm64/configs/defconfig +Recorded preimage for 'arch/arm/configs/multi_v7_defconfig' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/arm/configs/multi_v7_defconfig'. +[master dfd9e8058db9] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/devicetree/bindings/arm/fsl.yaml | 96 +++- + .../devicetree/bindings/power/fsl,imx-gpc.yaml | 19 +- + .../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 + + MAINTAINERS | 3 + + arch/arm/boot/dts/Makefile | 4 + + arch/arm/boot/dts/e70k02.dtsi | 11 +- + 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-zii-rdu1.dts | 2 +- + arch/arm/boot/dts/imx51-zii-scu2-mezz.dts | 2 +- + arch/arm/boot/dts/imx51-zii-scu3-esb.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 | 3 +- + arch/arm/boot/dts/imx6qdl-colibri.dtsi | 5 +- + 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-zii-rdu2.dtsi | 2 +- + arch/arm/boot/dts/imx6qdl.dtsi | 7 +- + arch/arm/boot/dts/imx6sl-evk.dts | 2 +- + arch/arm/boot/dts/imx6sl-tolino-vision5.dts | 7 + + arch/arm/boot/dts/imx6sll-evk.dts | 2 +- + arch/arm/boot/dts/imx6sll-kobo-librah2o.dts | 7 + + 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-14x14-evk.dtsi | 4 +- + 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/imx6ull-colibri.dtsi | 4 +- + arch/arm/boot/dts/imx6ull-dhcom-drc02.dts | 99 ++++ + arch/arm/boot/dts/imx6ull-dhcom-pdk2.dts | 222 ++++++++ + arch/arm/boot/dts/imx6ull-dhcom-picoitx.dts | 101 ++++ + .../arm/boot/dts/imx6ull-dhcom-som-cfg-sdcard.dtsi | 97 ++++ + arch/arm/boot/dts/imx6ull-dhcom-som.dtsi | 633 +++++++++++++++++++++ + arch/arm/boot/dts/imx6ull-dhcor-som.dtsi | 255 +++++++++ + 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/imx7-colibri.dtsi | 2 +- + 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/imx7d-smegw01.dts | 3 +- + arch/arm/boot/dts/imx7d-zii-rmu2.dts | 2 +- + arch/arm/boot/dts/imx7d-zii-rpu2.dts | 2 +- + arch/arm/boot/dts/imx7s.dtsi | 3 +- + arch/arm/boot/dts/imxrt1050.dtsi | 2 +- + arch/arm/boot/dts/ls1021a.dtsi | 4 + + 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/arm/boot/dts/vf610-zii-spb4.dts | 2 +- + arch/arm/boot/dts/vf610-zii-ssmb-spu3.dts | 2 +- + arch/arm/boot/dts/vfxxx.dtsi | 20 +- + arch/arm/configs/imx_v6_v7_defconfig | 1 - + arch/arm/mach-imx/mach-imx6ul.c | 1 + + arch/arm/mach-imx/mmdc.c | 24 +- + arch/arm64/boot/dts/freescale/Makefile | 10 + + .../fsl-ls1028a-kontron-kbox-a-230-ls.dts | 12 + + .../freescale/fsl-ls1028a-kontron-sl28-var1.dts | 2 + + .../freescale/fsl-ls1028a-kontron-sl28-var2.dts | 8 + + .../freescale/fsl-ls1028a-kontron-sl28-var4.dts | 2 + + .../dts/freescale/fsl-ls1028a-kontron-sl28.dts | 17 + + arch/arm64/boot/dts/freescale/fsl-ls1028a.dtsi | 1 + + arch/arm64/boot/dts/freescale/fsl-ls1046a-rdb.dts | 4 +- + 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-beacon-baseboard.dtsi | 5 +- + .../dts/freescale/imx8mm-data-modul-edm-sbc.dts | 6 +- + arch/arm64/boot/dts/freescale/imx8mm-emcon.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mm-evk.dtsi | 7 +- + .../boot/dts/freescale/imx8mm-innocomm-wb15.dtsi | 3 - + .../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 + + .../dts/freescale/imx8mm-phyboard-polis-rdk.dts | 3 - + arch/arm64/boot/dts/freescale/imx8mm-pinfunc.h | 2 +- + .../boot/dts/freescale/imx8mm-tqma8mqml-mba8mx.dts | 5 +- + .../arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx8mm-var-som.dtsi | 1 - + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 5 +- + .../imx8mm-venice-gw72xx-0x-rs232-rts.dtso | 1 - + .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 5 +- + .../imx8mm-venice-gw73xx-0x-rs232-rts.dtso | 1 - + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 6 +- + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 8 +- + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 8 +- + .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 6 +- + .../boot/dts/freescale/imx8mm-venice-gw7904.dts | 5 +- + .../boot/dts/freescale/imx8mm-verdin-dahlia.dtsi | 2 + + .../boot/dts/freescale/imx8mm-verdin-dev.dtsi | 96 +++- + .../dts/freescale/imx8mm-verdin-nonwifi-yavia.dts | 18 + + .../dts/freescale/imx8mm-verdin-wifi-yavia.dts | 18 + + .../boot/dts/freescale/imx8mm-verdin-yavia.dtsi | 169 ++++++ + arch/arm64/boot/dts/freescale/imx8mm-verdin.dtsi | 14 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 34 +- + .../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 +- + .../arm64/boot/dts/freescale/imx8mp-beacon-kit.dts | 550 ++++++++++++++++++ + .../boot/dts/freescale/imx8mp-beacon-som.dtsi | 416 ++++++++++++++ + .../boot/dts/freescale/imx8mp-debix-model-a.dts | 506 ++++++++++++++++ + .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 21 +- + arch/arm64/boot/dts/freescale/imx8mp-evk.dts | 7 - + .../freescale/imx8mp-tqma8mpql-mba8mpxl-lvds.dtso | 61 ++ + .../dts/freescale/imx8mp-tqma8mpql-mba8mpxl.dts | 5 +- + .../arm64/boot/dts/freescale/imx8mp-tqma8mpql.dtsi | 5 +- + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 8 - + .../boot/dts/freescale/imx8mp-verdin-dev.dtsi | 116 +++- + .../dts/freescale/imx8mp-verdin-nonwifi-yavia.dts | 18 + + .../dts/freescale/imx8mp-verdin-wifi-yavia.dts | 18 + + .../boot/dts/freescale/imx8mp-verdin-yavia.dtsi | 213 +++++++ + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 3 +- + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 349 ++++++++---- + arch/arm64/boot/dts/freescale/imx8mq-evk.dts | 10 +- + .../dts/freescale/imx8mq-kontron-pitx-imx8m.dts | 10 +- + .../boot/dts/freescale/imx8mq-librem5-devkit.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 32 +- + .../boot/dts/freescale/imx8mq-mnt-reform2.dts | 5 +- + .../boot/dts/freescale/imx8mq-tqma8mq-mba8mx.dts | 10 +- + arch/arm64/boot/dts/freescale/imx8mq-tqma8mq.dtsi | 4 +- + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 12 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 32 +- + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 12 + + arch/arm64/boot/dts/freescale/imx93.dtsi | 41 ++ + 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 | 108 ++++ + drivers/soc/imx/imx93-pd.c | 1 - + drivers/soc/imx/imx93-src.c | 1 - + 196 files changed, 5020 insertions(+), 481 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/arm/boot/dts/imx6ull-dhcom-drc02.dts + create mode 100644 arch/arm/boot/dts/imx6ull-dhcom-pdk2.dts + create mode 100644 arch/arm/boot/dts/imx6ull-dhcom-picoitx.dts + create mode 100644 arch/arm/boot/dts/imx6ull-dhcom-som-cfg-sdcard.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-dhcom-som.dtsi + create mode 100644 arch/arm/boot/dts/imx6ull-dhcor-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-nonwifi-yavia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-wifi-yavia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-verdin-yavia.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-beacon-kit.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-beacon-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-debix-model-a.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-tqma8mpql-mba8mpxl-lvds.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-nonwifi-yavia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-wifi-yavia.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-verdin-yavia.dtsi +Merging mediatek/for-next (eb6fd30ef65f 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 | 2 + + .../bindings/input/mediatek,pmic-keys.yaml | 1 + + .../devicetree/bindings/leds/leds-mt6323.txt | 2 +- + .../devicetree/bindings/mfd/mediatek,mt6357.yaml | 111 ++++ + Documentation/devicetree/bindings/mfd/mt6397.txt | 2 +- + .../bindings/power/mediatek,power-controller.yaml | 2 + + .../bindings/soc/mediatek/mediatek,mutex.yaml | 1 + + .../bindings/soc/mediatek/mediatek,pwrap.yaml | 147 +++++ + .../devicetree/bindings/soc/mediatek/pwrap.txt | 75 --- + arch/arm/boot/dts/mt2701.dtsi | 1 - + arch/arm/boot/dts/mt7623.dtsi | 15 +- + arch/arm/boot/dts/mt7623a-rfb-emmc.dts | 86 +-- + arch/arm/boot/dts/mt7623a-rfb-nand.dts | 86 +-- + arch/arm/boot/dts/mt7623a.dtsi | 74 +++ + arch/arm/boot/dts/mt7623n-bananapi-bpi-r2.dts | 22 +- + arch/arm/boot/dts/mt7623n-rfb-emmc.dts | 13 +- + arch/arm/boot/dts/mt7629.dtsi | 3 +- + arch/arm/boot/dts/mt8135.dtsi | 1 - + arch/arm64/boot/dts/mediatek/Makefile | 5 + + arch/arm64/boot/dts/mediatek/mt2712e.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt6358.dtsi | 6 +- + arch/arm64/boot/dts/mediatek/mt6795.dtsi | 50 ++ + arch/arm64/boot/dts/mediatek/mt7622.dtsi | 1 - + .../dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso | 29 + + .../dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso | 55 ++ + .../dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso | 68 +++ + .../dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso | 23 + + .../boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts | 450 +++++++++++++++ + arch/arm64/boot/dts/mediatek/mt7986a-rfb.dts | 120 ++++ + arch/arm64/boot/dts/mediatek/mt7986a.dtsi | 122 ++++ + arch/arm64/boot/dts/mediatek/mt7986b-rfb.dts | 8 + + arch/arm64/boot/dts/mediatek/mt8167.dtsi | 1 - + arch/arm64/boot/dts/mediatek/mt8173-elm.dtsi | 29 +- + arch/arm64/boot/dts/mediatek/mt8173-evb.dts | 2 +- + arch/arm64/boot/dts/mediatek/mt8173.dtsi | 1 - + .../mediatek/mt8183-kukui-jacuzzi-fennel-sku1.dts | 2 +- + .../boot/dts/mediatek/mt8183-kukui-jacuzzi.dtsi | 28 +- + .../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 | 2 +- + arch/arm64/boot/dts/mediatek/mt8183.dtsi | 86 ++- + arch/arm64/boot/dts/mediatek/mt8186.dtsi | 546 +++++++++++++++++- + .../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 | 72 ++- + .../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-demo.dts | 77 +++ + arch/arm64/boot/dts/mediatek/mt8195.dtsi | 272 ++++++++- + arch/arm64/boot/dts/mediatek/mt8516.dtsi | 1 - + drivers/input/keyboard/mtk-pmic-keys.c | 17 + + drivers/soc/mediatek/Kconfig | 2 +- + drivers/soc/mediatek/mt8186-pm-domains.h | 4 +- + drivers/soc/mediatek/mt8188-mmsys.h | 149 +++++ + drivers/soc/mediatek/mt8188-pm-domains.h | 623 +++++++++++++++++++++ + drivers/soc/mediatek/mt8195-mmsys.h | 146 +++++ + drivers/soc/mediatek/mtk-mmsys.c | 178 ++++-- + drivers/soc/mediatek/mtk-mmsys.h | 1 + + drivers/soc/mediatek/mtk-mutex.c | 113 +++- + drivers/soc/mediatek/mtk-pm-domains.c | 13 + + drivers/soc/mediatek/mtk-pm-domains.h | 5 + + drivers/soc/mediatek/mtk-svs.c | 16 +- + include/dt-bindings/power/mediatek,mt8188-power.h | 44 ++ + include/dt-bindings/reset/mt8195-resets.h | 45 ++ + include/linux/soc/mediatek/infracfg.h | 121 ++++ + include/linux/soc/mediatek/mtk-mmsys.h | 25 + + 74 files changed, 4559 insertions(+), 338 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mfd/mediatek,mt6357.yaml + create mode 100644 Documentation/devicetree/bindings/soc/mediatek/mediatek,pwrap.yaml + delete mode 100644 Documentation/devicetree/bindings/soc/mediatek/pwrap.txt + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-emmc.dtso + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nand.dtso + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-nor.dtso + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3-sd.dtso + create mode 100644 arch/arm64/boot/dts/mediatek/mt7986a-bananapi-bpi-r3.dts + 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 + create mode 100644 drivers/soc/mediatek/mt8188-pm-domains.h + create mode 100644 include/dt-bindings/power/mediatek,mt8188-power.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 +Already up to date. +Merging omap/for-next (f68a6fc58073 Merge branch 'omap-for-v6.3/cleanup' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap/for-next +Merge made by the 'ort' strategy. +Merging qcom/for-next (97c57426d969 Merge branches 'arm64-defconfig-for-6.3', 'arm64-for-6.3', 'clk-for-6.3', 'drivers-for-6.3' and 'dts-for-6.3' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/qcom/linux.git qcom/for-next +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 | 63 + + .../bindings/clock/qcom,camcc-sm8250.yaml | 20 +- + .../bindings/clock/qcom,gcc-apq8084.yaml | 44 + + .../bindings/clock/qcom,gcc-msm8998.yaml | 6 +- + .../devicetree/bindings/clock/qcom,gcc-qcs404.yaml | 38 +- + .../bindings/clock/qcom,gcc-sc8280xp.yaml | 7 + + .../devicetree/bindings/clock/qcom,gcc-sdx55.yaml | 9 +- + .../devicetree/bindings/clock/qcom,gcc-sdx65.yaml | 8 +- + .../devicetree/bindings/clock/qcom,gcc-sm8350.yaml | 2 - + .../devicetree/bindings/clock/qcom,mmcc.yaml | 46 +- + .../bindings/clock/qcom,msm8996-apcc.yaml | 6 +- + .../bindings/clock/qcom,qdu1000-gcc.yaml | 51 + + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 2 + + .../bindings/clock/qcom,sa8775p-gcc.yaml | 79 + + .../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/clock/qcom,videocc.yaml | 59 +- + .../devicetree/bindings/firmware/qcom,scm.yaml | 64 +- + .../bindings/interconnect/qcom,sm8550-rpmh.yaml | 139 + + Documentation/devicetree/bindings/mfd/qcom-rpm.txt | 283 -- + .../devicetree/bindings/power/qcom,rpmpd.yaml | 2 +- + .../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/soc/qcom/qcom,smd-rpm.yaml | 1 + + .../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 | 18 +- + arch/arm/boot/dts/qcom-apq8084.dtsi | 331 +- + 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-msm8226.dtsi | 7 + + 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 | 435 +- + .../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-t55.dts | 4 +- + arch/arm/boot/dts/qcom-sdx55-telit-fn980-tlb.dts | 4 +- + arch/arm/boot/dts/qcom-sdx55.dtsi | 17 +- + arch/arm/boot/dts/qcom-sdx65.dtsi | 29 +- + arch/arm64/boot/dts/qcom/Makefile | 16 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 4 - + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 548 ++- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 66 +- + arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 295 ++ + arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 299 ++ + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 2 +- + .../boot/dts/qcom/msm8916-samsung-grandmax.dts | 6 +- + .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 296 ++ + arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts | 113 + + arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts | 75 + + .../boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 262 ++ + arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts | 196 +- + arch/arm64/boot/dts/qcom/msm8916-samsung-j5x.dts | 19 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 115 +- + .../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 | 92 +- + arch/arm64/boot/dts/qcom/msm8956.dtsi | 4 + + arch/arm64/boot/dts/qcom/msm8976.dtsi | 153 +- + arch/arm64/boot/dts/qcom/msm8992-lg-bullhead.dtsi | 7 +- + .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 52 +- + .../dts/qcom/msm8994-sony-xperia-kitakami.dtsi | 2 +- + .../boot/dts/qcom/msm8996-oneplus-common.dtsi | 1 - + .../boot/dts/qcom/msm8996-sony-xperia-tone.dtsi | 38 +- + arch/arm64/boot/dts/qcom/msm8996-v3.0.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 6 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 65 +- + 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 | 48 +- + 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 | 224 +- + arch/arm64/boot/dts/qcom/sa8155p-adp.dts | 2 +- + arch/arm64/boot/dts/qcom/sa8295p-adp.dts | 330 +- + .../dts/qcom/{pm8450a.dtsi => sa8540p-pmics.dtsi} | 33 +- + arch/arm64/boot/dts/qcom/sa8540p-ride.dts | 185 +- + arch/arm64/boot/dts/qcom/sa8540p.dtsi | 4 +- + arch/arm64/boot/dts/qcom/sc7180-idp.dts | 30 +- + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 18 + + .../boot/dts/qcom/sc7180-trogdor-lte-sku.dtsi | 5 +- + .../dts/qcom/sc7180-trogdor-parade-ps8640.dtsi | 20 + + .../boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi | 23 + + .../boot/dts/qcom/sc7180-trogdor-ti-sn65dsi86.dtsi | 20 + + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 50 +- + arch/arm64/boot/dts/qcom/sc7180.dtsi | 339 +- + .../dts/qcom/sc7280-herobrine-audio-rt5682.dtsi | 19 +- + .../boot/dts/qcom/sc7280-herobrine-lte-sku.dtsi | 30 +- + .../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-herobrine.dtsi | 4 + + arch/arm64/boot/dts/qcom/sc7280-idp.dtsi | 7 +- + arch/arm64/boot/dts/qcom/sc7280-qcard.dtsi | 5 - + arch/arm64/boot/dts/qcom/sc7280.dtsi | 104 +- + arch/arm64/boot/dts/qcom/sc8280xp-crd.dts | 246 +- + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 554 ++- + arch/arm64/boot/dts/qcom/sc8280xp.dtsi | 2745 +++++++++-- + arch/arm64/boot/dts/qcom/sdm450-motorola-ali.dts | 252 + + .../dts/qcom/sdm630-sony-xperia-ganges-kirin.dts | 5 + + .../boot/dts/qcom/sdm630-sony-xperia-nile.dtsi | 15 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 35 +- + 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 | 19 +- + 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 | 403 +- + arch/arm64/boot/dts/qcom/sdm845-db845c.dts | 130 +- + arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 77 +- + arch/arm64/boot/dts/qcom/sdm845-lg-judyln.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 80 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 111 +- + arch/arm64/boot/dts/qcom/sdm845-shift-axolotl.dts | 169 +- + .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 80 +- + .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 34 +- + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 37 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 1381 +++--- + .../boot/dts/qcom/sdm850-lenovo-yoga-c630.dts | 67 +- + arch/arm64/boot/dts/qcom/sdm850-samsung-w737.dts | 126 +- + arch/arm64/boot/dts/qcom/sm6115.dtsi | 995 +++- + 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 | 231 +- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 18 +- + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 49 + + arch/arm64/boot/dts/qcom/sm7225.dtsi | 19 + + .../boot/dts/qcom/sm8150-sony-xperia-kumano.dtsi | 86 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 426 +- + arch/arm64/boot/dts/qcom/sm8250-mtp.dts | 44 +- + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 6 +- + arch/arm64/boot/dts/qcom/sm8250.dtsi | 200 +- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 412 ++ + .../dts/qcom/sm8350-microsoft-surface-duo2.dts | 4 +- + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 4 +- + .../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 | 110 +- + arch/arm64/boot/dts/qcom/sm8350.dtsi | 616 ++- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 181 +- + 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 | 480 +- + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 568 +++ + arch/arm64/boot/dts/qcom/sm8550.dtsi | 4755 +++++++++++++++++++ + arch/arm64/configs/defconfig | 19 + + drivers/base/power/domain.c | 26 + + drivers/clk/clk.c | 57 +- + drivers/clk/qcom/Kconfig | 40 + + drivers/clk/qcom/Makefile | 5 + + 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.c | 5 + + drivers/clk/qcom/clk-alpha-pll.h | 1 + + drivers/clk/qcom/clk-cpu-8996.c | 144 +- + drivers/clk/qcom/clk-rpmh.c | 56 + + drivers/clk/qcom/clk-smd-rpm.c | 1443 +++--- + 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-sc8280xp.c | 1 + + 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-apq8084.c | 1024 +++-- + drivers/clk/qcom/gcc-ipq8074.c | 4 +- + drivers/clk/qcom/gcc-msm8939.c | 32 +- + drivers/clk/qcom/gcc-msm8974.c | 10 +- + drivers/clk/qcom/gcc-msm8976.c | 30 +- + drivers/clk/qcom/gcc-msm8998.c | 13 - + drivers/clk/qcom/gcc-qcs404.c | 841 ++-- + drivers/clk/qcom/gcc-qdu1000.c | 2653 +++++++++++ + drivers/clk/qcom/gcc-sa8775p.c | 4805 ++++++++++++++++++++ + drivers/clk/qcom/gcc-sc7180.c | 19 +- + drivers/clk/qcom/gcc-sc7280.c | 10 +- + drivers/clk/qcom/gcc-sc8280xp.c | 1 + + 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-apq8084.c | 1189 ++--- + drivers/clk/qcom/mmcc-msm8998.c | 25 - + drivers/clk/qcom/tcsrcc-sm8550.c | 192 + + drivers/clk/qcom/videocc-sm8250.c | 9 +- + drivers/firmware/qcom_scm-smc.c | 86 +- + drivers/firmware/qcom_scm.c | 90 +- + drivers/firmware/qcom_scm.h | 8 + + 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/rpmpd.c | 18 - + drivers/soc/qcom/socinfo.c | 96 +- + include/dt-bindings/arm/qcom,ids.h | 75 + + include/dt-bindings/clock/qcom,gcc-apq8084.h | 1 + + include/dt-bindings/clock/qcom,gcc-qcs404.h | 4 + + include/dt-bindings/clock/qcom,gcc-sm8350.h | 1 - + include/dt-bindings/clock/qcom,gcc-sm8450.h | 1 - + include/dt-bindings/clock/qcom,qdu1000-gcc.h | 175 + + include/dt-bindings/clock/qcom,rpmcc.h | 2 + + include/dt-bindings/clock/qcom,sa8775p-gcc.h | 320 ++ + 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 | 30 +- + 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 +- + 281 files changed, 43027 insertions(+), 7799 deletions(-) + create mode 100644 Documentation/ABI/testing/debugfs-driver-dcc + create mode 100644 Documentation/devicetree/bindings/clock/qcom,qdu1000-gcc.yaml + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sa8775p-gcc.yaml + 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/msm8916-samsung-gt5-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-j5-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-samsung-j5x.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/gcc-qdu1000.c + create mode 100644 drivers/clk/qcom/gcc-sa8775p.c + create mode 100644 drivers/clk/qcom/tcsrcc-sm8550.c + create mode 100644 drivers/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,qdu1000-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,sa8775p-gcc.h + 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 (5f4935f3f05d Merge branches 'renesas-arm-defconfig-for-v6.3', 'renesas-drivers-for-v6.3', 'renesas-dt-bindings-for-v6.3' and 'renesas-dts-for-v6.3' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Merge made by the 'ort' strategy. + .../bindings/soc/renesas/renesas,rzv2m-pwc.yaml | 56 +++++++ + arch/arm/boot/dts/r8a7742-iwg21d-q7-dbcm-ca.dts | 11 +- + .../dts/r8a7742-iwg21d-q7-dbcm-ov5640-single.dtsi | 4 +- + .../dts/r8a7742-iwg21d-q7-dbcm-ov7725-single.dtsi | 4 +- + arch/arm/boot/dts/r8a7742.dtsi | 2 +- + arch/arm/boot/dts/r8a7743.dtsi | 2 +- + arch/arm/boot/dts/r8a7744.dtsi | 2 +- + arch/arm/boot/dts/r8a7745.dtsi | 2 +- + arch/arm/boot/dts/r8a7778.dtsi | 2 +- + arch/arm/boot/dts/r8a7790.dtsi | 2 +- + arch/arm/boot/dts/r8a7791.dtsi | 2 +- + arch/arm/boot/dts/r8a7793.dtsi | 2 +- + arch/arm/boot/dts/r8a7794.dtsi | 2 +- + arch/arm/boot/dts/r9a06g032.dtsi | 12 ++ + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 26 ++- + .../arm64/boot/dts/renesas/beacon-renesom-som.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 2 +- + .../boot/dts/renesas/r8a774b1-beacon-rzg2n-kit.dts | 8 + + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 2 +- + .../boot/dts/renesas/r8a774e1-beacon-rzg2h-kit.dts | 8 + + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77970-eagle.dts | 12 ++ + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 2 +- + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 38 +++++ + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 1 + + arch/arm64/boot/dts/renesas/r8a779g0.dtsi | 6 + + arch/arm64/boot/dts/renesas/r9a07g043.dtsi | 2 + + arch/arm64/boot/dts/renesas/r9a07g043u.dtsi | 72 +++++++++ + arch/arm64/boot/dts/renesas/r9a09g011-v2mevk2.dts | 5 + + arch/arm64/boot/dts/renesas/r9a09g011.dtsi | 10 +- + arch/arm64/boot/dts/renesas/rzg2ul-smarc-som.dtsi | 11 +- + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 3 - + .../renesas/ulcb-audio-graph-card-mix+split.dtsi | 91 +++++++++++ + .../boot/dts/renesas/ulcb-audio-graph-card.dtsi | 85 ++++++++++ + .../renesas/ulcb-audio-graph-card2-mix+split.dtsi | 111 +++++++++++++ + .../boot/dts/renesas/ulcb-audio-graph-card2.dtsi | 26 +++ + .../ulcb-kf-audio-graph-card-mix+split.dtsi | 171 ++++++++++++++++++++ + .../boot/dts/renesas/ulcb-kf-audio-graph-card.dtsi | 88 ++++++++++ + .../ulcb-kf-audio-graph-card2-mix+split.dtsi | 178 +++++++++++++++++++++ + .../dts/renesas/ulcb-kf-audio-graph-card2.dtsi | 30 ++++ + .../ulcb-kf-simple-audio-card-mix+split.dtsi | 153 ++++++++++++++++++ + .../dts/renesas/ulcb-kf-simple-audio-card.dtsi | 85 ++++++++++ + arch/arm64/boot/dts/renesas/ulcb-kf.dtsi | 72 ++------- + .../renesas/ulcb-simple-audio-card-mix+split.dtsi | 92 +++++++++++ + .../boot/dts/renesas/ulcb-simple-audio-card.dtsi | 89 +++++++++++ + arch/arm64/boot/dts/renesas/ulcb.dtsi | 68 ++------ + arch/riscv/boot/dts/renesas/rzfive-smarc-som.dtsi | 10 ++ + drivers/soc/renesas/Kconfig | 4 + + drivers/soc/renesas/Makefile | 1 + + drivers/soc/renesas/pwc-rzv2m.c | 141 ++++++++++++++++ + 56 files changed, 1665 insertions(+), 159 deletions(-) + create mode 100644 Documentation/devicetree/bindings/soc/renesas/renesas,rzv2m-pwc.yaml + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-audio-graph-card-mix+split.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-audio-graph-card.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2-mix+split.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-audio-graph-card2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card-mix+split.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2-mix+split.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-audio-graph-card2.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card-mix+split.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-kf-simple-audio-card.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-simple-audio-card-mix+split.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/ulcb-simple-audio-card.dtsi + create mode 100644 drivers/soc/renesas/pwc-rzv2m.c +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 (4c20692e9cb9 Merge branch 'v6.3-armsoc/dts32' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +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 + + .../bindings/phy/rockchip,rk3288-dp-phy.yaml | 41 + + .../devicetree/bindings/phy/rockchip-dp-phy.txt | 26 - + .../devicetree/bindings/soc/rockchip/grf.yaml | 10 +- + .../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 +- + .../boot/dts/rockchip/rk3399-rock-4c-plus.dts | 4 +- + arch/arm64/boot/dts/rockchip/rk3399-rock-pi-4.dtsi | 4 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 +- + .../boot/dts/rockchip/rk3399pro-vmarc-som.dtsi | 4 +- + .../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 | 228 ++ + arch/arm64/boot/dts/rockchip/rk3568-rock-3a.dts | 9 +- + 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 +- + 50 files changed, 11374 insertions(+), 70 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/rockchip,rk3288-dp-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/rockchip-dp-phy.txt + 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 (5e8b8afd175e Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Auto-merging arch/arm/boot/dts/Makefile +Auto-merging arch/arm/mach-s3c/s3c64xx.c +Merge made by the 'ort' strategy. + .../bindings/arm/samsung/samsung-boards.yaml | 1 + + arch/arm/boot/dts/Makefile | 1 + + arch/arm/boot/dts/exynos-syscon-restart.dtsi | 2 +- + arch/arm/boot/dts/exynos3250-monk.dts | 3 +- + arch/arm/boot/dts/exynos3250-rinato.dts | 5 +- + arch/arm/boot/dts/exynos3250.dtsi | 44 +- + arch/arm/boot/dts/exynos4.dtsi | 66 +- + arch/arm/boot/dts/exynos4210.dtsi | 16 +- + arch/arm/boot/dts/exynos4412-itop-elite.dts | 2 +- + arch/arm/boot/dts/exynos4412-itop-scp-core.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-midas.dtsi | 15 +- + arch/arm/boot/dts/exynos4412-odroid-common.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-odroidu3.dts | 2 +- + arch/arm/boot/dts/exynos4412-odroidx.dts | 2 +- + arch/arm/boot/dts/exynos4412-odroidx2.dts | 2 +- + arch/arm/boot/dts/exynos4412-origen.dts | 2 +- + arch/arm/boot/dts/exynos4412-p4note.dtsi | 7 +- + arch/arm/boot/dts/exynos4412-pinctrl.dtsi | 2 +- + arch/arm/boot/dts/exynos4412-tiny4412.dts | 8 + + arch/arm/boot/dts/exynos4412.dtsi | 42 +- + arch/arm/boot/dts/exynos5.dtsi | 22 +- + arch/arm/boot/dts/exynos5250.dtsi | 76 +-- + arch/arm/boot/dts/exynos5260-xyref5260.dts | 2 +- + arch/arm/boot/dts/exynos5260.dtsi | 36 +- + arch/arm/boot/dts/exynos5410-odroidxu.dts | 3 +- + arch/arm/boot/dts/exynos5410.dtsi | 2 +- + .../arm/boot/dts/exynos5420-galaxy-tab-common.dtsi | 1 - + arch/arm/boot/dts/exynos5420.dtsi | 76 +-- + arch/arm/boot/dts/exynos5422-odroid-core.dtsi | 34 +- + arch/arm/boot/dts/exynos5422-samsung-k3g.dts | 674 +++++++++++++++++++++ + arch/arm/boot/dts/exynos5800.dtsi | 4 + + arch/arm/mach-s3c/s3c64xx.c | 3 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 17 +- + arch/arm64/boot/dts/exynos/exynos5433.dtsi | 12 +- + arch/arm64/boot/dts/exynos/exynos7-espresso.dts | 4 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 6 +- + arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 2 +- + arch/arm64/boot/dts/exynos/exynosautov9-sadk.dts | 2 - + 38 files changed, 951 insertions(+), 251 deletions(-) + create mode 100644 arch/arm/boot/dts/exynos5422-samsung-k3g.dts +Merging scmi/for-linux-next (672583a235f6 Merge tag 'scmi-updates-6.3' 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. + arch/arm64/kernel/cacheinfo.c | 11 +-- + arch/riscv/kernel/cacheinfo.c | 42 ----------- + drivers/acpi/pptt.c | 93 ++++++++++++++---------- + drivers/base/arch_topology.c | 12 +++- + drivers/base/cacheinfo.c | 161 +++++++++++++++++++++++++++++++++++------- + include/linux/cacheinfo.h | 11 ++- + 6 files changed, 213 insertions(+), 117 deletions(-) +Merging stm32/stm32-next (2f33df889e99 ARM: dts: stm32: Use new media bus type macros) +$ 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/stm32429i-eval.dts | 3 +- + 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/stm32mp13-pinctrl.dtsi | 60 +++ + arch/arm/boot/dts/stm32mp131.dtsi | 707 ++++++++++++++++++++++++++++++- + arch/arm/boot/dts/stm32mp135f-dk.dts | 60 ++- + arch/arm/boot/dts/stm32mp151.dtsi | 2 - + arch/arm/boot/dts/stm32mp157c-ev1.dts | 3 +- + arch/arm/boot/dts/stm32mp15xx-dkx.dtsi | 4 +- + 10 files changed, 830 insertions(+), 12 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 (dc2b15fc18a3 Merge branch for-6.3/arm64/dt into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tegra/linux.git tegra/for-next +Merge made by the 'ort' strategy. + .../bindings/bus/nvidia,tegra210-aconnect.yaml | 4 +- + .../display/tegra/nvidia,tegra186-display.yaml | 4 +- + .../bindings/phy/nvidia,tegra124-xusb-padctl.txt | 779 ------ + .../bindings/phy/nvidia,tegra124-xusb-padctl.yaml | 654 +++++ + .../bindings/phy/nvidia,tegra186-xusb-padctl.yaml | 544 ++++ + .../bindings/phy/nvidia,tegra194-xusb-padctl.yaml | 632 +++++ + .../bindings/phy/nvidia,tegra210-xusb-padctl.yaml | 786 ++++++ + .../bindings/sound/nvidia,tegra210-ahub.yaml | 4 +- + .../bindings/sound/nvidia,tegra210-ope.yaml | 4 +- + .../bindings/usb/nvidia,tegra234-xusb.yaml | 159 ++ + arch/arm/boot/dts/tegra114-asus-tf701t.dts | 240 +- + arch/arm/boot/dts/tegra114-dalmore.dts | 26 +- + arch/arm/boot/dts/tegra124-apalis-emc.dtsi | 14 +- + arch/arm/boot/dts/tegra124-apalis-eval.dts | 20 +- + arch/arm/boot/dts/tegra124-apalis-v1.2-eval.dts | 20 +- + arch/arm/boot/dts/tegra124-apalis-v1.2.dtsi | 60 +- + arch/arm/boot/dts/tegra124-apalis.dtsi | 60 +- + arch/arm/boot/dts/tegra124-jetson-tk1-emc.dtsi | 15 +- + arch/arm/boot/dts/tegra124-jetson-tk1.dts | 8 +- + arch/arm/boot/dts/tegra124-nyan-big-emc.dtsi | 27 +- + arch/arm/boot/dts/tegra124-nyan-big.dts | 22 +- + arch/arm/boot/dts/tegra124-nyan-blaze-emc.dtsi | 19 +- + arch/arm/boot/dts/tegra124-nyan-blaze.dts | 14 +- + arch/arm/boot/dts/tegra124-nyan.dtsi | 71 +- + arch/arm/boot/dts/tegra124.dtsi | 20 +- + arch/arm/boot/dts/tegra20-acer-a500-picasso.dts | 1257 ++++----- + arch/arm/boot/dts/tegra20-asus-tf101.dts | 114 +- + arch/arm/boot/dts/tegra20-colibri-eval-v3.dts | 38 +- + arch/arm/boot/dts/tegra20-colibri-iris.dts | 12 +- + arch/arm/boot/dts/tegra20-colibri.dtsi | 60 +- + arch/arm/boot/dts/tegra20-medcom-wide.dts | 8 +- + arch/arm/boot/dts/tegra20-paz00.dts | 130 +- + arch/arm/boot/dts/tegra20-seaboard.dts | 72 +- + arch/arm/boot/dts/tegra20-tamonten.dtsi | 58 +- + arch/arm/boot/dts/tegra20-trimslice.dts | 20 +- + arch/arm/boot/dts/tegra20-ventana.dts | 58 +- + arch/arm/boot/dts/tegra20.dtsi | 70 +- + arch/arm/boot/dts/tegra30-apalis-eval.dts | 20 +- + arch/arm/boot/dts/tegra30-apalis-v1.1-eval.dts | 20 +- + arch/arm/boot/dts/tegra30-apalis-v1.1.dtsi | 20 +- + arch/arm/boot/dts/tegra30-apalis.dtsi | 20 +- + arch/arm/boot/dts/tegra30-asus-lvds-display.dtsi | 2 + + .../dts/tegra30-asus-nexus7-grouper-common.dtsi | 82 +- + .../tegra30-asus-nexus7-grouper-maxim-pmic.dtsi | 14 +- + ...tegra30-asus-nexus7-grouper-memory-timings.dtsi | 20 +- + arch/arm/boot/dts/tegra30-asus-nexus7-grouper.dtsi | 28 +- + arch/arm/boot/dts/tegra30-asus-nexus7-tilapia.dtsi | 32 +- + arch/arm/boot/dts/tegra30-asus-tf201.dts | 34 +- + arch/arm/boot/dts/tegra30-asus-tf300t.dts | 24 +- + arch/arm/boot/dts/tegra30-asus-tf300tg.dts | 20 +- + arch/arm/boot/dts/tegra30-asus-tf700t.dts | 52 +- + .../boot/dts/tegra30-asus-transformer-common.dtsi | 54 +- + arch/arm/boot/dts/tegra30-beaver.dts | 44 +- + arch/arm/boot/dts/tegra30-cardhu.dtsi | 54 +- + arch/arm/boot/dts/tegra30-colibri-eval-v3.dts | 2 +- + arch/arm/boot/dts/tegra30-colibri.dtsi | 30 +- + arch/arm/boot/dts/tegra30-ouya.dts | 207 +- + arch/arm/boot/dts/tegra30-pegatron-chagall.dts | 130 +- + arch/arm/boot/dts/tegra30.dtsi | 88 +- + arch/arm64/boot/dts/nvidia/tegra132-norrin.dts | 16 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 232 +- + arch/arm64/boot/dts/nvidia/tegra186-p2771-0000.dts | 2564 +++++++++---------- + arch/arm64/boot/dts/nvidia/tegra186-p3310.dtsi | 86 +- + .../dts/nvidia/tegra186-p3509-0000+p3636-0001.dts | 1730 ++++++------- + arch/arm64/boot/dts/nvidia/tegra186.dtsi | 470 ++-- + arch/arm64/boot/dts/nvidia/tegra194-p2888.dtsi | 36 +- + arch/arm64/boot/dts/nvidia/tegra194-p2972-0000.dts | 2418 +++++++++--------- + .../arm64/boot/dts/nvidia/tegra194-p3509-0000.dtsi | 2495 +++++++++--------- + arch/arm64/boot/dts/nvidia/tegra194-p3668.dtsi | 36 +- + arch/arm64/boot/dts/nvidia/tegra194.dtsi | 1619 ++++++------ + arch/arm64/boot/dts/nvidia/tegra210-p2180.dtsi | 66 +- + arch/arm64/boot/dts/nvidia/tegra210-p2371-2180.dts | 278 +- + arch/arm64/boot/dts/nvidia/tegra210-p2595.dtsi | 3 + + arch/arm64/boot/dts/nvidia/tegra210-p2597.dtsi | 5 +- + arch/arm64/boot/dts/nvidia/tegra210-p2894.dtsi | 86 +- + arch/arm64/boot/dts/nvidia/tegra210-p3450-0000.dts | 384 +-- + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 66 +- + arch/arm64/boot/dts/nvidia/tegra210.dtsi | 310 +-- + .../arm64/boot/dts/nvidia/tegra234-p3701-0000.dtsi | 130 +- + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 2683 ++++++++++---------- + .../arm64/boot/dts/nvidia/tegra234-p3737-0000.dtsi | 24 + + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 2083 ++++++++------- + 82 files changed, 13654 insertions(+), 11266 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.txt + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra124-xusb-padctl.yaml + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra186-xusb-padctl.yaml + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra194-xusb-padctl.yaml + create mode 100644 Documentation/devicetree/bindings/phy/nvidia,tegra210-xusb-padctl.yaml + create mode 100644 Documentation/devicetree/bindings/usb/nvidia,tegra234-xusb.yaml +Merging ti/ti-next (9ae21ac445e9 arm64: dts: ti: k3-j7200: Fix wakeup pinmux range) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/ti/k3.yaml | 13 + + arch/arm64/boot/dts/ti/Makefile | 5 + + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 98 +- + arch/arm64/boot/dts/ti/k3-am625-sk.dts | 27 + + arch/arm64/boot/dts/ti/k3-am625.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 365 +++++++ + arch/arm64/boot/dts/ti/k3-am62a-mcu.dtsi | 51 + + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 70 ++ + arch/arm64/boot/dts/ti/k3-am62a7.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi | 231 +++++ + .../boot/dts/ti/k3-am642-phyboard-electra-rdk.dts | 277 ++++++ + arch/arm64/boot/dts/ti/k3-am642.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am654.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 335 +++++++ + arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi | 29 + + .../boot/dts/ti/k3-j7200-common-proc-board.dts | 2 +- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 29 +- + arch/arm64/boot/dts/ti/k3-j7200.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-j721e.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-j721s2.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-j784s4-evm.dts | 196 ++++ + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 1007 ++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 311 ++++++ + arch/arm64/boot/dts/ti/k3-j784s4.dtsi | 287 ++++++ + include/dt-bindings/pinctrl/k3.h | 3 + + 25 files changed, 3317 insertions(+), 27 deletions(-) + create mode 100644 arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-am642-phyboard-electra-rdk.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j784s4-evm.dts + create mode 100644 arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi + create mode 100644 arch/arm64/boot/dts/ti/k3-j784s4.dtsi +Merging xilinx/for-next (a18426505c2b Merge remote-tracking branch 'git/zynqmp/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Auto-merging include/linux/firmware/xlnx-zynqmp.h +Merge made by the 'ort' strategy. + arch/arm/boot/dts/zynq-7000.dtsi | 24 +++++++++++++++---- + 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 | 28 +++++++++++++++------- + 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, 73 insertions(+), 23 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 (71854f780c8b Merge branch 'clk-fixes' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/clock/idt,versaclock5.yaml | 1 + + .../devicetree/bindings/clock/imx8m-clock.yaml | 2 +- + .../bindings/clock/qcom,sm8450-camcc.yaml | 1 + + drivers/clk/Kconfig | 1 - + drivers/clk/clk-versaclock5.c | 28 +++++++-- + drivers/clk/ingenic/jz4760-cgu.c | 18 +++--- + drivers/clk/meson/clk-cpu-dyndiv.c | 9 ++- + drivers/clk/meson/clk-dualdiv.c | 21 ++++--- + drivers/clk/meson/clk-mpll.c | 20 +++--- + drivers/clk/meson/sclk-div.c | 11 ++-- + drivers/clk/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 +- + 15 files changed, 183 insertions(+), 50 deletions(-) +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 (bd176e46e9c2 clk: renesas: r8a779g0: Add CAN-FD clocks) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Merge made by the 'ort' strategy. + drivers/clk/renesas/r8a779a0-cpg-mssr.c | 4 +- + drivers/clk/renesas/r8a779g0-cpg-mssr.c | 20 ++-- + drivers/clk/renesas/r9a06g032-clocks.c | 28 ++++++ + drivers/clk/renesas/rcar-gen4-cpg.c | 156 ++++++++++++++++++++++++++++++++ + drivers/clk/renesas/rcar-gen4-cpg.h | 1 + + drivers/clk/renesas/renesas-cpg-mssr.c | 5 +- + 6 files changed, 200 insertions(+), 14 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 (5dc4c995db9e Linux 6.2-rc4) +$ 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 (43558085185a 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 (9d5567ccf96f riscv: fix jal offsets in patched 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.c +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 adc781ce24ca] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/riscv/uabi.rst | 42 ++++ + arch/riscv/Kconfig.socs | 40 ++-- + 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/hwcap.h | 12 +- + arch/riscv/include/asm/insn.h | 367 +++++++++++++++++++++++++++++++ + arch/riscv/include/asm/parse_asm.h | 219 ------------------ + arch/riscv/include/asm/pgtable.h | 2 +- + arch/riscv/kernel/alternative.c | 83 +++++++ + arch/riscv/kernel/cpu.c | 53 +++-- + arch/riscv/kernel/cpufeature.c | 11 +- + arch/riscv/kernel/kgdb.c | 63 ++---- + arch/riscv/kernel/probes/simulate-insn.c | 19 +- + arch/riscv/kernel/probes/simulate-insn.h | 26 +-- + 19 files changed, 625 insertions(+), 347 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 (d9c36d016f61 Merge patch series "Add a devicetree for the Aldec PolarFire SoC TySoM") +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Merge made by the 'ort' strategy. + .../devicetree/bindings/riscv/microchip.yaml | 1 + + .../devicetree/bindings/riscv/starfive.yaml | 6 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + arch/riscv/boot/dts/microchip/Makefile | 1 + + .../boot/dts/microchip/mpfs-tysom-m-fabric.dtsi | 18 +++ + arch/riscv/boot/dts/microchip/mpfs-tysom-m.dts | 165 +++++++++++++++++++++ + 6 files changed, 193 insertions(+) + create mode 100644 arch/riscv/boot/dts/microchip/mpfs-tysom-m-fabric.dtsi + create mode 100644 arch/riscv/boot/dts/microchip/mpfs-tysom-m.dts +Merging riscv-soc/riscv-soc-for-next (f3460326e38d Merge patch series "JH7110 PMU Support") +$ git merge -m Merge branch 'riscv-soc-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc/riscv-soc-for-next +Auto-merging MAINTAINERS +Auto-merging drivers/soc/Kconfig +Auto-merging drivers/soc/Makefile +Merge made by the 'ort' strategy. + .../bindings/power/starfive,jh7110-pmu.yaml | 45 +++ + .../devicetree/bindings/riscv/sifive,ccache0.yaml | 9 +- + MAINTAINERS | 13 + + drivers/soc/Kconfig | 1 + + drivers/soc/Makefile | 3 +- + drivers/soc/sifive/Kconfig | 2 +- + drivers/soc/starfive/Kconfig | 12 + + drivers/soc/starfive/Makefile | 3 + + drivers/soc/starfive/jh71xx_pmu.c | 383 +++++++++++++++++++++ + include/dt-bindings/power/starfive,jh7110-pmu.h | 17 + + 10 files changed, 485 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/starfive,jh7110-pmu.yaml + create mode 100644 drivers/soc/starfive/Kconfig + create mode 100644 drivers/soc/starfive/Makefile + create mode 100644 drivers/soc/starfive/jh71xx_pmu.c + create mode 100644 include/dt-bindings/power/starfive,jh7110-pmu.h +Merging s390/for-next (fe27e533c967 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/Kconfig | 1 + + 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/cpu_mcf.h | 112 -- + arch/s390/include/asm/cpu_mf.h | 53 - + 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/kprobes.h | 3 +- + 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/asm/syscall_wrapper.h | 144 +- + arch/s390/include/asm/unwind.h | 10 +- + arch/s390/include/uapi/asm/fs3270.h | 25 + + arch/s390/include/uapi/asm/raw3270.h | 75 + + arch/s390/kernel/Makefile | 3 +- + arch/s390/kernel/abs_lowcore.c | 49 - + arch/s390/kernel/cache.c | 2 +- + 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 | 7 +- + arch/s390/kernel/kprobes.c | 30 - + arch/s390/kernel/machine_kexec.c | 5 +- + arch/s390/kernel/mcount.S | 12 +- + arch/s390/kernel/os_info.c | 5 +- + arch/s390/kernel/perf_cpum_cf.c | 308 +++- + arch/s390/kernel/perf_cpum_cf_common.c | 233 --- + arch/s390/kernel/perf_cpum_sf.c | 148 +- + arch/s390/kernel/perf_pai_ext.c | 2 +- + arch/s390/kernel/process.c | 4 +- + arch/s390/kernel/rethook.c | 33 + + arch/s390/kernel/setup.c | 91 +- + arch/s390/kernel/smp.c | 14 +- + arch/s390/kernel/stacktrace.c | 6 +- + arch/s390/kernel/text_amode31.S | 13 + + arch/s390/kernel/vmlinux.lds.S | 4 + + arch/s390/lib/test_unwind.c | 12 +- + arch/s390/mm/init.c | 35 +- + arch/s390/mm/kasan_init.c | 164 +-- + arch/s390/mm/maccess.c | 28 +- + arch/s390/mm/vmem.c | 90 +- + 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/css.c | 21 +- + drivers/s390/cio/css.h | 2 +- + 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 | 114 +- + drivers/s390/crypto/zcrypt_api.c | 6 +- + 71 files changed, 3874 insertions(+), 4050 deletions(-) + create mode 100644 arch/s390/boot/vmem.c + delete mode 100644 arch/s390/include/asm/cpu_mcf.h + create mode 100644 arch/s390/include/uapi/asm/fs3270.h + create mode 100644 arch/s390/include/uapi/asm/raw3270.h + delete mode 100644 arch/s390/kernel/perf_cpum_cf_common.c + create mode 100644 arch/s390/kernel/rethook.c + 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 (f48ed993526e Merge branch 'fs.fuse.acl' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git vfs-idmapping/for-next +Auto-merging MAINTAINERS +Auto-merging fs/btrfs/inode.c +CONFLICT (content): Merge conflict in fs/btrfs/inode.c +Auto-merging fs/ceph/super.h +Auto-merging fs/cifs/link.c +Auto-merging fs/coredump.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/hfs/inode.c +Auto-merging fs/hostfs/hostfs_kern.c +Auto-merging fs/ksmbd/smb2pdu.c +Auto-merging fs/nfs/dir.c +Auto-merging fs/nfsd/nfsproc.c +Auto-merging fs/ntfs3/file.c +Auto-merging fs/xfs/xfs_ioctl.c +Auto-merging fs/xfs/xfs_qm.c +Auto-merging fs/zonefs/super.c +Auto-merging include/linux/fs.h +Auto-merging mm/madvise.c +Auto-merging mm/shmem.c +Resolved 'fs/btrfs/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 6a91a2d05e23] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/idmapping.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/locking.rst | 24 +- + Documentation/filesystems/vfs.rst | 24 +- + MAINTAINERS | 2 +- + arch/powerpc/platforms/cell/spufs/inode.c | 8 +- + drivers/android/binderfs.c | 4 +- + drivers/base/devtmpfs.c | 12 +- + fs/9p/acl.c | 10 +- + fs/9p/acl.h | 4 +- + fs/9p/v9fs.h | 2 +- + fs/9p/v9fs_vfs.h | 2 +- + fs/9p/vfs_inode.c | 38 +- + fs/9p/vfs_inode_dotl.c | 32 +- + fs/9p/xattr.c | 2 +- + fs/Makefile | 2 +- + fs/adfs/adfs.h | 2 +- + fs/adfs/inode.c | 4 +- + fs/affs/affs.h | 10 +- + fs/affs/inode.c | 6 +- + fs/affs/namei.c | 8 +- + fs/afs/dir.c | 16 +- + fs/afs/inode.c | 6 +- + fs/afs/internal.h | 6 +- + fs/afs/security.c | 2 +- + fs/afs/xattr.c | 4 +- + fs/attr.c | 129 ++++--- + fs/autofs/root.c | 14 +- + fs/bad_inode.c | 20 +- + fs/bfs/dir.c | 6 +- + fs/btrfs/acl.c | 4 +- + fs/btrfs/acl.h | 2 +- + fs/btrfs/btrfs_inode.h | 2 +- + fs/btrfs/inode.c | 52 +-- + fs/btrfs/ioctl.c | 70 ++-- + fs/btrfs/ioctl.h | 2 +- + fs/btrfs/tests/btrfs-tests.c | 2 +- + fs/btrfs/xattr.c | 4 +- + fs/cachefiles/interface.c | 4 +- + fs/cachefiles/namei.c | 12 +- + fs/cachefiles/xattr.c | 10 +- + fs/ceph/acl.c | 4 +- + fs/ceph/dir.c | 12 +- + fs/ceph/inode.c | 14 +- + fs/ceph/super.h | 8 +- + fs/ceph/xattr.c | 2 +- + fs/cifs/cifsacl.c | 4 +- + fs/cifs/cifsfs.c | 4 +- + fs/cifs/cifsfs.h | 14 +- + fs/cifs/cifsproto.h | 4 +- + fs/cifs/dir.c | 4 +- + fs/cifs/inode.c | 18 +- + fs/cifs/link.c | 2 +- + fs/cifs/xattr.c | 2 +- + fs/coda/coda_linux.h | 6 +- + fs/coda/dir.c | 10 +- + fs/coda/inode.c | 6 +- + fs/coda/pioctl.c | 4 +- + fs/configfs/configfs_internal.h | 4 +- + fs/configfs/dir.c | 2 +- + fs/configfs/inode.c | 4 +- + fs/configfs/symlink.c | 4 +- + fs/coredump.c | 8 +- + fs/crypto/policy.c | 2 +- + fs/debugfs/inode.c | 6 +- + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/inode.c | 70 ++-- + fs/ecryptfs/mmap.c | 2 +- + fs/efivarfs/inode.c | 4 +- + fs/erofs/inode.c | 4 +- + fs/erofs/internal.h | 2 +- + fs/exec.c | 14 +- + fs/exfat/exfat_fs.h | 4 +- + fs/exfat/file.c | 10 +- + fs/exfat/namei.c | 6 +- + fs/exportfs/expfs.c | 4 +- + fs/ext2/acl.c | 4 +- + fs/ext2/acl.h | 2 +- + fs/ext2/ext2.h | 6 +- + fs/ext2/ialloc.c | 2 +- + fs/ext2/inode.c | 20 +- + fs/ext2/ioctl.c | 6 +- + fs/ext2/namei.c | 12 +- + fs/ext2/xattr_security.c | 2 +- + fs/ext2/xattr_trusted.c | 2 +- + fs/ext2/xattr_user.c | 2 +- + fs/ext4/acl.c | 4 +- + fs/ext4/acl.h | 2 +- + fs/ext4/ext4.h | 16 +- + fs/ext4/ialloc.c | 6 +- + fs/ext4/inode.c | 28 +- + fs/ext4/ioctl.c | 20 +- + fs/ext4/namei.c | 32 +- + fs/ext4/symlink.c | 4 +- + fs/ext4/xattr_hurd.c | 2 +- + fs/ext4/xattr_security.c | 2 +- + fs/ext4/xattr_trusted.c | 2 +- + fs/ext4/xattr_user.c | 2 +- + fs/f2fs/acl.c | 14 +- + fs/f2fs/acl.h | 2 +- + fs/f2fs/f2fs.h | 8 +- + fs/f2fs/file.c | 50 +-- + fs/f2fs/namei.c | 50 +-- + fs/f2fs/recovery.c | 6 +- + fs/f2fs/xattr.c | 6 +- + fs/fat/fat.h | 4 +- + fs/fat/file.c | 26 +- + fs/fat/namei_msdos.c | 6 +- + fs/fat/namei_vfat.c | 6 +- + fs/fcntl.c | 2 +- + fs/fuse/acl.c | 14 +- + fs/fuse/dir.c | 32 +- + fs/fuse/file.c | 3 +- + fs/fuse/fuse_i.h | 6 +- + fs/fuse/ioctl.c | 2 +- + fs/fuse/xattr.c | 2 +- + fs/gfs2/acl.c | 4 +- + fs/gfs2/acl.h | 2 +- + fs/gfs2/file.c | 4 +- + fs/gfs2/inode.c | 58 +-- + fs/gfs2/inode.h | 4 +- + fs/gfs2/xattr.c | 2 +- + fs/hfs/attr.c | 2 +- + fs/hfs/dir.c | 6 +- + fs/hfs/hfs_fs.h | 2 +- + fs/hfs/inode.c | 6 +- + fs/hfsplus/dir.c | 14 +- + fs/hfsplus/hfsplus_fs.h | 4 +- + fs/hfsplus/inode.c | 14 +- + fs/hfsplus/xattr.c | 2 +- + fs/hfsplus/xattr_security.c | 2 +- + fs/hfsplus/xattr_trusted.c | 2 +- + fs/hfsplus/xattr_user.c | 2 +- + fs/hostfs/hostfs_kern.c | 20 +- + fs/hpfs/hpfs_fn.h | 2 +- + fs/hpfs/inode.c | 6 +- + fs/hpfs/namei.c | 10 +- + fs/hugetlbfs/inode.c | 22 +- + fs/init.c | 14 +- + fs/inode.c | 57 ++- + fs/internal.h | 15 +- + fs/ioctl.c | 16 +- + fs/jffs2/acl.c | 4 +- + fs/jffs2/acl.h | 2 +- + fs/jffs2/dir.c | 20 +- + fs/jffs2/fs.c | 6 +- + fs/jffs2/os-linux.h | 2 +- + fs/jffs2/security.c | 2 +- + fs/jffs2/xattr_trusted.c | 2 +- + fs/jffs2/xattr_user.c | 2 +- + fs/jfs/acl.c | 4 +- + fs/jfs/file.c | 12 +- + fs/jfs/ioctl.c | 2 +- + fs/jfs/jfs_acl.h | 2 +- + fs/jfs/jfs_inode.c | 2 +- + fs/jfs/jfs_inode.h | 4 +- + fs/jfs/namei.c | 10 +- + fs/jfs/xattr.c | 4 +- + fs/kernfs/dir.c | 4 +- + fs/kernfs/inode.c | 18 +- + fs/kernfs/kernfs-internal.h | 6 +- + fs/ksmbd/ndr.c | 6 +- + fs/ksmbd/ndr.h | 2 +- + fs/ksmbd/oplock.c | 6 +- + fs/ksmbd/smb2pdu.c | 122 +++--- + fs/ksmbd/smb_common.c | 4 +- + fs/ksmbd/smbacl.c | 72 ++-- + fs/ksmbd/smbacl.h | 12 +- + fs/ksmbd/vfs.c | 172 ++++----- + fs/ksmbd/vfs.h | 36 +- + fs/ksmbd/vfs_cache.c | 4 +- + fs/libfs.c | 20 +- + fs/minix/bitmap.c | 2 +- + fs/minix/file.c | 6 +- + fs/minix/inode.c | 4 +- + fs/minix/minix.h | 2 +- + fs/minix/namei.c | 14 +- + fs/mnt_idmapping.c | 273 ++++++++++++++ + fs/namei.c | 450 +++++++++++------------ + fs/namespace.c | 118 +----- + fs/nfs/dir.c | 14 +- + fs/nfs/inode.c | 6 +- + fs/nfs/internal.h | 10 +- + fs/nfs/namespace.c | 10 +- + fs/nfs/nfs3_fs.h | 2 +- + fs/nfs/nfs3acl.c | 2 +- + fs/nfs/nfs4proc.c | 10 +- + fs/nfsd/nfs2acl.c | 4 +- + fs/nfsd/nfs3acl.c | 4 +- + fs/nfsd/nfs3proc.c | 2 +- + fs/nfsd/nfs4recover.c | 6 +- + fs/nfsd/nfsfh.c | 2 +- + fs/nfsd/nfsproc.c | 2 +- + fs/nfsd/vfs.c | 41 ++- + fs/nilfs2/inode.c | 12 +- + fs/nilfs2/ioctl.c | 2 +- + fs/nilfs2/namei.c | 10 +- + fs/nilfs2/nilfs.h | 6 +- + fs/ntfs/inode.c | 6 +- + fs/ntfs/inode.h | 2 +- + fs/ntfs3/file.c | 12 +- + fs/ntfs3/inode.c | 6 +- + fs/ntfs3/namei.c | 24 +- + fs/ntfs3/ntfs_fs.h | 16 +- + fs/ntfs3/xattr.c | 24 +- + fs/ocfs2/acl.c | 4 +- + fs/ocfs2/acl.h | 2 +- + fs/ocfs2/dlmfs/dlmfs.c | 14 +- + fs/ocfs2/file.c | 20 +- + fs/ocfs2/file.h | 6 +- + fs/ocfs2/ioctl.c | 2 +- + fs/ocfs2/ioctl.h | 2 +- + fs/ocfs2/namei.c | 18 +- + fs/ocfs2/refcounttree.c | 4 +- + fs/ocfs2/xattr.c | 6 +- + fs/omfs/dir.c | 6 +- + fs/omfs/file.c | 6 +- + fs/omfs/inode.c | 2 +- + fs/open.c | 35 +- + fs/orangefs/acl.c | 4 +- + fs/orangefs/inode.c | 18 +- + fs/orangefs/namei.c | 8 +- + fs/orangefs/orangefs-kernel.h | 8 +- + fs/orangefs/xattr.c | 2 +- + fs/overlayfs/dir.c | 12 +- + fs/overlayfs/export.c | 4 +- + fs/overlayfs/file.c | 8 +- + fs/overlayfs/inode.c | 46 +-- + fs/overlayfs/namei.c | 6 +- + fs/overlayfs/overlayfs.h | 55 +-- + fs/overlayfs/ovl_entry.h | 4 +- + fs/overlayfs/readdir.c | 4 +- + fs/overlayfs/super.c | 4 +- + fs/overlayfs/util.c | 14 +- + fs/posix_acl.c | 106 +++--- + fs/proc/base.c | 22 +- + fs/proc/fd.c | 8 +- + fs/proc/fd.h | 2 +- + fs/proc/generic.c | 10 +- + fs/proc/internal.h | 4 +- + fs/proc/proc_net.c | 4 +- + fs/proc/proc_sysctl.c | 12 +- + fs/proc/root.c | 4 +- + fs/quota/dquot.c | 10 +- + fs/ramfs/file-nommu.c | 8 +- + fs/ramfs/inode.c | 16 +- + fs/reiserfs/acl.h | 2 +- + fs/reiserfs/inode.c | 10 +- + fs/reiserfs/ioctl.c | 4 +- + fs/reiserfs/namei.c | 12 +- + fs/reiserfs/reiserfs.h | 4 +- + fs/reiserfs/xattr.c | 12 +- + fs/reiserfs/xattr.h | 2 +- + fs/reiserfs/xattr_acl.c | 6 +- + fs/reiserfs/xattr_security.c | 2 +- + fs/reiserfs/xattr_trusted.c | 2 +- + fs/reiserfs/xattr_user.c | 2 +- + fs/remap_range.c | 6 +- + fs/stat.c | 24 +- + fs/sysv/file.c | 6 +- + fs/sysv/ialloc.c | 2 +- + fs/sysv/itree.c | 4 +- + fs/sysv/namei.c | 12 +- + fs/sysv/sysv.h | 2 +- + fs/tracefs/inode.c | 2 +- + fs/ubifs/dir.c | 18 +- + fs/ubifs/file.c | 8 +- + fs/ubifs/ioctl.c | 2 +- + fs/ubifs/ubifs.h | 8 +- + fs/ubifs/xattr.c | 2 +- + fs/udf/file.c | 6 +- + fs/udf/ialloc.c | 2 +- + fs/udf/namei.c | 12 +- + fs/udf/symlink.c | 4 +- + fs/ufs/ialloc.c | 2 +- + fs/ufs/inode.c | 6 +- + fs/ufs/namei.c | 10 +- + fs/ufs/ufs.h | 2 +- + fs/utimes.c | 2 +- + fs/vboxsf/dir.c | 8 +- + fs/vboxsf/utils.c | 6 +- + fs/vboxsf/vfsmod.h | 4 +- + fs/xattr.c | 83 +++-- + fs/xfs/xfs_acl.c | 4 +- + fs/xfs/xfs_acl.h | 2 +- + fs/xfs/xfs_file.c | 2 +- + fs/xfs/xfs_inode.c | 32 +- + fs/xfs/xfs_inode.h | 8 +- + fs/xfs/xfs_ioctl.c | 8 +- + fs/xfs/xfs_ioctl.h | 2 +- + fs/xfs/xfs_ioctl32.c | 2 +- + fs/xfs/xfs_iops.c | 85 +++-- + fs/xfs/xfs_iops.h | 2 +- + fs/xfs/xfs_itable.c | 14 +- + fs/xfs/xfs_itable.h | 2 +- + fs/xfs/xfs_pnfs.c | 2 +- + fs/xfs/xfs_qm.c | 2 +- + fs/xfs/xfs_symlink.c | 8 +- + fs/xfs/xfs_symlink.h | 2 +- + fs/xfs/xfs_xattr.c | 2 +- + fs/zonefs/super.c | 10 +- + include/linux/capability.h | 9 +- + include/linux/evm.h | 26 +- + include/linux/fileattr.h | 2 +- + include/linux/fs.h | 174 +++++---- + include/linux/ima.h | 22 +- + include/linux/lsm_hook_defs.h | 14 +- + include/linux/lsm_hooks.h | 2 +- + include/linux/mnt_idmapping.h | 226 ++---------- + include/linux/mount.h | 2 - + include/linux/namei.h | 6 +- + include/linux/nfs_fs.h | 6 +- + include/linux/posix_acl.h | 24 +- + include/linux/quotaops.h | 10 +- + include/linux/security.h | 46 ++- + include/linux/xattr.h | 20 +- + ipc/mqueue.c | 6 +- + kernel/auditsc.c | 4 +- + kernel/bpf/inode.c | 8 +- + kernel/capability.c | 10 +- + kernel/cgroup/cgroup.c | 2 +- + mm/madvise.c | 2 +- + mm/mincore.c | 2 +- + mm/secretmem.c | 4 +- + mm/shmem.c | 69 ++-- + net/socket.c | 6 +- + net/unix/af_unix.c | 8 +- + security/apparmor/apparmorfs.c | 2 +- + security/apparmor/domain.c | 4 +- + security/apparmor/file.c | 2 +- + security/apparmor/lsm.c | 16 +- + security/commoncap.c | 68 ++-- + security/integrity/evm/evm_crypto.c | 10 +- + security/integrity/evm/evm_main.c | 46 +-- + security/integrity/evm/evm_secfs.c | 2 +- + security/integrity/ima/ima.h | 10 +- + security/integrity/ima/ima_api.c | 6 +- + security/integrity/ima/ima_appraise.c | 18 +- + security/integrity/ima/ima_asymmetric_keys.c | 2 +- + security/integrity/ima/ima_main.c | 26 +- + security/integrity/ima/ima_policy.c | 14 +- + security/integrity/ima/ima_queue_keys.c | 2 +- + security/integrity/ima/ima_template_lib.c | 2 +- + security/security.c | 46 +-- + security/selinux/hooks.c | 22 +- + security/smack/smack_lsm.c | 30 +- + tools/testing/selftests/bpf/progs/profiler.inc.h | 2 +- + 345 files changed, 2626 insertions(+), 2644 deletions(-) + create mode 100644 fs/mnt_idmapping.c +Merging fscrypt/for-next (5dc4c995db9e Linux 6.2-rc4) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging fscache/fscache-next (0885eacdc81f Merge tag 'nfsd-5.19-1' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux) +$ git merge -m Merge branch 'fscache-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git fscache/fscache-next +Already up to date. +Merging afs/afs-next (a9eb558a5bea afs: Stop implementing ->writepage()) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Already up to date. +Merging btrfs/for-next (5966d3882003 Merge branch 'for-next-next-v6.2-20230125' into for-next-20230125) + d4295bf91b3b ("btrfs: raid56: fix stripes if vertical errors are found") + dda3dc127f22 ("btrfs: limit device extents to the device size") + ed55a190fc3e ("btrfs: zlib: zero-initialize zlib workspace") +$ 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/btrfs_inode.h +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/volumes.c +Merge made by the 'ort' strategy. + block/blk-merge.c | 3 +- + fs/btrfs/Makefile | 6 +- + fs/btrfs/backref.c | 33 ++- + fs/btrfs/bio.c | 547 +++++++++++++++++++++++++++++++---- + fs/btrfs/bio.h | 67 ++--- + fs/btrfs/block-group.c | 246 ++++++++++++++-- + fs/btrfs/block-group.h | 21 +- + fs/btrfs/btrfs_inode.h | 22 +- + fs/btrfs/compression.c | 275 +++--------------- + fs/btrfs/compression.h | 3 - + fs/btrfs/defrag.c | 4 +- + fs/btrfs/delayed-ref.c | 24 +- + fs/btrfs/delayed-ref.h | 2 +- + fs/btrfs/discard.c | 41 ++- + fs/btrfs/disk-io.c | 214 ++------------ + fs/btrfs/disk-io.h | 11 +- + fs/btrfs/extent-io-tree.c | 8 +- + fs/btrfs/extent-io-tree.h | 1 - + fs/btrfs/extent-tree.c | 172 ++++------- + fs/btrfs/extent-tree.h | 81 ++++++ + fs/btrfs/extent_io.c | 556 ++++-------------------------------- + fs/btrfs/extent_io.h | 31 -- + fs/btrfs/file-item.c | 74 ++--- + fs/btrfs/file-item.h | 8 +- + fs/btrfs/file.c | 2 +- + fs/btrfs/fs.c | 4 + + fs/btrfs/fs.h | 11 +- + fs/btrfs/inode.c | 636 ++++++----------------------------------- + fs/btrfs/locking.c | 25 +- + fs/btrfs/locking.h | 5 +- + fs/btrfs/lru_cache.c | 164 +++++++++++ + fs/btrfs/lru_cache.h | 80 ++++++ + fs/btrfs/lzo.c | 2 +- + fs/btrfs/messages.c | 38 --- + fs/btrfs/messages.h | 43 +-- + fs/btrfs/ordered-data.c | 25 +- + fs/btrfs/ordered-data.h | 2 +- + fs/btrfs/relocation.c | 2 +- + fs/btrfs/scrub.c | 49 +++- + fs/btrfs/send.c | 663 ++++++++++++++++++++++--------------------- + fs/btrfs/super.c | 1 + + fs/btrfs/sysfs.c | 29 +- + fs/btrfs/sysfs.h | 3 +- + fs/btrfs/transaction.c | 34 +++ + fs/btrfs/transaction.h | 31 ++ + fs/btrfs/tree-log.c | 64 +++-- + fs/btrfs/tree-log.h | 11 +- + fs/btrfs/volumes.c | 115 +++----- + fs/btrfs/volumes.h | 18 -- + fs/btrfs/zoned.c | 94 +++--- + fs/btrfs/zoned.h | 16 +- + fs/iomap/direct-io.c | 10 +- + include/linux/bio.h | 4 + + include/linux/iomap.h | 3 +- + include/trace/events/btrfs.h | 127 +++++++-- + 55 files changed, 2186 insertions(+), 2575 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 (d11e2b43a4c3 update internal module version number for cifs.ko) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Auto-merging fs/cifs/cifsfs.h +Merge made by the 'ort' strategy. + fs/cifs/cifs_debug.c | 27 +++++++++++--- + fs/cifs/cifsfs.h | 2 +- + fs/cifs/cifsglob.h | 2 ++ + fs/cifs/ntlmssp.h | 4 +-- + fs/cifs/sess.c | 99 ++++++++++++++++++++++++++++++++++++++++++---------- + fs/cifs/smb2ops.c | 20 ++++++++--- + fs/cifs/smbdirect.c | 1 + + fs/cifs/transport.c | 22 +++++++++--- + 8 files changed, 142 insertions(+), 35 deletions(-) +Merging configfs/for-next (77992f896745 configfs: remove mentions of committable items) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Already up to date. +Merging ecryptfs/next (c1cc2db21607 ecryptfs: keystore: Fix typo 'the the' in comment) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/tyhicks/ecryptfs.git ecryptfs/next +Auto-merging fs/ecryptfs/crypto.c +Merge made by the 'ort' strategy. + fs/ecryptfs/crypto.c | 8 ++++---- + fs/ecryptfs/keystore.c | 2 +- + fs/ecryptfs/read_write.c | 8 ++++---- + 3 files changed, 9 insertions(+), 9 deletions(-) +Merging erofs/dev (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 (5742d6a467d1 exfat: handle unreconized benign secondary entries) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Auto-merging fs/exfat/exfat_fs.h +Auto-merging fs/exfat/file.c +Auto-merging fs/exfat/namei.c +Merge made by the 'ort' strategy. + fs/exfat/dir.c | 90 ++++++++++++++++++++++++++++++++++------------------ + fs/exfat/exfat_fs.h | 4 ++- + fs/exfat/exfat_raw.h | 21 ++++++++++++ + fs/exfat/file.c | 3 +- + fs/exfat/inode.c | 6 ++-- + fs/exfat/namei.c | 2 +- + fs/exfat/super.c | 3 +- + 7 files changed, 89 insertions(+), 40 deletions(-) +Merging ext3/for_next (085cf7b7e2ef udf: Fix file counting in LVID) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Auto-merging fs/ext2/ext2.h +Auto-merging fs/ext2/namei.c +Auto-merging fs/udf/file.c +Auto-merging fs/udf/ialloc.c +Auto-merging fs/udf/namei.c +Auto-merging fs/udf/symlink.c +Merge made by the 'ort' strategy. + fs/ext2/dir.c | 17 +- + fs/ext2/ext2.h | 5 +- + fs/ext2/namei.c | 21 +- + fs/mpage.c | 2 + + fs/udf/balloc.c | 2 +- + fs/udf/dir.c | 148 ++----- + fs/udf/directory.c | 575 ++++++++++++++++++++------- + fs/udf/file.c | 176 ++++----- + fs/udf/ialloc.c | 31 +- + fs/udf/inode.c | 602 +++++++++++++++-------------- + fs/udf/lowlevel.c | 7 +- + fs/udf/misc.c | 18 +- + fs/udf/namei.c | 1093 +++++++++++++++++++--------------------------------- + fs/udf/partition.c | 5 +- + fs/udf/super.c | 77 ++-- + fs/udf/symlink.c | 28 +- + fs/udf/truncate.c | 6 +- + fs/udf/udf_i.h | 3 +- + fs/udf/udf_sb.h | 3 +- + fs/udf/udfdecl.h | 57 ++- + 20 files changed, 1329 insertions(+), 1547 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 +Auto-merging fs/f2fs/f2fs.h +Auto-merging fs/f2fs/file.c +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/for-next (245edf445c34 fsverity.rst: update git repo URL for fsverity-utils) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Auto-merging fs/f2fs/data.c +Merge made by the 'ort' strategy. + Documentation/filesystems/fsverity.rst | 78 ++++---- + 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, 648 insertions(+), 457 deletions(-) +Merging fuse/for-next (1cc4606d19e3 fuse: add inode/permission checks to fileattr_get/fileattr_set) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/dir.c +Auto-merging fs/fuse/file.c +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/inode.c +Auto-merging fs/fuse/ioctl.c +Merge made by the 'ort' strategy. + fs/fuse/cuse.c | 2 +- + fs/fuse/dev.c | 4 +- + fs/fuse/dir.c | 126 +++++++++++++++++++++++++++++++++++----------- + fs/fuse/file.c | 91 +++++++++++++++++++++++---------- + fs/fuse/fuse_i.h | 9 +++- + fs/fuse/inode.c | 4 +- + fs/fuse/ioctl.c | 6 +++ + include/uapi/linux/fuse.h | 45 ++++++++++++++++- + 8 files changed, 225 insertions(+), 62 deletions(-) +Merging gfs2/for-next (2d5a4e7c82f1 gfs2: gl_object races fix) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2.git gfs2/for-next +Auto-merging fs/gfs2/inode.c +Auto-merging include/linux/iomap.h +Merge made by the 'ort' strategy. + fs/gfs2/bmap.c | 38 ++++++++++++++------- + fs/gfs2/glock.c | 4 +-- + fs/gfs2/inode.c | 8 +++++ + fs/gfs2/super.c | 4 +-- + fs/iomap/buffered-io.c | 91 +++++++++++++++++++++++++++++++++----------------- + fs/xfs/xfs_iomap.c | 4 +-- + include/linux/iomap.h | 27 ++++++++------- + 7 files changed, 114 insertions(+), 62 deletions(-) +Merging jfs/jfs-next (a60dca73a1a8 jfs: makes diUnmount/diMount in jfs_mount_rw atomic) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Already up to date. +Merging ksmbd/ksmbd-for-next (a34dc4a9b9e2 ksmbd: downgrade ndr version error message to debug) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Auto-merging fs/ksmbd/ndr.c +Auto-merging fs/ksmbd/smb2pdu.c +Merge made by the 'ort' strategy. + fs/ksmbd/connection.c | 17 +++++++++++++++-- + fs/ksmbd/ksmbd_netlink.h | 3 ++- + fs/ksmbd/ndr.c | 8 ++++---- + fs/ksmbd/server.h | 1 + + fs/ksmbd/smb2pdu.c | 2 ++ + fs/ksmbd/smb2pdu.h | 5 +++-- + fs/ksmbd/transport_ipc.c | 3 +++ + fs/ksmbd/transport_tcp.c | 17 ++++++++++++++++- + 8 files changed, 46 insertions(+), 10 deletions(-) +Merging nfs/linux-next (2241ab53cbb5 Linux 6.2-rc5) +$ 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/nfsd-next (f1291b416498 SUNRPC: Remove ->xpo_secure_port()) +$ git merge -m Merge branch 'nfsd-next' of git://git.kernel.org/pub/scm/linux/kernel/git/cel/linux nfsd/nfsd-next +Auto-merging fs/namei.c +Auto-merging fs/nfsd/filecache.c +Auto-merging fs/nfsd/nfs2acl.c +Auto-merging fs/nfsd/nfs3acl.c +Auto-merging fs/nfsd/nfs3proc.c +Auto-merging fs/nfsd/nfsproc.c +Auto-merging fs/nfsd/vfs.c +Auto-merging include/linux/namei.h +Merge made by the 'ort' strategy. + fs/lockd/svc.c | 21 +- + fs/namei.c | 6 +- + fs/nfs/callback_xdr.c | 13 +- + fs/nfs/export.c | 2 +- + fs/nfsd/fault_inject.c | 142 --- + fs/nfsd/filecache.c | 5 +- + fs/nfsd/nfs2acl.c | 5 +- + fs/nfsd/nfs3acl.c | 5 +- + fs/nfsd/nfs3proc.c | 5 +- + fs/nfsd/nfs4proc.c | 190 ++- + fs/nfsd/nfs4state.c | 77 +- + fs/nfsd/nfscache.c | 4 +- + fs/nfsd/nfsctl.c | 82 +- + fs/nfsd/nfsd.h | 2 +- + fs/nfsd/nfsproc.c | 6 +- + fs/nfsd/nfssvc.c | 21 +- + fs/nfsd/state.h | 2 - + 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/gss_krb5.h | 196 +-- + include/linux/sunrpc/gss_krb5_enctypes.h | 41 - + include/linux/sunrpc/msg_prot.h | 5 + + include/linux/sunrpc/svc.h | 133 +- + include/linux/sunrpc/svc_xprt.h | 1 - + include/linux/sunrpc/xdr.h | 28 +- + include/trace/events/rpcgss.h | 22 + + include/trace/events/sunrpc.h | 28 +- + net/sunrpc/.kunitconfig | 30 + + net/sunrpc/Kconfig | 96 +- + net/sunrpc/auth_gss/Makefile | 2 + + net/sunrpc/auth_gss/auth_gss.c | 17 + + net/sunrpc/auth_gss/gss_krb5_crypto.c | 656 +++++++--- + net/sunrpc/auth_gss/gss_krb5_internal.h | 232 ++++ + net/sunrpc/auth_gss/gss_krb5_keys.c | 416 +++++- + net/sunrpc/auth_gss/gss_krb5_mech.c | 730 +++++++---- + net/sunrpc/auth_gss/gss_krb5_seal.c | 122 +- + net/sunrpc/auth_gss/gss_krb5_seqnum.c | 2 + + net/sunrpc/auth_gss/gss_krb5_test.c | 2040 ++++++++++++++++++++++++++++++ + net/sunrpc/auth_gss/gss_krb5_unseal.c | 63 +- + net/sunrpc/auth_gss/gss_krb5_wrap.c | 124 +- + net/sunrpc/auth_gss/svcauth_gss.c | 1080 +++++++++------- + net/sunrpc/stats.c | 11 +- + net/sunrpc/svc.c | 158 +-- + net/sunrpc/svc_xprt.c | 20 +- + net/sunrpc/svcauth.c | 13 +- + net/sunrpc/svcauth_unix.c | 178 ++- + net/sunrpc/svcsock.c | 4 +- + net/sunrpc/xdr.c | 79 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 1 + + net/sunrpc/xprtrdma/svc_rdma_transport.c | 7 - + 53 files changed, 5153 insertions(+), 1988 deletions(-) + delete mode 100644 fs/nfsd/fault_inject.c + delete mode 100644 include/linux/sunrpc/gss_krb5_enctypes.h + create mode 100644 net/sunrpc/.kunitconfig + create mode 100644 net/sunrpc/auth_gss/gss_krb5_internal.h + create mode 100644 net/sunrpc/auth_gss/gss_krb5_test.c +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 +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ntfs3/namei.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/xattr.c +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 (00628764be56 ovl: fail on invalid uid/gid mapping at copy up) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/vfs.git overlayfs/overlayfs-next +Merge made by the 'ort' strategy. + fs/overlayfs/copy_up.c | 6 +++++- + 1 file changed, 5 insertions(+), 1 deletion(-) +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 +Auto-merging fs/ubifs/dir.c +Auto-merging fs/ubifs/file.c +Auto-merging fs/ubifs/ubifs.h +Merge made by the 'ort' strategy. + drivers/mtd/ubi/block.c | 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 v9fs-ericvh/ericvh/for-next (32a145a90935 fs/9p: Fix revalidate) +$ git merge -m Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-ericvh/ericvh/for-next +Auto-merging fs/9p/v9fs.h +Auto-merging fs/9p/v9fs_vfs.h +Auto-merging fs/9p/vfs_inode.c +CONFLICT (content): Merge conflict in fs/9p/vfs_inode.c +Auto-merging fs/9p/vfs_inode_dotl.c +CONFLICT (content): Merge conflict in fs/9p/vfs_inode_dotl.c +Recorded preimage for 'fs/9p/vfs_inode.c' +Recorded preimage for 'fs/9p/vfs_inode_dotl.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/9p/vfs_inode.c'. +Recorded resolution for 'fs/9p/vfs_inode_dotl.c'. +[master a5eeffe2e240] Merge branch 'ericvh/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/9p.rst | 26 ++--- + fs/9p/fid.c | 49 ++++------ + fs/9p/fid.h | 33 ++++++- + fs/9p/v9fs.c | 49 ++++++---- + fs/9p/v9fs.h | 9 +- + fs/9p/v9fs_vfs.h | 4 - + fs/9p/vfs_addr.c | 24 ++--- + fs/9p/vfs_dentry.c | 3 +- + fs/9p/vfs_dir.c | 16 ++- + fs/9p/vfs_file.c | 205 ++++++++------------------------------- + fs/9p/vfs_inode.c | 71 +++++--------- + fs/9p/vfs_inode_dotl.c | 66 +++++++------ + fs/9p/vfs_super.c | 28 +++--- + include/net/9p/9p.h | 5 + + net/9p/client.c | 8 +- + net/9p/trans_virtio.c | 6 ++ + 16 files changed, 263 insertions(+), 339 deletions(-) +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 (43592c46375a zonefs: Cache zone group directory inodes) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Auto-merging fs/zonefs/super.c +CONFLICT (content): Merge conflict in fs/zonefs/super.c +Resolved 'fs/zonefs/super.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 5d047980444e] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git +$ git diff -M --stat --summary HEAD^.. + fs/zonefs/Makefile | 2 +- + fs/zonefs/file.c | 878 ++++++++++++++++++++++++ + fs/zonefs/super.c | 1931 +++++++++++++++++++--------------------------------- + fs/zonefs/trace.h | 20 +- + fs/zonefs/zonefs.h | 110 ++- + 5 files changed, 1677 insertions(+), 1264 deletions(-) + create mode 100644 fs/zonefs/file.c +Merging iomap/iomap-for-next (471859f57d42 iomap: Rename page_ops to folio_ops) +$ git merge -m Merge branch 'iomap-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git iomap/iomap-for-next +Already up to date. +Merging djw-vfs/vfs-for-next (a79168a0c00d fs/remap_range: avoid spurious writeback on zero length request) +$ git merge -m Merge branch 'vfs-for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git djw-vfs/vfs-for-next +Already up to date. +Merging file-locks/locks-next (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/9p/vfs_file.c +Auto-merging fs/afs/internal.h +Auto-merging fs/attr.c +Auto-merging fs/cifs/cifsfs.c +Auto-merging fs/cifs/cifsglob.h +Auto-merging fs/fcntl.c +Auto-merging fs/fuse/file.c +CONFLICT (content): Merge conflict in fs/fuse/file.c +Auto-merging fs/gfs2/file.c +Auto-merging fs/inode.c +Auto-merging fs/ksmbd/smb2pdu.c +Auto-merging fs/ksmbd/vfs.c +Auto-merging fs/ksmbd/vfs_cache.c +Auto-merging fs/namei.c +Auto-merging fs/nfsd/netns.h +Auto-merging fs/nfsd/nfs4state.c +Auto-merging fs/open.c +Auto-merging fs/posix_acl.c +Auto-merging fs/proc/fd.c +Auto-merging fs/utimes.c +Auto-merging fs/xattr.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/lockd/lockd.h +Recorded preimage for 'fs/fuse/file.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'fs/fuse/file.c'. +[master 3afc6b1ff9cd] Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git +$ git diff -M --stat --summary HEAD^.. + 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 (58a033c9a3e0 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/nfsfh.c +Auto-merging fs/stat.c +CONFLICT (content): Merge conflict in fs/stat.c +Resolved 'fs/stat.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0e38c7c3c027] Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git +$ git diff -M --stat --summary HEAD^.. + 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 | 60 ++++++++++++++++++------------------------------ + include/linux/stat.h | 9 ++++++++ + 12 files changed, 157 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 (930348ab0ad9 Merge branch 'rework/buffers-cleanup' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Auto-merging kernel/printk/printk.c +Merge made by the 'ort' strategy. + 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 (78913b41945a Merge branch 'remotes/lorenzo/pci/switchtec') + b692c96b424f ("PCI: dwc: Adjust to recent removal of PCI_MSI_IRQ_DOMAIN") +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/helgaas/pci.git pci/next +Auto-merging drivers/pci/controller/dwc/Kconfig +Auto-merging include/acpi/acpi_bus.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 4 +- + .../devicetree/bindings/pci/fsl,imx6q-pcie.yaml | 3 + + .../devicetree/bindings/pci/qcom,pcie-ep.yaml | 6 +- + .../devicetree/bindings/pci/qcom,pcie.yaml | 103 ++++-- + .../bindings/pci/socionext,uniphier-pcie-ep.yaml | 76 +++-- + drivers/acpi/device_pm.c | 19 ++ + drivers/dma/dw-edma/Kconfig | 5 +- + drivers/dma/dw-edma/dw-edma-core.c | 196 ++++++----- + drivers/dma/dw-edma/dw-edma-core.h | 10 +- + drivers/dma/dw-edma/dw-edma-pcie.c | 56 ++-- + drivers/dma/dw-edma/dw-edma-v0-core.c | 100 +++--- + drivers/dma/dw-edma/dw-edma-v0-core.h | 1 - + drivers/dma/dw-edma/dw-edma-v0-debugfs.c | 372 ++++++++++----------- + drivers/dma/dw-edma/dw-edma-v0-debugfs.h | 5 - + drivers/misc/pci_endpoint_test.c | 4 +- + drivers/pci/controller/dwc/Kconfig | 23 +- + drivers/pci/controller/dwc/pci-imx6.c | 200 ++++++++++- + drivers/pci/controller/dwc/pcie-bt1.c | 4 + + drivers/pci/controller/dwc/pcie-designware-ep.c | 12 +- + drivers/pci/controller/dwc/pcie-designware-host.c | 25 +- + drivers/pci/controller/dwc/pcie-designware.c | 195 +++++++++++ + drivers/pci/controller/dwc/pcie-designware.h | 21 ++ + drivers/pci/controller/dwc/pcie-qcom.c | 15 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + + drivers/pci/iov.c | 2 +- + drivers/pci/pci-acpi.c | 45 ++- + drivers/pci/pcie/aer.c | 3 + + drivers/pci/switch/switchtec.c | 13 +- + include/acpi/acpi_bus.h | 1 + + include/linux/dma/edma.h | 25 +- + include/linux/dmaengine.h | 2 +- + 31 files changed, 1050 insertions(+), 497 deletions(-) +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 (06f8ed62c952 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 +Merge made by the 'ort' strategy. + Documentation/hid/hid-bpf.rst | 522 ++++++++++ + Documentation/hid/index.rst | 1 + + MAINTAINERS | 3 + + drivers/Makefile | 2 +- + drivers/hid/.kunitconfig | 1 + + drivers/hid/Kconfig | 20 +- + drivers/hid/Makefile | 2 + + drivers/hid/amd-sfh-hid/Kconfig | 2 +- + drivers/hid/bpf/Kconfig | 18 + + drivers/hid/bpf/Makefile | 11 + + drivers/hid/bpf/entrypoints/Makefile | 93 ++ + drivers/hid/bpf/entrypoints/README | 4 + + drivers/hid/bpf/entrypoints/entrypoints.bpf.c | 25 + + drivers/hid/bpf/entrypoints/entrypoints.lskel.h | 248 +++++ + drivers/hid/bpf/hid_bpf_dispatch.c | 551 +++++++++++ + drivers/hid/bpf/hid_bpf_dispatch.h | 25 + + drivers/hid/bpf/hid_bpf_jmp_table.c | 565 +++++++++++ + drivers/hid/hid-core.c | 37 +- + drivers/hid/hid-debug.c | 1 + + drivers/hid/hid-elecom.c | 16 +- + drivers/hid/hid-ids.h | 6 +- + drivers/hid/hid-input-test.c | 80 ++ + drivers/hid/hid-input.c | 50 +- + drivers/hid/hid-letsketch.c | 2 +- + drivers/hid/hid-logitech-hidpp.c | 27 +- + drivers/hid/hid-multitouch.c | 39 +- + drivers/hid/hid-playstation.c | 41 +- + drivers/hid/hid-quirks.c | 9 +- + drivers/hid/hid-sensor-custom.c | 242 +++-- + drivers/hid/hid-sensor-hub.c | 6 +- + drivers/hid/hid-sony.c | 1021 +------------------- + drivers/hid/hid-uclogic-core-test.c | 105 ++ + drivers/hid/hid-uclogic-core.c | 61 +- + drivers/hid/hid-uclogic-params-test.c | 16 + + drivers/hid/hid-uclogic-params.c | 124 ++- + drivers/hid/hid-uclogic-params.h | 40 + + drivers/hid/hid-uclogic-rdesc-test.c | 3 +- + drivers/hid/hid-uclogic-rdesc.c | 6 + + drivers/hid/hid-uclogic-rdesc.h | 5 + + drivers/hid/i2c-hid/Kconfig | 31 +- + drivers/hid/i2c-hid/i2c-hid-acpi.c | 26 +- + drivers/hid/i2c-hid/i2c-hid-core.c | 18 +- + drivers/hid/i2c-hid/i2c-hid-dmi-quirks.c | 43 + + drivers/hid/i2c-hid/i2c-hid.h | 3 + + drivers/hid/intel-ish-hid/Kconfig | 2 +- + drivers/hid/uhid.c | 3 +- + drivers/hid/usbhid/hid-core.c | 9 +- + 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 | 25 +- + include/linux/hid_bpf.h | 170 ++++ + net/bluetooth/hidp/Kconfig | 2 +- + net/bluetooth/hidp/core.c | 3 +- + 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 | 5 + + tools/testing/selftests/hid/Makefile | 231 +++++ + tools/testing/selftests/hid/config | 21 + + tools/testing/selftests/hid/config.common | 241 +++++ + tools/testing/selftests/hid/config.x86_64 | 4 + + tools/testing/selftests/hid/hid_bpf.c | 869 +++++++++++++++++ + tools/testing/selftests/hid/progs/hid.c | 209 ++++ + .../testing/selftests/hid/progs/hid_bpf_helpers.h | 21 + + tools/testing/selftests/hid/vmtest.sh | 284 ++++++ + 74 files changed, 6093 insertions(+), 1236 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 drivers/hid/hid-input-test.c + create mode 100644 drivers/hid/hid-uclogic-core-test.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/config.common + create mode 100644 tools/testing/selftests/hid/config.x86_64 + 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 + create mode 100755 tools/testing/selftests/hid/vmtest.sh +Merging i2c/i2c/for-next (726ba204f4c7 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/i2c-gpio.yaml | 26 ++++++ + .../devicetree/bindings/i2c/i2c-mt65xx.yaml | 4 + + .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 49 ++++++---- + .../devicetree/bindings/i2c/renesas,rzv2m.yaml | 4 +- + drivers/i2c/algos/i2c-algo-bit.c | 77 +++++++-------- + drivers/i2c/busses/i2c-aspeed.c | 4 +- + drivers/i2c/busses/i2c-au1550.c | 4 +- + drivers/i2c/busses/i2c-axxia.c | 2 +- + drivers/i2c/busses/i2c-bcm2835.c | 4 +- + drivers/i2c/busses/i2c-cadence.c | 23 ++--- + 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-gpio.c | 47 ++++++---- + drivers/i2c/busses/i2c-mt65xx.c | 7 +- + drivers/i2c/busses/i2c-mxs.c | 4 +- + drivers/i2c/busses/i2c-qcom-cci.c | 8 +- + drivers/i2c/busses/i2c-qcom-geni.c | 2 +- + drivers/i2c/busses/i2c-rk3x.c | 44 ++++----- + drivers/i2c/i2c-core-acpi.c | 13 +-- + drivers/i2c/i2c-core-base.c | 103 ++++++++++++++++++++- + drivers/i2c/i2c-core-of.c | 66 ------------- + drivers/i2c/i2c-dev.c | 16 ++-- + include/linux/i2c.h | 24 ++++- + include/linux/pinctrl/devinfo.h | 15 +++ + include/linux/platform_data/i2c-gpio.h | 9 ++ + 27 files changed, 344 insertions(+), 246 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 (f9b70de51c89 hwmon: add initial NXP MC34VR500 PMIC monitoring support) +$ 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 + + .../devicetree/bindings/hwmon/adi,adm1177.yaml | 12 +- + .../devicetree/bindings/hwmon/adi,adm1266.yaml | 6 +- + .../bindings/hwmon/adi,axi-fan-control.yaml | 20 +- + .../devicetree/bindings/hwmon/adi,ltc2947.yaml | 20 +- + .../devicetree/bindings/hwmon/adi,ltc2992.yaml | 28 +- + .../devicetree/bindings/hwmon/amd,sbrmi.yaml | 6 +- + .../devicetree/bindings/hwmon/amd,sbtsi.yaml | 6 +- + .../bindings/hwmon/hpe,gxp-fan-ctrl.yaml | 45 ++ + .../devicetree/bindings/hwmon/iio-hwmon.yaml | 8 +- + .../devicetree/bindings/hwmon/national,lm90.yaml | 44 +- + .../devicetree/bindings/hwmon/ntc-thermistor.yaml | 2 +- + .../devicetree/bindings/hwmon/nuvoton,nct7802.yaml | 16 +- + .../devicetree/bindings/hwmon/nxp,mc34vr500.yaml | 36 ++ + .../devicetree/bindings/hwmon/ti,tmp513.yaml | 22 +- + .../devicetree/bindings/hwmon/ti,tps23861.yaml | 16 +- + 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 | 2 + + Documentation/hwmon/mc34vr500.rst | 32 ++ + Documentation/hwmon/oxp-sensors.rst | 17 +- + MAINTAINERS | 5 + + drivers/hwmon/Kconfig | 18 +- + drivers/hwmon/Makefile | 2 + + drivers/hwmon/aht10.c | 3 +- + drivers/hwmon/aquacomputer_d5next.c | 242 +++++++-- + drivers/hwmon/asus-ec-sensors.c | 1 + + 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 | 84 +++- + drivers/hwmon/mc34vr500.c | 263 ++++++++++ + 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 +- + 47 files changed, 1736 insertions(+), 655 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/hpe,gxp-fan-ctrl.yaml + create mode 100644 Documentation/devicetree/bindings/hwmon/nxp,mc34vr500.yaml + create mode 100644 Documentation/hwmon/gxp-fan-ctrl.rst + create mode 100644 Documentation/hwmon/mc34vr500.rst + create mode 100644 drivers/hwmon/gxp-fan-ctrl.c + create mode 100644 drivers/hwmon/mc34vr500.c + create mode 100644 drivers/hwmon/pmbus/mpq7932.c +Merging jc_docs/docs-next (a16abc68e66c Merge branch 'docs-mw' into docs-next) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/hwmon/index.rst +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + Documentation/Kconfig | 10 +- + Documentation/PCI/index.rst | 6 +- + Documentation/accel/introduction.rst | 2 +- + Documentation/admin-guide/kernel-parameters.txt | 130 +++---- + Documentation/core-api/dma-api.rst | 2 + + Documentation/cpu-freq/index.rst | 6 +- + Documentation/crypto/index.rst | 6 +- + Documentation/dev-tools/gdb-kernel-debugging.rst | 4 + + Documentation/driver-api/index.rst | 8 +- + Documentation/filesystems/proc.rst | 1 + + Documentation/gpu/index.rst | 6 +- + Documentation/hwmon/index.rst | 6 +- + Documentation/input/index.rst | 6 +- + Documentation/leds/index.rst | 1 + + Documentation/mm/index.rst | 6 +- + Documentation/mm/numa.rst | 2 +- + Documentation/mm/page_owner.rst | 4 +- + Documentation/mm/page_reclaim.rst | 2 + + Documentation/mm/physical_memory.rst | 347 +++++++++++++++++++ + Documentation/peci/index.rst | 6 +- + 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/scheduler/index.rst | 6 +- + Documentation/scsi/index.rst | 6 +- + Documentation/sound/index.rst | 8 +- + Documentation/trace/events.rst | 4 +- + Documentation/trace/kprobetrace.rst | 23 +- + .../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 ++++++ + .../translations/sp_SP/process/email-clients.rst | 374 +++++++++++++++++++++ + Documentation/translations/sp_SP/process/index.rst | 3 + + .../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/glossary.rst | 36 ++ + Documentation/translations/zh_CN/index.rst | 9 + + 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/virt/index.rst | 6 +- + .../virt/kvm/x86/running-nested-guests.rst | 2 +- + Documentation/watchdog/index.rst | 6 +- + Documentation/x86/x86_64/mm.rst | 2 +- + lib/Kconfig.debug | 2 - + 68 files changed, 1891 insertions(+), 392 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/email-clients.rst + create mode 100644 Documentation/translations/sp_SP/process/kernel-enforcement-statement.rst + create mode 100644 Documentation/translations/zh_CN/glossary.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 (7120d6bfd6d0 media: tm6000: remove deprecated driver) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging Documentation/admin-guide/media/platform-cardlist.rst +Auto-merging Documentation/admin-guide/media/v4l-drivers.rst +Auto-merging Documentation/driver-api/media/drivers/index.rst +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/staging/media/Kconfig +CONFLICT (content): Merge conflict in drivers/staging/media/Kconfig +Auto-merging drivers/staging/media/Makefile +CONFLICT (content): Merge conflict in drivers/staging/media/Makefile +Resolved 'MAINTAINERS' using previous resolution. +Resolved 'drivers/staging/media/Kconfig' using previous resolution. +Resolved 'drivers/staging/media/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a74ddb51a3c1] Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git +$ git diff -M --stat --summary HEAD^.. + .clang-format | 1 + + Documentation/admin-guide/media/cpia2.rst | 145 -- + Documentation/admin-guide/media/dvb-drivers.rst | 1 - + Documentation/admin-guide/media/meye.rst | 93 - + .../admin-guide/media/other-usb-cardlist.rst | 14 - + Documentation/admin-guide/media/pci-cardlist.rst | 1 - + .../admin-guide/media/platform-cardlist.rst | 1 - + .../admin-guide/media/tm6000-cardlist.rst | 83 - + Documentation/admin-guide/media/usb-cardlist.rst | 7 - + Documentation/admin-guide/media/v4l-drivers.rst | 2 - + Documentation/admin-guide/media/zr364xx.rst | 102 - + .../bindings/media/i2c/maxim,max9286.yaml | 51 +- + .../devicetree/bindings/media/nxp,imx7-csi.yaml | 15 + + .../driver-api/media/drivers/cpia2_devel.rst | 56 - + Documentation/driver-api/media/drivers/index.rst | 1 - + Documentation/driver-api/media/v4l2-subdev.rst | 8 + + .../userspace-api/media/drivers/index.rst | 1 - + .../userspace-api/media/drivers/meye-uapi.rst | 53 - + .../userspace-api/media/v4l/dev-subdev.rst | 166 ++ + .../userspace-api/media/v4l/user-func.rst | 1 + + .../v4l/vidioc-subdev-enum-frame-interval.rst | 5 +- + .../media/v4l/vidioc-subdev-enum-frame-size.rst | 5 +- + .../media/v4l/vidioc-subdev-enum-mbus-code.rst | 5 +- + .../media/v4l/vidioc-subdev-g-crop.rst | 5 +- + .../media/v4l/vidioc-subdev-g-fmt.rst | 5 +- + .../media/v4l/vidioc-subdev-g-frame-interval.rst | 5 +- + .../media/v4l/vidioc-subdev-g-routing.rst | 147 ++ + .../media/v4l/vidioc-subdev-g-selection.rst | 5 +- + MAINTAINERS | 27 - + drivers/media/dvb-frontends/dvb-pll.c | 5 +- + drivers/media/dvb-frontends/m88ds3103.c | 6 +- + drivers/media/dvb-frontends/mn88443x.c | 6 +- + drivers/media/dvb-frontends/tc90522.c | 6 +- + drivers/media/i2c/adv7180.c | 6 +- + drivers/media/i2c/adv7604.c | 6 +- + drivers/media/i2c/cs53l32a.c | 6 +- + drivers/media/i2c/ir-kbd-i2c.c | 5 +- + drivers/media/i2c/max9286.c | 462 +++- + drivers/media/i2c/msp3400-driver.c | 5 +- + drivers/media/i2c/mt9p031.c | 6 +- + drivers/media/i2c/mt9v032.c | 6 +- + drivers/media/i2c/ov7670.c | 6 +- + drivers/media/i2c/saa7115.c | 6 +- + drivers/media/i2c/saa7127.c | 6 +- + drivers/media/i2c/tda1997x.c | 6 +- + drivers/media/i2c/tvaudio.c | 5 +- + drivers/media/i2c/tvp514x.c | 6 +- + drivers/media/i2c/video-i2c.c | 6 +- + drivers/media/mc/mc-entity.c | 17 +- + drivers/media/platform/nxp/dw100/dw100.c | 2 +- + drivers/media/platform/nxp/imx7-media-csi.c | 4 +- + drivers/media/platform/ti/cal/cal.c | 4 +- + drivers/media/platform/ti/omap3isp/isp.c | 9 + + drivers/media/rc/Kconfig | 4 +- + drivers/media/rc/ir-rx51.c | 6 - + drivers/media/rc/pwm-ir-tx.c | 2 +- + drivers/media/tuners/si2157.c | 6 +- + drivers/media/usb/uvc/uvc_ctrl.c | 340 ++- + drivers/media/usb/uvc/uvc_driver.c | 181 +- + drivers/media/usb/uvc/uvc_entity.c | 2 +- + drivers/media/usb/uvc/uvc_status.c | 125 +- + drivers/media/usb/uvc/uvc_v4l2.c | 111 +- + drivers/media/usb/uvc/uvc_video.c | 58 +- + drivers/media/usb/uvc/uvcvideo.h | 39 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 25 +- + drivers/media/v4l2-core/v4l2-subdev.c | 1002 +++++++- + drivers/staging/media/Kconfig | 6 - + drivers/staging/media/Makefile | 6 - + drivers/staging/media/deprecated/cpia2/Kconfig | 13 - + drivers/staging/media/deprecated/cpia2/Makefile | 4 - + drivers/staging/media/deprecated/cpia2/TODO | 6 - + drivers/staging/media/deprecated/cpia2/cpia2.h | 475 ---- + .../staging/media/deprecated/cpia2/cpia2_core.c | 2434 -------------------- + .../media/deprecated/cpia2/cpia2_registers.h | 463 ---- + drivers/staging/media/deprecated/cpia2/cpia2_usb.c | 966 -------- + drivers/staging/media/deprecated/cpia2/cpia2_v4l.c | 1226 ---------- + drivers/staging/media/deprecated/fsl-viu/Kconfig | 15 - + drivers/staging/media/deprecated/fsl-viu/Makefile | 2 - + drivers/staging/media/deprecated/fsl-viu/TODO | 7 - + drivers/staging/media/deprecated/fsl-viu/fsl-viu.c | 1599 ------------- + drivers/staging/media/deprecated/meye/Kconfig | 19 - + drivers/staging/media/deprecated/meye/Makefile | 2 - + drivers/staging/media/deprecated/meye/TODO | 6 - + drivers/staging/media/deprecated/meye/meye.c | 1814 --------------- + drivers/staging/media/deprecated/meye/meye.h | 311 --- + drivers/staging/media/deprecated/stkwebcam/Kconfig | 18 - + .../staging/media/deprecated/stkwebcam/Makefile | 5 - + drivers/staging/media/deprecated/stkwebcam/TODO | 12 - + .../media/deprecated/stkwebcam/stk-sensor.c | 587 ----- + .../media/deprecated/stkwebcam/stk-webcam.c | 1434 ------------ + .../media/deprecated/stkwebcam/stk-webcam.h | 123 - + drivers/staging/media/deprecated/tm6000/Kconfig | 37 - + drivers/staging/media/deprecated/tm6000/Makefile | 14 - + drivers/staging/media/deprecated/tm6000/TODO | 7 - + .../staging/media/deprecated/tm6000/tm6000-alsa.c | 440 ---- + .../staging/media/deprecated/tm6000/tm6000-cards.c | 1397 ----------- + .../staging/media/deprecated/tm6000/tm6000-core.c | 916 -------- + .../staging/media/deprecated/tm6000/tm6000-dvb.c | 454 ---- + .../staging/media/deprecated/tm6000/tm6000-i2c.c | 317 --- + .../staging/media/deprecated/tm6000/tm6000-input.c | 503 ---- + .../staging/media/deprecated/tm6000/tm6000-regs.h | 588 ----- + .../staging/media/deprecated/tm6000/tm6000-stds.c | 623 ----- + .../media/deprecated/tm6000/tm6000-usb-isoc.h | 38 - + .../staging/media/deprecated/tm6000/tm6000-video.c | 1703 -------------- + drivers/staging/media/deprecated/tm6000/tm6000.h | 396 ---- + drivers/staging/media/deprecated/zr364xx/Kconfig | 18 - + drivers/staging/media/deprecated/zr364xx/Makefile | 3 - + drivers/staging/media/deprecated/zr364xx/TODO | 7 - + drivers/staging/media/deprecated/zr364xx/zr364xx.c | 1635 ------------- + include/media/davinci/ccdc_types.h | 30 - + include/media/media-entity.h | 4 +- + include/media/v4l2-subdev.h | 377 +++ + include/uapi/linux/meye.h | 65 - + include/uapi/linux/uvcvideo.h | 6 +- + include/uapi/linux/v4l2-controls.h | 8 +- + include/uapi/linux/v4l2-subdev.h | 74 +- + 116 files changed, 2923 insertions(+), 21804 deletions(-) + delete mode 100644 Documentation/admin-guide/media/cpia2.rst + delete mode 100644 Documentation/admin-guide/media/meye.rst + delete mode 100644 Documentation/admin-guide/media/tm6000-cardlist.rst + delete mode 100644 Documentation/admin-guide/media/zr364xx.rst + delete mode 100644 Documentation/driver-api/media/drivers/cpia2_devel.rst + delete mode 100644 Documentation/userspace-api/media/drivers/meye-uapi.rst + create mode 100644 Documentation/userspace-api/media/v4l/vidioc-subdev-g-routing.rst + delete mode 100644 drivers/staging/media/deprecated/cpia2/Kconfig + delete mode 100644 drivers/staging/media/deprecated/cpia2/Makefile + delete mode 100644 drivers/staging/media/deprecated/cpia2/TODO + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2.h + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2_core.c + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2_registers.h + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2_usb.c + delete mode 100644 drivers/staging/media/deprecated/cpia2/cpia2_v4l.c + delete mode 100644 drivers/staging/media/deprecated/fsl-viu/Kconfig + delete mode 100644 drivers/staging/media/deprecated/fsl-viu/Makefile + delete mode 100644 drivers/staging/media/deprecated/fsl-viu/TODO + delete mode 100644 drivers/staging/media/deprecated/fsl-viu/fsl-viu.c + delete mode 100644 drivers/staging/media/deprecated/meye/Kconfig + delete mode 100644 drivers/staging/media/deprecated/meye/Makefile + delete mode 100644 drivers/staging/media/deprecated/meye/TODO + delete mode 100644 drivers/staging/media/deprecated/meye/meye.c + delete mode 100644 drivers/staging/media/deprecated/meye/meye.h + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/Kconfig + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/Makefile + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/TODO + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/stk-sensor.c + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/stk-webcam.c + delete mode 100644 drivers/staging/media/deprecated/stkwebcam/stk-webcam.h + delete mode 100644 drivers/staging/media/deprecated/tm6000/Kconfig + delete mode 100644 drivers/staging/media/deprecated/tm6000/Makefile + delete mode 100644 drivers/staging/media/deprecated/tm6000/TODO + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-alsa.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-cards.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-core.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-dvb.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-i2c.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-input.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-regs.h + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-stds.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-usb-isoc.h + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000-video.c + delete mode 100644 drivers/staging/media/deprecated/tm6000/tm6000.h + delete mode 100644 drivers/staging/media/deprecated/zr364xx/Kconfig + delete mode 100644 drivers/staging/media/deprecated/zr364xx/Makefile + delete mode 100644 drivers/staging/media/deprecated/zr364xx/TODO + delete mode 100644 drivers/staging/media/deprecated/zr364xx/zr364xx.c + delete mode 100644 include/media/davinci/ccdc_types.h + delete mode 100644 include/uapi/linux/meye.h +Merging pm/linux-next (0bb04b623f4c Merge branch 'thermal-next' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Auto-merging MAINTAINERS +Auto-merging drivers/acpi/video_detect.c +Auto-merging drivers/cpufreq/Kconfig +Auto-merging drivers/cpufreq/Makefile +Merge made by the 'ort' strategy. + .../bindings/thermal/qcom-spmi-adc-tm5.yaml | 1 + + .../devicetree/bindings/thermal/qcom-tsens.yaml | 153 ++++- + Documentation/firmware-guide/acpi/index.rst | 1 - + .../firmware-guide/acpi/method-customizing.rst | 89 --- + MAINTAINERS | 5 +- + arch/x86/kernel/process.c | 1 + + drivers/acpi/Kconfig | 14 - + drivers/acpi/Makefile | 1 - + drivers/acpi/acpi_lpit.c | 1 + + drivers/acpi/acpi_pnp.c | 14 +- + drivers/acpi/acpica/hwvalid.c | 7 +- + drivers/acpi/acpica/nsrepair.c | 12 +- + drivers/acpi/acpica/nsxfname.c | 2 +- + drivers/acpi/battery.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/acpi/video_detect.c | 25 + + drivers/base/power/runtime.c | 4 + + drivers/cpufreq/Kconfig | 10 - + drivers/cpufreq/Makefile | 1 - + drivers/cpufreq/intel_pstate.c | 14 - + drivers/cpufreq/loongson1-cpufreq.c | 222 ------- + drivers/cpuidle/Kconfig | 1 + + drivers/cpuidle/cpuidle-haltpoll.c | 2 +- + drivers/cpuidle/governors/teo.c | 102 +++- + drivers/idle/intel_idle.c | 2 + + 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/powercap/idle_inject.c | 6 +- + drivers/powercap/intel_rapl_common.c | 3 + + drivers/powercap/powercap_sys.c | 14 +- + drivers/thermal/Kconfig | 4 + + drivers/thermal/Makefile | 5 +- + drivers/thermal/armada_thermal.c | 30 +- + drivers/thermal/broadcom/bcm2835_thermal.c | 12 +- + drivers/thermal/broadcom/brcmstb_thermal.c | 4 +- + drivers/thermal/da9062-thermal.c | 52 +- + drivers/thermal/dove_thermal.c | 7 +- + 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_sc_thermal.c | 8 +- + drivers/thermal/imx_thermal.c | 72 +-- + drivers/thermal/intel/Kconfig | 8 + + drivers/thermal/intel/Makefile | 1 + + drivers/thermal/intel/int340x_thermal/Kconfig | 1 + + .../intel/int340x_thermal/int3400_thermal.c | 10 +- + .../intel/int340x_thermal/int340x_thermal_zone.c | 57 +- + .../intel/int340x_thermal/int340x_thermal_zone.h | 5 +- + .../int340x_thermal/processor_thermal_device.c | 129 +--- + drivers/thermal/intel/intel_menlow.c | 12 +- + drivers/thermal/intel/intel_pch_thermal.c | 96 +-- + 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/kirkwood_thermal.c | 4 +- + drivers/thermal/mtk_thermal.c | 149 ++++- + drivers/thermal/qcom/qcom-spmi-adc-tm5.c | 3 +- + drivers/thermal/qcom/qcom-spmi-temp-alarm.c | 44 +- + drivers/thermal/qcom/tsens-v0_1.c | 655 ++++++--------------- + drivers/thermal/qcom/tsens-v1.c | 340 +++-------- + drivers/thermal/qcom/tsens.c | 219 +++++-- + drivers/thermal/qcom/tsens.h | 46 +- + drivers/thermal/rcar_gen3_thermal.c | 2 +- + drivers/thermal/rcar_thermal.c | 53 +- + drivers/thermal/rockchip_thermal.c | 10 +- + drivers/thermal/samsung/exynos_tmu.c | 62 +- + drivers/thermal/spear_thermal.c | 4 +- + drivers/thermal/st/st_thermal.c | 47 +- + drivers/thermal/sun8i_thermal.c | 4 +- + drivers/thermal/tegra/soctherm.c | 35 +- + drivers/thermal/tegra/tegra30-tsensor.c | 17 +- + drivers/thermal/thermal_acpi.c | 150 +++++ + drivers/thermal/thermal_core.c | 140 +++-- + drivers/thermal/thermal_core.h | 28 +- + drivers/thermal/thermal_helpers.c | 70 +-- + drivers/thermal/thermal_mmio.c | 4 +- + drivers/thermal/thermal_netlink.c | 24 +- + drivers/thermal/thermal_netlink.h | 3 + + drivers/thermal/thermal_of.c | 116 ---- + drivers/thermal/thermal_sysfs.c | 135 ++--- + drivers/thermal/thermal_trip.c | 182 ++++++ + drivers/thermal/ti-soc-thermal/ti-thermal.h | 15 - + drivers/thermal/uniphier_thermal.c | 29 +- + include/acpi/acpixf.h | 2 +- + include/acpi/acrestyp.h | 7 +- + include/acpi/actbl1.h | 2 + + include/linux/intel_tcc.h | 18 + + include/linux/thermal.h | 20 + + kernel/power/Kconfig | 1 - + kernel/power/swap.c | 16 +- + 102 files changed, 2204 insertions(+), 2744 deletions(-) + delete mode 100644 Documentation/firmware-guide/acpi/method-customizing.rst + delete mode 100644 drivers/acpi/custom_method.c + delete mode 100644 drivers/cpufreq/loongson1-cpufreq.c + create mode 100644 drivers/thermal/intel/intel_tcc.c + create mode 100644 drivers/thermal/thermal_acpi.c + create mode 100644 drivers/thermal/thermal_trip.c + create mode 100644 include/linux/intel_tcc.h +Merging cpufreq-arm/cpufreq/arm/linux-next (471be3641bd7 cpufreq: tegra194: Enable CPUFREQ thermal cooling) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'ort' strategy. + drivers/cpufreq/tegra194-cpufreq.c | 3 ++- + 1 file changed, 2 insertions(+), 1 deletion(-) +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 (93c697b41d14 dt-bindings: opp: v2-qcom-level: Let qcom,opp-fuse-level be a 2-long array) +$ 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 ++ + Documentation/devicetree/bindings/opp/opp-v2-qcom-level.yaml | 4 +++- + drivers/opp/Kconfig | 1 - + 4 files changed, 9 insertions(+), 2 deletions(-) +Merging thermal/thermal/linux-next (a2c81dc59d41 Merge back thermal control material for 6.3.) +$ git merge -m Merge branch 'thermal/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git thermal/thermal/linux-next +Already up to date. +Merging dlm/next (723b197bbdf1 fs: dlm: remove unnecessary waker_up() calls) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Merge made by the 'ort' strategy. + fs/dlm/Kconfig | 1 - + fs/dlm/lockspace.c | 21 +++++---- + fs/dlm/lowcomms.c | 77 ++++++++++++++++++++++--------- + fs/dlm/memory.c | 2 +- + fs/dlm/midcomms.c | 131 +++++++++++++++++++++++++++-------------------------- + fs/dlm/midcomms.h | 1 + + 6 files changed, 136 insertions(+), 97 deletions(-) +Merging rdma/for-next (ed73a505480d RDMA/erdma: Replace zero-length arrays with flexible-array members) +$ 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/file_ops.c +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/cxgb4/t4fw_ri_api.h | 26 +-- + drivers/infiniband/hw/erdma/erdma_hw.h | 4 +- + drivers/infiniband/hw/erdma/erdma_verbs.c | 4 +- + drivers/infiniband/hw/hfi1/chip.c | 59 +++--- + drivers/infiniband/hw/hfi1/exp_rcv.h | 5 +- + drivers/infiniband/hw/hfi1/file_ops.c | 81 +++++--- + drivers/infiniband/hw/hfi1/init.c | 2 +- + drivers/infiniband/hw/hfi1/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/hw/mlx4/main.c | 8 + + drivers/infiniband/hw/mlx4/mlx4_ib.h | 3 + + drivers/infiniband/hw/mlx4/qp.c | 121 ++++++++---- + drivers/infiniband/hw/mlx5/main.c | 7 + + drivers/infiniband/hw/mlx5/qp.c | 164 ++++++++++++---- + drivers/infiniband/hw/mlx5/qp.h | 4 +- + drivers/infiniband/hw/mlx5/qpc.c | 7 +- + drivers/infiniband/ulp/ipoib/ipoib_main.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/qp.c | 14 +- + include/linux/mlx4/qp.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 47 ++++- + include/rdma/ib_sa.h | 2 +- + include/rdma/ib_verbs.h | 2 +- + include/rdma/rdma_cm.h | 1 - + include/uapi/rdma/hns-abi.h | 4 + + 34 files changed, 715 insertions(+), 666 deletions(-) +Merging net-next/master (0313afe8b83a Merge branch 'tools-ynl-prevent-reorder-and-fix-flags') +$ 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 arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts +Auto-merging arch/arm64/boot/dts/freescale/imx93.dtsi +Auto-merging drivers/net/ethernet/adi/adin1110.c +Auto-merging drivers/net/ethernet/engleder/tsnep_main.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/engleder/tsnep_main.c +Auto-merging drivers/net/ethernet/freescale/fec_main.c +Auto-merging drivers/net/ethernet/intel/ice/ice_lib.c +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +CONFLICT (content): Merge conflict in drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/renesas/rswitch.c +Auto-merging drivers/net/mdio/mdio-mux-meson-g12a.c +Auto-merging drivers/scsi/iscsi_tcp.c +Auto-merging fs/dlm/lowcomms.c +Auto-merging include/linux/mlx5/mlx5_ifc.h +Auto-merging kernel/bpf/btf.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging net/netfilter/nf_conntrack_proto_sctp.c +CONFLICT (content): Merge conflict in net/netfilter/nf_conntrack_proto_sctp.c +Auto-merging net/socket.c +Auto-merging net/sunrpc/svcsock.c +Auto-merging net/unix/af_unix.c +Recorded preimage for 'drivers/net/ethernet/engleder/tsnep_main.c' +Recorded preimage for 'drivers/net/ethernet/intel/ice/ice_main.c' +Recorded preimage for 'net/netfilter/nf_conntrack_proto_sctp.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/net/ethernet/engleder/tsnep_main.c'. +Recorded resolution for 'drivers/net/ethernet/intel/ice/ice_main.c'. +Recorded resolution for 'net/netfilter/nf_conntrack_proto_sctp.c'. +[master bd61600ffb9e] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/map_sockmap.rst | 498 ++++ + Documentation/core-api/index.rst | 1 + + Documentation/core-api/netlink.rst | 101 + + .../bindings/net/amlogic,g12a-mdio-mux.yaml | 80 + + .../devicetree/bindings/net/asix,ax88796c.yaml | 3 +- + .../devicetree/bindings/net/dsa/arrow,xrs700x.yaml | 2 +- + .../devicetree/bindings/net/dsa/brcm,b53.yaml | 2 +- + .../devicetree/bindings/net/dsa/brcm,sf2.yaml | 15 +- + .../devicetree/bindings/net/dsa/dsa-port.yaml | 30 +- + Documentation/devicetree/bindings/net/dsa/dsa.yaml | 49 +- + .../bindings/net/dsa/hirschmann,hellcreek.yaml | 2 +- + .../bindings/net/dsa/mediatek,mt7530.yaml | 6 +- + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 2 +- + .../bindings/net/dsa/microchip,lan937x.yaml | 2 +- + .../devicetree/bindings/net/dsa/mscc,ocelot.yaml | 2 +- + .../devicetree/bindings/net/dsa/nxp,sja1105.yaml | 2 +- + .../devicetree/bindings/net/dsa/qca8k.yaml | 14 +- + .../devicetree/bindings/net/dsa/realtek.yaml | 2 +- + .../bindings/net/dsa/renesas,rzn1-a5psw.yaml | 2 +- + .../bindings/net/ethernet-switch-port.yaml | 26 + + .../devicetree/bindings/net/ethernet-switch.yaml | 62 + + Documentation/devicetree/bindings/net/fsl,fec.yaml | 1 + + .../devicetree/bindings/net/maxlinear,gpy2xx.yaml | 47 + + .../bindings/net/mdio-mux-meson-g12a.txt | 48 - + .../bindings/net/mscc,vsc7514-switch.yaml | 31 +- + .../devicetree/bindings/net/nxp,dwmac-imx.yaml | 4 +- + .../devicetree/bindings/net/rfkill-gpio.yaml | 51 + + .../devicetree/bindings/net/rockchip-dwmac.yaml | 2 +- + .../bindings/net/ti,k3-am654-cpsw-nuss.yaml | 33 +- + .../devicetree/bindings/net/ti,k3-am654-cpts.yaml | 8 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + Documentation/netlink/genetlink-c.yaml | 333 +++ + Documentation/netlink/genetlink-legacy.yaml | 356 +++ + Documentation/netlink/genetlink.yaml | 298 +++ + Documentation/netlink/specs/fou.yaml | 128 ++ + .../device_drivers/ethernet/intel/ice.rst | 16 +- + Documentation/networking/ethtool-netlink.rst | 262 +++ + Documentation/networking/ip-sysctl.rst | 3 + + Documentation/networking/statistics.rst | 1 + + Documentation/networking/xfrm_device.rst | 4 +- + Documentation/userspace-api/netlink/c-code-gen.rst | 107 + + .../userspace-api/netlink/genetlink-legacy.rst | 96 + + Documentation/userspace-api/netlink/index.rst | 5 + + Documentation/userspace-api/netlink/specs.rst | 422 ++++ + MAINTAINERS | 24 +- + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 78 + + arch/arm64/boot/dts/freescale/imx93.dtsi | 48 + + arch/x86/net/bpf_jit_comp.c | 70 +- + crypto/asymmetric_keys/x509_loader.c | 1 + + drivers/base/regmap/regmap-mdio.c | 41 +- + drivers/infiniband/hw/erdma/erdma_cm.c | 3 + + drivers/infiniband/sw/siw/siw_cm.c | 5 + + drivers/infiniband/sw/siw/siw_qp.c | 3 + + drivers/net/Kconfig | 13 +- + drivers/net/Makefile | 4 +- + drivers/net/bonding/bond_main.c | 10 +- + drivers/net/dsa/lan9303-core.c | 169 +- + drivers/net/dsa/microchip/Kconfig | 11 + + drivers/net/dsa/microchip/Makefile | 5 + + drivers/net/dsa/microchip/ksz9477.c | 25 + + drivers/net/dsa/microchip/ksz9477.h | 2 + + drivers/net/dsa/microchip/ksz9477_reg.h | 33 +- + drivers/net/dsa/microchip/ksz_common.c | 180 +- + drivers/net/dsa/microchip/ksz_common.h | 69 + + drivers/net/dsa/microchip/ksz_ptp.c | 1201 ++++++++++ + drivers/net/dsa/microchip/ksz_ptp.h | 86 + + drivers/net/dsa/microchip/ksz_ptp_reg.h | 142 ++ + drivers/net/dsa/microchip/lan937x.h | 1 + + drivers/net/dsa/microchip/lan937x_main.c | 9 + + drivers/net/dsa/microchip/lan937x_reg.h | 3 + + drivers/net/dsa/mt7530.c | 87 +- + drivers/net/dsa/mt7530.h | 15 +- + drivers/net/dsa/mv88e6xxx/Makefile | 1 + + drivers/net/dsa/mv88e6xxx/chip.c | 201 +- + drivers/net/dsa/mv88e6xxx/chip.h | 23 + + drivers/net/dsa/mv88e6xxx/global1.c | 12 + + drivers/net/dsa/mv88e6xxx/global1.h | 2 + + 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/ptp.c | 46 + + drivers/net/dsa/mv88e6xxx/ptp.h | 2 + + 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.c | 28 + + drivers/net/dsa/ocelot/felix_vsc9959.c | 63 +- + drivers/net/dsa/rzn1_a5psw.c | 6 - + drivers/net/dsa/sja1105/sja1105.h | 16 +- + drivers/net/dsa/sja1105/sja1105_mdio.c | 137 +- + drivers/net/dsa/sja1105/sja1105_spi.c | 24 +- + drivers/net/ethernet/actions/owl-emac.c | 6 - + drivers/net/ethernet/adi/adin1110.c | 1 - + drivers/net/ethernet/amd/xgbe/xgbe-common.h | 11 +- + drivers/net/ethernet/amd/xgbe/xgbe-dev.c | 94 +- + drivers/net/ethernet/amd/xgbe/xgbe-mdio.c | 24 + + drivers/net/ethernet/amd/xgbe/xgbe-phy-v2.c | 227 +- + drivers/net/ethernet/amd/xgbe/xgbe.h | 9 +- + drivers/net/ethernet/atheros/alx/main.c | 10 +- + drivers/net/ethernet/cadence/macb.h | 29 +- + drivers/net/ethernet/cadence/macb_main.c | 177 +- + drivers/net/ethernet/cadence/macb_ptp.c | 83 +- + drivers/net/ethernet/chelsio/cxgb4/cxgb4_main.c | 8 +- + .../chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c | 34 +- + drivers/net/ethernet/engleder/Makefile | 2 +- + drivers/net/ethernet/engleder/tsnep.h | 16 +- + drivers/net/ethernet/engleder/tsnep_main.c | 475 +++- + drivers/net/ethernet/engleder/tsnep_xdp.c | 19 + + drivers/net/ethernet/faraday/ftmac100.c | 6 + + drivers/net/ethernet/freescale/enetc/Kconfig | 14 +- + drivers/net/ethernet/freescale/enetc/Makefile | 7 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 583 +++-- + drivers/net/ethernet/freescale/enetc/enetc.h | 29 +- + drivers/net/ethernet/freescale/enetc/enetc_cbdr.c | 8 + + .../net/ethernet/freescale/enetc/enetc_ethtool.c | 4 +- + drivers/net/ethernet/freescale/enetc/enetc_hw.h | 112 +- + 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 | 98 +- + drivers/net/ethernet/freescale/fec_main.c | 153 +- + drivers/net/ethernet/freescale/xgmac_mdio.c | 149 +- + drivers/net/ethernet/fungible/funeth/Kconfig | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_misc.c | 20 +- + drivers/net/ethernet/hisilicon/hns_mdio.c | 192 +- + drivers/net/ethernet/intel/Kconfig | 3 + + drivers/net/ethernet/intel/e1000e/ethtool.c | 10 +- + drivers/net/ethernet/intel/e1000e/phy.c | 9 + + drivers/net/ethernet/intel/ice/Makefile | 3 +- + drivers/net/ethernet/intel/ice/ice.h | 6 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 18 +- + drivers/net/ethernet/intel/ice/ice_common.c | 13 + + drivers/net/ethernet/intel/ice/ice_common.h | 3 +- + drivers/net/ethernet/intel/ice/ice_dcb.c | 39 + + drivers/net/ethernet/intel/ice/ice_dcb.h | 2 + + drivers/net/ethernet/intel/ice/ice_dcb_lib.c | 70 +- + drivers/net/ethernet/intel/ice/ice_ddp.c | 1897 ++++++++++++++++ + drivers/net/ethernet/intel/ice/ice_ddp.h | 445 ++++ + drivers/net/ethernet/intel/ice/ice_ethtool.c | 63 +- + drivers/net/ethernet/intel/ice/ice_flex_pipe.c | 2258 ++----------------- + drivers/net/ethernet/intel/ice/ice_flex_pipe.h | 69 - + drivers/net/ethernet/intel/ice/ice_flex_type.h | 328 +-- + drivers/net/ethernet/intel/ice/ice_gnss.c | 377 ++-- + drivers/net/ethernet/intel/ice/ice_gnss.h | 18 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 2 +- + drivers/net/ethernet/intel/ice/ice_main.c | 38 +- + drivers/net/ethernet/intel/ice/ice_nvm.c | 1 - + drivers/net/ethernet/intel/ice/ice_ptp.c | 2 +- + drivers/net/ethernet/intel/ice/ice_sched.c | 7 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.c | 50 +- + drivers/net/ethernet/intel/ice/ice_tc_lib.h | 10 + + drivers/net/ethernet/intel/ice/ice_txrx.c | 3 - + 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/intel/ixgbe/ixgbe_common.c | 21 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_ipsec.c | 27 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 19 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_phy.c | 237 +- + drivers/net/ethernet/intel/ixgbevf/ipsec.c | 21 +- + drivers/net/ethernet/marvell/mvmdio.c | 30 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 33 +- + drivers/net/ethernet/marvell/octeontx2/af/rvu.c | 8 + + drivers/net/ethernet/marvell/octeontx2/af/rvu.h | 18 + + .../net/ethernet/marvell/octeontx2/af/rvu_cpt.c | 309 ++- + .../net/ethernet/marvell/octeontx2/af/rvu_nix.c | 46 +- + .../net/ethernet/marvell/octeontx2/af/rvu_reg.h | 2 + + drivers/net/ethernet/marvell/pxa168_eth.c | 2 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 476 +++- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 38 + + drivers/net/ethernet/mediatek/mtk_ppe.c | 27 + + drivers/net/ethernet/mediatek/mtk_ppe.h | 1 + + drivers/net/ethernet/mediatek/mtk_ppe_regs.h | 6 + + drivers/net/ethernet/mediatek/mtk_star_emac.c | 6 - + drivers/net/ethernet/mediatek/mtk_wed.c | 42 + + drivers/net/ethernet/mediatek/mtk_wed.h | 9 + + 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 | 121 +- + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 20 +- + drivers/net/ethernet/mellanox/mlx5/core/ecpf.c | 8 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 7 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.c | 44 +- + .../net/ethernet/mellanox/mlx5/core/en/devlink.h | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 5 +- + .../net/ethernet/mellanox/mlx5/core/en/mod_hdr.c | 1 + + .../net/ethernet/mellanox/mlx5/core/en/params.c | 18 +- + 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 + + .../ethernet/mellanox/mlx5/core/en/reporter_rx.c | 2 +- + .../ethernet/mellanox/mlx5/core/en/reporter_tx.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/tc/meter.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/tc_priv.h | 2 - + .../net/ethernet/mellanox/mlx5/core/en/tc_tun.c | 2 - + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 2 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/setup.c | 19 +- + .../ethernet/mellanox/mlx5/core/en_accel/fs_tcp.c | 6 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 103 +- + .../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 | 34 +- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 270 ++- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.h | 14 +- + .../ethernet/mellanox/mlx5/core/esw/indir_table.c | 213 +- + .../ethernet/mellanox/mlx5/core/esw/indir_table.h | 4 - + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 8 +- + .../ethernet/mellanox/mlx5/core/eswitch_offloads.c | 35 +- + .../net/ethernet/mellanox/mlx5/core/ipoib/ipoib.c | 3 +- + .../net/ethernet/mellanox/mlx5/core/lib/clock.c | 41 +- + .../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 | 178 +- + .../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/mellanox/mlxsw/core.c | 116 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 2 - + .../net/ethernet/mellanox/mlxsw/core_linecards.c | 8 +- + drivers/net/ethernet/mellanox/mlxsw/emad.h | 4 + + drivers/net/ethernet/mellanox/mlxsw/reg.h | 12 + + drivers/net/ethernet/mellanox/mlxsw/spectrum.c | 1 - + drivers/net/ethernet/microchip/lan743x_main.c | 167 +- + drivers/net/ethernet/microchip/lan743x_main.h | 1 + + .../net/ethernet/microchip/lan966x/lan966x_goto.c | 10 +- + .../net/ethernet/microchip/lan966x/lan966x_main.h | 3 +- + .../ethernet/microchip/lan966x/lan966x_tc_flower.c | 30 +- + .../microchip/lan966x/lan966x_tc_matchall.c | 16 +- + .../ethernet/microchip/lan966x/lan966x_vcap_impl.c | 21 +- + drivers/net/ethernet/microchip/sparx5/sparx5_dcb.c | 121 +- + .../ethernet/microchip/sparx5/sparx5_main_regs.h | 130 +- + .../net/ethernet/microchip/sparx5/sparx5_port.c | 97 + + .../net/ethernet/microchip/sparx5/sparx5_port.h | 41 + + .../ethernet/microchip/sparx5/sparx5_tc_flower.c | 289 ++- + .../ethernet/microchip/sparx5/sparx5_tc_matchall.c | 16 +- + .../ethernet/microchip/sparx5/sparx5_vcap_ag_api.c | 1110 ++++++++- + .../microchip/sparx5/sparx5_vcap_debugfs.c | 133 +- + .../ethernet/microchip/sparx5/sparx5_vcap_impl.c | 430 +++- + .../ethernet/microchip/sparx5/sparx5_vcap_impl.h | 61 + + drivers/net/ethernet/microchip/vcap/vcap_ag_api.h | 336 +-- + drivers/net/ethernet/microchip/vcap/vcap_api.c | 1172 +++++++--- + drivers/net/ethernet/microchip/vcap/vcap_api.h | 12 +- + .../net/ethernet/microchip/vcap/vcap_api_client.h | 12 +- + .../net/ethernet/microchip/vcap/vcap_api_debugfs.c | 71 +- + .../microchip/vcap/vcap_api_debugfs_kunit.c | 11 +- + .../net/ethernet/microchip/vcap/vcap_api_kunit.c | 35 +- + .../net/ethernet/microchip/vcap/vcap_api_private.h | 15 +- + .../net/ethernet/microchip/vcap/vcap_model_kunit.c | 1994 ++-------------- + drivers/net/ethernet/mscc/Makefile | 1 + + drivers/net/ethernet/mscc/ocelot.c | 18 +- + drivers/net/ethernet/mscc/ocelot.h | 2 + + drivers/net/ethernet/mscc/ocelot_mm.c | 215 ++ + drivers/net/ethernet/mscc/ocelot_stats.c | 332 ++- + drivers/net/ethernet/netronome/Kconfig | 2 +- + drivers/net/ethernet/netronome/nfp/Makefile | 2 + + drivers/net/ethernet/netronome/nfp/crypto/ipsec.c | 41 +- + drivers/net/ethernet/netronome/nfp/nfp_net_ctrl.h | 1 + + .../net/ethernet/netronome/nfp/nfp_net_ethtool.c | 11 +- + 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/ni/nixge.c | 141 +- + 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 | 24 +- + drivers/net/ethernet/renesas/rswitch.c | 28 +- + drivers/net/ethernet/renesas/sh_eth.c | 37 +- + drivers/net/ethernet/samsung/sxgbe/sxgbe_mdio.c | 105 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 55 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_mdio.c | 334 ++- + drivers/net/ethernet/sunplus/spl2sw_mdio.c | 6 - + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 85 +- + drivers/net/ethernet/ti/am65-cpsw-nuss.h | 1 + + drivers/net/ethernet/ti/am65-cpts.c | 170 +- + drivers/net/ethernet/ti/am65-cpts.h | 5 + + drivers/net/ethernet/ti/davinci_mdio.c | 50 +- + drivers/net/ethernet/wangxun/Kconfig | 1 + + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 522 +++-- + drivers/net/ethernet/wangxun/libwx/wx_hw.h | 37 +- + drivers/net/ethernet/wangxun/libwx/wx_type.h | 94 +- + drivers/net/ethernet/wangxun/ngbe/Makefile | 2 +- + drivers/net/ethernet/wangxun/ngbe/ngbe.h | 79 - + drivers/net/ethernet/wangxun/ngbe/ngbe_hw.c | 70 +- + 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/fwnode_mdio.c | 8 +- + drivers/net/mdio/mdio-aspeed.c | 48 +- + 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 | 38 +- + drivers/net/mdio/mdio-ipq4019.c | 154 +- + drivers/net/mdio/mdio-ipq8064.c | 8 - + drivers/net/mdio/mdio-mscc-miim.c | 6 - + drivers/net/mdio/mdio-mux-bcm-iproc.c | 54 +- + drivers/net/mdio/mdio-mux-meson-g12a.c | 27 +- + drivers/net/mdio/mdio-mvusb.c | 6 - + drivers/net/mdio/mdio-octeon.c | 6 +- + drivers/net/mdio/mdio-thunder.c | 6 +- + drivers/net/netdevsim/dev.c | 15 +- + drivers/net/netdevsim/health.c | 20 +- + drivers/net/netdevsim/ipsec.c | 14 +- + 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 | 464 +++- + drivers/net/phy/micrel.c | 38 +- + drivers/net/phy/microchip_t1.c | 70 +- + 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 | 26 +- + drivers/net/phy/phylink.c | 6 +- + drivers/net/phy/sfp.c | 39 +- + 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 | 179 +- + drivers/net/usb/usbnet.c | 29 +- + drivers/net/virtio_net.c | 383 ++-- + drivers/net/wireless/ath/ath11k/wmi.c | 4 +- + .../wireless/broadcom/brcm80211/brcmfmac/common.c | 7 +- + .../wireless/broadcom/brcm80211/brcmfmac/core.c | 1 + + .../wireless/broadcom/brcm80211/brcmfmac/msgbuf.c | 5 +- + drivers/net/wireless/intel/ipw2x00/ipw2200.c | 11 +- + drivers/net/wireless/intel/iwlegacy/common.c | 4 +- + drivers/net/wireless/intersil/orinoco/hw.c | 2 + + drivers/net/wireless/marvell/libertas/cmdresp.c | 2 +- + drivers/net/wireless/marvell/libertas/if_usb.c | 2 +- + drivers/net/wireless/marvell/libertas/main.c | 3 +- + drivers/net/wireless/marvell/libertas_tf/if_usb.c | 2 +- + drivers/net/wireless/mediatek/mt76/debugfs.c | 2 +- + drivers/net/wireless/mediatek/mt76/dma.c | 16 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 56 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 12 +- + drivers/net/wireless/mediatek/mt76/mt7603/init.c | 34 +- + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 85 + + drivers/net/wireless/mediatek/mt76/mt7615/mmio.c | 16 - + drivers/net/wireless/mediatek/mt76/mt7615/mt7615.h | 6 + + .../net/wireless/mediatek/mt76/mt7615/pci_init.c | 62 +- + drivers/net/wireless/mediatek/mt76/mt7615/regs.h | 1 + + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76x0/phy.c | 7 +- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 35 +- + .../net/wireless/mediatek/mt76/mt7915/debugfs.c | 6 +- + drivers/net/wireless/mediatek/mt76/mt7915/eeprom.c | 19 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 124 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 81 +- + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 27 +- + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 13 +- + drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 1 + + .../net/wireless/mediatek/mt76/mt7921/acpi_sar.c | 55 + + .../net/wireless/mediatek/mt76/mt7921/acpi_sar.h | 12 + + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 3 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 7 + + .../net/wireless/mediatek/mt76/mt7996/debugfs.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7996/eeprom.c | 18 +- + drivers/net/wireless/mediatek/mt76/mt7996/init.c | 14 +- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 15 +- + drivers/net/wireless/mediatek/mt76/mt7996/mmio.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7996/regs.h | 1 - + drivers/net/wireless/mediatek/mt76/sdio_txrx.c | 4 + + drivers/net/wireless/mediatek/mt7601u/dma.c | 3 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 8 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 2 - + drivers/net/wireless/realtek/rtl8xxxu/Kconfig | 2 +- + drivers/net/wireless/realtek/rtl8xxxu/Makefile | 3 +- + drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu.h | 134 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c | 1874 +++++++++++++++ + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188f.c | 24 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192c.c | 13 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8192e.c | 21 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723a.c | 3 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_8723b.c | 18 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 412 +++- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_regs.h | 40 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 6 +- + .../realtek/rtlwifi/rtl8723ae/hal_bt_coexist.h | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/phy.c | 52 +- + drivers/net/wireless/realtek/rtw88/bf.c | 13 +- + drivers/net/wireless/realtek/rtw88/mac80211.c | 4 +- + drivers/net/wireless/realtek/rtw88/main.c | 6 +- + drivers/net/wireless/realtek/rtw89/coex.c | 1665 +++++++++----- + drivers/net/wireless/realtek/rtw89/coex.h | 1 + + drivers/net/wireless/realtek/rtw89/core.c | 50 +- + drivers/net/wireless/realtek/rtw89/core.h | 289 ++- + drivers/net/wireless/realtek/rtw89/fw.c | 62 +- + drivers/net/wireless/realtek/rtw89/fw.h | 14 +- + drivers/net/wireless/realtek/rtw89/mac.c | 11 +- + drivers/net/wireless/realtek/rtw89/pci.c | 15 +- + drivers/net/wireless/realtek/rtw89/pci.h | 15 +- + drivers/net/wireless/realtek/rtw89/phy.c | 10 +- + drivers/net/wireless/realtek/rtw89/reg.h | 22 +- + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 25 +- + drivers/net/wireless/realtek/rtw89/rtw8852a_rfk.c | 2 +- + drivers/net/wireless/realtek/rtw89/rtw8852ae.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 20 +- + drivers/net/wireless/realtek/rtw89/rtw8852be.c | 1 + + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 15 +- + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 353 ++- + drivers/net/wireless/realtek/rtw89/rtw8852ce.c | 1 + + drivers/net/wireless/realtek/rtw89/txrx.h | 2 + + drivers/net/wireless/rsi/rsi_91x_coex.c | 1 + + drivers/net/wireless/wl3501_cs.c | 2 +- + drivers/nvme/host/tcp.c | 3 + + drivers/nvme/target/tcp.c | 5 + + drivers/ptp/ptp_qoriq.c | 50 +- + drivers/s390/net/ism.h | 19 +- + drivers/s390/net/ism_drv.c | 376 +++- + drivers/scsi/iscsi_tcp.c | 3 + + drivers/soc/qcom/qmi_interface.c | 3 + + drivers/target/iscsi/iscsi_target_nego.c | 2 + + drivers/vhost/vsock.c | 214 +- + drivers/xen/pvcalls-back.c | 5 + + fs/dlm/lowcomms.c | 5 + + fs/ocfs2/cluster/tcp.c | 5 + + include/linux/acpi.h | 15 + + include/linux/bitfield.h | 26 + + include/linux/bpf.h | 16 +- + include/linux/bpf_verifier.h | 40 +- + include/linux/dsa/ksz_common.h | 53 + + include/linux/ethtool.h | 261 ++- + include/linux/ethtool_netlink.h | 42 + + include/linux/fsl/enetc_mdio.h | 21 +- + include/linux/fsl/ptp_qoriq.h | 1 + + include/linux/ism.h | 98 + + include/linux/mdio-bitbang.h | 6 +- + include/linux/mdio.h | 66 +- + include/linux/micrel_phy.h | 2 + + include/linux/mlx5/driver.h | 12 +- + include/linux/mlx5/mlx5_ifc.h | 65 +- + include/linux/netdevice.h | 4 +- + include/linux/netlink.h | 4 + + include/linux/phy.h | 102 +- + include/linux/ptp_classify.h | 73 + + include/linux/regmap.h | 8 + + include/linux/soc/mediatek/mtk_wed.h | 3 +- + include/linux/u64_stats_sync.h | 12 - + include/linux/virtio_vsock.h | 129 +- + include/net/cfg80211.h | 16 +- + include/net/dcbnl.h | 18 + + include/net/devlink.h | 29 +- + include/net/dsa.h | 11 + + include/net/dst_ops.h | 2 +- + include/net/inet_sock.h | 4 + + include/net/ip.h | 3 +- + include/net/ip6_route.h | 4 - + include/net/mac80211.h | 73 +- + include/net/netfilter/nf_tables_core.h | 16 + + include/net/smc.h | 24 +- + include/soc/mscc/ocelot.h | 58 + + include/soc/mscc/ocelot_dev.h | 23 + + include/trace/events/sock.h | 69 + + include/uapi/linux/bpf.h | 4 + + include/uapi/linux/dcbnl.h | 2 + + include/uapi/linux/ethtool.h | 48 +- + include/uapi/linux/ethtool_netlink.h | 78 + + include/uapi/linux/fou.h | 54 +- + include/uapi/linux/in.h | 1 + + include/uapi/linux/ioam6.h | 2 +- + include/uapi/linux/netfilter/nf_tables.h | 14 + + include/uapi/linux/nl80211.h | 4 +- + include/uapi/linux/rpl.h | 4 +- + include/uapi/linux/rtnetlink.h | 1 + + include/uapi/linux/snmp.h | 3 + + 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/bluetooth/rfcomm/core.c | 4 + + net/caif/caif_socket.c | 4 - + net/ceph/messenger.c | 4 + + net/core/Makefile | 1 - + net/core/dev.c | 7 +- + net/core/dst.c | 8 +- + net/core/filter.c | 15 +- + net/core/net-traces.c | 2 + + net/core/skbuff.c | 74 +- + net/core/skmsg.c | 5 + + net/core/sock.c | 2 + + net/core/sysctl_net_core.c | 5 - + net/dcb/dcbnl.c | 272 ++- + net/devlink/Makefile | 3 + + net/devlink/core.c | 340 +++ + net/devlink/devl_internal.h | 192 ++ + net/{core/devlink.c => devlink/leftover.c} | 1926 +++++----------- + net/devlink/netlink.c | 251 +++ + net/dsa/slave.c | 37 + + net/dsa/tag_ksz.c | 216 +- + net/ethtool/Makefile | 4 +- + net/ethtool/coalesce.c | 22 +- + net/ethtool/common.c | 8 + + net/ethtool/common.h | 2 + + net/ethtool/mm.c | 271 +++ + net/ethtool/netlink.c | 48 + + net/ethtool/netlink.h | 40 +- + net/ethtool/pause.c | 48 + + net/ethtool/plca.c | 277 +++ + net/ethtool/stats.c | 159 +- + net/ipv4/Makefile | 1 + + net/ipv4/{fou.c => fou_core.c} | 47 +- + net/ipv4/fou_nl.c | 48 + + net/ipv4/fou_nl.h | 25 + + net/ipv4/icmp.c | 3 + + net/ipv4/inet_connection_sock.c | 25 +- + net/ipv4/inet_hashtables.c | 14 +- + net/ipv4/ip_sockglue.c | 18 + + net/ipv4/netfilter/Kconfig | 14 - + net/ipv4/netfilter/Makefile | 1 - + net/ipv4/netfilter/ipt_CLUSTERIP.c | 929 -------- + net/ipv4/proc.c | 8 +- + net/ipv4/udp.c | 2 +- + net/ipv6/icmp.c | 4 + + net/ipv6/proc.c | 1 + + net/ipv6/route.c | 23 +- + net/ipv6/rpl_iptunnel.c | 2 +- + net/kcm/kcmsock.c | 3 + + net/mac80211/cfg.c | 36 +- + net/mac80211/rx.c | 15 +- + net/mac80211/sta_info.c | 9 +- + net/mac80211/sta_info.h | 24 +- + net/mac80211/util.c | 26 +- + net/mptcp/options.c | 3 +- + net/mptcp/pm_netlink.c | 63 +- + net/mptcp/pm_userspace.c | 5 +- + net/mptcp/protocol.c | 38 +- + net/mptcp/protocol.h | 2 +- + net/mptcp/sockopt.c | 3 +- + net/mptcp/subflow.c | 3 + + net/mptcp/token.c | 14 +- + net/mptcp/token_test.c | 3 + + net/netfilter/Makefile | 6 + + net/netfilter/ipset/Kconfig | 2 +- + net/netfilter/nf_conntrack_core.c | 46 +- + net/netfilter/nf_conntrack_netlink.c | 2 +- + net/netfilter/nf_conntrack_proto.c | 20 +- + net/netfilter/nf_conntrack_proto_sctp.c | 44 +- + net/netfilter/nf_conntrack_proto_tcp.c | 9 - + net/netfilter/nf_conntrack_proto_udp.c | 10 +- + net/netfilter/nf_tables_api.c | 111 +- + net/netfilter/nf_tables_core.c | 35 +- + net/netfilter/nft_ct.c | 39 +- + net/netfilter/nft_ct_fast.c | 56 + + net/netfilter/nft_objref.c | 12 +- + net/phonet/pep-gprs.c | 4 + + net/qrtr/ns.c | 3 + + net/rds/tcp_listen.c | 2 + + net/rds/tcp_recv.c | 2 + + net/rfkill/rfkill-gpio.c | 20 +- + net/sched/Kconfig | 2 +- + net/sched/act_api.c | 15 +- + net/sched/act_mirred.c | 23 +- + net/sched/cls_api.c | 62 +- + net/sched/sch_api.c | 55 +- + net/sctp/socket.c | 5 +- + net/smc/af_smc.c | 9 +- + net/smc/smc_clc.c | 11 +- + net/smc/smc_core.c | 13 +- + net/smc/smc_diag.c | 3 +- + net/smc/smc_ism.c | 180 +- + net/smc/smc_ism.h | 3 +- + net/smc/smc_pnet.c | 40 +- + net/smc/smc_rx.c | 3 + + net/socket.c | 33 +- + net/sunrpc/svcsock.c | 5 + + net/sunrpc/xprtsock.c | 3 + + net/tipc/socket.c | 3 + + net/tipc/topsrv.c | 5 + + net/tls/tls_sw.c | 3 + + net/unix/af_unix.c | 20 +- + net/vmw_vsock/af_vsock.c | 3 +- + net/vmw_vsock/virtio_transport.c | 149 +- + net/vmw_vsock/virtio_transport_common.c | 422 ++-- + net/vmw_vsock/vsock_loopback.c | 51 +- + net/wireless/core.h | 4 +- + net/wireless/ibss.c | 5 +- + net/wireless/nl80211.c | 6 +- + net/wireless/reg.c | 54 +- + net/wireless/sme.c | 6 +- + net/wireless/util.c | 2 +- + net/wireless/wext-compat.c | 2 +- + net/wireless/wext-core.c | 20 +- + net/wireless/wext-sme.c | 2 +- + net/xfrm/espintcp.c | 3 + + net/xfrm/xfrm_device.c | 9 +- + net/xfrm/xfrm_state.c | 2 +- + 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/net/ynl/samples/cli.py | 47 + + tools/net/ynl/samples/ynl.py | 534 +++++ + tools/net/ynl/ynl-gen-c.py | 2379 ++++++++++++++++++++ + tools/net/ynl/ynl-regen.sh | 30 + + 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/Makefile | 52 +- + tools/testing/selftests/net/bpf/Makefile | 51 - + .../testing/selftests/net/forwarding/tc_actions.sh | 49 +- + tools/testing/selftests/net/ip_local_port_range.c | 447 ++++ + tools/testing/selftests/net/ip_local_port_range.sh | 5 + + tools/testing/selftests/net/mptcp/diag.sh | 56 +- + tools/testing/selftests/net/mptcp/mptcp_connect.c | 4 +- + tools/testing/selftests/net/mptcp/mptcp_join.sh | 53 +- + tools/testing/selftests/net/mptcp/userspace_pm.sh | 153 +- + tools/testing/selftests/net/{bpf => }/nat6to4.c | 0 + tools/testing/selftests/net/tcp_mmap.c | 3 +- + tools/testing/selftests/net/udpgro_frglist.sh | 8 +- + 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 +- + 693 files changed, 38299 insertions(+), 15518 deletions(-) + create mode 100644 Documentation/bpf/map_sockmap.rst + create mode 100644 Documentation/core-api/netlink.rst + create mode 100644 Documentation/devicetree/bindings/net/amlogic,g12a-mdio-mux.yaml + create mode 100644 Documentation/devicetree/bindings/net/ethernet-switch-port.yaml + create mode 100644 Documentation/devicetree/bindings/net/ethernet-switch.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 Documentation/devicetree/bindings/net/rfkill-gpio.yaml + create mode 100644 Documentation/netlink/genetlink-c.yaml + create mode 100644 Documentation/netlink/genetlink-legacy.yaml + create mode 100644 Documentation/netlink/genetlink.yaml + create mode 100644 Documentation/netlink/specs/fou.yaml + create mode 100644 Documentation/userspace-api/netlink/c-code-gen.rst + create mode 100644 Documentation/userspace-api/netlink/genetlink-legacy.rst + create mode 100644 Documentation/userspace-api/netlink/specs.rst + 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/engleder/tsnep_xdp.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_ddp.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_ddp.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/mscc/ocelot_mm.c + 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 drivers/net/wireless/realtek/rtl8xxxu/rtl8xxxu_8188e.c + create mode 100644 include/linux/dsa/ksz_common.h + create mode 100644 include/linux/ism.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} (88%) + create mode 100644 net/devlink/netlink.c + create mode 100644 net/ethtool/mm.c + create mode 100644 net/ethtool/plca.c + rename net/ipv4/{fou.c => fou_core.c} (94%) + create mode 100644 net/ipv4/fou_nl.c + create mode 100644 net/ipv4/fou_nl.h + delete mode 100644 net/ipv4/netfilter/ipt_CLUSTERIP.c + create mode 100644 net/netfilter/nft_ct_fast.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 100755 tools/net/ynl/samples/cli.py + create mode 100644 tools/net/ynl/samples/ynl.py + create mode 100755 tools/net/ynl/ynl-gen-c.py + create mode 100755 tools/net/ynl/ynl-regen.sh + 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 + delete mode 100644 tools/testing/selftests/net/bpf/Makefile + create mode 100644 tools/testing/selftests/net/ip_local_port_range.c + create mode 100755 tools/testing/selftests/net/ip_local_port_range.sh + rename tools/testing/selftests/net/{bpf => }/nat6to4.c (100%) + create mode 100644 tools/testing/vsock/vsock_perf.c +Merging bpf-next/for-next (0164776a2ce7 Merge branch 'Enable bpf_setsockopt() on ktls enabled sockets.') +$ 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 drivers/net/ethernet/mellanox/mlx5/core/en.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_rx.c +Auto-merging include/linux/bpf.h +Auto-merging include/linux/netdevice.h +Auto-merging init/Kconfig +Auto-merging kernel/bpf/btf.c +Auto-merging kernel/bpf/offload.c +CONFLICT (content): Merge conflict in kernel/bpf/offload.c +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/trace/bpf_trace.c +Auto-merging kernel/trace/ftrace.c +Auto-merging lib/Kconfig.debug +Auto-merging net/core/dev.c +Auto-merging net/core/filter.c +Resolved 'kernel/bpf/offload.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master cbcf286b666f] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/cpumasks.rst | 393 ++++++++++++ + Documentation/bpf/index.rst | 1 + + Documentation/bpf/instruction-set.rst | 16 +- + Documentation/bpf/kfuncs.rst | 76 ++- + Documentation/networking/index.rst | 1 + + Documentation/networking/xdp-rx-metadata.rst | 110 ++++ + arch/x86/net/bpf_jit_comp.c | 101 ++- + drivers/net/ethernet/mellanox/mlx4/en_clock.c | 13 +- + drivers/net/ethernet/mellanox/mlx4/en_netdev.c | 6 + + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 63 +- + drivers/net/ethernet/mellanox/mlx4/mlx4_en.h | 5 + + drivers/net/ethernet/mellanox/mlx5/core/en.h | 5 +- + drivers/net/ethernet/mellanox/mlx5/core/en/txrx.h | 5 + + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 31 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.h | 10 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.c | 47 +- + .../net/ethernet/mellanox/mlx5/core/en/xsk/rx.h | 2 + + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 1 + + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 99 +-- + drivers/net/netdevsim/bpf.c | 4 - + drivers/net/veth.c | 87 ++- + include/linux/bpf.h | 79 ++- + include/linux/bpf_verifier.h | 5 +- + include/linux/module.h | 6 +- + include/linux/netdevice.h | 8 + + include/net/xdp.h | 21 + + include/net/xsk_buff_pool.h | 5 + + include/uapi/linux/bpf.h | 12 + + init/Kconfig | 2 +- + kernel/bpf/Makefile | 1 + + kernel/bpf/btf.c | 160 ++++- + kernel/bpf/core.c | 12 +- + kernel/bpf/cpumask.c | 476 +++++++++++++++ + kernel/bpf/offload.c | 419 ++++++++----- + kernel/bpf/syscall.c | 34 +- + kernel/bpf/verifier.c | 544 ++++++++++++++--- + kernel/livepatch/core.c | 10 +- + kernel/module/kallsyms.c | 13 +- + kernel/trace/bpf_trace.c | 93 +-- + kernel/trace/ftrace.c | 2 +- + lib/Kconfig.debug | 9 + + net/bpf/bpf_dummy_struct_ops.c | 18 + + net/bpf/test_run.c | 3 + + net/core/dev.c | 9 +- + net/core/filter.c | 41 +- + net/core/xdp.c | 64 ++ + net/ipv4/bpf_tcp_ca.c | 3 +- + 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 +- + scripts/pahole-flags.sh | 4 + + tools/bpf/bpftool/Makefile | 5 +- + tools/bpf/bpftool/feature.c | 8 +- + tools/bpf/resolve_btfids/Makefile | 34 +- + tools/bpf/resolve_btfids/main.c | 2 +- + tools/include/uapi/linux/bpf.h | 12 + + tools/lib/bpf/bpf_tracing.h | 303 +++++++-- + tools/lib/bpf/libbpf.c | 10 +- + tools/lib/bpf/libbpf_internal.h | 4 +- + tools/testing/selftests/bpf/.gitignore | 1 + + tools/testing/selftests/bpf/DENYLIST.s390x | 3 + + tools/testing/selftests/bpf/Makefile | 20 +- + .../testing/selftests/bpf/prog_tests/cgrp_kfunc.c | 4 +- + tools/testing/selftests/bpf/prog_tests/cpumask.c | 74 +++ + .../selftests/bpf/prog_tests/dummy_st_ops.c | 52 +- + .../selftests/bpf/prog_tests/kfunc_dynptr_param.c | 2 +- + .../selftests/bpf/prog_tests/kprobe_multi_test.c | 19 +- + .../selftests/bpf/prog_tests/nested_trust.c | 12 + + .../selftests/bpf/prog_tests/setget_sockopt.c | 73 +++ + .../testing/selftests/bpf/prog_tests/task_kfunc.c | 71 +-- + .../bpf/prog_tests/test_bpf_syscall_macro.c | 17 + + .../selftests/bpf/prog_tests/uprobe_autoattach.c | 33 +- + .../selftests/bpf/prog_tests/xdp_metadata.c | 410 +++++++++++++ + tools/testing/selftests/bpf/progs/bpf_misc.h | 32 + + .../selftests/bpf/progs/bpf_syscall_macro.c | 26 + + tools/testing/selftests/bpf/progs/cpumask_common.h | 114 ++++ + .../testing/selftests/bpf/progs/cpumask_failure.c | 126 ++++ + .../testing/selftests/bpf/progs/cpumask_success.c | 426 +++++++++++++ + .../selftests/bpf/progs/dummy_st_ops_fail.c | 27 + + .../{dummy_st_ops.c => dummy_st_ops_success.c} | 19 +- + tools/testing/selftests/bpf/progs/dynptr_fail.c | 453 +++++++++++++- + .../selftests/bpf/progs/nested_trust_common.h | 12 + + .../selftests/bpf/progs/nested_trust_failure.c | 33 + + .../selftests/bpf/progs/nested_trust_success.c | 19 + + tools/testing/selftests/bpf/progs/setget_sockopt.c | 8 + + .../selftests/bpf/progs/task_kfunc_failure.c | 18 + + tools/testing/selftests/bpf/progs/test_bpf_nf.c | 11 +- + tools/testing/selftests/bpf/progs/test_tc_tunnel.c | 91 ++- + .../selftests/bpf/progs/test_uprobe_autoattach.c | 48 +- + tools/testing/selftests/bpf/progs/test_xdp_vlan.c | 2 +- + .../testing/selftests/bpf/progs/xdp_hw_metadata.c | 81 +++ + tools/testing/selftests/bpf/progs/xdp_metadata.c | 64 ++ + tools/testing/selftests/bpf/progs/xdp_metadata2.c | 23 + + tools/testing/selftests/bpf/progs/xsk_xdp_progs.c | 30 + + tools/testing/selftests/bpf/test_offload.py | 10 +- + tools/testing/selftests/bpf/test_tc_tunnel.sh | 15 +- + tools/testing/selftests/bpf/test_xsk.sh | 42 +- + tools/testing/selftests/bpf/verifier/sleepable.c | 91 +++ + tools/testing/selftests/bpf/xdp_hw_metadata.c | 403 ++++++++++++ + tools/testing/selftests/bpf/xdp_metadata.h | 15 + + 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 +- + 122 files changed, 6257 insertions(+), 1813 deletions(-) + create mode 100644 Documentation/bpf/cpumasks.rst + create mode 100644 Documentation/networking/xdp-rx-metadata.rst + create mode 100644 kernel/bpf/cpumask.c + 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/prog_tests/cpumask.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/nested_trust.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/xdp_metadata.c + create mode 100644 tools/testing/selftests/bpf/progs/cpumask_common.h + create mode 100644 tools/testing/selftests/bpf/progs/cpumask_failure.c + create mode 100644 tools/testing/selftests/bpf/progs/cpumask_success.c + create mode 100644 tools/testing/selftests/bpf/progs/dummy_st_ops_fail.c + rename tools/testing/selftests/bpf/progs/{dummy_st_ops.c => dummy_st_ops_success.c} (72%) + create mode 100644 tools/testing/selftests/bpf/progs/nested_trust_common.h + create mode 100644 tools/testing/selftests/bpf/progs/nested_trust_failure.c + create mode 100644 tools/testing/selftests/bpf/progs/nested_trust_success.c + create mode 100644 tools/testing/selftests/bpf/progs/xdp_hw_metadata.c + create mode 100644 tools/testing/selftests/bpf/progs/xdp_metadata.c + create mode 100644 tools/testing/selftests/bpf/progs/xdp_metadata2.c + create mode 100644 tools/testing/selftests/bpf/progs/xsk_xdp_progs.c + create mode 100644 tools/testing/selftests/bpf/verifier/sleepable.c + create mode 100644 tools/testing/selftests/bpf/xdp_hw_metadata.c + create mode 100644 tools/testing/selftests/bpf/xdp_metadata.h +Merging ipsec-next/master (9f92752788d7 Merge branch 'adding-sparx5-is0-vcap-support') +$ 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 (c4d508fbe54a net/mlx5: Configure IPsec steering for egress RoCEv2 traffic) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/fs.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_accel/ipsec.h +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/main.c +Auto-merging include/linux/mlx5/driver.h +Auto-merging include/linux/mlx5/mlx5_ifc.h +Merge made by the 'ort' strategy. + drivers/infiniband/hw/mlx5/main.c | 78 +++-- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 3 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 9 +- + drivers/net/ethernet/mellanox/mlx5/core/devlink.h | 5 + + .../mellanox/mlx5/core/diag/fs_tracepoint.c | 4 + + drivers/net/ethernet/mellanox/mlx5/core/en/fs.h | 1 + + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 1 + + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 59 +++- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 15 +- + drivers/net/ethernet/mellanox/mlx5/core/events.c | 2 + + drivers/net/ethernet/mellanox/mlx5/core/fs_cmd.c | 6 + + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 44 ++- + .../mellanox/mlx5/core/lib/ipsec_fs_roce.c | 372 +++++++++++++++++++++ + .../mellanox/mlx5/core/lib/ipsec_fs_roce.h | 20 ++ + drivers/net/ethernet/mellanox/mlx5/core/lib/mlx5.h | 5 - + drivers/net/ethernet/mellanox/mlx5/core/main.c | 20 ++ + include/linux/mlx5/device.h | 1 + + include/linux/mlx5/driver.h | 5 + + include/linux/mlx5/fs.h | 3 + + include/linux/mlx5/mlx5_ifc.h | 12 +- + 21 files changed, 614 insertions(+), 53 deletions(-) + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/ipsec_fs_roce.c + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/lib/ipsec_fs_roce.h +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 (f5be9caf7bf0 net: ethtool: fix NULL pointer dereference in pause_prepare_data()) +$ 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 (ef017002b93b dt-bindings: leds: Document Bluetooth and WLAN triggers) + 0ae189bf87a3 ("Bluetooth: Fix a buffer overflow in mgmt_mesh_add()") + 15ee25fb2573 ("Bluetooth: hci_qca: Fix driver shutdown on closed serdev") + 4a98a4089e63 ("Bluetooth: Fix possible deadlock in rfcomm_sk_state_change") + 4a9c793b939e ("Bluetooth: hci_sync: fix memory leak in hci_update_adv_data()") + 994a2a8fa0c9 ("Bluetooth: hci_event: Fix Invalid wait context") + 9a68d02be75e ("Bluetooth: hci_conn: Fix memory leaks") + e66069edbaf4 ("Bluetooth: hci_sync: Fix use HCI_OP_LE_READ_BUFFER_SIZE_V2") + f85b7caff131 ("Bluetooth: ISO: Fix possible circular locking dependency") + fbc5c03cdcfa ("Bluetooth: ISO: Fix possible circular locking dependency") +$ 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. + Documentation/devicetree/bindings/leds/common.yaml | 8 ++++++-- + drivers/bluetooth/btusb.c | 16 ++++++++++++++++ + drivers/bluetooth/hci_qca.c | 4 ++-- + include/net/bluetooth/hci.h | 4 ++-- + 4 files changed, 26 insertions(+), 6 deletions(-) +Merging wireless-next/for-next (4ca69027691a wifi: wireless: deny wireless extensions on MLO-capable devices) +$ 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 (d6b7ec11062e crypto: x86/aria-avx512 - fix build failure with old binutils) +$ 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 +Auto-merging drivers/crypto/atmel-i2c.c +Auto-merging drivers/crypto/atmel-i2c.h +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/arm64/crypto/ghash-ce-glue.c | 145 +- + arch/s390/crypto/aes_s390.c | 4 - + arch/s390/crypto/paes_s390.c | 2 +- + arch/x86/Kconfig.assembler | 5 + + arch/x86/crypto/Kconfig | 38 + + arch/x86/crypto/Makefile | 6 + + arch/x86/crypto/aria-aesni-avx-asm_64.S | 36 +- + arch/x86/crypto/aria-aesni-avx2-asm_64.S | 1441 ++++++++++++++++++++ + 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 | 254 ++++ + arch/x86/crypto/aria_aesni_avx_glue.c | 49 +- + 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/essiv.c | 7 +- + crypto/seqiv.c | 2 +- + crypto/shash.c | 4 +- + crypto/skcipher.c | 22 +- + crypto/tcrypt.c | 8 +- + crypto/tcrypt.h | 2 +- + 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/aspeed/aspeed-hace.h | 2 +- + drivers/crypto/atmel-aes.c | 3 +- + drivers/crypto/atmel-i2c.c | 2 +- + drivers/crypto/atmel-i2c.h | 2 +- + 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/ccp-dmaengine.c | 21 +- + drivers/crypto/ccp/sev-dev.c | 9 +- + drivers/crypto/ccree/cc_cipher.c | 2 +- + drivers/crypto/hisilicon/Kconfig | 8 +- + drivers/crypto/marvell/octeontx/otx_cptvf_algs.c | 2 +- + drivers/crypto/marvell/octeontx2/otx2_cptvf_algs.c | 2 +- + .../qat/qat_common/adf_transport_access_macros.h | 2 +- + drivers/crypto/qat/qat_common/qat_bl.c | 86 +- + drivers/crypto/qat/qat_common/qat_bl.h | 2 +- + drivers/crypto/stm32/stm32-cryp.c | 37 +- + drivers/crypto/talitos.c | 2 +- + drivers/crypto/ux500/Kconfig | 7 +- + include/crypto/aead.h | 20 +- + include/crypto/scatterwalk.h | 4 +- + include/crypto/xts.h | 25 +- + lib/crypto/blake2s-selftest.c | 25 +- + lib/mpi/mpicoder.c | 3 +- + 80 files changed, 4504 insertions(+), 357 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/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 +Merging drm/drm-next (68de345e101c Merge tag 'drm-misc-next-2023-01-24' of git://anongit.freedesktop.org/drm/drm-misc into drm-next) + 0feeb4fd4c93 ("drm/amd/display: fix issues with driver unload") + 1427a7202739 ("drm/amdgpu: fix amdgpu_job_free_resources v2") + 1def6539028c ("drm/amd/display: Fix COLOR_SPACE_YCBCR2020_TYPE matrix") + 25959dd67dde ("drm/amdgpu: allow multipipe policy on ASICs with one MEC") + 29c472b28ba2 ("drm/amdgpu: Correct the power calcultion for Renior/Cezanne.") + 3c6d1aeb4342 ("drm/amd/display: Fix set scaling doesn's work") + 3cc67fe1b3aa ("drm/amd/display: disable S/G display on DCN 3.1.5") + 4d3d5e6c078f ("drm/amdgpu: fix cleaning up reserved VMID on release") + 766f17923863 ("drm/amd/display: Calculate output_color_space after pixel encoding adjustment") + 99761aaa1ce8 ("drm/amdgpu: correct MEC number for gfx11 APUs") + 9aa153708192 ("drm/amd/display: disable S/G display on DCN 3.1.4") +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging Documentation/userspace-api/ioctl/ioctl-number.rst +Auto-merging MAINTAINERS +Auto-merging drivers/Makefile +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/amdgpu/amdgpu_drv.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_object.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_mst_types.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn32/display_mode_vba_util_32.c +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/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_fbdev_generic.c +Auto-merging drivers/gpu/drm/drm_panel_orientation_quirks.c +Auto-merging drivers/gpu/drm/i915/display/skl_universal_plane.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_context.c +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c +Auto-merging drivers/gpu/drm/i915/gem/selftests/huge_pages.c +Auto-merging drivers/gpu/drm/i915/gt/intel_gt_regs.h +Auto-merging drivers/gpu/drm/i915/gt/intel_reset.c +Auto-merging drivers/gpu/drm/i915/gt/intel_workarounds.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/i915/gt/intel_workarounds.c +Auto-merging drivers/gpu/drm/i915/gvt/dmabuf.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Auto-merging drivers/gpu/drm/i915/i915_pci.c +Auto-merging drivers/gpu/drm/i915/i915_vma.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c +Auto-merging drivers/gpu/drm/scheduler/sched_main.c +Auto-merging drivers/gpu/drm/solomon/ssd130x.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/vc4/vc4_hdmi.c +Auto-merging drivers/gpu/drm/vmwgfx/ttm_object.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/vmwgfx/ttm_object.h +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_drv.h +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c +Auto-merging include/drm/drm_fb_helper.h +Resolved 'drivers/gpu/drm/i915/gt/intel_workarounds.c' using previous resolution. +Resolved 'drivers/gpu/drm/vmwgfx/ttm_object.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b62fd1c6a91d] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/bridge/cdns,dsi.txt | 112 - + .../bindings/display/bridge/cdns,dsi.yaml | 180 + + .../bindings/display/bridge/fsl,ldb.yaml | 16 +- + .../bindings/display/bridge/ite,it6505.yaml | 68 +- + .../bindings/display/bridge/ite,it66121.yaml | 4 +- + .../bindings/display/bridge/renesas,dsi.yaml | 1 + + .../bindings/display/panel/auo,a030jtn01.yaml | 60 + + .../bindings/display/panel/focaltech,gpt3.yaml | 56 + + .../bindings/display/panel/himax,hx8394.yaml | 76 + + .../bindings/display/panel/panel-mipi-dbi-spi.yaml | 8 +- + .../bindings/display/panel/visionox,vtdr6130.yaml | 53 + + .../bindings/display/simple-framebuffer.yaml | 7 + + .../bindings/reserved-memory/framebuffer.yaml | 52 + + Documentation/fb/modedb.rst | 5 + + Documentation/gpu/amdgpu/apu-asic-info-table.csv | 18 +- + Documentation/gpu/amdgpu/dgpu-asic-info-table.csv | 2 + + Documentation/gpu/amdgpu/driver-misc.rst | 2 +- + 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 + + Documentation/userspace-api/ioctl/ioctl-number.rst | 1 + + .../userspace-api/media/v4l/subdev-formats.rst | 111 + + MAINTAINERS | 53 +- + drivers/Makefile | 1 + + drivers/accel/Kconfig | 2 + + drivers/accel/Makefile | 3 + + drivers/accel/ivpu/Kconfig | 15 + + drivers/accel/ivpu/Makefile | 16 + + drivers/accel/ivpu/TODO | 11 + + drivers/accel/ivpu/ivpu_drv.c | 654 ++ + drivers/accel/ivpu/ivpu_drv.h | 190 + + drivers/accel/ivpu/ivpu_fw.c | 423 ++ + drivers/accel/ivpu/ivpu_fw.h | 38 + + drivers/accel/ivpu/ivpu_gem.c | 753 +++ + drivers/accel/ivpu/ivpu_gem.h | 127 + + drivers/accel/ivpu/ivpu_hw.h | 170 + + drivers/accel/ivpu/ivpu_hw_mtl.c | 1084 ++++ + drivers/accel/ivpu/ivpu_hw_mtl_reg.h | 280 + + drivers/accel/ivpu/ivpu_hw_reg_io.h | 115 + + drivers/accel/ivpu/ivpu_ipc.c | 510 ++ + drivers/accel/ivpu/ivpu_ipc.h | 93 + + drivers/accel/ivpu/ivpu_job.c | 614 ++ + drivers/accel/ivpu/ivpu_job.h | 67 + + drivers/accel/ivpu/ivpu_jsm_msg.c | 169 + + drivers/accel/ivpu/ivpu_jsm_msg.h | 23 + + drivers/accel/ivpu/ivpu_mmu.c | 883 +++ + drivers/accel/ivpu/ivpu_mmu.h | 50 + + drivers/accel/ivpu/ivpu_mmu_context.c | 398 ++ + drivers/accel/ivpu/ivpu_mmu_context.h | 50 + + drivers/accel/ivpu/ivpu_pm.c | 329 + + drivers/accel/ivpu/ivpu_pm.h | 38 + + drivers/accel/ivpu/vpu_boot_api.h | 349 + + drivers/accel/ivpu/vpu_jsm_api.h | 999 +++ + drivers/dma-buf/dma-buf.c | 14 +- + drivers/dma-buf/udmabuf.c | 28 + + drivers/firmware/sysfb_simplefb.c | 43 +- + drivers/gpu/drm/Kconfig | 67 +- + drivers/gpu/drm/Makefile | 9 +- + drivers/gpu/drm/amd/amdgpu/Kconfig | 2 + + drivers/gpu/drm/amd/amdgpu/Makefile | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cgs.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 24 +- + 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 | 103 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_encoders.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 51 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 9 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 42 +- + 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 | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 327 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 215 +- + 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 | 62 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.c | 8 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_securedisplay.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_trace.h | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 27 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 255 +- + 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 | 210 +- + 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/amdgpu_vm.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 166 +- + drivers/gpu/drm/amd/amdgpu/atombios_crtc.c | 1 - + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 1 - + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 16 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 9 +- + 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 | 241 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.c | 88 + + drivers/gpu/drm/amd/amdgpu/gfx_v11_0_3.h | 29 + + 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 | 174 +- + 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/nv.c | 101 +- + 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 | 68 +- + 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 | 59 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 61 +- + drivers/gpu/drm/amd/amdgpu/ta_secureDisplay_if.h | 24 +- + drivers/gpu/drm/amd/amdgpu/umc_v6_7.c | 7 - + 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 | 9 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 9 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 11 - + .../drm/amd/amdkfd/kfd_device_queue_manager_v9.c | 27 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 2 + + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 14 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 465 +- + 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 | 113 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 153 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.h | 17 +- + .../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 | 17 +- + .../gpu/drm/amd/display/dc/bios/command_table2.c | 14 +- + .../gpu/drm/amd/display/dc/bios/command_table2.h | 3 +- + .../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 | 100 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 112 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 553 +- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 6826 +++----------------- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 60 +- + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 63 +- + 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 | 4 +- + drivers/gpu/drm/amd/display/dc/dc_bios_types.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_ddc_types.h | 28 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 13 +- + drivers/gpu/drm/amd/display/dc/dc_hdmi_types.h | 114 + + drivers/gpu/drm/amd/display/dc/dc_link.h | 76 +- + 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 | 52 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.h | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 12 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 4 +- + .../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 | 94 +- + .../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 | 49 +- + 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 | 9 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 4 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 4 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_optc.c | 3 +- + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 2 +- + .../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 | 215 +- + 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 | 16 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 199 +- + .../display/dc/dcn321/dcn321_dio_link_encoder.c | 1 - + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 7 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 5 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 119 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 6 + + .../dc/dml/dcn32/display_mode_vba_util_32.c | 33 +- + .../dc/dml/dcn32/display_mode_vba_util_32.h | 5 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 2 +- + .../gpu/drm/amd/display/dc/dml/display_mode_vba.c | 1 + + .../gpu/drm/amd/display/dc/dml/display_mode_vba.h | 1 + + .../amd/display/dc/gpio/dcn20/hw_factory_dcn20.c | 6 +- + .../amd/display/dc/gpio/dcn30/hw_factory_dcn30.c | 6 +- + .../amd/display/dc/gpio/dcn32/hw_factory_dcn32.c | 6 +- + drivers/gpu/drm/amd/display/dc/gpio/ddc_regs.h | 7 + + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 5 +- + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 24 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_ddc.h | 133 - + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 160 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.h | 105 - + 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 | 92 + + 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 | 6 +- + .../dc/{core/dc_link_ddc.c => link/link_ddc.c} | 410 +- + .../i2caux_interface.h => dc/link/link_ddc.h} | 70 +- + .../drm/amd/display/dc/link/link_dp_capability.c | 2169 +++++++ + .../drm/amd/display/dc/link/link_dp_capability.h | 66 + + drivers/gpu/drm/amd/display/dc/link/link_dp_dpia.c | 107 + + .../display/dc/link/link_dp_dpia.h} | 42 +- + .../gpu/drm/amd/display/dc/link/link_dp_dpia_bw.h | 47 +- + drivers/gpu/drm/amd/display/dc/link/link_dp_phy.c | 145 + + drivers/gpu/drm/amd/display/dc/link/link_dp_phy.h | 51 + + .../gpu/drm/amd/display/dc/link/link_dp_training.c | 1700 +++++ + .../gpu/drm/amd/display/dc/link/link_dp_training.h | 179 + + .../display/dc/link/link_dp_training_128b_132b.c | 260 + + .../display/dc/link/link_dp_training_128b_132b.h | 42 + + .../amd/display/dc/link/link_dp_training_8b_10b.c | 415 ++ + .../amd/display/dc/link/link_dp_training_8b_10b.h | 61 + + .../amd/display/dc/link/link_dp_training_auxless.c | 80 + + .../amd/display/dc/link/link_dp_training_auxless.h | 35 + + .../link_dp_training_dpia.c} | 308 +- + .../amd/display/dc/link/link_dp_training_dpia.h | 41 + + .../dc/link/link_dp_training_fixed_vs_pe_retimer.c | 580 ++ + .../dc/link/link_dp_training_fixed_vs_pe_retimer.h | 45 + + .../dc/{core/dc_link_dpcd.c => link/link_dpcd.c} | 13 +- + .../drm/amd/display/dc/{inc => link}/link_dpcd.h | 5 +- + 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 | 89 +- + .../gpu/drm/amd/display/dmub/src/dmub_srv_stat.c | 21 + + .../drm/amd/display/include/ddc_service_types.h | 5 + + drivers/gpu/drm/amd/display/include/dpcd_defs.h | 5 +- + .../drm/amd/display/include/link_service_types.h | 7 +- + .../drm/amd/display/modules/freesync/freesync.c | 64 +- + .../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 + + .../drm/amd/include/asic_reg/gc/gc_11_0_3_offset.h | 8 + + .../amd/include/asic_reg/gc/gc_11_0_3_sh_mask.h | 50 + + .../amd/include/asic_reg/xgmi/xgmi_6_1_0_sh_mask.h | 87 + + .../amd/include/ivsrcid/gfx/irqsrcs_gfx_11_0_0.h | 2 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 2 + + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 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 | 85 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu8_hwmgr.c | 16 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/vega10_hwmgr.c | 32 +- + .../pm/powerplay/hwmgr/vega10_processpptables.c | 1 - + .../gpu/drm/amd/pm/powerplay/hwmgr/vega12_hwmgr.c | 23 +- + .../pm/powerplay/hwmgr/vega12_processpptables.c | 1 - + .../gpu/drm/amd/pm/powerplay/hwmgr/vega20_hwmgr.c | 21 +- + .../pm/powerplay/hwmgr/vega20_processpptables.c | 1 - + drivers/gpu/drm/amd/pm/powerplay/inc/hwmgr.h | 2 + + .../gpu/drm/amd/pm/powerplay/smumgr/ci_smumgr.c | 3 +- + .../drm/amd/pm/powerplay/smumgr/iceland_smumgr.c | 2 +- + .../gpu/drm/amd/pm/powerplay/smumgr/smu10_smumgr.c | 10 +- + .../gpu/drm/amd/pm/powerplay/smumgr/tonga_smumgr.c | 2 +- + 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/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/arm/display/komeda/komeda_crtc.c | 1 - + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 1 + + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 1 - + drivers/gpu/drm/arm/hdlcd_drv.c | 24 +- + drivers/gpu/drm/aspeed/aspeed_gfx_crtc.c | 1 - + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 1 - + drivers/gpu/drm/aspeed/aspeed_gfx_out.c | 1 - + drivers/gpu/drm/ast/Kconfig | 2 + + drivers/gpu/drm/ast/ast_drv.c | 1 - + drivers/gpu/drm/ast/ast_main.c | 1 - + drivers/gpu/drm/ast/ast_mode.c | 3 +- + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 9 +- + drivers/gpu/drm/bridge/Kconfig | 11 - + drivers/gpu/drm/bridge/Makefile | 1 - + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 5 +- + drivers/gpu/drm/bridge/analogix/analogix-anx6345.c | 6 +- + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 5 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 7 +- + drivers/gpu/drm/bridge/cadence/Kconfig | 21 + + drivers/gpu/drm/bridge/cadence/Makefile | 3 + + .../bridge/{cdns-dsi.c => cadence/cdns-dsi-core.c} | 83 +- + drivers/gpu/drm/bridge/cadence/cdns-dsi-core.h | 84 + + drivers/gpu/drm/bridge/cadence/cdns-dsi-j721e.c | 51 + + drivers/gpu/drm/bridge/cadence/cdns-dsi-j721e.h | 16 + + .../gpu/drm/bridge/cadence/cdns-mhdp8546-core.c | 1 - + drivers/gpu/drm/bridge/chipone-icn6211.c | 5 +- + drivers/gpu/drm/bridge/chrontel-ch7033.c | 5 +- + drivers/gpu/drm/bridge/fsl-ldb.c | 80 +- + drivers/gpu/drm/bridge/ite-it6505.c | 133 +- + drivers/gpu/drm/bridge/ite-it66121.c | 321 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 26 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 5 +- + drivers/gpu/drm/bridge/lontium-lt9611.c | 346 +- + 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 | 13 +- + drivers/gpu/drm/bridge/parade-ps8622.c | 6 +- + drivers/gpu/drm/bridge/parade-ps8640.c | 22 +- + drivers/gpu/drm/bridge/sii902x.c | 38 +- + drivers/gpu/drm/bridge/sii9234.c | 5 +- + drivers/gpu/drm/bridge/sil-sii8620.c | 5 +- + drivers/gpu/drm/bridge/tc358767.c | 12 +- + drivers/gpu/drm/bridge/tc358768.c | 6 +- + drivers/gpu/drm/bridge/tc358775.c | 5 +- + 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_blend.c | 13 +- + drivers/gpu/drm/drm_bridge.c | 294 +- + drivers/gpu/drm/drm_bridge_connector.c | 27 +- + drivers/gpu/drm/drm_bufs.c | 12 +- + drivers/gpu/drm/drm_client.c | 11 +- + drivers/gpu/drm/drm_client_modeset.c | 4 - + drivers/gpu/drm/drm_connector.c | 174 +- + drivers/gpu/drm/drm_context.c | 36 +- + drivers/gpu/drm/drm_debugfs.c | 110 +- + drivers/gpu/drm/drm_drv.c | 7 +- + drivers/gpu/drm/drm_edid.c | 528 +- + drivers/gpu/drm/drm_fb_helper.c | 276 +- + drivers/gpu/drm/drm_fbdev_generic.c | 15 +- + drivers/gpu/drm/drm_file.c | 18 +- + drivers/gpu/drm/drm_format_helper.c | 496 +- + 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_dma_helper.c | 4 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 6 +- + 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_ioc32.c | 13 +- + drivers/gpu/drm/drm_ioctl.c | 25 +- + drivers/gpu/drm/drm_lease.c | 66 +- + drivers/gpu/drm/drm_mipi_dbi.c | 158 +- + drivers/gpu/drm/drm_mipi_dsi.c | 52 + + drivers/gpu/drm/drm_mode_config.c | 10 +- + drivers/gpu/drm/drm_modes.c | 551 +- + drivers/gpu/drm/drm_panel_orientation_quirks.c | 33 +- + drivers/gpu/drm/drm_plane.c | 5 + + drivers/gpu/drm/drm_plane_helper.c | 1 - + drivers/gpu/drm/drm_probe_helper.c | 126 +- + 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_dsi.c | 41 +- + 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/gma500/Kconfig | 2 + + drivers/gpu/drm/gma500/backlight.c | 2 + + drivers/gpu/drm/gma500/cdv_device.c | 1 + + drivers/gpu/drm/gma500/cdv_intel_crt.c | 2 + + drivers/gpu/drm/gma500/cdv_intel_display.c | 1 + + drivers/gpu/drm/gma500/cdv_intel_dp.c | 1 + + drivers/gpu/drm/gma500/cdv_intel_hdmi.c | 2 + + drivers/gpu/drm/gma500/cdv_intel_lvds.c | 2 + + drivers/gpu/drm/gma500/framebuffer.c | 7 +- + drivers/gpu/drm/gma500/gma_display.c | 2 + + drivers/gpu/drm/gma500/oaktrail_crtc.c | 1 + + drivers/gpu/drm/gma500/oaktrail_hdmi.c | 2 + + drivers/gpu/drm/gma500/oaktrail_lvds.c | 1 + + drivers/gpu/drm/gma500/psb_device.c | 1 + + drivers/gpu/drm/gma500/psb_intel_display.c | 3 + + drivers/gpu/drm/gma500/psb_intel_drv.h | 1 - + drivers/gpu/drm/gma500/psb_intel_lvds.c | 2 + + drivers/gpu/drm/gma500/psb_intel_sdvo.c | 2 + + drivers/gpu/drm/gud/gud_connector.c | 10 +- + drivers/gpu/drm/gud/gud_drv.c | 18 +- + drivers/gpu/drm/gud/gud_internal.h | 1 + + drivers/gpu/drm/gud/gud_pipe.c | 223 +- + drivers/gpu/drm/hisilicon/hibmc/Kconfig | 2 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 4 +- + drivers/gpu/drm/i2c/ch7006_drv.c | 14 +- + drivers/gpu/drm/i2c/ch7006_priv.h | 1 - + 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 | 17 +- + drivers/gpu/drm/i915/Makefile | 18 +- + 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 | 1276 +++- + 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_dsb.c | 98 +- + drivers/gpu/drm/i915/display/intel_dsb.h | 13 +- + 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_fb_pin.c | 2 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 10 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 9 +- + 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_tv.c | 4 +- + 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/gem/i915_gem_context.c | 6 +- + drivers/gpu/drm/i915/gem/i915_gem_create.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 15 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 35 +- + drivers/gpu/drm/i915/gem/i915_gem_internal.c | 7 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 7 +- + drivers/gpu/drm/i915/gem/i915_gem_object.h | 303 +- + drivers/gpu/drm/i915/gem/i915_gem_object_types.h | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_pages.c | 27 +- + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 4 + + drivers/gpu/drm/i915/gem/i915_gem_shmem.c | 25 +- + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_tiling.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 31 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_userptr.c | 6 +- + .../gpu/drm/i915/gem/selftests/huge_gem_object.c | 6 +- + drivers/gpu/drm/i915/gem/selftests/huge_pages.c | 10 +- + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 23 +- + .../drm/i915/gem/selftests/i915_gem_coherency.c | 2 +- + .../gpu/drm/i915/gem/selftests/i915_gem_context.c | 35 +- + drivers/gpu/drm/i915/gem/selftests/i915_gem_mman.c | 10 +- + .../gpu/drm/i915/gem/selftests/i915_gem_object.c | 8 +- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.c | 15 +- + drivers/gpu/drm/i915/gem/selftests/igt_gem_utils.h | 2 +- + drivers/gpu/drm/i915/gt/gen7_renderclear.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine.h | 2 + + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 24 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 18 + + .../gpu/drm/i915/gt/intel_execlists_submission.c | 6 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 186 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 3 +- + drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c | 1 - + drivers/gpu/drm/i915/gt/intel_gpu_commands.h | 7 + + drivers/gpu/drm/i915/gt/intel_gsc.c | 8 + + drivers/gpu/drm/i915/gt/intel_gt.c | 167 +- + drivers/gpu/drm/i915/gt/intel_gt.h | 5 + + drivers/gpu/drm/i915/gt/intel_gt_clock_utils.c | 8 +- + drivers/gpu/drm/i915/gt/intel_gt_debugfs.c | 2 - + drivers/gpu/drm/i915/gt/intel_gt_irq.c | 11 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 141 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.h | 2 + + drivers/gpu/drm/i915/gt/intel_gt_pm.c | 17 +- + drivers/gpu/drm/i915/gt/intel_gt_print.h | 51 + + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 19 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt_sysfs_pm.c | 42 +- + drivers/gpu/drm/i915/gt/intel_gt_types.h | 20 +- + drivers/gpu/drm/i915/gt/intel_gtt.c | 34 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 30 +- + drivers/gpu/drm/i915/gt/intel_migrate.c | 6 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 3 + + drivers/gpu/drm/i915/gt/intel_renderstate.c | 2 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 18 +- + drivers/gpu/drm/i915/gt/intel_ring_submission.c | 2 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 158 +- + drivers/gpu/drm/i915/gt/selftest_engine_cs.c | 8 +- + drivers/gpu/drm/i915/gt/selftest_execlists.c | 30 +- + drivers/gpu/drm/i915/gt/selftest_hangcheck.c | 15 +- + drivers/gpu/drm/i915/gt/selftest_lrc.c | 20 +- + drivers/gpu/drm/i915/gt/selftest_migrate.c | 173 +- + drivers/gpu/drm/i915/gt/selftest_mocs.c | 4 +- + drivers/gpu/drm/i915/gt/selftest_ring_submission.c | 2 +- + drivers/gpu/drm/i915/gt/selftest_rps.c | 12 +- + drivers/gpu/drm/i915/gt/selftest_workarounds.c | 20 +- + drivers/gpu/drm/i915/gt/shmem_utils.c | 7 +- + drivers/gpu/drm/i915/gt/uc/guc_capture_fwif.h | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c | 210 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h | 15 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c | 137 + + drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.h | 47 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 16 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 11 + + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 24 +- + drivers/gpu/drm/i915/gt/uc/intel_huc_fw.c | 2 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.c | 29 +- + drivers/gpu/drm/i915/gt/uc/intel_uc.h | 3 + + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 291 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.h | 23 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw_abi.h | 3 +- + drivers/gpu/drm/i915/gvt/dmabuf.c | 10 +- + drivers/gpu/drm/i915/i915_cmd_parser.c | 4 +- + drivers/gpu/drm/i915/i915_debugfs.c | 2 +- + drivers/gpu/drm/i915/i915_deps.c | 2 +- + drivers/gpu/drm/i915/i915_driver.c | 49 +- + drivers/gpu/drm/i915/i915_drv.h | 15 +- + drivers/gpu/drm/i915/i915_gem.c | 22 +- + drivers/gpu/drm/i915/i915_gem_evict.c | 51 +- + drivers/gpu/drm/i915/i915_gem_gtt.h | 3 +- + drivers/gpu/drm/i915/i915_hwmon.c | 43 +- + drivers/gpu/drm/i915/i915_irq.c | 28 +- + drivers/gpu/drm/i915/i915_params.c | 5 +- + drivers/gpu/drm/i915/i915_params.h | 1 + + drivers/gpu/drm/i915/i915_pci.c | 52 +- + drivers/gpu/drm/i915/i915_perf.c | 51 +- + drivers/gpu/drm/i915/i915_reg.h | 103 +- + drivers/gpu/drm/i915/i915_scatterlist.c | 9 + + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 2 +- + drivers/gpu/drm/i915/i915_utils.h | 4 +- + drivers/gpu/drm/i915/i915_vma.c | 79 +- + drivers/gpu/drm/i915/i915_vma.h | 52 +- + drivers/gpu/drm/i915/i915_vma_resource.c | 4 +- + drivers/gpu/drm/i915/i915_vma_resource.h | 17 +- + drivers/gpu/drm/i915/i915_vma_types.h | 3 +- + drivers/gpu/drm/i915/intel_device_info.c | 6 + + drivers/gpu/drm/i915/intel_mchbar_regs.h | 2 + + drivers/gpu/drm/i915/intel_region_ttm.c | 17 +- + drivers/gpu/drm/i915/intel_runtime_pm.h | 2 +- + drivers/gpu/drm/i915/intel_uncore.c | 59 + + drivers/gpu/drm/i915/intel_uncore.h | 13 + + drivers/gpu/drm/i915/intel_wakeref.h | 21 +- + drivers/gpu/drm/i915/pxp/intel_pxp.c | 128 +- + drivers/gpu/drm/i915/pxp/intel_pxp.h | 9 +- + drivers/gpu/drm/i915/pxp/intel_pxp_cmd.c | 8 +- + .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_cmn.h | 1 + + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.c | 36 +- + drivers/gpu/drm/i915/pxp/intel_pxp_debugfs.h | 4 +- + drivers/gpu/drm/i915/pxp/intel_pxp_huc.c | 11 +- + drivers/gpu/drm/i915/pxp/intel_pxp_irq.c | 18 +- + drivers/gpu/drm/i915/pxp/intel_pxp_pm.c | 6 +- + drivers/gpu/drm/i915/pxp/intel_pxp_session.c | 10 +- + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 35 +- + drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 8 + + drivers/gpu/drm/i915/selftests/i915_gem.c | 2 + + drivers/gpu/drm/i915/selftests/i915_gem_gtt.c | 4 + + drivers/gpu/drm/i915/selftests/i915_request.c | 20 +- + drivers/gpu/drm/i915/selftests/igt_spinner.c | 8 +- + drivers/gpu/drm/i915/selftests/scatterlist.c | 4 + + 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 + drivers/gpu/drm/imx/Kconfig | 41 +- + drivers/gpu/drm/imx/Makefile | 10 +- + drivers/gpu/drm/imx/dcss/dcss-dev.c | 23 +- + drivers/gpu/drm/imx/dcss/dcss-dev.h | 7 +- + drivers/gpu/drm/imx/dcss/dcss-drv.c | 15 +- + drivers/gpu/drm/imx/dcss/dcss-kms.c | 2 - + 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/ingenic/ingenic-drm-drv.c | 1 - + drivers/gpu/drm/kmb/kmb_crtc.c | 1 - + drivers/gpu/drm/kmb/kmb_plane.c | 1 - + drivers/gpu/drm/logicvc/logicvc_drm.c | 13 +- + drivers/gpu/drm/logicvc/logicvc_interface.c | 1 - + drivers/gpu/drm/logicvc/logicvc_mode.c | 1 - + drivers/gpu/drm/mediatek/mtk_dp.c | 4 +- + drivers/gpu/drm/meson/meson_dw_hdmi.c | 23 +- + 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/Kconfig | 2 + + drivers/gpu/drm/mxsfb/mxsfb_drv.c | 10 +- + drivers/gpu/drm/nouveau/Kconfig | 14 +- + drivers/gpu/drm/nouveau/dispnv04/crtc.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/dac.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/dfp.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/tvmodesnv17.c | 1 - + drivers/gpu/drm/nouveau/dispnv04/tvnv04.c | 2 +- + drivers/gpu/drm/nouveau/dispnv04/tvnv17.c | 7 +- + drivers/gpu/drm/nouveau/dispnv50/head.c | 1 - + drivers/gpu/drm/nouveau/include/nvfw/hs.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_bo.c | 7 +- + drivers/gpu/drm/nouveau/nouveau_bo.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_drm.c | 12 +- + drivers/gpu/drm/nouveau/nouveau_drv.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_gem.c | 11 +- + 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/nouveau/nouveau_vga.c | 1 - + drivers/gpu/drm/omapdrm/dss/dispc.c | 5 - + drivers/gpu/drm/omapdrm/dss/dsi.c | 26 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 41 - + drivers/gpu/drm/omapdrm/omap_gem.c | 2 +- + drivers/gpu/drm/omapdrm/omap_irq.c | 4 +- + drivers/gpu/drm/panel/Kconfig | 38 + + drivers/gpu/drm/panel/Makefile | 4 + + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 96 +- + drivers/gpu/drm/panel/panel-auo-a030jtn01.c | 308 + + drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c | 42 +- + drivers/gpu/drm/panel/panel-edp.c | 11 +- + drivers/gpu/drm/panel/panel-elida-kd35t133.c | 46 +- + drivers/gpu/drm/panel/panel-himax-hx8394.c | 451 ++ + drivers/gpu/drm/panel/panel-ilitek-ili9341.c | 6 +- + 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 +- + drivers/gpu/drm/panel/panel-orisetech-ota5601a.c | 364 ++ + .../gpu/drm/panel/panel-raspberrypi-touchscreen.c | 6 +- + drivers/gpu/drm/panel/panel-ronbo-rb070d30.c | 2 +- + drivers/gpu/drm/panel/panel-samsung-atna33xc20.c | 10 +- + drivers/gpu/drm/panel/panel-samsung-s6e3ha2.c | 4 +- + drivers/gpu/drm/panel/panel-samsung-s6e63j0x03.c | 3 +- + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 44 +- + drivers/gpu/drm/panel/panel-samsung-s6e8aa0.c | 2 - + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 33 +- + drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 19 +- + drivers/gpu/drm/panel/panel-simple.c | 6 +- + 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 | 350 + + drivers/gpu/drm/panel/panel-xinpeng-xpp055c272.c | 112 +- + 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/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.h | 10 +- + drivers/gpu/drm/radeon/atombios_crtc.c | 3 +- + drivers/gpu/drm/radeon/atombios_encoders.c | 1 + + drivers/gpu/drm/radeon/r300.c | 1 - + drivers/gpu/drm/radeon/radeon.h | 3 +- + drivers/gpu/drm/radeon/radeon_acpi.c | 2 +- + drivers/gpu/drm/radeon/radeon_asic.c | 1 - + drivers/gpu/drm/radeon/radeon_connectors.c | 2 +- + drivers/gpu/drm/radeon/radeon_device.c | 6 +- + drivers/gpu/drm/radeon/radeon_display.c | 1 + + drivers/gpu/drm/radeon/radeon_dp_auxch.c | 5 +- + drivers/gpu/drm/radeon/radeon_drv.c | 2 - + drivers/gpu/drm/radeon/radeon_encoders.c | 1 - + drivers/gpu/drm/radeon/radeon_fb.c | 4 - + drivers/gpu/drm/radeon/radeon_irq_kms.c | 1 - + drivers/gpu/drm/radeon/radeon_legacy_crtc.c | 5 +- + drivers/gpu/drm/radeon/radeon_legacy_encoders.c | 2 +- + drivers/gpu/drm/radeon/radeon_legacy_tv.c | 1 - + drivers/gpu/drm/radeon/radeon_mode.h | 2 +- + 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/rockchip/rockchip_drm_vop2.c | 1 - + 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/scheduler/sched_main.c | 13 +- + drivers/gpu/drm/shmobile/shmob_drm_crtc.c | 2 + + drivers/gpu/drm/shmobile/shmob_drm_drv.c | 10 +- + drivers/gpu/drm/shmobile/shmob_drm_plane.c | 1 - + 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/solomon/ssd130x.c | 15 +- + drivers/gpu/drm/sprd/sprd_dpu.c | 5 +- + drivers/gpu/drm/sprd/sprd_drm.c | 1 - + drivers/gpu/drm/sprd/sprd_dsi.c | 1 - + drivers/gpu/drm/sun4i/sun4i_tv.c | 141 +- + drivers/gpu/drm/sun4i/sun8i_dw_hdmi.c | 2 +- + drivers/gpu/drm/tdfx/Makefile | 8 - + drivers/gpu/drm/tdfx/tdfx_drv.c | 90 - + 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_format_helper_test.c | 384 +- + 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_crtc.c | 1 - + drivers/gpu/drm/tidss/tidss_dispc.c | 6 +- + drivers/gpu/drm/tidss/tidss_drv.c | 1 - + drivers/gpu/drm/tidss/tidss_encoder.c | 2 +- + drivers/gpu/drm/tidss/tidss_kms.c | 1 - + drivers/gpu/drm/tidss/tidss_plane.c | 1 - + 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 | 40 +- + drivers/gpu/drm/tiny/panel-mipi-dbi.c | 10 +- + drivers/gpu/drm/tiny/simpledrm.c | 140 +- + drivers/gpu/drm/tiny/st7586.c | 39 +- + drivers/gpu/drm/tiny/st7735r.c | 5 +- + drivers/gpu/drm/ttm/ttm_bo.c | 227 +- + drivers/gpu/drm/ttm/ttm_bo_util.c | 131 +- + 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/udl/udl_drv.c | 2 +- + drivers/gpu/drm/udl/udl_modeset.c | 1 - + drivers/gpu/drm/v3d/v3d_debugfs.c | 22 +- + drivers/gpu/drm/v3d/v3d_gem.c | 62 +- + drivers/gpu/drm/vboxvideo/vbox_drv.c | 8 +- + drivers/gpu/drm/vboxvideo/vbox_main.c | 1 - + 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 | 215 +- + 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 | 189 +- + drivers/gpu/drm/vc4/vc4_hdmi.c | 28 +- + drivers/gpu/drm/vc4/vc4_hdmi_regs.h | 4 + + drivers/gpu/drm/vc4/vc4_hvs.c | 272 +- + drivers/gpu/drm/vc4/vc4_kms.c | 139 +- + drivers/gpu/drm/vc4/vc4_plane.c | 139 +- + drivers/gpu/drm/vc4/vc4_regs.h | 20 +- + drivers/gpu/drm/vc4/vc4_txp.c | 62 +- + drivers/gpu/drm/vc4/vc4_v3d.c | 14 +- + drivers/gpu/drm/vc4/vc4_vec.c | 365 +- + 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/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/vkms/vkms_plane.c | 36 +- + drivers/gpu/drm/vmwgfx/ttm_object.h | 10 + + 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 + + drivers/video/fbdev/clps711x-fb.c | 10 +- + drivers/video/fbdev/core/fb_defio.c | 4 - + 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/display/drm_dp.h | 15 +- + 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_bridge_connector.h | 2 - + include/drm/drm_connector.h | 100 +- + include/drm/drm_crtc_helper.h | 16 +- + include/drm/drm_debugfs.h | 59 + + include/drm/drm_device.h | 32 +- + include/drm/drm_drv.h | 7 - + include/drm/drm_edid.h | 2 + + include/drm/drm_fb_helper.h | 5 - + include/drm/drm_fixed.h | 1 + + include/drm/drm_format_helper.h | 16 +- + 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_mipi_dsi.h | 43 +- + include/drm/drm_mode_config.h | 12 +- + include/drm/drm_modes.h | 17 + + include/drm/drm_modeset_helper_vtables.h | 28 +- + include/drm/drm_panel.h | 10 + + include/drm/drm_pciids.h | 112 - + include/drm/drm_plane.h | 4 +- + include/drm/drm_print.h | 3 - + include/drm/drm_probe_helper.h | 1 + + include/drm/drm_simple_kms_helper.h | 4 +- + include/drm/gpu_scheduler.h | 1 - + include/drm/ttm/{ttm_bo_api.h => ttm_bo.h} | 370 +- + 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/linux/fb.h | 23 - + include/linux/platform_data/simplefb.h | 1 + + include/uapi/drm/amdgpu_drm.h | 12 +- + include/uapi/drm/drm_fourcc.h | 12 + + include/uapi/drm/i810_drm.h | 292 - + include/uapi/drm/ivpu_accel.h | 306 + + 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 - + include/uapi/linux/media-bus-format.h | 5 +- + samples/vfio-mdev/mdpy-fb.c | 8 - + 978 files changed, 38850 insertions(+), 37861 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,dsi.txt + create mode 100644 Documentation/devicetree/bindings/display/bridge/cdns,dsi.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/auo,a030jtn01.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/focaltech,gpt3.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/himax,hx8394.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/visionox,vtdr6130.yaml + create mode 100644 Documentation/devicetree/bindings/reserved-memory/framebuffer.yaml + create mode 100644 drivers/accel/Makefile + create mode 100644 drivers/accel/ivpu/Kconfig + create mode 100644 drivers/accel/ivpu/Makefile + create mode 100644 drivers/accel/ivpu/TODO + create mode 100644 drivers/accel/ivpu/ivpu_drv.c + create mode 100644 drivers/accel/ivpu/ivpu_drv.h + create mode 100644 drivers/accel/ivpu/ivpu_fw.c + create mode 100644 drivers/accel/ivpu/ivpu_fw.h + create mode 100644 drivers/accel/ivpu/ivpu_gem.c + create mode 100644 drivers/accel/ivpu/ivpu_gem.h + create mode 100644 drivers/accel/ivpu/ivpu_hw.h + create mode 100644 drivers/accel/ivpu/ivpu_hw_mtl.c + create mode 100644 drivers/accel/ivpu/ivpu_hw_mtl_reg.h + create mode 100644 drivers/accel/ivpu/ivpu_hw_reg_io.h + create mode 100644 drivers/accel/ivpu/ivpu_ipc.c + create mode 100644 drivers/accel/ivpu/ivpu_ipc.h + create mode 100644 drivers/accel/ivpu/ivpu_job.c + create mode 100644 drivers/accel/ivpu/ivpu_job.h + create mode 100644 drivers/accel/ivpu/ivpu_jsm_msg.c + create mode 100644 drivers/accel/ivpu/ivpu_jsm_msg.h + create mode 100644 drivers/accel/ivpu/ivpu_mmu.c + create mode 100644 drivers/accel/ivpu/ivpu_mmu.h + create mode 100644 drivers/accel/ivpu/ivpu_mmu_context.c + create mode 100644 drivers/accel/ivpu/ivpu_mmu_context.h + create mode 100644 drivers/accel/ivpu/ivpu_pm.c + create mode 100644 drivers/accel/ivpu/ivpu_pm.h + create mode 100644 drivers/accel/ivpu/vpu_boot_api.h + create mode 100644 drivers/accel/ivpu/vpu_jsm_api.h + 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/amdgpu/gfx_v11_0_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfx_v11_0_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 + delete mode 100644 drivers/gpu/drm/amd/display/dc/inc/dc_link_dpia.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%) + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_capability.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_capability.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_dpia.c + rename drivers/gpu/drm/{tdfx/tdfx_drv.h => amd/display/dc/link/link_dp_dpia.h} (52%) + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_phy.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_phy.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_training.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_training.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_training_128b_132b.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_training_128b_132b.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_training_8b_10b.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_training_8b_10b.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_training_auxless.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_training_auxless.h + rename drivers/gpu/drm/amd/display/dc/{core/dc_link_dpia.c => link/link_dp_training_dpia.c} (83%) + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_training_dpia.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_training_fixed_vs_pe_retimer.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/link_dp_training_fixed_vs_pe_retimer.h + 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 + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/xgmi/xgmi_6_1_0_sh_mask.h + rename drivers/gpu/drm/bridge/{cdns-dsi.c => cadence/cdns-dsi-core.c} (97%) + create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-dsi-core.h + create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-dsi-j721e.c + create mode 100644 drivers/gpu/drm/bridge/cadence/cdns-dsi-j721e.h + 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 + create mode 100644 drivers/gpu/drm/i915/display/intel_dvo_regs.h + create mode 100644 drivers/gpu/drm/i915/gt/intel_gt_print.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_fw.h + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.c + create mode 100644 drivers/gpu/drm/i915/gt/uc/intel_gsc_uc.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%) + 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%) + 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-auo-a030jtn01.c + create mode 100644 drivers/gpu/drm/panel/panel-himax-hx8394.c + create mode 100644 drivers/gpu/drm/panel/panel-orisetech-ota5601a.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 + 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 + 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 + 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 + delete mode 100644 include/uapi/drm/i810_drm.h + create mode 100644 include/uapi/drm/ivpu_accel.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 +$ git am -3 ../patches/0001-fix-up-for-drm-fb-helper-Set-framebuffer-for-vga-swi.patch +Applying: fix up for "drm/fb-helper: Set framebuffer for vga-switcheroo clients" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/gpu/drm/drm_fb_helper.c +$ git add -A . +$ git commit -v -a --amend +[master d8311609c51f] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git + Date: Fri Jan 27 13:17:37 2023 +1100 +Merging drm-misc/for-linux-next (851a4a77a9f6 dma-buf: actually set signaling bit for private stub fences) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging drivers/gpu/drm/drm_fb_helper.c +Auto-merging drivers/gpu/drm/drm_fbdev_generic.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/drm_fbdev_generic.c +Auto-merging include/drm/drm_fb_helper.h +Recorded preimage for 'drivers/gpu/drm/drm_fbdev_generic.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/drm_fbdev_generic.c'. +[master 3ba7579af13c] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + drivers/accel/ivpu/ivpu_hw_mtl.c | 4 +- + drivers/dma-buf/dma-fence.c | 2 +- + drivers/gpu/drm/armada/armada_fbdev.c | 4 +- + drivers/gpu/drm/bridge/Kconfig | 2 +- + drivers/gpu/drm/drm_client.c | 10 ++ + drivers/gpu/drm/drm_fb_helper.c | 58 ++++++--- + drivers/gpu/drm/drm_fbdev_generic.c | 131 ++++++++------------- + drivers/gpu/drm/drm_probe_helper.c | 108 +++++++++-------- + drivers/gpu/drm/exynos/exynos_drm_fbdev.c | 4 +- + drivers/gpu/drm/gma500/framebuffer.c | 4 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 11 +- + drivers/gpu/drm/i915/gem/i915_gem_ttm.c | 27 ++++- + drivers/gpu/drm/i915/gem/i915_gem_ttm_move.c | 56 +++++++-- + drivers/gpu/drm/msm/msm_fbdev.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/base.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g84.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/g98.c | 4 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gf100.c | 4 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gm107.c | 4 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/gt215.c | 4 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/mcp89.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.c | 5 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/nv50.h | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/devinit/priv.h | 2 +- + drivers/gpu/drm/omapdrm/omap_fbdev.c | 4 +- + drivers/gpu/drm/radeon/radeon_fb.c | 4 +- + drivers/gpu/drm/tegra/fb.c | 7 +- + drivers/gpu/drm/tiny/simpledrm.c | 4 +- + include/drm/drm_client.h | 8 ++ + include/drm/drm_fb_helper.h | 16 ++- + 30 files changed, 287 insertions(+), 218 deletions(-) +Merging amdgpu/drm-next (f732e2b3c6b3 drm/amdgpu/vcn4: add missing encoder cap) +$ 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_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/display/drm_dp_mst_topology.c +Auto-merging include/drm/drm_print.h +Merge made by the 'ort' strategy. + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 +- + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 1 + + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 1 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 62 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 138 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 9 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 18 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 200 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 54 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_psr.c | 2 +- + drivers/gpu/drm/amd/display/dc/Makefile | 3 +- + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 1 + + .../amd/display/dc/clk_mgr/dcn31/dcn31_clk_mgr.c | 1 + + .../amd/display/dc/clk_mgr/dcn314/dcn314_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn315/dcn315_clk_mgr.c | 28 +- + .../amd/display/dc/clk_mgr/dcn316/dcn316_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 1 - + drivers/gpu/drm/amd/display/dc/core/dc.c | 7 +- + drivers/gpu/drm/amd/display/dc/core/dc_link.c | 1189 +++++----- + drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c | 2375 -------------------- + .../gpu/drm/amd/display/dc/core/dc_link_enc_cfg.c | 1 - + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 56 +- + drivers/gpu/drm/amd/display/dc/dc.h | 3 +- + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 21 +- + drivers/gpu/drm/amd/display/dc/dc_link.h | 72 +- + drivers/gpu/drm/amd/display/dc/dc_stream.h | 2 + + drivers/gpu/drm/amd/display/dc/dc_types.h | 2 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 1 + + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 38 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 2 - + .../amd/display/dc/dcn10/dcn10_stream_encoder.c | 9 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 8 +- + .../amd/display/dc/dcn20/dcn20_stream_encoder.c | 20 +- + .../display/dc/dcn30/dcn30_dio_stream_encoder.c | 26 + + .../display/dc/dcn30/dcn30_dio_stream_encoder.h | 4 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 10 +- + .../display/dc/dcn31/dcn31_hpo_dp_stream_encoder.c | 25 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 6 +- + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 4 +- + .../display/dc/dcn314/dcn314_dio_stream_encoder.h | 4 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 2 - + .../display/dc/dcn32/dcn32_dio_stream_encoder.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 19 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 63 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 4 + + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 10 + + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 10 +- + drivers/gpu/drm/amd/display/dc/dm_helpers.h | 6 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 39 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 55 +- + .../amd/display/dc/dml/dcn32/display_mode_vba_32.c | 47 +- + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 5 +- + .../gpu/drm/amd/display/dc/dml/display_mode_lib.h | 1 + + drivers/gpu/drm/amd/display/dc/hdcp/hdcp_msg.c | 2 +- + drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h | 117 - + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 17 + + drivers/gpu/drm/amd/display/dc/inc/link.h | 17 + + drivers/gpu/drm/amd/display/dc/link/Makefile | 36 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 1055 +++++++++ + .../amd/display/dc/link/accessories/link_dp_cts.h | 33 + + .../dc/link/{ => accessories}/link_dp_trace.c | 8 +- + .../dc/link/{ => accessories}/link_dp_trace.h | 5 - + .../amd/display/dc/link/{ => hwss}/link_hwss_dio.c | 1 - + .../amd/display/dc/link/{ => hwss}/link_hwss_dio.h | 1 + + .../display/dc/link/{ => hwss}/link_hwss_dpia.c | 0 + .../display/dc/link/{ => hwss}/link_hwss_dpia.h | 0 + .../display/dc/link/{ => hwss}/link_hwss_hpo_dp.c | 1 - + .../display/dc/link/{ => hwss}/link_hwss_hpo_dp.h | 1 + + .../amd/display/dc/link/{ => protocols}/link_ddc.c | 0 + .../amd/display/dc/link/{ => protocols}/link_ddc.h | 0 + .../dc/link/{ => protocols}/link_dp_capability.c | 29 +- + .../dc/link/{ => protocols}/link_dp_capability.h | 13 + + .../display/dc/link/{ => protocols}/link_dp_dpia.c | 2 - + .../display/dc/link/{ => protocols}/link_dp_dpia.h | 0 + .../dc/link/{ => protocols}/link_dp_dpia_bw.c | 0 + .../dc/link/{ => protocols}/link_dp_dpia_bw.h | 0 + .../dc/link/protocols/link_dp_irq_handler.c | 401 ++++ + .../link_dp_irq_handler.h} | 15 +- + .../display/dc/link/{ => protocols}/link_dp_phy.c | 33 +- + .../display/dc/link/{ => protocols}/link_dp_phy.h | 5 + + .../dc/link/{ => protocols}/link_dp_training.c | 14 +- + .../dc/link/{ => protocols}/link_dp_training.h | 3 + + .../{ => protocols}/link_dp_training_128b_132b.c | 1 - + .../{ => protocols}/link_dp_training_128b_132b.h | 0 + .../link/{ => protocols}/link_dp_training_8b_10b.c | 1 - + .../link/{ => protocols}/link_dp_training_8b_10b.h | 0 + .../{ => protocols}/link_dp_training_auxless.c | 1 - + .../{ => protocols}/link_dp_training_auxless.h | 0 + .../link/{ => protocols}/link_dp_training_dpia.c | 1 - + .../link/{ => protocols}/link_dp_training_dpia.h | 0 + .../link_dp_training_fixed_vs_pe_retimer.c | 1 - + .../link_dp_training_fixed_vs_pe_retimer.h | 0 + .../display/dc/link/{ => protocols}/link_dpcd.c | 0 + .../display/dc/link/{ => protocols}/link_dpcd.h | 0 + .../dc/link/protocols/link_edp_panel_control.c | 833 +++++++ + .../dc/link/protocols/link_edp_panel_control.h | 33 + + .../amd/display/dc/link/{ => protocols}/link_hpd.c | 0 + .../amd/display/dc/link/{ => protocols}/link_hpd.h | 0 + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 10 +- + .../drm/amd/display/modules/inc/mod_info_packet.h | 36 + + .../amd/display/modules/info_packet/info_packet.c | 55 + + .../drm/amd/display/modules/power/power_helpers.c | 8 +- + .../drm/amd/display/modules/power/power_helpers.h | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 1 + + drivers/gpu/drm/display/drm_dp_mst_topology.c | 4 +- + include/drm/drm_print.h | 2 +- + 109 files changed, 4136 insertions(+), 3356 deletions(-) + delete mode 100644 drivers/gpu/drm/amd/display/dc/core/dc_link_dp.c + delete mode 100644 drivers/gpu/drm/amd/display/dc/inc/dc_link_dp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/accessories/link_dp_cts.h + rename drivers/gpu/drm/amd/display/dc/link/{ => accessories}/link_dp_trace.c (95%) + rename drivers/gpu/drm/amd/display/dc/link/{ => accessories}/link_dp_trace.h (91%) + rename drivers/gpu/drm/amd/display/dc/link/{ => hwss}/link_hwss_dio.c (99%) + rename drivers/gpu/drm/amd/display/dc/link/{ => hwss}/link_hwss_dio.h (99%) + rename drivers/gpu/drm/amd/display/dc/link/{ => hwss}/link_hwss_dpia.c (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => hwss}/link_hwss_dpia.h (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => hwss}/link_hwss_hpo_dp.c (99%) + rename drivers/gpu/drm/amd/display/dc/link/{ => hwss}/link_hwss_hpo_dp.h (98%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_ddc.c (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_ddc.h (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_capability.c (98%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_capability.h (85%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_dpia.c (99%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_dpia.h (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_dpia_bw.c (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_dpia_bw.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_dp_irq_handler.c + rename drivers/gpu/drm/amd/display/dc/link/{link_hwss_hpo_frl.h => protocols/link_dp_irq_handler.h} (80%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_phy.c (98%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_phy.h (93%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_training.c (99%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_training.h (98%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_training_128b_132b.c (99%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_training_128b_132b.h (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_training_8b_10b.c (99%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_training_8b_10b.h (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_training_auxless.c (99%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_training_auxless.h (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_training_dpia.c (99%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_training_dpia.h (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_training_fixed_vs_pe_retimer.c (99%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dp_training_fixed_vs_pe_retimer.h (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dpcd.c (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_dpcd.h (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.c + create mode 100644 drivers/gpu/drm/amd/display/dc/link/protocols/link_edp_panel_control.h + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_hpd.c (100%) + rename drivers/gpu/drm/amd/display/dc/link/{ => protocols}/link_hpd.h (100%) +Merging drm-intel/for-linux-next (d3eb347da114 drm/i915/mtl: Apply Wa_14013475917 for all MTL steppings) +$ 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/display/intel_fbdev.c +Auto-merging drivers/gpu/drm/i915/i915_driver.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/display/g4x_dp.c | 2 + + drivers/gpu/drm/i915/display/g4x_hdmi.c | 2 + + drivers/gpu/drm/i915/display/icl_dsi.c | 2 +- + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 1 + + drivers/gpu/drm/i915/display/intel_audio.c | 317 ++++++++------- + drivers/gpu/drm/i915/display/intel_audio.h | 7 + + drivers/gpu/drm/i915/display/intel_bios.c | 32 +- + drivers/gpu/drm/i915/display/intel_bios.h | 4 +- + drivers/gpu/drm/i915/display/intel_bw.h | 2 +- + drivers/gpu/drm/i915/display/intel_cdclk.h | 2 +- + drivers/gpu/drm/i915/display/intel_color.c | 47 +-- + drivers/gpu/drm/i915/display/intel_connector.c | 5 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 1 + + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 17 + + drivers/gpu/drm/i915/display/intel_ddi.c | 4 +- + drivers/gpu/drm/i915/display/intel_de.h | 7 + + drivers/gpu/drm/i915/display/intel_display.c | 155 ++++---- + drivers/gpu/drm/i915/display/intel_display.h | 115 +----- + drivers/gpu/drm/i915/display/intel_display_core.h | 34 +- + .../gpu/drm/i915/display/intel_display_limits.h | 124 ++++++ + .../gpu/drm/i915/display/intel_display_power_map.c | 1 + + drivers/gpu/drm/i915/display/intel_display_trace.h | 1 + + drivers/gpu/drm/i915/display/intel_display_types.h | 13 +- + drivers/gpu/drm/i915/display/intel_dmc.c | 90 ++++- + drivers/gpu/drm/i915/display/intel_dmc.h | 4 + + drivers/gpu/drm/i915/display/intel_dmc_regs.h | 10 + + drivers/gpu/drm/i915/display/intel_dp.c | 95 +++-- + drivers/gpu/drm/i915/display/intel_dpio_phy.c | 9 +- + drivers/gpu/drm/i915/display/intel_dpll.c | 2 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 4 +- + drivers/gpu/drm/i915/display/intel_drrs.c | 8 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 246 ++++++------ + drivers/gpu/drm/i915/display/intel_dsb.h | 5 +- + drivers/gpu/drm/i915/display/intel_dvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_dvo_dev.h | 2 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 22 +- + drivers/gpu/drm/i915/display/intel_fbdev.c | 2 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 36 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 51 ++- + drivers/gpu/drm/i915/display/intel_modeset_setup.c | 4 +- + drivers/gpu/drm/i915/display/intel_opregion.c | 29 +- + drivers/gpu/drm/i915/display/intel_opregion.h | 4 +- + drivers/gpu/drm/i915/display/intel_panel.c | 10 +- + drivers/gpu/drm/i915/display/intel_panel.h | 4 +- + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 10 +- + drivers/gpu/drm/i915/display/intel_pipe_crc.c | 23 +- + drivers/gpu/drm/i915/display/intel_plane_initial.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 57 ++- + drivers/gpu/drm/i915/display/intel_sdvo.c | 45 ++- + drivers/gpu/drm/i915/display/intel_snps_phy.c | 2 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 441 +++++++++++++++++++++ + drivers/gpu/drm/i915/display/intel_vblank.h | 23 ++ + drivers/gpu/drm/i915/display/intel_vga.c | 32 +- + drivers/gpu/drm/i915/display/skl_scaler.c | 11 +- + drivers/gpu/drm/i915/display/skl_watermark.h | 2 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_create.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_stolen.c | 42 +- + drivers/gpu/drm/i915/gt/intel_ggtt.c | 5 +- + drivers/gpu/drm/i915/gt/intel_ggtt_fencing.c | 1 + + drivers/gpu/drm/i915/gt/intel_ggtt_gmch.c | 5 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 12 +- + drivers/gpu/drm/i915/gt/intel_rps.c | 1 + + drivers/gpu/drm/i915/gt/intel_rps.h | 3 + + drivers/gpu/drm/i915/gt/selftest_reset.c | 2 +- + drivers/gpu/drm/i915/gvt/cmd_parser.c | 1 + + drivers/gpu/drm/i915/gvt/display.c | 1 + + drivers/gpu/drm/i915/gvt/fb_decoder.h | 2 +- + drivers/gpu/drm/i915/i915_config.c | 5 +- + drivers/gpu/drm/i915/i915_config.h | 23 ++ + drivers/gpu/drm/i915/i915_debugfs.c | 6 +- + drivers/gpu/drm/i915/i915_debugfs_params.c | 33 +- + drivers/gpu/drm/i915/i915_driver.c | 145 +------ + drivers/gpu/drm/i915/i915_drv.h | 119 ++---- + drivers/gpu/drm/i915/i915_gem.h | 7 + + drivers/gpu/drm/i915/i915_gem_gtt.h | 2 + + drivers/gpu/drm/i915/i915_irq.c | 408 ------------------- + drivers/gpu/drm/i915/i915_irq.h | 6 - + drivers/gpu/drm/i915/i915_params.c | 86 ++-- + drivers/gpu/drm/i915/i915_pci.c | 1 + + drivers/gpu/drm/i915/i915_reg.h | 3 +- + drivers/gpu/drm/i915/i915_request.c | 1 + + drivers/gpu/drm/i915/i915_vma.c | 1 + + drivers/gpu/drm/i915/intel_device_info.c | 1 + + drivers/gpu/drm/i915/intel_device_info.h | 2 +- + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 + + drivers/gpu/drm/i915/intel_memory_region.c | 2 +- + drivers/gpu/drm/i915/intel_pm.c | 1 + + drivers/gpu/drm/i915/intel_pm_types.h | 2 +- + drivers/gpu/drm/i915/selftests/i915_gem.c | 4 +- + drivers/gpu/drm/i915/selftests/mock_gtt.c | 2 +- + drivers/gpu/drm/i915/soc/intel_gmch.c | 171 ++++++++ + drivers/gpu/drm/i915/soc/intel_gmch.h | 18 + + drivers/gpu/drm/i915/vlv_sideband.c | 1 + + 97 files changed, 1818 insertions(+), 1497 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_display_limits.h + create mode 100644 drivers/gpu/drm/i915/display/intel_vblank.c + create mode 100644 drivers/gpu/drm/i915/display/intel_vblank.h + create mode 100644 drivers/gpu/drm/i915/i915_config.h + create mode 100644 drivers/gpu/drm/i915/soc/intel_gmch.c + create mode 100644 drivers/gpu/drm/i915/soc/intel_gmch.h +Merging drm-tegra/for-next (900cd8f065de drm/tegra: Remove #ifdef guards for PM related functions) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 2 +- + drivers/gpu/drm/tegra/dpaux.c | 6 +- + drivers/gpu/drm/tegra/firewall.c | 3 + + drivers/gpu/drm/tegra/submit.c | 5 +- + drivers/gpu/host1x/cdma.c | 14 +- + drivers/gpu/host1x/cdma.h | 2 + + drivers/gpu/host1x/debug.c | 7 +- + drivers/gpu/host1x/dev.c | 4 +- + drivers/gpu/host1x/dev.h | 10 +- + drivers/gpu/host1x/fence.c | 118 +++++----- + drivers/gpu/host1x/fence.h | 19 +- + drivers/gpu/host1x/hw/channel_hw.c | 48 +++-- + drivers/gpu/host1x/hw/hw_host1x06_uclass.h | 2 +- + drivers/gpu/host1x/hw/hw_host1x07_uclass.h | 2 +- + drivers/gpu/host1x/hw/hw_host1x08_uclass.h | 2 +- + drivers/gpu/host1x/hw/intr_hw.c | 74 ++----- + drivers/gpu/host1x/hw/syncpt_hw.c | 3 - + drivers/gpu/host1x/intr.c | 334 +++++------------------------ + drivers/gpu/host1x/intr.h | 83 +------ + drivers/gpu/host1x/job.c | 12 +- + drivers/gpu/host1x/syncpt.c | 98 ++------- + drivers/gpu/host1x/syncpt.h | 3 +- + include/linux/host1x.h | 10 +- + 23 files changed, 257 insertions(+), 604 deletions(-) +Merging drm-msm/msm-next (1d233b1cb149 drm/msm/dpu: set pdpu->is_rt_pipe early in dpu_plane_sspp_atomic_update()) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Auto-merging drivers/gpu/drm/msm/adreno/a6xx_gpu.c +Auto-merging drivers/gpu/drm/msm/adreno/adreno_gpu.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_gpu.h +Merge made by the 'ort' strategy. + .../bindings/display/msm/dp-controller.yaml | 31 +- + .../bindings/display/msm/dpu-common.yaml | 12 +- + .../bindings/display/msm/dsi-controller-main.yaml | 285 ++++++- + .../bindings/display/msm/dsi-phy-28nm.yaml | 1 + + .../bindings/display/msm/dsi-phy-7nm.yaml | 5 +- + .../bindings/display/msm/dsi-phy-common.yaml | 7 +- + .../devicetree/bindings/display/msm/gpu.yaml | 2 + + .../devicetree/bindings/display/msm/mdp5.txt | 132 ---- + .../bindings/display/msm/mdss-common.yaml | 9 +- + .../devicetree/bindings/display/msm/qcom,mdp5.yaml | 156 ++++ + .../devicetree/bindings/display/msm/qcom,mdss.yaml | 55 +- + .../bindings/display/msm/qcom,msm8998-dpu.yaml | 12 +- + .../bindings/display/msm/qcom,msm8998-mdss.yaml | 14 +- + .../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 | 12 +- + .../bindings/display/msm/qcom,sc7280-dpu.yaml | 9 +- + .../bindings/display/msm/qcom,sc7280-mdss.yaml | 9 +- + .../bindings/display/msm/qcom,sc8280xp-dpu.yaml | 122 +++ + .../bindings/display/msm/qcom,sc8280xp-mdss.yaml | 151 ++++ + .../bindings/display/msm/qcom,sdm845-dpu.yaml | 12 +- + .../bindings/display/msm/qcom,sdm845-mdss.yaml | 20 +- + .../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 | 332 ++++++++ + .../bindings/display/msm/qcom,sm8250-dpu.yaml | 7 + + .../bindings/display/msm/qcom,sm8250-mdss.yaml | 14 +- + .../bindings/display/msm/qcom,sm8350-dpu.yaml | 120 +++ + .../bindings/display/msm/qcom,sm8350-mdss.yaml | 223 ++++++ + .../bindings/display/msm/qcom,sm8450-dpu.yaml | 139 ++++ + .../bindings/display/msm/qcom,sm8450-mdss.yaml | 345 ++++++++ + .../bindings/phy/qcom,hdmi-phy-other.yaml | 27 +- + drivers/gpu/drm/msm/Kconfig | 7 +- + drivers/gpu/drm/msm/adreno/a2xx_gpu.c | 27 +- + drivers/gpu/drm/msm/adreno/a2xx_gpu.h | 1 + + drivers/gpu/drm/msm/adreno/a6xx.xml.h | 18 + + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 2 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 61 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 66 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 4 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 17 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 30 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 47 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 18 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 12 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 14 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 872 ++++++++++++++++++++- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 19 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_ctl.c | 147 ++-- + 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_sspp.c | 6 +- + 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 | 20 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 15 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 14 +- + 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_crtc.c | 5 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_irq.c | 9 +- + drivers/gpu/drm/msm/disp/msm_disp_snapshot.c | 3 + + drivers/gpu/drm/msm/dp/dp_display.c | 157 ++-- + 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.h | 3 + + drivers/gpu/drm/msm/dsi/dsi_cfg.c | 22 +- + drivers/gpu/drm/msm/dsi/dsi_cfg.h | 2 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 69 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 20 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.c | 12 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy.h | 4 + + drivers/gpu/drm/msm/dsi/phy/dsi_phy_7nm.c | 243 +++++- + drivers/gpu/drm/msm/hdmi/hdmi.c | 4 + + drivers/gpu/drm/msm/hdmi/hdmi_pll_8960.c | 21 +- + drivers/gpu/drm/msm/msm_debugfs.c | 12 + + drivers/gpu/drm/msm/msm_drv.c | 18 +- + drivers/gpu/drm/msm/msm_drv.h | 12 +- + drivers/gpu/drm/msm/msm_fence.c | 2 +- + drivers/gpu/drm/msm/msm_gem_submit.c | 15 + + drivers/gpu/drm/msm/msm_gpu.h | 15 +- + drivers/gpu/drm/msm/msm_gpu_devfreq.c | 148 ++-- + drivers/gpu/drm/msm/msm_mdss.c | 16 + + include/uapi/drm/msm_drm.h | 4 +- + 94 files changed, 4068 insertions(+), 754 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/display/msm/mdp5.txt + create mode 100644 Documentation/devicetree/bindings/display/msm/qcom,mdp5.yaml + 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 drm-msm-lumag/msm-next-lumag (1d233b1cb149 drm/msm/dpu: set pdpu->is_rt_pipe early in dpu_plane_sspp_atomic_update()) +$ git merge -m Merge branch 'msm-next-lumag' of https://gitlab.freedesktop.org/lumag/msm.git drm-msm-lumag/msm-next-lumag +Already up to date. +Merging imx-drm/imx-drm/next (927d8fd465ad drm/imx: ipuv3-plane: Remove redundant color encoding and range initialisation) +$ git merge -m Merge branch 'imx-drm/next' of https://git.pengutronix.de/git/pza/linux imx-drm/imx-drm/next +Already up to date. +Merging etnaviv/etnaviv/next (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 (ee9fffdc3887 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 +Merge made by the 'ort' strategy. + 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 (7b3c4c370c09 regmap: Rework regmap_mdio_c45_{read|write} for new C45 API.) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +Merging sound/for-next (47c59e0c213f ALSA: aoa: make remove callback of soundbus driver void returned) +$ 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. + drivers/firewire/core-cdev.c | 43 ++- + drivers/firewire/core-transaction.c | 53 +++- + drivers/firewire/core.h | 9 + + drivers/mfd/wm97xx-core.c | 4 +- + include/linux/firewire.h | 5 +- + include/sound/ac97/codec.h | 2 +- + include/uapi/sound/firewire.h | 24 ++ + sound/ac97/bus.c | 5 +- + sound/aoa/fabrics/layout.c | 3 +- + sound/aoa/soundbus/soundbus.h | 2 +- + 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 | 188 ++++++++++--- + 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 +- + sound/pci/hda/patch_ca0132.c | 2 +- + 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 +++++ + 34 files changed, 910 insertions(+), 440 deletions(-) + create mode 100644 tools/testing/selftests/alsa/pcm-test.conf +Merging sound-asoc/for-next (51a56d3e1a91 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 170c9418f500] 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 + + .../bindings/sound/google,sc7280-herobrine.yaml | 12 + + .../bindings/sound/mediatek,mt8188-afe.yaml | 208 ++ + .../bindings/sound/mediatek,mt8188-mt6359.yaml | 97 + + ...,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 +- + .../bindings/sound/qcom,lpass-va-macro.yaml | 4 +- + .../devicetree/bindings/sound/qcom,sm8250.yaml | 24 +- + .../devicetree/bindings/sound/renesas,rsnd.yaml | 18 +- + Documentation/devicetree/bindings/sound/rt5640.txt | 3 + + .../devicetree/bindings/sound/samsung,odroid.yaml | 3 +- + .../devicetree/bindings/sound/samsung-i2s.yaml | 11 +- + .../devicetree/bindings/sound/simple-card.yaml | 14 +- + .../devicetree/bindings/sound/ti,tlv320aic3x.yaml | 165 + + .../devicetree/bindings/sound/tlv320aic3x.txt | 97 - + include/linux/platform_data/asoc-ux500-msp.h | 20 - + 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/rt1316-sdw.c | 2 +- + sound/soc/codecs/rt1318-sdw.c | 2 +- + sound/soc/codecs/rt5640.c | 4 + + sound/soc/codecs/rt5640.h | 2 + + sound/soc/codecs/rt711-sdca-sdw.c | 2 +- + sound/soc/codecs/rt711-sdca.c | 15 + + sound/soc/codecs/rt711-sdca.h | 8 +- + sound/soc/codecs/rt715-sdca-sdw.c | 2 +- + sound/soc/codecs/wcd938x-sdw.c | 2 +- + sound/soc/codecs/wl1273.c | 6 - + sound/soc/codecs/wm8940.c | 116 +- + sound/soc/codecs/wm8940.h | 3 + + sound/soc/codecs/wsa881x.c | 63 +- + sound/soc/codecs/wsa883x.c | 22 +- + sound/soc/fsl/fsl-asoc-card.c | 2 +- + sound/soc/fsl/fsl_sai.c | 6 +- + 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/probes.c | 23 - + 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 +- + sound/soc/mediatek/Kconfig | 23 + + sound/soc/mediatek/Makefile | 1 + + sound/soc/mediatek/common/Makefile | 2 +- + sound/soc/mediatek/common/mtk-base-afe.h | 19 + + sound/soc/mediatek/common/mtk-soundcard-driver.c | 79 + + sound/soc/mediatek/common/mtk-soundcard-driver.h | 14 + + sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 1 + + .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 2 +- + sound/soc/mediatek/mt8188/Makefile | 15 + + sound/soc/mediatek/mt8188/mt8188-afe-clk.c | 658 ++++ + sound/soc/mediatek/mt8188/mt8188-afe-clk.h | 115 + + sound/soc/mediatek/mt8188/mt8188-afe-common.h | 151 + + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 3358 ++++++++++++++++++++ + sound/soc/mediatek/mt8188/mt8188-audsys-clk.c | 205 ++ + sound/soc/mediatek/mt8188/mt8188-audsys-clk.h | 15 + + sound/soc/mediatek/mt8188/mt8188-audsys-clkid.h | 83 + + sound/soc/mediatek/mt8188/mt8188-dai-adda.c | 632 ++++ + sound/soc/mediatek/mt8188/mt8188-dai-etdm.c | 2588 +++++++++++++++ + sound/soc/mediatek/mt8188/mt8188-dai-pcm.c | 367 +++ + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 785 +++++ + sound/soc/mediatek/mt8188/mt8188-reg.h | 3180 ++++++++++++++++++ + sound/soc/pxa/Kconfig | 5 +- + sound/soc/pxa/spitz.c | 6 - + sound/soc/qcom/lpass-platform.c | 2 +- + sound/soc/qcom/qdsp6/q6apm.c | 13 + + sound/soc/qcom/qdsp6/q6apm.h | 2 + + sound/soc/qcom/qdsp6/q6prm.c | 4 + + sound/soc/qcom/sdm845.c | 1 + + sound/soc/rockchip/Kconfig | 2 +- + sound/soc/samsung/i2s-regs.h | 1 + + sound/soc/samsung/i2s.c | 53 + + sound/soc/sof/amd/acp-dsp-offset.h | 4 + + sound/soc/sof/amd/acp-ipc.c | 8 +- + sound/soc/sof/amd/acp-loader.c | 7 + + sound/soc/sof/amd/acp.h | 7 +- + sound/soc/sof/compress.c | 9 + + sound/soc/sof/control.c | 44 +- + sound/soc/sof/core.c | 3 + + sound/soc/sof/intel/hda-ipc.c | 8 +- + sound/soc/sof/intel/hda.h | 4 +- + sound/soc/sof/ipc3-pcm.c | 3 +- + sound/soc/sof/ipc3-topology.c | 7 +- + sound/soc/sof/ipc3.c | 4 +- + sound/soc/sof/ipc4-topology.c | 83 +- + sound/soc/sof/ipc4-topology.h | 2 + + sound/soc/sof/mediatek/mt8186/mt8186.c | 22 +- + sound/soc/sof/mediatek/mt8186/mt8186.h | 10 +- + sound/soc/sof/mediatek/mt8195/mt8195.c | 8 +- + sound/soc/sof/mediatek/mt8195/mt8195.h | 2 - + sound/soc/sof/nocodec.c | 6 - + sound/soc/sof/ops.h | 8 +- + 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 | 17 +- + sound/soc/sof/stream-ipc.c | 53 +- + sound/soc/sof/topology.c | 91 +- + sound/soc/sof/trace.c | 8 +- + sound/soc/tegra/Kconfig | 4 +- + sound/soc/ux500/mop500.c | 8 +- + sound/soc/ux500/ux500_msp_dai.c | 37 +- + sound/soc/ux500/ux500_msp_i2s.c | 66 +- + sound/soc/ux500/ux500_msp_i2s.h | 14 +- + sound/soc/ux500/ux500_pcm.c | 83 +- + 151 files changed, 14808 insertions(+), 1127 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/sound/adi,adau7002.txt + create mode 100644 Documentation/devicetree/bindings/sound/adi,adau7002.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt8188-afe.yaml + create mode 100644 Documentation/devicetree/bindings/sound/mediatek,mt8188-mt6359.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 + delete mode 100644 include/linux/platform_data/asoc-ux500-msp.h + create mode 100644 sound/soc/intel/avs/control.c + create mode 100644 sound/soc/intel/avs/control.h + create mode 100644 sound/soc/mediatek/common/mtk-soundcard-driver.c + create mode 100644 sound/soc/mediatek/common/mtk-soundcard-driver.h + create mode 100644 sound/soc/mediatek/mt8188/Makefile + create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-clk.c + create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-clk.h + create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-common.h + create mode 100644 sound/soc/mediatek/mt8188/mt8188-afe-pcm.c + create mode 100644 sound/soc/mediatek/mt8188/mt8188-audsys-clk.c + create mode 100644 sound/soc/mediatek/mt8188/mt8188-audsys-clk.h + create mode 100644 sound/soc/mediatek/mt8188/mt8188-audsys-clkid.h + create mode 100644 sound/soc/mediatek/mt8188/mt8188-dai-adda.c + create mode 100644 sound/soc/mediatek/mt8188/mt8188-dai-etdm.c + create mode 100644 sound/soc/mediatek/mt8188/mt8188-dai-pcm.c + create mode 100644 sound/soc/mediatek/mt8188/mt8188-mt6359.c + create mode 100644 sound/soc/mediatek/mt8188/mt8188-reg.h +Merging modules/modules-next (fbed4fea6422 module: Use kstrtobool() instead of strtobool()) +$ 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 | 3 ++- + kernel/params.c | 3 ++- + lib/test_kmod.c | 11 +++++------ + scripts/Makefile.modinst | 2 +- + 4 files changed, 10 insertions(+), 9 deletions(-) +Merging input/next (8aaec1177521 Input: cros_ec_keyb - add 3 buttons for monitor function) +$ 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 9e045a334940] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git +$ git diff -M --stat --summary HEAD^.. + drivers/input/keyboard/cros_ec_keyb.c | 15 ++ + 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 | 335 ++++++++++--------------- + 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 +- + include/linux/platform_data/cros_ec_commands.h | 3 + + 70 files changed, 447 insertions(+), 502 deletions(-) +Merging block/for-next (7d02a82b9775 Merge branch 'for-6.3/dio' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging MAINTAINERS +Auto-merging fs/Makefile +Auto-merging fs/internal.h +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-block | 3 +- + Documentation/block/ublk.rst | 55 +++- + 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-core.c | 13 +- + block/blk-iocost.c | 40 ++- + block/blk-map.c | 14 +- + block/blk-settings.c | 9 +- + block/blk-sysfs.c | 21 +- + block/blk-zoned.c | 4 +- + block/fops.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 +- + drivers/block/ps3vram.c | 7 - + drivers/block/ublk_drv.c | 341 ++++++++++++++------ + drivers/nvme/host/ioctl.c | 4 +- + drivers/nvme/target/zns.c | 3 +- + drivers/s390/block/dcssblk.c | 4 - + fs/Kconfig | 4 + + fs/Makefile | 3 +- + fs/affs/Kconfig | 1 + + fs/direct-io.c | 24 -- + fs/exfat/Kconfig | 1 + + fs/ext2/Kconfig | 1 + + fs/fat/Kconfig | 1 + + fs/hfs/Kconfig | 1 + + fs/hfsplus/Kconfig | 1 + + fs/internal.h | 4 +- + fs/jfs/Kconfig | 1 + + fs/nilfs2/Kconfig | 1 + + fs/ntfs3/Kconfig | 1 + + fs/ocfs2/Kconfig | 1 + + fs/reiserfs/Kconfig | 1 + + fs/super.c | 24 ++ + fs/udf/Kconfig | 1 + + include/linux/blkdev.h | 26 +- + 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 | 21 +- + include/linux/uio.h | 1 + + include/uapi/linux/io_uring.h | 2 + + include/uapi/linux/ublk_cmd.h | 49 ++- + io_uring/io_uring.c | 424 ++++++++++++++++--------- + io_uring/io_uring.h | 95 +++--- + io_uring/msg_ring.c | 31 +- + io_uring/net.c | 28 +- + io_uring/notif.c | 3 +- + io_uring/opdef.c | 339 +++++++++++++------- + io_uring/opdef.h | 13 +- + io_uring/poll.c | 2 +- + io_uring/rw.c | 13 +- + io_uring/sqpoll.c | 3 +- + io_uring/sqpoll.h | 2 +- + lib/iov_iter.c | 15 +- + 67 files changed, 1846 insertions(+), 959 deletions(-) + create mode 100644 drivers/block/drbd/drbd_buildtag.c + create mode 100644 include/linux/drbd_config.h +$ git am -3 ../patches/0001-fixup-for-ublk_drv-add-mechanism-for-supporting-unpr.patch +Applying: fixup for "ublk_drv: add mechanism for supporting unprivileged ublk device" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/block/ublk_drv.c +$ git add -A . +$ git commit -v -a --amend +[master 22ac51217237] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git + Date: Fri Jan 27 13:35:32 2023 +1100 +Merging device-mapper/for-next (6bfba8b202b0 dm cache: Add some documentation to dm-cache-background-tracker.h) +$ 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 +Merge made by the 'ort' strategy. + drivers/md/dm-bufio.c | 2 +- + drivers/md/dm-cache-background-tracker.c | 8 +++++++ + drivers/md/dm-cache-background-tracker.h | 40 +++++++++++++++++++++++++++++--- + drivers/md/dm-zoned-metadata.c | 2 +- + 4 files changed, 47 insertions(+), 5 deletions(-) +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 (b1d908e6c71e dt-bindings: mmc: convert amlogic,meson-gx.txt to dt-schema) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Auto-merging drivers/mmc/host/Kconfig +Merge made by the 'ort' strategy. + .../bindings/mmc/allwinner,sun4i-a10-mmc.yaml | 2 +- + .../bindings/mmc/amlogic,meson-gx-mmc.yaml | 73 ++++++++++ + .../devicetree/bindings/mmc/amlogic,meson-gx.txt | 39 ------ + .../bindings/mmc/amlogic,meson-mx-sdhc.yaml | 2 +- + .../devicetree/bindings/mmc/arasan,sdhci.yaml | 6 +- + .../devicetree/bindings/mmc/cdns,sdhci.yaml | 22 +-- + .../devicetree/bindings/mmc/fsl-imx-esdhc.yaml | 17 ++- + .../devicetree/bindings/mmc/fsl-imx-mmc.yaml | 2 +- + .../bindings/mmc/microchip,dw-sparx5-sdhci.yaml | 4 +- + .../devicetree/bindings/mmc/mmc-pwrseq-emmc.yaml | 2 +- + .../devicetree/bindings/mmc/mmc-pwrseq-sd8787.yaml | 2 +- + .../devicetree/bindings/mmc/mmc-pwrseq-simple.yaml | 2 +- + .../devicetree/bindings/mmc/mmc-spi-slot.yaml | 2 +- + Documentation/devicetree/bindings/mmc/mxs-mmc.yaml | 2 +- + .../bindings/mmc/nvidia,tegra20-sdhci.yaml | 36 ++--- + Documentation/devicetree/bindings/mmc/owl-mmc.yaml | 2 +- + .../devicetree/bindings/mmc/renesas,mmcif.yaml | 2 +- + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 8 +- + .../devicetree/bindings/mmc/rockchip-dw-mshc.yaml | 2 +- + .../bindings/mmc/samsung,exynos-dw-mshc.yaml | 2 +- + .../devicetree/bindings/mmc/sdhci-pxa.yaml | 19 ++- + .../devicetree/bindings/mmc/sunplus,mmc.yaml | 2 +- + .../bindings/mmc/synopsys-dw-mshc-common.yaml | 2 +- + drivers/mmc/core/Kconfig | 2 +- + drivers/mmc/core/pwrseq_simple.c | 4 +- + drivers/mmc/core/sdio_io.c | 2 +- + drivers/mmc/host/Kconfig | 1 + + drivers/mmc/host/renesas_sdhi_internal_dmac.c | 11 ++ + drivers/mmc/host/sdhci-brcmstb.c | 4 +- + drivers/mmc/host/sdhci-esdhc-imx.c | 66 +++++++-- + drivers/mmc/host/sdhci-iproc.c | 14 +- + drivers/mmc/host/sdhci-of-dwcmshc.c | 5 + + drivers/mmc/host/sdhci-pci-core.c | 8 +- + drivers/mmc/host/sdhci-pxav2.c | 154 +++++++++++++++++++-- + drivers/mmc/host/sdhci-pxav3.c | 4 +- + drivers/mmc/host/sdhci-sprd.c | 6 +- + drivers/mmc/host/sdhci.c | 3 - + drivers/mmc/host/sdhci.h | 2 - + 38 files changed, 393 insertions(+), 145 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gx-mmc.yaml + delete mode 100644 Documentation/devicetree/bindings/mmc/amlogic,meson-gx.txt +Merging mfd/for-mfd-next (dd77f5fa97d3 mfd: Remove toshiba tmio drivers) + dd77f5fa97d3 ("mfd: Remove toshiba tmio drivers") +$ 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 +Auto-merging drivers/mfd/Makefile +Merge made by the 'ort' strategy. + .../devicetree/bindings/mfd/google,cros-ec.yaml | 20 ++++++++++++++++ + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 7 ++++++ + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 1 + + Documentation/devicetree/bindings/mfd/syscon.yaml | 5 ++++ + MAINTAINERS | 2 +- + drivers/mfd/Kconfig | 1 + + drivers/mfd/arizona-core.c | 2 +- + 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 | 2 +- + drivers/mfd/syscon.c | 27 +++++++++++++++++----- + drivers/mfd/twl-core.c | 9 ++++---- + drivers/mfd/twl4030-power.c | 6 ----- + drivers/video/backlight/ili922x.c | 24 +++++++++---------- + include/linux/mfd/axp20x.h | 15 ++++++++---- + include/linux/mfd/core.h | 2 +- + include/linux/mfd/twl.h | 2 ++ + 22 files changed, 109 insertions(+), 69 deletions(-) +Merging backlight/for-backlight-next (718c35c8d594 backlight: ktz8866: Add support for Kinetic KTZ8866 backlight) + 6e9b5cad13f0 ("backlight: Remove pxa tosa support") +$ 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 +Auto-merging MAINTAINERS +Auto-merging drivers/video/backlight/Kconfig +Auto-merging drivers/video/backlight/Makefile +Merge made by the 'ort' strategy. + .../bindings/leds/backlight/kinetic,ktz8866.yaml | 76 ++++++++ + .../bindings/leds/backlight/qcom-wled.yaml | 1 + + MAINTAINERS | 6 + + drivers/video/backlight/Kconfig | 8 + + drivers/video/backlight/Makefile | 1 + + drivers/video/backlight/aat2870_bl.c | 7 +- + drivers/video/backlight/arcxcnn_bl.c | 5 +- + drivers/video/backlight/backlight.c | 2 +- + drivers/video/backlight/ipaq_micro_bl.c | 7 +- + drivers/video/backlight/ktd253-backlight.c | 9 +- + drivers/video/backlight/ktz8866.c | 209 +++++++++++++++++++++ + drivers/video/backlight/pwm_bl.c | 68 +++---- + drivers/video/backlight/sky81452-backlight.c | 2 +- + include/linux/pwm_backlight.h | 1 - + 14 files changed, 340 insertions(+), 62 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/kinetic,ktz8866.yaml + create mode 100644 drivers/video/backlight/ktz8866.c +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 (e3d31788f630 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/fixed-regulator.yaml | 7 + + .../bindings/regulator/maxim,max20411.yaml | 58 +++++ + .../bindings/regulator/qcom,rpm-regulator.yaml | 128 ++++++++++ + .../regulator/qcom,usb-vbus-regulator.yaml | 2 +- + .../bindings/regulator/qcom-labibb-regulator.yaml | 6 +- + drivers/regulator/Kconfig | 8 + + drivers/regulator/Makefile | 1 + + drivers/regulator/act8945a-regulator.c | 6 +- + drivers/regulator/fixed-helper.c | 2 +- + drivers/regulator/max20411-regulator.c | 164 +++++++++++++ + drivers/regulator/mcp16502.c | 1 + + drivers/regulator/scmi-regulator.c | 16 +- + drivers/regulator/tps65219-regulator.c | 4 +- + 21 files changed, 1208 insertions(+), 273 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/maxim,max20411.yaml + create mode 100644 Documentation/devicetree/bindings/regulator/qcom,rpm-regulator.yaml + create mode 100644 drivers/regulator/max20411-regulator.c +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 (b8dc57947379 ima: fix ima_delete_rules() kernel-doc warning) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Auto-merging security/integrity/ima/ima_api.c +Auto-merging security/integrity/ima/ima_main.c +Auto-merging security/integrity/ima/ima_policy.c +Merge made by the 'ort' strategy. + security/integrity/ima/ima_api.c | 2 +- + security/integrity/ima/ima_main.c | 4 ++-- + security/integrity/ima/ima_policy.c | 3 ++- + 3 files changed, 5 insertions(+), 4 deletions(-) +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 (5fc44ba8be52 workqueue: Emit runtime message when flush_scheduled_work() is called) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Merge made by the 'ort' strategy. + include/linux/workqueue.h | 2 ++ + kernel/workqueue.c | 2 ++ + 2 files changed, 4 insertions(+) +Merging tpmdd/next (b0474a20b153 tpm: Add reserved memory event log) +$ 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. + certs/blacklist.c | 21 +++--- + crypto/asymmetric_keys/Kconfig | 2 +- + crypto/asymmetric_keys/pkcs7_verify.c | 1 + + crypto/asymmetric_keys/public_key.c | 24 +++++- + drivers/char/tpm/eventlog/acpi.c | 5 +- + drivers/char/tpm/eventlog/efi.c | 13 ++-- + drivers/char/tpm/eventlog/of.c | 41 +++++++++- + drivers/char/tpm/st33zp24/i2c.c | 5 +- + drivers/char/tpm/tpm-chip.c | 1 - + drivers/char/tpm/tpm_crb.c | 100 ++++++++++++++++++++++--- + drivers/char/tpm/tpm_i2c_atmel.c | 5 +- + drivers/char/tpm/tpm_i2c_infineon.c | 5 +- + drivers/char/tpm/tpm_i2c_nuvoton.c | 6 +- + drivers/char/tpm/tpm_tis_i2c.c | 5 +- + include/acpi/actbl3.h | 1 + + include/linux/key.h | 8 ++ + security/keys/key.c | 137 +++++++++++++++++++++++++--------- + 17 files changed, 295 insertions(+), 85 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 (28dcba7e10b6 Merge branches 'apple/dart', 'arm/exynos', 'arm/renesas', 'arm/smmu', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Auto-merging drivers/gpu/host1x/cdma.c +Auto-merging drivers/vfio/vfio_iommu_type1.c +CONFLICT (content): Merge conflict in drivers/vfio/vfio_iommu_type1.c +Recorded preimage for 'drivers/vfio/vfio_iommu_type1.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/vfio/vfio_iommu_type1.c'. +[master 7eb641610003] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/iommu/apple,dart.yaml | 1 + + .../devicetree/bindings/iommu/arm,smmu.yaml | 66 ++- + .../devicetree/bindings/iommu/qcom,iommu.txt | 1 + + .../bindings/iommu/renesas,ipmmu-vmsa.yaml | 1 + + .../bindings/reserved-memory/reserved-memory.yaml | 89 +++- + arch/arm/mm/dma-mapping.c | 11 +- + arch/s390/include/asm/pci_dma.h | 5 +- + arch/s390/pci/pci_dma.c | 31 +- + .../gpu/drm/nouveau/nvkm/subdev/instmem/gk20a.c | 3 +- + drivers/gpu/drm/tegra/drm.c | 2 +- + drivers/gpu/host1x/cdma.c | 2 +- + drivers/infiniband/hw/usnic/usnic_uiom.c | 4 +- + drivers/iommu/Kconfig | 18 +- + drivers/iommu/amd/iommu.c | 60 +-- + drivers/iommu/apple-dart.c | 581 ++++++++++++++++----- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 + + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 23 - + drivers/iommu/dma-iommu.c | 21 +- + drivers/iommu/exynos-iommu.c | 211 +++++--- + drivers/iommu/fsl_pamu_domain.c | 6 +- + drivers/iommu/intel/iommu.c | 36 +- + drivers/iommu/intel/iommu.h | 2 +- + drivers/iommu/intel/pasid.c | 2 +- + drivers/iommu/iommu-traces.c | 1 - + drivers/iommu/iommu.c | 147 +++--- + drivers/iommu/iommufd/pages.c | 6 +- + drivers/iommu/ipmmu-vmsa.c | 28 - + drivers/iommu/msm_iommu.c | 6 +- + drivers/iommu/mtk_iommu.c | 9 - + drivers/iommu/mtk_iommu_v1.c | 4 +- + drivers/iommu/of_iommu.c | 94 ++++ + drivers/iommu/omap-iommu.c | 6 +- + drivers/iommu/rockchip-iommu.c | 1 - + drivers/iommu/s390-iommu.c | 22 +- + drivers/iommu/sprd-iommu.c | 16 - + drivers/iommu/sun50i-iommu.c | 1 - + drivers/iommu/tegra-gart.c | 6 +- + drivers/iommu/tegra-smmu.c | 5 +- + drivers/media/platform/qcom/venus/firmware.c | 2 +- + drivers/net/ipa/ipa_mem.c | 6 +- + drivers/net/wireless/ath/ath10k/snoc.c | 2 +- + drivers/net/wireless/ath/ath11k/ahb.c | 4 +- + drivers/of/address.c | 41 ++ + drivers/remoteproc/remoteproc_core.c | 5 +- + drivers/vfio/vfio_iommu_type1.c | 9 +- + drivers/vhost/vdpa.c | 2 +- + include/linux/iommu.h | 39 +- + include/linux/of_address.h | 2 + + include/linux/of_iommu.h | 8 + + include/trace/events/iommu.h | 7 - + 50 files changed, 1118 insertions(+), 539 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 (8da765cca292 dt-bindings: vendor-prefixes: document lineartechnology) +$ 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 Documentation/devicetree/bindings/display/msm/dp-controller.yaml +Auto-merging Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging Makefile +Resolved 'Documentation/devicetree/bindings/mmc/nvidia,tegra20-sdhci.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 19592f2c7a8f] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/clock/socionext,uniphier-clock.yaml | 39 +---- + .../bindings/display/msm/dp-controller.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-dc.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-dsi.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-epp.yaml | 3 +- + .../display/tegra/nvidia,tegra20-gr2d.yaml | 3 +- + .../display/tegra/nvidia,tegra20-gr3d.yaml | 3 +- + .../display/tegra/nvidia,tegra20-hdmi.yaml | 3 +- + .../display/tegra/nvidia,tegra20-host1x.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-mpe.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-tvo.yaml | 3 +- + .../bindings/display/tegra/nvidia,tegra20-vi.yaml | 3 +- + .../bindings/fuse/nvidia,tegra20-fuse.yaml | 3 +- + .../devicetree/bindings/i2c/i2c-synquacer.txt | 29 ---- + .../bindings/i2c/qcom,i2c-geni-qcom.yaml | 2 + + .../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/mmc/nvidia,tegra20-sdhci.yaml | 3 +- + .../bindings/nvmem/socionext,uniphier-efuse.yaml | 101 ++++++------- + .../bindings/pci/rockchip,rk3399-pcie-common.yaml | 69 +++++++++ + .../bindings/pci/rockchip,rk3399-pcie-ep.yaml | 68 +++++++++ + .../bindings/pci/rockchip,rk3399-pcie.yaml | 132 +++++++++++++++++ + .../devicetree/bindings/pci/rockchip-pcie-ep.txt | 62 -------- + .../devicetree/bindings/pci/rockchip-pcie-host.txt | 135 ----------------- + .../devicetree/bindings/perf/riscv,pmu.yaml | 161 +++++++++++++++++++++ + .../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 ++- + .../devicetree/bindings/power/power-domain.yaml | 3 - + .../bindings/pwm/nvidia,tegra20-pwm.yaml | 3 +- + .../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 | 114 +++++++++++++++ + .../soc/socionext/socionext,uniphier-sysctrl.yaml | 104 +++++++++++++ + .../thermal/socionext,uniphier-thermal.yaml | 15 +- + .../devicetree/bindings/ufs/qcom,ufs.yaml | 3 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + .../bindings/watchdog/socionext,uniphier-wdt.yaml | 10 +- + MAINTAINERS | 5 +- + Makefile | 9 +- + drivers/of/base.c | 3 +- + drivers/of/irq.c | 12 +- + drivers/of/overlay.c | 2 +- + include/dt-bindings/gpio/gpio.h | 2 +- + 56 files changed, 1427 insertions(+), 565 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/pci/rockchip,rk3399-pcie-common.yaml + create mode 100644 Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie-ep.yaml + create mode 100644 Documentation/devicetree/bindings/pci/rockchip,rk3399-pcie.yaml + delete mode 100644 Documentation/devicetree/bindings/pci/rockchip-pcie-ep.txt + delete mode 100644 Documentation/devicetree/bindings/pci/rockchip-pcie-host.txt + create mode 100644 Documentation/devicetree/bindings/perf/riscv,pmu.yaml + create mode 100644 Documentation/devicetree/bindings/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 (9fac79ef2865 Merge branch 'next/dt64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-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 +++- + .../devicetree/bindings/pinctrl/qcom,pmic-mpp.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/alpine.dtsi | 4 ++-- + arch/arm/boot/dts/axm55xx.dtsi | 8 +++---- + arch/arm/boot/dts/cx92755.dtsi | 6 ++--- + arch/arm/boot/dts/dm814x.dtsi | 6 ++--- + arch/arm/boot/dts/dm816x.dtsi | 6 ++--- + arch/arm/boot/dts/integrator.dtsi | 4 ++-- + arch/arm/boot/dts/integratorap-im-pd1.dts | 4 ++-- + arch/arm/boot/dts/integratorap.dts | 4 ++-- + arch/arm/boot/dts/integratorcp.dts | 4 ++-- + arch/arm/boot/dts/moxart.dtsi | 2 +- + arch/arm/boot/dts/mstar-v7.dtsi | 2 +- + arch/arm/boot/dts/stih418-b2264.dts | 2 +- + arch/arm/boot/dts/versatile-ab.dts | 6 ++--- + arch/arm/boot/dts/versatile-pb.dts | 2 +- + arch/arm/boot/dts/vexpress-v2m.dtsi | 8 +++---- + arch/arm64/boot/dts/amazon/alpine-v2.dtsi | 4 ---- + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 1 - + arch/arm64/boot/dts/apm/apm-storm.dtsi | 4 ---- + 54 files changed, 181 insertions(+), 90 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 (44eb7d6da222 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 +Auto-merging drivers/spi/Kconfig +Auto-merging drivers/spi/spidev.c +Merge made by the 'ort' strategy. + .../bindings/spi/allwinner,sun4i-a10-spi.yaml | 2 +- + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 2 +- + .../bindings/spi/amlogic,meson-gx-spicc.yaml | 32 +-- + .../bindings/spi/amlogic,meson6-spifc.yaml | 28 +-- + .../bindings/spi/aspeed,ast2600-fmc.yaml | 26 +-- + .../devicetree/bindings/spi/brcm,spi-bcm-qspi.yaml | 156 ++++++------- + .../devicetree/bindings/spi/cdns,qspi-nor.yaml | 36 +-- + .../devicetree/bindings/spi/cdns,xspi.yaml | 6 +- + .../devicetree/bindings/spi/fsl,spi-fsl-qspi.yaml | 2 +- + .../devicetree/bindings/spi/fsl-imx-cspi.yaml | 2 +- + .../bindings/spi/mediatek,spi-mt65xx.yaml | 2 +- + .../bindings/spi/mediatek,spi-slave-mt27xx.yaml | 2 +- + .../bindings/spi/mikrotik,rb4xx-spi.yaml | 2 +- + .../devicetree/bindings/spi/mxicy,mx25f0a-spi.yaml | 2 +- + Documentation/devicetree/bindings/spi/mxs-spi.yaml | 2 +- + .../bindings/spi/nvidia,tegra210-quad.yaml | 44 ++-- + .../bindings/spi/qcom,spi-qcom-qspi.yaml | 6 +- + .../devicetree/bindings/spi/realtek,rtl-spi.yaml | 2 +- + .../devicetree/bindings/spi/renesas,rspi.yaml | 22 +- + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 2 +- + .../devicetree/bindings/spi/spi-cadence.yaml | 2 +- + .../devicetree/bindings/spi/spi-fsl-lpspi.yaml | 2 +- + .../devicetree/bindings/spi/spi-gpio.yaml | 4 +- + Documentation/devicetree/bindings/spi/spi-mux.yaml | 4 +- + .../devicetree/bindings/spi/spi-nxp-fspi.yaml | 2 +- + .../bindings/spi/spi-peripheral-props.yaml | 10 + + .../devicetree/bindings/spi/spi-pl022.yaml | 18 +- + .../devicetree/bindings/spi/spi-rockchip.yaml | 2 +- + .../devicetree/bindings/spi/spi-sifive.yaml | 6 +- + .../bindings/spi/spi-sunplus-sp7021.yaml | 6 +- + .../devicetree/bindings/spi/spi-xilinx.yaml | 2 +- + .../devicetree/bindings/spi/spi-zynqmp-qspi.yaml | 2 +- + .../devicetree/bindings/spi/sprd,spi-adi.yaml | 5 +- + .../devicetree/bindings/spi/st,stm32-qspi.yaml | 2 +- + .../devicetree/bindings/spi/st,stm32-spi.yaml | 25 +- + .../devicetree/bindings/spi/xlnx,zynq-qspi.yaml | 2 +- + .../devicetree/bindings/trivial-devices.yaml | 14 ++ + drivers/spi/Kconfig | 2 +- + drivers/spi/atmel-quadspi.c | 8 +- + 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-at91-usart.c | 40 ++-- + drivers/spi/spi-ath79.c | 40 ++-- + drivers/spi/spi-atmel.c | 254 ++++++++++----------- + 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 | 12 +- + include/linux/spi/altera.h | 4 +- + 53 files changed, 732 insertions(+), 569 deletions(-) +Merging tip/master (610b3c408ab5 Merge branch into tip/master: 'x86/vdso') +$ 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 Documentation/admin-guide/kernel-parameters.txt +Auto-merging Documentation/scheduler/index.rst +Auto-merging MAINTAINERS +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/arm64/kernel/vmlinux.lds.S +Auto-merging arch/s390/kernel/idle.c +Auto-merging arch/s390/kernel/perf_cpum_cf.c +Auto-merging arch/s390/kernel/perf_cpum_sf.c +Auto-merging arch/s390/kernel/perf_pai_ext.c +Auto-merging arch/s390/kernel/vmlinux.lds.S +Auto-merging arch/x86/kernel/process.c +Auto-merging drivers/acpi/processor_idle.c +Auto-merging drivers/base/power/runtime.c +Auto-merging drivers/clk/clk.c +Auto-merging drivers/idle/intel_idle.c +Auto-merging fs/exec.c +Auto-merging include/linux/compiler_types.h +Auto-merging init/Kconfig +Auto-merging kernel/exit.c +Auto-merging kernel/printk/printk.c +Auto-merging kernel/trace/bpf_trace.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 4c0beddcebbe] 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/admin-guide/hw-vuln/spectre.rst | 6 +- + Documentation/admin-guide/kernel-parameters.txt | 8 +- + 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 +- + Documentation/x86/amd-memory-encryption.rst | 36 + + Documentation/x86/resctrl.rst | 147 ++- + MAINTAINERS | 2 + + 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 | 6 +- + arch/arm64/kernel/idle.c | 1 - + arch/arm64/kernel/smp.c | 4 +- + arch/arm64/kernel/suspend.c | 12 +- + 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/powerpc/perf/core-book3s.c | 3 +- + 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/perf_cpum_cf.c | 4 +- + arch/s390/kernel/perf_cpum_sf.c | 3 +- + arch/s390/kernel/perf_pai_crypto.c | 4 +- + arch/s390/kernel/perf_pai_ext.c | 4 +- + 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/Kconfig | 6 +- + arch/x86/Makefile | 2 +- + arch/x86/boot/compressed/head_32.S | 2 +- + arch/x86/boot/compressed/head_64.S | 2 +- + arch/x86/boot/compressed/ident_map_64.c | 6 + + arch/x86/boot/compressed/misc.c | 18 +- + arch/x86/boot/compressed/misc.h | 2 + + arch/x86/boot/compressed/sev.c | 70 ++ + 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/entry/vdso/vdso2c.h | 6 + + arch/x86/entry/vdso/vdso32-setup.c | 9 - + arch/x86/entry/vdso/vma.c | 19 +- + arch/x86/events/amd/brs.c | 13 +- + arch/x86/events/amd/core.c | 6 +- + arch/x86/events/amd/ibs.c | 9 +- + arch/x86/events/intel/core.c | 199 +++- + arch/x86/events/intel/ds.c | 98 +- + arch/x86/events/intel/lbr.c | 4 +- + arch/x86/events/intel/uncore.c | 34 +- + arch/x86/events/intel/uncore.h | 4 + + arch/x86/events/intel/uncore_discovery.c | 60 +- + arch/x86/events/intel/uncore_discovery.h | 14 +- + arch/x86/events/intel/uncore_snbep.c | 158 ++- + arch/x86/events/perf_event.h | 23 +- + arch/x86/include/asm/acpi.h | 8 + + arch/x86/include/asm/alternative.h | 132 ++- + arch/x86/include/asm/asm-prototypes.h | 1 + + arch/x86/include/asm/cpufeature.h | 7 +- + arch/x86/include/asm/cpufeatures.h | 15 +- + arch/x86/include/asm/disabled-features.h | 3 +- + arch/x86/include/asm/fpu/sched.h | 2 +- + arch/x86/include/asm/fpu/types.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 | 31 + + 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/processor.h | 4 +- + arch/x86/include/asm/required-features.h | 3 +- + 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/vdso.h | 2 +- + arch/x86/include/asm/xen/hypercall.h | 2 +- + arch/x86/include/uapi/asm/svm.h | 6 + + arch/x86/kernel/Makefile | 1 - + arch/x86/kernel/acpi/boot.c | 35 +- + arch/x86/kernel/alternative.c | 14 +- + arch/x86/kernel/cpu/amd.c | 2 +- + arch/x86/kernel/cpu/bugs.c | 33 +- + arch/x86/kernel/cpu/common.c | 75 +- + arch/x86/kernel/cpu/cpu.h | 2 - + arch/x86/kernel/cpu/cpuid-deps.c | 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/microcode/core.c | 26 +- + arch/x86/kernel/cpu/microcode/intel.c | 44 +- + arch/x86/kernel/cpu/resctrl/core.c | 54 +- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 13 +- + arch/x86/kernel/cpu/resctrl/internal.h | 28 + + arch/x86/kernel/cpu/resctrl/monitor.c | 30 +- + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 307 ++++- + arch/x86/kernel/cpu/scattered.c | 2 + + arch/x86/kernel/cpu/tsx.c | 1 + + arch/x86/kernel/e820.c | 6 +- + arch/x86/kernel/fpu/context.h | 2 +- + arch/x86/kernel/fpu/core.c | 6 +- + arch/x86/kernel/i8259.c | 1 + + arch/x86/kernel/irqinit.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/kvm/cpuid.c | 41 +- + arch/x86/kvm/reverse_cpuid.h | 1 + + arch/x86/kvm/svm/svm.c | 3 + + arch/x86/kvm/x86.c | 3 + + 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/mm/pat/memtype.c | 4 +- + arch/x86/mm/tlb.c | 2 +- + arch/x86/pci/xen.c | 2 + + 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 - + block/blk-mq-cpumap.c | 63 +- + drivers/acpi/processor_idle.c | 28 +- + drivers/acpi/sleep.c | 6 +- + 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 | 15 +- + drivers/cpuidle/cpuidle-psci.c | 22 +- + 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/firmware/psci/psci.c | 11 + + 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 | 50 +- + include/linux/cpumask.h | 4 +- + include/linux/group_cpus.h | 14 + + include/linux/mm.h | 25 + + include/linux/mm_types.h | 43 +- + include/linux/percpu-defs.h | 2 +- + include/linux/perf_event.h | 172 ++- + include/linux/resctrl.h | 11 + + 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/events/core.c | 207 ++-- + kernel/exit.c | 7 + + kernel/fork.c | 8 +- + kernel/irq/affinity.c | 405 +------ + kernel/irq/irqdomain.c | 2 +- + kernel/irq/manage.c | 5 +- + kernel/irq/msi.c | 6 +- + kernel/locking/qspinlock.c | 4 +- + kernel/locking/rwsem.c | 87 +- + 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 | 185 ++- + 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/bpf_trace.c | 6 +- + kernel/trace/trace.c | 3 + + kernel/trace/trace_preemptirq.c | 55 +- + lib/Makefile | 2 + + lib/group_cpus.c | 428 +++++++ + 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/Documentation/objtool.txt | 8 + + tools/objtool/arch/x86/include/arch/special.h | 6 +- + tools/objtool/check.c | 26 + + .../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 + + 315 files changed, 9228 insertions(+), 6635 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 include/linux/group_cpus.h + create mode 100644 lib/group_cpus.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 (e09903cea09e clocksource/drivers/riscv: Get rid of clocksource_arch_init() callback) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Auto-merging drivers/clocksource/Kconfig +Merge made by the 'ort' strategy. + .../devicetree/bindings/timer/riscv,timer.yaml | 52 ++++++++++++++++++++++ + .../bindings/timer/rockchip,rk-timer.yaml | 1 + + arch/riscv/Kconfig | 1 - + arch/riscv/kernel/time.c | 10 +---- + drivers/clocksource/Kconfig | 2 +- + drivers/clocksource/sh_cmt.c | 7 +-- + drivers/clocksource/timer-riscv.c | 17 ++++++- + 7 files changed, 73 insertions(+), 17 deletions(-) + create mode 100644 Documentation/devicetree/bindings/timer/riscv,timer.yaml +Merging edac/edac-for-next (4c5be17ae445 Merge branch 'edac-drivers' into edac-for-next) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging MAINTAINERS +Auto-merging drivers/edac/skx_common.c +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/i10nm_base.c | 357 +++++++++++++--- + drivers/edac/qcom_edac.c | 7 + + drivers/edac/skx_common.c | 76 ++-- + drivers/edac/skx_common.h | 61 ++- + drivers/edac/zynqmp_edac.c | 467 +++++++++++++++++++++ + 9 files changed, 925 insertions(+), 104 deletions(-) + 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 (d0df85c4fd09 tick/nohz: Fix cpu_is_hotpluggable() by checking with nohz subsystem) +$ 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 arch/x86/Kconfig +Auto-merging drivers/net/Kconfig +Auto-merging fs/locks.c +Auto-merging init/Kconfig +Auto-merging kernel/sched/core.c +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + 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 | 29 +- + 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/base/cpu.c | 3 +- + drivers/clocksource/acpi_pm.c | 6 +- + 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/linux/tick.h | 2 + + 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/rcu/Kconfig | 3 - + kernel/rcu/Kconfig.debug | 15 +- + kernel/rcu/rcu.h | 45 ++ + kernel/rcu/rcu_segcblist.c | 2 +- + kernel/rcu/rcu_segcblist.h | 2 + + kernel/rcu/rcutorture.c | 240 +++++++- + 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 | 673 ++++++++++++--------- + 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 | 249 +------- + kernel/time/Kconfig | 18 +- + kernel/time/clocksource.c | 83 ++- + kernel/time/tick-sched.c | 16 +- + kernel/torture.c | 4 +- + lib/Kconfig.debug | 20 + + lib/nmi_backtrace.c | 2 + + mm/Kconfig | 1 - + tools/include/nolibc/.gitignore | 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 | 6 + + 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 | 17 +- + 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/bin/srcu_lockdep.sh | 73 +++ + .../selftests/rcutorture/configs/rcu/TREE01 | 1 + + .../selftests/rcutorture/configs/rcu/TREE04 | 1 + + .../selftests/rcutorture/doc/TREE_RCU-kconfig.txt | 4 - + 134 files changed, 4146 insertions(+), 1490 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/.gitignore + 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 + create mode 100755 tools/testing/selftests/rcutorture/bin/srcu_lockdep.sh +Merging kvm/next (7cb79f433e75 KVM: PPC: Fix refactoring goof in kvmppc_e500mc_init()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Auto-merging arch/arm64/kvm/Kconfig +Auto-merging arch/mips/kvm/Kconfig +Auto-merging arch/riscv/kvm/Kconfig +Auto-merging arch/s390/kvm/interrupt.c +Auto-merging arch/x86/kvm/Kconfig +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/reverse_cpuid.h +CONFLICT (content): Merge conflict in arch/x86/kvm/reverse_cpuid.h +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +Resolved 'arch/x86/kvm/reverse_cpuid.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a3fa4e1df131] Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/locking.rst | 25 +- + Documentation/virt/kvm/x86/errata.rst | 11 + + arch/arm64/include/asm/kvm_host.h | 15 +- + arch/arm64/include/asm/kvm_mmu.h | 4 +- + arch/arm64/kvm/Kconfig | 1 + + arch/arm64/kvm/arch_timer.c | 29 +- + arch/arm64/kvm/arm.c | 93 ++-- + arch/arm64/kvm/mmu.c | 12 +- + arch/arm64/kvm/reset.c | 8 +- + arch/arm64/kvm/sys_regs.c | 6 +- + arch/arm64/kvm/vgic/vgic-init.c | 19 +- + arch/arm64/kvm/vmid.c | 6 +- + arch/mips/include/asm/kvm_host.h | 3 +- + arch/mips/kvm/Kconfig | 1 + + arch/mips/kvm/Makefile | 2 +- + arch/mips/kvm/callback.c | 14 - + arch/mips/kvm/mips.c | 34 +- + arch/mips/kvm/vz.c | 7 +- + arch/powerpc/include/asm/kvm_host.h | 3 - + arch/powerpc/include/asm/kvm_ppc.h | 1 - + arch/powerpc/kvm/book3s.c | 12 +- + arch/powerpc/kvm/booke.c | 2 +- + arch/powerpc/kvm/e500.c | 6 +- + arch/powerpc/kvm/e500mc.c | 8 +- + arch/powerpc/kvm/powerpc.c | 20 - + arch/riscv/include/asm/kvm_host.h | 7 +- + arch/riscv/kvm/Kconfig | 1 + + arch/riscv/kvm/main.c | 23 +- + arch/riscv/kvm/mmu.c | 12 +- + arch/riscv/kvm/vmid.c | 4 +- + arch/s390/include/asm/kvm_host.h | 1 - + arch/s390/kvm/interrupt.c | 2 +- + arch/s390/kvm/kvm-s390.c | 84 ++-- + arch/s390/kvm/kvm-s390.h | 2 +- + arch/s390/kvm/pci.c | 2 +- + arch/s390/kvm/pci.h | 2 +- + arch/x86/include/asm/hyperv-tlfs.h | 3 + + arch/x86/include/asm/kvm-x86-ops.h | 2 +- + arch/x86/include/asm/kvm_host.h | 74 +-- + arch/x86/kernel/cpu/mshyperv.c | 2 +- + arch/x86/kvm/Kconfig | 1 + + arch/x86/kvm/cpuid.c | 12 +- + arch/x86/kvm/debugfs.c | 2 + + arch/x86/kvm/emulate.c | 1 + + arch/x86/kvm/hyperv.c | 20 + + arch/x86/kvm/hyperv.h | 27 ++ + arch/x86/kvm/i8254.c | 4 +- + arch/x86/kvm/i8259.c | 4 +- + arch/x86/kvm/ioapic.c | 1 + + arch/x86/kvm/irq.c | 1 + + arch/x86/kvm/irq_comm.c | 7 +- + arch/x86/kvm/kvm_onhyperv.c | 1 + + arch/x86/kvm/lapic.c | 327 ++++++++++---- + arch/x86/kvm/lapic.h | 2 + + arch/x86/kvm/mmu.h | 6 +- + arch/x86/kvm/mmu/mmu.c | 277 +++++++----- + arch/x86/kvm/mmu/mmu_internal.h | 8 +- + arch/x86/kvm/mmu/page_track.c | 1 + + arch/x86/kvm/mmu/paging_tmpl.h | 12 +- + arch/x86/kvm/mmu/spte.c | 4 +- + arch/x86/kvm/mmu/spte.h | 4 +- + arch/x86/kvm/mmu/tdp_iter.c | 1 + + arch/x86/kvm/mmu/tdp_mmu.c | 14 +- + arch/x86/kvm/mmu/tdp_mmu.h | 25 +- + arch/x86/kvm/mtrr.c | 1 + + arch/x86/kvm/pmu.c | 1 + + arch/x86/kvm/reverse_cpuid.h | 7 + + arch/x86/kvm/smm.c | 1 + + arch/x86/kvm/svm/avic.c | 372 +++++++-------- + arch/x86/kvm/svm/nested.c | 4 +- + arch/x86/kvm/svm/pmu.c | 2 + + arch/x86/kvm/svm/sev.c | 1 + + arch/x86/kvm/svm/svm.c | 97 ++-- + arch/x86/kvm/svm/svm.h | 27 +- + arch/x86/kvm/svm/svm_onhyperv.c | 1 + + arch/x86/kvm/svm/svm_onhyperv.h | 4 +- + arch/x86/kvm/vmx/capabilities.h | 4 +- + arch/x86/kvm/vmx/hyperv.c | 87 +++- + arch/x86/kvm/vmx/hyperv.h | 97 +++- + arch/x86/kvm/vmx/nested.c | 3 +- + arch/x86/kvm/vmx/pmu_intel.c | 5 +- + arch/x86/kvm/vmx/posted_intr.c | 2 + + arch/x86/kvm/vmx/sgx.c | 5 +- + arch/x86/kvm/vmx/vmcs12.c | 1 + + arch/x86/kvm/vmx/vmx.c | 499 +++++++++++---------- + arch/x86/kvm/vmx/vmx_ops.h | 4 +- + arch/x86/kvm/x86.c | 281 +++++++----- + arch/x86/kvm/xen.c | 1 + + include/kvm/arm_arch_timer.h | 6 +- + include/kvm/arm_vgic.h | 4 + + include/linux/cpuhotplug.h | 5 +- + include/linux/kvm_host.h | 13 +- + .../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 +- + virt/kvm/Kconfig | 3 + + virt/kvm/kvm_main.c | 297 ++++++------ + 99 files changed, 2112 insertions(+), 1550 deletions(-) + delete mode 100644 arch/mips/kvm/callback.c +Merging kvm-arm/next (7e819b68a4f0 Merge remote-tracking branch 'oupton/kvmarm/next' 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 +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging MAINTAINERS +Auto-merging arch/arm64/include/asm/kvm_arm.h +Auto-merging arch/arm64/include/asm/kvm_emulate.h +Auto-merging arch/arm64/include/asm/sysreg.h +Auto-merging arch/arm64/kernel/cacheinfo.c +Auto-merging arch/arm64/kvm/fpsimd.c +Auto-merging arch/arm64/kvm/mmu.c +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging arch/arm64/kvm/vgic/vgic-v3.c +Auto-merging arch/arm64/tools/sysreg +Auto-merging arch/x86/kvm/x86.c +Auto-merging drivers/irqchip/irq-apple-aic.c +Merge made by the 'ort' strategy. + arch/arm64/include/asm/cache.h | 9 + + arch/arm64/include/asm/kvm_arm.h | 4 +- + arch/arm64/include/asm/kvm_emulate.h | 4 - + arch/arm64/include/asm/kvm_host.h | 6 +- + arch/arm64/include/asm/kvm_pgtable.h | 8 + + arch/arm64/include/asm/sysreg.h | 1 - + arch/arm64/kernel/cacheinfo.c | 5 - + arch/arm64/kvm/fpsimd.c | 1 + + arch/arm64/kvm/hyp/include/hyp/sysreg-sr.h | 2 - + arch/arm64/kvm/hyp/pgtable.c | 43 ++++- + arch/arm64/kvm/hyp/vhe/switch.c | 2 +- + arch/arm64/kvm/mmu.c | 18 +- + arch/arm64/kvm/reset.c | 1 + + arch/arm64/kvm/sys_regs.c | 275 +++++++++++++++++++---------- + arch/arm64/kvm/vgic/vgic-init.c | 2 +- + arch/arm64/kvm/vgic/vgic-mmio.c | 13 +- + arch/arm64/kvm/vgic/vgic-v3.c | 9 +- + arch/arm64/tools/gen-sysreg.awk | 20 ++- + arch/arm64/tools/sysreg | 17 ++ + drivers/irqchip/irq-apple-aic.c | 55 ++++-- + 20 files changed, 343 insertions(+), 152 deletions(-) +Merging kvms390/next (99b63f55dc51 KVM: s390: remove unused gisa_clear_ipm_gisc() function) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/kvms390/linux.git kvms390/next +Already up to date. +Merging kvm-x86/next (503f0315c977 Merge branches 'apic', 'generic', 'misc', 'mmu', 'pmu', 'selftests', 'svm' and 'vmx' into next) +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging arch/x86/include/asm/cpufeatures.h +CONFLICT (content): Merge conflict in arch/x86/include/asm/cpufeatures.h +Auto-merging arch/x86/kernel/nmi.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/vmx/vmx.c +Auto-merging arch/x86/kvm/x86.c +Auto-merging tools/testing/selftests/kvm/x86_64/xen_shinfo_test.c +Resolved 'arch/x86/include/asm/cpufeatures.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b8b80bbb3b81] Merge branch 'next' of https://github.com/kvm-x86/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/virt/kvm/api.rst | 78 ++++- + arch/x86/include/asm/cpufeatures.h | 3 + + arch/x86/include/asm/idtentry.h | 16 +- + arch/x86/include/asm/kvm_host.h | 23 +- + arch/x86/include/asm/reboot.h | 2 + + arch/x86/include/asm/virtext.h | 16 +- + arch/x86/include/asm/xen/hypervisor.h | 4 +- + arch/x86/include/uapi/asm/kvm.h | 34 +- + arch/x86/kernel/crash.c | 17 +- + arch/x86/kernel/nmi.c | 8 +- + arch/x86/kernel/reboot.c | 88 +++-- + arch/x86/kernel/smp.c | 6 +- + arch/x86/kvm/cpuid.c | 31 +- + arch/x86/kvm/kvm_cache_regs.h | 12 + + arch/x86/kvm/lapic.c | 69 ++-- + arch/x86/kvm/lapic.h | 2 + + arch/x86/kvm/mmu/mmu.c | 45 ++- + arch/x86/kvm/mmu/mmu_internal.h | 14 + + arch/x86/kvm/mmu/paging_tmpl.h | 13 +- + arch/x86/kvm/mmu/spte.c | 6 +- + arch/x86/kvm/mmu/spte.h | 16 +- + arch/x86/kvm/mmu/tdp_iter.c | 11 +- + arch/x86/kvm/mmu/tdp_mmu.c | 6 +- + arch/x86/kvm/pmu.c | 241 +++++++++++-- + arch/x86/kvm/pmu.h | 2 + + arch/x86/kvm/svm/avic.c | 2 +- + arch/x86/kvm/svm/pmu.c | 1 + + arch/x86/kvm/svm/sev.c | 2 +- + arch/x86/kvm/svm/svm.c | 9 +- + arch/x86/kvm/svm/svm.h | 2 +- + arch/x86/kvm/vmx/hyperv.h | 20 +- + arch/x86/kvm/vmx/pmu_intel.c | 1 + + arch/x86/kvm/vmx/vmcs.h | 4 +- + arch/x86/kvm/vmx/vmenter.S | 80 +++-- + arch/x86/kvm/vmx/vmx.c | 106 +++--- + arch/x86/kvm/vmx/vmx.h | 18 +- + arch/x86/kvm/vmx/vmx_ops.h | 2 + + arch/x86/kvm/x86.c | 10 +- + arch/x86/kvm/x86.h | 6 +- + arch/x86/kvm/xen.c | 26 ++ + arch/x86/kvm/xen.h | 7 + + include/linux/kvm_host.h | 4 +- + include/uapi/linux/kvm.h | 1 + + .../selftests/kvm/include/x86_64/processor.h | 30 +- + .../testing/selftests/kvm/kvm_binary_stats_test.c | 10 +- + tools/testing/selftests/kvm/lib/elf.c | 2 + + tools/testing/selftests/kvm/lib/x86_64/processor.c | 46 ++- + .../selftests/kvm/x86_64/fix_hypercall_test.c | 4 +- + .../selftests/kvm/x86_64/mmio_warning_test.c | 2 +- + .../selftests/kvm/x86_64/pmu_event_filter_test.c | 385 ++++++++++++++++++++- + .../vmx_exception_with_invalid_guest_state.c | 2 +- + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 2 +- + 52 files changed, 1173 insertions(+), 374 deletions(-) +Merging xen-tip/linux-next (ca0d80778e48 xen/pvcalls-back: fix permanently masked event channel) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging drivers/xen/pvcalls-back.c +Auto-merging tools/objtool/check.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-hypervisor-xen | 13 +++++ + arch/x86/xen/smp.h | 2 + + arch/x86/xen/smp_pv.c | 17 ++----- + arch/x86/xen/time.c | 38 ++++++++++++++- + arch/x86/xen/xen-head.S | 7 +++ + drivers/xen/events/events_base.c | 9 ++-- + drivers/xen/platform-pci.c | 5 +- + drivers/xen/pvcalls-back.c | 3 +- + drivers/xen/sys-hypervisor.c | 69 +++++++++++++++++++++++++-- + include/xen/events.h | 2 +- + tools/objtool/check.c | 1 + + 11 files changed, 140 insertions(+), 26 deletions(-) +Merging percpu/for-next (b9819165bb45 Merge branch 'for-6.2' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dennis/percpu.git percpu/for-next +Merge made by the 'ort' strategy. +Merging workqueues/for-next (c63a2e52d5e0 workqueue: Fold rebind_worker() within rebind_workers()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Auto-merging include/linux/workqueue.h +Auto-merging kernel/workqueue.c +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 (b7233286202b platform/x86: hp-wmi: Ignore Win-Lock key events) +$ 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 +Auto-merging drivers/platform/x86/acerhdf.c +Merge made by the 'ort' strategy. + .../driver-api/surface_aggregator/client.rst | 12 ++-- + .../driver-api/surface_aggregator/ssh.rst | 36 ++++++----- + drivers/hid/surface-hid/surface_hid.c | 8 +-- + drivers/hid/surface-hid/surface_kbd.c | 8 +-- + drivers/platform/surface/aggregator/bus.c | 6 +- + drivers/platform/surface/aggregator/controller.c | 44 ++++++------- + drivers/platform/surface/aggregator/ssh_msgb.h | 4 +- + .../surface/aggregator/ssh_request_layer.c | 11 ++-- + drivers/platform/surface/aggregator/trace.h | 73 ++++++++++++++++++++-- + drivers/platform/surface/surface_acpi_notify.c | 2 +- + drivers/platform/surface/surface_aggregator_cdev.c | 6 +- + drivers/platform/surface/surface_aggregator_hub.c | 8 +-- + .../platform/surface/surface_aggregator_registry.c | 2 +- + .../platform/surface/surface_aggregator_tabletsw.c | 12 ++-- + drivers/platform/surface/surface_dtx.c | 20 +++--- + drivers/platform/surface/surface_hotplug.c | 13 +--- + .../platform/surface/surface_platform_profile.c | 2 +- + drivers/platform/x86/Kconfig | 1 - + drivers/platform/x86/acerhdf.c | 6 -- + drivers/platform/x86/hp/hp-wmi.c | 2 + + drivers/platform/x86/intel/int1092/intel_sar.c | 15 +++-- + drivers/platform/x86/intel/oaktrail.c | 6 -- + drivers/platform/x86/intel/pmc/tgl.c | 6 +- + drivers/platform/x86/intel/punit_ipc.c | 6 -- + drivers/power/supply/surface_battery.c | 4 +- + drivers/power/supply/surface_charger.c | 2 +- + include/linux/surface_aggregator/controller.h | 60 +++++++++--------- + include/linux/surface_aggregator/device.h | 58 ++++++++--------- + include/linux/surface_aggregator/serial_hub.h | 40 ++++++++---- + 29 files changed, 263 insertions(+), 210 deletions(-) +Merging chrome-platform/for-next (478f32ab4daa platform/chrome: cros_typec_vdm: Fix VDO copy) +$ 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 +Auto-merging include/linux/platform_data/cros_ec_commands.h +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 | 13 +- + drivers/platform/chrome/cros_ec_sysfs.c | 40 ++- + drivers/platform/chrome/cros_ec_typec.c | 115 +++----- + drivers/platform/chrome/cros_ec_typec.h | 85 ++++++ + drivers/platform/chrome/cros_ec_uart.c | 362 +++++++++++++++++++++++++ + drivers/platform/chrome/cros_typec_switch.c | 16 +- + drivers/platform/chrome/cros_typec_vdm.c | 108 ++++++++ + 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, 787 insertions(+), 147 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 (83bb0ba2c46b dt-bindings: leds: Document Bluetooth and WLAN triggers) + 83bb0ba2c46b ("dt-bindings: leds: Document Bluetooth and WLAN triggers") + 84819002e94f ("leds: Remove asic3 driver") +$ 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 +Auto-merging drivers/leds/Kconfig +Auto-merging drivers/leds/Makefile +Merge made by the 'ort' strategy. + drivers/leds/flash/leds-mt6360.c | 38 ++++------------------ + drivers/leds/led-class.c | 1 + + drivers/leds/leds-an30259a.c | 21 +++---------- + drivers/leds/leds-bcm6328.c | 49 ++++++++++++++--------------- + drivers/leds/leds-bcm6358.c | 32 +++++++++---------- + 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-mt6323.c | 30 +++++++++--------- + drivers/leds/leds-pca9532.c | 9 +++--- + drivers/leds/leds-pca955x.c | 26 ++++----------- + drivers/leds/leds-pca963x.c | 6 ++-- + drivers/leds/leds-pm8058.c | 29 ++++++++--------- + drivers/leds/leds-pwm.c | 4 +-- + drivers/leds/leds-syscon.c | 49 ++++++++++++++--------------- + drivers/leds/leds-tca6507.c | 8 ++--- + drivers/leds/leds-tlc591xx.c | 5 ++- + drivers/leds/leds-turris-omnia.c | 5 ++- + drivers/leds/leds.h | 1 - + drivers/leds/simple/simatic-ipc-leds-gpio.c | 2 ++ + include/linux/leds.h | 15 ++++++--- + 35 files changed, 181 insertions(+), 241 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 (0b2a1a3938aa driver core: class: Clear private pointer on registration failures) +$ 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 +Auto-merging fs/kernfs/dir.c +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-kernel-address_bits | 10 ++++ + drivers/base/base.h | 3 +- + drivers/base/bus.c | 68 ++++++---------------- + drivers/base/class.c | 18 ++++-- + drivers/base/core.c | 16 ++--- + drivers/base/dd.c | 34 +++-------- + drivers/base/memory.c | 9 +-- + drivers/base/physical_location.c | 5 +- + drivers/base/platform.c | 14 +++-- + drivers/base/swnode.c | 61 ------------------- + drivers/base/test/property-entry-test.c | 30 +++++----- + drivers/base/transport_class.c | 17 +++++- + drivers/media/pci/intel/ipu3/cio2-bridge.c | 27 +++++++-- + drivers/media/pci/intel/ipu3/cio2-bridge.h | 5 +- + drivers/staging/greybus/audio_codec.c | 6 -- + drivers/tty/serial/arc_uart.c | 7 --- + fs/kernfs/dir.c | 3 - + include/linux/device/bus.h | 56 +++++++++--------- + include/linux/device/driver.h | 1 - + include/linux/platform_device.h | 11 ++++ + include/linux/property.h | 9 +-- + include/linux/transport_class.h | 8 ++- + kernel/ksysfs.c | 9 +++ + lib/kobject.c | 12 +++- + lib/test_firmware.c | 5 +- + 25 files changed, 196 insertions(+), 248 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-kernel-address_bits +Merging usb/usb-next (9e6f4c8b880b usb: typec: tcpm: Remove altmode active state updates) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm/boot/dts/meson8b-odroidc1.dts +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/gadget/udc/Kconfig +Auto-merging drivers/usb/gadget/udc/Makefile +Merge made by the 'ort' strategy. + Documentation/ABI/testing/configfs-usb-gadget | 13 + + .../ABI/testing/sysfs-driver-typec-displayport | 15 + + .../devicetree/bindings/usb/ci-hdrc-usb2.txt | 1 + + .../devicetree/bindings/usb/faraday,fotg210.yaml | 7 +- + .../devicetree/bindings/usb/fsl,imx8mp-dwc3.yaml | 6 + + .../devicetree/bindings/usb/genesys,gl850g.yaml | 1 + + .../devicetree/bindings/usb/gpio-sbu-mux.yaml | 110 + + .../devicetree/bindings/usb/renesas,rzn1-usbf.yaml | 68 + + .../devicetree/bindings/usb/ti,hd3ss3220.yaml | 1 - + .../devicetree/bindings/usb/ti,tps6598x.yaml | 3 + + .../devicetree/bindings/usb/usbmisc-imx.txt | 1 + + .../devicetree/bindings/usb/vialab,vl817.yaml | 69 + + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 8 + + arch/arm/boot/dts/meson8b-odroidc1.dts | 24 +- + .../arm64/boot/dts/amlogic/meson-gxbb-odroidc2.dts | 26 +- + .../arm64/boot/dts/amlogic/meson-sm1-odroid-c4.dts | 36 +- + arch/arm64/configs/defconfig | 1 + + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 15 +- + drivers/phy/tegra/Makefile | 1 + + drivers/phy/tegra/xusb-tegra186.c | 64 +- + drivers/phy/tegra/xusb.c | 6 + + drivers/phy/tegra/xusb.h | 23 + + drivers/usb/cdns3/cdnsp-gadget.c | 2 +- + drivers/usb/cdns3/cdnsp-gadget.h | 4 +- + drivers/usb/cdns3/cdnsp-ring.c | 110 +- + drivers/usb/chipidea/usbmisc_imx.c | 6 - + drivers/usb/core/usb.c | 2 +- + drivers/usb/fotg210/fotg210-core.c | 83 +- + drivers/usb/fotg210/fotg210-hcd.c | 67 +- + drivers/usb/fotg210/fotg210-hcd.h | 1 + + drivers/usb/fotg210/fotg210-udc.c | 161 +- + drivers/usb/fotg210/fotg210-udc.h | 4 +- + drivers/usb/fotg210/fotg210.h | 27 +- + drivers/usb/gadget/composite.c | 102 +- + drivers/usb/gadget/configfs.c | 210 +- + drivers/usb/gadget/function/f_fs.c | 8 +- + drivers/usb/gadget/function/uvc_configfs.c | 29 +- + drivers/usb/gadget/legacy/hid.c | 7 +- + drivers/usb/gadget/udc/Kconfig | 11 + + drivers/usb/gadget/udc/Makefile | 1 + + drivers/usb/gadget/udc/bcm63xx_udc.c | 11 +- + drivers/usb/gadget/udc/fusb300_udc.c | 10 +- + drivers/usb/gadget/udc/renesas_usbf.c | 3406 ++++++++++++++++++++ + drivers/usb/gadget/udc/tegra-xudc.c | 33 +- + drivers/usb/host/ehci-fsl.c | 2 +- + drivers/usb/host/xhci-hub.c | 1 + + drivers/usb/host/xhci-ring.c | 7 +- + drivers/usb/host/xhci-tegra.c | 392 ++- + drivers/usb/host/xhci.c | 2 + + drivers/usb/host/xhci.h | 2 + + drivers/usb/misc/onboard_usb_hub.c | 4 + + drivers/usb/misc/onboard_usb_hub.h | 11 + + drivers/usb/mtu3/mtu3_gadget.c | 3 +- + drivers/usb/mtu3/mtu3_hw_regs.h | 1 + + drivers/usb/mtu3/mtu3_qmu.c | 7 + + drivers/usb/musb/da8xx.c | 4 +- + drivers/usb/typec/altmodes/displayport.c | 12 + + drivers/usb/typec/bus.c | 33 +- + drivers/usb/typec/bus.h | 2 + + drivers/usb/typec/class.c | 15 +- + drivers/usb/typec/hd3ss3220.c | 29 + + drivers/usb/typec/mux/Kconfig | 6 + + drivers/usb/typec/mux/Makefile | 1 + + drivers/usb/typec/mux/gpio-sbu-mux.c | 172 + + drivers/usb/typec/mux/intel_pmc_mux.c | 13 +- + drivers/usb/typec/retimer.h | 2 +- + drivers/usb/typec/tcpm/Makefile | 1 + + drivers/usb/typec/tcpm/maxim_contaminant.c | 387 +++ + drivers/usb/typec/tcpm/tcpci.c | 19 +- + drivers/usb/typec/tcpm/tcpci_maxim.h | 89 + + .../tcpm/{tcpci_maxim.c => tcpci_maxim_core.c} | 53 +- + drivers/usb/typec/tcpm/tcpm.c | 60 +- + drivers/usb/typec/tipd/core.c | 38 + + drivers/usb/typec/ucsi/ucsi.c | 164 +- + drivers/usb/typec/ucsi/ucsi.h | 8 + + include/linux/list.h | 15 + + include/linux/usb.h | 27 +- + include/linux/usb/composite.h | 7 + + include/linux/usb/tcpci.h | 7 + + include/linux/usb/tcpm.h | 8 + + include/linux/usb/webusb.h | 83 + + include/uapi/linux/usb/ch9.h | 16 + + 83 files changed, 6037 insertions(+), 462 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/gpio-sbu-mux.yaml + create mode 100644 Documentation/devicetree/bindings/usb/renesas,rzn1-usbf.yaml + create mode 100644 Documentation/devicetree/bindings/usb/vialab,vl817.yaml + create mode 100644 drivers/usb/gadget/udc/renesas_usbf.c + create mode 100644 drivers/usb/typec/mux/gpio-sbu-mux.c + create mode 100644 drivers/usb/typec/tcpm/maxim_contaminant.c + create mode 100644 drivers/usb/typec/tcpm/tcpci_maxim.h + rename drivers/usb/typec/tcpm/{tcpci_maxim.c => tcpci_maxim_core.c} (93%) + create mode 100644 include/linux/usb/webusb.h +Merging thunderbolt/next (6ce3563520be thunderbolt: Add support for DisplayPort bandwidth allocation mode) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Auto-merging drivers/thunderbolt/tb.c +Auto-merging drivers/thunderbolt/tunnel.c +Merge made by the 'ort' strategy. + drivers/thunderbolt/acpi.c | 13 +- + drivers/thunderbolt/ctl.c | 52 +++- + drivers/thunderbolt/ctl.h | 2 + + drivers/thunderbolt/debugfs.c | 5 +- + drivers/thunderbolt/switch.c | 42 ++-- + drivers/thunderbolt/tb.c | 504 +++++++++++++++++++++++++++++++++++-- + drivers/thunderbolt/tb.h | 39 ++- + drivers/thunderbolt/tb_msgs.h | 11 +- + drivers/thunderbolt/tb_regs.h | 36 +++ + drivers/thunderbolt/tunnel.c | 496 +++++++++++++++++++++++++++++++++--- + drivers/thunderbolt/tunnel.h | 18 ++ + drivers/thunderbolt/usb4.c | 571 ++++++++++++++++++++++++++++++++++++++++++ + 12 files changed, 1695 insertions(+), 94 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 (ed0400ad547c serial: liteuart: Correct error rollback) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging drivers/tty/serial/Kconfig +Auto-merging drivers/video/fbdev/core/fbcon.c +Auto-merging include/linux/console.h +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 12 +- + .../devicetree/bindings/serial/qcom,msm-uart.txt | 25 - + .../devicetree/bindings/serial/qcom,msm-uart.yaml | 56 ++ + .../devicetree/bindings/serial/rs485.yaml | 6 + + Documentation/fpga/dfl.rst | 119 ++++ + arch/arm/include/asm/semihost.h | 30 + + arch/arm64/include/asm/semihost.h | 24 + + arch/riscv/include/asm/semihost.h | 26 + + drivers/char/pcmcia/synclink_cs.c | 18 +- + drivers/fpga/dfl.c | 245 ++++++-- + drivers/fpga/dfl.h | 43 ++ + drivers/ipack/devices/ipoctal.c | 4 +- + drivers/mmc/core/sdio_uart.c | 13 +- + drivers/pps/clients/pps-ldisc.c | 6 +- + drivers/s390/char/con3215.c | 4 +- + drivers/staging/greybus/uart.c | 4 +- + drivers/tty/amiserial.c | 12 +- + drivers/tty/hvc/hvc_console.c | 4 +- + drivers/tty/hvc/hvc_console.h | 2 +- + drivers/tty/hvc/hvc_iucv.c | 6 +- + drivers/tty/moxa.c | 82 +-- + drivers/tty/mxser.c | 11 +- + drivers/tty/n_gsm.c | 16 +- + drivers/tty/serial/8250/8250_dfl.c | 167 ++++++ + drivers/tty/serial/8250/8250_early.c | 4 +- + drivers/tty/serial/8250/8250_port.c | 47 +- + drivers/tty/serial/8250/Kconfig | 12 + + drivers/tty/serial/8250/Makefile | 1 + + drivers/tty/serial/Kconfig | 16 +- + drivers/tty/serial/Makefile | 2 +- + ...earlycon-arm-semihost.c => earlycon-semihost.c} | 25 +- + drivers/tty/serial/earlycon.c | 9 +- + drivers/tty/serial/fsl_lpuart.c | 52 +- + drivers/tty/serial/imx.c | 15 +- + drivers/tty/serial/liteuart.c | 209 ++++--- + drivers/tty/serial/max3100.c | 2 +- + drivers/tty/serial/max310x.c | 3 +- + drivers/tty/serial/msm_serial.c | 1 + + drivers/tty/serial/pic32_uart.c | 2 + + drivers/tty/serial/qcom_geni_serial.c | 636 ++++++++++++++------- + drivers/tty/serial/sc16is7xx.c | 51 +- + drivers/tty/serial/sccnxp.c | 12 +- + drivers/tty/serial/serial-tegra.c | 7 +- + drivers/tty/serial/serial_core.c | 77 +-- + drivers/tty/serial/stm32-usart.c | 6 +- + drivers/tty/serial/sunhv.c | 8 +- + drivers/tty/serial/ucc_uart.c | 2 + + drivers/tty/synclink_gt.c | 21 +- + drivers/tty/tty_io.c | 8 +- + drivers/tty/tty_ioctl.c | 8 +- + drivers/tty/tty_port.c | 22 +- + drivers/tty/vt/vt.c | 310 +++++----- + drivers/usb/class/cdc-acm.c | 4 +- + drivers/usb/serial/console.c | 2 +- + drivers/usb/serial/usb-serial.c | 6 +- + drivers/video/console/newport_con.c | 9 +- + drivers/video/console/sticon.c | 9 +- + drivers/video/console/vgacon.c | 8 +- + drivers/video/fbdev/core/fbcon.c | 35 +- + include/linux/console.h | 5 +- + include/linux/console_struct.h | 3 +- + include/linux/dfl.h | 8 + + include/linux/qcom-geni-se.h | 3 + + include/linux/serial.h | 10 + + include/linux/serial_core.h | 9 +- + include/linux/tty.h | 2 +- + include/linux/tty_ldisc.h | 4 +- + include/linux/tty_port.h | 10 +- + include/uapi/linux/kd.h | 10 +- + include/uapi/linux/serial_reg.h | 5 + + net/bluetooth/rfcomm/tty.c | 2 +- + 71 files changed, 1761 insertions(+), 886 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/serial/qcom,msm-uart.txt + create mode 100644 Documentation/devicetree/bindings/serial/qcom,msm-uart.yaml + create mode 100644 arch/arm/include/asm/semihost.h + create mode 100644 arch/arm64/include/asm/semihost.h + create mode 100644 arch/riscv/include/asm/semihost.h + create mode 100644 drivers/tty/serial/8250/8250_dfl.c + rename drivers/tty/serial/{earlycon-arm-semihost.c => earlycon-semihost.c} (57%) +Merging char-misc/char-misc-next (99ba2ad1db62 Merge 6.2-rc5 into char-misc-next) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Auto-merging MAINTAINERS +Auto-merging drivers/android/binderfs.c +Auto-merging drivers/char/pcmcia/synclink_cs.c +Auto-merging drivers/ipack/devices/ipoctal.c +Auto-merging scripts/tags.sh +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-driver-uacce | 18 ++ + .../ABI/testing/sysfs-driver-xilinx-tmr-manager | 16 ++ + .../devicetree/bindings/misc/xlnx,tmr-inject.yaml | 47 +++++ + .../devicetree/bindings/misc/xlnx,tmr-manager.yaml | 47 +++++ + Documentation/kbuild/kbuild.rst | 7 + + MAINTAINERS | 13 ++ + drivers/accessibility/speakup/main.c | 2 +- + drivers/android/binder.c | 65 +++--- + drivers/android/binder_internal.h | 3 +- + drivers/android/binderfs.c | 4 +- + drivers/bus/simple-pm-bus.c | 46 +++++ + drivers/char/applicom.c | 5 +- + drivers/char/pcmcia/cm4000_cs.c | 6 +- + drivers/char/pcmcia/synclink_cs.c | 22 +-- + drivers/char/virtio_console.c | 5 +- + drivers/comedi/Kconfig | 2 +- + drivers/comedi/comedi_fops.c | 1 + + drivers/crypto/hisilicon/qm.c | 169 ++++++++++++++-- + drivers/firmware/dmi-sysfs.c | 14 +- + drivers/firmware/stratix10-svc.c | 25 ++- + drivers/ipack/devices/ipoctal.c | 2 +- + drivers/misc/Kconfig | 20 ++ + drivers/misc/Makefile | 2 + + drivers/misc/eeprom/at25.c | 8 +- + drivers/misc/eeprom/idt_89hpesx.c | 10 +- + drivers/misc/enclosure.c | 2 +- + drivers/misc/fastrpc.c | 13 +- + drivers/misc/genwqe/card_utils.c | 6 +- + drivers/misc/mei/bus-fixup.c | 8 +- + drivers/misc/mei/hdcp/mei_hdcp.c | 4 +- + drivers/misc/mei/pxp/mei_pxp.c | 4 +- + drivers/misc/sgi-gru/grukservices.c | 8 +- + drivers/misc/uacce/uacce.c | 50 +++++ + drivers/misc/vmw_vmci/vmci_host.c | 2 + + drivers/misc/xilinx_tmr_inject.c | 171 ++++++++++++++++ + drivers/misc/xilinx_tmr_manager.c | 220 +++++++++++++++++++++ + drivers/most/Kconfig | 2 +- + drivers/most/most_cdev.c | 5 +- + drivers/most/most_snd.c | 10 +- + drivers/most/most_usb.c | 6 +- + drivers/parport/parport_pc.c | 125 ++++++++---- + include/linux/hisi_acc_qm.h | 15 ++ + include/linux/parport_pc.h | 3 + + include/linux/uacce.h | 12 ++ + include/uapi/linux/android/binder.h | 7 +- + scripts/tags.sh | 7 + + 46 files changed, 1084 insertions(+), 155 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-driver-xilinx-tmr-manager + create mode 100644 Documentation/devicetree/bindings/misc/xlnx,tmr-inject.yaml + create mode 100644 Documentation/devicetree/bindings/misc/xlnx,tmr-manager.yaml + create mode 100644 drivers/misc/xilinx_tmr_inject.c + create mode 100644 drivers/misc/xilinx_tmr_manager.c +Merging accel/habanalabs-next (4dc7c58023e8 habanalabs: Fix list of /sys/class/habanalabs/hl<n>/status) + 24444a99331a ("docs: accel: Fix debugfs path") +$ 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 Documentation/accel/introduction.rst +CONFLICT (content): Merge conflict in Documentation/accel/introduction.rst +Auto-merging MAINTAINERS +Auto-merging drivers/Makefile +Auto-merging drivers/misc/Kconfig +Auto-merging drivers/misc/Makefile +Recorded preimage for 'Documentation/accel/introduction.rst' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'Documentation/accel/introduction.rst'. +[master 1cfd5cd2bea9] Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-driver-habanalabs | 14 +- + Documentation/accel/introduction.rst | 6 +- + MAINTAINERS | 7 +- + drivers/Makefile | 2 +- + drivers/accel/Kconfig | 1 + + drivers/accel/Makefile | 1 + + 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 | 133 ++- + .../{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 | 109 +- + .../habanalabs/common/firmware_if.c | 189 ++- + .../{misc => accel}/habanalabs/common/habanalabs.h | 122 +- + .../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 | 38 +- + 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 | 174 +++ + drivers/accel/habanalabs/common/security.h | 163 +++ + .../{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 | 1175 +++++++++++-------- + .../{misc => accel}/habanalabs/gaudi2/gaudi2P.h | 39 +- + .../habanalabs/gaudi2/gaudi2_coresight.c | 10 +- + .../habanalabs/gaudi2/gaudi2_coresight_regs.h | 0 + .../habanalabs/gaudi2/gaudi2_masks.h | 0 + .../habanalabs/gaudi2/gaudi2_security.c | 37 +- + 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/gaudi2/gaudi2_special_blocks.h | 157 +++ + .../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/drm/drm_accel.h | 3 +- + include/trace/events/habanalabs.h | 75 ++ + .../{misc/habanalabs.h => drm/habanalabs_accel.h} | 33 +- + 439 files changed, 3947 insertions(+), 1153 deletions(-) + 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 (96%) + 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 (95%) + rename drivers/{misc => accel}/habanalabs/common/firmware_if.c (93%) + 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 (94%) + 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 (76%) + create mode 100644 drivers/accel/habanalabs/common/security.h + 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 (92%) + rename drivers/{misc => accel}/habanalabs/gaudi2/gaudi2P.h (95%) + 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%) + create mode 100644 drivers/accel/habanalabs/include/gaudi2/gaudi2_special_blocks.h + 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 (a646ca099b18 coresight: perf: Output trace id only once) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Auto-merging MAINTAINERS +Auto-merging kernel/events/core.c +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-bus-coresight-devices-etm3x | 2 +- + .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 13 + + .../testing/sysfs-bus-coresight-devices-ultra_smb | 31 + + .../bindings/arm/qcom,coresight-tpda.yaml | 129 ++++ + .../bindings/arm/qcom,coresight-tpdm.yaml | 93 +++ + Documentation/trace/coresight/coresight-tpda.rst | 52 ++ + Documentation/trace/coresight/coresight-tpdm.rst | 45 ++ + Documentation/trace/coresight/ultrasoc-smb.rst | 83 +++ + MAINTAINERS | 5 + + drivers/hwtracing/coresight/Kconfig | 35 ++ + drivers/hwtracing/coresight/Makefile | 5 +- + drivers/hwtracing/coresight/coresight-core.c | 87 +-- + drivers/hwtracing/coresight/coresight-cti-core.c | 23 +- + drivers/hwtracing/coresight/coresight-cti-sysfs.c | 15 +- + drivers/hwtracing/coresight/coresight-cti.h | 2 +- + drivers/hwtracing/coresight/coresight-etm-perf.c | 31 + + drivers/hwtracing/coresight/coresight-etm-perf.h | 2 + + drivers/hwtracing/coresight/coresight-etm.h | 3 +- + drivers/hwtracing/coresight/coresight-etm3x-core.c | 93 +-- + .../hwtracing/coresight/coresight-etm3x-sysfs.c | 27 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 91 ++- + .../hwtracing/coresight/coresight-etm4x-sysfs.c | 27 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 3 + + drivers/hwtracing/coresight/coresight-stm.c | 49 +- + drivers/hwtracing/coresight/coresight-tpda.c | 211 +++++++ + drivers/hwtracing/coresight/coresight-tpda.h | 35 ++ + drivers/hwtracing/coresight/coresight-tpdm.c | 259 ++++++++ + drivers/hwtracing/coresight/coresight-tpdm.h | 62 ++ + drivers/hwtracing/coresight/coresight-trace-id.c | 297 ++++++++++ + drivers/hwtracing/coresight/coresight-trace-id.h | 156 +++++ + drivers/hwtracing/coresight/ultrasoc-smb.c | 648 +++++++++++++++++++++ + drivers/hwtracing/coresight/ultrasoc-smb.h | 125 ++++ + drivers/hwtracing/ptt/hisi_ptt.c | 10 + + include/linux/coresight-pmu.h | 34 +- + include/linux/coresight.h | 4 +- + kernel/events/core.c | 1 + + 36 files changed, 2592 insertions(+), 196 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-tpdm + create mode 100644 Documentation/ABI/testing/sysfs-bus-coresight-devices-ultra_smb + create mode 100644 Documentation/devicetree/bindings/arm/qcom,coresight-tpda.yaml + create mode 100644 Documentation/devicetree/bindings/arm/qcom,coresight-tpdm.yaml + create mode 100644 Documentation/trace/coresight/coresight-tpda.rst + create mode 100644 Documentation/trace/coresight/coresight-tpdm.rst + create mode 100644 Documentation/trace/coresight/ultrasoc-smb.rst + create mode 100644 drivers/hwtracing/coresight/coresight-tpda.c + create mode 100644 drivers/hwtracing/coresight/coresight-tpda.h + create mode 100644 drivers/hwtracing/coresight/coresight-tpdm.c + create mode 100644 drivers/hwtracing/coresight/coresight-tpdm.h + create mode 100644 drivers/hwtracing/coresight/coresight-trace-id.c + create mode 100644 drivers/hwtracing/coresight/coresight-trace-id.h + create mode 100644 drivers/hwtracing/coresight/ultrasoc-smb.c + create mode 100644 drivers/hwtracing/coresight/ultrasoc-smb.h +Merging fpga/for-next (c82e5aa87205 fpga: dfl: more 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 +Auto-merging drivers/fpga/dfl.c +Auto-merging drivers/fpga/dfl.h +CONFLICT (content): Merge conflict in drivers/fpga/dfl.h +Resolved 'drivers/fpga/dfl.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master db9033cf0100] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git +$ git diff -M --stat --summary HEAD^.. + drivers/fpga/dfl-afu-region.c | 1 + + drivers/fpga/dfl-afu.h | 2 +- + drivers/fpga/dfl-fme-perf.c | 2 +- + drivers/fpga/dfl-fme-pr.c | 4 +- + drivers/fpga/dfl-fme-pr.h | 2 +- + drivers/fpga/dfl.c | 4 +- + drivers/fpga/dfl.h | 2 +- + drivers/fpga/microchip-spi.c | 145 +++++++++++++++++++++++------------------- + 8 files changed, 88 insertions(+), 74 deletions(-) +Merging icc/icc-next (6f773d4b3bfe Merge branch 'icc-sa8775p' 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,msm8998-bwmon.yaml | 2 + + .../bindings/interconnect/qcom,osm-l3.yaml | 1 + + .../bindings/interconnect/qcom,qdu1000-rpmh.yaml | 70 + + .../bindings/interconnect/qcom,rpmh.yaml | 46 +- + .../bindings/interconnect/qcom,sa8775p-rpmh.yaml | 50 + + .../bindings/interconnect/qcom,sc7280-rpmh.yaml | 71 + + .../bindings/interconnect/qcom,sc8280xp-rpmh.yaml | 49 + + .../bindings/interconnect/qcom,sm8450-rpmh.yaml | 124 + + drivers/interconnect/core.c | 14 +- + drivers/interconnect/qcom/Kconfig | 27 + + drivers/interconnect/qcom/Makefile | 6 + + drivers/interconnect/qcom/qdu1000.c | 1067 ++++++++ + drivers/interconnect/qcom/qdu1000.h | 95 + + drivers/interconnect/qcom/sa8775p.c | 2541 ++++++++++++++++++++ + drivers/interconnect/qcom/sc7180.h | 4 +- + drivers/interconnect/qcom/sc8180x.c | 38 - + drivers/interconnect/qcom/sc8180x.h | 4 +- + drivers/interconnect/qcom/sc8280xp.c | 25 - + drivers/interconnect/qcom/sc8280xp.h | 4 +- + drivers/interconnect/qcom/sdm670.c | 440 ++++ + drivers/interconnect/qcom/sdm670.h | 128 + + drivers/interconnect/qcom/sdx55.h | 4 +- + drivers/interconnect/qcom/sm8150.c | 21 - + drivers/interconnect/qcom/sm8150.h | 4 +- + drivers/interconnect/qcom/sm8250.c | 21 - + drivers/interconnect/qcom/sm8250.h | 4 +- + .../dt-bindings/interconnect/qcom,qdu1000-rpmh.h | 98 + + .../dt-bindings/interconnect/qcom,sa8775p-rpmh.h | 231 ++ + include/dt-bindings/interconnect/qcom,sc7180.h | 3 - + include/dt-bindings/interconnect/qcom,sc8180x.h | 3 - + include/dt-bindings/interconnect/qcom,sc8280xp.h | 4 +- + .../dt-bindings/interconnect/qcom,sdm670-rpmh.h | 136 ++ + include/dt-bindings/interconnect/qcom,sdx55.h | 2 - + include/dt-bindings/interconnect/qcom,sm8150.h | 3 - + include/dt-bindings/interconnect/qcom,sm8250.h | 3 - + 35 files changed, 5167 insertions(+), 176 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,qdu1000-rpmh.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sa8775p-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 drivers/interconnect/qcom/sa8775p.c + create mode 100644 drivers/interconnect/qcom/sdm670.c + create mode 100644 drivers/interconnect/qcom/sdm670.h + create mode 100644 include/dt-bindings/interconnect/qcom,qdu1000-rpmh.h + create mode 100644 include/dt-bindings/interconnect/qcom,sa8775p-rpmh.h + create mode 100644 include/dt-bindings/interconnect/qcom,sdm670-rpmh.h +Merging iio/togreg (354f23ac2c87 dt-bindings: iio: adc: Add NXP IMX93 ADC) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +CONFLICT (content): Merge conflict in MAINTAINERS +Auto-merging drivers/iio/adc/Kconfig +Auto-merging drivers/iio/adc/xilinx-ams.c +Resolved 'MAINTAINERS' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 1daa2b41ce63] Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/iio/adc/cirrus,ep9301-adc.yaml | 47 ++ + .../devicetree/bindings/iio/adc/maxim,max1238.yaml | 2 +- + .../devicetree/bindings/iio/adc/maxim,max1363.yaml | 2 +- + .../devicetree/bindings/iio/adc/nxp,imx93-adc.yaml | 81 +++ + .../bindings/iio/adc/qcom,spmi-iadc.yaml | 1 + + .../devicetree/bindings/iio/adc/ti,adc081c.yaml | 55 ++ + .../devicetree/bindings/iio/adc/ti,ads7924.yaml | 110 +++ + .../devicetree/bindings/iio/adc/ti,lmp92064.yaml | 70 ++ + .../devicetree/bindings/iio/dac/adi,ad5686.yaml | 1 + + .../devicetree/bindings/iio/dac/maxim,max5522.yaml | 49 ++ + .../bindings/iio/magnetometer/ti,tmag5273.yaml | 75 +++ + .../devicetree/bindings/iio/st,st-sensors.yaml | 2 + + MAINTAINERS | 28 +- + 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 | 34 +- + drivers/iio/adc/Makefile | 3 + + drivers/iio/adc/at91-sama5d2_adc.c | 4 +- + drivers/iio/adc/ep93xx_adc.c | 8 + + drivers/iio/adc/imx93_adc.c | 484 ++++++++++++++ + 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-ads7924.c | 474 +++++++++++++ + drivers/iio/adc/ti-lmp92064.c | 332 +++++++++ + drivers/iio/adc/xilinx-ams.c | 9 +- + drivers/iio/cdc/ad7746.c | 3 +- + drivers/iio/chemical/scd30_core.c | 46 +- + drivers/iio/common/scmi_sensors/scmi_iio.c | 4 +- + drivers/iio/dac/Kconfig | 21 +- + drivers/iio/dac/Makefile | 1 + + drivers/iio/dac/ad5686.c | 7 + + drivers/iio/dac/ad5686.h | 1 + + drivers/iio/dac/ad5696-i2c.c | 2 + + drivers/iio/dac/max5522.c | 207 ++++++ + drivers/iio/imu/kmx61.c | 2 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx.h | 5 +- + drivers/iio/imu/st_lsm6dsx/st_lsm6dsx_shub.c | 12 +- + drivers/iio/industrialio-core.c | 64 +- + drivers/iio/light/Makefile | 2 +- + drivers/iio/light/max44009.c | 5 +- + drivers/iio/light/tsl2563.c | 189 +++--- + drivers/iio/light/vcnl4000.c | 449 +++++++++---- + 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 - + tools/iio/iio_utils.c | 23 +- + 64 files changed, 3502 insertions(+), 533 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/cirrus,ep9301-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/nxp,imx93-adc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,adc081c.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,ads7924.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,lmp92064.yaml + create mode 100644 Documentation/devicetree/bindings/iio/dac/maxim,max5522.yaml + create mode 100644 Documentation/devicetree/bindings/iio/magnetometer/ti,tmag5273.yaml + create mode 100644 drivers/iio/adc/imx93_adc.c + create mode 100644 drivers/iio/adc/ti-ads7924.c + create mode 100644 drivers/iio/adc/ti-lmp92064.c + create mode 100644 drivers/iio/dac/max5522.c + create mode 100644 drivers/iio/magnetometer/tmag5273.c + delete mode 100644 include/linux/platform_data/tsl2563.h +Merging phy-next/next (fb1ff01307ee dt-bindings: phy: tegra-xusb: Convert to json-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 Documentation/devicetree/bindings/phy/nvidia,tegra194-xusb-padctl.yaml +CONFLICT (add/add): Merge conflict in Documentation/devicetree/bindings/phy/nvidia,tegra194-xusb-padctl.yaml +Auto-merging drivers/phy/renesas/r8a779f0-ether-serdes.c +Auto-merging drivers/phy/tegra/xusb.c +Resolved 'Documentation/devicetree/bindings/phy/nvidia,tegra194-xusb-padctl.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 4663fabe80ae] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git +$ git diff -M --stat --summary HEAD^.. + .../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 | 32 +- + 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 | 5 + + 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 | 589 +++++++++++++++------ + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 83 ++- + drivers/phy/qualcomm/phy-qcom-qmp.h | 14 +- + drivers/phy/renesas/r8a779f0-ether-serdes.c | 65 ++- + drivers/phy/tegra/xusb.c | 17 + + drivers/phy/ti/phy-j721e-wiz.c | 66 ++- + 33 files changed, 1370 insertions(+), 607 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 +Auto-merging sound/soc/codecs/rt1316-sdw.c +Auto-merging sound/soc/codecs/rt1318-sdw.c +Auto-merging sound/soc/codecs/rt711-sdca-sdw.c +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 (7658aeda334a vfio/platform: Use GFP_KERNEL_ACCOUNT for userspace persistent allocations) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Auto-merging MAINTAINERS +Auto-merging arch/s390/Kconfig +Auto-merging drivers/gpu/drm/i915/Kconfig +Merge made by the 'ort' strategy. + Documentation/driver-api/vfio-mediated-device.rst | 108 +--------------------- + Documentation/s390/vfio-ap.rst | 1 - + MAINTAINERS | 1 - + arch/s390/Kconfig | 6 +- + arch/s390/configs/debug_defconfig | 1 - + arch/s390/configs/defconfig | 1 - + drivers/gpu/drm/i915/Kconfig | 2 +- + drivers/vfio/container.c | 2 +- + drivers/vfio/fsl-mc/vfio_fsl_mc.c | 2 +- + drivers/vfio/fsl-mc/vfio_fsl_mc_intr.c | 4 +- + drivers/vfio/mdev/Kconfig | 8 +- + drivers/vfio/pci/hisilicon/hisi_acc_vfio_pci.c | 4 +- + drivers/vfio/pci/mlx5/cmd.c | 17 ++-- + drivers/vfio/pci/mlx5/main.c | 19 ++-- + drivers/vfio/pci/vfio_pci_config.c | 6 +- + drivers/vfio/pci/vfio_pci_core.c | 7 +- + drivers/vfio/pci/vfio_pci_igd.c | 2 +- + drivers/vfio/pci/vfio_pci_intrs.c | 10 +- + drivers/vfio/pci/vfio_pci_rdwr.c | 2 +- + drivers/vfio/platform/vfio_platform_common.c | 5 +- + drivers/vfio/platform/vfio_platform_irq.c | 8 +- + drivers/vfio/virqfd.c | 2 +- + samples/Kconfig | 16 ++-- + samples/vfio-mdev/README.rst | 100 ++++++++++++++++++++ + 24 files changed, 161 insertions(+), 173 deletions(-) + create mode 100644 samples/vfio-mdev/README.rst +Merging staging/staging-next (2529ca211402 staging: vc04_services: interface: Drop include Makefile directive) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Merge made by the 'ort' strategy. + drivers/staging/emxx_udc/emxx_udc.c | 7 +- + drivers/staging/greybus/gpio.c | 6 +- + drivers/staging/greybus/usb.c | 2 +- + drivers/staging/ks7010/ks_wlan_net.c | 3 +- + drivers/staging/r8188eu/core/rtw_cmd.c | 4 - + drivers/staging/r8188eu/core/rtw_fw.c | 10 +- + drivers/staging/r8188eu/core/rtw_mlme.c | 5 - + drivers/staging/r8188eu/core/rtw_mlme_ext.c | 31 +- + drivers/staging/r8188eu/core/rtw_xmit.c | 275 ++++++---------- + drivers/staging/r8188eu/hal/rtl8188e_cmd.c | 4 +- + drivers/staging/r8188eu/hal/rtl8188e_phycfg.c | 35 +- + drivers/staging/r8188eu/hal/rtl8188e_rf6052.c | 7 +- + drivers/staging/r8188eu/hal/rtl8188eu_xmit.c | 25 +- + drivers/staging/r8188eu/hal/usb_halinit.c | 15 +- + drivers/staging/r8188eu/hal/usb_ops_linux.c | 48 +-- + drivers/staging/r8188eu/include/drv_types.h | 3 +- + drivers/staging/r8188eu/include/rtl8188e_cmd.h | 2 +- + drivers/staging/r8188eu/include/rtl8188e_spec.h | 21 -- + drivers/staging/r8188eu/include/rtl8188e_xmit.h | 15 +- + drivers/staging/r8188eu/include/rtw_cmd.h | 1 - + drivers/staging/r8188eu/include/rtw_io.h | 247 -------------- + drivers/staging/r8188eu/include/rtw_xmit.h | 16 - + drivers/staging/r8188eu/include/usb_ops_linux.h | 2 - + drivers/staging/r8188eu/os_dep/ioctl_linux.c | 6 +- + drivers/staging/r8188eu/os_dep/os_intfs.c | 3 - + drivers/staging/r8188eu/os_dep/usb_intf.c | 5 +- + drivers/staging/r8188eu/os_dep/usb_ops_linux.c | 74 ++--- + drivers/staging/rtl8192e/rtl8192e/r8190P_rtl8256.c | 22 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 255 +++++++-------- + .../staging/rtl8192e/rtl8192e/r8192E_firmware.c | 4 +- + drivers/staging/rtl8192e/rtl8192e/r8192E_phy.c | 356 ++++++++++----------- + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 38 +-- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 143 ++++----- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 222 +++++++------ + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 2 - + drivers/staging/rtl8192u/ieee80211/ieee80211.h | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723b_hal_init.c | 14 +- + drivers/staging/rts5208/ms.c | 2 + + drivers/staging/vc04_services/Makefile | 2 - + .../staging/vc04_services/bcm2835-audio/Makefile | 2 - + .../vc04_services/bcm2835-audio/bcm2835-vchiq.c | 12 +- + .../staging/vc04_services/bcm2835-audio/bcm2835.h | 3 +- + .../staging/vc04_services/bcm2835-camera/Makefile | 5 - + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 10 +- + .../vc04_services/bcm2835-camera/controls.c | 6 +- + .../include/linux/raspberrypi/vchiq.h | 63 ++-- + drivers/staging/vc04_services/interface/TODO | 5 - + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 124 +++---- + .../vc04_services/interface/vchiq_arm/vchiq_arm.h | 8 +- + .../vc04_services/interface/vchiq_arm/vchiq_core.c | 226 ++++++------- + .../vc04_services/interface/vchiq_arm/vchiq_core.h | 38 ++- + .../vc04_services/interface/vchiq_arm/vchiq_dev.c | 36 +-- + .../interface/vchiq_arm/vchiq_ioctl.h | 11 +- + drivers/staging/vc04_services/vchiq-mmal/Makefile | 5 - + .../staging/vc04_services/vchiq-mmal/mmal-vchiq.c | 13 +- + drivers/staging/vme_user/vme.h | 26 +- + drivers/staging/vme_user/vme_bridge.h | 36 +-- + drivers/staging/wlan-ng/hfa384x.h | 171 ---------- + 58 files changed, 1007 insertions(+), 1727 deletions(-) +Merging counter-next/counter-next (01f714ee022e counter: fix dependency references for config MICROCHIP_TCB_CAPTURE) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +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 (4b23603a251d dmaengine: drivers: Use devm_platform_ioremap_resource()) +$ 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/dw-axi-dmac/dw-axi-dmac-platform.c +Auto-merging drivers/dma/idxd/device.c +Auto-merging drivers/dma/imx-sdma.c +Auto-merging drivers/dma/mmp_tdma.c +Auto-merging drivers/dma/tegra210-adma.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/at_xdmac.c | 220 +++++++++++++++++++-- + drivers/dma/bcm2835-dma.c | 4 +- + drivers/dma/dma-axi-dmac.c | 4 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 4 +- + drivers/dma/fsl-edma.c | 8 +- + drivers/dma/fsl-qdma.c | 10 +- + drivers/dma/idma64.c | 4 +- + 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/img-mdc-dma.c | 4 +- + drivers/dma/imx-dma.c | 4 +- + drivers/dma/imx-sdma.c | 42 ++-- + drivers/dma/mcf-edma.c | 5 +- + drivers/dma/mediatek/mtk-hsdma.c | 4 +- + drivers/dma/mmp_pdma.c | 4 +- + drivers/dma/mmp_tdma.c | 4 +- + drivers/dma/moxart-dma.c | 4 +- + drivers/dma/mv_xor_v2.c | 7 +- + drivers/dma/mxs-dma.c | 4 +- + drivers/dma/nbpfaxi.c | 4 +- + drivers/dma/ppc4xx/adma.c | 12 +- + drivers/dma/pxa_dma.c | 4 +- + drivers/dma/qcom/bam_dma.c | 4 +- + drivers/dma/sf-pdma/sf-pdma.c | 4 +- + drivers/dma/sh/usb-dmac.c | 4 +- + drivers/dma/stm32-dmamux.c | 4 +- + drivers/dma/stm32-mdma.c | 4 +- + drivers/dma/sun4i-dma.c | 4 +- + drivers/dma/sun6i-dma.c | 7 +- + drivers/dma/tegra210-adma.c | 4 +- + drivers/dma/ti/Makefile | 3 +- + drivers/dma/ti/cppi41.c | 10 +- + drivers/dma/ti/k3-psil-am62a.c | 196 ++++++++++++++++++ + drivers/dma/ti/k3-psil-priv.h | 1 + + drivers/dma/ti/k3-psil.c | 1 + + drivers/dma/ti/k3-udma.c | 42 +++- + drivers/dma/ti/omap-dma.c | 4 +- + drivers/dma/xilinx/zynqmp_dma.c | 4 +- + include/linux/dma/imx-dma.h | 1 + + 48 files changed, 810 insertions(+), 346 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 (e9f87b59c685 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 Documentation/devicetree/bindings/ufs/qcom,ufs.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/ata/libata-scsi.c +Auto-merging drivers/scsi/ipr.c +Auto-merging drivers/scsi/libsas/sas_ata.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/ufs/qcom,ufs.yaml | 2 + + .../devicetree/bindings/ufs/sprd,ums9620-ufs.yaml | 79 +++ + MAINTAINERS | 14 + + drivers/ata/libata-scsi.c | 23 +- + drivers/hwmon/drivetemp.c | 11 +- + drivers/scsi/3w-sas.c | 12 +- + drivers/scsi/3w-sas.h | 4 +- + 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/ipr.c | 9 +- + drivers/scsi/ips.c | 11 +- + 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/megaraid/megaraid_sas_fusion.c | 2 +- + drivers/scsi/megaraid/megaraid_sas_fusion.h | 5 +- + drivers/scsi/mpt3sas/mpt3sas_ctl.c | 2 +- + 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/scsi/scsi.c | 14 +- + drivers/scsi/scsi_ioctl.c | 7 +- + drivers/scsi/scsi_lib.c | 78 +- + drivers/scsi/scsi_scan.c | 33 +- + drivers/scsi/scsi_sysfs.c | 2 + + 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/ufs_bsg.c | 144 ++-- + drivers/ufs/core/ufshcd-priv.h | 109 ++- + drivers/ufs/core/ufshcd.c | 781 +++++++++++++++------ + drivers/ufs/core/ufshpb.c | 4 +- + drivers/ufs/host/Kconfig | 16 + + drivers/ufs/host/Makefile | 1 + + drivers/ufs/host/ufs-qcom.c | 540 +++++++++----- + drivers/ufs/host/ufs-qcom.h | 91 +-- + 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/scsi/scsi_device.h | 38 +- + include/uapi/scsi/scsi_bsg_fc.h | 2 +- + include/uapi/scsi/scsi_bsg_ufs.h | 48 +- + include/ufs/ufs.h | 37 +- + include/ufs/ufshcd.h | 186 ++++- + include/ufs/ufshci.h | 76 +- + include/ufs/unipro.h | 1 - + 92 files changed, 4067 insertions(+), 1770 deletions(-) + create mode 100644 Documentation/devicetree/bindings/ufs/sprd,ums9620-ufs.yaml + create mode 100644 drivers/ufs/core/ufs-mcq.c + create mode 100644 drivers/ufs/host/ufs-sprd.c + create mode 100644 drivers/ufs/host/ufs-sprd.h +Merging scsi-mkp/for-next (5adca38c0b97 Merge patch series "Enable DMA clustering in the UFS driver") +$ 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/ufs/core/ufshcd.c +Auto-merging include/ufs/ufshcd.h +Merge made by the 'ort' strategy. + drivers/scsi/elx/libefc_sli/sli4.c | 2 +- + drivers/scsi/qla2xxx/qla_target.c | 3 +-- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 13 ++++++------- + drivers/ufs/core/ufshcd.c | 5 ++--- + drivers/ufs/host/ufs-exynos.c | 10 +++++++++- + include/ufs/ufshcd.h | 4 ++-- + 6 files changed, 21 insertions(+), 16 deletions(-) +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 Documentation/driver-api/index.rst +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 (10de8156ed71 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 421 +-------------------- + .../bindings/remoteproc/qcom,glink-edge.yaml | 24 +- + .../bindings/remoteproc/qcom,msm8916-mss-pil.yaml | 289 ++++++++++++++ + .../bindings/remoteproc/qcom,msm8996-mss-pil.yaml | 393 +++++++++++++++++++ + .../bindings/remoteproc/qcom,pas-common.yaml | 89 +++++ + .../devicetree/bindings/remoteproc/qcom,q6v5.txt | 172 +-------- + .../bindings/remoteproc/qcom,qcs404-pas.yaml | 94 +++++ + .../bindings/remoteproc/qcom,sc7180-mss-pil.yaml | 3 +- + .../bindings/remoteproc/qcom,sc7180-pas.yaml | 133 +++++++ + .../bindings/remoteproc/qcom,sc7280-adsp-pil.yaml | 195 ++++++++++ + .../bindings/remoteproc/qcom,sc7280-mss-pil.yaml | 3 +- + .../bindings/remoteproc/qcom,sc8180x-pas.yaml | 95 +++++ + .../bindings/remoteproc/qcom,sc8280xp-pas.yaml | 147 +++++++ + .../bindings/remoteproc/qcom,sdx55-pas.yaml | 109 ++++++ + .../bindings/remoteproc/qcom,sm6350-pas.yaml | 167 ++++++++ + .../bindings/remoteproc/qcom,sm8150-pas.yaml | 174 +++++++++ + .../bindings/remoteproc/qcom,sm8350-pas.yaml | 182 +++++++++ + .../bindings/remoteproc/qcom,sm8550-pas.yaml | 178 +++++++++ + .../bindings/remoteproc/qcom,wcnss-pil.txt | 177 --------- + .../bindings/remoteproc/qcom,wcnss-pil.yaml | 294 ++++++++++++++ + .../bindings/remoteproc/ti,k3-dsp-rproc.yaml | 3 + + .../bindings/remoteproc/ti,pru-consumer.yaml | 60 +++ + 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 | 261 +++++++++---- + drivers/remoteproc/qcom_q6v5_pas.c | 313 ++++++++++++--- + 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_native.h | 3 + + 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 ++++ + 38 files changed, 3590 insertions(+), 904 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,msm8916-mss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,msm8996-mss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,pas-common.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,qcs404-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7180-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc7280-adsp-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc8180x-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sc8280xp-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sdx55-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm6350-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm8150-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm8350-pas.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm8550-pas.yaml + delete mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.txt + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,wcnss-pil.yaml + create mode 100644 Documentation/devicetree/bindings/remoteproc/ti,pru-consumer.yaml + 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 (5bb837ebcfe3 gpio: mvebu: Use IS_REACHABLE instead of IS_ENABLED for CONFIG_PWM) +$ 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-acpi.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 +++ + .../devicetree/bindings/gpio/gpio-eic-sprd.txt | 97 ----- + .../devicetree/bindings/gpio/gpio-sprd.txt | 28 -- + .../devicetree/bindings/gpio/sprd,gpio-eic.yaml | 124 +++++++ + .../devicetree/bindings/gpio/sprd,gpio.yaml | 75 ++++ + 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 | 10 +- + 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 | 3 +- + drivers/gpio/gpio-ge.c | 1 - + 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-mvebu.c | 6 +- + drivers/gpio/gpio-omap.c | 2 +- + drivers/gpio/gpio-pca953x.c | 34 +- + drivers/gpio/gpio-pca9570.c | 24 +- + drivers/gpio/gpio-pcf857x.c | 118 +++--- + drivers/gpio/gpio-regmap.c | 17 +- + drivers/gpio/gpio-rockchip.c | 2 +- + drivers/gpio/gpio-tegra186.c | 1 + + drivers/gpio/gpio-vf610.c | 2 +- + drivers/gpio/gpio-wcd934x.c | 1 - + drivers/gpio/gpio-xilinx.c | 11 - + drivers/gpio/gpio-zevio.c | 9 +- + 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 + + drivers/pinctrl/core.c | 14 +- + include/asm-generic/gpio.h | 12 - + include/linux/gpio.h | 20 -- + include/linux/gpio/consumer.h | 48 --- + include/linux/gpio/driver.h | 9 +- + include/linux/of_gpio.h | 87 +---- + include/linux/platform_data/pcf857x.h | 45 --- + 48 files changed, 849 insertions(+), 1648 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/fujitsu,mb86s70-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/fujitsu,mb86s70-gpio.yaml + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-eic-sprd.txt + delete mode 100644 Documentation/devicetree/bindings/gpio/gpio-sprd.txt + create mode 100644 Documentation/devicetree/bindings/gpio/sprd,gpio-eic.yaml + create mode 100644 Documentation/devicetree/bindings/gpio/sprd,gpio.yaml + delete mode 100644 include/linux/platform_data/pcf857x.h +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 (3859bc00d62e 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 +Auto-merging drivers/gpio/gpiolib-of.c +Auto-merging drivers/gpio/gpiolib.c +Auto-merging drivers/pinctrl/samsung/pinctrl-samsung.c +Auto-merging include/linux/gpio/driver.h +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/mediatek,mt8365-pinctrl.yaml | 197 +++ + .../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/ralink,mt7620-pinctrl.yaml | 633 ++++++- + .../bindings/pinctrl/ralink,mt7621-pinctrl.yaml | 205 ++- + .../bindings/pinctrl/ralink,rt2880-pinctrl.yaml | 86 +- + .../bindings/pinctrl/ralink,rt305x-pinctrl.yaml | 236 ++- + .../bindings/pinctrl/ralink,rt3883-pinctrl.yaml | 205 ++- + .../bindings/pinctrl/renesas,rzg2l-poeg.yaml | 86 + + drivers/gpio/gpiolib-of.c | 5 - + drivers/gpio/gpiolib.c | 8 + + drivers/pinctrl/Kconfig | 2 +- + drivers/pinctrl/bcm/pinctrl-bcm2835.c | 10 +- + drivers/pinctrl/freescale/pinctrl-mxs.c | 6 +- + drivers/pinctrl/freescale/pinctrl-mxs.h | 6 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 1 - + drivers/pinctrl/mediatek/pinctrl-mt8195.c | 4 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 1 - + drivers/pinctrl/mediatek/pinctrl-paris.c | 5 +- + drivers/pinctrl/nomadik/pinctrl-abx500.c | 2 - + 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-digicolor.c | 10 +- + drivers/pinctrl/pinctrl-mcp23s08_i2c.c | 5 +- + drivers/pinctrl/pinctrl-rockchip.c | 1 + + drivers/pinctrl/pinctrl-sx150x.c | 6 +- + 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-lpass-lpi.c | 1 - + drivers/pinctrl/qcom/pinctrl-msm.c | 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 | 8 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 2 +- + drivers/pinctrl/ralink/pinctrl-mt7620.c | 164 +- + drivers/pinctrl/ralink/pinctrl-mt7621.c | 48 +- + drivers/pinctrl/ralink/pinctrl-rt2880.c | 28 +- + drivers/pinctrl/ralink/pinctrl-rt305x.c | 82 +- + drivers/pinctrl/ralink/pinctrl-rt3883.c | 44 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 2 +- + drivers/pinctrl/stm32/pinctrl-stm32.c | 1 + + drivers/pinctrl/sunplus/sppctl.c | 1 - + include/linux/gpio/driver.h | 12 - + 59 files changed, 5241 insertions(+), 612 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/mediatek,mt8365-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 (88f8ac47bddc pinctrl: Proofreading and updating the documentation (part 2)) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Merge made by the 'ort' strategy. + Documentation/driver-api/pin-control.rst | 498 +++++++++++++-------------- + 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 ++ + 24 files changed, 440 insertions(+), 570 deletions(-) +Merging pinctrl-renesas/renesas-pinctrl (698485cd875b pinctrl: renesas: r8a77950: Add VIN[45] pins, groups, and functions) +$ git merge -m Merge branch 'renesas-pinctrl' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git pinctrl-renesas/renesas-pinctrl +Merge made by the 'ort' strategy. + drivers/pinctrl/renesas/pfc-r8a77950.c | 244 ++++++++++++++++++++++++++++++++ + drivers/pinctrl/renesas/pfc-r8a779g0.c | 112 +++++++-------- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 25 ++-- + 3 files changed, 317 insertions(+), 64 deletions(-) +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 (65177e47d303 testing: kselftest_harness: add filtering and enumerating tests) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Merge made by the 'ort' strategy. + tools/testing/selftests/kselftest_harness.h | 142 +++++++++++++++++++++++++++- + 1 file changed, 137 insertions(+), 5 deletions(-) +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 (5835ffc27381 kunit: kunit.py extract handlers) +$ git merge -m Merge branch 'kunit' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-next/kunit +Merge made by the 'ort' strategy. + tools/testing/kunit/kunit.py | 186 +++++++++++++++++++++++-------------------- + 1 file changed, 101 insertions(+), 85 deletions(-) +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 (24304a87158a rtc: brcmstb-waketimer: allow use as non-wake alarm) +$ 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. + .../bindings/rtc/brcm,brcmstb-waketimer.yaml | 21 ++- + .../bindings/rtc/microcrystal,rv3028.yaml | 54 ++++++++ + .../devicetree/bindings/rtc/trivial-rtc.yaml | 4 +- + drivers/rtc/rtc-brcmstb-waketimer.c | 152 +++++++++++++++------ + drivers/rtc/rtc-ds1307.c | 6 +- + drivers/rtc/rtc-sun6i.c | 16 +-- + 6 files changed, 188 insertions(+), 65 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/microcrystal,rv3028.yaml +Merging nvdimm/libnvdimm-for-next (305a72efa791 Merge branch 'for-6.1/nvdimm' into libnvdimm-for-next) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (1b929c02afd3 Linux 6.2-rc1) +$ git merge -m Merge branch 'at24/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git at24/at24/for-next +Already up to date. +Merging ntb/ntb-next (0310a30a9395 NTB: ntb_transport: fix possible memory leak while device_register() fails) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Auto-merging drivers/pci/endpoint/functions/pci-epf-vntb.c +Merge made by the 'ort' strategy. + drivers/ntb/hw/amd/ntb_hw_amd.c | 7 ++++++- + drivers/ntb/hw/idt/ntb_hw_idt.c | 7 ++++++- + drivers/ntb/hw/intel/ntb_hw_gen1.c | 7 ++++++- + drivers/ntb/ntb_transport.c | 2 +- + drivers/pci/endpoint/functions/pci-epf-vntb.c | 1 + + 5 files changed, 20 insertions(+), 4 deletions(-) +Merging seccomp/for-next/seccomp (0fb0624b15d2 seccomp: fix kernel-doc function name warning) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +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 (ef26c0349eb5 of: property: fix #nvmem-cell-cells parsing) +$ 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 | 15 + + drivers/nvmem/Makefile | 2 + + drivers/nvmem/brcm_nvram.c | 3 + + drivers/nvmem/core.c | 343 ++++++++++++++------- + 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/rave-sp-eeprom.c | 2 +- + drivers/nvmem/stm32-bsec-optee-ta.c | 298 ++++++++++++++++++ + drivers/nvmem/stm32-bsec-optee-ta.h | 80 +++++ + drivers/nvmem/stm32-romem.c | 84 ++++- + 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 ++ + 23 files changed, 1356 insertions(+), 149 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 + create mode 100644 drivers/nvmem/stm32-bsec-optee-ta.c + create mode 100644 drivers/nvmem/stm32-bsec-optee-ta.h +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 (96ec2939620c Drivers: hv: Make remove callback of hyperv driver void returned) +$ 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 +Auto-merging drivers/scsi/storvsc_drv.c +Auto-merging drivers/video/fbdev/hyperv_fb.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/gpu/drm/hyperv/hyperv_drm_drv.c | 4 +- + drivers/hid/hid-hyperv.c | 4 +- + drivers/hv/hv.c | 18 +++++---- + drivers/hv/hv_balloon.c | 4 +- + drivers/hv/hv_common.c | 9 +++-- + drivers/hv/hv_util.c | 4 +- + drivers/hv/vmbus_drv.c | 2 +- + drivers/input/serio/hyperv-keyboard.c | 4 +- + drivers/net/hyperv/netvsc_drv.c | 5 +-- + drivers/pci/controller/pci-hyperv.c | 8 +--- + drivers/scsi/storvsc_drv.c | 4 +- + drivers/uio/uio_hv_generic.c | 5 +-- + drivers/video/fbdev/hyperv_fb.c | 5 +-- + include/asm-generic/hyperv-tlfs.h | 1 + + include/asm-generic/mshyperv.h | 1 + + include/linux/hyperv.h | 2 +- + net/vmw_vsock/hyperv_transport.c | 4 +- + 20 files changed, 167 insertions(+), 78 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 (1fd102893456 bus: mhi: ep: Save channel state locally during suspend and resume) +$ 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/ep/main.c | 79 ++++++++++++++++++++++++--------------------- + drivers/bus/mhi/host/init.c | 2 +- + 3 files changed, 45 insertions(+), 40 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 f92412adab97] 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 bd3d8039aafe] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git + Date: Fri Jan 27 15:51:11 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 (240645b94108 efi/libstub: Add memory attribute protocol definitions) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/firmware/google/gsmi.c +Auto-merging include/linux/efi.h +Merge made by the 'ort' strategy. + arch/x86/include/asm/efi.h | 7 ++++ + drivers/firmware/efi/earlycon.c | 41 +++++++++++++++++------ + drivers/firmware/efi/efi.c | 52 ++++++++++++++++++++++++++--- + drivers/firmware/efi/esrt.c | 15 +++------ + drivers/firmware/efi/libstub/efistub.h | 22 ++++++++++++ + drivers/firmware/efi/vars.c | 38 +++++++++++---------- + drivers/firmware/google/gsmi.c | 2 +- + drivers/xen/efi.c | 61 ++++++++++++++++++++++++++++++++++ + fs/efivarfs/super.c | 9 +++-- + include/linux/efi.h | 25 +++++++++++--- + 10 files changed, 220 insertions(+), 52 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 | 16 +++++----------- + mm/slub.c | 2 +- + 2 files changed, 6 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 (dec1df547d81 rust: prelude: prevent doc inline of external imports) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging rust/Makefile +Merge made by the 'ort' strategy. + rust/Makefile | 15 ++ + rust/alloc/borrow.rs | 498 ---------------------------------------- + rust/alloc/lib.rs | 3 +- + rust/alloc/vec/mod.rs | 3 + + rust/bindings/bindings_helper.h | 1 + + rust/bindings/lib.rs | 1 + + rust/compiler_builtins.rs | 5 +- + rust/helpers.c | 19 ++ + rust/kernel/lib.rs | 5 + + rust/kernel/prelude.rs | 8 +- + rust/kernel/sync.rs | 10 + + rust/kernel/sync/arc.rs | 494 +++++++++++++++++++++++++++++++++++++++ + 12 files changed, 561 insertions(+), 501 deletions(-) + delete mode 100644 rust/alloc/borrow.rs + create mode 100644 rust/kernel/sync.rs + create mode 100644 rust/kernel/sync/arc.rs +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 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 (be1923932d0c Merge branches 'for-linus/hardening' and '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 drivers/tty/vt/vt.c +CONFLICT (content): Merge conflict in drivers/tty/vt/vt.c +Auto-merging fs/open.c +Auto-merging fs/super.c +Auto-merging include/linux/compiler_attributes.h +Auto-merging include/uapi/linux/io_uring.h +Auto-merging lib/Kconfig.debug +Auto-merging net/rxrpc/ar-internal.h +Recorded preimage for 'drivers/tty/vt/vt.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/tty/vt/vt.c'. +[master befaec68e541] Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git +$ git diff -M --stat --summary HEAD^.. + drivers/crypto/hisilicon/sgl.c | 3 +- + drivers/gpu/drm/i915/gvt/firmware.c | 4 +- + drivers/gpu/drm/nouveau/include/nvif/outp.h | 3 +- + drivers/gpu/drm/nouveau/nvif/outp.c | 2 +- + drivers/md/bcache/bcache_ondisk.h | 3 +- + drivers/md/bcache/journal.c | 3 +- + drivers/misc/lkdtm/heap.c | 1 + + drivers/net/ethernet/intel/i40e/i40e.h | 2 +- + drivers/soc/ixp4xx/ixp4xx-npe.c | 6 +- + fs/ext4/sysfs.c | 7 ++- + fs/open.c | 5 +- + fs/super.c | 21 +++++-- + include/linux/compiler_attributes.h | 5 ++ + include/linux/fortify-string.h | 7 +++ + include/linux/poison.h | 3 + + include/uapi/linux/io_uring.h | 2 +- + lib/Kconfig.debug | 9 +++ + lib/memcpy_kunit.c | 2 + + net/rxrpc/ar-internal.h | 2 +- + scripts/gcc-plugins/gcc-common.h | 4 +- + security/loadpin/loadpin.c | 89 +++++++++++++++++------------ + 21 files changed, 123 insertions(+), 60 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 drivers/md/bcache/bcache_ondisk.h +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 (84798f284994 iommufd: Add three missing structures in ucmd_buffer) +$ 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/intel/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 +Auto-merging kernel/irq/irqdomain.c +Auto-merging kernel/irq/msi.c +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/iommufd/main.c | 3 +++ + 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 +++++++++++++++++++++++ + tools/testing/selftests/iommu/iommufd.c | 2 +- + 16 files changed, 104 insertions(+), 92 deletions(-) + create mode 100644 arch/s390/include/asm/msi.h +Merging mm-stable/mm-stable (9a3f21fe5cb9 selftests: vm: enable cross-compilation) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Auto-merging Documentation/admin-guide/cgroup-v1/memory.rst +CONFLICT (content): Merge conflict in Documentation/admin-guide/cgroup-v1/memory.rst +Auto-merging Documentation/mm/page_owner.rst +Auto-merging Documentation/translations/zh_CN/mm/page_owner.rst +Auto-merging MAINTAINERS +Auto-merging arch/x86/entry/vdso/vma.c +Auto-merging fs/buffer.c +CONFLICT (content): Merge conflict in fs/buffer.c +Auto-merging fs/cramfs/inode.c +Auto-merging fs/gfs2/log.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/mpage.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/ramfs/file-nommu.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/swap.h +Auto-merging io_uring/io_uring.c +Auto-merging kernel/pid_namespace.c +Auto-merging lib/maple_tree.c +Auto-merging mm/Kconfig +Auto-merging mm/compaction.c +Auto-merging mm/kasan/kasan.h +Auto-merging mm/madvise.c +Auto-merging mm/memcontrol.c +Auto-merging mm/memory.c +Auto-merging mm/shmem.c +Auto-merging mm/slab.c +Auto-merging mm/slub.c +Auto-merging mm/swapfile.c +Auto-merging mm/vmscan.c +Auto-merging mm/zsmalloc.c +Auto-merging net/ipv4/tcp.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 d3fd83ce8eb1] Merge branch 'mm-stable' 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 | 48 +- + Documentation/admin-guide/mm/hugetlbpage.rst | 6 +- + .../admin-guide/mm/idle_page_tracking.rst | 2 +- + Documentation/admin-guide/mm/numaperf.rst | 8 +- + Documentation/admin-guide/mm/pagemap.rst | 4 +- + Documentation/core-api/pin_user_pages.rst | 2 +- + Documentation/dev-tools/kasan.rst | 17 + + Documentation/mm/multigen_lru.rst | 8 +- + Documentation/mm/page_owner.rst | 2 +- + Documentation/mm/slub.rst | 2 +- + Documentation/translations/zh_CN/mm/page_owner.rst | 2 +- + MAINTAINERS | 9 +- + arch/arm64/kernel/vdso.c | 6 +- + arch/powerpc/kernel/vdso.c | 4 +- + arch/powerpc/platforms/book3s/vas-api.c | 2 +- + arch/powerpc/platforms/pseries/vas.c | 3 +- + arch/riscv/kernel/vdso.c | 6 +- + arch/s390/kernel/vdso.c | 4 +- + arch/s390/mm/gmap.c | 2 +- + arch/x86/entry/vdso/vma.c | 4 +- + arch/x86/include/asm/pgtable.h | 24 +- + drivers/android/binder_alloc.c | 2 +- + drivers/block/zram/zram_drv.c | 8 +- + drivers/char/mem.c | 2 +- + drivers/misc/open-dice.c | 14 +- + fs/buffer.c | 54 +- + fs/cramfs/inode.c | 2 +- + fs/ext4/move_extent.c | 46 +- + fs/gfs2/glops.c | 2 +- + fs/gfs2/log.c | 2 +- + fs/gfs2/meta_io.c | 2 +- + 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 | 2 +- + fs/nilfs2/gcinode.c | 2 +- + fs/nilfs2/mdt.c | 4 +- + fs/nilfs2/segment.c | 2 +- + fs/ntfs3/inode.c | 33 +- + fs/ocfs2/journal.c | 16 +- + 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/hugetlb.h | 16 +- + include/linux/buffer_head.h | 5 +- + include/linux/damon.h | 51 ++ + include/linux/fs.h | 2 + + include/linux/highmem.h | 9 +- + include/linux/hugetlb.h | 73 +- + include/linux/jbd2.h | 2 - + include/linux/kasan.h | 36 +- + include/linux/maple_tree.h | 6 - + include/linux/memcontrol.h | 50 +- + include/linux/mm.h | 140 ++-- + include/linux/mm_inline.h | 36 +- + include/linux/mm_types.h | 77 ++- + include/linux/mmzone.h | 131 +++- + include/linux/pagewalk.h | 11 +- + include/linux/pid_namespace.h | 19 + + 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/writeback.h | 2 - + include/trace/events/cma.h | 32 +- + include/uapi/linux/fcntl.h | 1 + + include/uapi/linux/memfd.h | 4 + + io_uring/io_uring.c | 2 +- + kernel/pid_namespace.c | 5 + + kernel/pid_sysctl.h | 60 ++ + lib/maple_tree.c | 115 ++-- + lib/test_vmalloc.c | 8 +- + mm/Kconfig | 2 +- + mm/Kconfig.debug | 2 +- + mm/cma.c | 2 +- + mm/compaction.c | 1 - + 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_vm_pgtable.c | 102 ++- + mm/fadvise.c | 5 +- + mm/hmm.c | 15 +- + mm/huge_memory.c | 64 +- + mm/hugetlb.c | 114 ++-- + mm/internal.h | 19 + + mm/kasan/common.c | 18 +- + mm/kasan/hw_tags.c | 60 ++ + mm/kasan/kasan.h | 27 + + mm/madvise.c | 100 +-- + mm/memcontrol.c | 78 ++- + mm/memfd.c | 56 +- + mm/memory-failure.c | 2 +- + mm/memory.c | 55 +- + mm/mempolicy.c | 35 +- + mm/migrate.c | 25 +- + mm/mprotect.c | 105 +-- + mm/nommu.c | 62 +- + mm/page-writeback.c | 59 +- + mm/page_alloc.c | 60 +- + mm/page_idle.c | 47 +- + mm/page_io.c | 1 - + mm/page_reporting.c | 6 +- + mm/page_vma_mapped.c | 9 +- + mm/pagewalk.c | 6 +- + mm/rmap.c | 68 +- + mm/shmem.c | 17 + + mm/slab.c | 2 +- + mm/slab.h | 8 + + mm/slab_common.c | 1 - + mm/slub.c | 2 +- + mm/swap.c | 26 +- + mm/swap_state.c | 59 +- + mm/swapfile.c | 7 +- + mm/userfaultfd.c | 49 +- + mm/util.c | 24 +- + mm/vmalloc.c | 85 ++- + mm/vmscan.c | 738 ++++++++++++++------- + mm/workingset.c | 7 +- + mm/z3fold.c | 2 - + mm/zsmalloc.c | 3 - + net/ipv4/tcp.c | 7 +- + 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/testing/radix-tree/maple.c | 18 +- + tools/testing/selftests/Makefile | 2 +- + tools/testing/selftests/damon/sysfs.sh | 29 + + 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 | 2 +- + 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 + 201 files changed, 3744 insertions(+), 1475 deletions(-) + create mode 100644 kernel/pid_sysctl.h + 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 (99%) + 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%) +Merging mm-nonmm-stable/mm-nonmm-stable (5dc4c995db9e Linux 6.2-rc4) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm/mm-everything (47950d0b9368 Merge branch 'mm-nonmm-unstable' into mm-everything) + 199a8adcc84a ("mm-mremap-fix-mremap-expanding-for-vmas-with-vm_ops-close-checkpatch-fixes") + 221ec23a348d ("mm/khugepaged: fix ->anon_vma race") + 32b7d5fb9c6e ("maple_tree: fix mas_empty_area_rev() lower bound validation") + 3cf0da31d5f0 ("mm/MADV_COLLAPSE: catch !none !huge !bad pmd lookups") + 4d57682855ae ("mm: multi-gen LRU: fix crash during cgroup migration") + 51cf49ef6770 ("mm: hwpoison: support recovery from ksm_might_need_to_copy()") + 5627c34f9178 ("maple_tree: should get pivots boundary by type") + 7a64d7f80e73 ("squashfs: harden sanity check in squashfs_read_xattr_id_table") + 7d0ffb25be37 ("Revert "mm: kmemleak: alloc gray object for reserved region with direct map"") + 8723eaacb369 ("ia64: fix build error due to switch case label appearing next to declaration") + 88b607ab4c90 ("aio: fix mremap after fork null-deref") + 8a4a053c1a03 ("zsmalloc: fix a race with deferred_handles storing") + 8f3e183e63d1 ("zsmalloc: avoid unused-function warning") + 9f4d5c728dce ("fs: gracefully handle ->get_block not mapping bh in __mpage_writepage") + b66e392203fd ("mm: hwposion: support recovery from ksm_might_need_to_copy()") + b81892668314 ("Revert "mm/compaction: fix set skip in fast_find_migrateblock"") + b9305dfce97d ("lib: parser: optimize match_NUMBER apis to use local array") + bcafa3ae4207 ("freevxfs: Kconfig: fix spelling") + ce8a94688c46 ("Revert "remoteproc: qcom_q6v5_mss: map/unmap metadata region before/after use"") + d8b957def2c0 ("Revert "mm: add nodes= arg to memory.reclaim"") + dce15f97114a ("mm, mremap: fix mremap() expanding for vma's with vm_ops->close()") + ec85ea14df85 ("lib: Kconfig: fix spellos") + f1105936c435 (".mailmap: update e-mail address for Eugen Hristev") +$ 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-v2.rst +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging MAINTAINERS +Auto-merging arch/alpha/kernel/process.c +Auto-merging arch/arm/kernel/process.c +Auto-merging arch/riscv/include/asm/pgtable.h +Auto-merging arch/s390/include/asm/pgtable.h +Auto-merging arch/x86/kvm/emulate.c +Auto-merging arch/x86/mm/pat/memtype.c +Auto-merging drivers/accel/habanalabs/common/memory.c +Auto-merging drivers/accel/habanalabs/gaudi/gaudi.c +Auto-merging drivers/accel/habanalabs/gaudi2/gaudi2.c +Auto-merging drivers/accel/habanalabs/goya/goya.c +Auto-merging drivers/android/binder.c +Auto-merging drivers/crypto/hisilicon/qm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_chardev.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_process.c +Auto-merging drivers/gpu/drm/drm_gem.c +Auto-merging drivers/gpu/drm/drm_gem_dma_helper.c +Auto-merging drivers/gpu/drm/drm_gem_shmem_helper.c +Auto-merging drivers/gpu/drm/gma500/framebuffer.c +CONFLICT (modify/delete): drivers/gpu/drm/i810/i810_dma.c deleted in HEAD and modified in mm/mm-everything. Version mm/mm-everything of drivers/gpu/drm/i810/i810_dma.c left in tree. +Auto-merging drivers/gpu/drm/i915/gem/i915_gem_mman.c +Auto-merging drivers/gpu/drm/omapdrm/omap_gem.c +Auto-merging drivers/gpu/drm/ttm/ttm_bo_vm.c +Auto-merging drivers/infiniband/hw/hfi1/file_ops.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/hfi1/file_ops.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/iommu/tegra-smmu.c +Auto-merging drivers/misc/uacce/uacce.c +Auto-merging drivers/remoteproc/qcom_q6v5_mss.c +CONFLICT (content): Merge conflict in drivers/remoteproc/qcom_q6v5_mss.c +CONFLICT (modify/delete): drivers/staging/media/deprecated/meye/meye.c deleted in HEAD and modified in mm/mm-everything. Version mm/mm-everything of drivers/staging/media/deprecated/meye/meye.c left in tree. +CONFLICT (modify/delete): drivers/staging/media/deprecated/stkwebcam/stk-webcam.c deleted in HEAD and modified in mm/mm-everything. Version mm/mm-everything of drivers/staging/media/deprecated/stkwebcam/stk-webcam.c left in tree. +Auto-merging drivers/vfio/pci/vfio_pci_core.c +Auto-merging drivers/vhost/vdpa.c +Auto-merging drivers/video/fbdev/core/fb_defio.c +Auto-merging fs/aio.c +Auto-merging fs/btrfs/extent_io.c +Auto-merging fs/cifs/file.c +Auto-merging fs/coredump.c +Auto-merging fs/cramfs/inode.c +Auto-merging fs/exec.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/checkpoint.c +Auto-merging fs/f2fs/data.c +Auto-merging fs/f2fs/node.c +Auto-merging fs/fat/namei_vfat.c +Auto-merging fs/fuse/file.c +Auto-merging fs/hfsplus/xattr.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/iomap/buffered-io.c +Auto-merging fs/mpage.c +Auto-merging fs/nfs/write.c +Auto-merging fs/ntfs/inode.c +Auto-merging fs/ntfs3/inode.c +Auto-merging fs/orangefs/file.c +Auto-merging fs/orangefs/inode.c +Auto-merging fs/proc/base.c +Auto-merging fs/xfs/xfs_file.c +Auto-merging include/linux/blkdev.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/util_macros.h +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/events/core.c +Auto-merging kernel/fork.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/sys.c +Auto-merging lib/Kconfig.debug +Auto-merging lib/Makefile +Auto-merging lib/maple_tree.c +Auto-merging lib/test_maple_tree.c +Auto-merging mm/Kconfig +Auto-merging mm/compaction.c +Auto-merging mm/kasan/shadow.c +Auto-merging mm/khugepaged.c +Auto-merging mm/ksm.c +Auto-merging mm/madvise.c +Auto-merging mm/memcontrol.c +Auto-merging mm/memory.c +Auto-merging mm/mremap.c +CONFLICT (content): Merge conflict in mm/mremap.c +Auto-merging mm/secretmem.c +Auto-merging mm/shmem.c +Auto-merging mm/swapfile.c +Auto-merging mm/vmscan.c +Auto-merging mm/zsmalloc.c +Auto-merging net/ipv4/tcp.c +Auto-merging sound/soc/fsl/fsl-asoc-card.c +Recorded preimage for 'drivers/infiniband/hw/hfi1/file_ops.c' +Resolved 'drivers/remoteproc/qcom_q6v5_mss.c' using previous resolution. +Resolved 'mm/mremap.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f drivers/gpu/drm/i810/i810_dma.c +rm 'drivers/gpu/drm/i810/i810_dma.c' +$ git rm -f drivers/staging/media/deprecated/meye/meye.c +rm 'drivers/staging/media/deprecated/meye/meye.c' +$ git rm -f drivers/staging/media/deprecated/stkwebcam/stk-webcam.c +rm 'drivers/staging/media/deprecated/stkwebcam/stk-webcam.c' +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/infiniband/hw/hfi1/file_ops.c'. +[master 17e3a2f5200e] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/stable/sysfs-devices-node | 39 + + Documentation/admin-guide/mm/damon/usage.rst | 41 +- + Documentation/admin-guide/mm/ksm.rst | 7 + + Documentation/admin-guide/sysctl/kernel.rst | 25 +- + Documentation/core-api/pin_user_pages.rst | 29 +- + 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 | 43 +- + Documentation/mm/hugetlbfs_reserv.rst | 21 +- + Documentation/mm/multigen_lru.rst | 78 +- + Documentation/mm/transhuge.rst | 24 +- + Documentation/mm/unevictable-lru.rst | 151 +-- + Documentation/mm/zsmalloc.rst | 168 +++ + .../translations/zh_CN/mm/hugetlbfs_reserv.rst | 14 +- + MAINTAINERS | 5 + + arch/alpha/include/asm/page.h | 5 +- + 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/arm/kernel/process.c | 2 +- + arch/arm64/include/asm/page.h | 4 +- + arch/arm64/include/asm/pgtable.h | 1 - + arch/arm64/mm/fault.c | 4 +- + 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/page.h | 14 +- + arch/ia64/include/asm/pgtable.h | 31 +- + arch/ia64/mm/init.c | 8 +- + arch/loongarch/include/asm/pgtable-bits.h | 4 + + arch/loongarch/include/asm/pgtable.h | 38 +- + arch/loongarch/include/asm/tlb.h | 2 +- + arch/m68k/include/asm/mcf_pgtable.h | 35 +- + arch/m68k/include/asm/motorola_pgtable.h | 39 +- + arch/m68k/include/asm/page_no.h | 5 +- + 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/kvm/book3s_hv_uvmem.c | 6 +- + arch/powerpc/kvm/book3s_xive_native.c | 2 +- + arch/powerpc/mm/book3s64/subpage_prot.c | 2 +- + arch/powerpc/platforms/book3s/vas-api.c | 2 +- + arch/powerpc/platforms/cell/spufs/file.c | 14 +- + arch/riscv/include/asm/pgtable-bits.h | 3 + + arch/riscv/include/asm/pgtable.h | 28 +- + arch/s390/include/asm/page.h | 5 +- + arch/s390/include/asm/pgtable.h | 1 - + arch/s390/mm/gmap.c | 9 +- + 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/vsyscall/vsyscall_64.c | 2 +- + arch/x86/include/asm/page.h | 5 +- + arch/x86/include/asm/pgtable-2level.h | 26 +- + arch/x86/include/asm/pgtable-3level.h | 26 +- + arch/x86/include/asm/pgtable.h | 3 - + arch/x86/kernel/cpu/sgx/driver.c | 2 +- + arch/x86/kernel/cpu/sgx/virt.c | 2 +- + arch/x86/kvm/emulate.c | 8 +- + arch/x86/mm/fault.c | 23 +- + arch/x86/mm/pat/memtype.c | 14 +- + arch/x86/um/mem_32.c | 2 +- + arch/xtensa/include/asm/pgtable.h | 31 +- + block/bdev.c | 78 -- + drivers/accel/habanalabs/common/memory.c | 2 +- + drivers/accel/habanalabs/gaudi/gaudi.c | 4 +- + drivers/accel/habanalabs/gaudi2/gaudi2.c | 8 +- + drivers/accel/habanalabs/goya/goya.c | 4 +- + drivers/acpi/pfr_telemetry.c | 2 +- + drivers/android/binder.c | 3 +- + drivers/base/node.c | 3 + + drivers/block/brd.c | 15 +- + drivers/block/zram/zram_drv.c | 61 +- + drivers/char/mspec.c | 2 +- + drivers/crypto/hisilicon/qm.c | 2 +- + drivers/dax/device.c | 2 +- + drivers/dma/idxd/cdev.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_events.c | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_process.c | 4 +- + drivers/gpu/drm/drm_gem.c | 2 +- + drivers/gpu/drm/drm_gem_dma_helper.c | 3 +- + drivers/gpu/drm/drm_gem_shmem_helper.c | 2 +- + drivers/gpu/drm/drm_vm.c | 8 +- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 2 +- + drivers/gpu/drm/exynos/exynos_drm_gem.c | 4 +- + drivers/gpu/drm/gma500/framebuffer.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 4 +- + drivers/gpu/drm/mediatek/mtk_drm_gem.c | 2 +- + drivers/gpu/drm/msm/msm_gem.c | 2 +- + drivers/gpu/drm/omapdrm/omap_gem.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_gem.c | 3 +- + drivers/gpu/drm/tegra/gem.c | 5 +- + drivers/gpu/drm/ttm/ttm_bo_vm.c | 3 +- + drivers/gpu/drm/virtio/virtgpu_vram.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_ttm_glue.c | 2 +- + drivers/gpu/drm/xen/xen_drm_front_gem.c | 3 +- + drivers/hsi/clients/cmt_speech.c | 2 +- + drivers/hwtracing/intel_th/msu.c | 2 +- + drivers/hwtracing/stm/core.c | 2 +- + drivers/infiniband/hw/hfi1/file_ops.c | 4 +- + drivers/infiniband/hw/mlx5/main.c | 4 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 13 +- + drivers/infiniband/hw/usnic/usnic_ib_verbs.c | 2 +- + drivers/infiniband/hw/vmw_pvrdma/pvrdma_verbs.c | 2 +- + drivers/infiniband/ulp/iser/iscsi_iser.c | 2 +- + drivers/iommu/tegra-smmu.c | 4 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 2 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-contig.c | 2 +- + drivers/media/v4l2-core/videobuf-dma-sg.c | 4 +- + drivers/media/v4l2-core/videobuf-vmalloc.c | 2 +- + drivers/misc/cxl/context.c | 2 +- + drivers/misc/ocxl/context.c | 4 +- + drivers/misc/ocxl/sysfs.c | 2 +- + drivers/misc/open-dice.c | 4 +- + drivers/misc/sgi-gru/grufile.c | 4 +- + drivers/misc/uacce/uacce.c | 2 +- + drivers/nvdimm/btt.c | 16 +- + drivers/nvdimm/pmem.c | 24 +- + drivers/sbus/char/oradax.c | 2 +- + drivers/scsi/cxlflash/ocxl_hw.c | 2 +- + drivers/scsi/sg.c | 2 +- + drivers/staging/media/atomisp/pci/hmm/hmm_bo.c | 2 +- + drivers/target/target_core_user.c | 2 +- + drivers/uio/uio.c | 2 +- + drivers/usb/core/devio.c | 3 +- + drivers/usb/mon/mon_bin.c | 3 +- + drivers/vdpa/vdpa_user/iova_domain.c | 2 +- + drivers/vfio/pci/vfio_pci_core.c | 2 +- + drivers/vhost/vdpa.c | 2 +- + drivers/video/fbdev/68328fb.c | 2 +- + drivers/video/fbdev/core/fb_defio.c | 4 +- + drivers/xen/gntalloc.c | 2 +- + drivers/xen/gntdev.c | 4 +- + drivers/xen/privcmd-buf.c | 2 +- + drivers/xen/privcmd.c | 4 +- + fs/afs/write.c | 116 ++- + fs/aio.c | 2 +- + fs/btrfs/extent_io.c | 57 +- + fs/ceph/addr.c | 58 +- + fs/cifs/file.c | 40 +- + fs/coredump.c | 8 +- + fs/cramfs/Kconfig | 2 +- + fs/cramfs/inode.c | 2 +- + fs/erofs/data.c | 2 +- + fs/exec.c | 20 +- + fs/ext4/file.c | 2 +- + fs/ext4/inode.c | 74 +- + fs/ext4/super.c | 6 +- + 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/fs-writeback.c | 10 +- + fs/fuse/dax.c | 2 +- + fs/fuse/file.c | 18 +- + fs/gfs2/aops.c | 64 +- + fs/hfs/bnode.c | 1 + + fs/hfs/extent.c | 2 +- + fs/hfsplus/extents.c | 2 +- + fs/hfsplus/xattr.c | 18 +- + fs/hugetlbfs/inode.c | 44 +- + fs/iomap/buffered-io.c | 5 +- + fs/mpage.c | 54 +- + fs/nfs/write.c | 7 +- + fs/nilfs2/btree.c | 14 +- + fs/nilfs2/dat.c | 27 +- + fs/nilfs2/page.c | 59 +- + fs/nilfs2/segment.c | 44 +- + 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 | 6 +- + fs/orangefs/file.c | 3 +- + fs/orangefs/inode.c | 23 +- + fs/proc/base.c | 1 + + fs/proc/cmdline.c | 1 + + fs/proc/task_mmu.c | 41 +- + fs/proc/vmcore.c | 3 +- + fs/userfaultfd.c | 89 +- + fs/xfs/xfs_file.c | 2 +- + include/asm-generic/error-injection.h | 7 +- + include/linux/blkdev.h | 12 +- + include/linux/damon.h | 17 +- + include/linux/error-injection.h | 3 +- + include/linux/gfp_types.h | 12 +- + include/linux/highmem-internal.h | 4 +- + include/linux/highmem.h | 62 +- + include/linux/huge_mm.h | 13 +- + include/linux/hugetlb.h | 46 +- + include/linux/hugetlb_cgroup.h | 8 +- + include/linux/kexec.h | 3 +- + include/linux/maple_tree.h | 13 +- + include/linux/memcontrol.h | 2 +- + include/linux/migrate.h | 1 + + include/linux/mm.h | 320 ++++-- + include/linux/mm_inline.h | 17 - + include/linux/mm_types.h | 108 +- + include/linux/mman.h | 34 + + include/linux/mmu_notifier.h | 13 +- + include/linux/mmzone.h | 41 +- + include/linux/page-flags.h | 1 + + include/linux/page_ext.h | 20 + + include/linux/pagemap.h | 32 +- + include/linux/pagevec.h | 13 +- + include/linux/percpu_counter.h | 6 +- + include/linux/pgtable.h | 34 +- + include/linux/rmap.h | 13 +- + include/linux/sched/coredump.h | 6 +- + include/linux/shmem_fs.h | 10 +- + include/linux/util_macros.h | 2 + + include/linux/vmalloc.h | 1 + + include/linux/writeback.h | 14 +- + include/linux/xarray.h | 3 +- + include/trace/events/huge_memory.h | 3 +- + include/trace/events/mmflags.h | 1 - + include/uapi/linux/prctl.h | 6 + + init/initramfs.c | 4 +- + init/main.c | 6 +- + ipc/shm.c | 8 +- + kernel/bpf/ringbuf.c | 4 +- + kernel/bpf/syscall.c | 4 +- + kernel/crash_core.c | 4 +- + kernel/events/core.c | 2 +- + kernel/events/uprobes.c | 5 +- + kernel/fork.c | 23 +- + kernel/kcov.c | 2 +- + kernel/kexec.c | 4 +- + kernel/kexec_core.c | 94 +- + kernel/kexec_file.c | 11 +- + kernel/kthread.c | 5 + + kernel/relay.c | 2 +- + kernel/sched/fair.c | 14 +- + kernel/sys.c | 33 + + kernel/user_namespace.c | 2 +- + lib/Kconfig.debug | 110 +- + 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/genalloc.c | 18 +- + lib/maple_tree.c | 26 +- + lib/percpu_counter.c | 25 +- + lib/test_maple_tree.c | 72 ++ + lib/test_printf.c | 8 +- + lib/zlib_deflate/deflate.c | 23 +- + lib/zlib_dfltcc/dfltcc.c | 25 +- + lib/zlib_dfltcc/dfltcc.h | 57 +- + lib/zlib_dfltcc/dfltcc_deflate.c | 89 +- + lib/zlib_dfltcc/dfltcc_deflate.h | 21 + + lib/zlib_dfltcc/dfltcc_inflate.c | 24 +- + lib/zlib_dfltcc/dfltcc_inflate.h | 37 + + lib/zlib_inflate/inflate.c | 2 +- + mm/Kconfig | 28 + + mm/Kconfig.debug | 71 ++ + mm/Makefile | 1 + + mm/cma.c | 24 +- + mm/compaction.c | 98 +- + mm/damon/core-test.h | 30 + + mm/damon/core.c | 74 +- + mm/damon/vaddr-test.h | 20 +- + mm/debug.c | 9 +- + mm/debug_vm_pgtable.c | 27 +- + mm/dmapool.c | 402 ++++---- + mm/dmapool_test.c | 147 +++ + mm/filemap.c | 114 +- + mm/folio-compat.c | 11 + + mm/gup.c | 12 +- + mm/huge_memory.c | 104 +- + mm/hugetlb.c | 543 +++++----- + mm/hugetlb_cgroup.c | 8 +- + mm/internal.h | 172 ++- + mm/kasan/common.c | 3 + + mm/kasan/generic.c | 7 +- + mm/kasan/shadow.c | 12 + + mm/khugepaged.c | 292 ++++-- + mm/kmemleak.c | 88 +- + mm/kmsan/instrumentation.c | 23 + + mm/ksm.c | 188 +++- + mm/madvise.c | 23 +- + mm/mapping_dirty_helpers.c | 2 +- + mm/memcontrol.c | 20 +- + mm/memory-failure.c | 213 ++-- + mm/memory.c | 192 ++-- + mm/memory_hotplug.c | 2 +- + mm/mempolicy.c | 154 +-- + mm/memremap.c | 4 +- + mm/migrate.c | 799 ++++++++++---- + mm/migrate_device.c | 4 +- + mm/mlock.c | 351 ++++--- + mm/mmap.c | 1090 ++++++++++---------- + mm/mmu_notifier.c | 10 - + mm/mprotect.c | 56 +- + mm/mremap.c | 53 +- + mm/nommu.c | 135 +-- + mm/oom_kill.c | 2 +- + mm/page-writeback.c | 50 +- + mm/page_alloc.c | 152 +-- + mm/page_ext.c | 16 +- + mm/page_io.c | 182 ++-- + mm/page_owner.c | 4 +- + mm/page_table_check.c | 1 + + mm/readahead.c | 39 +- + mm/rmap.c | 263 ++--- + mm/secretmem.c | 4 +- + mm/shmem.c | 50 +- + mm/sparse.c | 2 +- + mm/swap.c | 24 +- + mm/swap.h | 10 +- + mm/swap_state.c | 6 + + mm/swapfile.c | 2 +- + mm/vmalloc.c | 419 ++++---- + mm/vmscan.c | 534 +++++----- + mm/workingset.c | 21 +- + mm/zsmalloc.c | 71 +- + net/ipv4/tcp.c | 4 +- + net/openvswitch/flow_table.c | 2 +- + scripts/bloat-o-meter | 3 +- + scripts/checkpatch.pl | 38 +- + scripts/gdb/linux/mm.py | 222 ++++ + scripts/gdb/vmlinux-gdb.py | 1 + + scripts/spelling.txt | 17 + + security/selinux/selinuxfs.c | 6 +- + sound/core/oss/pcm_oss.c | 2 +- + sound/core/pcm_native.c | 9 +- + sound/soc/fsl/fsl-asoc-card.c | 2 +- + sound/soc/pxa/mmp-sspa.c | 2 +- + sound/usb/usx2y/us122l.c | 4 +- + sound/usb/usx2y/usX2Yhwdep.c | 2 +- + sound/usb/usx2y/usx2yhwdeppcm.c | 2 +- + tools/mm/Makefile | 4 +- + tools/perf/builtin-kmem.c | 1 - + tools/testing/radix-tree/maple.c | 32 +- + .../selftests/damon/debugfs_rm_non_contexts.sh | 2 +- + tools/testing/selftests/damon/sysfs.sh | 2 +- + tools/testing/selftests/mm/Makefile | 1 + + tools/testing/selftests/mm/ksm_functional_tests.c | 103 +- + tools/testing/selftests/mm/mdwe_test.c | 197 ++++ + 378 files changed, 9233 insertions(+), 5117 deletions(-) + create mode 100644 Documentation/mm/damon/maintainer-profile.rst + 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 lib/zlib_dfltcc/dfltcc_deflate.h + create mode 100644 lib/zlib_dfltcc/dfltcc_inflate.h + create mode 100644 mm/dmapool_test.c + create mode 100644 scripts/gdb/linux/mm.py + create mode 100644 tools/testing/selftests/mm/mdwe_test.c +$ git am -3 ../patches/0001-udf-fix-up-for-fs-convert-writepage_t-callback-to-pa.patch +Applying: udf: fix up for "fs: convert writepage_t callback to pass a folio" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/udf/inode.c +$ git add -A . +$ git commit -v -a --amend +[master 064d781fa163] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Fri Jan 27 16:28:11 2023 +1100 +$ git am -3 ../patches/0001-accel-ivpu-fix-up-for-mm-introduce-vma-vm_flags-wrap.patch +Applying: accel/ivpu: fix up for "mm: introduce vma->vm_flags wrapper functions" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/accel/ivpu/ivpu_gem.c +$ git add -A . +$ git commit -v -a --amend +[master 34aaf105e58c] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Fri Jan 27 16:28:11 2023 +1100 +$ git am -3 ../patches/0001-gfs2-fix-up-for-fs-convert-writepage_t-callback-to-p.patch +Applying: gfs2: fix up for "fs: convert writepage_t callback to pass a folio" +$ git reset HEAD^ +Unstaged changes after reset: +M fs/gfs2/log.c +$ git add -A . +$ git commit -v -a --amend +[master c63a0260a66f] Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm + Date: Fri Jan 27 16:28:11 2023 +1100 +$ git am -3 ../patches/0001-remoteproc-fix-for-iommu-Add-a-gfp-parameter-to-iomm.patch +Applying: remoteproc: fix for "iommu: Add a gfp parameter to iommu_map()" diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..009885479a77 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20230127 |