diff options
| -rw-r--r-- | Next/SHA1s | 370 | ||||
| -rw-r--r-- | Next/Trees | 372 | ||||
| -rw-r--r-- | Next/merge.log | 14992 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 15735 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..9fcfc965d82c --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,370 @@ +Name SHA1 +---- ---- +origin 58720809f52779dc0f08e53e54b014209d13eebb +fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +mm-hotfixes 836ff2cb6c5ce8a2c3a02c9b74cabeb2c426aa0e +kbuild-current 8a749fd1a8720d4619c91c8b6e7528c0a355c0aa +arc-current 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm-current 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +arm64-fixes 4785aa8028536c2be656d22c74ec1995b97056f3 +arm-soc-fixes 26de14831cf6e6a6ff96609a0623e1266a636467 +davinci-current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current eb1e6ccdcf785e633863c5c7cec32d6c1e7b09dd +powerpc-fixes ff9e8f41513669e290f6e1904e1bc75950584491 +s390-fixes 5c95bf274665cc9f5126e4a48a9da51114f7afd2 +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net 883f0dc0e4f6b627c0e91098724851da2eabe697 +bpf a307f5a24924b5f0c45d003aefcb3327f3ed19aa +ipsec 513f61e2193350c7a345da98559b80f61aec4fa6 +netfilter 2d1c882d4434a27a026b98b602f232c7919849c5 +ipvs 2d1c882d4434a27a026b98b602f232c7919849c5 +wireless f2ac54ebf85615a6d78f5eb213a8bbeeb17ebe5d +wpan 2d1c882d4434a27a026b98b602f232c7919849c5 +rdma-fixes 94f6f0550c625fab1f373bb86a6669b45e9748b3 +sound-current 4a63e68a295187ae3c1cb3fa0c583c96a959714f +sound-asoc-fixes 9c97790a07dc4f9bdc6e1701003dc9b86f749c71 +regmap-fixes 7a795ac8d49e2433e1b97caf5e99129daf8e1b08 +regulator-fixes 6e800968f6a715c0661716d2ec5e1f56ed9f9c08 +spi-fixes 2ec8b010979036c2fe79a64adb6ecc0bd11e91d1 +pci-current 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +driver-core.current 8a749fd1a8720d4619c91c8b6e7528c0a355c0aa +tty.current b3fa3cf02e3ce92d32bfdeedd5a6bd0825f55a14 +usb.current c9ca8de2eb15f9da24113e652980c61f95a47530 +usb-serial-fixes 064f6e2ba9eb59b2c87b866e1e968e79ccedf9dd +phy 089667aaaa6aa33715d22b21a72216b43af3e896 +staging.current 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +iio-fixes e2bd8c28b9bd835077eb65715d416d667694a80d +counter-current df8fdd01c98b99d04915c04f3a5ce73f55456b7c +char-misc.current ffd1f150fffe8a708f6ccd15152791d0e8f812b6 +soundwire-fixes 3b6c4a11bf2b810f772f5c2c1ef6eef3fc268246 +thunderbolt-fixes ec4405ed92036f5bb487b5c2f9a28f9e36a3e3d5 +input-current 5c15c60e7be615f05a45cd905093a54b11f461bc +crypto-current 152d0bcdf1efcb54a4fa20f694e9c7bbb6d06cbf +vfio-fixes c777b11d34e0f47dbbc4b018ef65ad030f2b283a +kselftest-fixes 6f874fa021dfc7bf37f4f37da3a5aaa41fe9c39c +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes 3fa53518ad419bfacceae046a9d8027e4c4c5290 +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes 5279f4a9eed3ee7d222b76511ea7a22c89e7eefd +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes c46f16f156ac58afcf4addc850bb5dfbca77b9fc +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes 8a749fd1a8720d4619c91c8b6e7528c0a355c0aa +at91-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +omap-fixes 0b9a4a67c60d3e15b39a69d480a50ce7eeff9bc1 +kvm-fixes ba8c993c3748931a307648616f68892bcb6afe28 +kvms390-fixes f87ef5723536a6545ed9c43e18b13a9faceb3c80 +hwmon-fixes 6465e260f48790807eef06b583b38ca9789b6072 +nvdimm-fixes 33908660e814203e996f6e775d033c5c32fcf9a7 +cxl-fixes c66650d29764e228eba40b7a59fdb70fa6567daa +btrfs-fixes dcb1886a86a415689c2a8efe1f9974ead612acb3 +vfs-fixes 609d54441493c99f21c1823dfd66fa7f4c512ff4 +dma-mapping-fixes bbb73a103fbbed6f63cb738d3783261c4241b4b2 +drivers-x86-fixes 51064b7acf665bfa2c929d7cafb7ad494b7d2783 +samsung-krzk-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +pinctrl-samsung-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +devicetree-fixes 19007c629c63c76ae0f8adee9dc076bda4788b46 +dt-krzk-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +scsi-fixes a20c4350c6a12405b7f732b3ee6801ffe2cc45ce +drm-fixes 30873697b83743eda54d66ea9a3ea83554f8a535 +drm-intel-fixes 94f6f0550c625fab1f373bb86a6669b45e9748b3 +mmc-fixes 84ee19bffc9306128cd0f1c650e89767079efeff +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +hyperv-fixes 42999c90461293233de9bb6e6c7d8a2db7281c1e +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes 3fec323339a4a9801a54e8b282eb571965b67b23 +riscv-dt-fixes cf98fe6b579e55aa71b6197e34c112b51f0c2a66 +riscv-soc-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +fpga-fixes 6a935361500a21ef11a82814ee66fc58e59813f7 +spdx 8a749fd1a8720d4619c91c8b6e7528c0a355c0aa +gpio-brgl-fixes 94f6f0550c625fab1f373bb86a6669b45e9748b3 +gpio-intel-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +pinctrl-intel-fixes 2d325e54d9e2e4ae247c9fd03f810208ce958c51 +erofs-fixes 3048102d9d68008e948decbd730f0748dd7bdc31 +kunit-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +ubifs-fixes 2241ab53cbb5cdb08a6b2d4688feb13971058f65 +memblock-fixes 55122e0130e51eb71f5ec62d10525db0468f28e8 +nfsd-fixes 0d32a6bbb8e7bf503855f2990f1ccce0922db87b +irqchip-fixes b673fe1a6229a49be5394f4e539055d9ce685615 +renesas-fixes 4c188fa183ebb45238ef16504c4c7606955cf9d4 +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current f38f547314b858b94d36aeb9a4401f0aade7d1af +efi-fixes 0d3ad1917996839a5042d18f04e41915cfa1b74a +zstd-fixes f064f4e5ecb151b3fce59762075658ac6f389532 +battery-fixes 8894b432548851f705f72ff135d3dcbd442a18d1 +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +rust-fixes 344b6c0a7514b044ed12b8ad3cdeecd262292f3e +v9fs-fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +w1-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +pmdomain-fixes 767881c470b3140c33795031c4e4d65572731c1c +overlayfs-fixes beae836e9c61ee039e367a94b14f7fea08f0ad4c +drm-misc-fixes 4366faf43308bd91c59a20c43a9f853a9c3bb6e4 +mm-stable 2b76550922a81fd63e16b81b6b39f1eb19df52f0 +mm-nonmm-stable c37e56cac3d62c69f093904afbc58fc428484d14 +mm 2ae6ac8b1d58da998956185a9b3cd9978cd85908 +kbuild ffa46bbc5892ebba8a95c839dc302cad7f22c209 +clang-format 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +perf a16afcc58a8c5ebc65c852faf001f8f61f05e4ef +compiler-attributes 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +dma-mapping 2d5780bbef8dbe6375d481cbea212606a80e4453 +asm-generic f82060480095a909291adc90d5579f50b6ec0627 +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm c7368ddba2ffcc5d200122c5bb122c3825ecb976 +arm64 c19b7014aaaeebcc1a0736bba8d945ab8b246560 +arm-perf 0abe7f61c28d62ee0530c31589e6ea209aa82cbd +arm-soc cda3f5e2e08909baf1f9467fce84d2d22fb00e51 +amlogic 996fc07dce7991dd12ac0b7c378ce65080036492 +asahi-soc eaf935fa48ec826f7c564c269a607cb4fba082b3 +aspeed 32d514b6de633b99ee545c43dccd37c5e5eb5e5a +at91 3cec9514911c4400a4b4ab778b9e92b60a14c677 +broadcom 61641804ab355d1ee4d987c110d92c7e25b392e0 +davinci 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory 09de3691daab15ae125cbf32f9f72fc90eada49d +imx-mxs fa81543ef85463e53bd2e3193a182ec1ff800ee9 +mediatek e2a38d710912263683126adaadce576750077627 +mvebu 93e6b023e552e7af30ba89439a1486160779010f +omap cb1114df7bb08a0be22ae1652b0c5ff9602ed391 +qcom 870b5222204243ee6dbeada9ad1b90cda9ecb4da +renesas 11476f31ceafc77476a853d48a145978af65b04b +reset 417a3a5ae44a14b4eeb3df514b2c006b19771f82 +rockchip 45dc525cfcd3f4574159e9ea8c01df79614b73f7 +samsung-krzk dac677d8e797e95863510b43c98b81e60f24c206 +scmi b98e85977c50bfc53c88e6787f580668d80d140b +stm32 1aeb02d3f2c5a7a9f132ea748877012a48036d90 +sunxi c3f7c14856ebbeb8e9e19439b9f5ec66f88744b9 +tee 6a8b7e80105416cc7324fda295608ea2d3f98862 +tegra 650220c2b474332f78dbb20651f0e98d77af6fde +ti 6c1e5a8266dd76fd2abdf8c997425daf00f9767b +xilinx 0f133188d6b8e6978fa936caab3446b7b1781749 +clk b7c08e5d3824bc57182b308c1e158ddfdbe4cd00 +clk-imx 2838820800dcaa60f32bef715c7e2e87e049aebc +clk-renesas 4bce4bedbe6daa54cf701184601f913a0c00bb1c +csky 5195c35ac4f09bc45bde23b98d74c4f5d62bea65 +loongarch 2c10cda4b777be4be9d9e69e4f70c818dbb15e21 +m68k 48ceb35e72683dce009f2b47f6579b0a1f9d9768 +m68knommu 49827634a69baf5b0028aac2a2fb954d94774d9e +microblaze 65d6e954e37872fd9afb5ef3fc0481bb3c2f20f4 +mips 4d0f332a6fb65aac2fa98e61bbed4ac9dfcf0a01 +openrisc c289330331eb93bc6a3c68b9119ccd7d4285a4a2 +parisc-hd ce9ecca0238b140b88f43859b211c9fdfd8e5b70 +powerpc c7e0d9bb9154c6e6b2ac8746faba27b53393f25e +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +riscv-dt 81b5948cf1a7ad49ba72fa0674710bd3f44deb9e +riscv-soc 22dedf8f4570897f15e156ac5547cef93e802182 +s390 a8dbae76e7bc7d2294bb5d19ba81b0ef15d2d8ed +sh 246f80a0b17f8f582b2c0996db02998239057c65 +uml 974b808d85abbc03c3914af63d60d5816aabf2ca +xtensa a83a72730c330a57c1a07cd98603140f5fbe0bf9 +bcachefs 1a97b93a13f8f3d9c53be3eb27d0d3fee9084606 +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt 3e7807d5a7d770c59837026e9967fe99ad043174 +afs 0a278bc196e784b4849c1581266421adbca1989f +btrfs c6e8f898f56fae2cb5bc4396bec480f23cd8b066 +ceph 07bb00ef00ace88dd6f695fadbba76565756e55c +cifs bde45b6aa521aa5f976fd49020091a394661f2ba +configfs 77992f896745c63ae64bfccfdc429ab7b3d88da5 +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs 78a50b6a41665efeabeec5edbae245d8be93278c +exfat b3a62a9886007ce5e2b69e2b14fe41c50c6843d6 +ext3 21cdd81765e789bd9636445f626f71f4c63db89c +ext4 a37d4c46392e207518deb6533768986634b193c0 +f2fs 3e729e50d01e6a336132d1739866a6463f82faa9 +fsverity 919dc320956ea353a7fb2d84265195ad5ef525ac +fuse ae3024a4c4995ff6927882e800f9f447109e62ae +gfs2 18e0c7817d45152d46d01ef770ab5d6837b4f639 +jfs a779ed754e52d582b8c0e17959df063108bd0656 +ksmbd b0e493f09ffc108dcf4fabed2726147e2d505578 +nfs 9a3dad63edbe9a2ab2be1e7361a2133f519f855b +nfs-anna 6a6d4644ce935ddec4f76223ac0ca68da56bd2d3 +nfsd 2ce5c9d081682db9714e48d1ef3ca86630e5d6f7 +ntfs3 e4494770a5cad3c9d1d2a65ed15d07656c0d9b82 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs fbaf916f84f4728272482d2bfda98d5691618bd4 +ubifs 017c73a34a661a861712f7cc1393a123e5b2208c +v9fs 4ec5183ec48656cec489c49f989c508b68b518e3 +v9fs-ericvh 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +xfs cbc06310c36f73a5f3b0c6f0d974d60cf66d816b +zonefs 8812387d056957355ef1d026cd38bed3830649db +iomap 684f7e6d28e8087502fc8efdb6c9fe82400479dd +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner 216b1c1577a615379632d74cde662a97b4df6af1 +vfs cff4b23c731a1cbdf39d5ce180196b8dffb6c411 +printk a26f18f291f6c2eac6dac9faa12cc68fd1da5865 +pci 87a836d6fc7a82d13cef77cfa1c7bd6ab8f7304c +pstore a19d48f7c5d57c0f0405a7d4334d1d38fe9d3c1c +hid d4ce72c23d31592037f45496ff372d70c0c12a98 +i2c f168a3309a1877398c1b43b084c08d95165b9390 +i3c 57ec42b9a1b7e4db4a1c2aa4fcc4eefe6d31bcb8 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 443f1855047638fa27436dfdd1cb2d066408e748 +jc_docs f949cb759051b24aa6cacda73964327608c08a89 +v4l-dvb 2c1bae27df787c9535e48cc27bbd11c3c3e0a235 +v4l-dvb-next 94e27fbeca27d8c772fc2bc807730aaee5886055 +pm 8134843f53ba0826c8d090964f9bedeeea19c665 +cpufreq-arm 21135104a67ec0434fd0479fd663020d19ec68cd +cpupower 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +devfreq e50fa1a5ac52e2a2ec09b8028bdb1c4bf9166cbc +pmdomain 38a88d52dd372b3fe0d8f173c61b5159ea00a2cc +opp 4cd8fe2135128168c1cd80482359dc7a46550085 +thermal edd220b33f479cf9dcda0bfefb2cb8c5902e9885 +dlm eb53c01873cab75d0bf42e6d685dc5ef3b68d884 +rdma 5ac388db27c443dadfbb0b8b23fa7ccf429d901a +net-next c49bba011b51e44d45bbc279ef8f42d46f4b0700 +bpf-next 0e10fd4b7a6dd03cf6d1da293d5d50082917f0e0 +ipsec-next efedce336d71e238fbbada0f54b2bff9bf0509e9 +mlx5-next 82f9378c443c206d3f9e45844306e5270e7e4109 +netfilter-next 35715ac13a7781c8e7a28436477e9f359d9fda91 +ipvs-next 35715ac13a7781c8e7a28436477e9f359d9fda91 +bluetooth 8fa4c368ba691e6d92bc7a71279ed4ce5f1a6a1d +wireless-next b650981501bf00bc84f09cf3b3e0b6190cfed794 +wpan-next 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +wpan-staging 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +mtd 3cff177fc2793a362d784c912f536e69a755925e +nand 48919c6c48380aa1aec4243c7e6ad39e89d78539 +spi-nor 8f407eda173f1d43466636314c7aa30405e4dd67 +crypto 5b90073defd1a52aa8120403d79f6e0fc10c87ee +drm 389af786f92ecdff35883551d54bf4e507ffcccb +drm-ci ad6bfe1b66a5c146ec236847eca7af4c8806d666 +drm-misc 0ddd30471a5dd78ff762ffb9eeae1d573283243a +amdgpu c8e7df374ba2ce715ed7f3ceba34efdbfffcb0a9 +drm-intel 34d8311f4a1c464ae0ce4470f2e3932c1a40d83e +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm d3b4075b173f033387b614297bb4d998cf22c8bd +drm-msm-lumag d3b4075b173f033387b614297bb4d998cf22c8bd +etnaviv 925b10728f20c24516031060f3d01e4410c4a52a +fbdev c1a8d1d0edb71dec15c9649cb56866c71c1ecd9e +regmap 7b4d73072bcc2984ee3f32d3a78f1963316b4e97 +sound 2b17b489e47a956c8e93c8f1bcabb0343c851d90 +ieee1394 a464d2f75fa16689b2d0307248740d83828d9b0c +sound-asoc e38ab5e537b0309fde482411feac04d98190725a +modules 3111add7f414fddb587cf8e419df2d73500cb4e6 +input 6cd256694afe2a0a94f62418fea95279de2b7ada +block b7f443536443cafe2ce580fd8518522d438bb55c +device-mapper 1d99b7e950352ee4e8f786e0d13ceb31c078e98a +libata 2da4c5e24e86313fc09596ae775123b41055fd54 +pcmcia 4f733de8b78a209501041a4b0a44c83ece0e8933 +mmc a2b8fa785358f699e9736718f430cddf596cd79e +mfd b5cd5e72a71e9d368e20271d3a772dd045ae220e +backlight 40da4737717b252fd01d92ff38d3b95a491167cc +battery b3c3a197baf23ca445ba74e3c7c40cfacfedd9fb +regulator 80e3e6f2037d3e23cf4614b6a601c7b1b4c5a66d +security e508560672890b2873c89258b88fade1356392ce +apparmor 8884ba07786c718771cf7b78cb3024924b27ec2b +integrity c1f30e80ce2c36b1ca09229031fa80d12f271138 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux 19c1c9916dbf9b05157a0c4970f61f952c0cb86a +smack 3ad49d37cf5759c3b8b68d02e3563f633d9c1aee +tomoyo 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tpmdd 1c8b86a3799f7e5be903c3f49fcdaee29fd385b5 +watchdog db7673e6d5783a8664840b9218f58b5b836603ce +iommu 52e9fd0e9a6b8cf9895309678b378145bad1a75b +audit 97f576eb38ae219a6fb337d13586d8acbf01d3f8 +devicetree 00d589ace5f4edae7d5e5e5d0727196c8d681363 +dt-krzk d896029c9726830232899944d1927847cfc6a2d1 +mailbox a493208079e299aefdc15169dc80e3da3ebb718a +spi 713e934b741595b393b4004c8860f9bb99e0c1aa +tip 541c0b0e9d0a449422ce8ea7316b273efcbd9f5e +clockevents 0a8b07c77ea09602a152d3604e599f95726306d0 +edac 0fd934580ea3ea91052b999ff75017c3f08b9783 +irqchip 19b5a44bee16518104e8a159ab9a60788292fbd4 +ftrace fc1653abba0d554aad80224e51bcad42b09895ed +rcu c06828f759e856e1affb37e480ce13c4072a9039 +kvm ba8c993c3748931a307648616f68892bcb6afe28 +kvm-arm cad9fde0c878f60a4a0ef453429648638e40e87c +kvms390 899e2206f46aece42d8194c350bc1de71344dbc7 +kvm-ppc 476652297f94a2e5e5ef29e734b0da37ade94110 +kvm-riscv 62d0c458f828949dd01bfe41daf3bed73ab9e288 +kvm-x86 2bf2d3d16b8d7fe346a88569b6d786a3b18913dc +xen-tip 0fc6ff5a0f0488e09b496773c440ed5bb36d1f0d +percpu 3fcf62f24c80e2472f472778f317e062841c2d37 +workqueues ef3e4fbc60e34cdc94aeeca744360fb16cda29aa +drivers-x86 8abba08944663add37111dd6bc4f2916fd6d9085 +chrome-platform 466f70fb1b10fd139582646285e587fb38a9ff2c +chrome-platform-firmware 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +hsi 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj e0e29e434cdca9705eb420b3f26928444fa559f6 +ipmi b00839ca4cca8aa9641c121c848a553d6220ce70 +driver-core 36b2d7dd5a8ac95c8c1e69bdc93c4a6e2dc28a23 +usb 1034cc423f1b4a7a9a56d310ca980fcd2753e11d +thunderbolt 274baf695b08d34230253a792fcb3d6790040ab6 +usb-serial 8a749fd1a8720d4619c91c8b6e7528c0a355c0aa +tty dd976a97d15b47656991e185a94ef42a0fa5cfd4 +char-misc d712d205210c494c29f33dc1d1f2ce4d7448faa9 +accel 4db74c0fdeb8138f6438d42a015c5dcdb2e6874c +coresight c0a232f1e19e378c5c4e5973a996392942c80090 +fastrpc 9fffb8240581927a71ed0ae46a5e269dbc0f3e3f +fpga 33f9b88122625de77d14824a3f7e4901b1f25ae5 +icc 9330bf741fdac78c398a866f979fd29fea435a88 +iio 73006239ef2313f1986f86af86f8b06150a807e9 +phy-next 03c866cab420e2e3381ca817be664e714107e39b +soundwire 95b0f3aa71eb09d067d89395fdb7f2dd87feae18 +extcon da886ba844791d11c9d1526fddf8607eb0198243 +gnss 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +vfio bd885fcf28da7da6a2244d30cd45630303c781ed +w1 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +staging 25d367506a284bb0404b7d53b0b20c9bfb33f926 +counter-next 631c15d5f14dd25b2dd0401627b716087ceca343 +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 8bf914570650ec5858e18554d70d2838cef01de1 +cgroup ca2332016d316c5652fa31093f8b570b3a67fdbb +scsi e2187116a4dc2ac5f90dd2c85e5aea5f9ba7ca94 +scsi-mkp af46076d6640a5404ed65e1160df810fed54e7ac +vhost 1acfe2c1225899eab5ab724c91b7e1eb2881b9ab +rpmsg a7d272979d3a89b117ca2c547dc8a465c4f28635 +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl 8c85a102fc4e5c0c942c10677fa43f7a19baa92f +gpio-intel 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +pinctrl c766fd3059c080dca017c328481aa2ba0f707abb +pinctrl-intel 8d751da9f1d790f1d5e4b109eb0ad4a366d5efc8 +pinctrl-renesas 583d8073205566468abf3a34000fccdd1d19c9cc +pinctrl-samsung 8aec97decfd0f444a69a765b2f00d64b42752824 +pwm 4bb36d126cb3147d6bbfd00242a5b846dacad595 +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest 508934b5d15ab79fd5895cc2a6063bc9d95f6a55 +kunit 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +kunit-next 8040345fdae4cb256c5d981f91ae0f22bea8adcc +livepatching 602bf18307981f3bfd9ebf19921791a4256d3fd1 +rtc dc71c03b0a2937545d2c6ff89d2275890a309618 +nvdimm dd6cad2dcb581b2b15997b6e8d50de64644c3011 +at24 4791146e9055dd4c21a1a725514512167b8ee75b +ntb 9341b37ec17a8793e8439e9b18354ba69556b786 +seccomp ce9ecca0238b140b88f43859b211c9fdfd8e5b70 +fsi f04d61a379d65794d5d85168b84dcdf01d426f7c +slimbus 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +nvmem d79c910284d25331fd26fd8bc088b8b6e8aa8b03 +xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af +hyperv ce9ecca0238b140b88f43859b211c9fdfd8e5b70 +auxdisplay 35b464e32c8bccef435e415db955787ead4ab44c +kgdb b6464883f45ae6412de33e53587974fd86ba811e +hmm 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi 0724869ede9c169429bb622e2d28f97995a95656 +memblock 0f5e4adb608c79bedd8ced30f9ffdcfa01c37459 +cxl fe77cc2e5a6a7c85f5c6ef8a39d7694ffc7f41c9 +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi b691118f2c44d16b84fc65b8147b33620eb18cac +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab e050a704f3c360d085f4ed7bc5c7ac9500551dc3 +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock 96e033d649b375df8bd550beb2813cc3f32b566f +rust a7135d10754760f0c038497b44c2c2f2b0fb5651 +sysctl ccee9a2a8c002516d4252952df836abeaddfa39c +execve 21ca59b365c091d583f36ac753eaa8baf947be6f +bitmap b9c957f5544422461e17b1010fa9114024632d7a +hte 091ac92dc79e35ba208b022936dc9f13e0bbad7c +kspp faed498d0db78adc1eee6bab3a8480bcb7e17e6e +kspp-gustavo 4d8cbf6dbcdaebe949461b0a933ae4c71cb53edc +nolibc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +iommufd c97d1b20d3835178bcd0e3a86c20ce4e36b6d80c diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..5f572b30b390 --- /dev/null +++ b/Next/Trees @@ -0,0 +1,372 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-current +fsverity-current git git://git.kernel.org/pub/scm/fs/fsverity/linux.git#for-current +net git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git#main +bpf git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git#master +ipsec git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git#master +netfilter git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git#main +ipvs git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git#main +wireless git git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git#for-next +wpan git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git#master +rdma-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-rc +sound-current git git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git#for-linus +sound-asoc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git#for-linus +regmap-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git#for-linus +regulator-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git#for-linus +spi-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git#for-linus +pci-current git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#for-linus +driver-core.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/driver-core.git#driver-core-linus +tty.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git#tty-linus +usb.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git#usb-linus +usb-serial-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git#usb-linus +phy git git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git#fixes +staging.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git#staging-linus +iio-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git#fixes-togreg +counter-current git git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git#counter-current +char-misc.current git git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git#char-misc-linus +soundwire-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git#fixes +thunderbolt-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git#fixes +input-current git git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git#for-linus +crypto-current git git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6.git#master +vfio-fixes git git://github.com/awilliam/linux-vfio.git#for-linus +kselftest-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#fixes +modules-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git#modules-linus +dmaengine-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git#fixes +backlight-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git#for-backlight-fixes +mtd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git#mtd/fixes +mfd-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git#for-mfd-fixes +v4l-dvb-fixes git https://git.linuxtv.org/media_stage.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/perf/perf-tools#perf-tools +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 +v9fs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git#fixes/next +w1-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#fixes +pmdomain-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#fixes +overlayfs-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git#ovl-fixes +drm-misc-fixes git git://anongit.freedesktop.org/drm/drm-misc#for-linux-next-fixes +mm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-stable +mm-nonmm-stable git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-nonmm-stable +mm git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-everything +kbuild git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#for-next +clang-format git https://github.com/ojeda/linux.git#clang-format +perf git git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git#perf-tools-next +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 +csky git git://github.com/c-sky/csky-linux.git#linux-next +loongarch git git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git#loongarch-next +m68k git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-next +m68knommu git git://git.kernel.org/pub/scm/linux/kernel/git/gerg/m68knommu.git#for-next +microblaze git git://git.monstr.eu/linux-2.6-microblaze.git#next +mips git git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git#mips-next +openrisc git git://github.com/openrisc/linux.git#for-next +parisc-hd git git://git.kernel.org/pub/scm/linux/kernel/git/deller/parisc-linux.git#for-next +powerpc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#next +soc-fsl git git://git.kernel.org/pub/scm/linux/kernel/git/leo/linux.git#next +risc-v git git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git#for-next +riscv-dt git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-dt-for-next +riscv-soc git git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git#riscv-soc-for-next +s390 git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#for-next +sh git git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-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 +bcachefs git https://evilpiepirate.org/git/bcachefs.git#for-next +pidfd git git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git#for-next +fscrypt git git://git.kernel.org/pub/scm/fs/fscrypt/linux.git#for-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/overlayfs/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-brauner git git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git#vfs.all +vfs git git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git#for-next +printk git git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git#for-next +pci git git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git#next +pstore git git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git#for-next/pstore +hid git git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git#for-next +i2c git git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git#i2c/for-next +i3c git git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git#i3c/next +dmi git git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git#dmi-for-next +hwmon-staging git git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git#hwmon-next +jc_docs git git://git.lwn.net/linux.git#docs-next +v4l-dvb git git://linuxtv.org/media_tree.git#master +v4l-dvb-next git git://linuxtv.org/mchehab/media-next.git#master +pm git git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git#linux-next +cpufreq-arm git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#cpufreq/arm/linux-next +cpupower git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux.git#cpupower +devfreq git git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git#devfreq-next +pmdomain git git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git#next +opp git git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git#opp/linux-next +thermal git git://git.kernel.org/pub/scm/linux/kernel/git/thermal/linux.git#thermal/linux-next +dlm git git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git#next +rdma git git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git#for-next +net-next git git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git#main +bpf-next git git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git#for-next +ipsec-next git git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git#master +mlx5-next git git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git#mlx5-next +netfilter-next git git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git#main +ipvs-next git git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git#main +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 +wpan-next git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#master +wpan-staging git git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git#staging +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-ci git git://git.freedesktop.org/git/drm/drm.git#topic/drm-ci +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 +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 +ieee1394 git https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.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 +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-ppc git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#topic/ppc-kvm +kvm-riscv git https://github.com/kvm-riscv/linux.git#riscv_kvm_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 +chrome-platform-firmware git git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git#for-firmware-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 +fastrpc git git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git#for-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 +w1 git git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git#for-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 +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#slab/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 +nolibc git git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git#nolibc +iommufd git git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git#for-next diff --git a/Next/merge.log b/Next/merge.log new file mode 100644 index 000000000000..b7bb9cc43f17 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,14992 @@ +$ date -R +Mon, 16 Oct 2023 08:35:04 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +Updating files: 57% (5435/9448)
Updating files: 58% (5480/9448)
Updating files: 59% (5575/9448)
Updating files: 60% (5669/9448)
Updating files: 61% (5764/9448)
Updating files: 62% (5858/9448)
Updating files: 63% (5953/9448)
Updating files: 64% (6047/9448)
Updating files: 65% (6142/9448)
Updating files: 66% (6236/9448)
Updating files: 67% (6331/9448)
Updating files: 68% (6425/9448)
Updating files: 69% (6520/9448)
Updating files: 70% (6614/9448)
Updating files: 71% (6709/9448)
Updating files: 72% (6803/9448)
Updating files: 73% (6898/9448)
Updating files: 74% (6992/9448)
Updating files: 75% (7086/9448)
Updating files: 76% (7181/9448)
Updating files: 77% (7275/9448)
Updating files: 78% (7370/9448)
Updating files: 79% (7464/9448)
Updating files: 80% (7559/9448)
Updating files: 81% (7653/9448)
Updating files: 82% (7748/9448)
Updating files: 83% (7842/9448)
Updating files: 84% (7937/9448)
Updating files: 85% (8031/9448)
Updating files: 86% (8126/9448)
Updating files: 87% (8220/9448)
Updating files: 88% (8315/9448)
Updating files: 89% (8409/9448)
Updating files: 90% (8504/9448)
Updating files: 91% (8598/9448)
Updating files: 92% (8693/9448)
Updating files: 93% (8787/9448)
Updating files: 94% (8882/9448)
Updating files: 95% (8976/9448)
Updating files: 96% (9071/9448)
Updating files: 97% (9165/9448)
Updating files: 98% (9260/9448)
Updating files: 99% (9354/9448)
Updating files: 100% (9448/9448)
Updating files: 100% (9448/9448), done. +HEAD is now at e8c127b05766 Merge tag 'net-6.6-rc6' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net +Merging origin/master (58720809f527 Linux 6.6-rc6) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating e8c127b05766..58720809f527 +Fast-forward (no commit created; -m option ignored) + Documentation/ABI/testing/sysfs-class-firmware | 14 +- + Documentation/core-api/workqueue.rst | 4 +- + .../bindings/dma/xilinx/xlnx,zynqmp-dma-1.0.yaml | 3 + + .../devicetree/bindings/iio/adc/adi,ad7292.yaml | 2 +- + .../bindings/iio/light/rohm,bu27010.yaml | 1 + + Documentation/filesystems/overlayfs.rst | 12 ++ + .../process/embargoed-hardware-issues.rst | 19 ++- + .../translations/zh_CN/core-api/workqueue.rst | 2 +- + MAINTAINERS | 2 +- + Makefile | 2 +- + arch/ia64/include/asm/cpu.h | 5 - + arch/ia64/kernel/topology.c | 2 +- + arch/powerpc/include/asm/nohash/32/pte-8xx.h | 7 + + arch/powerpc/include/asm/nohash/64/pgtable.h | 2 +- + arch/powerpc/include/asm/nohash/pgtable.h | 2 + + arch/powerpc/kernel/entry_32.S | 8 +- + arch/powerpc/kernel/head_85xx.S | 2 +- + arch/powerpc/platforms/pseries/hvCall.S | 8 +- + arch/riscv/Makefile | 1 - + arch/riscv/errata/andes/Makefile | 4 + + arch/riscv/include/asm/ftrace.h | 21 +++ + arch/riscv/include/asm/kprobes.h | 9 ++ + arch/riscv/include/asm/uprobes.h | 11 ++ + arch/riscv/kernel/irq.c | 4 +- + arch/riscv/kernel/setup.c | 13 -- + arch/riscv/kernel/signal.c | 7 - + arch/riscv/kernel/traps.c | 28 ++-- + arch/x86/events/utils.c | 5 +- + arch/x86/include/asm/cpu.h | 2 - + arch/x86/include/asm/msr-index.h | 9 +- + arch/x86/include/asm/smp.h | 1 - + arch/x86/kernel/alternative.c | 13 ++ + arch/x86/kernel/cpu/amd.c | 8 ++ + arch/x86/kernel/cpu/resctrl/monitor.c | 10 +- + arch/x86/kernel/smp.c | 39 +----- + arch/x86/kernel/smpboot.c | 27 ---- + arch/x86/kernel/topology.c | 2 +- + block/fops.c | 21 ++- + drivers/acpi/acpi_processor.c | 1 + + drivers/acpi/ec.c | 11 ++ + drivers/acpi/resource.c | 26 +++- + drivers/android/binder.c | 2 + + drivers/counter/counter-chrdev.c | 4 +- + drivers/counter/microchip-tcb-capture.c | 2 +- + drivers/dma-buf/dma-fence-unwrap.c | 13 +- + drivers/dma-buf/sync_file.c | 9 +- + drivers/dma/fsl-edma-common.c | 25 +++- + drivers/dma/fsl-edma-common.h | 14 +- + drivers/dma/fsl-edma-main.c | 8 +- + drivers/dma/idxd/device.c | 5 +- + drivers/dma/mediatek/mtk-uart-apdma.c | 3 +- + drivers/dma/ste_dma40.c | 1 + + drivers/dma/stm32-dma.c | 11 +- + drivers/dma/stm32-mdma.c | 33 +++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.h | 2 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 3 + + drivers/gpu/drm/drm_atomic_helper.c | 17 ++- + drivers/gpu/drm/drm_gem.c | 6 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_plane.c | 27 ++-- + drivers/gpu/drm/msm/dp/dp_ctrl.c | 13 +- + drivers/gpu/drm/msm/dp/dp_link.c | 4 +- + drivers/gpu/drm/msm/dsi/dsi_host.c | 19 ++- + drivers/gpu/drm/msm/msm_mdss.c | 2 +- + drivers/gpu/drm/panel/panel-boe-tv101wum-nl6.c | 4 +- + drivers/gpu/drm/scheduler/sched_main.c | 2 +- + drivers/gpu/drm/tiny/simpledrm.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.c | 7 +- + drivers/gpu/drm/vmwgfx/vmwgfx_bo.h | 17 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_cotable.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_drv.h | 4 + + drivers/gpu/drm/vmwgfx/vmwgfx_execbuf.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 18 ++- + drivers/gpu/drm/vmwgfx/vmwgfx_kms.c | 6 +- + drivers/gpu/drm/vmwgfx/vmwgfx_overlay.c | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_resource.c | 12 +- + drivers/gpu/drm/vmwgfx/vmwgfx_shader.c | 4 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 29 ++--- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 27 ++-- + drivers/iio/adc/ad7192.c | 29 ++++- + drivers/iio/adc/imx8qxp-adc.c | 4 +- + drivers/iio/addac/Kconfig | 2 + + .../common/cros_ec_sensors/cros_ec_sensors_core.c | 6 +- + drivers/iio/dac/ad3552r.c | 4 +- + drivers/iio/frequency/admv1013.c | 4 +- + drivers/iio/imu/bno055/Kconfig | 2 + + drivers/iio/light/vcnl4000.c | 1 - + drivers/iio/pressure/bmp280-core.c | 2 +- + drivers/iio/pressure/dps310.c | 8 +- + drivers/iio/pressure/ms5611_core.c | 2 +- + drivers/iio/proximity/irsd200.c | 6 +- + drivers/input/joystick/xpad.c | 4 + + drivers/input/misc/powermate.c | 1 + + drivers/input/mouse/elantech.c | 1 + + drivers/input/mouse/psmouse-smbus.c | 19 +-- + drivers/input/mouse/synaptics.c | 2 + + drivers/input/rmi4/rmi_smbus.c | 50 +++---- + drivers/input/serio/i8042-acpipnpio.h | 8 ++ + drivers/input/touchscreen/goodix.c | 19 +++ + drivers/mcb/mcb-core.c | 10 +- + drivers/mcb/mcb-parse.c | 2 - + drivers/media/i2c/ov8858.c | 10 +- + drivers/media/pci/intel/ipu-bridge.c | 4 +- + drivers/media/platform/xilinx/xilinx-vipp.c | 15 ++- + drivers/media/v4l2-core/v4l2-subdev.c | 7 + + drivers/net/virtio_net.c | 16 +-- + drivers/perf/riscv_pmu.c | 3 +- + drivers/perf/riscv_pmu_sbi.c | 16 ++- + drivers/power/supply/qcom_battmgr.c | 8 +- + drivers/soundwire/Makefile | 4 + + drivers/soundwire/bus.c | 31 +---- + drivers/soundwire/bus_type.c | 11 +- + drivers/soundwire/irq.c | 59 +++++++++ + drivers/soundwire/irq.h | 43 +++++++ + drivers/thunderbolt/icm.c | 40 +++--- + drivers/thunderbolt/switch.c | 7 + + drivers/thunderbolt/tmu.c | 2 +- + drivers/thunderbolt/xdomain.c | 58 ++++++--- + drivers/tty/serial/8250/8250_omap.c | 25 ++-- + drivers/tty/serial/serial_core.c | 15 ++- + drivers/ufs/core/ufshcd.c | 2 +- + drivers/usb/cdns3/cdnsp-gadget.c | 3 + + drivers/usb/cdns3/core.h | 3 +- + drivers/usb/core/hub.c | 25 +++- + drivers/usb/core/hub.h | 2 +- + drivers/usb/dwc3/core.c | 39 +++++- + drivers/usb/gadget/function/f_ncm.c | 26 +++- + drivers/usb/gadget/udc/udc-xilinx.c | 20 +-- + drivers/usb/host/xhci-hub.c | 19 +-- + drivers/usb/host/xhci-mem.c | 4 +- + drivers/usb/host/xhci-ring.c | 16 ++- + drivers/usb/host/xhci.h | 2 +- + drivers/usb/misc/onboard_usb_hub.c | 1 + + drivers/usb/misc/onboard_usb_hub.h | 1 + + drivers/usb/musb/musb_debugfs.c | 2 +- + drivers/usb/musb/musb_host.c | 9 +- + drivers/usb/typec/altmodes/displayport.c | 5 + + .../usb/typec/tcpm/qcom/qcom_pmic_typec_pdphy.c | 12 +- + drivers/usb/typec/ucsi/psy.c | 9 ++ + drivers/usb/typec/ucsi/ucsi.c | 2 + + fs/ceph/crypto.c | 2 +- + fs/ceph/file.c | 2 +- + fs/ceph/inode.c | 4 +- + fs/fs_context.c | 34 ++++- + fs/overlayfs/params.c | 117 ++++++++--------- + fs/smb/client/cached_dir.c | 143 ++++++++++----------- + fs/smb/client/cached_dir.h | 2 +- + fs/smb/server/smb2pdu.c | 11 +- + fs/smb/server/vfs_cache.c | 7 +- + fs/xfs/libxfs/xfs_ag.c | 6 + + fs/xfs/scrub/xfile.c | 1 - + fs/xfs/xfs_extent_busy.c | 3 +- + fs/xfs/xfs_iops.c | 5 + + fs/xfs/xfs_notify_failure.c | 6 +- + include/acpi/processor.h | 5 - + include/linux/cgroup-defs.h | 2 +- + include/linux/cpu.h | 2 + + include/linux/dma-fence.h | 19 +++ + include/linux/fs_context.h | 2 + + include/linux/mcb.h | 1 - + kernel/cgroup/cgroup-v1.c | 5 +- + kernel/sched/fair.c | 73 +++++++++-- + kernel/workqueue.c | 24 +++- + net/ceph/messenger.c | 4 +- + sound/soc/ti/ams-delta.c | 4 +- + tools/testing/selftests/riscv/mm/Makefile | 6 +- + .../riscv/mm/{testcases => }/mmap_bottomup.c | 2 +- + .../riscv/mm/{testcases => }/mmap_default.c | 2 +- + .../selftests/riscv/mm/{testcases => }/mmap_test.h | 0 + .../selftests/riscv/mm/{testcases => }/run_mmap.sh | 0 + 170 files changed, 1278 insertions(+), 727 deletions(-) + create mode 100644 drivers/soundwire/irq.c + create mode 100644 drivers/soundwire/irq.h + rename tools/testing/selftests/riscv/mm/{testcases => }/mmap_bottomup.c (97%) + rename tools/testing/selftests/riscv/mm/{testcases => }/mmap_default.c (97%) + rename tools/testing/selftests/riscv/mm/{testcases => }/mmap_test.h (100%) + rename tools/testing/selftests/riscv/mm/{testcases => }/run_mmap.sh (100%) +Merging fixes/fixes (2dde18cd1d8f Linux 6.5) +$ 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 (836ff2cb6c5c selftests/clone3: Fix broken test under !CONFIG_TIME_NS) +$ 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 +Merge made by the 'ort' strategy. + .mailmap | 6 +- + MAINTAINERS | 2 +- + arch/riscv/mm/fault.c | 2 +- + arch/riscv/mm/hugetlbpage.c | 19 ++++-- + include/linux/hugetlb.h | 41 ++++++++++++- + include/linux/kasan.h | 6 +- + include/linux/mmzone.h | 11 +++- + lib/maple_tree.c | 2 +- + lib/test_maple_tree.c | 35 +++++++---- + mm/damon/sysfs.c | 7 ++- + mm/hugetlb.c | 84 ++++++++++++++++++++------- + mm/kasan/report.c | 4 +- + mm/madvise.c | 11 ++++ + mm/memory.c | 16 +++-- + mm/mempolicy.c | 4 +- + mm/migrate.c | 14 ++++- + mm/mmap.c | 46 ++++++++++----- + mm/page_alloc.c | 2 +- + mm/shmem.c | 19 +++++- + mm/sparse.c | 14 +++-- + mm/zswap.c | 4 +- + tools/include/linux/rwsem.h | 40 +++++++++++++ + tools/testing/selftests/clone3/clone3.c | 7 ++- + tools/testing/selftests/mm/mremap_dontunmap.c | 1 + + 24 files changed, 311 insertions(+), 86 deletions(-) + create mode 100644 tools/include/linux/rwsem.h +Merging kbuild-current/fixes (8a749fd1a872 Linux 6.6-rc4) +$ 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 (2dde18cd1d8f Linux 6.5) +$ git merge -m Merge branch 'fixes' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm-current/fixes +Already up to date. +Merging arm64-fixes/for-next/fixes (4785aa802853 cpuidle, ACPI: Evaluate LPI arch_flags for broadcast timer) +$ git merge -m Merge branch 'for-next/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux arm64-fixes/for-next/fixes +Already up to date. +Merging arm-soc-fixes/arm/fixes (26de14831cf6 IXP4xx MAINTAINERS entries) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +Already up to date. +Merging davinci-current/davinci/for-current (06c2afb862f9 Linux 6.5-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 (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'fixes' of https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git drivers-memory-fixes/fixes +Already up to date. +Merging tee-fixes/fixes (ceaa837f96ad Linux 6.2-rc8) +$ git merge -m Merge branch 'fixes' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee-fixes/fixes +Already up to date. +Merging m68k-current/for-linus (eb1e6ccdcf78 zorro: Include zorro.h in names.c) +$ 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 (ff9e8f415136 powerpc/mm: Allow ARCH_FORCE_MAX_ORDER up to 12) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Merge made by the 'ort' strategy. + arch/powerpc/Kconfig | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging s390-fixes/fixes (5c95bf274665 s390/cert_store: fix string length handling) +$ 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 (4bcf6f827a79 fscrypt: check for NULL keyring in fscrypt_put_master_key_activeref()) +$ 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 (a075bacde257 fsverity: don't drop pagecache at end of FS_IOC_ENABLE_VERITY) +$ git merge -m Merge branch 'for-current' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity-current/for-current +Already up to date. +Merging net/main (883f0dc0e4f6 Merge branch 'ovs-selftests') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net.git net/main +Merge made by the 'ort' strategy. + Documentation/netlink/specs/devlink.yaml | 18 +++--- + Documentation/networking/representors.rst | 8 ++- + drivers/net/bonding/bond_main.c | 2 +- + drivers/net/dsa/bcm_sf2.c | 24 +++++--- + .../chelsio/inline_crypto/chtls/chtls_io.c | 36 +++++++++--- + drivers/net/ethernet/intel/i40e/i40e_common.c | 4 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 3 +- + drivers/net/ethernet/intel/ice/ice_main.c | 18 ++++++ + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 64 ++++++++++------------ + .../ethernet/mellanox/mlx5/core/diag/fw_tracer.c | 2 +- + .../ethernet/mellanox/mlx5/core/en/rep/bridge.c | 11 ++++ + .../ethernet/mellanox/mlx5/core/en/tc_tun_encap.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 8 +-- + drivers/net/ethernet/mellanox/mlx5/core/en_rep.c | 10 +++- + drivers/net/ethernet/mellanox/mlx5/core/en_rx.c | 35 +++++++++--- + drivers/net/ethernet/mellanox/mlx5/core/en_stats.h | 11 +++- + drivers/net/ethernet/mellanox/mlx5/core/en_tc.c | 5 +- + .../net/ethernet/mellanox/mlx5/core/esw/bridge.c | 25 ++++++++- + .../net/ethernet/mellanox/mlx5/core/esw/bridge.h | 3 + + .../ethernet/mellanox/mlx5/core/esw/bridge_priv.h | 1 + + drivers/net/ethernet/mellanox/mlx5/core/eswitch.c | 17 +++--- + drivers/net/ethernet/qlogic/qed/qed_ll2.c | 7 ++- + drivers/net/ethernet/ti/icssg/icssg_stats.c | 9 +++ + include/linux/virtio_net.h | 19 ++++++- + include/net/sock.h | 10 ++-- + net/core/stream.c | 12 ++-- + net/ipv4/af_inet.c | 10 +++- + net/ipv4/inet_connection_sock.c | 1 - + net/ipv4/inet_hashtables.c | 24 +++----- + net/ipv4/tcp.c | 16 +++--- + net/ipv4/tcp_bpf.c | 4 ++ + net/mptcp/protocol.c | 7 --- + net/netfilter/nf_tables_api.c | 25 ++++----- + net/netfilter/nfnetlink_log.c | 2 +- + net/netfilter/nft_inner.c | 1 + + net/netfilter/nft_payload.c | 2 +- + net/netfilter/nft_set_pipapo.h | 2 +- + net/smc/af_smc.c | 3 +- + net/smc/smc_ib.c | 7 ++- + net/smc/smc_ib.h | 2 +- + net/tls/tls_main.c | 10 +++- + net/tls/tls_sw.c | 19 +++++-- + tools/net/ynl/generated/devlink-user.c | 54 +++++++++--------- + tools/testing/selftests/net/fib_tests.sh | 7 ++- + .../selftests/net/openvswitch/openvswitch.sh | 21 ++++++- + .../testing/selftests/net/openvswitch/ovs-dpctl.py | 48 +++++++++++++++- + 46 files changed, 419 insertions(+), 211 deletions(-) +Merging bpf/master (a307f5a24924 bpf: Avoid unnecessary -EBUSY from htab_lock_bucket) +$ 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. + kernel/bpf/hashtab.c | 7 +++++-- + 1 file changed, 5 insertions(+), 2 deletions(-) +Merging ipsec/master (513f61e21933 net: ipv4: fix return value check in esp_remove_trailer) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Auto-merging net/ipv6/xfrm6_policy.c +Merge made by the 'ort' strategy. + include/net/netns/xfrm.h | 1 + + net/ipv4/esp4.c | 4 +++- + net/ipv6/esp6.c | 4 +++- + net/ipv6/xfrm6_policy.c | 4 ++-- + net/xfrm/xfrm_interface_core.c | 22 ++++++++++------------ + net/xfrm/xfrm_policy.c | 25 +++++++++++++++---------- + 6 files changed, 34 insertions(+), 26 deletions(-) +Merging netfilter/main (2d1c882d4434 Merge tag 'mlx5-fixes-2023-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf.git netfilter/main +Already up to date. +Merging ipvs/main (2d1c882d4434 Merge tag 'mlx5-fixes-2023-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs.git ipvs/main +Already up to date. +Merging wireless/for-next (f2ac54ebf856 net: rfkill: reduce data->mtx scope in rfkill_fop_open) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Merge made by the 'ort' strategy. + net/mac80211/key.c | 3 +-- + net/rfkill/core.c | 5 ++--- + net/rfkill/rfkill-gpio.c | 4 ++-- + net/wireless/core.c | 2 +- + 4 files changed, 6 insertions(+), 8 deletions(-) +Merging wpan/master (2d1c882d4434 Merge tag 'mlx5-fixes-2023-10-12' of git://git.kernel.org/pub/scm/linux/kernel/git/saeed/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan.git wpan/master +Already up to date. +Merging rdma-fixes/for-rc (94f6f0550c62 Linux 6.6-rc5) +$ git merge -m Merge branch 'for-rc' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma-fixes/for-rc +Already up to date. +Merging sound-current/for-linus (4a63e68a2951 ALSA: usb-audio: Fix microphone sound on Nexigo webcam.) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound-current/for-linus +Already up to date. +Merging sound-asoc-fixes/for-linus (9c97790a07dc ASoC: dwc: Fix non-DT instantiation) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + .../devicetree/bindings/sound/cirrus,cs42l43.yaml | 2 +- + include/sound/soc-dapm.h | 1 + + sound/soc/codecs/cs35l56.c | 8 ++- + sound/soc/codecs/cs42l42-sdw.c | 1 + + sound/soc/codecs/cs42l43-jack.c | 2 +- + sound/soc/codecs/lpass-wsa-macro.c | 4 +- + sound/soc/codecs/rt5645.c | 2 + + sound/soc/codecs/tas2780.c | 2 +- + sound/soc/codecs/wcd938x-sdw.c | 27 +++++++- + sound/soc/codecs/wcd938x.c | 76 ++++++++++++++++------ + sound/soc/dwc/dwc-i2s.c | 2 +- + sound/soc/pxa/pxa-ssp.c | 2 +- + sound/soc/soc-component.c | 1 + + sound/soc/soc-dapm.c | 12 ++++ + 14 files changed, 114 insertions(+), 28 deletions(-) +Merging regmap-fixes/for-linus (7a795ac8d49e regmap: rbtree: Fix wrong register marked as in-cache when creating new node) +$ 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 (6e800968f6a7 regulator/core: Revert "fix kobject release warning and memory leak in regulator_register()") +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regulator.git regulator-fixes/for-linus +Already up to date. +Merging spi-fixes/for-linus (2ec8b0109790 spi: npcm-fiu: Fix UMA reads when dummy.nbytes == 0) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/spi/spi-npcm-fiu.c | 5 +++-- + 1 file changed, 3 insertions(+), 2 deletions(-) +Merging pci-current/for-linus (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci-current/for-linus +Already up to date. +Merging driver-core.current/driver-core-linus (8a749fd1a872 Linux 6.6-rc4) +$ 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 (b3fa3cf02e3c ASoC: ti: ams-delta: Fix cx81801_receive() argument types) +$ 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 (c9ca8de2eb15 usb: typec: ucsi: Use GET_CAPABILITY attributes data to set power supply scope) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb.current/usb-linus +Already up to date. +Merging usb-serial-fixes/usb-linus (064f6e2ba9eb USB: serial: option: add entry for Sierra EM9191 with new firmware) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Merge made by the 'ort' strategy. + drivers/usb/serial/option.c | 2 ++ + 1 file changed, 2 insertions(+) +Merging phy/fixes (089667aaaa6a phy: realtek: Realtek PHYs should depend on ARCH_REALTEK) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Merge made by the 'ort' strategy. + .../bindings/phy/qcom,ipq8074-qmp-pcie-phy.yaml | 2 +- + drivers/phy/motorola/phy-mapphone-mdm6600.c | 38 ++++++++++------------ + drivers/phy/qualcomm/phy-qcom-apq8064-sata.c | 2 +- + drivers/phy/qualcomm/phy-qcom-m31.c | 7 ++-- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 6 +++- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v6.h | 3 +- + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 24 +++++++++++--- + drivers/phy/realtek/Kconfig | 5 +++ + drivers/phy/realtek/phy-rtk-usb2.c | 10 ++---- + drivers/phy/realtek/phy-rtk-usb3.c | 10 ++---- + 10 files changed, 58 insertions(+), 49 deletions(-) +Merging staging.current/staging-linus (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 (e2bd8c28b9bd iio: adc: xilinx-xadc: Correct temperature offset/scale for UltraScale) +$ 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. + .../devicetree/bindings/iio/addac/adi,ad74115.yaml | 3 +- + .../devicetree/bindings/iio/dac/adi,ad5758.yaml | 3 +- + .../devicetree/bindings/iio/health/ti,afe4403.yaml | 3 +- + .../devicetree/bindings/iio/health/ti,afe4404.yaml | 3 +- + drivers/iio/adc/xilinx-xadc-core.c | 39 ++++++++-------------- + drivers/iio/adc/xilinx-xadc.h | 2 ++ + 6 files changed, 24 insertions(+), 29 deletions(-) +Merging counter-current/counter-current (df8fdd01c98b counter: microchip-tcb-capture: Fix the use of internal GCLK logic) +$ 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 (ffd1f150fffe Merge tag 'iio-fixes-for-6.6a' of https://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio into char-misc-linus) +$ 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 (3b6c4a11bf2b soundwire: bus: Make IRQ handling conditionally built) +$ 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 (ec4405ed9203 thunderbolt: Call tb_switch_put() once DisplayPort bandwidth request is finished) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt-fixes/fixes +Merge made by the 'ort' strategy. + drivers/thunderbolt/tb.c | 10 ++++++---- + 1 file changed, 6 insertions(+), 4 deletions(-) +Merging input-current/for-linus (5c15c60e7be6 Input: powermate - fix use-after-free in powermate_config_complete) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input-current/for-linus +Already up to date. +Merging crypto-current/master (152d0bcdf1ef dm crypt: Fix reqsize in crypt_iv_eboiv_gen) +$ 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 (c777b11d34e0 vfio/mdev: Fix a null-ptr-deref bug for mdev_unregister_parent()) +$ 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 (6f874fa021df selftests: Fix wrong TARGET in kselftest top level Makefile) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest-fixes/fixes +Already up to date. +Merging modules-fixes/modules-linus (f412eef03938 Documentation: livepatch: module-elf-format: Remove local klp_modinfo definition) +$ git merge -m Merge branch 'modules-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules-fixes/modules-linus +Already up to date. +Merging dmaengine-fixes/fixes (3fa53518ad41 dmaengine: fsl-edma: fix all channels requested when call fsl_edma3_xlate()) +$ 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 (5279f4a9eed3 mtd: rawnand: qcom: Unmap the right resource upon probe failure) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Merge made by the 'ort' strategy. + drivers/mtd/maps/physmap-core.c | 11 +++++++++++ + drivers/mtd/nand/raw/arasan-nand-controller.c | 16 ++++++++++++++-- + drivers/mtd/nand/raw/marvell_nand.c | 23 ++++++++++++++++++++++- + drivers/mtd/nand/raw/pl35x-nand-controller.c | 9 +++++++++ + drivers/mtd/nand/raw/qcom_nandc.c | 2 +- + drivers/mtd/nand/spi/micron.c | 2 +- + 6 files changed, 58 insertions(+), 5 deletions(-) +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 (c46f16f156ac media: i2c: ov8858: Don't set fwnode in the driver) +$ git merge -m Merge branch 'fixes' of https://git.linuxtv.org/media_stage.git v4l-dvb-fixes/fixes +Already up to date. +Merging reset-fixes/reset/fixes (3a2390c6777e reset: uniphier-glue: Fix possible null-ptr-deref) +$ git merge -m Merge branch 'reset/fixes' of https://git.pengutronix.de/git/pza/linux reset-fixes/reset/fixes +Already up to date. +Merging mips-fixes/mips-fixes (8a749fd1a872 Linux 6.6-rc4) +$ 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 (0b9a4a67c60d clk: ti: Fix missing omap5 mcbsp functional clock and aliases) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/tmlind/linux-omap.git omap-fixes/fixes +Merge made by the 'ort' strategy. + arch/arm/boot/dts/ti/omap/omap4-l4-abe.dtsi | 6 +++ + arch/arm/boot/dts/ti/omap/omap4-l4.dtsi | 2 + + arch/arm/boot/dts/ti/omap/omap5-l4-abe.dtsi | 6 +++ + arch/arm/mach-omap1/board-ams-delta.c | 60 ++++++++--------------------- + arch/arm/mach-omap1/timer32k.c | 14 +++---- + arch/arm/mach-omap2/omap_hwmod.c | 2 +- + drivers/clk/ti/clk-44xx.c | 5 +++ + drivers/clk/ti/clk-54xx.c | 4 ++ + 8 files changed, 47 insertions(+), 52 deletions(-) +Merging kvm-fixes/master (ba8c993c3748 x86/cpu: amd: fix warning in W=1 build) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Merge made by the 'ort' strategy. + arch/arm64/include/asm/kvm_arm.h | 4 +- + arch/arm64/kvm/arch_timer.c | 13 +-- + arch/arm64/kvm/emulate-nested.c | 2 + + arch/arm64/kvm/hyp/vhe/switch.c | 44 +++++++++ + arch/arm64/kvm/pmu.c | 4 +- + arch/arm64/kvm/sys_regs.c | 4 +- + arch/mips/kvm/mmu.c | 3 +- + arch/s390/kvm/interrupt.c | 16 ++- + arch/x86/include/asm/fpu/api.h | 3 +- + arch/x86/include/asm/kvm_host.h | 1 - + arch/x86/include/asm/svm.h | 1 + + arch/x86/kernel/cpu/microcode/amd.c | 2 +- + arch/x86/kernel/fpu/core.c | 5 +- + arch/x86/kernel/fpu/xstate.c | 12 +-- + arch/x86/kernel/fpu/xstate.h | 3 +- + arch/x86/kvm/cpuid.c | 8 -- + arch/x86/kvm/lapic.c | 8 +- + arch/x86/kvm/pmu.c | 27 +---- + arch/x86/kvm/pmu.h | 6 ++ + arch/x86/kvm/svm/avic.c | 5 +- + arch/x86/kvm/svm/nested.c | 3 + + arch/x86/kvm/svm/pmu.c | 2 +- + arch/x86/kvm/svm/svm.c | 5 +- + arch/x86/kvm/vmx/pmu_intel.c | 4 +- + arch/x86/kvm/x86.c | 40 +++++--- + include/kvm/arm_arch_timer.h | 7 ++ + tools/testing/selftests/kvm/include/ucall_common.h | 2 - + .../selftests/kvm/include/x86_64/processor.h | 23 +++++ + tools/testing/selftests/kvm/lib/guest_sprintf.c | 7 ++ + tools/testing/selftests/kvm/lib/x86_64/apic.c | 2 - + tools/testing/selftests/kvm/memslot_perf_test.c | 9 +- + .../testing/selftests/kvm/x86_64/hyperv_svm_test.c | 2 - + .../selftests/kvm/x86_64/nx_huge_pages_test.c | 2 - + .../selftests/kvm/x86_64/nx_huge_pages_test.sh | 1 - + tools/testing/selftests/kvm/x86_64/state_test.c | 110 ++++++++++++++++++++- + .../selftests/kvm/x86_64/tsc_scaling_sync.c | 4 - + .../testing/selftests/kvm/x86_64/xen_shinfo_test.c | 4 - + 37 files changed, 277 insertions(+), 121 deletions(-) +Merging kvms390-fixes/master (f87ef5723536 KVM: s390: fix gisa destroy operation might lead to cpu stalls) +$ 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 (6465e260f487 Linux 6.6-rc3) +$ git merge -m Merge branch 'hwmon' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-fixes/hwmon +Already up to date. +Merging nvdimm-fixes/libnvdimm-fixes (33908660e814 ACPI: NFIT: Fix incorrect calculation of idt size) +$ git merge -m Merge branch 'libnvdimm-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm-fixes/libnvdimm-fixes +Already up to date. +Merging cxl-fixes/fixes (c66650d29764 cxl/acpi: Annotate struct cxl_cxims_data with __counted_by) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl-fixes/fixes +Already up to date. +Merging btrfs-fixes/next-fixes (dcb1886a86a4 Merge branch 'misc-6.6' 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/volumes.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging vfs-fixes/fixes (609d54441493 fs: prevent out-of-bounds array speculation when closing a file descriptor) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs-fixes/fixes +Already up to date. +Merging dma-mapping-fixes/for-linus (bbb73a103fbb swiotlb: fix a braino in the alignment check fix) +$ 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 (51064b7acf66 platform/x86: wmi: Update MAINTAINERS entry) +$ 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 3 ++- + .../platform/x86/intel/uncore-frequency/uncore-frequency-common.c | 8 ++++++-- + drivers/platform/x86/mlx-platform.c | 5 +++-- + drivers/platform/x86/msi-ec.c | 3 +-- + 4 files changed, 12 insertions(+), 7 deletions(-) +Merging samsung-krzk-fixes/fixes (0bb80ecc33a8 Linux 6.6-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 (0bb80ecc33a8 Linux 6.6-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 (19007c629c63 dt-bindings: trivial-devices: Fix MEMSIC MXC4005 compatible string) +$ 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 (0bb80ecc33a8 Linux 6.6-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 (a20c4350c6a1 scsi: ufs: core: Correct clear TM error log) +$ 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 (30873697b837 Merge tag 'amd-drm-fixes-6.6-2023-10-11' 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 (94f6f0550c62 Linux 6.6-rc5) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm-intel drm-intel-fixes/for-linux-next-fixes +Already up to date. +Merging mmc-fixes/fixes (84ee19bffc93 mmc: core: Capture correct oemid-bits for eMMC cards) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc-fixes/fixes +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/sdhci-msm.yaml | 2 +- + drivers/mmc/core/block.c | 31 +++--- + drivers/mmc/core/mmc.c | 2 +- + drivers/mmc/core/sdio.c | 8 +- + drivers/mmc/host/mtk-sd.c | 6 +- + drivers/mmc/host/sdhci-pci-gli.c | 104 +++++++++++++-------- + drivers/mmc/host/sdhci-sprd.c | 1 + + 7 files changed, 99 insertions(+), 55 deletions(-) +Merging rtc-fixes/rtc-fixes (08279468a294 rtc: sunplus: fix format string for printing resource) +$ git merge -m Merge branch 'rtc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc-fixes/rtc-fixes +Already up to date. +Merging gnss-fixes/gnss-linus (0bb80ecc33a8 Linux 6.6-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 (42999c904612 hv/hv_kvp_daemon:Support for keyfile based connection profile) +$ 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 (06c2afb862f9 Linux 6.5-rc1) +$ 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 (3fec323339a4 drivers: perf: Fix panic in riscv SBI mmap support) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v-fixes/fixes +Already up to date. +Merging riscv-dt-fixes/riscv-dt-fixes (cf98fe6b579e riscv: dts: starfive: visionfive 2: correct spi's ss pin) +$ git merge -m Merge branch 'riscv-dt-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt-fixes/riscv-dt-fixes +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging riscv-soc-fixes/riscv-soc-fixes (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'riscv-soc-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-soc-fixes/riscv-soc-fixes +Already up to date. +Merging fpga-fixes/fixes (6a935361500a fpga: Fix memory leak for fpga_region_test_class_find()) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga-fixes/fixes +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../testing/sysfs-driver-intel-m10-bmc-sec-update | 14 +++++------ + MAINTAINERS | 2 +- + drivers/fpga/tests/fpga-bridge-test.c | 18 +++++++++++++- + drivers/fpga/tests/fpga-mgr-test.c | 18 +++++++++++++- + drivers/fpga/tests/fpga-region-test.c | 28 +++++++++++++++++---- + drivers/fpga/tests/fpga-test-helpers.h | 29 ++++++++++++++++++++++ + 6 files changed, 94 insertions(+), 15 deletions(-) + create mode 100644 drivers/fpga/tests/fpga-test-helpers.h +Merging spdx/spdx-linus (8a749fd1a872 Linux 6.6-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 (94f6f0550c62 Linux 6.6-rc5) +$ git merge -m Merge branch 'gpio/for-current' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git gpio-brgl-fixes/gpio/for-current +Already up to date. +Merging gpio-intel-fixes/fixes (0bb80ecc33a8 Linux 6.6-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 (2d325e54d9e2 pinctrl: baytrail: fix debounce disable case) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel-fixes/fixes +Merge made by the 'ort' strategy. + drivers/pinctrl/intel/pinctrl-baytrail.c | 11 +++++++++-- + 1 file changed, 9 insertions(+), 2 deletions(-) +Merging erofs-fixes/fixes (3048102d9d68 erofs: update documentation) +$ 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'kunit-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kunit-fixes/kunit-fixes +Already up to date. +Merging ubifs-fixes/fixes (2241ab53cbb5 Linux 6.2-rc5) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs-fixes/fixes +Already up to date. +Merging memblock-fixes/fixes (55122e0130e5 memblock tests: fix warning ‘struct seq_file’ declared inside parameter list) +$ 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 (0d32a6bbb8e7 NFSD: Fix zero NFSv4 READ results when RQ_SPLICE_OK is not set) +$ 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 (b673fe1a6229 MAINTAINERS: Remove myself from the general IRQ subsystem maintenance) +$ 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 (4c188fa183eb arm64: dts: renesas: rzg2l: Update overfow/underflow IRQ names for MTU3 channels) +$ 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-tools (f38f547314b8 perf dlfilter: Add a test for object_code()) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Merge made by the 'ort' strategy. + tools/perf/dlfilters/dlfilter-test-api-v0.c | 12 +++++++++- + tools/perf/dlfilters/dlfilter-test-api-v2.c | 12 +++++++++- + tools/perf/util/dlfilter.c | 34 ++++++++++++++--------------- + tools/perf/util/pmu.c | 8 +++---- + 4 files changed, 42 insertions(+), 24 deletions(-) +Merging efi-fixes/urgent (0d3ad1917996 efi: fix memory leak in krealloc failure handling) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Auto-merging drivers/firmware/efi/efi.c +Merge made by the 'ort' strategy. + drivers/firmware/efi/efi.c | 8 ++++++-- + drivers/firmware/efi/libstub/x86-stub.c | 5 +---- + 2 files changed, 7 insertions(+), 6 deletions(-) +Merging zstd-fixes/zstd-linus (f064f4e5ecb1 zstd: Fix array-index-out-of-bounds UBSAN 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/common/fse_decompress.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging battery-fixes/fixes (8894b4325488 power: supply: qcom_battmgr: fix enable request endianness) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery-fixes/fixes +Already up to date. +Merging uml-fixes/fixes (73a23d771033 um: harddog: fix modular build) +$ 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ 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 (344b6c0a7514 rust: fix bindgen build error with fstrict-flex-arrays) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Merge made by the 'ort' strategy. + rust/Makefile | 1 + + rust/kernel/error.rs | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging v9fs-fixes/fixes/next (2dde18cd1d8f Linux 6.5) +$ git merge -m Merge branch 'fixes/next' of git://git.kernel.org/pub/scm/linux/kernel/git/ericvh/v9fs.git v9fs-fixes/fixes/next +Already up to date. +Merging w1-fixes/fixes (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1-fixes/fixes +Already up to date. +Merging pmdomain-fixes/fixes (767881c470b3 pmdomain: imx: scu-pd: correct DMA2 channel) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain-fixes/fixes +Already up to date. +Merging overlayfs-fixes/ovl-fixes (beae836e9c61 ovl: temporarily disable appending lowedirs) +$ git merge -m Merge branch 'ovl-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs-fixes/ovl-fixes +Already up to date. +Merging drm-misc-fixes/for-linux-next-fixes (4366faf43308 drm/nouveau/disp: fix DP capable DSM connectors) +$ 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/bridge/ti-sn65dsi86.c | 14 +++++----- + drivers/gpu/drm/nouveau/nvkm/engine/disp/uconn.c | 14 +++++++++- + drivers/gpu/drm/panel/panel-edp.c | 29 -------------------- + drivers/gpu/drm/panel/panel-simple.c | 35 ++++++++++++++++++++++++ + include/uapi/drm/nouveau_drm.h | 4 +-- + 5 files changed, 57 insertions(+), 39 deletions(-) +Merging mm-stable/mm-stable (2b76550922a8 mm/ksm: document pages_skipped sysfs knob) +$ 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 drivers/md/raid5.c +Auto-merging fs/quota/dquot.c +Auto-merging include/linux/hugetlb.h +Auto-merging include/linux/mmzone.h +Auto-merging kernel/sched/fair.c +Auto-merging mm/hugetlb.c +Auto-merging mm/madvise.c +Auto-merging mm/memory.c +Auto-merging mm/mempolicy.c +Auto-merging mm/migrate.c +Auto-merging mm/mmap.c +Auto-merging mm/page_alloc.c +Auto-merging mm/shmem.c +Auto-merging net/sunrpc/auth.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-kernel-mm-damon | 7 + + Documentation/admin-guide/cgroup-v1/memory.rst | 1 + + Documentation/admin-guide/cgroup-v2.rst | 9 + + Documentation/admin-guide/mm/damon/usage.rst | 118 ++- + Documentation/admin-guide/mm/ksm.rst | 11 + + Documentation/admin-guide/sysctl/vm.rst | 12 +- + Documentation/mm/damon/design.rst | 26 +- + .../trace/postprocess/trace-vmscan-postprocess.pl | 40 +- + arch/arm64/include/asm/tlb.h | 5 +- + arch/loongarch/include/asm/pgalloc.h | 1 + + arch/mips/include/asm/pgalloc.h | 1 + + arch/mips/mm/cache.c | 2 +- + arch/x86/kvm/mmu/mmu.c | 18 +- + arch/x86/mm/pgtable.c | 3 + + drivers/acpi/acpi_pad.c | 2 +- + drivers/acpi/numa/hmat.c | 146 ++-- + drivers/android/binder_alloc.c | 30 +- + drivers/base/cacheinfo.c | 44 +- + drivers/dax/kmem.c | 62 +- + drivers/firmware/efi/unaccepted_memory.c | 20 + + drivers/gpu/drm/i915/gem/i915_gem_shrinker.c | 29 +- + drivers/gpu/drm/i915/i915_drv.h | 2 +- + drivers/gpu/drm/msm/msm_drv.c | 4 +- + drivers/gpu/drm/msm/msm_drv.h | 4 +- + drivers/gpu/drm/msm/msm_gem_shrinker.c | 33 +- + drivers/gpu/drm/panfrost/panfrost_device.h | 2 +- + drivers/gpu/drm/panfrost/panfrost_drv.c | 6 +- + drivers/gpu/drm/panfrost/panfrost_gem.h | 2 +- + drivers/gpu/drm/panfrost/panfrost_gem_shrinker.c | 29 +- + drivers/gpu/drm/ttm/ttm_pool.c | 40 +- + drivers/md/bcache/bcache.h | 2 +- + drivers/md/bcache/btree.c | 27 +- + drivers/md/bcache/sysfs.c | 3 +- + drivers/md/dm-bufio.c | 28 +- + drivers/md/dm-cache-metadata.c | 2 +- + drivers/md/dm-zoned-metadata.c | 28 +- + drivers/md/raid5.c | 26 +- + drivers/md/raid5.h | 2 +- + drivers/misc/vmw_balloon.c | 38 +- + drivers/virtio/virtio_balloon.c | 24 +- + drivers/xen/xenbus/xenbus_probe_backend.c | 17 +- + fs/btrfs/super.c | 2 +- + fs/buffer.c | 80 +- + fs/dax.c | 24 +- + fs/erofs/utils.c | 19 +- + fs/exec.c | 4 +- + fs/ext4/ext4.h | 2 +- + fs/ext4/extents_status.c | 23 +- + fs/ext4/super.c | 13 +- + fs/f2fs/super.c | 31 +- + fs/gfs2/glock.c | 19 +- + fs/gfs2/main.c | 6 +- + fs/gfs2/quota.c | 25 +- + fs/gfs2/quota.h | 3 +- + fs/hugetlbfs/inode.c | 41 +- + fs/jbd2/journal.c | 29 +- + fs/kernfs/mount.c | 2 +- + fs/mbcache.c | 22 +- + fs/nfs/nfs42xattr.c | 87 +-- + fs/nfs/super.c | 21 +- + fs/nfsd/filecache.c | 23 +- + fs/nfsd/netns.h | 4 +- + fs/nfsd/nfs4state.c | 19 +- + fs/nfsd/nfscache.c | 31 +- + fs/proc/kcore.c | 3 +- + fs/proc/root.c | 2 +- + fs/quota/dquot.c | 17 +- + fs/super.c | 35 +- + fs/ubifs/super.c | 21 +- + fs/xfs/xfs_buf.c | 24 +- + fs/xfs/xfs_buf.h | 2 +- + fs/xfs/xfs_icache.c | 26 +- + fs/xfs/xfs_mount.c | 4 +- + fs/xfs/xfs_mount.h | 2 +- + fs/xfs/xfs_qm.c | 27 +- + fs/xfs/xfs_qm.h | 2 +- + include/asm-generic/pgalloc.h | 7 +- + include/linux/buffer_head.h | 55 +- + include/linux/cacheinfo.h | 1 + + include/linux/damon.h | 67 +- + include/linux/dax.h | 10 +- + include/linux/fs.h | 2 +- + include/linux/gfp.h | 2 + + include/linux/hugetlb.h | 12 + + include/linux/jbd2.h | 2 +- + include/linux/memblock.h | 9 + + include/linux/memcontrol.h | 12 +- + include/linux/memory-tiers.h | 41 +- + include/linux/mempolicy.h | 5 +- + include/linux/migrate.h | 4 +- + include/linux/mm.h | 35 +- + include/linux/mmu_notifier.h | 9 +- + include/linux/mmzone.h | 18 +- + include/linux/pagemap.h | 32 +- + include/linux/rmap.h | 2 +- + include/linux/sched/coredump.h | 19 +- + include/linux/sched/numa_balancing.h | 6 +- + include/linux/shrinker.h | 86 ++- + include/trace/events/damon.h | 45 +- + include/trace/events/vmscan.h | 8 +- + include/uapi/linux/prctl.h | 3 +- + kernel/exit.c | 4 - + kernel/fork.c | 6 +- + kernel/kthread.c | 1 - + kernel/rcu/tree.c | 21 +- + kernel/rcu/tree_nocb.h | 19 +- + kernel/sched/fair.c | 12 +- + kernel/sys.c | 32 +- + mm/Kconfig | 1 + + mm/Makefile | 4 +- + mm/cma.c | 2 +- + mm/compaction.c | 91 ++- + mm/damon/core-test.h | 29 +- + mm/damon/core.c | 285 ++++++-- + mm/damon/dbgfs.c | 3 +- + mm/damon/lru_sort.c | 2 + + mm/damon/paddr.c | 11 +- + mm/damon/reclaim.c | 2 + + mm/damon/sysfs-schemes.c | 40 +- + mm/damon/vaddr.c | 22 +- + mm/filemap.c | 36 +- + mm/huge_memory.c | 96 ++- + mm/hugetlb.c | 202 +++-- + mm/hugetlb_vmemmap.c | 12 +- + mm/hugetlb_vmemmap.h | 9 +- + mm/internal.h | 128 +++- + mm/kmsan/core.c | 125 +--- + mm/kmsan/kmsan_test.c | 109 ++- + mm/ksm.c | 116 +++ + mm/list_lru.c | 30 - + mm/madvise.c | 5 +- + mm/memblock.c | 49 +- + mm/memcontrol.c | 17 +- + mm/memfd.c | 6 - + mm/memory-failure.c | 29 +- + mm/memory-tiers.c | 175 ++++- + mm/memory.c | 51 +- + mm/memory_hotplug.c | 2 +- + mm/mempolicy.c | 22 +- + mm/migrate.c | 134 ++-- + mm/mlock.c | 66 +- + mm/mm_init.c | 4 +- + mm/mmap.c | 5 +- + mm/mremap.c | 77 +- + mm/page-writeback.c | 2 +- + mm/page_alloc.c | 300 ++++++-- + mm/page_io.c | 8 +- + mm/rmap.c | 147 ++-- + mm/shmem.c | 4 - + mm/show_mem.c | 11 +- + mm/shrinker.c | 809 +++++++++++++++++++++ + mm/shrinker_debug.c | 35 +- + mm/vmscan.c | 716 +----------------- + mm/vmstat.c | 26 +- + mm/workingset.c | 29 +- + mm/zsmalloc.c | 27 +- + net/sunrpc/auth.c | 20 +- + tools/include/uapi/linux/prctl.h | 3 +- + tools/testing/selftests/damon/sysfs.sh | 1 + + tools/testing/selftests/mm/gup_longterm.c | 3 +- + tools/testing/selftests/mm/ksm_functional_tests.c | 66 +- + tools/testing/selftests/mm/mdwe_test.c | 137 +++- + tools/testing/selftests/mm/mremap_test.c | 305 ++++++-- + 163 files changed, 4440 insertions(+), 2394 deletions(-) + create mode 100644 mm/shrinker.c +Merging mm-nonmm-stable/mm-nonmm-stable (c37e56cac3d6 crash_core.c: remove unneeded functions) +$ 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 +Auto-merging arch/arm64/Kconfig +Auto-merging drivers/net/xen-netback/interface.c +Auto-merging kernel/exit.c +Auto-merging kernel/fork.c +Auto-merging kernel/kthread.c +Auto-merging kernel/sys.c +Auto-merging mm/damon/core.c +Merge made by the 'ort' strategy. + arch/arm/kernel/setup.c | 3 +- + arch/arm64/Kconfig | 3 + + arch/arm64/include/asm/crash_core.h | 10 ++ + arch/arm64/mm/init.c | 140 ++-------------------- + arch/ia64/kernel/setup.c | 2 +- + arch/loongarch/kernel/setup.c | 4 +- + arch/mips/kernel/setup.c | 3 +- + arch/powerpc/kernel/fadump.c | 2 +- + arch/powerpc/kexec/core.c | 2 +- + arch/powerpc/mm/nohash/kaslr_booke.c | 2 +- + arch/riscv/Kconfig | 3 + + arch/riscv/include/asm/crash_core.h | 11 ++ + arch/riscv/include/asm/processor.h | 2 + + arch/riscv/mm/init.c | 141 ++-------------------- + arch/s390/kernel/setup.c | 4 +- + arch/sh/kernel/machine_kexec.c | 2 +- + arch/x86/Kconfig | 3 + + arch/x86/include/asm/crash_core.h | 42 +++++++ + arch/x86/kernel/setup.c | 147 ++--------------------- + drivers/accel/ivpu/ivpu_job.c | 3 +- + drivers/dma-buf/st-dma-fence-chain.c | 12 +- + drivers/dma-buf/st-dma-fence.c | 4 +- + drivers/gpu/drm/i915/gt/selftest_migrate.c | 4 +- + drivers/net/xen-netback/interface.c | 3 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 137 ++------------------- + drivers/scsi/qla2xxx/qla_dfs.c | 59 ++------- + drivers/usb/usbip/usbip_common.h | 6 - + fs/gfs2/ops_fstype.c | 9 +- + fs/ocfs2/alloc.c | 2 +- + fs/ocfs2/dlmfs/dlmfs.c | 3 +- + fs/proc/array.c | 7 +- + fs/proc/base.c | 6 +- + include/linux/compiler-clang.h | 5 - + include/linux/compiler-gcc.h | 2 - + include/linux/compiler.h | 5 +- + include/linux/crash_core.h | 49 +++++++- + include/linux/kexec.h | 4 - + include/linux/kthread.h | 1 + + include/linux/minmax.h | 27 +---- + include/linux/sched.h | 1 - + include/linux/sched/signal.h | 19 ++- + include/linux/seq_file.h | 15 +++ + init/init_task.c | 1 - + kernel/Kconfig.kexec | 2 +- + kernel/crash_core.c | 184 +++++++++++++++++++++++++---- + kernel/exit.c | 1 - + kernel/fork.c | 3 - + kernel/irq/manage.c | 15 +-- + kernel/kexec_core.c | 17 --- + kernel/kthread.c | 18 +++ + kernel/panic.c | 22 ++-- + kernel/pid_namespace.c | 6 - + kernel/signal.c | 22 ++-- + kernel/smpboot.c | 3 +- + kernel/sys.c | 41 ++++--- + kernel/taskstats.c | 5 +- + mm/damon/core.c | 3 +- + net/core/pktgen.c | 3 +- + 58 files changed, 471 insertions(+), 784 deletions(-) + create mode 100644 arch/arm64/include/asm/crash_core.h + create mode 100644 arch/riscv/include/asm/crash_core.h + create mode 100644 arch/x86/include/asm/crash_core.h +Merging mm/mm-everything (2ae6ac8b1d58 Merge branch 'mm-nonmm-unstable' into mm-everything) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging MAINTAINERS +Auto-merging include/linux/cgroup-defs.h +Auto-merging kernel/workqueue.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 29 + + Documentation/admin-guide/mm/damon/usage.rst | 6 +- + Documentation/admin-guide/mm/pagemap.rst | 89 ++ + Documentation/admin-guide/mm/userfaultfd.rst | 35 + + Documentation/admin-guide/mm/zswap.rst | 12 + + Documentation/dev-tools/kasan.rst | 7 +- + Documentation/dev-tools/kcsan.rst | 4 +- + Documentation/dev-tools/kmsan.rst | 6 +- + MAINTAINERS | 2 + + arch/Kconfig | 2 +- + arch/alpha/include/asm/bitops.h | 20 + + arch/arm/kernel/module.c | 32 - + arch/arm/mm/init.c | 38 + + arch/arm64/kernel/module.c | 124 -- + arch/arm64/kernel/mte.c | 4 +- + arch/arm64/kernel/probes/kprobes.c | 7 - + arch/arm64/mm/init.c | 132 ++ + arch/arm64/mm/kasan_init.c | 6 +- + arch/arm64/net/bpf_jit_comp.c | 11 - + arch/loongarch/kernel/module.c | 6 - + arch/loongarch/mm/init.c | 20 + + arch/m68k/include/asm/bitops.h | 21 + + arch/mips/include/asm/bitops.h | 25 +- + arch/mips/kernel/module.c | 10 +- + arch/mips/lib/bitops.c | 14 + + arch/mips/mm/init.c | 20 + + arch/nios2/include/asm/pgtable.h | 5 +- + arch/nios2/kernel/module.c | 28 +- + arch/parisc/kernel/module.c | 12 +- + arch/parisc/mm/init.c | 22 +- + arch/powerpc/include/asm/bitops.h | 21 +- + arch/powerpc/kernel/kprobes.c | 16 +- + arch/powerpc/kernel/module.c | 37 - + arch/powerpc/mm/mem.c | 62 + + arch/riscv/include/asm/bitops.h | 12 + + arch/riscv/kernel/module.c | 10 - + arch/riscv/kernel/probes/kprobes.c | 10 - + arch/riscv/mm/init.c | 39 + + arch/riscv/net/bpf_jit_core.c | 13 - + arch/s390/include/asm/bitops.h | 10 + + arch/s390/kernel/ftrace.c | 4 +- + arch/s390/kernel/kprobes.c | 4 +- + arch/s390/kernel/module.c | 42 +- + arch/s390/mm/init.c | 28 + + arch/sparc/kernel/module.c | 33 +- + arch/sparc/mm/Makefile | 2 + + arch/sparc/mm/execmem.c | 25 + + arch/sparc/net/bpf_jit_comp_32.c | 8 +- + arch/x86/Kconfig | 1 + + arch/x86/include/asm/bitops.h | 11 +- + arch/x86/kernel/ftrace.c | 16 +- + arch/x86/kernel/kprobes/core.c | 4 +- + arch/x86/kernel/module.c | 51 - + arch/x86/mm/init.c | 29 + + arch/x86/mm/numa.c | 33 +- + block/bdev.c | 6 +- + drivers/dax/bus.c | 38 + + drivers/dax/bus.h | 1 + + drivers/dax/cxl.c | 1 + + drivers/dax/dax-private.h | 1 + + drivers/dax/hmem/hmem.c | 1 + + drivers/dax/kmem.c | 8 +- + drivers/dax/pmem.c | 1 + + drivers/dma-buf/udmabuf.c | 82 +- + fs/anon_inodes.c | 4 +- + fs/buffer.c | 20 +- + fs/char_dev.c | 2 +- + fs/dcache.c | 8 +- + fs/direct-io.c | 2 +- + fs/eventpoll.c | 6 +- + fs/ext4/readpage.c | 14 +- + fs/fcntl.c | 2 +- + fs/file_table.c | 2 +- + fs/hugetlbfs/inode.c | 114 +- + fs/inode.c | 8 +- + fs/iomap/buffered-io.c | 57 +- + fs/kernfs/file.c | 49 - + fs/kernfs/mount.c | 5 +- + fs/locks.c | 4 +- + fs/namespace.c | 16 +- + fs/notify/dnotify/dnotify.c | 6 +- + fs/notify/fanotify/fanotify_user.c | 8 +- + fs/notify/inotify/inotify_user.c | 2 +- + fs/ocfs2/buffer_head_io.c | 2 +- + fs/ocfs2/journal.c | 2 +- + fs/ocfs2/namei.c | 8 + + fs/ocfs2/quota_local.c | 4 + + fs/pipe.c | 2 +- + fs/proc/base.c | 16 +- + fs/proc/bootconfig.c | 6 + + fs/proc/inode.c | 11 +- + fs/proc/task_mmu.c | 744 ++++++++- + fs/userfaultfd.c | 98 +- + include/asm-generic/bitops/instrumented-lock.h | 28 +- + include/asm-generic/bitops/lock.h | 20 +- + include/linux/cgroup-defs.h | 5 + + include/linux/compiler.h | 8 + + include/linux/const.h | 8 - + include/linux/execmem.h | 141 ++ + include/linux/fortify-string.h | 2 +- + include/linux/fs.h | 10 +- + include/linux/gfp.h | 10 +- + include/linux/hugetlb.h | 34 +- + include/linux/hugetlb_cgroup.h | 11 - + include/linux/kstrtox.h | 5 - + include/linux/list_lru.h | 39 + + include/linux/memblock.h | 1 + + include/linux/memcontrol.h | 67 +- + include/linux/mempolicy.h | 46 +- + include/linux/minmax.h | 102 +- + include/linux/mm.h | 113 +- + include/linux/mm_inline.h | 20 +- + include/linux/mm_types.h | 27 + + include/linux/mmzone.h | 14 + + include/linux/moduleloader.h | 15 - + include/linux/page-flags.h | 19 + + include/linux/pagemap.h | 1 + + include/linux/percpu_counter.h | 30 + + include/linux/rmap.h | 2 +- + include/linux/sched.h | 4 + + include/linux/shmem_fs.h | 16 +- + include/linux/shrinker.h | 1 + + include/linux/stringify.h | 2 + + include/linux/swap.h | 6 + + include/linux/timer.h | 3 +- + include/linux/userfaultfd_k.h | 28 +- + include/linux/wait.h | 9 +- + include/linux/zswap.h | 9 + + include/uapi/linux/fs.h | 59 + + include/uapi/linux/mempolicy.h | 2 +- + include/uapi/linux/userfaultfd.h | 9 +- + ipc/shm.c | 21 +- + kernel/audit_tree.c | 4 +- + kernel/bpf/Kconfig | 2 +- + kernel/bpf/core.c | 6 +- + kernel/cgroup/cgroup.c | 15 +- + kernel/events/uprobes.c | 4 +- + kernel/fork.c | 2 +- + kernel/gcov/fs.c | 2 +- + kernel/kcsan/kcsan_test.c | 9 +- + kernel/kcsan/selftest.c | 9 +- + kernel/kprobes.c | 51 +- + kernel/module/Kconfig | 1 + + kernel/module/main.c | 45 +- + kernel/ptrace.c | 2 +- + kernel/sched/core.c | 2 +- + kernel/sched/wait.c | 60 +- + kernel/signal.c | 2 +- + kernel/trace/trace_kprobe.c | 11 + + kernel/user_namespace.c | 2 +- + kernel/workqueue.c | 16 +- + lib/debugobjects.c | 2 +- + lib/percpu_counter.c | 79 + + mm/Kconfig | 3 + + mm/Makefile | 1 + + mm/damon/sysfs-common.h | 2 + + mm/damon/sysfs-schemes.c | 93 ++ + mm/damon/sysfs.c | 34 +- + mm/execmem.c | 142 ++ + mm/filemap.c | 179 +-- + mm/gup.c | 103 +- + mm/huge_memory.c | 23 +- + mm/hugetlb.c | 669 ++++---- + mm/hugetlb_cgroup.c | 20 +- + mm/hugetlb_vmemmap.c | 291 +++- + mm/hugetlb_vmemmap.h | 24 +- + mm/internal.h | 23 +- + mm/kasan/kasan_test.c | 19 +- + mm/kasan/kasan_test_module.c | 2 +- + mm/kasan/quarantine.c | 4 +- + mm/kasan/report.c | 4 +- + mm/kasan/report_generic.c | 6 +- + mm/kasan/shadow.c | 2 +- + mm/khugepaged.c | 2 +- + mm/list_lru.c | 46 +- + mm/madvise.c | 28 +- + mm/memblock.c | 21 + + mm/memcontrol.c | 717 +++++++-- + mm/memory.c | 215 ++- + mm/memory_hotplug.c | 166 +- + mm/mempolicy.c | 1014 ++++++------ + mm/migrate.c | 18 +- + mm/mlock.c | 25 +- + mm/mm_init.c | 2 + + mm/mmap.c | 144 +- + mm/mprotect.c | 42 +- + mm/mremap.c | 30 +- + mm/nommu.c | 8 +- + mm/page-writeback.c | 33 +- + mm/page_alloc.c | 64 +- + mm/page_owner.c | 4 +- + mm/percpu.c | 8 +- + mm/rmap.c | 17 +- + mm/shmem.c | 598 +++---- + mm/slab.h | 10 +- + mm/swap.h | 9 +- + mm/swap_state.c | 129 +- + mm/vmscan.c | 44 +- + mm/vmstat.c | 4 +- + mm/workingset.c | 42 +- + mm/zsmalloc.c | 2 +- + mm/zswap.c | 397 ++++- + scripts/get_maintainer.pl | 38 +- + scripts/show_delta | 3 +- + security/integrity/iint.c | 2 +- + sound/pci/asihpi/hpidebug.h | 9 +- + tools/include/linux/compiler.h | 8 + + tools/include/linux/const.h | 8 - + tools/include/uapi/linux/fs.h | 59 + + tools/mm/page_owner_sort.c | 217 ++- + tools/testing/radix-tree/linux.c | 4 +- + tools/testing/selftests/cgroup/.gitignore | 1 + + tools/testing/selftests/cgroup/Makefile | 2 + + .../testing/selftests/cgroup/test_hugetlb_memcg.c | 234 +++ + tools/testing/selftests/drivers/dma-buf/udmabuf.c | 151 +- + tools/testing/selftests/mm/.gitignore | 2 + + tools/testing/selftests/mm/Makefile | 4 +- + tools/testing/selftests/mm/config | 1 + + tools/testing/selftests/mm/hugetlb-madvise.c | 19 - + .../selftests/mm/hugetlb_fault_after_madv.c | 73 + + tools/testing/selftests/mm/pagemap_ioctl.c | 1660 ++++++++++++++++++++ + tools/testing/selftests/mm/run_vmtests.sh | 8 + + tools/testing/selftests/mm/vm_util.c | 19 + + tools/testing/selftests/mm/vm_util.h | 1 + + tools/testing/selftests/proc/proc-empty-vm.c | 97 +- + 225 files changed, 8570 insertions(+), 3437 deletions(-) + create mode 100644 arch/sparc/mm/execmem.c + create mode 100644 include/linux/execmem.h + create mode 100644 mm/execmem.c + create mode 100644 tools/testing/selftests/cgroup/test_hugetlb_memcg.c + create mode 100644 tools/testing/selftests/mm/hugetlb_fault_after_madv.c + create mode 100644 tools/testing/selftests/mm/pagemap_ioctl.c +Merging kbuild/for-next (ffa46bbc5892 kbuild: rpm-pkg: generate kernel.spec in rpmbuild/SPECS/) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Auto-merging Makefile +Merge made by the 'ort' strategy. + .gitignore | 1 - + Makefile | 2 +- + scripts/Makefile.package | 8 +- + scripts/mod/Makefile | 4 +- + scripts/mod/modpost.c | 70 ++-------------- + scripts/mod/modpost.h | 25 ++++++ + scripts/mod/symsearch.c | 199 +++++++++++++++++++++++++++++++++++++++++++++ + scripts/package/mkspec | 6 ++ + scripts/remove-stale-files | 2 +- + 9 files changed, 244 insertions(+), 73 deletions(-) + create mode 100644 scripts/mod/symsearch.c +Merging clang-format/clang-format (5d0c230f1de8 Linux 6.5-rc4) +$ git merge -m Merge branch 'clang-format' of https://github.com/ojeda/linux.git clang-format/clang-format +Already up to date. +Merging perf/perf-tools-next (a16afcc58a8c perf cs-etm: Fix incorrect or missing decoder for raw trace) +$ git merge -m Merge branch 'perf-tools-next' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools-next.git perf/perf-tools-next +Auto-merging tools/perf/util/dlfilter.c +Auto-merging tools/perf/util/pmu.c +Merge made by the 'ort' strategy. + scripts/clang-tools/gen_compile_commands.py | 8 +- + scripts/clang-tools/run-clang-tools.py | 32 +- + tools/lib/api/io.h | 1 + + tools/lib/perf/evlist.c | 9 + + tools/lib/perf/include/internal/evlist.h | 2 + + tools/perf/Documentation/perf-kwork.txt | 38 +- + tools/perf/Documentation/perf-lock.txt | 7 + + tools/perf/Documentation/perf-record.txt | 3 + + tools/perf/Makefile.config | 78 +- + tools/perf/Makefile.perf | 16 +- + tools/perf/arch/arm64/util/pmu.c | 20 +- + tools/perf/arch/x86/annotate/instructions.c | 9 +- + tools/perf/arch/x86/util/intel-pt.c | 15 +- + tools/perf/arch/x86/util/pmu.c | 139 - + tools/perf/bench/sched-messaging.c | 102 +- + tools/perf/bench/uprobe.c | 1 + + tools/perf/builtin-buildid-cache.c | 6 +- + tools/perf/builtin-kwork.c | 760 ++- + tools/perf/builtin-lock.c | 117 +- + tools/perf/builtin-record.c | 92 +- + tools/perf/builtin-stat.c | 2 +- + tools/perf/builtin-version.c | 1 + + tools/perf/perf-completion.sh | 10 +- + .../arch/arm64/ampere/ampereone/metrics.json | 418 +- + .../pmu-events/arch/arm64/arm/cmn/sys/cmn.json | 266 + + .../pmu-events/arch/arm64/arm/cmn/sys/metric.json | 74 + + .../arch/arm64/arm/neoverse-v1/branch.json | 8 - + .../pmu-events/arch/arm64/arm/neoverse-v1/bus.json | 18 +- + .../arch/arm64/arm/neoverse-v1/cache.json | 155 - + .../arch/arm64/arm/neoverse-v1/exception.json | 45 +- + .../arch/arm64/arm/neoverse-v1/fp_operation.json | 10 + + .../arch/arm64/arm/neoverse-v1/general.json | 10 + + .../arch/arm64/arm/neoverse-v1/instruction.json | 119 - + .../arch/arm64/arm/neoverse-v1/l1d_cache.json | 54 + + .../arch/arm64/arm/neoverse-v1/l1i_cache.json | 14 + + .../arch/arm64/arm/neoverse-v1/l2_cache.json | 50 + + .../arch/arm64/arm/neoverse-v1/l3_cache.json | 22 + + .../arch/arm64/arm/neoverse-v1/ll_cache.json | 10 + + .../arch/arm64/arm/neoverse-v1/memory.json | 21 +- + .../arch/arm64/arm/neoverse-v1/metrics.json | 233 + + .../arch/arm64/arm/neoverse-v1/pipeline.json | 23 - + .../arch/arm64/arm/neoverse-v1/retired.json | 30 + + .../pmu-events/arch/arm64/arm/neoverse-v1/spe.json | 18 + + .../arch/arm64/arm/neoverse-v1/spec_operation.json | 110 + + .../arch/arm64/arm/neoverse-v1/stall.json | 30 + + .../pmu-events/arch/arm64/arm/neoverse-v1/sve.json | 30 + + .../pmu-events/arch/arm64/arm/neoverse-v1/tlb.json | 66 + + tools/perf/pmu-events/arch/arm64/mapfile.csv | 2 +- + tools/perf/pmu-events/arch/nds32/mapfile.csv | 2 +- + tools/perf/pmu-events/arch/powerpc/mapfile.csv | 2 +- + .../arch/powerpc/power10/datasource.json | 1787 ++++++ + .../pmu-events/arch/powerpc/power10/metrics.json | 388 ++ + .../pmu-events/arch/powerpc/power10/others.json | 10 - + .../arch/powerpc/power10/translation.json | 5 - + .../pmu-events/arch/test/test_soc/sys/uncore.json | 8 + + .../pmu-events/arch/x86/alderlake/adl-metrics.json | 6 +- + .../pmu-events/arch/x86/alderlake/pipeline.json | 2 +- + .../arch/x86/alderlaken/adln-metrics.json | 6 +- + .../perf/pmu-events/arch/x86/bonnell/frontend.json | 2 +- + .../arch/x86/broadwellde/uncore-interconnect.json | 18 +- + .../arch/x86/broadwellx/uncore-interconnect.json | 18 +- + .../pmu-events/arch/x86/emeraldrapids/cache.json | 888 +++ + .../arch/x86/emeraldrapids/floating-point.json | 193 + + .../arch/x86/emeraldrapids/frontend.json | 389 ++ + .../pmu-events/arch/x86/emeraldrapids/memory.json | 343 ++ + .../pmu-events/arch/x86/emeraldrapids/other.json | 315 + + .../arch/x86/emeraldrapids/pipeline.json | 975 +++ + .../arch/x86/emeraldrapids/uncore-cache.json | 5952 +++++++++++++++++++ + .../arch/x86/emeraldrapids/uncore-cxl.json | 450 ++ + .../x86/emeraldrapids/uncore-interconnect.json | 6199 ++++++++++++++++++++ + .../arch/x86/emeraldrapids/uncore-io.json | 3587 +++++++++++ + .../arch/x86/emeraldrapids/uncore-memory.json | 3308 +++++++++++ + .../arch/x86/emeraldrapids/uncore-power.json | 197 + + .../arch/x86/emeraldrapids/virtual-memory.json | 165 + + tools/perf/pmu-events/arch/x86/haswell/memory.json | 2 +- + .../perf/pmu-events/arch/x86/haswellx/memory.json | 2 +- + .../arch/x86/haswellx/uncore-interconnect.json | 18 +- + .../perf/pmu-events/arch/x86/ivybridge/cache.json | 8 +- + .../pmu-events/arch/x86/ivybridge/frontend.json | 18 +- + tools/perf/pmu-events/arch/x86/ivytown/cache.json | 4 +- + .../arch/x86/ivytown/uncore-interconnect.json | 20 +- + .../arch/x86/jaketown/uncore-interconnect.json | 18 +- + .../perf/pmu-events/arch/x86/lunarlake/cache.json | 219 + + .../pmu-events/arch/x86/lunarlake/frontend.json | 27 + + .../perf/pmu-events/arch/x86/lunarlake/memory.json | 183 + + .../perf/pmu-events/arch/x86/lunarlake/other.json | 62 + + .../pmu-events/arch/x86/lunarlake/pipeline.json | 217 + + .../arch/x86/lunarlake/virtual-memory.json | 56 + + tools/perf/pmu-events/arch/x86/mapfile.csv | 26 +- + .../perf/pmu-events/arch/x86/nehalemep/cache.json | 2 +- + .../arch/x86/nehalemep/floating-point.json | 2 +- + .../perf/pmu-events/arch/x86/nehalemex/cache.json | 2 +- + .../arch/x86/nehalemex/floating-point.json | 2 +- + .../arch/x86/sapphirerapids/frontend.json | 41 +- + .../arch/x86/sapphirerapids/uncore-cache.json | 20 +- + .../arch/x86/westmereep-dp/floating-point.json | 2 +- + .../pmu-events/arch/x86/westmereep-sp/cache.json | 2 +- + .../arch/x86/westmereep-sp/floating-point.json | 2 +- + .../perf/pmu-events/arch/x86/westmereex/cache.json | 2 +- + .../arch/x86/westmereex/floating-point.json | 2 +- + tools/perf/pmu-events/empty-pmu-events.c | 8 + + tools/perf/pmu-events/jevents.py | 15 +- + tools/perf/pmu-events/metric.py | 3 +- + tools/perf/tests/Build | 1 + + tools/perf/tests/attr/system-wide-dummy | 14 +- + tools/perf/tests/attr/test-record-C0 | 4 +- + tools/perf/tests/attr/test-record-dummy-C0 | 55 + + tools/perf/tests/builtin-test.c | 1 + + tools/perf/tests/code-reading.c | 10 + + tools/perf/tests/expr.c | 33 +- + tools/perf/tests/make | 7 +- + tools/perf/tests/parse-events.c | 51 +- + tools/perf/tests/pmu-events.c | 65 +- + tools/perf/tests/pmu.c | 23 +- + tools/perf/tests/shell/coresight/asm_pure_loop.sh | 4 + + .../tests/shell/coresight/memcpy_thread_16k_10.sh | 4 + + .../shell/coresight/thread_loop_check_tid_10.sh | 4 + + .../shell/coresight/thread_loop_check_tid_2.sh | 4 + + .../tests/shell/coresight/unroll_loop_thread_10.sh | 4 + + tools/perf/tests/shell/lock_contention.sh | 51 + + tools/perf/tests/shell/probe_vfs_getname.sh | 2 + + .../tests/shell/record+probe_libc_inet_pton.sh | 2 + + .../tests/shell/record+script_probe_vfs_getname.sh | 2 + + tools/perf/tests/shell/record.sh | 1 + + tools/perf/tests/shell/record_offcpu.sh | 2 +- + tools/perf/tests/shell/record_sideband.sh | 58 + + tools/perf/tests/shell/stat+csv_output.sh | 1 + + tools/perf/tests/shell/stat+csv_summary.sh | 4 +- + tools/perf/tests/shell/stat+shadow_stat.sh | 34 +- + tools/perf/tests/shell/stat+std_output.sh | 1 + + tools/perf/tests/shell/stat_all_metricgroups.sh | 16 +- + tools/perf/tests/shell/test_arm_coresight.sh | 15 +- + tools/perf/tests/shell/test_intel_pt.sh | 1 + + tools/perf/tests/shell/trace+probe_vfs_getname.sh | 1 + + tools/perf/tests/tests.h | 1 + + tools/perf/tests/util.c | 31 + + tools/perf/ui/browsers/hists.c | 6 +- + tools/perf/util/Build | 1 + + tools/perf/util/bpf-filter.y | 4 + + tools/perf/util/bpf_counter.c | 5 +- + tools/perf/util/bpf_kwork_top.c | 308 + + tools/perf/util/bpf_lock_contention.c | 51 +- + tools/perf/util/bpf_off_cpu.c | 5 +- + tools/perf/util/bpf_skel/kwork_top.bpf.c | 338 ++ + tools/perf/util/bpf_skel/lock_contention.bpf.c | 48 +- + tools/perf/util/bpf_skel/lock_data.h | 3 +- + tools/perf/util/cgroup.c | 63 +- + tools/perf/util/cgroup.h | 5 + + tools/perf/util/cs-etm.c | 114 +- + tools/perf/util/dlfilter.c | 4 +- + tools/perf/util/dso.c | 2 + + tools/perf/util/dso.h | 2 + + tools/perf/util/env.c | 6 +- + tools/perf/util/evlist.c | 23 +- + tools/perf/util/evlist.h | 1 + + tools/perf/util/evsel.c | 13 + + tools/perf/util/evsel.h | 2 + + tools/perf/util/expr.c | 2 +- + tools/perf/util/expr.y | 2 + + tools/perf/util/header.c | 60 +- + tools/perf/util/hisi-ptt.c | 4 +- + tools/perf/util/intel-pt.c | 2 + + tools/perf/util/jitdump.c | 1 + + tools/perf/util/kwork.h | 61 +- + tools/perf/util/lock-contention.h | 10 +- + tools/perf/util/machine.c | 4 +- + tools/perf/util/mem-events.c | 3 +- + tools/perf/util/metricgroup.c | 2 +- + tools/perf/util/parse-events.c | 205 +- + tools/perf/util/parse-events.h | 34 +- + tools/perf/util/parse-events.l | 6 +- + tools/perf/util/parse-events.y | 68 +- + tools/perf/util/pfm.c | 15 +- + tools/perf/util/pmu.c | 137 +- + tools/perf/util/pmu.h | 12 +- + tools/perf/util/pmu.y | 4 + + tools/perf/util/pmus.c | 18 +- + tools/perf/util/print-events.c | 28 +- + tools/perf/util/string.c | 48 + + tools/perf/util/string2.h | 1 + + tools/perf/util/svghelper.c | 5 +- + tools/perf/util/symbol-elf.c | 4 +- + tools/perf/util/symbol.c | 6 +- + tools/perf/util/trace-event-info.c | 3 +- + 184 files changed, 30361 insertions(+), 1399 deletions(-) + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cmn/sys/cmn.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/cmn/sys/metric.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/branch.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/fp_operation.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/general.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/instruction.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/l1d_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/l1i_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/l2_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/l3_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/ll_cache.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/metrics.json + delete mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/retired.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/spe.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/spec_operation.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/stall.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/sve.json + create mode 100644 tools/perf/pmu-events/arch/arm64/arm/neoverse-v1/tlb.json + create mode 100644 tools/perf/pmu-events/arch/powerpc/power10/datasource.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/floating-point.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/uncore-cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/uncore-cxl.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/uncore-interconnect.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/uncore-io.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/uncore-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/uncore-power.json + create mode 100644 tools/perf/pmu-events/arch/x86/emeraldrapids/virtual-memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/lunarlake/cache.json + create mode 100644 tools/perf/pmu-events/arch/x86/lunarlake/frontend.json + create mode 100644 tools/perf/pmu-events/arch/x86/lunarlake/memory.json + create mode 100644 tools/perf/pmu-events/arch/x86/lunarlake/other.json + create mode 100644 tools/perf/pmu-events/arch/x86/lunarlake/pipeline.json + create mode 100644 tools/perf/pmu-events/arch/x86/lunarlake/virtual-memory.json + create mode 100644 tools/perf/tests/attr/test-record-dummy-C0 + create mode 100755 tools/perf/tests/shell/record_sideband.sh + create mode 100644 tools/perf/tests/util.c + create mode 100644 tools/perf/util/bpf_kwork_top.c + create mode 100644 tools/perf/util/bpf_skel/kwork_top.bpf.c +Merging compiler-attributes/compiler-attributes (5d0c230f1de8 Linux 6.5-rc4) +$ git merge -m Merge branch 'compiler-attributes' of https://github.com/ojeda/linux.git compiler-attributes/compiler-attributes +Already up to date. +Merging dma-mapping/for-next (2d5780bbef8d swiotlb: fix the check whether a device has used software IO TLB) +$ 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 (f82060480095 asm-generic: Fix spelling of architecture) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Auto-merging MAINTAINERS +Auto-merging Makefile +Auto-merging arch/Kconfig +CONFLICT (modify/delete): arch/ia64/include/asm/cpu.h deleted in asm-generic/master and modified in HEAD. Version HEAD of arch/ia64/include/asm/cpu.h left in tree. +CONFLICT (modify/delete): arch/ia64/kernel/setup.c deleted in asm-generic/master and modified in HEAD. Version HEAD of arch/ia64/kernel/setup.c left in tree. +CONFLICT (modify/delete): arch/ia64/kernel/topology.c deleted in asm-generic/master and modified in HEAD. Version HEAD of arch/ia64/kernel/topology.c left in tree. +Auto-merging drivers/firmware/efi/efi.c +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging include/linux/acpi.h +Auto-merging include/linux/mm.h +Auto-merging include/linux/sched/signal.h +Auto-merging kernel/fork.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/signal.c +Auto-merging mm/mmap.c +Auto-merging tools/include/uapi/asm-generic/unistd.h +Auto-merging tools/perf/arch/mips/entry/syscalls/syscall_n64.tbl +Auto-merging tools/perf/arch/powerpc/entry/syscalls/syscall.tbl +Auto-merging tools/perf/arch/s390/entry/syscalls/syscall.tbl +Auto-merging tools/perf/arch/x86/entry/syscalls/syscall_64.tbl +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/ia64/kernel/setup.c +rm 'arch/ia64/kernel/setup.c' +$ git rm -f arch/ia64/include/asm/cpu.h arch/ia64/kernel/topology.c +rm 'arch/ia64/include/asm/cpu.h' +rm 'arch/ia64/kernel/topology.c' +$ git commit --no-edit -v -a +[master 8ad02ce87ca2] Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-devices-system-cpu | 3 - + .../ABI/testing/sysfs-firmware-dmi-entries | 2 +- + Documentation/admin-guide/kdump/kdump.rst | 37 +- + Documentation/admin-guide/kdump/vmcoreinfo.rst | 30 - + Documentation/admin-guide/kernel-parameters.txt | 8 +- + Documentation/admin-guide/mm/memory-hotplug.rst | 2 +- + Documentation/admin-guide/sysctl/kernel.rst | 23 +- + Documentation/arch/ia64/aliasing.rst | 246 --- + Documentation/arch/ia64/efirtc.rst | 144 -- + Documentation/arch/ia64/err_inject.rst | 1067 --------- + Documentation/arch/ia64/features.rst | 3 - + Documentation/arch/ia64/fsys.rst | 303 --- + Documentation/arch/ia64/ia64.rst | 49 - + Documentation/arch/ia64/index.rst | 19 - + Documentation/arch/ia64/irq-redir.rst | 80 - + Documentation/arch/ia64/mca.rst | 198 -- + Documentation/arch/ia64/serial.rst | 165 -- + Documentation/arch/index.rst | 1 - + Documentation/block/ioprio.rst | 3 - + Documentation/core-api/cpu_hotplug.rst | 6 - + Documentation/core-api/debugging-via-ohci1394.rst | 6 +- + .../features/core/cBPF-JIT/arch-support.txt | 1 - + .../features/core/eBPF-JIT/arch-support.txt | 1 - + .../core/generic-idle-thread/arch-support.txt | 1 - + .../features/core/jump-labels/arch-support.txt | 1 - + .../core/thread-info-in-task/arch-support.txt | 1 - + .../features/core/tracehook/arch-support.txt | 1 - + .../features/debug/KASAN/arch-support.txt | 1 - + .../debug/debug-vm-pgtable/arch-support.txt | 1 - + .../debug/gcov-profile-all/arch-support.txt | 1 - + Documentation/features/debug/kcov/arch-support.txt | 1 - + Documentation/features/debug/kgdb/arch-support.txt | 1 - + .../features/debug/kmemleak/arch-support.txt | 1 - + .../debug/kprobes-on-ftrace/arch-support.txt | 1 - + .../features/debug/kprobes/arch-support.txt | 1 - + .../features/debug/kretprobes/arch-support.txt | 1 - + .../features/debug/optprobes/arch-support.txt | 1 - + .../features/debug/stackprotector/arch-support.txt | 1 - + .../features/debug/uprobes/arch-support.txt | 1 - + .../debug/user-ret-profiler/arch-support.txt | 1 - + .../features/io/dma-contiguous/arch-support.txt | 1 - + .../locking/cmpxchg-local/arch-support.txt | 1 - + .../features/locking/lockdep/arch-support.txt | 1 - + .../locking/queued-rwlocks/arch-support.txt | 1 - + .../locking/queued-spinlocks/arch-support.txt | 1 - + .../features/perf/kprobes-event/arch-support.txt | 1 - + .../features/perf/perf-regs/arch-support.txt | 1 - + .../features/perf/perf-stackdump/arch-support.txt | 1 - + .../sched/membarrier-sync-core/arch-support.txt | 1 - + .../features/sched/numa-balancing/arch-support.txt | 1 - + .../seccomp/seccomp-filter/arch-support.txt | 1 - + .../time/arch-tick-broadcast/arch-support.txt | 1 - + .../features/time/clockevents/arch-support.txt | 1 - + .../time/context-tracking/arch-support.txt | 1 - + .../features/time/irq-time-acct/arch-support.txt | 1 - + .../features/time/virt-cpuacct/arch-support.txt | 1 - + .../features/vm/ELF-ASLR/arch-support.txt | 1 - + .../features/vm/PG_uncached/arch-support.txt | 1 - + Documentation/features/vm/THP/arch-support.txt | 1 - + Documentation/features/vm/TLB/arch-support.txt | 1 - + .../features/vm/huge-vmap/arch-support.txt | 1 - + .../features/vm/ioremap_prot/arch-support.txt | 1 - + .../features/vm/pte_special/arch-support.txt | 1 - + Documentation/kbuild/makefiles.rst | 2 +- + .../device_drivers/ethernet/neterion/s2io.rst | 4 +- + Documentation/scheduler/sched-arch.rst | 4 +- + Documentation/trace/kprobes.rst | 1 - + Documentation/translations/zh_CN/arch/index.rst | 1 - + .../translations/zh_CN/core-api/cpu_hotplug.rst | 6 - + .../translations/zh_CN/scheduler/sched-arch.rst | 5 +- + MAINTAINERS | 11 - + Makefile | 4 +- + arch/Kconfig | 1 - + arch/alpha/kernel/syscalls/syscall.tbl | 3 +- + arch/arm/tools/syscall.tbl | 3 +- + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 6 +- + arch/ia64/Kbuild | 3 - + arch/ia64/Kconfig | 394 ---- + arch/ia64/Kconfig.debug | 55 - + arch/ia64/Makefile | 82 - + arch/ia64/configs/bigsur_defconfig | 102 - + arch/ia64/configs/generic_defconfig | 206 -- + arch/ia64/configs/gensparse_defconfig | 184 -- + arch/ia64/configs/tiger_defconfig | 169 -- + arch/ia64/configs/zx1_defconfig | 148 -- + arch/ia64/hp/common/Makefile | 10 - + arch/ia64/hp/common/aml_nfw.c | 232 -- + arch/ia64/hp/common/sba_iommu.c | 2155 ------------------ + arch/ia64/include/asm/Kbuild | 6 - + arch/ia64/include/asm/acenv.h | 49 - + arch/ia64/include/asm/acpi-ext.h | 17 - + arch/ia64/include/asm/acpi.h | 110 - + arch/ia64/include/asm/asm-offsets.h | 1 - + arch/ia64/include/asm/asm-prototypes.h | 30 - + arch/ia64/include/asm/asmmacro.h | 136 -- + arch/ia64/include/asm/atomic.h | 216 -- + arch/ia64/include/asm/barrier.h | 79 - + arch/ia64/include/asm/bitops.h | 453 ---- + arch/ia64/include/asm/bug.h | 19 - + arch/ia64/include/asm/cache.h | 30 - + arch/ia64/include/asm/cacheflush.h | 39 - + arch/ia64/include/asm/checksum.h | 63 - + arch/ia64/include/asm/clocksource.h | 11 - + arch/ia64/include/asm/cmpxchg.h | 33 - + arch/ia64/include/asm/cpu.h | 18 - + arch/ia64/include/asm/cputime.h | 21 - + arch/ia64/include/asm/current.h | 18 - + arch/ia64/include/asm/cyclone.h | 16 - + arch/ia64/include/asm/delay.h | 89 - + arch/ia64/include/asm/device.h | 14 - + arch/ia64/include/asm/div64.h | 1 - + arch/ia64/include/asm/dma-mapping.h | 16 - + arch/ia64/include/asm/dma.h | 17 - + arch/ia64/include/asm/dmi.h | 15 - + arch/ia64/include/asm/early_ioremap.h | 11 - + arch/ia64/include/asm/efi.h | 13 - + arch/ia64/include/asm/elf.h | 233 -- + arch/ia64/include/asm/emergency-restart.h | 6 - + arch/ia64/include/asm/esi.h | 30 - + arch/ia64/include/asm/exception.h | 23 - + arch/ia64/include/asm/extable.h | 12 - + arch/ia64/include/asm/fb.h | 43 - + arch/ia64/include/asm/fpswa.h | 74 - + arch/ia64/include/asm/ftrace.h | 28 - + arch/ia64/include/asm/futex.h | 109 - + arch/ia64/include/asm/gcc_intrin.h | 13 - + arch/ia64/include/asm/hardirq.h | 27 - + arch/ia64/include/asm/hugetlb.h | 34 - + arch/ia64/include/asm/hw_irq.h | 167 -- + arch/ia64/include/asm/idle.h | 8 - + arch/ia64/include/asm/intrinsics.h | 13 - + arch/ia64/include/asm/io.h | 271 --- + arch/ia64/include/asm/iommu.h | 22 - + arch/ia64/include/asm/iosapic.h | 106 - + arch/ia64/include/asm/irq.h | 37 - + arch/ia64/include/asm/irq_regs.h | 1 - + arch/ia64/include/asm/irq_remapping.h | 5 - + arch/ia64/include/asm/irqflags.h | 95 - + arch/ia64/include/asm/kdebug.h | 45 - + arch/ia64/include/asm/kexec.h | 46 - + arch/ia64/include/asm/kprobes.h | 116 - + arch/ia64/include/asm/kregs.h | 166 -- + arch/ia64/include/asm/libata-portmap.h | 9 - + arch/ia64/include/asm/linkage.h | 19 - + arch/ia64/include/asm/local.h | 1 - + arch/ia64/include/asm/mca.h | 185 -- + arch/ia64/include/asm/mca_asm.h | 245 --- + arch/ia64/include/asm/meminit.h | 59 - + arch/ia64/include/asm/mman.h | 18 - + arch/ia64/include/asm/mmiowb.h | 17 - + arch/ia64/include/asm/mmu.h | 14 - + arch/ia64/include/asm/mmu_context.h | 194 -- + arch/ia64/include/asm/mmzone.h | 35 - + arch/ia64/include/asm/module.h | 35 - + arch/ia64/include/asm/module.lds.h | 14 - + arch/ia64/include/asm/msidef.h | 43 - + arch/ia64/include/asm/native/inst.h | 119 - + arch/ia64/include/asm/native/irq.h | 20 - + arch/ia64/include/asm/native/patchlist.h | 24 - + arch/ia64/include/asm/nodedata.h | 63 - + arch/ia64/include/asm/numa.h | 83 - + arch/ia64/include/asm/page.h | 208 -- + arch/ia64/include/asm/pal.h | 1827 --------------- + arch/ia64/include/asm/param.h | 18 - + arch/ia64/include/asm/parport.h | 20 - + arch/ia64/include/asm/patch.h | 28 - + arch/ia64/include/asm/pci.h | 66 - + arch/ia64/include/asm/percpu.h | 53 - + arch/ia64/include/asm/pgalloc.h | 64 - + arch/ia64/include/asm/pgtable.h | 545 ----- + arch/ia64/include/asm/processor.h | 660 ------ + arch/ia64/include/asm/ptrace.h | 146 -- + arch/ia64/include/asm/sal.h | 919 -------- + arch/ia64/include/asm/sections.h | 33 - + arch/ia64/include/asm/serial.h | 17 - + arch/ia64/include/asm/shmparam.h | 13 - + arch/ia64/include/asm/signal.h | 33 - + arch/ia64/include/asm/smp.h | 103 - + arch/ia64/include/asm/sn/intr.h | 15 - + arch/ia64/include/asm/sn/sn_sal.h | 124 -- + arch/ia64/include/asm/sparsemem.h | 28 - + arch/ia64/include/asm/spinlock.h | 265 --- + arch/ia64/include/asm/spinlock_types.h | 22 - + arch/ia64/include/asm/string.h | 22 - + arch/ia64/include/asm/switch_to.h | 71 - + arch/ia64/include/asm/syscall.h | 65 - + arch/ia64/include/asm/thread_info.h | 131 -- + arch/ia64/include/asm/timex.h | 47 - + arch/ia64/include/asm/tlb.h | 50 - + arch/ia64/include/asm/tlbflush.h | 128 -- + arch/ia64/include/asm/topology.h | 56 - + arch/ia64/include/asm/types.h | 32 - + arch/ia64/include/asm/uaccess.h | 265 --- + arch/ia64/include/asm/uncached.h | 9 - + arch/ia64/include/asm/unistd.h | 38 - + arch/ia64/include/asm/unwind.h | 234 -- + arch/ia64/include/asm/user.h | 53 - + arch/ia64/include/asm/ustack.h | 12 - + arch/ia64/include/asm/uv/uv.h | 30 - + arch/ia64/include/asm/uv/uv_hub.h | 315 --- + arch/ia64/include/asm/uv/uv_mmrs.h | 825 ------- + arch/ia64/include/asm/vermagic.h | 15 - + arch/ia64/include/asm/vga.h | 26 - + arch/ia64/include/asm/vmalloc.h | 4 - + arch/ia64/include/asm/xor.h | 30 - + arch/ia64/include/asm/xtp.h | 46 - + arch/ia64/include/uapi/asm/Kbuild | 2 - + arch/ia64/include/uapi/asm/auxvec.h | 14 - + arch/ia64/include/uapi/asm/bitsperlong.h | 9 - + arch/ia64/include/uapi/asm/break.h | 23 - + arch/ia64/include/uapi/asm/byteorder.h | 7 - + arch/ia64/include/uapi/asm/cmpxchg.h | 138 -- + arch/ia64/include/uapi/asm/fcntl.h | 15 - + arch/ia64/include/uapi/asm/fpu.h | 67 - + arch/ia64/include/uapi/asm/gcc_intrin.h | 619 ------ + arch/ia64/include/uapi/asm/ia64regs.h | 101 - + arch/ia64/include/uapi/asm/intrinsics.h | 82 - + arch/ia64/include/uapi/asm/mman.h | 17 - + arch/ia64/include/uapi/asm/param.h | 30 - + arch/ia64/include/uapi/asm/posix_types.h | 9 - + arch/ia64/include/uapi/asm/ptrace.h | 248 --- + arch/ia64/include/uapi/asm/ptrace_offsets.h | 269 --- + arch/ia64/include/uapi/asm/resource.h | 8 - + arch/ia64/include/uapi/asm/rse.h | 67 - + arch/ia64/include/uapi/asm/setup.h | 25 - + arch/ia64/include/uapi/asm/sigcontext.h | 71 - + arch/ia64/include/uapi/asm/siginfo.h | 28 - + arch/ia64/include/uapi/asm/signal.h | 98 - + arch/ia64/include/uapi/asm/stat.h | 52 - + arch/ia64/include/uapi/asm/statfs.h | 21 - + arch/ia64/include/uapi/asm/swab.h | 35 - + arch/ia64/include/uapi/asm/types.h | 32 - + arch/ia64/include/uapi/asm/ucontext.h | 13 - + arch/ia64/include/uapi/asm/unistd.h | 22 - + arch/ia64/include/uapi/asm/ustack.h | 13 - + arch/ia64/install.sh | 30 - + arch/ia64/kernel/.gitignore | 3 - + arch/ia64/kernel/Makefile | 46 - + arch/ia64/kernel/Makefile.gate | 29 - + arch/ia64/kernel/acpi-ext.c | 101 - + arch/ia64/kernel/acpi.c | 913 -------- + arch/ia64/kernel/asm-offsets.c | 289 --- + arch/ia64/kernel/audit.c | 63 - + arch/ia64/kernel/brl_emu.c | 217 -- + arch/ia64/kernel/crash.c | 257 --- + arch/ia64/kernel/crash_dump.c | 27 - + arch/ia64/kernel/cyclone.c | 125 -- + arch/ia64/kernel/dma-mapping.c | 9 - + arch/ia64/kernel/efi.c | 1360 ------------ + arch/ia64/kernel/efi_stub.S | 87 - + arch/ia64/kernel/elfcore.c | 77 - + arch/ia64/kernel/entry.S | 1427 ------------ + arch/ia64/kernel/entry.h | 83 - + arch/ia64/kernel/err_inject.c | 273 --- + arch/ia64/kernel/esi.c | 193 -- + arch/ia64/kernel/esi_stub.S | 99 - + arch/ia64/kernel/fsys.S | 837 ------- + arch/ia64/kernel/fsyscall_gtod_data.h | 30 - + arch/ia64/kernel/ftrace.c | 196 -- + arch/ia64/kernel/gate-data.S | 3 - + arch/ia64/kernel/gate.S | 380 ---- + arch/ia64/kernel/gate.lds.S | 108 - + arch/ia64/kernel/head.S | 1167 ---------- + arch/ia64/kernel/iosapic.c | 1137 ---------- + arch/ia64/kernel/irq.c | 181 -- + arch/ia64/kernel/irq.h | 3 - + arch/ia64/kernel/irq_ia64.c | 645 ------ + arch/ia64/kernel/irq_lsapic.c | 45 - + arch/ia64/kernel/ivt.S | 1688 -------------- + arch/ia64/kernel/kprobes.c | 911 -------- + arch/ia64/kernel/machine_kexec.c | 163 -- + arch/ia64/kernel/mca.c | 2111 ------------------ + arch/ia64/kernel/mca_asm.S | 1123 ---------- + arch/ia64/kernel/mca_drv.c | 796 ------- + arch/ia64/kernel/mca_drv.h | 123 -- + arch/ia64/kernel/mca_drv_asm.S | 56 - + arch/ia64/kernel/minstate.h | 251 --- + arch/ia64/kernel/module.c | 959 -------- + arch/ia64/kernel/msi_ia64.c | 198 -- + arch/ia64/kernel/numa.c | 73 - + arch/ia64/kernel/pal.S | 306 --- + arch/ia64/kernel/palinfo.c | 942 -------- + arch/ia64/kernel/patch.c | 237 -- + arch/ia64/kernel/pci-dma.c | 33 - + arch/ia64/kernel/perfmon_itanium.h | 116 - + arch/ia64/kernel/process.c | 611 ------ + arch/ia64/kernel/ptrace.c | 2012 ----------------- + arch/ia64/kernel/relocate_kernel.S | 321 --- + arch/ia64/kernel/sal.c | 400 ---- + arch/ia64/kernel/salinfo.c | 646 ------ + arch/ia64/kernel/setup.c | 1081 --------- + arch/ia64/kernel/sigframe.h | 26 - + arch/ia64/kernel/signal.c | 412 ---- + arch/ia64/kernel/smp.c | 335 --- + arch/ia64/kernel/smpboot.c | 839 ------- + arch/ia64/kernel/stacktrace.c | 40 - + arch/ia64/kernel/sys_ia64.c | 197 -- + arch/ia64/kernel/syscalls/Makefile | 32 - + arch/ia64/kernel/syscalls/syscall.tbl | 375 ---- + arch/ia64/kernel/time.c | 463 ---- + arch/ia64/kernel/topology.c | 410 ---- + arch/ia64/kernel/traps.c | 612 ------ + arch/ia64/kernel/unaligned.c | 1560 ------------- + arch/ia64/kernel/uncached.c | 273 --- + arch/ia64/kernel/unwind.c | 2320 -------------------- + arch/ia64/kernel/unwind_decoder.c | 460 ---- + arch/ia64/kernel/unwind_i.h | 165 -- + arch/ia64/kernel/vmlinux.lds.S | 224 -- + arch/ia64/lib/Makefile | 48 - + arch/ia64/lib/checksum.c | 102 - + arch/ia64/lib/clear_page.S | 79 - + arch/ia64/lib/clear_user.S | 212 -- + arch/ia64/lib/copy_page.S | 101 - + arch/ia64/lib/copy_page_mck.S | 188 -- + arch/ia64/lib/copy_user.S | 613 ------ + arch/ia64/lib/csum_partial_copy.c | 98 - + arch/ia64/lib/do_csum.S | 324 --- + arch/ia64/lib/flush.S | 119 - + arch/ia64/lib/idiv32.S | 86 - + arch/ia64/lib/idiv64.S | 83 - + arch/ia64/lib/io.c | 51 - + arch/ia64/lib/ip_fast_csum.S | 148 -- + arch/ia64/lib/memcpy.S | 304 --- + arch/ia64/lib/memcpy_mck.S | 659 ------ + arch/ia64/lib/memset.S | 365 --- + arch/ia64/lib/strlen.S | 195 -- + arch/ia64/lib/strncpy_from_user.S | 47 - + arch/ia64/lib/strnlen_user.S | 48 - + arch/ia64/lib/xor.S | 181 -- + arch/ia64/mm/Makefile | 11 - + arch/ia64/mm/contig.c | 208 -- + arch/ia64/mm/discontig.c | 635 ------ + arch/ia64/mm/extable.c | 24 - + arch/ia64/mm/fault.c | 251 --- + arch/ia64/mm/hugetlbpage.c | 186 -- + arch/ia64/mm/init.c | 532 ----- + arch/ia64/mm/ioremap.c | 94 - + arch/ia64/mm/numa.c | 80 - + arch/ia64/mm/tlb.c | 591 ----- + arch/ia64/pci/Makefile | 5 - + arch/ia64/pci/fixup.c | 80 - + arch/ia64/pci/pci.c | 576 ----- + arch/ia64/scripts/check-gas | 16 - + arch/ia64/scripts/check-gas-asm.S | 2 - + arch/ia64/scripts/check-model.c | 1 - + arch/ia64/scripts/check-segrel.S | 5 - + arch/ia64/scripts/check-segrel.lds | 13 - + arch/ia64/scripts/check-serialize.S | 2 - + arch/ia64/scripts/check-text-align.S | 7 - + arch/ia64/scripts/toolchain-flags | 54 - + arch/ia64/scripts/unwcheck.py | 65 - + arch/ia64/uv/Makefile | 12 - + arch/ia64/uv/kernel/Makefile | 12 - + arch/ia64/uv/kernel/setup.c | 120 - + arch/m68k/kernel/syscalls/syscall.tbl | 3 +- + arch/microblaze/kernel/syscalls/syscall.tbl | 3 +- + arch/mips/kernel/syscalls/syscall_n32.tbl | 3 +- + arch/mips/kernel/syscalls/syscall_n64.tbl | 3 +- + arch/mips/kernel/syscalls/syscall_o32.tbl | 3 +- + arch/parisc/kernel/syscalls/syscall.tbl | 3 +- + arch/powerpc/kernel/syscalls/syscall.tbl | 3 +- + arch/s390/kernel/syscalls/syscall.tbl | 3 +- + arch/sh/kernel/syscalls/syscall.tbl | 3 +- + arch/sparc/kernel/syscalls/syscall.tbl | 3 +- + arch/x86/entry/syscalls/syscall_32.tbl | 3 +- + arch/x86/entry/syscalls/syscall_64.tbl | 2 +- + arch/xtensa/kernel/syscalls/syscall.tbl | 3 +- + drivers/acpi/Kconfig | 6 +- + drivers/acpi/numa/Kconfig | 4 +- + drivers/acpi/osl.c | 2 +- + drivers/char/Kconfig | 4 +- + drivers/char/Makefile | 1 - + drivers/char/agp/Kconfig | 16 +- + drivers/char/agp/Makefile | 2 - + drivers/char/agp/hp-agp.c | 550 ----- + drivers/char/agp/i460-agp.c | 659 ------ + drivers/char/hpet.c | 30 - + drivers/char/hw_random/Kconfig | 2 +- + drivers/char/mem.c | 12 - + drivers/char/mspec.c | 295 --- + drivers/cpufreq/Kconfig | 11 - + drivers/cpufreq/Makefile | 1 - + drivers/cpufreq/ia64-acpi-cpufreq.c | 353 --- + drivers/firmware/Kconfig | 24 - + drivers/firmware/Makefile | 1 - + drivers/firmware/efi/Kconfig | 6 +- + drivers/firmware/efi/efi.c | 13 +- + drivers/firmware/pcdp.c | 135 -- + drivers/firmware/pcdp.h | 108 - + drivers/gpu/drm/drm_ioc32.c | 4 +- + drivers/input/serio/i8042.h | 2 +- + drivers/iommu/Kconfig | 4 +- + drivers/iommu/intel/Kconfig | 2 +- + drivers/media/cec/platform/Kconfig | 2 +- + drivers/misc/Kconfig | 2 +- + drivers/misc/sgi-gru/gru.h | 4 +- + drivers/misc/sgi-gru/gru_instructions.h | 12 +- + drivers/misc/sgi-gru/grufile.c | 72 - + drivers/misc/sgi-gru/gruhandles.c | 6 - + drivers/misc/sgi-gru/grumain.c | 4 - + drivers/misc/sgi-xp/xp.h | 2 +- + drivers/misc/sgi-xp/xp_uv.c | 24 - + drivers/misc/sgi-xp/xpc_main.c | 31 - + drivers/misc/sgi-xp/xpc_uv.c | 85 - + drivers/net/ethernet/broadcom/tg3.c | 2 +- + drivers/net/ethernet/brocade/bna/bnad.h | 1 - + .../net/ethernet/qlogic/netxen/netxen_nic_main.c | 2 - + drivers/pci/vgaarb.c | 2 +- + drivers/tty/serial/8250/Kconfig | 2 +- + drivers/tty/vt/keyboard.c | 2 +- + drivers/video/fbdev/Kconfig | 2 +- + drivers/watchdog/Kconfig | 2 +- + fs/Kconfig | 2 +- + fs/afs/main.c | 2 - + fs/xfs/xfs_ioctl32.h | 2 +- + include/asm-generic/Kbuild | 2 +- + include/linux/acpi.h | 9 +- + include/linux/compat.h | 1 - + include/linux/efi.h | 7 - + include/linux/mm.h | 2 - + include/linux/moduleparam.h | 2 +- + include/linux/raid/pq.h | 2 - + include/linux/sched/signal.h | 17 +- + include/linux/syscalls.h | 1 - + include/trace/events/mmflags.h | 2 +- + include/uapi/asm-generic/siginfo.h | 5 - + include/uapi/asm-generic/unistd.h | 7 +- + init/Kconfig | 2 +- + kernel/cpu.c | 3 - + kernel/fork.c | 2 +- + kernel/sched/core.c | 29 +- + kernel/signal.c | 25 +- + kernel/sys_ni.c | 2 - + kernel/sysctl.c | 9 - + lib/Kconfig.debug | 2 +- + lib/decompress_unxz.c | 3 - + lib/raid6/Makefile | 4 +- + lib/raid6/algos.c | 4 - + lib/raid6/int.uc | 9 - + lib/xz/Kconfig | 5 - + mm/mmap.c | 6 +- + tools/arch/ia64/include/asm/barrier.h | 59 - + tools/arch/ia64/include/uapi/asm/bitsperlong.h | 9 - + tools/arch/ia64/include/uapi/asm/mman.h | 7 - + tools/include/uapi/asm-generic/unistd.h | 2 +- + .../perf/arch/mips/entry/syscalls/syscall_n64.tbl | 2 +- + tools/perf/arch/powerpc/entry/syscalls/syscall.tbl | 2 +- + tools/perf/arch/s390/entry/syscalls/syscall.tbl | 2 +- + tools/perf/arch/x86/entry/syscalls/syscall_64.tbl | 2 +- + usr/include/Makefile | 6 - + 451 files changed, 119 insertions(+), 65201 deletions(-) + delete mode 100644 Documentation/arch/ia64/aliasing.rst + delete mode 100644 Documentation/arch/ia64/efirtc.rst + delete mode 100644 Documentation/arch/ia64/err_inject.rst + delete mode 100644 Documentation/arch/ia64/features.rst + delete mode 100644 Documentation/arch/ia64/fsys.rst + delete mode 100644 Documentation/arch/ia64/ia64.rst + delete mode 100644 Documentation/arch/ia64/index.rst + delete mode 100644 Documentation/arch/ia64/irq-redir.rst + delete mode 100644 Documentation/arch/ia64/mca.rst + delete mode 100644 Documentation/arch/ia64/serial.rst + delete mode 100644 arch/ia64/Kbuild + delete mode 100644 arch/ia64/Kconfig + delete mode 100644 arch/ia64/Kconfig.debug + delete mode 100644 arch/ia64/Makefile + delete mode 100644 arch/ia64/configs/bigsur_defconfig + delete mode 100644 arch/ia64/configs/generic_defconfig + delete mode 100644 arch/ia64/configs/gensparse_defconfig + delete mode 100644 arch/ia64/configs/tiger_defconfig + delete mode 100644 arch/ia64/configs/zx1_defconfig + delete mode 100644 arch/ia64/hp/common/Makefile + delete mode 100644 arch/ia64/hp/common/aml_nfw.c + delete mode 100644 arch/ia64/hp/common/sba_iommu.c + delete mode 100644 arch/ia64/include/asm/Kbuild + delete mode 100644 arch/ia64/include/asm/acenv.h + delete mode 100644 arch/ia64/include/asm/acpi-ext.h + delete mode 100644 arch/ia64/include/asm/acpi.h + delete mode 100644 arch/ia64/include/asm/asm-offsets.h + delete mode 100644 arch/ia64/include/asm/asm-prototypes.h + delete mode 100644 arch/ia64/include/asm/asmmacro.h + delete mode 100644 arch/ia64/include/asm/atomic.h + delete mode 100644 arch/ia64/include/asm/barrier.h + delete mode 100644 arch/ia64/include/asm/bitops.h + delete mode 100644 arch/ia64/include/asm/bug.h + delete mode 100644 arch/ia64/include/asm/cache.h + delete mode 100644 arch/ia64/include/asm/cacheflush.h + delete mode 100644 arch/ia64/include/asm/checksum.h + delete mode 100644 arch/ia64/include/asm/clocksource.h + delete mode 100644 arch/ia64/include/asm/cmpxchg.h + delete mode 100644 arch/ia64/include/asm/cpu.h + delete mode 100644 arch/ia64/include/asm/cputime.h + delete mode 100644 arch/ia64/include/asm/current.h + delete mode 100644 arch/ia64/include/asm/cyclone.h + delete mode 100644 arch/ia64/include/asm/delay.h + delete mode 100644 arch/ia64/include/asm/device.h + delete mode 100644 arch/ia64/include/asm/div64.h + delete mode 100644 arch/ia64/include/asm/dma-mapping.h + delete mode 100644 arch/ia64/include/asm/dma.h + delete mode 100644 arch/ia64/include/asm/dmi.h + delete mode 100644 arch/ia64/include/asm/early_ioremap.h + delete mode 100644 arch/ia64/include/asm/efi.h + delete mode 100644 arch/ia64/include/asm/elf.h + delete mode 100644 arch/ia64/include/asm/emergency-restart.h + delete mode 100644 arch/ia64/include/asm/esi.h + delete mode 100644 arch/ia64/include/asm/exception.h + delete mode 100644 arch/ia64/include/asm/extable.h + delete mode 100644 arch/ia64/include/asm/fb.h + delete mode 100644 arch/ia64/include/asm/fpswa.h + delete mode 100644 arch/ia64/include/asm/ftrace.h + delete mode 100644 arch/ia64/include/asm/futex.h + delete mode 100644 arch/ia64/include/asm/gcc_intrin.h + delete mode 100644 arch/ia64/include/asm/hardirq.h + delete mode 100644 arch/ia64/include/asm/hugetlb.h + delete mode 100644 arch/ia64/include/asm/hw_irq.h + delete mode 100644 arch/ia64/include/asm/idle.h + delete mode 100644 arch/ia64/include/asm/intrinsics.h + delete mode 100644 arch/ia64/include/asm/io.h + delete mode 100644 arch/ia64/include/asm/iommu.h + delete mode 100644 arch/ia64/include/asm/iosapic.h + delete mode 100644 arch/ia64/include/asm/irq.h + delete mode 100644 arch/ia64/include/asm/irq_regs.h + delete mode 100644 arch/ia64/include/asm/irq_remapping.h + delete mode 100644 arch/ia64/include/asm/irqflags.h + delete mode 100644 arch/ia64/include/asm/kdebug.h + delete mode 100644 arch/ia64/include/asm/kexec.h + delete mode 100644 arch/ia64/include/asm/kprobes.h + delete mode 100644 arch/ia64/include/asm/kregs.h + delete mode 100644 arch/ia64/include/asm/libata-portmap.h + delete mode 100644 arch/ia64/include/asm/linkage.h + delete mode 100644 arch/ia64/include/asm/local.h + delete mode 100644 arch/ia64/include/asm/mca.h + delete mode 100644 arch/ia64/include/asm/mca_asm.h + delete mode 100644 arch/ia64/include/asm/meminit.h + delete mode 100644 arch/ia64/include/asm/mman.h + delete mode 100644 arch/ia64/include/asm/mmiowb.h + delete mode 100644 arch/ia64/include/asm/mmu.h + delete mode 100644 arch/ia64/include/asm/mmu_context.h + delete mode 100644 arch/ia64/include/asm/mmzone.h + delete mode 100644 arch/ia64/include/asm/module.h + delete mode 100644 arch/ia64/include/asm/module.lds.h + delete mode 100644 arch/ia64/include/asm/msidef.h + delete mode 100644 arch/ia64/include/asm/native/inst.h + delete mode 100644 arch/ia64/include/asm/native/irq.h + delete mode 100644 arch/ia64/include/asm/native/patchlist.h + delete mode 100644 arch/ia64/include/asm/nodedata.h + delete mode 100644 arch/ia64/include/asm/numa.h + delete mode 100644 arch/ia64/include/asm/page.h + delete mode 100644 arch/ia64/include/asm/pal.h + delete mode 100644 arch/ia64/include/asm/param.h + delete mode 100644 arch/ia64/include/asm/parport.h + delete mode 100644 arch/ia64/include/asm/patch.h + delete mode 100644 arch/ia64/include/asm/pci.h + delete mode 100644 arch/ia64/include/asm/percpu.h + delete mode 100644 arch/ia64/include/asm/pgalloc.h + delete mode 100644 arch/ia64/include/asm/pgtable.h + delete mode 100644 arch/ia64/include/asm/processor.h + delete mode 100644 arch/ia64/include/asm/ptrace.h + delete mode 100644 arch/ia64/include/asm/sal.h + delete mode 100644 arch/ia64/include/asm/sections.h + delete mode 100644 arch/ia64/include/asm/serial.h + delete mode 100644 arch/ia64/include/asm/shmparam.h + delete mode 100644 arch/ia64/include/asm/signal.h + delete mode 100644 arch/ia64/include/asm/smp.h + delete mode 100644 arch/ia64/include/asm/sn/intr.h + delete mode 100644 arch/ia64/include/asm/sn/sn_sal.h + delete mode 100644 arch/ia64/include/asm/sparsemem.h + delete mode 100644 arch/ia64/include/asm/spinlock.h + delete mode 100644 arch/ia64/include/asm/spinlock_types.h + delete mode 100644 arch/ia64/include/asm/string.h + delete mode 100644 arch/ia64/include/asm/switch_to.h + delete mode 100644 arch/ia64/include/asm/syscall.h + delete mode 100644 arch/ia64/include/asm/thread_info.h + delete mode 100644 arch/ia64/include/asm/timex.h + delete mode 100644 arch/ia64/include/asm/tlb.h + delete mode 100644 arch/ia64/include/asm/tlbflush.h + delete mode 100644 arch/ia64/include/asm/topology.h + delete mode 100644 arch/ia64/include/asm/types.h + delete mode 100644 arch/ia64/include/asm/uaccess.h + delete mode 100644 arch/ia64/include/asm/uncached.h + delete mode 100644 arch/ia64/include/asm/unistd.h + delete mode 100644 arch/ia64/include/asm/unwind.h + delete mode 100644 arch/ia64/include/asm/user.h + delete mode 100644 arch/ia64/include/asm/ustack.h + delete mode 100644 arch/ia64/include/asm/uv/uv.h + delete mode 100644 arch/ia64/include/asm/uv/uv_hub.h + delete mode 100644 arch/ia64/include/asm/uv/uv_mmrs.h + delete mode 100644 arch/ia64/include/asm/vermagic.h + delete mode 100644 arch/ia64/include/asm/vga.h + delete mode 100644 arch/ia64/include/asm/vmalloc.h + delete mode 100644 arch/ia64/include/asm/xor.h + delete mode 100644 arch/ia64/include/asm/xtp.h + delete mode 100644 arch/ia64/include/uapi/asm/Kbuild + delete mode 100644 arch/ia64/include/uapi/asm/auxvec.h + delete mode 100644 arch/ia64/include/uapi/asm/bitsperlong.h + delete mode 100644 arch/ia64/include/uapi/asm/break.h + delete mode 100644 arch/ia64/include/uapi/asm/byteorder.h + delete mode 100644 arch/ia64/include/uapi/asm/cmpxchg.h + delete mode 100644 arch/ia64/include/uapi/asm/fcntl.h + delete mode 100644 arch/ia64/include/uapi/asm/fpu.h + delete mode 100644 arch/ia64/include/uapi/asm/gcc_intrin.h + delete mode 100644 arch/ia64/include/uapi/asm/ia64regs.h + delete mode 100644 arch/ia64/include/uapi/asm/intrinsics.h + delete mode 100644 arch/ia64/include/uapi/asm/mman.h + delete mode 100644 arch/ia64/include/uapi/asm/param.h + delete mode 100644 arch/ia64/include/uapi/asm/posix_types.h + delete mode 100644 arch/ia64/include/uapi/asm/ptrace.h + delete mode 100644 arch/ia64/include/uapi/asm/ptrace_offsets.h + delete mode 100644 arch/ia64/include/uapi/asm/resource.h + delete mode 100644 arch/ia64/include/uapi/asm/rse.h + delete mode 100644 arch/ia64/include/uapi/asm/setup.h + delete mode 100644 arch/ia64/include/uapi/asm/sigcontext.h + delete mode 100644 arch/ia64/include/uapi/asm/siginfo.h + delete mode 100644 arch/ia64/include/uapi/asm/signal.h + delete mode 100644 arch/ia64/include/uapi/asm/stat.h + delete mode 100644 arch/ia64/include/uapi/asm/statfs.h + delete mode 100644 arch/ia64/include/uapi/asm/swab.h + delete mode 100644 arch/ia64/include/uapi/asm/types.h + delete mode 100644 arch/ia64/include/uapi/asm/ucontext.h + delete mode 100644 arch/ia64/include/uapi/asm/unistd.h + delete mode 100644 arch/ia64/include/uapi/asm/ustack.h + delete mode 100755 arch/ia64/install.sh + delete mode 100644 arch/ia64/kernel/.gitignore + delete mode 100644 arch/ia64/kernel/Makefile + delete mode 100644 arch/ia64/kernel/Makefile.gate + delete mode 100644 arch/ia64/kernel/acpi-ext.c + delete mode 100644 arch/ia64/kernel/acpi.c + delete mode 100644 arch/ia64/kernel/asm-offsets.c + delete mode 100644 arch/ia64/kernel/audit.c + delete mode 100644 arch/ia64/kernel/brl_emu.c + delete mode 100644 arch/ia64/kernel/crash.c + delete mode 100644 arch/ia64/kernel/crash_dump.c + delete mode 100644 arch/ia64/kernel/cyclone.c + delete mode 100644 arch/ia64/kernel/dma-mapping.c + delete mode 100644 arch/ia64/kernel/efi.c + delete mode 100644 arch/ia64/kernel/efi_stub.S + delete mode 100644 arch/ia64/kernel/elfcore.c + delete mode 100644 arch/ia64/kernel/entry.S + delete mode 100644 arch/ia64/kernel/entry.h + delete mode 100644 arch/ia64/kernel/err_inject.c + delete mode 100644 arch/ia64/kernel/esi.c + delete mode 100644 arch/ia64/kernel/esi_stub.S + delete mode 100644 arch/ia64/kernel/fsys.S + delete mode 100644 arch/ia64/kernel/fsyscall_gtod_data.h + delete mode 100644 arch/ia64/kernel/ftrace.c + delete mode 100644 arch/ia64/kernel/gate-data.S + delete mode 100644 arch/ia64/kernel/gate.S + delete mode 100644 arch/ia64/kernel/gate.lds.S + delete mode 100644 arch/ia64/kernel/head.S + delete mode 100644 arch/ia64/kernel/iosapic.c + delete mode 100644 arch/ia64/kernel/irq.c + delete mode 100644 arch/ia64/kernel/irq.h + delete mode 100644 arch/ia64/kernel/irq_ia64.c + delete mode 100644 arch/ia64/kernel/irq_lsapic.c + delete mode 100644 arch/ia64/kernel/ivt.S + delete mode 100644 arch/ia64/kernel/kprobes.c + delete mode 100644 arch/ia64/kernel/machine_kexec.c + delete mode 100644 arch/ia64/kernel/mca.c + delete mode 100644 arch/ia64/kernel/mca_asm.S + delete mode 100644 arch/ia64/kernel/mca_drv.c + delete mode 100644 arch/ia64/kernel/mca_drv.h + delete mode 100644 arch/ia64/kernel/mca_drv_asm.S + delete mode 100644 arch/ia64/kernel/minstate.h + delete mode 100644 arch/ia64/kernel/module.c + delete mode 100644 arch/ia64/kernel/msi_ia64.c + delete mode 100644 arch/ia64/kernel/numa.c + delete mode 100644 arch/ia64/kernel/pal.S + delete mode 100644 arch/ia64/kernel/palinfo.c + delete mode 100644 arch/ia64/kernel/patch.c + delete mode 100644 arch/ia64/kernel/pci-dma.c + delete mode 100644 arch/ia64/kernel/perfmon_itanium.h + delete mode 100644 arch/ia64/kernel/process.c + delete mode 100644 arch/ia64/kernel/ptrace.c + delete mode 100644 arch/ia64/kernel/relocate_kernel.S + delete mode 100644 arch/ia64/kernel/sal.c + delete mode 100644 arch/ia64/kernel/salinfo.c + delete mode 100644 arch/ia64/kernel/setup.c + delete mode 100644 arch/ia64/kernel/sigframe.h + delete mode 100644 arch/ia64/kernel/signal.c + delete mode 100644 arch/ia64/kernel/smp.c + delete mode 100644 arch/ia64/kernel/smpboot.c + delete mode 100644 arch/ia64/kernel/stacktrace.c + delete mode 100644 arch/ia64/kernel/sys_ia64.c + delete mode 100644 arch/ia64/kernel/syscalls/Makefile + delete mode 100644 arch/ia64/kernel/syscalls/syscall.tbl + delete mode 100644 arch/ia64/kernel/time.c + delete mode 100644 arch/ia64/kernel/topology.c + delete mode 100644 arch/ia64/kernel/traps.c + delete mode 100644 arch/ia64/kernel/unaligned.c + delete mode 100644 arch/ia64/kernel/uncached.c + delete mode 100644 arch/ia64/kernel/unwind.c + delete mode 100644 arch/ia64/kernel/unwind_decoder.c + delete mode 100644 arch/ia64/kernel/unwind_i.h + delete mode 100644 arch/ia64/kernel/vmlinux.lds.S + delete mode 100644 arch/ia64/lib/Makefile + delete mode 100644 arch/ia64/lib/checksum.c + delete mode 100644 arch/ia64/lib/clear_page.S + delete mode 100644 arch/ia64/lib/clear_user.S + delete mode 100644 arch/ia64/lib/copy_page.S + delete mode 100644 arch/ia64/lib/copy_page_mck.S + delete mode 100644 arch/ia64/lib/copy_user.S + delete mode 100644 arch/ia64/lib/csum_partial_copy.c + delete mode 100644 arch/ia64/lib/do_csum.S + delete mode 100644 arch/ia64/lib/flush.S + delete mode 100644 arch/ia64/lib/idiv32.S + delete mode 100644 arch/ia64/lib/idiv64.S + delete mode 100644 arch/ia64/lib/io.c + delete mode 100644 arch/ia64/lib/ip_fast_csum.S + delete mode 100644 arch/ia64/lib/memcpy.S + delete mode 100644 arch/ia64/lib/memcpy_mck.S + delete mode 100644 arch/ia64/lib/memset.S + delete mode 100644 arch/ia64/lib/strlen.S + delete mode 100644 arch/ia64/lib/strncpy_from_user.S + delete mode 100644 arch/ia64/lib/strnlen_user.S + delete mode 100644 arch/ia64/lib/xor.S + delete mode 100644 arch/ia64/mm/Makefile + delete mode 100644 arch/ia64/mm/contig.c + delete mode 100644 arch/ia64/mm/discontig.c + delete mode 100644 arch/ia64/mm/extable.c + delete mode 100644 arch/ia64/mm/fault.c + delete mode 100644 arch/ia64/mm/hugetlbpage.c + delete mode 100644 arch/ia64/mm/init.c + delete mode 100644 arch/ia64/mm/ioremap.c + delete mode 100644 arch/ia64/mm/numa.c + delete mode 100644 arch/ia64/mm/tlb.c + delete mode 100644 arch/ia64/pci/Makefile + delete mode 100644 arch/ia64/pci/fixup.c + delete mode 100644 arch/ia64/pci/pci.c + delete mode 100755 arch/ia64/scripts/check-gas + delete mode 100644 arch/ia64/scripts/check-gas-asm.S + delete mode 100644 arch/ia64/scripts/check-model.c + delete mode 100644 arch/ia64/scripts/check-segrel.S + delete mode 100644 arch/ia64/scripts/check-segrel.lds + delete mode 100644 arch/ia64/scripts/check-serialize.S + delete mode 100644 arch/ia64/scripts/check-text-align.S + delete mode 100755 arch/ia64/scripts/toolchain-flags + delete mode 100644 arch/ia64/scripts/unwcheck.py + delete mode 100644 arch/ia64/uv/Makefile + delete mode 100644 arch/ia64/uv/kernel/Makefile + delete mode 100644 arch/ia64/uv/kernel/setup.c + delete mode 100644 drivers/char/agp/hp-agp.c + delete mode 100644 drivers/char/agp/i460-agp.c + delete mode 100644 drivers/char/mspec.c + delete mode 100644 drivers/cpufreq/ia64-acpi-cpufreq.c + delete mode 100644 drivers/firmware/pcdp.c + delete mode 100644 drivers/firmware/pcdp.h + delete mode 100644 tools/arch/ia64/include/asm/barrier.h + delete mode 100644 tools/arch/ia64/include/uapi/asm/bitsperlong.h + delete mode 100644 tools/arch/ia64/include/uapi/asm/mman.h +Merging arc/for-next (0bb80ecc33a8 Linux 6.6-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 (c7368ddba2ff ARM: 9326/1: make <linux/uaccess.h> self-contained for ARM) +$ git merge -m Merge branch 'for-next' of git://git.armlinux.org.uk/~rmk/linux-arm.git arm/for-next +Auto-merging arch/arm/kernel/setup.c +Merge made by the 'ort' strategy. + arch/arm/common/sa1111.c | 27 ++++++++++++++------------- + arch/arm/include/asm/dma.h | 3 +++ + arch/arm/include/asm/domain.h | 2 +- + arch/arm/include/asm/exception.h | 4 ---- + arch/arm/include/asm/traps.h | 3 ++- + arch/arm/include/asm/uaccess.h | 15 +++------------ + arch/arm/kernel/devtree.c | 1 - + arch/arm/kernel/setup.c | 2 +- + arch/arm/lib/memset.S | 1 + + 9 files changed, 25 insertions(+), 33 deletions(-) +Merging arm64/for-next/core (c19b7014aaae Merge branch 'for-next/feat_lse128' 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/mm/init.c +Auto-merging drivers/irqchip/irq-gic-v3.c +Merge made by the 'ort' strategy. + Documentation/arch/arm64/cpu-feature-registers.rst | 2 + + Documentation/arch/arm64/elf_hwcaps.rst | 9 ++ + arch/arm64/include/asm/cpu.h | 6 - + arch/arm64/include/asm/fpsimd.h | 1 - + arch/arm64/include/asm/hwcap.h | 3 + + arch/arm64/include/asm/irq.h | 3 + + arch/arm64/include/asm/smp.h | 4 +- + arch/arm64/include/uapi/asm/hwcap.h | 3 + + arch/arm64/kernel/acpi_parking_protocol.c | 2 +- + arch/arm64/kernel/cpufeature.c | 63 +++------ + arch/arm64/kernel/cpuinfo.c | 3 + + arch/arm64/kernel/fpsimd.c | 75 ++--------- + arch/arm64/kernel/idle.c | 4 +- + arch/arm64/kernel/smp.c | 142 +++++++++++++++++---- + arch/arm64/mm/init.c | 11 +- + arch/arm64/tools/sysreg | 8 +- + drivers/irqchip/irq-gic-v3.c | 61 ++++++--- + tools/testing/selftests/arm64/abi/hwcap.c | 54 ++++++++ + tools/testing/selftests/arm64/fp/sve-test.S | 19 +++ + 19 files changed, 298 insertions(+), 175 deletions(-) +Merging arm-perf/for-next/perf (0abe7f61c28d docs/perf: Add ampere_cspmu to toctree to fix a build warning) +$ 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 +Merge made by the 'ort' strategy. + Documentation/admin-guide/perf/ampere_cspmu.rst | 29 +++ + Documentation/admin-guide/perf/index.rst | 1 + + drivers/perf/arm_cspmu/Kconfig | 19 +- + drivers/perf/arm_cspmu/Makefile | 8 +- + drivers/perf/arm_cspmu/ampere_cspmu.c | 272 ++++++++++++++++++++++++ + drivers/perf/arm_cspmu/arm_cspmu.c | 201 +++++++++++++---- + drivers/perf/arm_cspmu/arm_cspmu.h | 32 ++- + drivers/perf/arm_cspmu/nvidia_cspmu.c | 34 ++- + drivers/perf/arm_cspmu/nvidia_cspmu.h | 17 -- + 9 files changed, 547 insertions(+), 66 deletions(-) + create mode 100644 Documentation/admin-guide/perf/ampere_cspmu.rst + create mode 100644 drivers/perf/arm_cspmu/ampere_cspmu.c + delete mode 100644 drivers/perf/arm_cspmu/nvidia_cspmu.h +Merging arm-soc/for-next (cda3f5e2e089 soc: document merges) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/amd,pensando.yaml | 26 + + .../devicetree/bindings/arm/atmel-at91.yaml | 7 + + .../devicetree/bindings/arm/intel-ixp4xx.yaml | 16 + + Documentation/devicetree/bindings/arm/sti.yaml | 23 +- + Documentation/devicetree/bindings/arm/sunxi.yaml | 16 + + .../bindings/arm/tegra/nvidia,tegra20-pmc.yaml | 393 -------------- + .../bindings/clock/renesas,rzg2l-cpg.yaml | 1 + + .../bindings/nvmem/allwinner,sun4i-a10-sid.yaml | 4 +- + .../bindings/soc/renesas/renesas,rzg2l-sysc.yaml | 1 + + .../devicetree/bindings/soc/renesas/renesas.yaml | 28 +- + .../devicetree/bindings/soc/sti/st,sti-syscon.yaml | 46 ++ + .../bindings/soc/tegra/nvidia,tegra20-pmc.yaml | 416 ++++++++++++++ + .../devicetree/bindings/vendor-prefixes.yaml | 16 + + MAINTAINERS | 7 + + arch/arm/arm-soc-for-next-contents.txt | 55 ++ + arch/arm/boot/dts/allwinner/Makefile | 1 + + arch/arm/boot/dts/allwinner/sun8i-r40.dtsi | 2 + + .../dts/allwinner/sun8i-v3s-anbernic-rg-nano.dts | 276 ++++++++++ + arch/arm/boot/dts/allwinner/sun8i-v3s.dtsi | 35 ++ + arch/arm/boot/dts/intel/ixp/Makefile | 3 +- + .../dts/intel/ixp/intel-ixp42x-dlink-dsm-g600.dts | 2 +- + .../dts/intel/ixp/intel-ixp42x-freecom-fsg-3.dts | 2 +- + .../dts/intel/ixp/intel-ixp42x-iomega-nas100d.dts | 2 +- + .../dts/intel/ixp/intel-ixp42x-linksys-nslu2.dts | 4 +- + .../dts/intel/ixp/intel-ixp42x-linksys-wrv54g.dts | 2 +- + .../intel/ixp/intel-ixp42x-usrobotics-usr8200.dts | 229 ++++++++ + arch/arm/boot/dts/mediatek/mt2701-evb.dts | 2 +- + arch/arm/boot/dts/mediatek/mt6323.dtsi | 58 +- + arch/arm/boot/dts/mediatek/mt7623n.dtsi | 4 +- + arch/arm/boot/dts/mediatek/mt7629-rfb.dts | 2 +- + arch/arm/boot/dts/microchip/Makefile | 2 + + .../boot/dts/microchip/at91-sam9x60_curiosity.dts | 4 + + .../boot/dts/microchip/at91-sama5d29_curiosity.dts | 600 +++++++++++++++++++++ + arch/arm/boot/dts/microchip/sama5d4.dtsi | 2 +- + arch/arm/boot/dts/nuvoton/nuvoton-npcm730-gsj.dts | 4 +- + arch/arm/boot/dts/nuvoton/nuvoton-npcm730-kudo.dts | 2 +- + .../dts/nuvoton/nuvoton-npcm750-runbmc-olympus.dts | 4 +- + .../boot/dts/nvidia/tegra20-acer-a500-picasso.dts | 2 +- + arch/arm/boot/dts/nvidia/tegra20-asus-tf101.dts | 2 +- + .../boot/dts/nvidia/tegra30-asus-lvds-display.dtsi | 2 +- + arch/arm/boot/dts/nvidia/tegra30-asus-tf700t.dts | 2 +- + arch/arm/boot/dts/renesas/r7s72100-genmai.dts | 82 ++- + arch/arm/boot/dts/renesas/r7s72100-gr-peach.dts | 6 - + arch/arm/boot/dts/renesas/r7s72100-rskrza1.dts | 71 ++- + arch/arm/boot/dts/renesas/r7s72100.dtsi | 7 + + arch/arm/boot/dts/renesas/r7s9210-rza2mevb.dts | 5 - + arch/arm/boot/dts/renesas/r8a73a4-ape6evm.dts | 2 +- + arch/arm/boot/dts/renesas/r8a7778-bockw.dts | 34 ++ + arch/arm/boot/dts/renesas/r8a7779-marzen.dts | 32 +- + arch/arm/boot/dts/renesas/r8a7779.dtsi | 7 + + arch/arm/boot/dts/renesas/r8a7790-lager.dts | 5 - + arch/arm/boot/dts/renesas/r8a7791-koelsch.dts | 5 - + arch/arm/boot/dts/renesas/r8a7792-blanche.dts | 34 +- + arch/arm/boot/dts/renesas/r8a7792-wheat.dts | 34 +- + arch/arm/boot/dts/renesas/r8a7792.dtsi | 7 + + arch/arm/boot/dts/renesas/r8a7794-alt.dts | 5 - + arch/arm/boot/dts/samsung/exynos4210.dtsi | 12 +- + arch/arm/boot/dts/samsung/exynos4212-tab3.dtsi | 41 +- + .../arm/boot/dts/samsung/exynos4412-galaxy-s3.dtsi | 43 +- + arch/arm/boot/dts/samsung/exynos4412-n710x.dts | 39 +- + arch/arm/boot/dts/samsung/exynos4412-odroidu3.dts | 13 +- + arch/arm/boot/dts/samsung/exynos4412-odroidx.dts | 9 +- + .../dts/samsung/exynos5422-odroidxu3-audio.dtsi | 19 +- + arch/arm/boot/dts/samsung/exynos5422-odroidxu4.dts | 2 +- + arch/arm/boot/dts/samsung/s5pv210-fascinate4g.dts | 33 +- + arch/arm/boot/dts/samsung/s5pv210-galaxys.dts | 37 +- + arch/arm/boot/dts/st/ste-href-tvk1281618-r2.dtsi | 4 +- + arch/arm/boot/dts/st/stih407-family.dtsi | 1 - + arch/arm/boot/dts/st/stih418-b2264.dts | 16 +- + arch/arm/boot/dts/ti/omap/am335x-pocketbeagle.dts | 57 +- + arch/arm/boot/dts/ti/omap/am3517-evm.dts | 35 +- + arch/arm/boot/dts/ti/omap/am3517.dtsi | 1 + + .../boot/dts/ti/omap/motorola-mapphone-common.dtsi | 20 +- + .../boot/dts/ti/omap/omap3-devkit8000-common.dtsi | 4 +- + arch/arm/boot/dts/ti/omap/omap3-gta04.dtsi | 2 +- + arch/arm/boot/dts/ti/omap/omap4-epson-embt2ws.dts | 55 +- + arch/arm/configs/keystone_defconfig | 1 - + arch/arm/configs/multi_v7_defconfig | 1 - + arch/arm/configs/omap2plus_defconfig | 8 - + arch/arm64/Kconfig.platforms | 12 + + arch/arm64/boot/dts/allwinner/Makefile | 2 + + .../sun50i-h616-bigtreetech-cb1-manta.dts | 35 ++ + .../dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi | 138 +++++ + .../dts/allwinner/sun50i-h616-bigtreetech-pi.dts | 63 +++ + arch/arm64/boot/dts/allwinner/sun50i-h616.dtsi | 7 + + arch/arm64/boot/dts/amd/Makefile | 1 + + arch/arm64/boot/dts/amd/elba-16core.dtsi | 197 +++++++ + arch/arm64/boot/dts/amd/elba-asic-common.dtsi | 70 +++ + arch/arm64/boot/dts/amd/elba-asic.dts | 28 + + arch/arm64/boot/dts/amd/elba-flash-parts.dtsi | 117 ++++ + arch/arm64/boot/dts/amd/elba.dtsi | 191 +++++++ + arch/arm64/boot/dts/apm/apm-shadowcat.dtsi | 2 +- + arch/arm64/boot/dts/apm/apm-storm.dtsi | 2 +- + arch/arm64/boot/dts/bitmain/bm1880.dtsi | 6 +- + .../boot/dts/exynos/exynos5433-tm2-common.dtsi | 23 +- + arch/arm64/boot/dts/exynos/exynos7.dtsi | 1 - + arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 58 ++ + arch/arm64/boot/dts/exynos/exynos850.dtsi | 30 ++ + arch/arm64/boot/dts/marvell/ac5-98dx25xx.dtsi | 4 +- + .../boot/dts/mediatek/mt7622-bananapi-bpi-r64.dts | 6 +- + arch/arm64/boot/dts/mediatek/mt7622-rfb1.dts | 6 +- + arch/arm64/boot/dts/mediatek/mt8183-evb.dts | 48 +- + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 12 +- + arch/arm64/boot/dts/mediatek/mt8183-pumpkin.dts | 12 +- + arch/arm64/boot/dts/mediatek/mt8195-demo.dts | 2 +- + arch/arm64/boot/dts/nvidia/tegra132.dtsi | 2 + + arch/arm64/boot/dts/nvidia/tegra210-smaug.dts | 66 +++ + .../arm64/boot/dts/nvidia/tegra234-p3701-0008.dtsi | 33 ++ + arch/arm64/boot/dts/nvidia/tegra234-p3701.dtsi | 53 ++ + .../dts/nvidia/tegra234-p3737-0000+p3701-0000.dts | 1 + + arch/arm64/boot/dts/nvidia/tegra234-p3767.dtsi | 33 +- + .../dts/nvidia/tegra234-p3768-0000+p3767-0000.dts | 13 - + .../arm64/boot/dts/nvidia/tegra234-p3768-0000.dtsi | 1 + + arch/arm64/boot/dts/nvidia/tegra234.dtsi | 52 +- + arch/arm64/boot/dts/renesas/Makefile | 38 ++ + .../boot/dts/renesas/beacon-renesom-baseboard.dtsi | 2 +- + arch/arm64/boot/dts/renesas/ebisu.dtsi | 2 +- + arch/arm64/boot/dts/renesas/hihope-rev4.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774a1.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a774b1.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a774c0.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a774e1.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77951.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77960.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77961.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77965.dtsi | 4 +- + arch/arm64/boot/dts/renesas/r8a77990-ebisu.dts | 2 +- + arch/arm64/boot/dts/renesas/r8a77990.dtsi | 2 +- + arch/arm64/boot/dts/renesas/r8a77995.dtsi | 2 +- + .../boot/dts/renesas/r8a779f0-spider-cpu.dtsi | 24 + + arch/arm64/boot/dts/renesas/r8a779f0.dtsi | 134 +++++ + arch/arm64/boot/dts/renesas/r8a779f4-s4sk.dts | 240 +++++++++ + arch/arm64/boot/dts/renesas/r8a779f4.dtsi | 12 + + arch/arm64/boot/dts/renesas/r9a08g045.dtsi | 170 ++++++ + arch/arm64/boot/dts/renesas/r9a08g045s33-smarc.dts | 18 + + arch/arm64/boot/dts/renesas/r9a08g045s33.dtsi | 14 + + arch/arm64/boot/dts/renesas/rz-smarc-common.dtsi | 14 +- + arch/arm64/boot/dts/renesas/rzg2l-smarc.dtsi | 20 + + arch/arm64/boot/dts/renesas/rzg2lc-smarc.dtsi | 20 + + arch/arm64/boot/dts/renesas/rzg2ul-smarc.dtsi | 24 + + arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi | 142 +++++ + arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi | 28 + + arch/arm64/boot/dts/renesas/salvator-common.dtsi | 2 +- + .../renesas/ulcb-audio-graph-card-mix+split.dtsi | 16 +- + .../boot/dts/renesas/ulcb-audio-graph-card.dtsi | 17 +- + .../renesas/ulcb-audio-graph-card2-mix+split.dtsi | 13 +- + .../boot/dts/renesas/ulcb-audio-graph-card2.dtsi | 4 +- + .../ulcb-kf-audio-graph-card-mix+split.dtsi | 57 +- + .../boot/dts/renesas/ulcb-kf-audio-graph-card.dtsi | 27 +- + .../ulcb-kf-audio-graph-card2-mix+split.dtsi | 108 ++-- + .../dts/renesas/ulcb-kf-audio-graph-card2.dtsi | 14 +- + .../ulcb-kf-simple-audio-card-mix+split.dtsi | 152 +++--- + .../dts/renesas/ulcb-kf-simple-audio-card.dtsi | 77 +-- + .../renesas/ulcb-simple-audio-card-mix+split.dtsi | 8 +- + .../boot/dts/renesas/ulcb-simple-audio-card.dtsi | 8 +- + arch/arm64/boot/dts/renesas/ulcb.dtsi | 2 +- + .../dts/allwinner/sun20i-common-regulators.dtsi | 2 +- + .../dts/allwinner/sun20i-d1-dongshan-nezha-stu.dts | 2 +- + .../sun20i-d1-lichee-rv-86-panel-480p.dts | 2 +- + .../sun20i-d1-lichee-rv-86-panel-720p.dts | 2 +- + .../allwinner/sun20i-d1-lichee-rv-86-panel.dtsi | 2 +- + .../dts/allwinner/sun20i-d1-lichee-rv-dock.dts | 2 +- + .../boot/dts/allwinner/sun20i-d1-lichee-rv.dts | 2 +- + .../dts/allwinner/sun20i-d1-mangopi-mq-pro.dts | 2 +- + arch/riscv/boot/dts/allwinner/sun20i-d1-nezha.dts | 2 +- + arch/riscv/boot/dts/allwinner/sun20i-d1.dtsi | 2 +- + .../boot/dts/allwinner/sun20i-d1s-mangopi-mq.dts | 2 +- + arch/riscv/boot/dts/allwinner/sun20i-d1s.dtsi | 45 +- + arch/riscv/boot/dts/allwinner/sunxi-d1-t113.dtsi | 2 +- + arch/riscv/boot/dts/allwinner/sunxi-d1s-t113.dtsi | 2 +- + arch/riscv/boot/dts/renesas/r9a07g043f.dtsi | 13 + + arch/riscv/boot/dts/renesas/rzfive-smarc-som.dtsi | 23 - + arch/riscv/boot/dts/renesas/rzfive-smarc.dtsi | 56 -- + include/dt-bindings/clock/r9a08g045-cpg.h | 242 +++++++++ + 174 files changed, 5097 insertions(+), 1174 deletions(-) + create mode 100644 Documentation/devicetree/bindings/arm/amd,pensando.yaml + delete mode 100644 Documentation/devicetree/bindings/arm/tegra/nvidia,tegra20-pmc.yaml + create mode 100644 Documentation/devicetree/bindings/soc/sti/st,sti-syscon.yaml + create mode 100644 Documentation/devicetree/bindings/soc/tegra/nvidia,tegra20-pmc.yaml + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/allwinner/sun8i-v3s-anbernic-rg-nano.dts + create mode 100644 arch/arm/boot/dts/intel/ixp/intel-ixp42x-usrobotics-usr8200.dts + create mode 100644 arch/arm/boot/dts/microchip/at91-sama5d29_curiosity.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1-manta.dts + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-cb1.dtsi + create mode 100644 arch/arm64/boot/dts/allwinner/sun50i-h616-bigtreetech-pi.dts + create mode 100644 arch/arm64/boot/dts/amd/elba-16core.dtsi + create mode 100644 arch/arm64/boot/dts/amd/elba-asic-common.dtsi + create mode 100644 arch/arm64/boot/dts/amd/elba-asic.dts + create mode 100644 arch/arm64/boot/dts/amd/elba-flash-parts.dtsi + create mode 100644 arch/arm64/boot/dts/amd/elba.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r8a779f4-s4sk.dts + create mode 100644 arch/arm64/boot/dts/renesas/r8a779f4.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a08g045.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/r9a08g045s33-smarc.dts + create mode 100644 arch/arm64/boot/dts/renesas/r9a08g045s33.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg3s-smarc-som.dtsi + create mode 100644 arch/arm64/boot/dts/renesas/rzg3s-smarc.dtsi + create mode 100644 include/dt-bindings/clock/r9a08g045-cpg.h +Merging amlogic/for-next (996fc07dce79 Merge branch 'v6.7/defconfig' 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 +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/amlogic.yaml | 3 + + .../bindings/power/amlogic,meson-sec-pwrc.yaml | 3 +- + arch/arm64/boot/dts/amlogic/Makefile | 3 + + arch/arm64/boot/dts/amlogic/amlogic-t7.dtsi | 28 + + arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts | 147 +++++ + arch/arm64/boot/dts/amlogic/meson-a1.dtsi | 369 ++++++++++++- + arch/arm64/boot/dts/amlogic/meson-axg.dtsi | 13 + + arch/arm64/boot/dts/amlogic/meson-g12.dtsi | 40 +- + arch/arm64/boot/dts/amlogic/meson-g12a-u200.dts | 341 ++++++++++++ + arch/arm64/boot/dts/amlogic/meson-g12a-x96-max.dts | 10 +- + .../dts/amlogic/meson-g12b-a311d-libretech-cc.dts | 121 ++++ + arch/arm64/boot/dts/amlogic/meson-g12b-gtking.dts | 10 +- + .../boot/dts/amlogic/meson-g12b-ugoos-am6.dts | 10 +- + arch/arm64/boot/dts/amlogic/meson-gxbb-p200.dts | 60 ++ + arch/arm64/boot/dts/amlogic/meson-gxbb-p201.dts | 39 ++ + .../dts/amlogic/meson-libretech-cottonwood.dtsi | 614 +++++++++++++++++++++ + .../boot/dts/amlogic/meson-s4-s805x2-aq222.dts | 6 + + arch/arm64/boot/dts/amlogic/meson-s4.dtsi | 20 + + .../dts/amlogic/meson-sm1-s905d3-libretech-cc.dts | 89 +++ + arch/arm64/configs/defconfig | 8 + + drivers/firmware/meson/meson_sm.c | 25 +- + include/dt-bindings/power/amlogic,t7-pwrc.h | 63 +++ + include/linux/firmware/meson/meson_sm.h | 2 +- + 23 files changed, 1964 insertions(+), 60 deletions(-) + create mode 100644 arch/arm64/boot/dts/amlogic/meson-a1-ad402.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-g12b-a311d-libretech-cc.dts + create mode 100644 arch/arm64/boot/dts/amlogic/meson-libretech-cottonwood.dtsi + create mode 100644 arch/arm64/boot/dts/amlogic/meson-sm1-s905d3-libretech-cc.dts + create mode 100644 include/dt-bindings/power/amlogic,t7-pwrc.h +Merging asahi-soc/asahi-soc/for-next (eaf935fa48ec soc: apple: mailbox: Rename config symbol to APPLE_MAILBOX) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/soc/apple/Makefile +CONFLICT (content): Merge conflict in drivers/soc/apple/Makefile +Resolved 'drivers/soc/apple/Makefile' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ee541c979679] Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 - + drivers/mailbox/Kconfig | 12 - + drivers/mailbox/Makefile | 2 - + drivers/mailbox/apple-mailbox.c | 441 ------------------------------------- + drivers/soc/apple/Kconfig | 15 +- + drivers/soc/apple/Makefile | 3 + + drivers/soc/apple/mailbox.c | 436 ++++++++++++++++++++++++++++++++++++ + drivers/soc/apple/mailbox.h | 48 ++++ + drivers/soc/apple/rtkit-internal.h | 8 +- + drivers/soc/apple/rtkit.c | 133 +++-------- + include/linux/apple-mailbox.h | 19 -- + include/linux/soc/apple/rtkit.h | 18 -- + 12 files changed, 531 insertions(+), 606 deletions(-) + delete mode 100644 drivers/mailbox/apple-mailbox.c + create mode 100644 drivers/soc/apple/mailbox.c + create mode 100644 drivers/soc/apple/mailbox.h + delete mode 100644 include/linux/apple-mailbox.h +Merging aspeed/for-next (32d514b6de63 ARM: dts: aspeed: mtmitchell: Add I2C NVMe alias port) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/joel/bmc.git aspeed/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/aspeed/aspeed.yaml | 1 + + arch/arm/boot/dts/aspeed/Makefile | 1 + + .../boot/dts/aspeed/aspeed-bmc-ampere-mtjade.dts | 66 +++-- + .../dts/aspeed/aspeed-bmc-ampere-mtmitchell.dts | 302 +++++++++++++++++++-- + .../dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts | 265 ++++++++++++++++++ + .../arm/boot/dts/aspeed/aspeed-bmc-ibm-bonnell.dts | 8 +- + .../boot/dts/nuvoton/nuvoton-common-npcm7xx.dtsi | 7 + + arch/arm/configs/aspeed_g4_defconfig | 1 - + arch/arm/configs/aspeed_g5_defconfig | 8 +- + drivers/soc/aspeed/aspeed-lpc-ctrl.c | 6 +- + drivers/soc/aspeed/aspeed-lpc-snoop.c | 6 +- + drivers/soc/aspeed/aspeed-p2a-ctrl.c | 6 +- + drivers/soc/aspeed/aspeed-uart-routing.c | 6 +- + 13 files changed, 617 insertions(+), 66 deletions(-) + create mode 100644 arch/arm/boot/dts/aspeed/aspeed-bmc-facebook-minerva-cmc.dts +Merging at91/at91-next (3cec9514911c ARM: dts: at91: sam9x60_curiosity: Add mandatory dt property for RTT) +$ git merge -m Merge branch 'at91-next' of git://git.kernel.org/pub/scm/linux/kernel/git/at91/linux.git at91/at91-next +Already up to date. +Merging broadcom/next (61641804ab35 Merge branch 'drivers/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. + arch/arm/boot/dts/broadcom/bcm-ns.dtsi | 34 ++++++++++++++++++++++ + .../boot/dts/broadcom/bcm4709-asus-rt-ac87u.dts | 11 +++++++ + .../boot/dts/broadcom/bcm47094-dlink-dir-885l.dts | 16 ++++++++++ + arch/arm/boot/dts/broadcom/bcm5301x.dtsi | 34 ---------------------- + drivers/bus/Kconfig | 2 +- + drivers/firmware/raspberrypi.c | 1 + + drivers/soc/bcm/Kconfig | 2 +- + 7 files changed, 64 insertions(+), 36 deletions(-) +Merging davinci/davinci/for-next (06c2afb862f9 Linux 6.5-rc1) +$ git merge -m Merge branch 'davinci/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git davinci/davinci/for-next +Already up to date. +Merging drivers-memory/for-next (09de3691daab memory: Use device_get_match_data()) +$ 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. + .../bindings/memory-controllers/ingenic,nemc.yaml | 1 + + .../memory-controllers/renesas,rpc-if.yaml | 2 + + .../bindings/memory-controllers/ti,gpmc.yaml | 2 +- + drivers/memory/atmel-ebi.c | 16 +++--- + drivers/memory/brcmstb_memc.c | 9 ++-- + drivers/memory/fsl-corenet-cf.c | 11 +--- + drivers/memory/tegra/tegra234.c | 60 ++++++++++++++++++++++ + 7 files changed, 77 insertions(+), 24 deletions(-) +Merging imx-mxs/for-next (fa81543ef854 Merge branch 'imx/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/shawnguo/linux.git imx-mxs/for-next +Auto-merging MAINTAINERS +Auto-merging arch/arm64/boot/dts/freescale/imx93.dtsi +CONFLICT (content): Merge conflict in arch/arm64/boot/dts/freescale/imx93.dtsi +Auto-merging arch/arm64/configs/defconfig +Resolved 'arch/arm64/boot/dts/freescale/imx93.dtsi' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 0d05ef0ef97c] 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 | 43 +- + MAINTAINERS | 2 + + arch/arm/boot/dts/nxp/imx/Makefile | 3 + + arch/arm/boot/dts/nxp/imx/imx25.dtsi | 7 +- + .../dts/nxp/imx/imx27-phytec-phycard-s-som.dtsi | 2 +- + .../boot/dts/nxp/imx/imx27-phytec-phycore-som.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx51-zii-rdu1.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx51.dtsi | 2 +- + .../dts/nxp/imx/imx53-sk-imx53-atm0700d4-lvds.dts | 97 ++++ + .../dts/nxp/imx/imx53-sk-imx53-atm0700d4-rgb.dts | 112 ++++ + .../boot/dts/nxp/imx/imx53-sk-imx53-atm0700d4.dtsi | 45 ++ + arch/arm/boot/dts/nxp/imx/imx53.dtsi | 4 +- + arch/arm/boot/dts/nxp/imx/imx6q-b650v3.dts | 4 +- + arch/arm/boot/dts/nxp/imx/imx6q-pistachio.dts | 4 +- + .../boot/dts/nxp/imx/imx6q-var-mx6customboard.dts | 247 +++++++++ + arch/arm/boot/dts/nxp/imx/imx6qdl-gw5904.dtsi | 46 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-gw5910.dtsi | 1 - + arch/arm/boot/dts/nxp/imx/imx6qdl-gw5912.dtsi | 1 - + .../boot/dts/nxp/imx/imx6qdl-nitrogen6_max.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi | 569 +++++++++++++++++++++ + arch/arm/boot/dts/nxp/imx/imx6ul-tx6ul.dtsi | 6 +- + .../dts/nxp/imx/imx6ull-colibri-emmc-aster.dts | 1 - + .../dts/nxp/imx/imx6ull-colibri-emmc-eval-v3.dts | 1 - + .../dts/nxp/imx/imx6ull-colibri-emmc-iris-v2.dts | 3 +- + .../boot/dts/nxp/imx/imx6ull-colibri-emmc-iris.dts | 1 - + .../boot/dts/nxp/imx/imx6ull-colibri-eval-v3.dts | 2 +- + .../dts/nxp/imx/imx6ull-colibri-wifi-aster.dts | 2 +- + .../dts/nxp/imx/imx6ull-colibri-wifi-eval-v3.dts | 2 +- + .../dts/nxp/imx/imx6ull-colibri-wifi-iris-v2.dts | 2 +- + .../boot/dts/nxp/imx/imx6ull-colibri-wifi-iris.dts | 2 +- + .../boot/dts/nxp/imx/imx6ull-phytec-tauri-emmc.dts | 4 +- + .../boot/dts/nxp/imx/imx6ull-phytec-tauri-nand.dts | 4 +- + .../arm/boot/dts/nxp/imx/imx6ull-phytec-tauri.dtsi | 5 - + .../boot/dts/nxp/imx/imx7d-colibri-emmc-aster.dts | 1 - + .../dts/nxp/imx/imx7d-colibri-emmc-eval-v3.dts | 1 - + .../dts/nxp/imx/imx7d-colibri-emmc-iris-v2.dts | 1 - + .../boot/dts/nxp/imx/imx7d-colibri-emmc-iris.dts | 1 - + arch/arm/boot/dts/nxp/imx/imx7d-pico-pi.dts | 4 + + arch/arm/boot/dts/nxp/imx/imx7s.dtsi | 7 +- + arch/arm/boot/dts/nxp/imx/imx7ulp.dtsi | 2 +- + arch/arm/boot/dts/nxp/imx/mba6ulx.dtsi | 9 +- + arch/arm/boot/dts/nxp/mxs/imx23-evk.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx23-sansa.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx23-xfi3.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx23.dtsi | 4 +- + arch/arm/boot/dts/nxp/mxs/imx28-apf28dev.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-cfa10049.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-cfa10055.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-cfa10057.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-cfa10058.dts | 2 +- + .../boot/dts/nxp/mxs/imx28-eukrea-mbmx28lc.dtsi | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-evk.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-m28cu3.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-m28evk.dts | 2 +- + arch/arm/boot/dts/nxp/mxs/imx28-tx28.dts | 6 +- + arch/arm/boot/dts/nxp/mxs/imx28.dtsi | 6 +- + arch/arm/boot/dts/nxp/vf/vfxxx.dtsi | 27 +- + arch/arm64/boot/dts/freescale/Makefile | 19 + + .../freescale/fsl-ls1043a-tqmls1043a-mbls10xxa.dts | 49 ++ + .../boot/dts/freescale/fsl-ls1043a-tqmls1043a.dtsi | 32 ++ + arch/arm64/boot/dts/freescale/fsl-ls1043a.dtsi | 14 - + .../freescale/fsl-ls1046a-tqmls1046a-mbls10xxa.dts | 56 ++ + .../boot/dts/freescale/fsl-ls1046a-tqmls1046a.dtsi | 42 ++ + .../freescale/fsl-ls1088a-tqmls1088a-mbls10xxa.dts | 64 +++ + .../boot/dts/freescale/fsl-ls1088a-tqmls1088a.dtsi | 42 ++ + arch/arm64/boot/dts/freescale/fsl-ls208xa.dtsi | 46 +- + arch/arm64/boot/dts/freescale/fsl-lx2160a.dtsi | 7 + + .../boot/dts/freescale/fsl-lx2162a-clearfog.dts | 376 ++++++++++++++ + .../boot/dts/freescale/fsl-lx2162a-sr-som.dtsi | 73 +++ + .../boot/dts/freescale/imx8-apalis-ixora-v1.1.dtsi | 1 - + .../boot/dts/freescale/imx8-apalis-ixora-v1.2.dtsi | 1 - + .../arm64/boot/dts/freescale/imx8-apalis-v1.1.dtsi | 11 +- + arch/arm64/boot/dts/freescale/imx8-ss-audio.dtsi | 98 +++- + arch/arm64/boot/dts/freescale/imx8-ss-conn.dtsi | 42 +- + arch/arm64/boot/dts/freescale/imx8-ss-dma.dtsi | 117 ++++- + arch/arm64/boot/dts/freescale/imx8-ss-img.dtsi | 36 +- + arch/arm64/boot/dts/freescale/imx8-ss-lsio.dtsi | 25 +- + arch/arm64/boot/dts/freescale/imx8dxl-evk.dts | 2 - + arch/arm64/boot/dts/freescale/imx8dxl-ss-adma.dtsi | 38 +- + arch/arm64/boot/dts/freescale/imx8dxl-ss-conn.dtsi | 6 +- + arch/arm64/boot/dts/freescale/imx8dxl.dtsi | 8 +- + .../dts/freescale/imx8mm-beacon-baseboard.dtsi | 76 ++- + arch/arm64/boot/dts/freescale/imx8mm-ddr4-evk.dts | 1 - + arch/arm64/boot/dts/freescale/imx8mm-phg.dts | 5 + + .../boot/dts/freescale/imx8mm-phygate-tauri-l.dts | 489 ++++++++++++++++++ + .../imx8mm-tqma8mqml-mba8mx-lvds-tm070jvhg33.dtso | 45 ++ + .../arm64/boot/dts/freescale/imx8mm-tqma8mqml.dtsi | 5 + + .../boot/dts/freescale/imx8mm-venice-gw71xx.dtsi | 1 - + .../boot/dts/freescale/imx8mm-venice-gw72xx.dtsi | 1 - + .../boot/dts/freescale/imx8mm-venice-gw73xx.dtsi | 11 +- + .../boot/dts/freescale/imx8mm-venice-gw7901.dts | 4 +- + .../boot/dts/freescale/imx8mm-venice-gw7902.dts | 3 +- + .../boot/dts/freescale/imx8mm-venice-gw7903.dts | 3 +- + .../boot/dts/freescale/imx8mm-venice-gw7904.dts | 3 +- + arch/arm64/boot/dts/freescale/imx8mm.dtsi | 1 + + .../dts/freescale/imx8mn-beacon-baseboard.dtsi | 38 ++ + .../arm64/boot/dts/freescale/imx8mn-bsh-smm-s2.dts | 1 - + arch/arm64/boot/dts/freescale/imx8mn-evk.dtsi | 2 - + .../imx8mn-tqma8mqnl-mba8mx-lvds-tm070jvhg33.dtso | 45 ++ + .../arm64/boot/dts/freescale/imx8mn-tqma8mqnl.dtsi | 5 + + .../boot/dts/freescale/imx8mn-venice-gw7902.dts | 3 +- + arch/arm64/boot/dts/freescale/imx8mn.dtsi | 1 + + .../arm64/boot/dts/freescale/imx8mp-beacon-kit.dts | 65 ++- + .../dts/freescale/imx8mp-data-modul-edm-sbc.dts | 2 + + .../boot/dts/freescale/imx8mp-debix-model-a.dts | 3 - + .../dts/freescale/imx8mp-debix-som-a-bmb-08.dts | 2 +- + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk2.dts | 4 +- + .../arm64/boot/dts/freescale/imx8mp-dhcom-pdk3.dts | 70 +-- + .../arm64/boot/dts/freescale/imx8mp-dhcom-som.dtsi | 154 ++++-- + .../dts/freescale/imx8mp-phyboard-pollux-rdk.dts | 154 ++++++ + .../boot/dts/freescale/imx8mp-phycore-som.dtsi | 13 + + .../boot/dts/freescale/imx8mp-venice-gw71xx.dtsi | 1 - + .../boot/dts/freescale/imx8mp-venice-gw72xx.dtsi | 1 - + .../boot/dts/freescale/imx8mp-venice-gw73xx.dtsi | 10 +- + .../dts/freescale/imx8mp-venice-gw74xx-imx219.dtso | 80 +++ + .../boot/dts/freescale/imx8mp-venice-gw74xx.dts | 2 - + arch/arm64/boot/dts/freescale/imx8mp-verdin.dtsi | 1 - + arch/arm64/boot/dts/freescale/imx8mp.dtsi | 148 ++++-- + arch/arm64/boot/dts/freescale/imx8mq-librem5.dtsi | 7 +- + arch/arm64/boot/dts/freescale/imx8mq-nitrogen.dts | 14 +- + arch/arm64/boot/dts/freescale/imx8mq-pico-pi.dts | 2 +- + arch/arm64/boot/dts/freescale/imx8mq-thor96.dts | 2 +- + .../imx8mq-tqma8mq-mba8mx-lvds-tm070jvhg33.dtso | 49 ++ + .../arm64/boot/dts/freescale/imx8mq-zii-ultra.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8mq.dtsi | 106 ++-- + arch/arm64/boot/dts/freescale/imx8qm-apalis.dtsi | 1 - + arch/arm64/boot/dts/freescale/imx8qm-mek.dts | 26 + + arch/arm64/boot/dts/freescale/imx8qm-ss-dma.dtsi | 56 ++ + arch/arm64/boot/dts/freescale/imx8qm-ss-img.dtsi | 2 +- + arch/arm64/boot/dts/freescale/imx8qxp-mek.dts | 26 + + arch/arm64/boot/dts/freescale/imx8ulp.dtsi | 23 +- + .../boot/dts/freescale/imx8x-colibri-iris-v2.dtsi | 4 +- + arch/arm64/boot/dts/freescale/imx93-11x11-evk.dts | 15 + + arch/arm64/boot/dts/freescale/imx93.dtsi | 159 +++++- + arch/arm64/boot/dts/freescale/mba8mx.dtsi | 93 ++++ + .../dts/freescale/tqmls104xa-mbls10xxa-fman.dtsi | 104 ++++ + .../dts/freescale/tqmls1088a-mbls10xxa-mc.dtsi | 146 ++++++ + .../boot/dts/freescale/tqmls10xxa-mbls10xxa.dtsi | 136 +++++ + arch/arm64/boot/dts/freescale/tqmls10xxa.dtsi | 58 +++ + arch/arm64/configs/defconfig | 3 + + drivers/firmware/imx/imx-dsp.c | 2 +- + 141 files changed, 4479 insertions(+), 540 deletions(-) + create mode 100644 arch/arm/boot/dts/nxp/imx/imx53-sk-imx53-atm0700d4-lvds.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx53-sk-imx53-atm0700d4-rgb.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx53-sk-imx53-atm0700d4.dtsi + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6q-var-mx6customboard.dts + create mode 100644 arch/arm/boot/dts/nxp/imx/imx6qdl-var-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1043a-tqmls1043a-mbls10xxa.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1043a-tqmls1043a.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a-tqmls1046a-mbls10xxa.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1046a-tqmls1046a.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1088a-tqmls1088a-mbls10xxa.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-ls1088a-tqmls1088a.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2162a-clearfog.dts + create mode 100644 arch/arm64/boot/dts/freescale/fsl-lx2162a-sr-som.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-phygate-tauri-l.dts + create mode 100644 arch/arm64/boot/dts/freescale/imx8mm-tqma8mqml-mba8mx-lvds-tm070jvhg33.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mn-tqma8mqnl-mba8mx-lvds-tm070jvhg33.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mp-venice-gw74xx-imx219.dtso + create mode 100644 arch/arm64/boot/dts/freescale/imx8mq-tqma8mq-mba8mx-lvds-tm070jvhg33.dtso + create mode 100644 arch/arm64/boot/dts/freescale/tqmls104xa-mbls10xxa-fman.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/tqmls1088a-mbls10xxa-mc.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/tqmls10xxa-mbls10xxa.dtsi + create mode 100644 arch/arm64/boot/dts/freescale/tqmls10xxa.dtsi +Merging mediatek/for-next (e2a38d710912 Merge branch 'v6.6-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 +Auto-merging arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/mediatek.yaml | 16 + + .../devicetree/bindings/soc/mediatek/mtk-svs.yaml | 1 + + arch/arm64/boot/dts/mediatek/Makefile | 3 + + .../boot/dts/mediatek/mt6795-sony-xperia-m5.dts | 101 +++ + arch/arm64/boot/dts/mediatek/mt6795.dtsi | 253 +++++- + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 28 + + .../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 | 19 +- + .../dts/mediatek/mt8192-asurada-hayato-r5-sku2.dts | 64 ++ + .../dts/mediatek/mt8192-asurada-spherion-r0.dts | 19 +- + .../dts/mediatek/mt8192-asurada-spherion-r4.dts | 77 ++ + arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 28 + + arch/arm64/boot/dts/mediatek/mt8195-cherry.dtsi | 33 + + arch/arm64/boot/dts/mediatek/mt8365.dtsi | 210 +++++ + .../boot/dts/mediatek/mt8395-genio-1200-evk.dts | 901 +++++++++++++++++++++ + drivers/soc/mediatek/mtk-svs.c | 184 ++++- + 18 files changed, 1930 insertions(+), 73 deletions(-) + delete mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p-rt5682.dtsi + delete mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt1015p.dtsi + delete mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-audio-rt5682.dtsi + create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-hayato-r5-sku2.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8192-asurada-spherion-r4.dts + create mode 100644 arch/arm64/boot/dts/mediatek/mt8395-genio-1200-evk.dts +Merging mvebu/for-next (93e6b023e552 Merge branch 'mvebu/dt64' into mvebu/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gclement/mvebu.git mvebu/for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 5 ++- + arch/arm64/boot/dts/marvell/armada-3720-eDPU.dts | 47 +++++++++++++++++++++++ + arch/arm64/boot/dts/marvell/armada-3720-uDPU.dtsi | 8 ++-- + arch/arm64/boot/dts/marvell/cn9130-crb.dtsi | 4 +- + arch/arm64/boot/dts/marvell/cn9130-db.dtsi | 4 +- + drivers/soc/dove/pmu.c | 5 ++- + 6 files changed, 62 insertions(+), 11 deletions(-) +Merging omap/for-next (cb1114df7bb0 Merge branch 'fixes' 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 (870b52222042 Merge branches 'arm64-defconfig-for-6.7', 'arm64-fixes-for-6.6', 'arm64-for-6.7', 'clk-for-6.7', 'drivers-for-6.7' and 'dts-for-6.7' 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 MAINTAINERS +Auto-merging arch/arm64/boot/dts/qcom/sm8150.dtsi +Auto-merging arch/arm64/configs/defconfig +Auto-merging drivers/firmware/Kconfig +Auto-merging drivers/firmware/Makefile +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 45 + + .../devicetree/bindings/cache/qcom,llcc.yaml | 10 + + .../devicetree/bindings/clock/qcom,hfpll.txt | 3 + + .../devicetree/bindings/clock/qcom,rpmhcc.yaml | 1 + + .../devicetree/bindings/clock/qcom,sm4450-gcc.yaml | 55 + + .../bindings/clock/qcom,sm8450-camcc.yaml | 8 +- + .../devicetree/bindings/firmware/qcom,scm.yaml | 10 + + .../bindings/reserved-memory/qcom,rmtfs-mem.yaml | 11 + + .../devicetree/bindings/soc/qcom/qcom,geni-se.yaml | 2 + + MAINTAINERS | 12 + + .../dts/qcom/qcom-apq8026-samsung-matisse-wifi.dts | 4 +- + .../arm/boot/dts/qcom/qcom-apq8060-dragonboard.dts | 1 - + .../boot/dts/qcom/qcom-apq8064-asus-nexus7-flo.dts | 1 - + arch/arm/boot/dts/qcom/qcom-apq8064-ifc6410.dts | 1 - + arch/arm/boot/dts/qcom/qcom-apq8064.dtsi | 1 - + arch/arm/boot/dts/qcom/qcom-ipq8064-rb3011.dts | 55 +- + arch/arm/boot/dts/qcom/qcom-ipq8064-v1.0.dtsi | 122 +- + arch/arm/boot/dts/qcom/qcom-mdm9615.dtsi | 14 +- + arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 32 + + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 32 + + arch/arm/boot/dts/qcom/qcom-sdx55.dtsi | 32 +- + arch/arm/boot/dts/qcom/qcom-sdx65-mtp.dts | 4 + + arch/arm/boot/dts/qcom/qcom-sdx65.dtsi | 7 +- + arch/arm64/boot/dts/qcom/Makefile | 12 + + arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtso | 8 + + arch/arm64/boot/dts/qcom/apq8016-sbc.dts | 30 +- + arch/arm64/boot/dts/qcom/apq8039-t2.dts | 8 + + arch/arm64/boot/dts/qcom/apq8096-db820c.dts | 34 +- + arch/arm64/boot/dts/qcom/ipq5018.dtsi | 8 + + arch/arm64/boot/dts/qcom/ipq5332-rdp468.dts | 23 + + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 57 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 36 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 69 +- + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8916-acer-a1-724.dts | 12 + + .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 12 + + arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 12 + + arch/arm64/boot/dts/qcom/msm8916-gplus-fl8005a.dts | 12 + + arch/arm64/boot/dts/qcom/msm8916-huawei-g7.dts | 12 + + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 21 +- + .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 12 + + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 12 + + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 4 + + .../boot/dts/qcom/msm8916-samsung-a5u-eur.dts | 4 + + .../dts/qcom/msm8916-samsung-e2015-common.dtsi | 4 + + .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 12 + + arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts | 86 + + arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts | 64 + + .../boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 51 + + arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts | 5 + + arch/arm64/boot/dts/qcom/msm8916-samsung-j5x.dts | 15 + + .../boot/dts/qcom/msm8916-samsung-serranove.dts | 12 + + arch/arm64/boot/dts/qcom/msm8916-ufi.dtsi | 33 +- + .../boot/dts/qcom/msm8916-wingtech-wt88047.dts | 12 + + arch/arm64/boot/dts/qcom/msm8916.dtsi | 41 +- + .../boot/dts/qcom/msm8939-longcheer-l9100.dts | 334 ++ + arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts | 4 + + .../dts/qcom/msm8939-sony-xperia-kanuti-tulip.dts | 8 + + arch/arm64/boot/dts/qcom/msm8939.dtsi | 39 +- + arch/arm64/boot/dts/qcom/msm8976.dtsi | 15 +- + arch/arm64/boot/dts/qcom/msm8992-xiaomi-libra.dts | 6 +- + .../boot/dts/qcom/msm8994-msft-lumia-octagon.dtsi | 1 + + arch/arm64/boot/dts/qcom/msm8994.dtsi | 2 +- + .../boot/dts/qcom/msm8996-oneplus-common.dtsi | 2 +- + .../arm64/boot/dts/qcom/msm8996-xiaomi-common.dtsi | 36 +- + arch/arm64/boot/dts/qcom/msm8996-xiaomi-gemini.dts | 16 +- + arch/arm64/boot/dts/qcom/msm8996.dtsi | 3 +- + arch/arm64/boot/dts/qcom/msm8998-fxtec-pro1.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8998-mtp.dts | 2 +- + .../boot/dts/qcom/msm8998-oneplus-common.dtsi | 2 +- + arch/arm64/boot/dts/qcom/msm8998-xiaomi-sagit.dts | 2 +- + arch/arm64/boot/dts/qcom/msm8998.dtsi | 33 +- + arch/arm64/boot/dts/qcom/pm6150.dtsi | 16 + + arch/arm64/boot/dts/qcom/pm7250b.dtsi | 14 +- + arch/arm64/boot/dts/qcom/pm8150b.dtsi | 40 + + arch/arm64/boot/dts/qcom/pm8150l.dtsi | 10 + + arch/arm64/boot/dts/qcom/pm8350c.dtsi | 6 + + arch/arm64/boot/dts/qcom/pm8916.dtsi | 3 - + .../boot/dts/qcom/{pmr735d.dtsi => pmr735d_a.dtsi} | 45 - + arch/arm64/boot/dts/qcom/pmr735d_b.dtsi | 59 + + arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts | 667 ++++ + arch/arm64/boot/dts/qcom/qrb2210-rb1.dts | 147 +- + arch/arm64/boot/dts/qcom/qrb5165-rb5.dts | 125 +- + arch/arm64/boot/dts/qcom/sa8775p-pmics.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sa8775p-ride.dts | 2 + + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 8 + + .../arm64/boot/dts/qcom/sc7180-trogdor-coachz.dtsi | 2 +- + .../boot/dts/qcom/sc7180-trogdor-homestar.dtsi | 3 + + .../boot/dts/qcom/sc7180-trogdor-kingoftown.dts | 13 +- + .../sc7180-trogdor-lazor-limozeen-nots-r10.dts | 29 + + .../qcom/sc7180-trogdor-lazor-limozeen-nots-r5.dts | 1 + + .../qcom/sc7180-trogdor-lazor-limozeen-nots-r9.dts | 7 +- + .../dts/qcom/sc7180-trogdor-lazor-limozeen-r10.dts | 45 + + .../dts/qcom/sc7180-trogdor-lazor-limozeen-r4.dts | 2 + + .../dts/qcom/sc7180-trogdor-lazor-limozeen-r9.dts | 11 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r1.dts | 1 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r10-kb.dts | 23 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts | 27 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r10.dts | 19 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-kb.dts | 1 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r3-lte.dts | 1 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r3.dts | 1 + + .../boot/dts/qcom/sc7180-trogdor-lazor-r9-kb.dts | 5 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r9-lte.dts | 5 +- + .../boot/dts/qcom/sc7180-trogdor-lazor-r9.dts | 5 +- + arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor.dtsi | 1 + + .../dts/qcom/sc7180-trogdor-pazquel-lte-parade.dts | 1 + + .../dts/qcom/sc7180-trogdor-pazquel-lte-ti.dts | 1 + + .../dts/qcom/sc7180-trogdor-pazquel-parade.dts | 1 + + .../boot/dts/qcom/sc7180-trogdor-pazquel-ti.dts | 1 + + .../boot/dts/qcom/sc7180-trogdor-pazquel360.dtsi | 13 +- + .../arm64/boot/dts/qcom/sc7180-trogdor-pompom.dtsi | 2 + + .../dts/qcom/sc7180-trogdor-quackingstick.dtsi | 2 + + arch/arm64/boot/dts/qcom/sc7180-trogdor-r1.dts | 1 + + .../boot/dts/qcom/sc7180-trogdor-rt5682i-sku.dtsi | 38 + + .../boot/dts/qcom/sc7180-trogdor-rt5682s-sku.dtsi | 38 + + ...sc7180-trogdor-wormdingler-rev1-boe-rt5682s.dts | 17 +- + .../qcom/sc7180-trogdor-wormdingler-rev1-boe.dts | 1 + + ...sc7180-trogdor-wormdingler-rev1-inx-rt5682s.dts | 15 +- + .../qcom/sc7180-trogdor-wormdingler-rev1-inx.dts | 1 + + .../boot/dts/qcom/sc7180-trogdor-wormdingler.dtsi | 1 + + arch/arm64/boot/dts/qcom/sc7180-trogdor.dtsi | 27 - + arch/arm64/boot/dts/qcom/sc7180.dtsi | 187 +- + arch/arm64/boot/dts/qcom/sc7280-chrome-common.dtsi | 24 + + arch/arm64/boot/dts/qcom/sc7280-crd-r3.dts | 4 + + arch/arm64/boot/dts/qcom/sc7280.dtsi | 239 +- + .../arm64/boot/dts/qcom/sc8180x-lenovo-flex-5g.dts | 3 +- + arch/arm64/boot/dts/qcom/sc8180x-primus.dts | 3 +- + arch/arm64/boot/dts/qcom/sc8180x.dtsi | 177 +- + arch/arm64/boot/dts/qcom/sdm630.dtsi | 68 +- + arch/arm64/boot/dts/qcom/sdm670.dtsi | 3 +- + arch/arm64/boot/dts/qcom/sdm845-cheza.dtsi | 32 +- + arch/arm64/boot/dts/qcom/sdm845-lg-common.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm845-mtp.dts | 90 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 2 +- + .../dts/qcom/sdm845-sony-xperia-tama-akari.dts | 170 + + .../dts/qcom/sdm845-sony-xperia-tama-akatsuki.dts | 168 + + .../dts/qcom/sdm845-sony-xperia-tama-apollo.dts | 170 + + .../boot/dts/qcom/sdm845-sony-xperia-tama.dtsi | 91 + + .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sdm845-xiaomi-polaris.dts | 2 +- + arch/arm64/boot/dts/qcom/sdm845.dtsi | 130 +- + arch/arm64/boot/dts/qcom/sdx75-idp.dts | 2 +- + .../arm64/boot/dts/qcom/sm4250-oneplus-billie2.dts | 2 +- + arch/arm64/boot/dts/qcom/sm6115-fxtec-pro1x.dts | 2 +- + arch/arm64/boot/dts/qcom/sm6115p-lenovo-j606f.dts | 2 +- + .../dts/qcom/sm6125-sony-xperia-seine-pdx201.dts | 59 + + .../boot/dts/qcom/sm6125-xiaomi-laurel-sprout.dts | 4 +- + arch/arm64/boot/dts/qcom/sm6125.dtsi | 257 +- + arch/arm64/boot/dts/qcom/sm7125-xiaomi-common.dtsi | 423 +++ + arch/arm64/boot/dts/qcom/sm7125-xiaomi-joyeuse.dts | 16 + + arch/arm64/boot/dts/qcom/sm7125.dtsi | 16 + + arch/arm64/boot/dts/qcom/sm7225-fairphone-fp4.dts | 35 +- + arch/arm64/boot/dts/qcom/sm8150.dtsi | 117 +- + .../boot/dts/qcom/sm8250-sony-xperia-edo.dtsi | 5 + + arch/arm64/boot/dts/qcom/sm8250.dtsi | 554 ++- + arch/arm64/boot/dts/qcom/sm8350-hdk.dts | 81 + + arch/arm64/boot/dts/qcom/sm8350-mtp.dts | 1 + + arch/arm64/boot/dts/qcom/sm8350.dtsi | 5 +- + arch/arm64/boot/dts/qcom/sm8450-hdk.dts | 24 +- + arch/arm64/boot/dts/qcom/sm8450-qrd.dts | 1 + + .../boot/dts/qcom/sm8450-sony-xperia-nagara.dtsi | 2 +- + arch/arm64/boot/dts/qcom/sm8450.dtsi | 90 +- + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 6 +- + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 49 +- + arch/arm64/boot/dts/qcom/sm8550.dtsi | 48 +- + arch/arm64/configs/defconfig | 4 + + drivers/clk/qcom/Kconfig | 16 + + drivers/clk/qcom/Makefile | 2 + + drivers/clk/qcom/camcc-sm8550.c | 3564 ++++++++++++++++++++ + drivers/clk/qcom/clk-alpha-pll.c | 29 + + drivers/clk/qcom/clk-alpha-pll.h | 2 + + drivers/clk/qcom/clk-hfpll.c | 4 + + drivers/clk/qcom/clk-hfpll.h | 1 + + drivers/clk/qcom/clk-rcg2.c | 14 +- + drivers/clk/qcom/clk-rpmh.c | 21 + + drivers/clk/qcom/gcc-ipq5332.c | 2 - + drivers/clk/qcom/gcc-msm8996.c | 237 +- + drivers/clk/qcom/gcc-sm4450.c | 2897 ++++++++++++++++ + drivers/clk/qcom/gcc-sm8150.c | 2 +- + drivers/clk/qcom/hfpll.c | 59 +- + drivers/clk/qcom/mmcc-msm8974.c | 18 - + drivers/clk/qcom/mmcc-msm8998.c | 7 +- + drivers/firmware/Kconfig | 33 + + drivers/firmware/Makefile | 2 + + drivers/firmware/qcom_qseecom.c | 120 + + drivers/firmware/qcom_qseecom_uefisecapp.c | 871 +++++ + drivers/firmware/qcom_scm.c | 450 ++- + drivers/firmware/qcom_scm.h | 1 + + drivers/soc/qcom/cmd-db.c | 8 +- + drivers/soc/qcom/icc-bwmon.c | 6 +- + drivers/soc/qcom/kryo-l2-accessors.c | 4 +- + drivers/soc/qcom/llcc-qcom.c | 367 +- + drivers/soc/qcom/ocmem.c | 12 +- + drivers/soc/qcom/pdr_interface.c | 8 +- + drivers/soc/qcom/pmic_glink.c | 6 +- + drivers/soc/qcom/pmic_glink_altmode.c | 30 +- + drivers/soc/qcom/qcom-geni-se.c | 38 +- + drivers/soc/qcom/qcom_aoss.c | 12 +- + drivers/soc/qcom/qcom_gsbi.c | 6 +- + drivers/soc/qcom/qcom_stats.c | 6 +- + drivers/soc/qcom/qmi_encdec.c | 6 +- + drivers/soc/qcom/qmi_interface.c | 20 +- + drivers/soc/qcom/rmtfs_mem.c | 15 +- + drivers/soc/qcom/rpmh.c | 8 +- + drivers/soc/qcom/smd-rpm.c | 2 +- + drivers/soc/qcom/smem.c | 10 +- + drivers/soc/qcom/smp2p.c | 6 +- + drivers/soc/qcom/smsm.c | 6 +- + drivers/soc/qcom/socinfo.c | 17 +- + drivers/soc/qcom/wcnss_ctrl.c | 3 +- + include/dt-bindings/arm/qcom,ids.h | 5 + + include/dt-bindings/clock/qcom,mmcc-msm8974.h | 1 - + include/dt-bindings/clock/qcom,sm4450-gcc.h | 197 ++ + include/dt-bindings/clock/qcom,sm8550-camcc.h | 187 + + include/linux/firmware/qcom/qcom_qseecom.h | 46 + + include/linux/firmware/qcom/qcom_scm.h | 109 +- + include/linux/nvmem-consumer.h | 6 + + include/linux/soc/qcom/llcc-qcom.h | 2 +- + include/linux/ucs2_string.h | 1 + + lib/ucs2_string.c | 52 + + 221 files changed, 14462 insertions(+), 1675 deletions(-) + create mode 100644 Documentation/devicetree/bindings/clock/qcom,sm4450-gcc.yaml + create mode 100644 arch/arm64/boot/dts/qcom/apq8016-sbc-usb-host.dtso + create mode 100644 arch/arm64/boot/dts/qcom/msm8939-longcheer-l9100.dts + rename arch/arm64/boot/dts/qcom/{pmr735d.dtsi => pmr735d_a.dtsi} (55%) + create mode 100644 arch/arm64/boot/dts/qcom/pmr735d_b.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/qcm6490-fairphone-fp5.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-nots-r10.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-limozeen-r10.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-kb.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10-lte.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-lazor-r10.dts + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-rt5682i-sku.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sc7180-trogdor-rt5682s-sku.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm7125-xiaomi-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/sm7125-xiaomi-joyeuse.dts + create mode 100644 arch/arm64/boot/dts/qcom/sm7125.dtsi + create mode 100644 drivers/clk/qcom/camcc-sm8550.c + create mode 100644 drivers/clk/qcom/gcc-sm4450.c + create mode 100644 drivers/firmware/qcom_qseecom.c + create mode 100644 drivers/firmware/qcom_qseecom_uefisecapp.c + create mode 100644 include/dt-bindings/clock/qcom,sm4450-gcc.h + create mode 100644 include/dt-bindings/clock/qcom,sm8550-camcc.h + create mode 100644 include/linux/firmware/qcom/qcom_qseecom.h +Merging renesas/next (11476f31ceaf Merge branch 'renesas-dts-for-v6.7' into renesas-next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel.git renesas/next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + arch/arm/configs/shmobile_defconfig | 2 +- + arch/arm/mach-shmobile/pm-rcar-gen2.c | 5 +++-- + arch/arm/mach-shmobile/smp-r8a7779.c | 9 ++++++++- + arch/arm/mach-shmobile/smp-sh73a0.c | 10 ++++++++-- + arch/arm64/configs/defconfig | 1 + + drivers/soc/renesas/Kconfig | 15 +++++++++++---- + drivers/soc/renesas/renesas-soc.c | 15 +++++++++++++-- + 7 files changed, 45 insertions(+), 12 deletions(-) +Merging reset/reset/next (417a3a5ae44a reset: ti: syscon: remove unneeded call to platform_set_drvdata()) +$ 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 (45dc525cfcd3 Merge branch 'v6.7-armsoc/dts64' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mmind/linux-rockchip.git rockchip/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/arm/rockchip.yaml | 15 + + .../devicetree/bindings/pwm/pwm-rockchip.yaml | 1 + + arch/arm/boot/dts/rockchip/rk3128.dtsi | 79 +- + .../boot/dts/rockchip/rv1126-edgeble-neu2-io.dts | 4 + + arch/arm/boot/dts/rockchip/rv1126-pinctrl.dtsi | 16 + + arch/arm/boot/dts/rockchip/rv1126.dtsi | 22 + + arch/arm64/boot/dts/rockchip/Makefile | 3 + + .../boot/dts/rockchip/px30-ringneck-haikou.dts | 10 +- + arch/arm64/boot/dts/rockchip/rk3588-evb1-v10.dts | 98 ++ + arch/arm64/boot/dts/rockchip/rk3588-nanopc-t6.dts | 28 + + .../boot/dts/rockchip/rk3588-orangepi-5-plus.dts | 848 +++++++++++++++ + .../arm64/boot/dts/rockchip/rk3588-quartzpro64.dts | 1137 ++++++++++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588-rock-5b.dts | 119 ++ + .../boot/dts/rockchip/rk3588s-indiedroid-nova.dts | 84 ++ + .../arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts | 662 ++++++++++++ + arch/arm64/boot/dts/rockchip/rk3588s-pinctrl.dtsi | 44 + + arch/arm64/boot/dts/rockchip/rk3588s.dtsi | 11 + + drivers/soc/rockchip/io-domain.c | 6 +- + 18 files changed, 3167 insertions(+), 20 deletions(-) + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-orangepi-5-plus.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588-quartzpro64.dts + create mode 100644 arch/arm64/boot/dts/rockchip/rk3588s-orangepi-5.dts +Merging samsung-krzk/for-next (dac677d8e797 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/configs/multi_v7_defconfig +Merge made by the 'ort' strategy. + arch/arm/configs/exynos_defconfig | 3 ++- + arch/arm/configs/multi_v7_defconfig | 6 ++++++ + arch/arm/configs/s5pv210_defconfig | 1 + + arch/arm64/boot/dts/exynos/exynos850-e850-96.dts | 15 +++++++++++++++ + drivers/soc/samsung/exynos-chipid.c | 6 ++---- + 5 files changed, 26 insertions(+), 5 deletions(-) +Merging scmi/for-linux-next (b98e85977c50 Merge branches 'for-next/scmi/updates', 'for-next/ffa/updates', 'for-next/vexpress/updates' and 'for-next/pcc/updates' 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 +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/cpus.yaml | 4 +- + .../devicetree/bindings/firmware/arm,scmi.yaml | 15 +- + .../devicetree/bindings/power/power-domain.yaml | 17 +- + MAINTAINERS | 1 + + arch/arm64/kvm/hyp/nvhe/ffa.c | 10 +- + drivers/base/power/common.c | 21 + + drivers/base/power/domain.c | 44 +- + drivers/bus/vexpress-config.c | 2 +- + drivers/clk/clk-scmi.c | 96 ++- + drivers/cpufreq/scmi-cpufreq.c | 54 +- + drivers/firmware/arm_ffa/bus.c | 16 +- + drivers/firmware/arm_ffa/driver.c | 770 ++++++++++++++++++++- + drivers/firmware/arm_scmi/Kconfig | 12 + + drivers/firmware/arm_scmi/Makefile | 1 - + drivers/firmware/arm_scmi/clock.c | 402 ++++++++++- + drivers/firmware/arm_scmi/driver.c | 1 + + drivers/firmware/arm_scmi/perf.c | 112 ++- + drivers/firmware/arm_scmi/powercap.c | 4 +- + drivers/firmware/arm_scmi/smc.c | 35 +- + drivers/firmware/arm_scpi.c | 13 +- + drivers/hwmon/xgene-hwmon.c | 16 +- + drivers/i2c/busses/i2c-xgene-slimpro.c | 16 +- + drivers/mailbox/pcc.c | 91 ++- + drivers/opp/core.c | 60 +- + drivers/opp/of.c | 10 +- + drivers/opp/opp.h | 2 +- + drivers/pmdomain/Makefile | 1 + + drivers/pmdomain/arm/Makefile | 4 + + drivers/pmdomain/arm/scmi_perf_domain.c | 184 +++++ + .../arm_scmi => pmdomain/arm}/scmi_pm_domain.c | 0 + drivers/soc/hisilicon/kunpeng_hccs.c | 8 +- + include/acpi/pcc.h | 13 + + include/linux/arm_ffa.h | 79 ++- + include/linux/pm.h | 2 + + include/linux/pm_domain.h | 11 + + include/linux/pm_opp.h | 31 +- + include/linux/scmi_protocol.h | 43 +- + 37 files changed, 1940 insertions(+), 261 deletions(-) + create mode 100644 drivers/pmdomain/arm/Makefile + create mode 100644 drivers/pmdomain/arm/scmi_perf_domain.c + rename drivers/{firmware/arm_scmi => pmdomain/arm}/scmi_pm_domain.c (100%) +Merging stm32/stm32-next (1aeb02d3f2c5 ARM: dts: stm32: add SDIO pinctrl sleep support on stm32f7 boards) +$ 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. + .../devicetree/bindings/arm/stm32/stm32.yaml | 1 + + arch/arm/boot/dts/st/Makefile | 1 + + arch/arm/boot/dts/st/stm32746g-eval.dts | 3 +- + arch/arm/boot/dts/st/stm32f7-pinctrl.dtsi | 23 +- + arch/arm/boot/dts/st/stm32f746-disco.dts | 3 +- + arch/arm/boot/dts/st/stm32f769-disco.dts | 3 +- + arch/arm/boot/dts/st/stm32mp131.dtsi | 19 ++ + arch/arm/boot/dts/st/stm32mp15-pinctrl.dtsi | 342 +++++++++++++++++++++ + arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts | 225 ++++++++++++++ + arch/arm/boot/dts/st/stm32mp15xc-lxa-tac.dtsi | 4 - + arch/arm/boot/dts/st/stm32mp15xx-osd32.dtsi | 6 - + arch/arm64/boot/dts/st/stm32mp25-pinctrl.dtsi | 54 ++++ + arch/arm64/boot/dts/st/stm32mp251.dtsi | 19 ++ + arch/arm64/boot/dts/st/stm32mp257f-ev1.dts | 27 ++ + 14 files changed, 716 insertions(+), 14 deletions(-) + create mode 100644 arch/arm/boot/dts/st/stm32mp157c-osd32mp1-red.dts +Merging sunxi/sunxi/for-next (c3f7c14856eb riscv: dts: allwinner: convert isa detection to new properties) +$ 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 +Already up to date. +Merging tee/next (6a8b7e801054 tee: optee: Use kmemdup() to replace kmalloc + memcpy) +$ git merge -m Merge branch 'next' of https://git.linaro.org/people/jens.wiklander/linux-tee.git tee/next +Already up to date. +Merging tegra/for-next (650220c2b474 Merge branch for-6.7/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 +Auto-merging drivers/memory/tegra/tegra234.c +Merge made by the 'ort' strategy. + drivers/firmware/tegra/bpmp.c | 30 ++++++++++++++++++++++++++++++ + drivers/memory/tegra/tegra234.c | 4 ++++ + drivers/soc/tegra/cbb/tegra194-cbb.c | 6 ++---- + drivers/soc/tegra/pmc.c | 8 -------- + include/soc/tegra/bpmp-abi.h | 2 +- + include/soc/tegra/bpmp.h | 6 ++++++ + 6 files changed, 43 insertions(+), 13 deletions(-) +Merging ti/ti-next (6c1e5a8266dd Merge branch 'ti-k3-dts-next' into ti-next) +$ git merge -m Merge branch 'ti-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ti/linux.git ti/ti-next +Auto-merging arch/arm64/configs/defconfig +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/ti/Makefile | 7 +- + arch/arm64/boot/dts/ti/k3-am62-main.dtsi | 12 +- + arch/arm64/boot/dts/ti/k3-am62-mcu.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-am62-verdin-wifi.dtsi | 6 + + arch/arm64/boot/dts/ti/k3-am62-verdin.dtsi | 1 + + arch/arm64/boot/dts/ti/k3-am62-wakeup.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-am62.dtsi | 3 + + arch/arm64/boot/dts/ti/k3-am625-beagleplay.dts | 28 +- + arch/arm64/boot/dts/ti/k3-am625-sk.dts | 27 ++ + arch/arm64/boot/dts/ti/k3-am62a-main.dtsi | 60 ++++ + arch/arm64/boot/dts/ti/k3-am62a7-sk.dts | 189 ++++++++++++- + arch/arm64/boot/dts/ti/k3-am62p-main.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am62x-sk-common.dtsi | 16 ++ + arch/arm64/boot/dts/ti/k3-am64-main.dtsi | 37 ++- + arch/arm64/boot/dts/ti/k3-am64-mcu.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-am64-phycore-som.dtsi | 11 + + arch/arm64/boot/dts/ti/k3-am64.dtsi | 2 + + arch/arm64/boot/dts/ti/k3-am642-evm.dts | 37 +++ + arch/arm64/boot/dts/ti/k3-am642-sk.dts | 29 ++ + .../boot/dts/ti/k3-am642-tqma64xxl-mbax4xxl.dts | 84 +++++- + arch/arm64/boot/dts/ti/k3-am642-tqma64xxl.dtsi | 12 + + arch/arm64/boot/dts/ti/k3-am65-main.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am65-mcu.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-am654-base-board.dts | 7 + + arch/arm64/boot/dts/ti/k3-am68-sk-base-board.dts | 56 ++++ + arch/arm64/boot/dts/ti/k3-am68-sk-som.dtsi | 208 ++++++++++++++ + arch/arm64/boot/dts/ti/k3-am69-sk.dts | 304 +++++++++++++++++++++ + arch/arm64/boot/dts/ti/k3-j7200-main.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-j7200-mcu-wakeup.dtsi | 9 +- + arch/arm64/boot/dts/ti/k3-j721e-main.dtsi | 2 +- + arch/arm64/boot/dts/ti/k3-j721e-mcu-wakeup.dtsi | 9 +- + arch/arm64/boot/dts/ti/k3-j721s2-main.dtsi | 232 +++++++++++++++- + arch/arm64/boot/dts/ti/k3-j721s2-mcu-wakeup.dtsi | 82 +++++- + arch/arm64/boot/dts/ti/k3-j721s2-som-p0.dtsi | 208 ++++++++++++++ + arch/arm64/boot/dts/ti/k3-j784s4-main.dtsi | 223 +++++++++++++++ + arch/arm64/boot/dts/ti/k3-j784s4-mcu-wakeup.dtsi | 40 +++ + arch/arm64/boot/dts/ti/k3-serdes.h | 2 +- + arch/arm64/configs/defconfig | 1 + + drivers/firmware/ti_sci.c | 56 +--- + drivers/soc/ti/k3-ringacc.c | 5 +- + drivers/soc/ti/knav_dma.c | 6 +- + drivers/soc/ti/knav_qmss_queue.c | 5 +- + drivers/soc/ti/pm33xx.c | 5 +- + drivers/soc/ti/pruss.c | 6 +- + drivers/soc/ti/smartreflex.c | 5 +- + drivers/soc/ti/wkup_m3_ipc.c | 6 +- + 46 files changed, 1944 insertions(+), 108 deletions(-) +Merging xilinx/for-next (0f133188d6b8 Merge branch 'zynqmp/soc' into for-next) +$ git merge -m Merge branch 'for-next' of git://github.com/Xilinx/linux-xlnx.git xilinx/for-next +Merge made by the 'ort' strategy. + arch/arm64/boot/dts/xilinx/Makefile | 9 ++++----- + drivers/soc/xilinx/zynqmp_power.c | 6 ++---- + 2 files changed, 6 insertions(+), 9 deletions(-) +Merging clk/clk-next (b7c08e5d3824 Merge branch 'clk-doc' 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. + drivers/clk/.kunitconfig | 1 + + drivers/clk/Kconfig | 7 + + drivers/clk/Makefile | 1 + + drivers/clk/clk-asm9260.c | 6 +- + drivers/clk/clk-cdce925.c | 2 +- + drivers/clk/clk-fractional-divider.c | 27 +- + drivers/clk/clk-fractional-divider_test.c | 147 ++++++++++ + drivers/clk/clk-gate.c | 2 +- + drivers/clk/clk-si514.c | 2 +- + drivers/clk/clk-si5341.c | 2 +- + drivers/clk/clk-si5351.c | 2 +- + drivers/clk/clk-si544.c | 2 +- + drivers/clk/clk-si570.c | 2 +- + drivers/clk/clk-versaclock3.c | 8 +- + drivers/clk/clk-versaclock5.c | 2 +- + drivers/clk/clk-versaclock7.c | 2 +- + drivers/clk/clk.c | 21 +- + drivers/clk/clk_test.c | 130 +++++++-- + drivers/clk/renesas/Kconfig | 7 +- + drivers/clk/renesas/Makefile | 1 + + drivers/clk/renesas/r8a7795-cpg-mssr.c | 4 +- + drivers/clk/renesas/r9a06g032-clocks.c | 69 ++--- + drivers/clk/renesas/r9a07g043-cpg.c | 19 +- + drivers/clk/renesas/r9a07g044-cpg.c | 19 +- + drivers/clk/renesas/r9a08g045-cpg.c | 248 ++++++++++++++++ + drivers/clk/renesas/rcar-cpg-lib.c | 15 +- + drivers/clk/renesas/rzg2l-cpg.c | 465 +++++++++++++++++++++++++----- + drivers/clk/renesas/rzg2l-cpg.h | 39 ++- + drivers/clk/socfpga/clk-gate.c | 27 +- + drivers/clk/stm32/clk-stm32-core.c | 2 +- + include/linux/clk-provider.h | 15 +- + 31 files changed, 1103 insertions(+), 193 deletions(-) + create mode 100644 drivers/clk/clk-fractional-divider_test.c + create mode 100644 drivers/clk/renesas/r9a08g045-cpg.c +Merging clk-imx/for-next (2838820800dc clk: imx: imx8qm/qxp: add more resources to whitelist) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelvesa/linux.git clk-imx/for-next +Merge made by the 'ort' strategy. + drivers/clk/imx/Kconfig | 1 + + drivers/clk/imx/clk-imx6sx.c | 14 ++++++++++--- + drivers/clk/imx/clk-imx8-acm.c | 35 +++++++++++++++++--------------- + drivers/clk/imx/clk-imx8dxl-rsrc.c | 3 +-- + drivers/clk/imx/clk-imx8mq.c | 17 +++++++++------- + drivers/clk/imx/clk-imx8qm-rsrc.c | 5 ++--- + drivers/clk/imx/clk-imx8qxp-lpcg.h | 1 - + drivers/clk/imx/clk-imx8qxp-rsrc.c | 4 +++- + drivers/clk/imx/clk-imx8qxp.c | 13 +++++++++--- + drivers/clk/imx/clk-scu.c | 20 ++++++++++++++++++ + include/dt-bindings/clock/imx8mp-clock.h | 1 - + 11 files changed, 77 insertions(+), 37 deletions(-) +Merging clk-renesas/renesas-clk (4bce4bedbe6d clk: renesas: r9a08g045: Add clock and reset support for SDHI1 and SDHI2) +$ git merge -m Merge branch 'renesas-clk' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-drivers.git clk-renesas/renesas-clk +Already up to date. +Merging csky/linux-next (5195c35ac4f0 csky: Fixup compile error) +$ git merge -m Merge branch 'linux-next' of git://github.com/c-sky/csky-linux.git csky/linux-next +Already up to date. +Merging loongarch/loongarch-next (2c10cda4b777 LoongArch: KVM: Add maintainers for LoongArch KVM) +$ git merge -m Merge branch 'loongarch-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chenhuacai/linux-loongson.git loongarch/loongarch-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 70 ++- + MAINTAINERS | 12 + + arch/loongarch/Kbuild | 2 + + arch/loongarch/Kconfig | 6 + + arch/loongarch/configs/loongson3_defconfig | 2 + + arch/loongarch/include/asm/inst.h | 16 + + arch/loongarch/include/asm/kvm_csr.h | 211 +++++++ + arch/loongarch/include/asm/kvm_host.h | 237 ++++++++ + arch/loongarch/include/asm/kvm_mmu.h | 139 +++++ + arch/loongarch/include/asm/kvm_types.h | 11 + + arch/loongarch/include/asm/kvm_vcpu.h | 93 +++ + arch/loongarch/include/asm/loongarch.h | 19 +- + arch/loongarch/include/uapi/asm/kvm.h | 108 ++++ + arch/loongarch/kernel/asm-offsets.c | 32 + + arch/loongarch/kvm/Kconfig | 40 ++ + arch/loongarch/kvm/Makefile | 22 + + arch/loongarch/kvm/exit.c | 696 +++++++++++++++++++++ + arch/loongarch/kvm/interrupt.c | 183 ++++++ + arch/loongarch/kvm/main.c | 420 +++++++++++++ + arch/loongarch/kvm/mmu.c | 914 ++++++++++++++++++++++++++++ + arch/loongarch/kvm/switch.S | 250 ++++++++ + arch/loongarch/kvm/timer.c | 197 ++++++ + arch/loongarch/kvm/tlb.c | 32 + + arch/loongarch/kvm/trace.h | 162 +++++ + arch/loongarch/kvm/vcpu.c | 939 +++++++++++++++++++++++++++++ + arch/loongarch/kvm/vm.c | 94 +++ + include/uapi/linux/kvm.h | 9 + + 27 files changed, 4902 insertions(+), 14 deletions(-) + create mode 100644 arch/loongarch/include/asm/kvm_csr.h + create mode 100644 arch/loongarch/include/asm/kvm_host.h + create mode 100644 arch/loongarch/include/asm/kvm_mmu.h + create mode 100644 arch/loongarch/include/asm/kvm_types.h + create mode 100644 arch/loongarch/include/asm/kvm_vcpu.h + create mode 100644 arch/loongarch/include/uapi/asm/kvm.h + create mode 100644 arch/loongarch/kvm/Kconfig + create mode 100644 arch/loongarch/kvm/Makefile + create mode 100644 arch/loongarch/kvm/exit.c + create mode 100644 arch/loongarch/kvm/interrupt.c + create mode 100644 arch/loongarch/kvm/main.c + create mode 100644 arch/loongarch/kvm/mmu.c + create mode 100644 arch/loongarch/kvm/switch.S + create mode 100644 arch/loongarch/kvm/timer.c + create mode 100644 arch/loongarch/kvm/tlb.c + create mode 100644 arch/loongarch/kvm/trace.h + create mode 100644 arch/loongarch/kvm/vcpu.c + create mode 100644 arch/loongarch/kvm/vm.c +Merging m68k/for-next (48ceb35e7268 m68k: defconfig: Update virt_defconfig for v6.6-rc3) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Merge made by the 'ort' strategy. + arch/m68k/68000/entry.S | 7 ++-- + arch/m68k/Kconfig | 3 ++ + arch/m68k/amiga/amiga.h | 5 +++ + arch/m68k/amiga/amisound.c | 2 ++ + arch/m68k/amiga/config.c | 4 +-- + arch/m68k/amiga/pcmcia.c | 3 +- + arch/m68k/apollo/apollo.h | 4 +++ + arch/m68k/apollo/config.c | 45 ++++++-------------------- + arch/m68k/apollo/dn_ints.c | 8 +++-- + arch/m68k/atari/ataints.c | 3 +- + arch/m68k/atari/atakeyb.c | 2 +- + arch/m68k/atari/atari.h | 15 +++++++++ + arch/m68k/atari/atasound.c | 1 + + arch/m68k/atari/config.c | 13 ++------ + arch/m68k/atari/stdma.c | 1 + + arch/m68k/atari/stram.c | 2 +- + arch/m68k/atari/time.c | 2 ++ + arch/m68k/bvme6000/config.c | 7 ++-- + arch/m68k/coldfire/entry.S | 7 ++-- + arch/m68k/configs/amiga_defconfig | 1 + + arch/m68k/configs/apollo_defconfig | 2 ++ + arch/m68k/configs/atari_defconfig | 1 + + arch/m68k/configs/bvme6000_defconfig | 2 ++ + arch/m68k/configs/hp300_defconfig | 2 ++ + arch/m68k/configs/mac_defconfig | 1 + + arch/m68k/configs/multi_defconfig | 1 + + arch/m68k/configs/mvme147_defconfig | 2 ++ + arch/m68k/configs/mvme16x_defconfig | 2 ++ + arch/m68k/configs/q40_defconfig | 1 + + arch/m68k/configs/sun3_defconfig | 2 ++ + arch/m68k/configs/sun3x_defconfig | 2 ++ + arch/m68k/configs/virt_defconfig | 3 +- + arch/m68k/emu/natfeat.c | 9 +++--- + arch/m68k/emu/nfeth.c | 2 +- + arch/m68k/hp300/time.c | 2 ++ + arch/m68k/ifpsp060/Makefile | 6 ++-- + arch/m68k/include/asm/dvma.h | 8 ++++- + arch/m68k/include/asm/irq.h | 5 +++ + arch/m68k/include/asm/oplib.h | 4 ++- + arch/m68k/include/asm/pgtable.h | 9 ++++++ + arch/m68k/include/asm/pgtable_no.h | 1 - + arch/m68k/include/asm/raw_io.h | 32 ++++++++++--------- + arch/m68k/include/asm/syscalls.h | 19 +++++++++++ + arch/m68k/include/asm/tlbflush.h | 1 + + arch/m68k/kernel/early_printk.c | 4 +-- + arch/m68k/kernel/entry.S | 7 ++-- + arch/m68k/kernel/head.S | 8 ++--- + arch/m68k/kernel/ints.c | 2 ++ + arch/m68k/kernel/ints.h | 7 ++++ + arch/m68k/kernel/process.c | 1 + + arch/m68k/kernel/process.h | 8 +++++ + arch/m68k/kernel/ptrace.c | 2 ++ + arch/m68k/kernel/ptrace.h | 6 ++++ + arch/m68k/kernel/setup_mm.c | 2 -- + arch/m68k/kernel/signal.c | 4 ++- + arch/m68k/kernel/signal.h | 7 ++++ + arch/m68k/kernel/sys_m68k.c | 4 +-- + arch/m68k/kernel/traps.c | 11 +++---- + arch/m68k/kernel/traps.h | 10 ++++++ + arch/m68k/kernel/vectors.c | 3 ++ + arch/m68k/kernel/vectors.h | 3 ++ + arch/m68k/lib/Makefile | 3 +- + arch/m68k/lib/ashldi3.c | 61 ----------------------------------- + arch/m68k/lib/ashrdi3.c | 62 ------------------------------------ + arch/m68k/lib/lshrdi3.c | 61 ----------------------------------- + arch/m68k/mac/baboon.c | 2 ++ + arch/m68k/mac/config.c | 14 ++------ + arch/m68k/mac/iop.c | 2 ++ + arch/m68k/mac/mac.h | 25 +++++++++++++++ + arch/m68k/mac/macboing.c | 11 ++----- + arch/m68k/mac/misc.c | 5 +-- + arch/m68k/mac/oss.c | 2 ++ + arch/m68k/mac/psc.c | 2 ++ + arch/m68k/mac/via.c | 2 ++ + arch/m68k/math-emu/fp_arith.c | 49 ++++++++++------------------ + arch/m68k/math-emu/fp_arith.h | 47 +++++++++++---------------- + arch/m68k/math-emu/fp_log.c | 46 ++++++++++---------------- + arch/m68k/math-emu/fp_log.h | 44 +++++++++++++++++++++++++ + arch/m68k/math-emu/fp_trig.c | 54 +++++++++++-------------------- + arch/m68k/math-emu/fp_trig.h | 25 +++++++++++++-- + arch/m68k/math-emu/multi_arith.h | 8 +++-- + arch/m68k/mm/fault.c | 2 ++ + arch/m68k/mm/fault.h | 7 ++++ + arch/m68k/mm/hwtest.c | 2 ++ + arch/m68k/mm/sun3kmap.c | 6 ++-- + arch/m68k/mm/sun3mmu.c | 2 +- + arch/m68k/mvme147/config.c | 7 ++-- + arch/m68k/mvme16x/config.c | 10 +++--- + arch/m68k/mvme16x/mvme16x.h | 6 ++++ + arch/m68k/q40/config.c | 11 ++----- + arch/m68k/q40/q40.h | 6 ++++ + arch/m68k/q40/q40ints.c | 2 ++ + arch/m68k/sun3/config.c | 13 ++++---- + arch/m68k/sun3/idprom.c | 4 ++- + arch/m68k/sun3/intersil.c | 1 + + arch/m68k/sun3/leds.c | 2 ++ + arch/m68k/sun3/mmu_emu.c | 3 +- + arch/m68k/sun3/prom/printf.c | 5 ++- + arch/m68k/sun3/sun3.h | 22 +++++++++++++ + arch/m68k/sun3/sun3dvma.c | 17 ---------- + arch/m68k/sun3/sun3ints.c | 12 +++---- + arch/m68k/sun3x/config.c | 6 ++-- + arch/m68k/sun3x/dvma.c | 5 ++- + arch/m68k/sun3x/prom.c | 2 +- + 104 files changed, 490 insertions(+), 531 deletions(-) + create mode 100644 arch/m68k/amiga/amiga.h + create mode 100644 arch/m68k/apollo/apollo.h + create mode 100644 arch/m68k/atari/atari.h + create mode 100644 arch/m68k/include/asm/syscalls.h + create mode 100644 arch/m68k/kernel/ints.h + create mode 100644 arch/m68k/kernel/process.h + create mode 100644 arch/m68k/kernel/ptrace.h + create mode 100644 arch/m68k/kernel/signal.h + create mode 100644 arch/m68k/kernel/traps.h + create mode 100644 arch/m68k/kernel/vectors.h + delete mode 100644 arch/m68k/lib/ashldi3.c + delete mode 100644 arch/m68k/lib/ashrdi3.c + delete mode 100644 arch/m68k/lib/lshrdi3.c + create mode 100644 arch/m68k/mac/mac.h + create mode 100644 arch/m68k/math-emu/fp_log.h + create mode 100644 arch/m68k/mm/fault.h + create mode 100644 arch/m68k/mvme16x/mvme16x.h + create mode 100644 arch/m68k/q40/q40.h + create mode 100644 arch/m68k/sun3/sun3.h +Merging m68knommu/for-next (49827634a69b m68k: 68000: fix warning in timer code) +$ 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/ints.c | 5 ++++- + arch/m68k/68000/ints.h | 7 +++++++ + arch/m68k/68000/timers.c | 2 ++ + arch/m68k/Kconfig.machine | 4 ++-- + arch/m68k/coldfire/intc.c | 4 ++-- + arch/m68k/coldfire/vectors.c | 2 ++ + arch/m68k/coldfire/vectors.h | 3 +++ + arch/m68k/include/asm/mcfgpio.h | 8 ++++---- + arch/m68k/include/asm/nettel.h | 5 ++--- + arch/m68k/kernel/uboot.c | 13 ++++++++----- + arch/m68k/mm/mcfmmu.c | 3 +-- + 11 files changed, 37 insertions(+), 19 deletions(-) + create mode 100644 arch/m68k/68000/ints.h + create mode 100644 arch/m68k/coldfire/vectors.h +Merging microblaze/next (65d6e954e378 Merge tag 'gfs2-v6.5-rc5-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/gfs2/linux-gfs2) +$ 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 (4d0f332a6fb6 MIPS: Remove dead code in relocate_new_kernel) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Merge made by the 'ort' strategy. + arch/mips/boot/dts/ingenic/jz4725b.dtsi | 1 - + arch/mips/boot/dts/ingenic/jz4770.dtsi | 1 - + arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc1.dts | 2 +- + arch/mips/boot/dts/ralink/mt7621-gnubee-gb-pc2.dts | 2 +- + arch/mips/boot/dts/ralink/mt7621.dtsi | 5 ++--- + arch/mips/include/asm/mach-loongson32/dma.h | 21 ----------------- + arch/mips/include/asm/mach-loongson32/nand.h | 26 ---------------------- + arch/mips/include/asm/mach-loongson32/platform.h | 3 --- + arch/mips/kernel/relocate_kernel.S | 1 - + arch/mips/loongson32/common/platform.c | 2 -- + arch/mips/loongson32/ls1b/board.c | 2 -- + 11 files changed, 4 insertions(+), 62 deletions(-) + delete mode 100644 arch/mips/include/asm/mach-loongson32/dma.h + delete mode 100644 arch/mips/include/asm/mach-loongson32/nand.h +Merging openrisc/for-next (c289330331eb openrisc: Remove kernel-doc marker from ioremap comment) +$ 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 (ce9ecca0238b Linux 6.6-rc2) +$ 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 +Already up to date. +Merging powerpc/next (c7e0d9bb9154 powerpc: Only define __parse_fpscr() when required) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Auto-merging arch/powerpc/kernel/traps.c +Auto-merging arch/powerpc/kexec/core.c +Merge made by the 'ort' strategy. + arch/powerpc/Kconfig.debug | 2 + + arch/powerpc/configs/44x/sam440ep_defconfig | 1 - + arch/powerpc/configs/debug.config | 4 + + arch/powerpc/configs/g5_defconfig | 4 - + arch/powerpc/configs/pmac32_defconfig | 2 +- + arch/powerpc/configs/ppc64e_defconfig | 4 - + arch/powerpc/configs/ppc6xx_defconfig | 5 - + arch/powerpc/include/asm/kexec.h | 8 +- + arch/powerpc/kernel/btext.c | 360 +--------------------------- + arch/powerpc/kernel/crash_dump.c | 12 + + arch/powerpc/kernel/ptrace/ptrace.c | 5 +- + arch/powerpc/kernel/signal.c | 5 +- + arch/powerpc/kernel/signal.h | 7 +- + arch/powerpc/kernel/traps.c | 2 + + arch/powerpc/kexec/core.c | 2 + + arch/powerpc/kexec/file_load_64.c | 8 +- + arch/powerpc/platforms/powermac/Kconfig | 1 + + arch/powerpc/platforms/powermac/low_i2c.c | 4 +- + arch/powerpc/platforms/powermac/smp.c | 4 +- + include/linux/crash_dump.h | 8 +- + lib/fonts/Kconfig | 2 +- + 21 files changed, 58 insertions(+), 392 deletions(-) +Merging soc-fsl/next (fb9c384625dd bus: fsl-mc: fsl-mc-allocator: Drop a write-only variable) +$ 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Already up to date. +Merging riscv-dt/riscv-dt-for-next (81b5948cf1a7 riscv: dts: starfive: convert isa detection to new properties) +$ 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/riscv/cpus.yaml +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging arch/riscv/boot/dts/starfive/jh7110-starfive-visionfive-2.dtsi +Merge made by the 'ort' strategy. + .../interrupt-controller/sifive,plic-1.0.0.yaml | 2 + + .../thead,c900-aclint-mswi.yaml | 43 + + Documentation/devicetree/bindings/riscv/cpus.yaml | 1 + + .../devicetree/bindings/riscv/sophgo.yaml | 32 + + .../devicetree/bindings/timer/sifive,clint.yaml | 1 + + .../bindings/timer/thead,c900-aclint-mtimer.yaml | 43 + + .../devicetree/bindings/vendor-prefixes.yaml | 4 + + MAINTAINERS | 7 + + arch/riscv/Kconfig.socs | 5 + + arch/riscv/boot/dts/Makefile | 1 + + arch/riscv/boot/dts/microchip/mpfs.dtsi | 15 + + arch/riscv/boot/dts/sifive/fu540-c000.dtsi | 15 + + arch/riscv/boot/dts/sifive/fu740-c000.dtsi | 15 + + arch/riscv/boot/dts/sophgo/Makefile | 3 + + arch/riscv/boot/dts/sophgo/cv1800b-milkv-duo.dts | 38 + + arch/riscv/boot/dts/sophgo/cv1800b.dtsi | 123 ++ + arch/riscv/boot/dts/sophgo/sg2042-cpus.dtsi | 2000 ++++++++++++++++++++ + .../riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts | 19 + + arch/riscv/boot/dts/sophgo/sg2042.dtsi | 325 ++++ + arch/riscv/boot/dts/starfive/jh7100.dtsi | 6 + + arch/riscv/boot/dts/starfive/jh7110-pinfunc.h | 4 +- + .../dts/starfive/jh7110-starfive-visionfive-2.dtsi | 111 ++ + arch/riscv/boot/dts/starfive/jh7110.dtsi | 93 + + arch/riscv/configs/defconfig | 3 +- + 24 files changed, 2906 insertions(+), 3 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interrupt-controller/thead,c900-aclint-mswi.yaml + create mode 100644 Documentation/devicetree/bindings/riscv/sophgo.yaml + create mode 100644 Documentation/devicetree/bindings/timer/thead,c900-aclint-mtimer.yaml + create mode 100644 arch/riscv/boot/dts/sophgo/Makefile + create mode 100644 arch/riscv/boot/dts/sophgo/cv1800b-milkv-duo.dts + create mode 100644 arch/riscv/boot/dts/sophgo/cv1800b.dtsi + create mode 100644 arch/riscv/boot/dts/sophgo/sg2042-cpus.dtsi + create mode 100644 arch/riscv/boot/dts/sophgo/sg2042-milkv-pioneer.dts + create mode 100644 arch/riscv/boot/dts/sophgo/sg2042.dtsi +Merging riscv-soc/riscv-soc-for-next (22dedf8f4570 soc/microchip: mpfs-sys-controller: Convert to platform remove callback returning void) +$ 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 arch/riscv/Kconfig.socs +Merge made by the 'ort' strategy. + arch/riscv/Kconfig.socs | 1 + + drivers/soc/microchip/mpfs-sys-controller.c | 6 ++---- + drivers/soc/sifive/Kconfig | 2 +- + 3 files changed, 4 insertions(+), 5 deletions(-) +Merging s390/for-next (a8dbae76e7bc Merge branch 'features' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git s390/for-next +Auto-merging arch/s390/kernel/kprobes.c +Auto-merging arch/s390/kernel/setup.c +Auto-merging arch/s390/mm/init.c +Merge made by the 'ort' strategy. + arch/s390/boot/startup.c | 2 +- + arch/s390/boot/vmem.c | 15 ++- + arch/s390/include/asm/ctl_reg.h | 146 -------------------- + arch/s390/include/asm/ctlreg.h | 251 +++++++++++++++++++++++++++++++++++ + arch/s390/include/asm/fpu/internal.h | 1 - + arch/s390/include/asm/irq.h | 23 ++-- + arch/s390/include/asm/kprobes.h | 3 +- + arch/s390/include/asm/lowcore.h | 7 +- + arch/s390/include/asm/mmu_context.h | 10 +- + arch/s390/include/asm/pgtable.h | 3 +- + arch/s390/include/asm/smp.h | 1 - + arch/s390/include/asm/uaccess.h | 1 - + arch/s390/kernel/Makefile | 2 +- + arch/s390/kernel/ctlreg.c | 121 +++++++++++++++++ + arch/s390/kernel/early.c | 22 ++- + arch/s390/kernel/guarded_storage.c | 6 +- + arch/s390/kernel/ipl.c | 2 +- + arch/s390/kernel/irq.c | 4 +- + arch/s390/kernel/kprobes.c | 21 ++- + arch/s390/kernel/machine_kexec.c | 6 +- + arch/s390/kernel/nmi.c | 24 ++-- + arch/s390/kernel/perf_cpum_cf.c | 2 +- + arch/s390/kernel/perf_pai_crypto.c | 7 +- + arch/s390/kernel/perf_pai_ext.c | 7 +- + arch/s390/kernel/ptrace.c | 45 ++++--- + arch/s390/kernel/setup.c | 23 ++-- + arch/s390/kernel/smp.c | 132 ++---------------- + arch/s390/kernel/time.c | 4 +- + arch/s390/kvm/kvm-s390.c | 6 +- + arch/s390/kvm/priv.c | 2 +- + arch/s390/lib/uaccess.c | 15 ++- + arch/s390/mm/dump_pagetables.c | 2 +- + arch/s390/mm/fault.c | 4 +- + arch/s390/mm/init.c | 4 +- + arch/s390/mm/maccess.c | 2 +- + arch/s390/mm/pageattr.c | 2 +- + arch/s390/mm/pgalloc.c | 4 +- + arch/s390/mm/vmem.c | 3 +- + arch/s390/pci/pci.c | 2 +- + drivers/s390/char/diag_ftp.c | 2 +- + drivers/s390/char/sclp.c | 12 +- + drivers/s390/char/sclp_cmd.c | 2 +- + drivers/s390/char/sclp_early.c | 2 +- + drivers/s390/char/sclp_early_core.c | 7 +- + drivers/s390/cio/crw.c | 4 +- + drivers/s390/cio/isc.c | 4 +- + drivers/s390/crypto/zcrypt_cex4.c | 4 + + net/iucv/iucv.c | 4 +- + 48 files changed, 553 insertions(+), 425 deletions(-) + delete mode 100644 arch/s390/include/asm/ctl_reg.h + create mode 100644 arch/s390/include/asm/ctlreg.h + create mode 100644 arch/s390/kernel/ctlreg.c +Merging sh/for-next (246f80a0b17f sh: push-switch: Reorder cleanup operations to avoid use-after-free bug) +$ git merge -m Merge branch 'for-next' of git:git.kernel.org/pub/scm/linux/kernel/git/glaubitz/sh-linux.git sh/for-next +Already up to date. +Merging uml/next (974b808d85ab um: virt-pci: fix missing declaration warning) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/uml/linux.git uml/next +Already up to date. +Merging xtensa/xtensa-for-next (a83a72730c33 xtensa: import ESP32S3 core variant) +$ git merge -m Merge branch 'xtensa-for-next' of git://github.com/jcmvbkbc/linux-xtensa.git xtensa/xtensa-for-next +Merge made by the 'ort' strategy. + arch/xtensa/variants/esp32/include/variant/core.h | 655 ++++++++++++++++++++ + .../variants/esp32/include/variant/tie-asm.h | 323 ++++++++++ + arch/xtensa/variants/esp32/include/variant/tie.h | 182 ++++++ + .../xtensa/variants/esp32s3/include/variant/core.h | 681 +++++++++++++++++++++ + .../variants/esp32s3/include/variant/tie-asm.h | 429 +++++++++++++ + arch/xtensa/variants/esp32s3/include/variant/tie.h | 207 +++++++ + 6 files changed, 2477 insertions(+) + create mode 100644 arch/xtensa/variants/esp32/include/variant/core.h + create mode 100644 arch/xtensa/variants/esp32/include/variant/tie-asm.h + create mode 100644 arch/xtensa/variants/esp32/include/variant/tie.h + create mode 100644 arch/xtensa/variants/esp32s3/include/variant/core.h + create mode 100644 arch/xtensa/variants/esp32s3/include/variant/tie-asm.h + create mode 100644 arch/xtensa/variants/esp32s3/include/variant/tie.h +Merging bcachefs/for-next (1a97b93a13f8 bcachefs: Fix changing durability using sysfs) +$ git merge -m Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git bcachefs/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/md/bcache/bcache.h +Auto-merging fs/Kconfig +Auto-merging fs/dcache.c +Auto-merging include/linux/sched.h +Auto-merging init/init_task.c +Auto-merging lib/Kconfig.debug +Merge made by the 'ort' strategy. + MAINTAINERS | 23 + + arch/powerpc/kernel/firmware.c | 2 + + drivers/md/bcache/Kconfig | 10 +- + drivers/md/bcache/Makefile | 4 +- + drivers/md/bcache/bcache.h | 2 +- + drivers/md/bcache/super.c | 1 - + drivers/md/bcache/util.h | 3 +- + fs/Kconfig | 1 + + fs/Makefile | 1 + + fs/bcachefs/Kconfig | 85 + + fs/bcachefs/Makefile | 88 + + fs/bcachefs/acl.c | 463 ++++ + fs/bcachefs/acl.h | 60 + + fs/bcachefs/alloc_background.c | 2143 +++++++++++++++ + fs/bcachefs/alloc_background.h | 257 ++ + fs/bcachefs/alloc_foreground.c | 1576 +++++++++++ + fs/bcachefs/alloc_foreground.h | 224 ++ + fs/bcachefs/alloc_types.h | 126 + + fs/bcachefs/backpointers.c | 868 ++++++ + fs/bcachefs/backpointers.h | 131 + + fs/bcachefs/bbpos.h | 48 + + fs/bcachefs/bcachefs.h | 1147 ++++++++ + fs/bcachefs/bcachefs_format.h | 2389 +++++++++++++++++ + fs/bcachefs/bcachefs_ioctl.h | 368 +++ + fs/bcachefs/bkey.c | 1120 ++++++++ + fs/bcachefs/bkey.h | 782 ++++++ + fs/bcachefs/bkey_buf.h | 61 + + fs/bcachefs/bkey_cmp.h | 129 + + fs/bcachefs/bkey_methods.c | 459 ++++ + fs/bcachefs/bkey_methods.h | 188 ++ + fs/bcachefs/bkey_sort.c | 201 ++ + fs/bcachefs/bkey_sort.h | 54 + + fs/bcachefs/bset.c | 1592 +++++++++++ + fs/bcachefs/bset.h | 541 ++++ + fs/bcachefs/btree_cache.c | 1202 +++++++++ + fs/bcachefs/btree_cache.h | 130 + + fs/bcachefs/btree_gc.c | 2111 +++++++++++++++ + fs/bcachefs/btree_gc.h | 114 + + fs/bcachefs/btree_io.c | 2223 ++++++++++++++++ + fs/bcachefs/btree_io.h | 228 ++ + fs/bcachefs/btree_iter.c | 3215 +++++++++++++++++++++++ + fs/bcachefs/btree_iter.h | 939 +++++++ + fs/bcachefs/btree_journal_iter.c | 531 ++++ + fs/bcachefs/btree_journal_iter.h | 57 + + fs/bcachefs/btree_key_cache.c | 1072 ++++++++ + fs/bcachefs/btree_key_cache.h | 48 + + fs/bcachefs/btree_locking.c | 791 ++++++ + fs/bcachefs/btree_locking.h | 423 +++ + fs/bcachefs/btree_trans_commit.c | 1154 ++++++++ + fs/bcachefs/btree_types.h | 739 ++++++ + fs/bcachefs/btree_update.c | 933 +++++++ + fs/bcachefs/btree_update.h | 340 +++ + fs/bcachefs/btree_update_interior.c | 2480 +++++++++++++++++ + fs/bcachefs/btree_update_interior.h | 337 +++ + fs/bcachefs/btree_write_buffer.c | 375 +++ + fs/bcachefs/btree_write_buffer.h | 14 + + fs/bcachefs/btree_write_buffer_types.h | 44 + + fs/bcachefs/buckets.c | 2107 +++++++++++++++ + fs/bcachefs/buckets.h | 440 ++++ + fs/bcachefs/buckets_types.h | 92 + + fs/bcachefs/buckets_waiting_for_journal.c | 166 ++ + fs/bcachefs/buckets_waiting_for_journal.h | 15 + + fs/bcachefs/buckets_waiting_for_journal_types.h | 23 + + fs/bcachefs/chardev.c | 784 ++++++ + fs/bcachefs/chardev.h | 31 + + fs/bcachefs/checksum.c | 754 ++++++ + fs/bcachefs/checksum.h | 210 ++ + fs/bcachefs/clock.c | 193 ++ + fs/bcachefs/clock.h | 38 + + fs/bcachefs/clock_types.h | 37 + + fs/bcachefs/compress.c | 710 +++++ + fs/bcachefs/compress.h | 55 + + fs/bcachefs/counters.c | 107 + + fs/bcachefs/counters.h | 17 + + fs/bcachefs/darray.h | 87 + + fs/bcachefs/data_update.c | 558 ++++ + fs/bcachefs/data_update.h | 43 + + fs/bcachefs/debug.c | 954 +++++++ + fs/bcachefs/debug.h | 32 + + fs/bcachefs/dirent.c | 587 +++++ + fs/bcachefs/dirent.h | 70 + + fs/bcachefs/disk_groups.c | 555 ++++ + fs/bcachefs/disk_groups.h | 106 + + fs/bcachefs/ec.c | 1966 ++++++++++++++ + fs/bcachefs/ec.h | 260 ++ + fs/bcachefs/ec_types.h | 41 + + fs/bcachefs/errcode.c | 68 + + fs/bcachefs/errcode.h | 264 ++ + fs/bcachefs/error.c | 293 +++ + fs/bcachefs/error.h | 206 ++ + fs/bcachefs/extent_update.c | 173 ++ + fs/bcachefs/extent_update.h | 12 + + fs/bcachefs/extents.c | 1403 ++++++++++ + fs/bcachefs/extents.h | 757 ++++++ + fs/bcachefs/extents_types.h | 40 + + fs/bcachefs/eytzinger.h | 281 ++ + fs/bcachefs/fifo.h | 127 + + fs/bcachefs/fs-common.c | 501 ++++ + fs/bcachefs/fs-common.h | 43 + + fs/bcachefs/fs-io-buffered.c | 1093 ++++++++ + fs/bcachefs/fs-io-buffered.h | 27 + + fs/bcachefs/fs-io-direct.c | 679 +++++ + fs/bcachefs/fs-io-direct.h | 16 + + fs/bcachefs/fs-io-pagecache.c | 791 ++++++ + fs/bcachefs/fs-io-pagecache.h | 176 ++ + fs/bcachefs/fs-io.c | 1072 ++++++++ + fs/bcachefs/fs-io.h | 184 ++ + fs/bcachefs/fs-ioctl.c | 562 ++++ + fs/bcachefs/fs-ioctl.h | 81 + + fs/bcachefs/fs.c | 1982 ++++++++++++++ + fs/bcachefs/fs.h | 209 ++ + fs/bcachefs/fsck.c | 2457 +++++++++++++++++ + fs/bcachefs/fsck.h | 14 + + fs/bcachefs/inode.c | 1129 ++++++++ + fs/bcachefs/inode.h | 207 ++ + fs/bcachefs/io_misc.c | 497 ++++ + fs/bcachefs/io_misc.h | 34 + + fs/bcachefs/io_read.c | 1208 +++++++++ + fs/bcachefs/io_read.h | 158 ++ + fs/bcachefs/io_write.c | 1669 ++++++++++++ + fs/bcachefs/io_write.h | 110 + + fs/bcachefs/io_write_types.h | 96 + + fs/bcachefs/journal.c | 1449 ++++++++++ + fs/bcachefs/journal.h | 548 ++++ + fs/bcachefs/journal_io.c | 1894 +++++++++++++ + fs/bcachefs/journal_io.h | 65 + + fs/bcachefs/journal_reclaim.c | 876 ++++++ + fs/bcachefs/journal_reclaim.h | 87 + + fs/bcachefs/journal_sb.c | 219 ++ + fs/bcachefs/journal_sb.h | 24 + + fs/bcachefs/journal_seq_blacklist.c | 320 +++ + fs/bcachefs/journal_seq_blacklist.h | 22 + + fs/bcachefs/journal_types.h | 345 +++ + fs/bcachefs/keylist.c | 52 + + fs/bcachefs/keylist.h | 74 + + fs/bcachefs/keylist_types.h | 16 + + fs/bcachefs/logged_ops.c | 110 + + fs/bcachefs/logged_ops.h | 20 + + fs/bcachefs/lru.c | 162 ++ + fs/bcachefs/lru.h | 69 + + fs/bcachefs/mean_and_variance.c | 159 ++ + fs/bcachefs/mean_and_variance.h | 198 ++ + fs/bcachefs/mean_and_variance_test.c | 240 ++ + fs/bcachefs/migrate.c | 179 ++ + fs/bcachefs/migrate.h | 7 + + fs/bcachefs/move.c | 1159 ++++++++ + fs/bcachefs/move.h | 96 + + fs/bcachefs/move_types.h | 36 + + fs/bcachefs/movinggc.c | 414 +++ + fs/bcachefs/movinggc.h | 12 + + fs/bcachefs/nocow_locking.c | 123 + + fs/bcachefs/nocow_locking.h | 49 + + fs/bcachefs/nocow_locking_types.h | 20 + + fs/bcachefs/opts.c | 599 +++++ + fs/bcachefs/opts.h | 563 ++++ + fs/bcachefs/printbuf.c | 425 +++ + fs/bcachefs/printbuf.h | 284 ++ + fs/bcachefs/quota.c | 978 +++++++ + fs/bcachefs/quota.h | 74 + + fs/bcachefs/quota_types.h | 43 + + fs/bcachefs/rebalance.c | 366 +++ + fs/bcachefs/rebalance.h | 28 + + fs/bcachefs/rebalance_types.h | 26 + + fs/bcachefs/recovery.c | 1050 ++++++++ + fs/bcachefs/recovery.h | 33 + + fs/bcachefs/recovery_types.h | 49 + + fs/bcachefs/reflink.c | 405 +++ + fs/bcachefs/reflink.h | 81 + + fs/bcachefs/replicas.c | 1059 ++++++++ + fs/bcachefs/replicas.h | 91 + + fs/bcachefs/replicas_types.h | 27 + + fs/bcachefs/sb-clean.c | 395 +++ + fs/bcachefs/sb-clean.h | 16 + + fs/bcachefs/sb-members.c | 173 ++ + fs/bcachefs/sb-members.h | 176 ++ + fs/bcachefs/seqmutex.h | 48 + + fs/bcachefs/siphash.c | 173 ++ + fs/bcachefs/siphash.h | 87 + + fs/bcachefs/six.c | 913 +++++++ + fs/bcachefs/six.h | 388 +++ + fs/bcachefs/snapshot.c | 1669 ++++++++++++ + fs/bcachefs/snapshot.h | 272 ++ + fs/bcachefs/str_hash.h | 370 +++ + fs/bcachefs/subvolume.c | 450 ++++ + fs/bcachefs/subvolume.h | 35 + + fs/bcachefs/subvolume_types.h | 31 + + fs/bcachefs/super-io.c | 1264 +++++++++ + fs/bcachefs/super-io.h | 133 + + fs/bcachefs/super.c | 2011 ++++++++++++++ + fs/bcachefs/super.h | 52 + + fs/bcachefs/super_types.h | 52 + + fs/bcachefs/sysfs.c | 1031 ++++++++ + fs/bcachefs/sysfs.h | 48 + + fs/bcachefs/tests.c | 942 +++++++ + fs/bcachefs/tests.h | 15 + + fs/bcachefs/trace.c | 16 + + fs/bcachefs/trace.h | 1284 +++++++++ + fs/bcachefs/two_state_shared_lock.c | 8 + + fs/bcachefs/two_state_shared_lock.h | 59 + + fs/bcachefs/util.c | 1141 ++++++++ + fs/bcachefs/util.h | 852 ++++++ + fs/bcachefs/varint.c | 129 + + fs/bcachefs/varint.h | 11 + + fs/bcachefs/vstructs.h | 63 + + fs/bcachefs/xattr.c | 651 +++++ + fs/bcachefs/xattr.h | 50 + + fs/dcache.c | 12 +- + {drivers/md/bcache => include/linux}/closure.h | 46 +- + include/linux/dcache.h | 1 + + include/linux/exportfs.h | 6 + + include/linux/generic-radix-tree.h | 68 +- + include/linux/sched.h | 1 + + include/linux/string_helpers.h | 4 +- + init/init_task.c | 1 + + kernel/locking/mutex.c | 3 + + kernel/locking/osq_lock.c | 2 + + kernel/stacktrace.c | 2 + + lib/Kconfig | 3 + + lib/Kconfig.debug | 9 + + lib/Makefile | 2 + + {drivers/md/bcache => lib}/closure.c | 36 +- + lib/errname.c | 1 + + lib/generic-radix-tree.c | 76 +- + lib/string_helpers.c | 10 +- + tools/objtool/noreturns.h | 2 + + 225 files changed, 94766 insertions(+), 56 deletions(-) + create mode 100644 fs/bcachefs/Kconfig + create mode 100644 fs/bcachefs/Makefile + create mode 100644 fs/bcachefs/acl.c + create mode 100644 fs/bcachefs/acl.h + create mode 100644 fs/bcachefs/alloc_background.c + create mode 100644 fs/bcachefs/alloc_background.h + create mode 100644 fs/bcachefs/alloc_foreground.c + create mode 100644 fs/bcachefs/alloc_foreground.h + create mode 100644 fs/bcachefs/alloc_types.h + create mode 100644 fs/bcachefs/backpointers.c + create mode 100644 fs/bcachefs/backpointers.h + create mode 100644 fs/bcachefs/bbpos.h + create mode 100644 fs/bcachefs/bcachefs.h + create mode 100644 fs/bcachefs/bcachefs_format.h + create mode 100644 fs/bcachefs/bcachefs_ioctl.h + create mode 100644 fs/bcachefs/bkey.c + create mode 100644 fs/bcachefs/bkey.h + create mode 100644 fs/bcachefs/bkey_buf.h + create mode 100644 fs/bcachefs/bkey_cmp.h + create mode 100644 fs/bcachefs/bkey_methods.c + create mode 100644 fs/bcachefs/bkey_methods.h + create mode 100644 fs/bcachefs/bkey_sort.c + create mode 100644 fs/bcachefs/bkey_sort.h + create mode 100644 fs/bcachefs/bset.c + create mode 100644 fs/bcachefs/bset.h + create mode 100644 fs/bcachefs/btree_cache.c + create mode 100644 fs/bcachefs/btree_cache.h + create mode 100644 fs/bcachefs/btree_gc.c + create mode 100644 fs/bcachefs/btree_gc.h + create mode 100644 fs/bcachefs/btree_io.c + create mode 100644 fs/bcachefs/btree_io.h + create mode 100644 fs/bcachefs/btree_iter.c + create mode 100644 fs/bcachefs/btree_iter.h + create mode 100644 fs/bcachefs/btree_journal_iter.c + create mode 100644 fs/bcachefs/btree_journal_iter.h + create mode 100644 fs/bcachefs/btree_key_cache.c + create mode 100644 fs/bcachefs/btree_key_cache.h + create mode 100644 fs/bcachefs/btree_locking.c + create mode 100644 fs/bcachefs/btree_locking.h + create mode 100644 fs/bcachefs/btree_trans_commit.c + create mode 100644 fs/bcachefs/btree_types.h + create mode 100644 fs/bcachefs/btree_update.c + create mode 100644 fs/bcachefs/btree_update.h + create mode 100644 fs/bcachefs/btree_update_interior.c + create mode 100644 fs/bcachefs/btree_update_interior.h + create mode 100644 fs/bcachefs/btree_write_buffer.c + create mode 100644 fs/bcachefs/btree_write_buffer.h + create mode 100644 fs/bcachefs/btree_write_buffer_types.h + create mode 100644 fs/bcachefs/buckets.c + create mode 100644 fs/bcachefs/buckets.h + create mode 100644 fs/bcachefs/buckets_types.h + create mode 100644 fs/bcachefs/buckets_waiting_for_journal.c + create mode 100644 fs/bcachefs/buckets_waiting_for_journal.h + create mode 100644 fs/bcachefs/buckets_waiting_for_journal_types.h + create mode 100644 fs/bcachefs/chardev.c + create mode 100644 fs/bcachefs/chardev.h + create mode 100644 fs/bcachefs/checksum.c + create mode 100644 fs/bcachefs/checksum.h + create mode 100644 fs/bcachefs/clock.c + create mode 100644 fs/bcachefs/clock.h + create mode 100644 fs/bcachefs/clock_types.h + create mode 100644 fs/bcachefs/compress.c + create mode 100644 fs/bcachefs/compress.h + create mode 100644 fs/bcachefs/counters.c + create mode 100644 fs/bcachefs/counters.h + create mode 100644 fs/bcachefs/darray.h + create mode 100644 fs/bcachefs/data_update.c + create mode 100644 fs/bcachefs/data_update.h + create mode 100644 fs/bcachefs/debug.c + create mode 100644 fs/bcachefs/debug.h + create mode 100644 fs/bcachefs/dirent.c + create mode 100644 fs/bcachefs/dirent.h + create mode 100644 fs/bcachefs/disk_groups.c + create mode 100644 fs/bcachefs/disk_groups.h + create mode 100644 fs/bcachefs/ec.c + create mode 100644 fs/bcachefs/ec.h + create mode 100644 fs/bcachefs/ec_types.h + create mode 100644 fs/bcachefs/errcode.c + create mode 100644 fs/bcachefs/errcode.h + create mode 100644 fs/bcachefs/error.c + create mode 100644 fs/bcachefs/error.h + create mode 100644 fs/bcachefs/extent_update.c + create mode 100644 fs/bcachefs/extent_update.h + create mode 100644 fs/bcachefs/extents.c + create mode 100644 fs/bcachefs/extents.h + create mode 100644 fs/bcachefs/extents_types.h + create mode 100644 fs/bcachefs/eytzinger.h + create mode 100644 fs/bcachefs/fifo.h + create mode 100644 fs/bcachefs/fs-common.c + create mode 100644 fs/bcachefs/fs-common.h + create mode 100644 fs/bcachefs/fs-io-buffered.c + create mode 100644 fs/bcachefs/fs-io-buffered.h + create mode 100644 fs/bcachefs/fs-io-direct.c + create mode 100644 fs/bcachefs/fs-io-direct.h + create mode 100644 fs/bcachefs/fs-io-pagecache.c + create mode 100644 fs/bcachefs/fs-io-pagecache.h + create mode 100644 fs/bcachefs/fs-io.c + create mode 100644 fs/bcachefs/fs-io.h + create mode 100644 fs/bcachefs/fs-ioctl.c + create mode 100644 fs/bcachefs/fs-ioctl.h + create mode 100644 fs/bcachefs/fs.c + create mode 100644 fs/bcachefs/fs.h + create mode 100644 fs/bcachefs/fsck.c + create mode 100644 fs/bcachefs/fsck.h + create mode 100644 fs/bcachefs/inode.c + create mode 100644 fs/bcachefs/inode.h + create mode 100644 fs/bcachefs/io_misc.c + create mode 100644 fs/bcachefs/io_misc.h + create mode 100644 fs/bcachefs/io_read.c + create mode 100644 fs/bcachefs/io_read.h + create mode 100644 fs/bcachefs/io_write.c + create mode 100644 fs/bcachefs/io_write.h + create mode 100644 fs/bcachefs/io_write_types.h + create mode 100644 fs/bcachefs/journal.c + create mode 100644 fs/bcachefs/journal.h + create mode 100644 fs/bcachefs/journal_io.c + create mode 100644 fs/bcachefs/journal_io.h + create mode 100644 fs/bcachefs/journal_reclaim.c + create mode 100644 fs/bcachefs/journal_reclaim.h + create mode 100644 fs/bcachefs/journal_sb.c + create mode 100644 fs/bcachefs/journal_sb.h + create mode 100644 fs/bcachefs/journal_seq_blacklist.c + create mode 100644 fs/bcachefs/journal_seq_blacklist.h + create mode 100644 fs/bcachefs/journal_types.h + create mode 100644 fs/bcachefs/keylist.c + create mode 100644 fs/bcachefs/keylist.h + create mode 100644 fs/bcachefs/keylist_types.h + create mode 100644 fs/bcachefs/logged_ops.c + create mode 100644 fs/bcachefs/logged_ops.h + create mode 100644 fs/bcachefs/lru.c + create mode 100644 fs/bcachefs/lru.h + create mode 100644 fs/bcachefs/mean_and_variance.c + create mode 100644 fs/bcachefs/mean_and_variance.h + create mode 100644 fs/bcachefs/mean_and_variance_test.c + create mode 100644 fs/bcachefs/migrate.c + create mode 100644 fs/bcachefs/migrate.h + create mode 100644 fs/bcachefs/move.c + create mode 100644 fs/bcachefs/move.h + create mode 100644 fs/bcachefs/move_types.h + create mode 100644 fs/bcachefs/movinggc.c + create mode 100644 fs/bcachefs/movinggc.h + create mode 100644 fs/bcachefs/nocow_locking.c + create mode 100644 fs/bcachefs/nocow_locking.h + create mode 100644 fs/bcachefs/nocow_locking_types.h + create mode 100644 fs/bcachefs/opts.c + create mode 100644 fs/bcachefs/opts.h + create mode 100644 fs/bcachefs/printbuf.c + create mode 100644 fs/bcachefs/printbuf.h + create mode 100644 fs/bcachefs/quota.c + create mode 100644 fs/bcachefs/quota.h + create mode 100644 fs/bcachefs/quota_types.h + create mode 100644 fs/bcachefs/rebalance.c + create mode 100644 fs/bcachefs/rebalance.h + create mode 100644 fs/bcachefs/rebalance_types.h + create mode 100644 fs/bcachefs/recovery.c + create mode 100644 fs/bcachefs/recovery.h + create mode 100644 fs/bcachefs/recovery_types.h + create mode 100644 fs/bcachefs/reflink.c + create mode 100644 fs/bcachefs/reflink.h + create mode 100644 fs/bcachefs/replicas.c + create mode 100644 fs/bcachefs/replicas.h + create mode 100644 fs/bcachefs/replicas_types.h + create mode 100644 fs/bcachefs/sb-clean.c + create mode 100644 fs/bcachefs/sb-clean.h + create mode 100644 fs/bcachefs/sb-members.c + create mode 100644 fs/bcachefs/sb-members.h + create mode 100644 fs/bcachefs/seqmutex.h + create mode 100644 fs/bcachefs/siphash.c + create mode 100644 fs/bcachefs/siphash.h + create mode 100644 fs/bcachefs/six.c + create mode 100644 fs/bcachefs/six.h + create mode 100644 fs/bcachefs/snapshot.c + create mode 100644 fs/bcachefs/snapshot.h + create mode 100644 fs/bcachefs/str_hash.h + create mode 100644 fs/bcachefs/subvolume.c + create mode 100644 fs/bcachefs/subvolume.h + create mode 100644 fs/bcachefs/subvolume_types.h + create mode 100644 fs/bcachefs/super-io.c + create mode 100644 fs/bcachefs/super-io.h + create mode 100644 fs/bcachefs/super.c + create mode 100644 fs/bcachefs/super.h + create mode 100644 fs/bcachefs/super_types.h + create mode 100644 fs/bcachefs/sysfs.c + create mode 100644 fs/bcachefs/sysfs.h + create mode 100644 fs/bcachefs/tests.c + create mode 100644 fs/bcachefs/tests.h + create mode 100644 fs/bcachefs/trace.c + create mode 100644 fs/bcachefs/trace.h + create mode 100644 fs/bcachefs/two_state_shared_lock.c + create mode 100644 fs/bcachefs/two_state_shared_lock.h + create mode 100644 fs/bcachefs/util.c + create mode 100644 fs/bcachefs/util.h + create mode 100644 fs/bcachefs/varint.c + create mode 100644 fs/bcachefs/varint.h + create mode 100644 fs/bcachefs/vstructs.h + create mode 100644 fs/bcachefs/xattr.c + create mode 100644 fs/bcachefs/xattr.h + rename {drivers/md/bcache => include/linux}/closure.h (93%) + rename {drivers/md/bcache => lib}/closure.c (88%) +$ git am -3 ../patches/0001-bcachefs-convert-to-dynamically-allocated-shrinkers.patch +Applying: bcachefs: convert to dynamically allocated shrinkers +$ git reset HEAD^ +Unstaged changes after reset: +M fs/bcachefs/btree_cache.c +M fs/bcachefs/btree_key_cache.c +M fs/bcachefs/btree_types.h +M fs/bcachefs/fs.c +M fs/bcachefs/sysfs.c +$ git add -A . +$ git commit -v -a --amend +[master 332bd57a6cd6] Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git + Date: Mon Oct 16 09:43:26 2023 +1100 +Merging pidfd/for-next (a901a3568fd2 Merge tag 'iomap-6.5-merge-1' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brauner/linux.git pidfd/for-next +Already up to date. +Merging fscrypt/for-next (3e7807d5a7d7 fscrypt: rename fscrypt_info => fscrypt_inode_info) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Auto-merging fs/ceph/crypto.c +Auto-merging fs/f2fs/super.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + Documentation/filesystems/fscrypt.rst | 105 ++++++++++++++++------ + fs/ceph/crypto.c | 1 + + fs/crypto/bio.c | 39 ++++---- + fs/crypto/crypto.c | 163 +++++++++++++++++++--------------- + fs/crypto/fname.c | 6 +- + fs/crypto/fscrypt_private.h | 98 ++++++++++++++------ + fs/crypto/hooks.c | 2 +- + fs/crypto/inline_crypt.c | 32 +++---- + fs/crypto/keyring.c | 4 +- + fs/crypto/keysetup.c | 49 +++++----- + fs/crypto/keysetup_v1.c | 20 +++-- + fs/crypto/policy.c | 83 +++++++++++------ + fs/ext4/crypto.c | 13 +-- + fs/f2fs/super.c | 13 +-- + fs/ubifs/crypto.c | 3 +- + include/linux/fs.h | 4 +- + include/linux/fscrypt.h | 82 ++++++++++------- + include/uapi/linux/fscrypt.h | 3 +- + 18 files changed, 445 insertions(+), 275 deletions(-) +Merging afs/afs-next (0a278bc196e7 afs: Automatically generate trace tag enums) +$ git merge -m Merge branch 'afs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dhowells/linux-fs.git afs/afs-next +Merge made by the 'ort' strategy. + include/trace/events/afs.h | 475 ++++++++++++++------------------------------- + 1 file changed, 148 insertions(+), 327 deletions(-) +Merging btrfs/for-next (c6e8f898f56f btrfs: open code timespec64 in struct btrfs_inode) +$ 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/super.c +Auto-merging fs/btrfs/volumes.c +Merge made by the 'ort' strategy. + fs/btrfs/Kconfig | 21 - + fs/btrfs/Makefile | 3 +- + fs/btrfs/accessors.h | 16 + + fs/btrfs/async-thread.c | 12 +- + fs/btrfs/async-thread.h | 6 +- + fs/btrfs/backref.c | 5 +- + fs/btrfs/backref.h | 10 +- + fs/btrfs/bio.c | 47 +- + fs/btrfs/block-group.c | 178 +-- + fs/btrfs/block-rsv.c | 24 +- + fs/btrfs/btrfs_inode.h | 80 +- + fs/btrfs/check-integrity.c | 2871 ---------------------------------- + fs/btrfs/check-integrity.h | 20 - + fs/btrfs/compression.c | 6 +- + fs/btrfs/ctree.c | 340 ++-- + fs/btrfs/ctree.h | 142 +- + fs/btrfs/defrag.c | 152 +- + fs/btrfs/defrag.h | 2 +- + fs/btrfs/delalloc-space.c | 6 +- + fs/btrfs/delayed-inode.c | 27 +- + fs/btrfs/delayed-inode.h | 1 - + fs/btrfs/delayed-ref.c | 199 ++- + fs/btrfs/delayed-ref.h | 70 +- + fs/btrfs/dev-replace.c | 3 +- + fs/btrfs/dir-item.c | 8 +- + fs/btrfs/dir-item.h | 9 + + fs/btrfs/disk-io.c | 142 +- + fs/btrfs/disk-io.h | 3 +- + fs/btrfs/extent-io-tree.c | 272 ++-- + fs/btrfs/extent-io-tree.h | 7 +- + fs/btrfs/extent-tree.c | 538 ++++--- + fs/btrfs/extent-tree.h | 15 +- + fs/btrfs/extent_io.c | 39 +- + fs/btrfs/extent_io.h | 4 +- + fs/btrfs/file-item.c | 17 +- + fs/btrfs/file.c | 61 +- + fs/btrfs/free-space-cache.c | 28 +- + fs/btrfs/free-space-tree.c | 17 +- + fs/btrfs/fs.h | 69 +- + fs/btrfs/inode-item.c | 21 +- + fs/btrfs/inode-item.h | 8 + + fs/btrfs/inode.c | 182 +-- + fs/btrfs/ioctl.c | 23 +- + fs/btrfs/locking.c | 20 +- + fs/btrfs/messages.c | 32 +- + fs/btrfs/messages.h | 14 +- + fs/btrfs/ordered-data.c | 127 +- + fs/btrfs/ordered-data.h | 17 +- + fs/btrfs/print-tree.c | 35 + + fs/btrfs/props.c | 1 + + fs/btrfs/qgroup.c | 872 +++++++---- + fs/btrfs/qgroup.h | 149 +- + fs/btrfs/raid-stripe-tree.c | 274 ++++ + fs/btrfs/raid-stripe-tree.h | 50 + + fs/btrfs/ref-verify.c | 9 +- + fs/btrfs/reflink.c | 3 +- + fs/btrfs/relocation.c | 208 ++- + fs/btrfs/relocation.h | 9 +- + fs/btrfs/root-tree.c | 12 +- + fs/btrfs/root-tree.h | 8 +- + fs/btrfs/scrub.c | 78 +- + fs/btrfs/send.c | 6 +- + fs/btrfs/space-info.c | 64 +- + fs/btrfs/space-info.h | 3 +- + fs/btrfs/super.c | 87 +- + fs/btrfs/sysfs.c | 53 +- + fs/btrfs/tests/extent-buffer-tests.c | 6 +- + fs/btrfs/tests/inode-tests.c | 12 +- + fs/btrfs/transaction.c | 231 +-- + fs/btrfs/transaction.h | 20 +- + fs/btrfs/tree-checker.c | 48 +- + fs/btrfs/tree-log.c | 81 +- + fs/btrfs/ulist.c | 3 +- + fs/btrfs/uuid-tree.c | 6 +- + fs/btrfs/verity.c | 4 +- + fs/btrfs/volumes.c | 417 +++-- + fs/btrfs/volumes.h | 39 +- + fs/btrfs/xattr.c | 12 +- + fs/btrfs/zoned.c | 452 ++++-- + fs/btrfs/zstd.c | 11 +- + include/trace/events/btrfs.h | 83 +- + include/uapi/linux/btrfs.h | 3 + + include/uapi/linux/btrfs_tree.h | 60 +- + 83 files changed, 4030 insertions(+), 5293 deletions(-) + delete mode 100644 fs/btrfs/check-integrity.c + delete mode 100644 fs/btrfs/check-integrity.h + create mode 100644 fs/btrfs/raid-stripe-tree.c + create mode 100644 fs/btrfs/raid-stripe-tree.h +Merging ceph/master (07bb00ef00ac ceph: fix type promotion bug on 32bit systems) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Already up to date. +Merging cifs/for-next (bde45b6aa521 Add definition for new smb3.1.1 command type) +$ git merge -m Merge branch 'for-next' of git://git.samba.org/sfrench/cifs-2.6.git cifs/for-next +Merge made by the 'ort' strategy. + fs/smb/client/ntlmssp.h | 4 ++-- + fs/smb/client/sess.c | 12 +++++++++--- + fs/smb/common/smb2pdu.h | 24 +++++++++++++++++++++++- + 3 files changed, 34 insertions(+), 6 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 (a3d78fe3e1ae fs: ecryptfs: comment typo fix) +$ 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 +Auto-merging fs/ecryptfs/read_write.c +Merge made by the 'ort' strategy. + fs/ecryptfs/crypto.c | 2 +- + fs/ecryptfs/keystore.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging erofs/dev (78a50b6a4166 erofs: fix inode metadata space layout description in documentation) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Merge made by the 'ort' strategy. + Documentation/filesystems/erofs.rst | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging exfat/dev (b3a62a988600 exfat: support create zero-size directory) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/linkinjeon/exfat.git exfat/dev +Merge made by the 'ort' strategy. + fs/exfat/dir.c | 12 +++---- + fs/exfat/exfat_fs.h | 8 +++++ + fs/exfat/file.c | 93 +++++++++++++++++++++++++++++++++++++++++++++++++++++ + fs/exfat/namei.c | 36 +++++++++++++++------ + fs/exfat/super.c | 7 ++++ + 5 files changed, 141 insertions(+), 15 deletions(-) +Merging ext3/for_next (21cdd81765e7 Pull fsnotify cleanup.) +$ 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/quota/dquot.c +Merge made by the 'ort' strategy. + fs/notify/fanotify/fanotify.h | 4 ++-- + fs/quota/dquot.c | 14 ++++++++++++++ + fs/udf/ecma_167.h | 2 +- + fs/udf/udf_sb.h | 2 +- + 4 files changed, 18 insertions(+), 4 deletions(-) +Merging ext4/dev (a37d4c46392e ext4: fix racy may inline data check in dio write) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/extents_status.c +Auto-merging fs/ext4/super.c +Merge made by the 'ort' strategy. + fs/ext4/acl.h | 5 + + fs/ext4/balloc.c | 16 +- + fs/ext4/ext4.h | 8 +- + fs/ext4/extents.c | 14 +- + fs/ext4/extents_status.c | 127 ++++++++--- + fs/ext4/fast_commit.c | 8 +- + fs/ext4/file.c | 16 +- + fs/ext4/inode.c | 14 +- + fs/ext4/mballoc-test.c | 349 ++++++++++++++++++++++++++++ + fs/ext4/mballoc.c | 581 +++++++++++++++++------------------------------ + fs/ext4/namei.c | 3 +- + fs/ext4/resize.c | 94 +++----- + fs/ext4/super.c | 17 +- + fs/jbd2/recovery.c | 13 +- + 14 files changed, 763 insertions(+), 502 deletions(-) + create mode 100644 fs/ext4/mballoc-test.c +Merging f2fs/dev (3e729e50d01e f2fs: preload extent_cache for POSIX_FADV_WILLNEED) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Auto-merging fs/f2fs/super.c +Merge made by the 'ort' strategy. + fs/f2fs/compress.c | 61 ++++++++++++++++++++++++++++---------------------- + fs/f2fs/data.c | 33 ++++++++++++++++++++++----- + fs/f2fs/extent_cache.c | 53 +++++++++++++++++-------------------------- + fs/f2fs/file.c | 12 ++++++++++ + fs/f2fs/super.c | 35 ++++++++++++++++++++++++++++- + 5 files changed, 128 insertions(+), 66 deletions(-) +Merging fsverity/for-next (919dc320956e fsverity: skip PKCS#7 parser when keyring is empty) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fsverity/linux.git fsverity/for-next +Already up to date. +Merging fuse/for-next (ae3024a4c499 docs/fuse-io: Document the usage of DIRECT_IO_ALLOW_MMAP) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Merge made by the 'ort' strategy. + Documentation/filesystems/fuse-io.rst | 3 ++- + fs/fuse/file.c | 6 +++--- + fs/fuse/fuse_i.h | 4 ++-- + fs/fuse/inode.c | 6 +++--- + include/uapi/linux/fuse.h | 7 +++---- + 5 files changed, 13 insertions(+), 13 deletions(-) +Merging gfs2/for-next (18e0c7817d45 gfs2: No longer use 'extern' in function declarations) +$ 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/quota.c +Auto-merging fs/gfs2/quota.h +Merge made by the 'ort' strategy. + fs/gfs2/acl.h | 8 ++-- + fs/gfs2/aops.c | 2 +- + fs/gfs2/aops.h | 6 +-- + fs/gfs2/bmap.c | 5 +-- + fs/gfs2/bmap.h | 38 +++++++++--------- + fs/gfs2/dir.h | 38 +++++++++--------- + fs/gfs2/file.c | 90 +++++++++++++++++++++++------------------- + fs/gfs2/glock.h | 113 +++++++++++++++++++++++------------------------------ + fs/gfs2/glops.c | 13 ------ + fs/gfs2/glops.h | 4 +- + fs/gfs2/incore.h | 2 +- + fs/gfs2/inode.c | 13 ++++-- + fs/gfs2/inode.h | 48 +++++++++++------------ + fs/gfs2/log.h | 46 +++++++++++----------- + fs/gfs2/lops.h | 22 ++++++----- + fs/gfs2/meta_io.h | 20 +++++----- + fs/gfs2/quota.c | 11 ++++++ + fs/gfs2/quota.h | 35 +++++++++-------- + fs/gfs2/recovery.h | 18 ++++----- + fs/gfs2/rgrp.h | 81 +++++++++++++++++++------------------- + fs/gfs2/super.c | 18 ++------- + fs/gfs2/super.h | 50 ++++++++++++------------ + fs/gfs2/trans.h | 22 +++++------ + fs/gfs2/util.h | 8 ++-- + fs/gfs2/xattr.h | 12 +++--- + 25 files changed, 358 insertions(+), 365 deletions(-) +Merging jfs/jfs-next (a779ed754e52 jfs: define xtree root and page independently) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Merge made by the 'ort' strategy. + fs/jfs/jfs_dinode.h | 2 +- + fs/jfs/jfs_dmap.c | 23 ++++++++++++++++++----- + fs/jfs/jfs_imap.c | 11 +++++++---- + fs/jfs/jfs_incore.h | 2 +- + fs/jfs/jfs_txnmgr.c | 4 ++-- + fs/jfs/jfs_xtree.c | 4 ++-- + fs/jfs/jfs_xtree.h | 37 +++++++++++++++++++++++-------------- + 7 files changed, 54 insertions(+), 29 deletions(-) +Merging ksmbd/ksmbd-for-next (b0e493f09ffc ksmbd: fix kernel-doc comment of ksmbd_vfs_setxattr()) +$ git merge -m Merge branch 'ksmbd-for-next' of https://github.com/smfrench/smb3-kernel.git ksmbd/ksmbd-for-next +Merge made by the 'ort' strategy. + fs/smb/server/ksmbd_work.c | 43 ++++++++++++++++++++-------------------- + fs/smb/server/mgmt/user_config.h | 1 - + fs/smb/server/vfs.c | 2 +- + 3 files changed, 23 insertions(+), 23 deletions(-) +Merging nfs/linux-next (9a3dad63edbe Merge tag '6.6-rc5-ksmbd-server-fixes' of git://git.samba.org/ksmbd) +$ 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 (6a6d4644ce93 NFS: Fix potential oops in nfs_inode_remove_request()) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Merge made by the 'ort' strategy. + fs/nfs/nfs42proc.c | 3 ++- + fs/nfs/write.c | 4 +++- + 2 files changed, 5 insertions(+), 2 deletions(-) +Merging nfsd/nfsd-next (2ce5c9d08168 svcrdma: Fix tracepoint printk format) +$ 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/locks.c +Auto-merging fs/nfsd/filecache.c +Auto-merging fs/nfsd/nfs4state.c +Auto-merging include/linux/exportfs.h +Auto-merging lib/Kconfig +Auto-merging lib/Makefile +Merge made by the 'ort' strategy. + Documentation/filesystems/nfs/exporting.rst | 7 + + Documentation/netlink/specs/nfsd.yaml | 89 + + fs/lockd/svc.c | 7 +- + fs/lockd/svclock.c | 43 +- + fs/locks.c | 12 +- + fs/nfs/callback.c | 46 +- + fs/nfsd/Makefile | 3 +- + fs/nfsd/blocklayoutxdr.c | 6 +- + fs/nfsd/blocklayoutxdr.h | 4 +- + fs/nfsd/export.c | 32 +- + fs/nfsd/export.h | 4 +- + fs/nfsd/filecache.c | 27 +- + fs/nfsd/flexfilelayoutxdr.c | 6 +- + fs/nfsd/flexfilelayoutxdr.h | 4 +- + fs/nfsd/netlink.c | 32 + + fs/nfsd/netlink.h | 22 + + fs/nfsd/nfs3proc.c | 5 +- + fs/nfsd/nfs4callback.c | 97 +- + fs/nfsd/nfs4layouts.c | 6 +- + fs/nfsd/nfs4proc.c | 32 +- + fs/nfsd/nfs4state.c | 156 +- + fs/nfsd/nfs4xdr.c | 2700 +++++++++++++++------------ + fs/nfsd/nfsctl.c | 203 ++ + fs/nfsd/nfsd.h | 17 + + fs/nfsd/nfsfh.c | 2 +- + fs/nfsd/nfsfh.h | 3 +- + fs/nfsd/nfssvc.c | 42 +- + fs/nfsd/pnfs.h | 6 +- + fs/nfsd/state.h | 27 +- + fs/nfsd/stats.c | 4 +- + fs/nfsd/stats.h | 18 +- + fs/nfsd/trace.h | 87 + + fs/nfsd/vfs.c | 61 +- + fs/nfsd/vfs.h | 4 +- + fs/nfsd/xdr4.h | 154 +- + fs/nfsd/xdr4cb.h | 18 + + include/linux/exportfs.h | 14 + + include/linux/iversion.h | 2 +- + include/linux/llist.h | 46 + + include/linux/lockd/lockd.h | 2 +- + include/linux/lwq.h | 124 ++ + include/linux/nfs4.h | 262 ++- + include/linux/sunrpc/svc.h | 45 +- + include/linux/sunrpc/svc_xprt.h | 2 +- + include/linux/sunrpc/xprt.h | 3 +- + include/trace/events/rpcrdma.h | 10 +- + include/trace/events/sunrpc.h | 1 - + include/uapi/linux/nfsd_netlink.h | 39 + + lib/Kconfig | 5 + + lib/Makefile | 2 +- + lib/llist.c | 28 + + lib/lwq.c | 158 ++ + net/sunrpc/backchannel_rqst.c | 13 +- + net/sunrpc/svc.c | 155 +- + net/sunrpc/svc_xprt.c | 238 ++- + net/sunrpc/xprtrdma/backchannel.c | 6 +- + net/sunrpc/xprtrdma/svc_rdma_recvfrom.c | 3 +- + tools/net/ynl/Makefile.deps | 1 + + tools/net/ynl/generated/Makefile | 2 +- + tools/net/ynl/generated/nfsd-user.c | 95 + + tools/net/ynl/generated/nfsd-user.h | 33 + + 61 files changed, 3531 insertions(+), 1744 deletions(-) + create mode 100644 Documentation/netlink/specs/nfsd.yaml + create mode 100644 fs/nfsd/netlink.c + create mode 100644 fs/nfsd/netlink.h + create mode 100644 include/linux/lwq.h + create mode 100644 include/uapi/linux/nfsd_netlink.h + create mode 100644 lib/lwq.c + create mode 100644 tools/net/ynl/generated/nfsd-user.c + create mode 100644 tools/net/ynl/generated/nfsd-user.h +Merging ntfs3/master (e4494770a5ca fs/ntfs3: Avoid possible memory leak) +$ git merge -m Merge branch 'master' of https://github.com/Paragon-Software-Group/linux-ntfs3.git ntfs3/master +Auto-merging fs/ntfs3/super.c +Merge made by the 'ort' strategy. + fs/ntfs3/attrib.c | 12 +++--- + fs/ntfs3/attrlist.c | 15 +++++++- + fs/ntfs3/bitmap.c | 4 +- + fs/ntfs3/dir.c | 6 ++- + fs/ntfs3/file.c | 4 +- + fs/ntfs3/frecord.c | 8 +++- + fs/ntfs3/fslog.c | 6 ++- + fs/ntfs3/fsntfs.c | 19 ++++------ + fs/ntfs3/index.c | 3 ++ + fs/ntfs3/inode.c | 5 ++- + fs/ntfs3/namei.c | 6 +-- + fs/ntfs3/ntfs.h | 2 +- + fs/ntfs3/ntfs_fs.h | 4 +- + fs/ntfs3/record.c | 74 +++++++++++++++++++++++++++++-------- + fs/ntfs3/super.c | 104 +++++++++++++++++++++++++++++++++++++--------------- + fs/ntfs3/xattr.c | 7 +++- + 16 files changed, 197 insertions(+), 82 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 (fbaf916f84f4 ovl: Add documentation on nesting of overlayfs mounts) +$ git merge -m Merge branch 'overlayfs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/overlayfs/vfs.git overlayfs/overlayfs-next +Auto-merging Documentation/filesystems/overlayfs.rst +Auto-merging fs/btrfs/xattr.c +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/gfs2/super.h +Auto-merging fs/inode.c +Auto-merging fs/namespace.c +Auto-merging fs/ntfs3/ntfs_fs.h +Auto-merging fs/ntfs3/xattr.c +Auto-merging fs/super.c +Auto-merging include/linux/fs.h +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + Documentation/filesystems/overlayfs.rst | 23 +++ + fs/9p/xattr.c | 8 +- + fs/9p/xattr.h | 2 +- + fs/afs/internal.h | 2 +- + fs/afs/xattr.c | 2 +- + fs/btrfs/xattr.c | 2 +- + fs/btrfs/xattr.h | 2 +- + fs/ceph/super.h | 2 +- + fs/ceph/xattr.c | 2 +- + fs/ecryptfs/ecryptfs_kernel.h | 2 +- + fs/ecryptfs/inode.c | 2 +- + fs/erofs/xattr.c | 2 +- + fs/erofs/xattr.h | 4 +- + fs/ext2/xattr.c | 4 +- + fs/ext2/xattr.h | 2 +- + fs/ext4/xattr.c | 2 +- + fs/ext4/xattr.h | 2 +- + fs/f2fs/xattr.c | 4 +- + fs/f2fs/xattr.h | 2 +- + fs/fuse/fuse_i.h | 2 +- + fs/fuse/xattr.c | 2 +- + fs/gfs2/super.h | 4 +- + fs/gfs2/xattr.c | 4 +- + fs/hfs/attr.c | 2 +- + fs/hfs/hfs_fs.h | 2 +- + fs/hfsplus/xattr.c | 2 +- + fs/hfsplus/xattr.h | 2 +- + fs/inode.c | 8 +- + fs/internal.h | 12 +- + fs/jffs2/xattr.c | 2 +- + fs/jffs2/xattr.h | 2 +- + fs/jfs/jfs_xattr.h | 2 +- + fs/jfs/xattr.c | 2 +- + fs/kernfs/inode.c | 2 +- + fs/kernfs/kernfs-internal.h | 2 +- + fs/namespace.c | 36 +++-- + fs/nfs/nfs.h | 2 +- + fs/nfs/nfs4_fs.h | 2 +- + fs/nfs/nfs4proc.c | 2 +- + fs/ntfs3/ntfs_fs.h | 2 +- + fs/ntfs3/xattr.c | 2 +- + fs/ocfs2/xattr.c | 4 +- + fs/ocfs2/xattr.h | 2 +- + fs/open.c | 2 +- + fs/orangefs/orangefs-kernel.h | 2 +- + fs/orangefs/xattr.c | 2 +- + fs/overlayfs/Makefile | 2 +- + fs/overlayfs/copy_up.c | 142 +++++++++++------ + fs/overlayfs/dir.c | 66 ++++---- + fs/overlayfs/export.c | 7 +- + fs/overlayfs/file.c | 88 ++++++++--- + fs/overlayfs/inode.c | 165 +++---------------- + fs/overlayfs/namei.c | 52 ++++-- + fs/overlayfs/overlayfs.h | 72 +++++++-- + fs/overlayfs/readdir.c | 27 +++- + fs/overlayfs/super.c | 87 ++-------- + fs/overlayfs/util.c | 117 +++++++++++++- + fs/overlayfs/xattrs.c | 271 ++++++++++++++++++++++++++++++++ + fs/reiserfs/reiserfs.h | 2 +- + fs/reiserfs/xattr.c | 4 +- + fs/smb/client/cifsfs.h | 2 +- + fs/smb/client/xattr.c | 2 +- + fs/squashfs/squashfs.h | 2 +- + fs/squashfs/xattr.c | 2 +- + fs/super.c | 1 + + fs/ubifs/ubifs.h | 2 +- + fs/ubifs/xattr.c | 2 +- + fs/xattr.c | 6 +- + fs/xfs/xfs_xattr.c | 2 +- + fs/xfs/xfs_xattr.h | 2 +- + include/linux/fs.h | 2 +- + include/linux/mount.h | 4 +- + include/linux/pseudo_fs.h | 2 +- + kernel/acct.c | 4 +- + mm/shmem.c | 2 +- + net/socket.c | 2 +- + 76 files changed, 841 insertions(+), 481 deletions(-) + create mode 100644 fs/overlayfs/xattrs.c +Merging ubifs/next (017c73a34a66 ubi: Refuse attaching if mtd's erasesize is 0) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/rw/ubifs.git ubifs/next +Already up to date. +Merging v9fs/9p-next (4ec5183ec486 Linux 6.2-rc7) +$ git merge -m Merge branch '9p-next' of git://github.com/martinetd/linux v9fs/9p-next +Already up to date. +Merging v9fs-ericvh/ericvh/for-next (2dde18cd1d8f Linux 6.5) +$ 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 +Already up to date. +Merging xfs/for-next (cbc06310c36f xfs: reinstate the old i_version counter as STATX_CHANGE_COOKIE) +$ 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 (8812387d0569 zonefs: set FMODE_CAN_ODIRECT instead of a dummy direct_IO method) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/zonefs.git zonefs/for-next +Already up to date. +Merging iomap/iomap-for-next (684f7e6d28e8 iomap: Spelling s/preceeding/preceding/g) +$ 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 (ce85a1e04645 xfs: stabilize fs summary counters for online fsck) +$ 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 (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge -m Merge branch 'locks-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git file-locks/locks-next +Already up to date. +Merging iversion/iversion-next (e0152e7481c6 Merge tag 'riscv-for-linus-6.6-mw1' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux) +$ git merge -m Merge branch 'iversion-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jlayton/linux.git iversion/iversion-next +Already up to date. +Merging vfs-brauner/vfs.all (216b1c1577a6 Merge branch 'vfs.super' into vfs.all) +$ git merge -m Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git vfs-brauner/vfs.all +Auto-merging block/bdev.c +Auto-merging block/fops.c +Auto-merging drivers/md/bcache/bcache.h +Auto-merging drivers/md/bcache/super.c +Auto-merging fs/btrfs/volumes.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/inode.c +Auto-merging fs/char_dev.c +Auto-merging fs/exfat/exfat_fs.h +Auto-merging fs/exfat/file.c +Auto-merging fs/exfat/namei.c +Auto-merging fs/exfat/super.c +Auto-merging fs/ext4/ext4.h +Auto-merging fs/ext4/extents.c +Auto-merging fs/ext4/inode.c +Auto-merging fs/ext4/namei.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/file_table.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/gfs2/bmap.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/gfs2/glops.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/gfs2/quota.c +Auto-merging fs/gfs2/super.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/inode.c +Auto-merging fs/jfs/jfs_imap.c +Auto-merging fs/namespace.c +Auto-merging fs/nfs/super.c +Auto-merging fs/nfsd/nfs3proc.c +Auto-merging fs/nfsd/nfs4proc.c +Auto-merging fs/nfsd/nfsctl.c +Auto-merging fs/nfsd/vfs.c +Auto-merging fs/notify/dnotify/dnotify.c +Auto-merging fs/ntfs3/file.c +Auto-merging fs/ntfs3/frecord.c +Auto-merging fs/ntfs3/inode.c +CONFLICT (content): Merge conflict in fs/ntfs3/inode.c +Auto-merging fs/ntfs3/namei.c +CONFLICT (content): Merge conflict in fs/ntfs3/namei.c +Auto-merging fs/ocfs2/alloc.c +Auto-merging fs/ocfs2/dlmfs/dlmfs.c +Auto-merging fs/ocfs2/namei.c +Auto-merging fs/overlayfs/file.c +Auto-merging fs/overlayfs/inode.c +Auto-merging fs/overlayfs/super.c +Auto-merging fs/overlayfs/util.c +Auto-merging fs/pipe.c +Auto-merging fs/proc/base.c +Auto-merging fs/proc/inode.c +Auto-merging fs/proc/task_mmu.c +Auto-merging fs/smb/server/smb2pdu.c +Auto-merging fs/super.c +Auto-merging fs/ubifs/super.c +Auto-merging fs/xfs/xfs_buf.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_buf.c +Auto-merging fs/xfs/xfs_buf.h +Auto-merging fs/xfs/xfs_iops.c +Auto-merging include/linux/fs.h +Auto-merging include/linux/skbuff.h +Auto-merging include/linux/swap.h +Auto-merging kernel/fork.c +Auto-merging mm/shmem.c +Resolved 'fs/ntfs3/inode.c' using previous resolution. +Resolved 'fs/ntfs3/namei.c' using previous resolution. +Resolved 'fs/xfs/xfs_buf.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master e225a890ebba] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git +$ git diff -M --stat --summary HEAD^.. + Documentation/filesystems/files.rst | 53 ++-- + arch/arc/kernel/troubleshoot.c | 6 +- + arch/powerpc/platforms/cell/spufs/coredump.c | 11 +- + arch/powerpc/platforms/cell/spufs/inode.c | 2 +- + arch/s390/hypfs/inode.c | 4 +- + arch/x86/include/asm/uaccess.h | 2 +- + arch/x86/lib/copy_mc.c | 8 +- + block/bdev.c | 51 ++++ + block/fops.c | 44 ++- + block/genhd.c | 12 +- + block/ioctl.c | 6 +- + drivers/android/binderfs.c | 8 +- + drivers/block/drbd/drbd_int.h | 2 + + drivers/block/drbd/drbd_nl.c | 65 ++-- + drivers/block/pktcdvd.c | 76 ++--- + drivers/block/rnbd/rnbd-srv.c | 27 +- + drivers/block/rnbd/rnbd-srv.h | 2 +- + drivers/block/xen-blkback/blkback.c | 4 +- + drivers/block/xen-blkback/common.h | 4 +- + drivers/block/xen-blkback/xenbus.c | 40 +-- + drivers/block/zram/zram_drv.c | 31 +- + drivers/block/zram/zram_drv.h | 2 +- + drivers/char/sonypi.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_mman.c | 4 +- + drivers/infiniband/hw/hfi1/file_ops.c | 2 +- + drivers/infiniband/hw/qib/qib_file_ops.c | 2 +- + drivers/infiniband/hw/qib/qib_fs.c | 4 +- + drivers/md/bcache/bcache.h | 2 + + drivers/md/bcache/super.c | 95 +++--- + drivers/md/dm.c | 20 +- + drivers/md/md.c | 23 +- + drivers/md/md.h | 4 +- + drivers/misc/ibmasm/ibmasmfs.c | 2 +- + drivers/misc/ibmvmc.c | 2 +- + drivers/mtd/devices/block2mtd.c | 51 ++-- + drivers/nvme/target/io-cmd-bdev.c | 20 +- + drivers/nvme/target/nvmet.h | 1 + + drivers/platform/x86/sony-laptop.c | 2 +- + drivers/s390/block/dasd.c | 12 +- + drivers/s390/block/dasd_genhd.c | 45 ++- + drivers/s390/block/dasd_int.h | 2 +- + drivers/s390/block/dasd_ioctl.c | 2 +- + drivers/target/target_core_iblock.c | 19 +- + drivers/target/target_core_iblock.h | 1 + + drivers/target/target_core_pscsi.c | 26 +- + drivers/target/target_core_pscsi.h | 2 +- + drivers/tty/tty_io.c | 10 +- + drivers/usb/core/devio.c | 26 +- + drivers/usb/gadget/function/f_fs.c | 4 +- + drivers/usb/gadget/legacy/inode.c | 2 +- + fs/9p/vfs_inode.c | 6 +- + fs/9p/vfs_inode_dotl.c | 16 +- + fs/adfs/inode.c | 13 +- + fs/affs/amigaffs.c | 4 +- + fs/affs/inode.c | 17 +- + fs/afs/dynroot.c | 2 +- + fs/afs/inode.c | 8 +- + fs/afs/write.c | 2 +- + fs/attr.c | 4 +- + fs/autofs/autofs_i.h | 15 +- + fs/autofs/init.c | 9 +- + fs/autofs/inode.c | 441 ++++++++++++++++----------- + fs/autofs/root.c | 6 +- + fs/bad_inode.c | 2 +- + fs/befs/linuxvfs.c | 10 +- + fs/bfs/dir.c | 9 +- + fs/bfs/inode.c | 12 +- + fs/binfmt_misc.c | 2 +- + fs/btrfs/delayed-inode.c | 20 +- + fs/btrfs/dev-replace.c | 14 +- + fs/btrfs/file.c | 18 +- + fs/btrfs/inode.c | 51 ++-- + fs/btrfs/ioctl.c | 18 +- + fs/btrfs/reflink.c | 2 +- + fs/btrfs/transaction.c | 3 +- + fs/btrfs/tree-log.c | 12 +- + fs/btrfs/volumes.c | 107 +++---- + fs/btrfs/volumes.h | 6 +- + fs/ceph/addr.c | 10 +- + fs/ceph/caps.c | 4 +- + fs/ceph/file.c | 2 +- + fs/ceph/inode.c | 64 ++-- + fs/ceph/mds_client.c | 8 +- + fs/ceph/snap.c | 4 +- + fs/char_dev.c | 2 +- + fs/coda/coda_linux.c | 6 +- + fs/coda/dir.c | 2 +- + fs/coda/file.c | 2 +- + fs/configfs/inode.c | 8 +- + fs/cramfs/inode.c | 6 +- + fs/debugfs/inode.c | 2 +- + fs/devpts/inode.c | 6 +- + fs/efivarfs/file.c | 2 +- + fs/efivarfs/inode.c | 2 +- + fs/efs/inode.c | 5 +- + fs/erofs/data.c | 4 +- + fs/erofs/inode.c | 3 +- + fs/erofs/internal.h | 2 +- + fs/erofs/super.c | 20 +- + fs/exfat/exfat_fs.h | 1 + + fs/exfat/file.c | 7 +- + fs/exfat/inode.c | 31 +- + fs/exfat/misc.c | 8 + + fs/exfat/namei.c | 31 +- + fs/exfat/super.c | 4 +- + fs/ext2/dir.c | 6 +- + fs/ext2/ialloc.c | 2 +- + fs/ext2/inode.c | 13 +- + fs/ext2/super.c | 2 +- + fs/ext4/ext4.h | 22 +- + fs/ext4/extents.c | 11 +- + fs/ext4/fsmap.c | 9 +- + fs/ext4/ialloc.c | 4 +- + fs/ext4/inline.c | 4 +- + fs/ext4/inode.c | 19 +- + fs/ext4/ioctl.c | 13 +- + fs/ext4/namei.c | 10 +- + fs/ext4/super.c | 54 ++-- + fs/ext4/xattr.c | 8 +- + fs/f2fs/dir.c | 6 +- + fs/f2fs/f2fs.h | 11 +- + fs/f2fs/file.c | 14 +- + fs/f2fs/inline.c | 2 +- + fs/f2fs/inode.c | 24 +- + fs/f2fs/namei.c | 4 +- + fs/f2fs/recovery.c | 8 +- + fs/f2fs/super.c | 15 +- + fs/fat/inode.c | 25 +- + fs/fat/misc.c | 6 +- + fs/file.c | 128 ++++++-- + fs/file_table.c | 53 ++-- + fs/freevxfs/vxfs_inode.c | 6 +- + fs/fsopen.c | 1 + + fs/fuse/control.c | 2 +- + fs/fuse/dir.c | 10 +- + fs/fuse/inode.c | 29 +- + fs/fuse/readdir.c | 6 +- + fs/gfs2/bmap.c | 10 +- + fs/gfs2/dir.c | 10 +- + fs/gfs2/glock.c | 11 +- + fs/gfs2/glops.c | 11 +- + fs/gfs2/inode.c | 7 +- + fs/gfs2/quota.c | 2 +- + fs/gfs2/super.c | 12 +- + fs/hfs/catalog.c | 8 +- + fs/hfs/inode.c | 16 +- + fs/hfs/sysdep.c | 10 +- + fs/hfsplus/catalog.c | 8 +- + fs/hfsplus/inode.c | 22 +- + fs/hostfs/hostfs_kern.c | 12 +- + fs/hpfs/dir.c | 12 +- + fs/hpfs/inode.c | 16 +- + fs/hpfs/namei.c | 22 +- + fs/hpfs/super.c | 10 +- + fs/hugetlbfs/inode.c | 10 +- + fs/init.c | 6 +- + fs/inode.c | 35 ++- + fs/internal.h | 12 +- + fs/isofs/inode.c | 4 +- + fs/isofs/rock.c | 18 +- + fs/jffs2/dir.c | 35 ++- + fs/jffs2/file.c | 4 +- + fs/jffs2/fs.c | 20 +- + fs/jffs2/os-linux.h | 4 +- + fs/jfs/inode.c | 2 +- + fs/jfs/jfs_imap.c | 20 +- + fs/jfs/jfs_inode.c | 4 +- + fs/jfs/jfs_logmgr.c | 33 +- + fs/jfs/jfs_logmgr.h | 2 +- + fs/jfs/jfs_mount.c | 3 +- + fs/jfs/namei.c | 20 +- + fs/jfs/super.c | 2 +- + fs/kernfs/inode.c | 6 +- + fs/libfs.c | 41 ++- + fs/minix/bitmap.c | 2 +- + fs/minix/dir.c | 6 +- + fs/minix/inode.c | 17 +- + fs/minix/itree_common.c | 2 +- + fs/namei.c | 37 +-- + fs/namespace.c | 4 +- + fs/nfs/blocklayout/blocklayout.h | 2 +- + fs/nfs/blocklayout/dev.c | 74 +++-- + fs/nfs/callback_proc.c | 2 +- + fs/nfs/fscache.h | 4 +- + fs/nfs/inode.c | 30 +- + fs/nfs/super.c | 2 +- + fs/nfsd/blocklayout.c | 3 +- + fs/nfsd/nfs3proc.c | 4 +- + fs/nfsd/nfs4proc.c | 8 +- + fs/nfsd/nfsctl.c | 2 +- + fs/nfsd/vfs.c | 2 +- + fs/nilfs2/dir.c | 6 +- + fs/nilfs2/inode.c | 20 +- + fs/notify/dnotify/dnotify.c | 6 +- + fs/nsfs.c | 2 +- + fs/ntfs/inode.c | 25 +- + fs/ntfs/mft.c | 2 +- + fs/ntfs3/file.c | 6 +- + fs/ntfs3/frecord.c | 11 +- + fs/ntfs3/inode.c | 25 +- + fs/ntfs3/namei.c | 4 +- + fs/ocfs2/acl.c | 4 +- + fs/ocfs2/alloc.c | 6 +- + fs/ocfs2/aops.c | 6 +- + fs/ocfs2/cluster/heartbeat.c | 81 ++--- + fs/ocfs2/dir.c | 9 +- + fs/ocfs2/dlmfs/dlmfs.c | 4 +- + fs/ocfs2/dlmglue.c | 29 +- + fs/ocfs2/file.c | 30 +- + fs/ocfs2/inode.c | 28 +- + fs/ocfs2/move_extents.c | 4 +- + fs/ocfs2/namei.c | 16 +- + fs/ocfs2/refcounttree.c | 12 +- + fs/ocfs2/xattr.c | 4 +- + fs/omfs/inode.c | 12 +- + fs/open.c | 52 ++-- + fs/openpromfs/inode.c | 4 +- + fs/orangefs/orangefs-utils.c | 16 +- + fs/overlayfs/file.c | 9 +- + fs/overlayfs/inode.c | 3 +- + fs/overlayfs/super.c | 24 +- + fs/overlayfs/util.c | 4 +- + fs/pipe.c | 66 ++-- + fs/proc/base.c | 4 +- + fs/proc/fd.c | 11 +- + fs/proc/inode.c | 2 +- + fs/proc/nommu.c | 2 +- + fs/proc/proc_sysctl.c | 2 +- + fs/proc/self.c | 2 +- + fs/proc/task_mmu.c | 4 +- + fs/proc/task_nommu.c | 2 +- + fs/proc/thread_self.c | 2 +- + fs/pstore/inode.c | 5 +- + fs/qnx4/inode.c | 6 +- + fs/qnx6/inode.c | 6 +- + fs/ramfs/inode.c | 7 +- + fs/reiserfs/inode.c | 26 +- + fs/reiserfs/journal.c | 56 ++-- + fs/reiserfs/namei.c | 8 +- + fs/reiserfs/procfs.c | 2 +- + fs/reiserfs/reiserfs.h | 11 +- + fs/reiserfs/stree.c | 5 +- + fs/reiserfs/super.c | 2 +- + fs/romfs/super.c | 5 +- + fs/smb/client/file.c | 18 +- + fs/smb/client/fscache.h | 6 +- + fs/smb/client/inode.c | 17 +- + fs/smb/client/smb2ops.c | 6 +- + fs/smb/server/smb2pdu.c | 8 +- + fs/squashfs/inode.c | 6 +- + fs/stack.c | 4 +- + fs/stat.c | 4 +- + fs/super.c | 15 +- + fs/sysv/dir.c | 6 +- + fs/sysv/ialloc.c | 2 +- + fs/sysv/inode.c | 12 +- + fs/sysv/itree.c | 2 +- + fs/tracefs/inode.c | 2 +- + fs/ubifs/debug.c | 12 +- + fs/ubifs/dir.c | 23 +- + fs/ubifs/file.c | 16 +- + fs/ubifs/journal.c | 12 +- + fs/ubifs/super.c | 8 +- + fs/udf/ialloc.c | 4 +- + fs/udf/inode.c | 38 ++- + fs/udf/namei.c | 16 +- + fs/ufs/dir.c | 6 +- + fs/ufs/ialloc.c | 2 +- + fs/ufs/inode.c | 42 +-- + fs/vboxsf/utils.c | 15 +- + fs/xfs/libxfs/xfs_inode_buf.c | 10 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 6 +- + fs/xfs/libxfs/xfs_trans_inode.c | 2 +- + fs/xfs/xfs_bmap_util.c | 7 +- + fs/xfs/xfs_buf.c | 22 +- + fs/xfs/xfs_buf.h | 3 +- + fs/xfs/xfs_inode.c | 4 +- + fs/xfs/xfs_inode_item.c | 4 +- + fs/xfs/xfs_iops.c | 8 +- + fs/xfs/xfs_itable.c | 12 +- + fs/xfs/xfs_rtalloc.c | 30 +- + fs/xfs/xfs_super.c | 42 +-- + fs/zonefs/super.c | 10 +- + include/linux/blkdev.h | 11 + + include/linux/device-mapper.h | 1 + + include/linux/fdtable.h | 17 +- + include/linux/fs.h | 126 ++++++-- + include/linux/fs_stack.h | 6 +- + include/linux/fsnotify.h | 3 +- + include/linux/iov_iter.h | 274 +++++++++++++++++ + include/linux/namei.h | 26 +- + include/linux/pipe_fs_i.h | 22 +- + include/linux/pktcdvd.h | 4 +- + include/linux/skbuff.h | 3 + + include/linux/swap.h | 1 + + include/linux/uio.h | 34 +-- + include/linux/watch_queue.h | 2 +- + init/do_mounts.c | 2 +- + io_uring/openclose.c | 9 +- + ipc/mqueue.c | 19 +- + kernel/auditsc.c | 8 +- + kernel/bpf/inode.c | 5 +- + kernel/bpf/task_iter.c | 4 +- + kernel/fork.c | 4 +- + kernel/kcmp.c | 4 +- + kernel/power/hibernate.c | 14 +- + kernel/power/power.h | 2 +- + kernel/power/swap.c | 37 +-- + kernel/trace/trace_output.c | 2 +- + lib/iov_iter.c | 435 ++++++++------------------ + mm/readahead.c | 3 +- + mm/shmem.c | 20 +- + mm/swapfile.c | 23 +- + net/core/datagram.c | 75 ++++- + net/core/skbuff.c | 40 +++ + net/sunrpc/rpc_pipe.c | 2 +- + scripts/const_structs.checkpatch | 1 + + security/apparmor/apparmorfs.c | 7 +- + security/apparmor/policy_unpack.c | 4 +- + security/inode.c | 2 +- + security/selinux/selinuxfs.c | 2 +- + sound/core/pcm_native.c | 4 +- + 322 files changed, 3175 insertions(+), 2375 deletions(-) + create mode 100644 include/linux/iov_iter.h +$ git am -3 ../patches/bcachefs_convert_to_new_timestamp_accessors.patch +Applying: bcachefs: convert to new timestamp accessors +$ git reset HEAD^ +Unstaged changes after reset: +M fs/bcachefs/fs.c +$ git add -A . +$ git commit -v -a --amend +[master 8d959f97ccbe] Merge branch 'vfs.all' of git://git.kernel.org/pub/scm/linux/kernel/git/vfs/vfs.git + Date: Mon Oct 16 09:44:12 2023 +1100 +Merging vfs/for-next (cff4b23c731a Merge branch 'work.lock_rename_child' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Merge made by the 'ort' strategy. +Merging printk/for-next (a26f18f291f6 Merge branch 'rework/misc-cleanups' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. + include/linux/console.h | 129 ++++++ + kernel/printk/Makefile | 2 +- + kernel/printk/internal.h | 31 ++ + kernel/printk/nbcon.c | 1029 ++++++++++++++++++++++++++++++++++++++++++++++ + kernel/printk/printk.c | 148 ++++--- + 5 files changed, 1276 insertions(+), 63 deletions(-) + create mode 100644 kernel/printk/nbcon.c +Merging pci/next (87a836d6fc7a Merge branch 'pci/misc') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Auto-merging drivers/pci/vgaarb.c +Auto-merging sound/pci/hda/hda_intel.c +Merge made by the 'ort' strategy. + arch/x86/pci/fixup.c | 59 ++++++++++++++++++++++ + drivers/gpu/drm/amd/amdgpu/amdgpu_acpi.c | 11 ++-- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 20 ++------ + drivers/gpu/drm/nouveau/nouveau_acpi.c | 11 ++-- + drivers/gpu/drm/qxl/qxl_drv.c | 11 ++-- + drivers/gpu/drm/radeon/radeon_bios.c | 20 ++------ + drivers/gpu/drm/virtio/virtgpu_drv.c | 2 +- + drivers/pci/controller/cadence/pcie-cadence-plat.c | 5 -- + drivers/pci/controller/dwc/pci-layerscape.c | 2 +- + .../pci/controller/mobiveil/pcie-mobiveil-host.c | 2 +- + drivers/pci/controller/pcie-iproc.c | 2 +- + drivers/pci/controller/pcie-rcar-ep.c | 2 +- + drivers/pci/controller/pcie-rcar-host.c | 2 +- + drivers/pci/controller/vmd.c | 10 ++-- + drivers/pci/endpoint/pci-epc-core.c | 12 ++--- + drivers/pci/hotplug/cpqphp_ctrl.c | 6 +-- + drivers/pci/hotplug/cpqphp_pci.c | 22 ++++---- + drivers/pci/hotplug/ibmphp.h | 5 +- + drivers/pci/hotplug/ibmphp_pci.c | 2 +- + drivers/pci/p2pdma.c | 2 +- + drivers/pci/pci-acpi.c | 15 +++--- + drivers/pci/pci-sysfs.c | 12 ++--- + drivers/pci/pci.c | 2 +- + drivers/pci/quirks.c | 26 +++++++--- + drivers/pci/search.c | 31 ++++++++++++ + drivers/pci/setup-bus.c | 2 +- + drivers/pci/vgaarb.c | 14 ++--- + include/linux/logic_pio.h | 3 -- + include/linux/pci.h | 29 +++++++++++ + include/linux/pci_ids.h | 1 + + include/uapi/linux/pci_regs.h | 1 + + sound/pci/hda/hda_intel.c | 16 ++---- + 32 files changed, 223 insertions(+), 137 deletions(-) +Merging pstore/for-next/pstore (a19d48f7c5d5 pstore/platform: Add check for kstrdup) +$ git merge -m Merge branch 'for-next/pstore' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git pstore/for-next/pstore +Merge made by the 'ort' strategy. + Documentation/admin-guide/pstore-blk.rst | 8 ++++---- + fs/pstore/platform.c | 9 ++++++++- + 2 files changed, 12 insertions(+), 5 deletions(-) +Merging hid/for-next (d4ce72c23d31 Merge branch 'for-6.7/selftests' 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 +Merge made by the 'ort' strategy. + tools/testing/selftests/hid/Makefile | 10 ++- + tools/testing/selftests/hid/progs/hid.c | 3 - + .../testing/selftests/hid/progs/hid_bpf_helpers.h | 77 ++++++++++++++++++++++ + 3 files changed, 81 insertions(+), 9 deletions(-) +Merging i2c/i2c/for-next (f168a3309a18 Merge branch 'i2c/for-mergewindow' into i2c/for-next) +$ git merge -m Merge branch 'i2c/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wsa/linux.git i2c/i2c/for-next +Merge made by the 'ort' strategy. + .../devicetree/bindings/i2c/qcom,i2c-cci.yaml | 2 + + Documentation/i2c/busses/i2c-i801.rst | 1 + + drivers/i2c/busses/Kconfig | 1 + + drivers/i2c/busses/i2c-aspeed.c | 3 +- + drivers/i2c/busses/i2c-brcmstb.c | 23 ++- + drivers/i2c/busses/i2c-cp2615.c | 2 +- + drivers/i2c/busses/i2c-gpio.c | 7 +- + drivers/i2c/busses/i2c-i801.c | 70 ++++---- + drivers/i2c/busses/i2c-mt65xx.c | 12 +- + drivers/i2c/busses/i2c-mv64xxx.c | 11 +- + drivers/i2c/busses/i2c-omap.c | 8 +- + drivers/i2c/busses/i2c-powermac.c | 2 +- + drivers/i2c/busses/i2c-pxa.c | 7 +- + drivers/i2c/busses/i2c-rcar.c | 182 +++++++++++++-------- + drivers/i2c/busses/i2c-riic.c | 2 +- + drivers/i2c/busses/i2c-stm32f7.c | 51 +++++- + drivers/i2c/i2c-atr.c | 2 +- + drivers/i2c/i2c-core.h | 2 +- + drivers/i2c/i2c-dev.c | 18 +- + drivers/i2c/muxes/i2c-demux-pinctrl.c | 6 +- + drivers/i2c/muxes/i2c-mux-gpio.c | 7 +- + drivers/mfd/tps6586x.c | 50 +++++- + include/linux/reboot.h | 3 + + kernel/reboot.c | 4 + + 24 files changed, 311 insertions(+), 165 deletions(-) +Merging i3c/i3c/next (57ec42b9a1b7 i3c: Fix typo "Provisional ID" to "Provisioned ID") +$ 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. + Documentation/ABI/testing/sysfs-bus-i3c | 4 ++-- + Documentation/devicetree/bindings/i3c/i3c.yaml | 4 ++-- + Documentation/driver-api/i3c/protocol.rst | 4 ++-- + drivers/i3c/master.c | 10 ++++++++-- + drivers/i3c/master/dw-i3c-master.c | 2 +- + drivers/i3c/master/i3c-master-cdns.c | 8 ++++---- + drivers/i3c/master/mipi-i3c-hci/cmd_v1.c | 1 + + drivers/i3c/master/mipi-i3c-hci/core.c | 14 ++++++++------ + drivers/i3c/master/mipi-i3c-hci/dma.c | 21 +++++++++++++-------- + drivers/i3c/master/svc-i3c-master.c | 4 ++-- + include/linux/i3c/device.h | 2 +- + include/linux/i3c/master.h | 2 +- + 12 files changed, 45 insertions(+), 31 deletions(-) +Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (443f18550476 hwmon: (adt7475) Add support for Imon readout on ADT7490) +$ 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 Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/hwmon/xgene-hwmon.c +Merge made by the 'ort' strategy. + .../bindings/hwmon/pmbus/infineon,tda38640.yaml | 49 ++++ + .../devicetree/bindings/trivial-devices.yaml | 2 - + Documentation/hwmon/adt7475.rst | 3 +- + Documentation/hwmon/index.rst | 1 + + Documentation/hwmon/powerz.rst | 30 +++ + Documentation/hwmon/sch5627.rst | 10 + + MAINTAINERS | 7 + + drivers/hwmon/Kconfig | 15 +- + drivers/hwmon/Makefile | 1 + + drivers/hwmon/abituguru.c | 6 +- + drivers/hwmon/abituguru3.c | 5 +- + drivers/hwmon/adt7475.c | 68 ++++- + drivers/hwmon/da9052-hwmon.c | 6 +- + drivers/hwmon/dme1737.c | 6 +- + drivers/hwmon/f71805f.c | 6 +- + drivers/hwmon/f71882fg.c | 5 +- + drivers/hwmon/i5k_amb.c | 5 +- + drivers/hwmon/max197.c | 6 +- + drivers/hwmon/mc13783-adc.c | 6 +- + drivers/hwmon/occ/p9_sbe.c | 6 +- + drivers/hwmon/pc87360.c | 6 +- + drivers/hwmon/pc87427.c | 6 +- + drivers/hwmon/pmbus/pmbus.h | 9 + + drivers/hwmon/pmbus/tda38640.c | 154 +++++++++++- + drivers/hwmon/powerz.c | 275 +++++++++++++++++++++ + drivers/hwmon/sch5627.c | 267 ++++++++++++++------ + drivers/hwmon/sch5636.c | 6 +- + drivers/hwmon/sch56xx-common.c | 107 ++++++++ + drivers/hwmon/sch56xx-common.h | 6 + + drivers/hwmon/sht15.c | 6 +- + drivers/hwmon/sis5595.c | 6 +- + drivers/hwmon/tmp513.c | 52 ++-- + drivers/hwmon/ultra45_env.c | 6 +- + drivers/hwmon/via-cputemp.c | 5 +- + drivers/hwmon/via686a.c | 6 +- + drivers/hwmon/vt1211.c | 6 +- + drivers/hwmon/vt8231.c | 6 +- + drivers/hwmon/w83627hf.c | 6 +- + drivers/hwmon/w83781d.c | 7 +- + drivers/hwmon/xgene-hwmon.c | 6 +- + 40 files changed, 987 insertions(+), 204 deletions(-) + create mode 100644 Documentation/devicetree/bindings/hwmon/pmbus/infineon,tda38640.yaml + create mode 100644 Documentation/hwmon/powerz.rst + create mode 100644 drivers/hwmon/powerz.c +Merging jc_docs/docs-next (f949cb759051 docs/zh_TW: update contents for zh_TW) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Auto-merging Documentation/admin-guide/mm/memory-hotplug.rst +Auto-merging Documentation/admin-guide/sysctl/vm.rst +Auto-merging Documentation/arch/index.rst +Auto-merging Documentation/translations/zh_CN/arch/index.rst +Auto-merging MAINTAINERS +Auto-merging kernel/fork.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-papr-pmem | 2 +- + Documentation/PCI/pci-error-recovery.rst | 4 +- + Documentation/admin-guide/efi-stub.rst | 2 +- + Documentation/admin-guide/hw-vuln/mds.rst | 32 +- + .../hw-vuln/processor_mmio_stale_data.rst | 13 +- + .../admin-guide/hw-vuln/tsx_async_abort.rst | 33 +- + Documentation/admin-guide/mm/memory-hotplug.rst | 10 +- + Documentation/admin-guide/sysctl/fs.rst | 16 +- + Documentation/admin-guide/sysctl/vm.rst | 4 +- + Documentation/arch/index.rst | 4 +- + Documentation/{ => arch}/powerpc/associativity.rst | 0 + Documentation/{ => arch}/powerpc/booting.rst | 0 + Documentation/{ => arch}/powerpc/bootwrapper.rst | 0 + Documentation/{ => arch}/powerpc/cpu_families.rst | 0 + Documentation/{ => arch}/powerpc/cpu_features.rst | 0 + Documentation/{ => arch}/powerpc/cxl.rst | 0 + Documentation/{ => arch}/powerpc/cxlflash.rst | 2 +- + Documentation/{ => arch}/powerpc/dawr-power9.rst | 0 + Documentation/{ => arch}/powerpc/dexcr.rst | 0 + Documentation/{ => arch}/powerpc/dscr.rst | 0 + .../{ => arch}/powerpc/eeh-pci-error-recovery.rst | 0 + Documentation/{ => arch}/powerpc/elf_hwcaps.rst | 6 +- + Documentation/{ => arch}/powerpc/elfnote.rst | 0 + Documentation/{ => arch}/powerpc/features.rst | 0 + .../{ => arch}/powerpc/firmware-assisted-dump.rst | 0 + Documentation/{ => arch}/powerpc/hvcs.rst | 0 + Documentation/{ => arch}/powerpc/imc.rst | 0 + Documentation/{ => arch}/powerpc/index.rst | 0 + Documentation/{ => arch}/powerpc/isa-versions.rst | 0 + Documentation/{ => arch}/powerpc/kasan.txt | 0 + Documentation/{ => arch}/powerpc/kaslr-booke32.rst | 0 + Documentation/{ => arch}/powerpc/mpc52xx.rst | 0 + Documentation/{ => arch}/powerpc/papr_hcalls.rst | 0 + .../powerpc/pci_iov_resource_on_powernv.rst | 0 + Documentation/{ => arch}/powerpc/pmu-ebb.rst | 0 + Documentation/{ => arch}/powerpc/ptrace.rst | 0 + Documentation/{ => arch}/powerpc/qe_firmware.rst | 0 + Documentation/{ => arch}/powerpc/syscall64-abi.rst | 0 + .../{ => arch}/powerpc/transactional_memory.rst | 0 + Documentation/{ => arch}/powerpc/ultravisor.rst | 0 + Documentation/{ => arch}/powerpc/vas-api.rst | 0 + .../{ => arch}/powerpc/vcpudispatch_stats.rst | 0 + Documentation/{ => arch}/powerpc/vmemmap_dedup.rst | 0 + Documentation/{ => arch}/riscv/acpi.rst | 0 + .../{ => arch}/riscv/boot-image-header.rst | 0 + Documentation/{ => arch}/riscv/boot.rst | 0 + Documentation/{ => arch}/riscv/features.rst | 0 + Documentation/{ => arch}/riscv/hwprobe.rst | 0 + Documentation/{ => arch}/riscv/index.rst | 0 + .../{ => arch}/riscv/patch-acceptance.rst | 0 + Documentation/{ => arch}/riscv/uabi.rst | 0 + Documentation/{ => arch}/riscv/vector.rst | 0 + Documentation/{ => arch}/riscv/vm-layout.rst | 0 + Documentation/block/blk-mq.rst | 2 +- + Documentation/driver-api/driver-model/devres.rst | 14 +- + Documentation/driver-api/pwm.rst | 6 +- + .../filesystems/xfs-online-fsck-design.rst | 2 +- + .../maintainer/maintainer-entry-profile.rst | 2 +- + Documentation/mm/overcommit-accounting.rst | 3 +- + Documentation/mm/page_tables.rst | 127 ++++ + Documentation/mm/vmemmap_dedup.rst | 2 +- + Documentation/process/backporting.rst | 514 ++++++++++++++ + Documentation/process/index.rst | 3 +- + Documentation/process/submitting-patches.rst | 10 +- + Documentation/security/index.rst | 1 + + Documentation/security/snp-tdx-threat-model.rst | 253 +++++++ + Documentation/sphinx/cdomain.py | 2 +- + Documentation/sphinx/kernel_abi.py | 2 +- + Documentation/sphinx/kernel_feat.py | 2 +- + Documentation/sphinx/kerneldoc.py | 4 +- + Documentation/sphinx/kfigure.py | 2 +- + Documentation/sphinx/maintainers_include.py | 8 +- + Documentation/subsystem-apis.rst | 2 +- + .../translations/it_IT/riscv/patch-acceptance.rst | 2 +- + .../sp_SP/process/embargoed-hardware-issues.rst | 341 +++++++++ + Documentation/translations/sp_SP/process/index.rst | 2 + + .../translations/sp_SP/process/security-bugs.rst | 103 +++ + Documentation/translations/zh_CN/arch/index.rst | 2 +- + .../zh_CN/{ => arch}/riscv/boot-image-header.rst | 4 +- + .../translations/zh_CN/{ => arch}/riscv/index.rst | 4 +- + .../zh_CN/{ => arch}/riscv/patch-acceptance.rst | 4 +- + .../zh_CN/{ => arch}/riscv/vm-layout.rst | 4 +- + .../zh_CN/maintainer/maintainer-entry-profile.rst | 2 +- + .../translations/zh_TW/admin-guide/README.rst | 160 ++--- + .../translations/zh_TW/admin-guide/bootconfig.rst | 294 ++++++++ + .../translations/zh_TW/admin-guide/bug-bisect.rst | 10 +- + .../translations/zh_TW/admin-guide/bug-hunting.rst | 38 +- + .../zh_TW/admin-guide/clearing-warn-once.rst | 4 +- + .../translations/zh_TW/admin-guide/cpu-load.rst | 8 +- + .../translations/zh_TW/admin-guide/cputopology.rst | 97 +++ + .../translations/zh_TW/admin-guide/index.rst | 137 ++-- + .../translations/zh_TW/admin-guide/init.rst | 36 +- + .../zh_TW/admin-guide/lockup-watchdogs.rst | 67 ++ + .../zh_TW/admin-guide/mm/damon/index.rst | 30 + + .../zh_TW/admin-guide/mm/damon/lru_sort.rst | 264 +++++++ + .../zh_TW/admin-guide/mm/damon/reclaim.rst | 229 +++++++ + .../zh_TW/admin-guide/mm/damon/start.rst | 125 ++++ + .../zh_TW/admin-guide/mm/damon/usage.rst | 592 ++++++++++++++++ + .../translations/zh_TW/admin-guide/mm/index.rst | 50 ++ + .../translations/zh_TW/admin-guide/mm/ksm.rst | 199 ++++++ + .../zh_TW/admin-guide/reporting-issues.rst | 727 ++++++++++---------- + .../zh_TW/admin-guide/reporting-regressions.rst | 371 ++++++++++ + .../zh_TW/admin-guide/security-bugs.rst | 26 +- + .../translations/zh_TW/admin-guide/sysrq.rst | 281 ++++++++ + .../zh_TW/admin-guide/tainted-kernels.rst | 84 +-- + .../translations/zh_TW/admin-guide/unicode.rst | 10 +- + Documentation/translations/zh_TW/arch/arm/Booting | 176 +++++ + .../zh_TW/arch/arm/kernel_user_helpers.txt | 285 ++++++++ + .../translations/zh_TW/arch/arm64/amu.rst | 6 +- + .../translations/zh_TW/arch/arm64/booting.txt | 28 +- + .../translations/zh_TW/arch/arm64/elf_hwcaps.rst | 10 +- + .../zh_TW/arch/arm64/legacy_instructions.txt | 14 +- + .../translations/zh_TW/arch/arm64/memory.txt | 16 +- + .../translations/zh_TW/arch/arm64/perf.rst | 2 +- + .../zh_TW/arch/arm64/silicon-errata.txt | 28 +- + .../zh_TW/arch/arm64/tagged-pointers.txt | 10 +- + Documentation/translations/zh_TW/arch/index.rst | 29 + + .../translations/zh_TW/arch/loongarch/booting.rst | 49 ++ + .../translations/zh_TW/arch/loongarch/features.rst | 9 + + .../translations/zh_TW/arch/loongarch/index.rst | 28 + + .../zh_TW/arch/loongarch/introduction.rst | 354 ++++++++++ + .../zh_TW/arch/loongarch/irq-chip-model.rst | 158 +++++ + .../translations/zh_TW/arch/mips/booting.rst | 35 + + .../translations/zh_TW/arch/mips/features.rst | 14 + + .../translations/zh_TW/arch/mips/index.rst | 30 + + .../translations/zh_TW/arch/mips/ingenic-tcu.rst | 73 ++ + .../translations/zh_TW/arch/openrisc/index.rst | 33 + + .../zh_TW/arch/openrisc/openrisc_port.rst | 128 ++++ + .../translations/zh_TW/arch/openrisc/todo.rst | 24 + + .../translations/zh_TW/arch/parisc/debugging.rst | 46 ++ + .../translations/zh_TW/arch/parisc/index.rst | 32 + + .../translations/zh_TW/arch/parisc/registers.rst | 157 +++++ + Documentation/translations/zh_TW/cpu-freq/core.rst | 38 +- + .../translations/zh_TW/cpu-freq/cpu-drivers.rst | 158 ++--- + .../translations/zh_TW/cpu-freq/cpufreq-stats.rst | 52 +- + .../translations/zh_TW/cpu-freq/index.rst | 13 +- + .../translations/zh_TW/dev-tools/gcov.rst | 265 +++++++ + .../zh_TW/dev-tools/gdb-kernel-debugging.rst | 168 +++++ + .../translations/zh_TW/dev-tools/index.rst | 41 ++ + .../translations/zh_TW/dev-tools/kasan.rst | 463 +++++++++++++ + .../zh_TW/{sparse.txt => dev-tools/sparse.rst} | 4 +- + .../zh_TW/dev-tools/testing-overview.rst | 162 +++++ + .../translations/zh_TW/filesystems/debugfs.rst | 47 +- + .../translations/zh_TW/filesystems/index.rst | 2 +- + .../translations/zh_TW/filesystems/sysfs.txt | 14 +- + .../translations/zh_TW/filesystems/tmpfs.rst | 35 +- + .../translations/zh_TW/filesystems/virtiofs.rst | 9 +- + Documentation/translations/zh_TW/index.rst | 7 +- + .../translations/zh_TW/process/1.Intro.rst | 78 +-- + .../translations/zh_TW/process/2.Process.rst | 130 ++-- + .../translations/zh_TW/process/3.Early-stage.rst | 44 +- + .../translations/zh_TW/process/4.Coding.rst | 104 +-- + .../translations/zh_TW/process/5.Posting.rst | 80 +-- + .../translations/zh_TW/process/6.Followthrough.rst | 46 +- + .../zh_TW/process/7.AdvancedTopics.rst | 56 +- + .../translations/zh_TW/process/8.Conclusion.rst | 14 +- + .../process/code-of-conduct-interpretation.rst | 52 +- + .../translations/zh_TW/process/code-of-conduct.rst | 18 +- + .../translations/zh_TW/process/coding-style.rst | 405 +++++++---- + .../zh_TW/process/development-process.rst | 2 +- + .../translations/zh_TW/process/email-clients.rst | 295 +++++--- + .../zh_TW/process/embargoed-hardware-issues.rst | 76 +- + Documentation/translations/zh_TW/process/index.rst | 5 +- + .../zh_TW/process/kernel-driver-statement.rst | 2 +- + .../translations/zh_TW/process/license-rules.rst | 54 +- + .../zh_TW/process/management-style.rst | 60 +- + .../zh_TW/process/stable-api-nonsense.rst | 86 +-- + .../zh_TW/process/stable-kernel-rules.rst | 36 +- + .../zh_TW/process/submit-checklist.rst | 92 +-- + .../zh_TW/process/submitting-patches.rst | 761 ++++++++++----------- + .../zh_TW/process/volatile-considered-harmful.rst | 32 +- + MAINTAINERS | 16 +- + arch/powerpc/kernel/exceptions-64s.S | 6 +- + arch/powerpc/kernel/paca.c | 2 +- + arch/powerpc/kvm/book3s_64_entry.S | 2 +- + arch/riscv/include/uapi/asm/hwprobe.h | 2 +- + arch/riscv/kernel/sys_riscv.c | 2 +- + drivers/soc/fsl/qe/qe.c | 2 +- + drivers/tty/hvc/hvcs.c | 2 +- + include/soc/fsl/qe/qe.h | 2 +- + kernel/fork.c | 15 +- + 181 files changed, 9068 insertions(+), 2159 deletions(-) + rename Documentation/{ => arch}/powerpc/associativity.rst (100%) + rename Documentation/{ => arch}/powerpc/booting.rst (100%) + rename Documentation/{ => arch}/powerpc/bootwrapper.rst (100%) + rename Documentation/{ => arch}/powerpc/cpu_families.rst (100%) + rename Documentation/{ => arch}/powerpc/cpu_features.rst (100%) + rename Documentation/{ => arch}/powerpc/cxl.rst (100%) + rename Documentation/{ => arch}/powerpc/cxlflash.rst (99%) + rename Documentation/{ => arch}/powerpc/dawr-power9.rst (100%) + rename Documentation/{ => arch}/powerpc/dexcr.rst (100%) + rename Documentation/{ => arch}/powerpc/dscr.rst (100%) + rename Documentation/{ => arch}/powerpc/eeh-pci-error-recovery.rst (100%) + rename Documentation/{ => arch}/powerpc/elf_hwcaps.rst (97%) + rename Documentation/{ => arch}/powerpc/elfnote.rst (100%) + rename Documentation/{ => arch}/powerpc/features.rst (100%) + rename Documentation/{ => arch}/powerpc/firmware-assisted-dump.rst (100%) + rename Documentation/{ => arch}/powerpc/hvcs.rst (100%) + rename Documentation/{ => arch}/powerpc/imc.rst (100%) + rename Documentation/{ => arch}/powerpc/index.rst (100%) + rename Documentation/{ => arch}/powerpc/isa-versions.rst (100%) + rename Documentation/{ => arch}/powerpc/kasan.txt (100%) + rename Documentation/{ => arch}/powerpc/kaslr-booke32.rst (100%) + rename Documentation/{ => arch}/powerpc/mpc52xx.rst (100%) + rename Documentation/{ => arch}/powerpc/papr_hcalls.rst (100%) + rename Documentation/{ => arch}/powerpc/pci_iov_resource_on_powernv.rst (100%) + rename Documentation/{ => arch}/powerpc/pmu-ebb.rst (100%) + rename Documentation/{ => arch}/powerpc/ptrace.rst (100%) + rename Documentation/{ => arch}/powerpc/qe_firmware.rst (100%) + rename Documentation/{ => arch}/powerpc/syscall64-abi.rst (100%) + rename Documentation/{ => arch}/powerpc/transactional_memory.rst (100%) + rename Documentation/{ => arch}/powerpc/ultravisor.rst (100%) + rename Documentation/{ => arch}/powerpc/vas-api.rst (100%) + rename Documentation/{ => arch}/powerpc/vcpudispatch_stats.rst (100%) + rename Documentation/{ => arch}/powerpc/vmemmap_dedup.rst (100%) + rename Documentation/{ => arch}/riscv/acpi.rst (100%) + rename Documentation/{ => arch}/riscv/boot-image-header.rst (100%) + rename Documentation/{ => arch}/riscv/boot.rst (100%) + rename Documentation/{ => arch}/riscv/features.rst (100%) + rename Documentation/{ => arch}/riscv/hwprobe.rst (100%) + rename Documentation/{ => arch}/riscv/index.rst (100%) + rename Documentation/{ => arch}/riscv/patch-acceptance.rst (100%) + rename Documentation/{ => arch}/riscv/uabi.rst (100%) + rename Documentation/{ => arch}/riscv/vector.rst (100%) + rename Documentation/{ => arch}/riscv/vm-layout.rst (100%) + create mode 100644 Documentation/process/backporting.rst + create mode 100644 Documentation/security/snp-tdx-threat-model.rst + create mode 100644 Documentation/translations/sp_SP/process/embargoed-hardware-issues.rst + create mode 100644 Documentation/translations/sp_SP/process/security-bugs.rst + rename Documentation/translations/zh_CN/{ => arch}/riscv/boot-image-header.rst (96%) + rename Documentation/translations/zh_CN/{ => arch}/riscv/index.rst (79%) + rename Documentation/translations/zh_CN/{ => arch}/riscv/patch-acceptance.rst (93%) + rename Documentation/translations/zh_CN/{ => arch}/riscv/vm-layout.rst (98%) + create mode 100644 Documentation/translations/zh_TW/admin-guide/bootconfig.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/cputopology.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/lockup-watchdogs.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/mm/damon/index.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/mm/damon/lru_sort.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/mm/damon/reclaim.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/mm/damon/start.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/mm/damon/usage.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/mm/index.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/mm/ksm.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/reporting-regressions.rst + create mode 100644 Documentation/translations/zh_TW/admin-guide/sysrq.rst + create mode 100644 Documentation/translations/zh_TW/arch/arm/Booting + create mode 100644 Documentation/translations/zh_TW/arch/arm/kernel_user_helpers.txt + create mode 100644 Documentation/translations/zh_TW/arch/index.rst + create mode 100644 Documentation/translations/zh_TW/arch/loongarch/booting.rst + create mode 100644 Documentation/translations/zh_TW/arch/loongarch/features.rst + create mode 100644 Documentation/translations/zh_TW/arch/loongarch/index.rst + create mode 100644 Documentation/translations/zh_TW/arch/loongarch/introduction.rst + create mode 100644 Documentation/translations/zh_TW/arch/loongarch/irq-chip-model.rst + create mode 100644 Documentation/translations/zh_TW/arch/mips/booting.rst + create mode 100644 Documentation/translations/zh_TW/arch/mips/features.rst + create mode 100644 Documentation/translations/zh_TW/arch/mips/index.rst + create mode 100644 Documentation/translations/zh_TW/arch/mips/ingenic-tcu.rst + create mode 100644 Documentation/translations/zh_TW/arch/openrisc/index.rst + create mode 100644 Documentation/translations/zh_TW/arch/openrisc/openrisc_port.rst + create mode 100644 Documentation/translations/zh_TW/arch/openrisc/todo.rst + create mode 100644 Documentation/translations/zh_TW/arch/parisc/debugging.rst + create mode 100644 Documentation/translations/zh_TW/arch/parisc/index.rst + create mode 100644 Documentation/translations/zh_TW/arch/parisc/registers.rst + create mode 100644 Documentation/translations/zh_TW/dev-tools/gcov.rst + create mode 100644 Documentation/translations/zh_TW/dev-tools/gdb-kernel-debugging.rst + create mode 100644 Documentation/translations/zh_TW/dev-tools/index.rst + create mode 100644 Documentation/translations/zh_TW/dev-tools/kasan.rst + rename Documentation/translations/zh_TW/{sparse.txt => dev-tools/sparse.rst} (98%) + create mode 100644 Documentation/translations/zh_TW/dev-tools/testing-overview.rst +Merging v4l-dvb/master (2c1bae27df78 media: qcom: camss: Fix pm_domain_on sequence in probe) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/master +Merge made by the 'ort' strategy. + drivers/media/platform/qcom/camss/camss.c | 12 ++++++------ + 1 file changed, 6 insertions(+), 6 deletions(-) +Merging v4l-dvb-next/master (94e27fbeca27 media: cec: meson: always include meson sub-directory in Makefile) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Auto-merging Documentation/devicetree/bindings/media/i2c/sony,imx415.yaml +Auto-merging Documentation/devicetree/bindings/media/samsung,fimc.yaml +Auto-merging Documentation/devicetree/bindings/trivial-devices.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm/configs/omap2plus_defconfig +Auto-merging drivers/media/pci/intel/ivsc/Kconfig +Auto-merging drivers/media/platform/mediatek/vcodec/encoder/venc_vpu_if.c +Auto-merging drivers/media/platform/qcom/camss/camss.c +Auto-merging drivers/media/v4l2-core/v4l2-subdev.c +Auto-merging drivers/staging/media/atomisp/Kconfig +Merge made by the 'ort' strategy. + Documentation/admin-guide/media/mgb4.rst | 374 ++ + Documentation/admin-guide/media/pci-cardlist.rst | 1 + + Documentation/admin-guide/media/v4l-drivers.rst | 1 + + Documentation/admin-guide/media/visl.rst | 6 +- + .../devicetree/bindings/leds/irled/pwm-ir-tx.yaml | 5 +- + .../bindings/media/amlogic,meson6-ir.yaml | 1 + + .../devicetree/bindings/media/cdns,csi2rx.yaml | 1 + + .../devicetree/bindings/media/i2c/hynix,hi846.yaml | 7 +- + .../bindings/media/i2c/onnn,mt9m114.yaml | 114 + + .../bindings/media/i2c/ovti,ov02a10.yaml | 8 +- + .../devicetree/bindings/media/i2c/ovti,ov4689.yaml | 6 +- + .../devicetree/bindings/media/i2c/ovti,ov5640.yaml | 7 +- + .../devicetree/bindings/media/i2c/ovti,ov5642.yaml | 141 + + .../devicetree/bindings/media/i2c/ovti,ov5693.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx214.yaml | 2 +- + .../devicetree/bindings/media/i2c/sony,imx415.yaml | 10 +- + .../devicetree/bindings/media/nokia,n900-ir | 20 - + .../bindings/media/nuvoton,npcm-ece.yaml | 43 + + .../bindings/media/nuvoton,npcm-vcd.yaml | 72 + + .../bindings/media/qcom,sdm845-venus-v2.yaml | 8 + + .../devicetree/bindings/media/rockchip-vpu.yaml | 7 + + .../bindings/media/samsung,exynos4212-fimc-is.yaml | 15 +- + .../devicetree/bindings/media/samsung,fimc.yaml | 27 +- + .../bindings/media/ti,j721e-csi2rx-shim.yaml | 100 + + .../bindings/media/video-interfaces.yaml | 1 + + .../bindings/soc/nuvoton/nuvoton,gfxi.yaml | 39 + + .../devicetree/bindings/trivial-devices.yaml | 2 - + Documentation/driver-api/media/camera-sensor.rst | 188 +- + Documentation/driver-api/media/drivers/ccs/ccs.rst | 10 +- + Documentation/driver-api/media/v4l2-core.rst | 1 - + Documentation/driver-api/media/v4l2-dev.rst | 8 - + Documentation/driver-api/media/v4l2-videobuf.rst | 403 --- + .../zh_CN/video4linux/v4l2-framework.txt | 12 - + .../userspace-api/media/drivers/camera-sensor.rst | 104 + + .../userspace-api/media/drivers/index.rst | 2 + + .../userspace-api/media/drivers/npcm-video.rst | 66 + + Documentation/userspace-api/media/gen-errors.rst | 4 +- + Documentation/userspace-api/media/v4l/buffer.rst | 4 +- + Documentation/userspace-api/media/v4l/control.rst | 4 + + .../userspace-api/media/v4l/dev-subdev.rst | 49 +- + .../userspace-api/media/v4l/dv-timings.rst | 21 + + .../userspace-api/media/v4l/pixfmt-reserved.rst | 7 + + .../userspace-api/media/v4l/pixfmt-srggb12p.rst | 4 +- + MAINTAINERS | 52 +- + arch/arm/configs/omap2plus_defconfig | 1 - + drivers/media/cec/platform/Makefile | 2 +- + drivers/media/cec/platform/cros-ec/cros-ec-cec.c | 387 +- + drivers/media/common/siano/smsdvb-debugfs.c | 22 +- + drivers/media/common/videobuf2/frame_vector.c | 2 +- + drivers/media/common/videobuf2/videobuf2-core.c | 2 +- + .../media/common/videobuf2/videobuf2-dma-contig.c | 13 +- + drivers/media/common/videobuf2/videobuf2-vmalloc.c | 10 +- + drivers/media/dvb-frontends/drx39xyj/drxj.c | 6 +- + drivers/media/dvb-frontends/m88ds3103.c | 3 +- + drivers/media/i2c/Kconfig | 11 + + drivers/media/i2c/Makefile | 1 + + drivers/media/i2c/adp1653.c | 28 +- + drivers/media/i2c/adv7180.c | 65 +- + drivers/media/i2c/ar0521.c | 30 +- + drivers/media/i2c/ccs/ccs-core.c | 431 +-- + drivers/media/i2c/ccs/ccs-quirk.h | 4 +- + drivers/media/i2c/ccs/ccs.h | 4 +- + drivers/media/i2c/cx25840/cx25840-core.c | 3694 +++++--------------- + drivers/media/i2c/ds90ub913.c | 2 - + drivers/media/i2c/ds90ub953.c | 2 - + drivers/media/i2c/ds90ub960.c | 2 - + drivers/media/i2c/hi556.c | 114 +- + drivers/media/i2c/hi846.c | 34 +- + drivers/media/i2c/hi847.c | 57 +- + drivers/media/i2c/imx208.c | 61 +- + drivers/media/i2c/imx214.c | 40 - + drivers/media/i2c/imx219.c | 1511 ++++---- + drivers/media/i2c/imx258.c | 40 - + drivers/media/i2c/imx296.c | 16 +- + drivers/media/i2c/imx319.c | 44 - + drivers/media/i2c/imx334.c | 66 +- + drivers/media/i2c/imx335.c | 9 - + drivers/media/i2c/imx355.c | 45 - + drivers/media/i2c/imx412.c | 9 - + drivers/media/i2c/imx415.c | 45 +- + drivers/media/i2c/max9286.c | 2 - + drivers/media/i2c/msp3400-driver.c | 2 +- + drivers/media/i2c/mt9m001.c | 6 - + drivers/media/i2c/mt9m111.c | 13 +- + drivers/media/i2c/mt9m114.c | 2481 +++++++++++++ + drivers/media/i2c/mt9v011.c | 6 - + drivers/media/i2c/mt9v032.c | 26 +- + drivers/media/i2c/mt9v111.c | 14 - + drivers/media/i2c/og01a1b.c | 55 +- + drivers/media/i2c/ov01a10.c | 59 +- + drivers/media/i2c/ov02a10.c | 2 - + drivers/media/i2c/ov08d10.c | 52 - + drivers/media/i2c/ov08x40.c | 44 - + drivers/media/i2c/ov13858.c | 44 - + drivers/media/i2c/ov13b10.c | 98 +- + drivers/media/i2c/ov2640.c | 21 +- + drivers/media/i2c/ov2659.c | 16 +- + drivers/media/i2c/ov2685.c | 19 - + drivers/media/i2c/ov2740.c | 170 +- + drivers/media/i2c/ov4689.c | 9 +- + drivers/media/i2c/ov5640.c | 24 +- + drivers/media/i2c/ov5647.c | 6 - + drivers/media/i2c/ov5670.c | 36 - + drivers/media/i2c/ov5675.c | 44 - + drivers/media/i2c/ov5693.c | 9 +- + drivers/media/i2c/ov5695.c | 25 - + drivers/media/i2c/ov7251.c | 8 +- + drivers/media/i2c/ov7670.c | 72 +- + drivers/media/i2c/ov772x.c | 4 - + drivers/media/i2c/ov7740.c | 30 +- + drivers/media/i2c/ov8856.c | 47 - + drivers/media/i2c/ov9282.c | 9 - + drivers/media/i2c/ov9734.c | 50 - + drivers/media/i2c/rdacm20.c | 3 +- + drivers/media/i2c/st-vgxy61.c | 9 +- + drivers/media/i2c/tc358746.c | 6 +- + drivers/media/i2c/tvp514x.c | 51 +- + drivers/media/i2c/video-i2c.c | 12 +- + drivers/media/mc/mc-entity.c | 15 +- + drivers/media/pci/Kconfig | 1 + + drivers/media/pci/Makefile | 1 + + drivers/media/pci/bt8xx/bttv-cards.c | 1 + + drivers/media/pci/bt8xx/bttv-driver.c | 1 + + drivers/media/pci/bt8xx/dvb-bt8xx.c | 14 +- + drivers/media/pci/cobalt/cobalt-driver.c | 11 +- + drivers/media/pci/cobalt/cobalt-v4l2.c | 8 +- + drivers/media/pci/cx18/cx18-driver.h | 2 +- + drivers/media/pci/cx18/cx18-mailbox.c | 2 +- + drivers/media/pci/intel/ivsc/Kconfig | 12 +- + drivers/media/pci/intel/ivsc/mei_ace.c | 9 +- + drivers/media/pci/intel/ivsc/mei_csi.c | 5 +- + drivers/media/pci/mgb4/Kconfig | 17 + + drivers/media/pci/mgb4/Makefile | 6 + + drivers/media/pci/mgb4/mgb4_cmt.c | 244 ++ + drivers/media/pci/mgb4/mgb4_cmt.h | 17 + + drivers/media/pci/mgb4/mgb4_core.c | 686 ++++ + drivers/media/pci/mgb4/mgb4_core.h | 74 + + drivers/media/pci/mgb4/mgb4_dma.c | 123 + + drivers/media/pci/mgb4/mgb4_dma.h | 18 + + drivers/media/pci/mgb4/mgb4_i2c.c | 140 + + drivers/media/pci/mgb4/mgb4_i2c.h | 35 + + drivers/media/pci/mgb4/mgb4_io.h | 33 + + drivers/media/pci/mgb4/mgb4_regs.c | 30 + + drivers/media/pci/mgb4/mgb4_regs.h | 35 + + drivers/media/pci/mgb4/mgb4_sysfs.h | 18 + + drivers/media/pci/mgb4/mgb4_sysfs_in.c | 772 ++++ + drivers/media/pci/mgb4/mgb4_sysfs_out.c | 740 ++++ + drivers/media/pci/mgb4/mgb4_sysfs_pci.c | 71 + + drivers/media/pci/mgb4/mgb4_trigger.c | 208 ++ + drivers/media/pci/mgb4/mgb4_trigger.h | 8 + + drivers/media/pci/mgb4/mgb4_vin.c | 939 +++++ + drivers/media/pci/mgb4/mgb4_vin.h | 69 + + drivers/media/pci/mgb4/mgb4_vout.c | 602 ++++ + drivers/media/pci/mgb4/mgb4_vout.h | 65 + + drivers/media/pci/zoran/zoran.h | 2 +- + drivers/media/platform/Kconfig | 1 + + drivers/media/platform/Makefile | 1 + + drivers/media/platform/allegro-dvt/allegro-mail.c | 2 +- + drivers/media/platform/allegro-dvt/allegro-mail.h | 2 +- + drivers/media/platform/amphion/vpu_defs.h | 1 + + drivers/media/platform/amphion/vpu_helpers.c | 1 + + drivers/media/platform/amphion/vpu_malone.c | 1 + + drivers/media/platform/amphion/vpu_msgs.c | 31 +- + drivers/media/platform/aspeed/aspeed-video.c | 15 +- + drivers/media/platform/cadence/cdns-csi2rx.c | 180 +- + drivers/media/platform/cadence/cdns-csi2tx.c | 6 +- + .../media/platform/mediatek/jpeg/mtk_jpeg_enc_hw.c | 5 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-cmdq.c | 2 +- + .../media/platform/mediatek/mdp3/mtk-mdp3-comp.c | 1 + + .../mediatek/vcodec/common/mtk_vcodec_fw_scp.c | 2 +- + .../mediatek/vcodec/common/mtk_vcodec_fw_vpu.c | 2 +- + .../mediatek/vcodec/common/mtk_vcodec_util.c | 56 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc.c | 21 +- + .../mediatek/vcodec/encoder/mtk_vcodec_enc_pm.c | 18 + + .../mediatek/vcodec/encoder/mtk_vcodec_enc_pm.h | 3 +- + .../platform/mediatek/vcodec/encoder/venc_drv_if.c | 8 +- + .../platform/mediatek/vcodec/encoder/venc_vpu_if.c | 5 + + .../media/platform/microchip/microchip-isc-base.c | 6 - + drivers/media/platform/nuvoton/Kconfig | 15 + + drivers/media/platform/nuvoton/Makefile | 2 + + drivers/media/platform/nuvoton/npcm-regs.h | 152 + + drivers/media/platform/nuvoton/npcm-video.c | 1831 ++++++++++ + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg-hw.h | 11 - + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.c | 36 +- + drivers/media/platform/nxp/imx-jpeg/mxc-jpeg.h | 1 + + drivers/media/platform/nxp/imx-mipi-csis.c | 2 - + .../media/platform/nxp/imx8-isi/imx8-isi-core.c | 4 +- + drivers/media/platform/qcom/camss/camss-csid-4-1.c | 8 +- + drivers/media/platform/qcom/camss/camss-csid-4-7.c | 8 +- + .../media/platform/qcom/camss/camss-csid-gen2.c | 33 +- + drivers/media/platform/qcom/camss/camss-csid.c | 39 +- + drivers/media/platform/qcom/camss/camss-csid.h | 4 +- + .../platform/qcom/camss/camss-csiphy-3ph-1-0.c | 10 +- + drivers/media/platform/qcom/camss/camss-csiphy.c | 93 +- + drivers/media/platform/qcom/camss/camss-csiphy.h | 4 +- + drivers/media/platform/qcom/camss/camss-ispif.c | 52 +- + drivers/media/platform/qcom/camss/camss-ispif.h | 4 +- + drivers/media/platform/qcom/camss/camss-vfe-170.c | 73 +- + drivers/media/platform/qcom/camss/camss-vfe-4-1.c | 18 +- + drivers/media/platform/qcom/camss/camss-vfe-4-7.c | 18 +- + drivers/media/platform/qcom/camss/camss-vfe-4-8.c | 18 +- + drivers/media/platform/qcom/camss/camss-vfe-480.c | 61 +- + drivers/media/platform/qcom/camss/camss-vfe.c | 228 +- + drivers/media/platform/qcom/camss/camss-vfe.h | 15 +- + drivers/media/platform/qcom/camss/camss-video.c | 81 +- + drivers/media/platform/qcom/camss/camss.c | 476 +-- + drivers/media/platform/qcom/camss/camss.h | 34 +- + drivers/media/platform/qcom/venus/pm_helpers.c | 2 +- + drivers/media/platform/renesas/rcar-isp.c | 2 +- + .../media/platform/renesas/rcar-vin/rcar-csi2.c | 2 +- + drivers/media/platform/renesas/rcar_drif.c | 3 +- + drivers/media/platform/renesas/renesas-ceu.c | 6 +- + .../platform/rockchip/rkisp1/rkisp1-capture.c | 24 +- + .../media/platform/rockchip/rkisp1/rkisp1-common.h | 18 - + .../media/platform/rockchip/rkisp1/rkisp1-csi.c | 107 +- + .../media/platform/rockchip/rkisp1/rkisp1-isp.c | 263 +- + .../media/platform/rockchip/rkisp1/rkisp1-params.c | 4 +- + .../media/platform/rockchip/rkisp1/rkisp1-regs.h | 618 ++-- + .../platform/rockchip/rkisp1/rkisp1-resizer.c | 255 +- + .../media/platform/samsung/exynos4-is/fimc-is.c | 33 +- + .../platform/samsung/s3c-camif/camif-capture.c | 6 +- + .../media/platform/samsung/s5p-mfc/s5p_mfc_enc.c | 2 +- + .../platform/st/sti/c8sectpfe/c8sectpfe-core.c | 26 +- + drivers/media/platform/ti/Kconfig | 12 + + drivers/media/platform/ti/Makefile | 1 + + drivers/media/platform/ti/am437x/am437x-vpfe.c | 4 - + drivers/media/platform/ti/j721e-csi2rx/Makefile | 2 + + .../media/platform/ti/j721e-csi2rx/j721e-csi2rx.c | 1159 ++++++ + drivers/media/platform/ti/omap3isp/ispstat.c | 2 +- + drivers/media/platform/verisilicon/hantro_drv.c | 8 +- + .../media/platform/verisilicon/hantro_postproc.c | 2 +- + .../platform/verisilicon/rockchip_av1_filmgrain.c | 2 +- + .../media/platform/verisilicon/rockchip_vpu_hw.c | 2 +- + drivers/media/platform/xilinx/xilinx-dma.c | 5 +- + drivers/media/radio/radio-isa.c | 2 +- + drivers/media/radio/radio-miropcm20.c | 4 +- + drivers/media/radio/radio-si476x.c | 4 +- + drivers/media/radio/radio-wl1273.c | 2 +- + drivers/media/rc/Kconfig | 10 - + drivers/media/rc/Makefile | 1 - + drivers/media/rc/ati_remote.c | 2 +- + drivers/media/rc/imon.c | 6 + + drivers/media/rc/ir-rx51.c | 285 -- + drivers/media/rc/ir-sharp-decoder.c | 8 +- + drivers/media/rc/keymaps/rc-adstech-dvb-t-pci.c | 1 + + drivers/media/rc/keymaps/rc-alink-dtu-m.c | 1 + + drivers/media/rc/keymaps/rc-anysee.c | 1 + + drivers/media/rc/keymaps/rc-apac-viewcomp.c | 1 + + drivers/media/rc/keymaps/rc-astrometa-t2hybrid.c | 1 + + drivers/media/rc/keymaps/rc-asus-pc39.c | 1 + + drivers/media/rc/keymaps/rc-asus-ps3-100.c | 1 + + drivers/media/rc/keymaps/rc-ati-tv-wonder-hd-600.c | 1 + + drivers/media/rc/keymaps/rc-ati-x10.c | 1 + + drivers/media/rc/keymaps/rc-avermedia-a16d.c | 1 + + drivers/media/rc/keymaps/rc-avermedia-cardbus.c | 1 + + drivers/media/rc/keymaps/rc-avermedia-dvbt.c | 1 + + drivers/media/rc/keymaps/rc-avermedia-m135a.c | 1 + + .../media/rc/keymaps/rc-avermedia-m733a-rm-k6.c | 1 + + drivers/media/rc/keymaps/rc-avermedia-rm-ks.c | 1 + + drivers/media/rc/keymaps/rc-avermedia.c | 1 + + drivers/media/rc/keymaps/rc-avertv-303.c | 1 + + drivers/media/rc/keymaps/rc-azurewave-ad-tu700.c | 1 + + drivers/media/rc/keymaps/rc-beelink-gs1.c | 1 + + drivers/media/rc/keymaps/rc-beelink-mxiii.c | 1 + + drivers/media/rc/keymaps/rc-behold-columbus.c | 1 + + drivers/media/rc/keymaps/rc-behold.c | 1 + + drivers/media/rc/keymaps/rc-budget-ci-old.c | 1 + + drivers/media/rc/keymaps/rc-cinergy-1400.c | 1 + + drivers/media/rc/keymaps/rc-cinergy.c | 1 + + drivers/media/rc/keymaps/rc-ct-90405.c | 1 + + drivers/media/rc/keymaps/rc-d680-dmb.c | 1 + + drivers/media/rc/keymaps/rc-dib0700-nec.c | 1 + + drivers/media/rc/keymaps/rc-dib0700-rc5.c | 1 + + drivers/media/rc/keymaps/rc-digitalnow-tinytwin.c | 1 + + drivers/media/rc/keymaps/rc-digittrade.c | 1 + + drivers/media/rc/keymaps/rc-dm1105-nec.c | 1 + + drivers/media/rc/keymaps/rc-dntv-live-dvb-t.c | 1 + + drivers/media/rc/keymaps/rc-dntv-live-dvbt-pro.c | 1 + + drivers/media/rc/keymaps/rc-dreambox.c | 1 + + drivers/media/rc/keymaps/rc-dtt200u.c | 1 + + drivers/media/rc/keymaps/rc-dvbsky.c | 1 + + drivers/media/rc/keymaps/rc-dvico-mce.c | 1 + + drivers/media/rc/keymaps/rc-dvico-portable.c | 1 + + drivers/media/rc/keymaps/rc-em-terratec.c | 1 + + drivers/media/rc/keymaps/rc-encore-enltv-fm53.c | 1 + + drivers/media/rc/keymaps/rc-encore-enltv.c | 1 + + drivers/media/rc/keymaps/rc-encore-enltv2.c | 1 + + drivers/media/rc/keymaps/rc-evga-indtube.c | 1 + + drivers/media/rc/keymaps/rc-eztv.c | 1 + + drivers/media/rc/keymaps/rc-flydvb.c | 1 + + drivers/media/rc/keymaps/rc-flyvideo.c | 1 + + drivers/media/rc/keymaps/rc-fusionhdtv-mce.c | 1 + + drivers/media/rc/keymaps/rc-gadmei-rm008z.c | 1 + + drivers/media/rc/keymaps/rc-geekbox.c | 1 + + drivers/media/rc/keymaps/rc-genius-tvgo-a11mce.c | 1 + + drivers/media/rc/keymaps/rc-gotview7135.c | 1 + + drivers/media/rc/keymaps/rc-hauppauge.c | 1 + + drivers/media/rc/keymaps/rc-hisi-poplar.c | 1 + + drivers/media/rc/keymaps/rc-hisi-tv-demo.c | 1 + + drivers/media/rc/keymaps/rc-imon-mce.c | 1 + + drivers/media/rc/keymaps/rc-imon-pad.c | 1 + + drivers/media/rc/keymaps/rc-imon-rsc.c | 1 + + drivers/media/rc/keymaps/rc-iodata-bctv7e.c | 1 + + drivers/media/rc/keymaps/rc-it913x-v1.c | 1 + + drivers/media/rc/keymaps/rc-it913x-v2.c | 1 + + drivers/media/rc/keymaps/rc-kaiomy.c | 1 + + drivers/media/rc/keymaps/rc-khadas.c | 1 + + drivers/media/rc/keymaps/rc-khamsin.c | 1 + + drivers/media/rc/keymaps/rc-kworld-315u.c | 1 + + drivers/media/rc/keymaps/rc-kworld-pc150u.c | 1 + + .../media/rc/keymaps/rc-kworld-plus-tv-analog.c | 1 + + drivers/media/rc/keymaps/rc-leadtek-y04g0051.c | 1 + + drivers/media/rc/keymaps/rc-lme2510.c | 1 + + drivers/media/rc/keymaps/rc-manli.c | 1 + + drivers/media/rc/keymaps/rc-mecool-kii-pro.c | 1 + + drivers/media/rc/keymaps/rc-mecool-kiii-pro.c | 1 + + drivers/media/rc/keymaps/rc-medion-x10.c | 1 + + drivers/media/rc/keymaps/rc-minix-neo.c | 1 + + drivers/media/rc/keymaps/rc-msi-digivox-ii.c | 1 + + drivers/media/rc/keymaps/rc-msi-digivox-iii.c | 1 + + drivers/media/rc/keymaps/rc-msi-tvanywhere-plus.c | 1 + + drivers/media/rc/keymaps/rc-msi-tvanywhere.c | 1 + + drivers/media/rc/keymaps/rc-nebula.c | 1 + + .../media/rc/keymaps/rc-nec-terratec-cinergy-xs.c | 1 + + drivers/media/rc/keymaps/rc-norwood.c | 1 + + drivers/media/rc/keymaps/rc-npgtech.c | 1 + + drivers/media/rc/keymaps/rc-odroid.c | 1 + + drivers/media/rc/keymaps/rc-pctv-sedna.c | 1 + + drivers/media/rc/keymaps/rc-pine64.c | 1 + + drivers/media/rc/keymaps/rc-pinnacle-color.c | 1 + + drivers/media/rc/keymaps/rc-pinnacle-grey.c | 1 + + drivers/media/rc/keymaps/rc-pinnacle-pctv-hd.c | 1 + + drivers/media/rc/keymaps/rc-pixelview-002t.c | 1 + + drivers/media/rc/keymaps/rc-pixelview-mk12.c | 1 + + drivers/media/rc/keymaps/rc-pixelview-new.c | 1 + + drivers/media/rc/keymaps/rc-pixelview.c | 1 + + .../media/rc/keymaps/rc-powercolor-real-angel.c | 1 + + drivers/media/rc/keymaps/rc-proteus-2309.c | 1 + + drivers/media/rc/keymaps/rc-purpletv.c | 1 + + drivers/media/rc/keymaps/rc-pv951.c | 1 + + drivers/media/rc/keymaps/rc-rc6-mce.c | 1 + + .../media/rc/keymaps/rc-real-audio-220-32-keys.c | 1 + + drivers/media/rc/keymaps/rc-reddo.c | 1 + + drivers/media/rc/keymaps/rc-snapstream-firefly.c | 1 + + drivers/media/rc/keymaps/rc-streamzap.c | 1 + + drivers/media/rc/keymaps/rc-su3000.c | 1 + + drivers/media/rc/keymaps/rc-tanix-tx3mini.c | 1 + + drivers/media/rc/keymaps/rc-tanix-tx5max.c | 1 + + drivers/media/rc/keymaps/rc-tbs-nec.c | 1 + + drivers/media/rc/keymaps/rc-technisat-ts35.c | 1 + + drivers/media/rc/keymaps/rc-technisat-usb2.c | 1 + + .../media/rc/keymaps/rc-terratec-cinergy-c-pci.c | 1 + + .../media/rc/keymaps/rc-terratec-cinergy-s2-hd.c | 1 + + drivers/media/rc/keymaps/rc-terratec-cinergy-xs.c | 1 + + drivers/media/rc/keymaps/rc-terratec-slim-2.c | 1 + + drivers/media/rc/keymaps/rc-terratec-slim.c | 1 + + drivers/media/rc/keymaps/rc-tevii-nec.c | 1 + + drivers/media/rc/keymaps/rc-tivo.c | 1 + + .../media/rc/keymaps/rc-total-media-in-hand-02.c | 1 + + drivers/media/rc/keymaps/rc-total-media-in-hand.c | 1 + + drivers/media/rc/keymaps/rc-trekstor.c | 1 + + drivers/media/rc/keymaps/rc-tt-1500.c | 1 + + drivers/media/rc/keymaps/rc-twinhan-dtv-cab-ci.c | 1 + + drivers/media/rc/keymaps/rc-twinhan1027.c | 1 + + drivers/media/rc/keymaps/rc-vega-s9x.c | 1 + + drivers/media/rc/keymaps/rc-videomate-m1f.c | 1 + + drivers/media/rc/keymaps/rc-videomate-s350.c | 1 + + drivers/media/rc/keymaps/rc-videomate-tv-pvr.c | 1 + + drivers/media/rc/keymaps/rc-videostrong-kii-pro.c | 1 + + drivers/media/rc/keymaps/rc-wetek-hub.c | 1 + + drivers/media/rc/keymaps/rc-wetek-play2.c | 1 + + drivers/media/rc/keymaps/rc-winfast-usbii-deluxe.c | 1 + + drivers/media/rc/keymaps/rc-winfast.c | 1 + + drivers/media/rc/keymaps/rc-x96max.c | 1 + + drivers/media/rc/keymaps/rc-xbox-360.c | 1 + + drivers/media/rc/keymaps/rc-xbox-dvd.c | 1 + + drivers/media/rc/keymaps/rc-zx-irdec.c | 1 + + drivers/media/rc/lirc_dev.c | 6 +- + drivers/media/rc/meson-ir.c | 560 ++- + drivers/media/rc/pwm-ir-tx.c | 1 + + drivers/media/test-drivers/vidtv/vidtv_mux.c | 7 +- + drivers/media/test-drivers/vidtv/vidtv_psi.c | 45 +- + drivers/media/test-drivers/vivid/vivid-core.c | 2 +- + drivers/media/test-drivers/vivid/vivid-rds-gen.c | 2 +- + drivers/media/usb/cx231xx/cx231xx-417.c | 9 +- + drivers/media/usb/cx231xx/cx231xx-core.c | 7 +- + drivers/media/usb/cx231xx/cx231xx.h | 3 + + drivers/media/usb/dvb-usb-v2/af9035.c | 13 +- + drivers/media/usb/dvb-usb/gp8psk.c | 2 +- + drivers/media/usb/gspca/cpia1.c | 3 + + drivers/media/usb/siano/smsusb.c | 4 +- + drivers/media/v4l2-core/Kconfig | 16 - + drivers/media/v4l2-core/Makefile | 5 - + drivers/media/v4l2-core/v4l2-event.c | 2 +- + drivers/media/v4l2-core/v4l2-ioctl.c | 1 + + drivers/media/v4l2-core/v4l2-subdev.c | 55 +- + drivers/media/v4l2-core/videobuf-core.c | 1198 ------- + drivers/media/v4l2-core/videobuf-dma-contig.c | 402 --- + drivers/media/v4l2-core/videobuf-dma-sg.c | 681 ---- + drivers/media/v4l2-core/videobuf-vmalloc.c | 326 -- + drivers/staging/media/atomisp/Kconfig | 12 - + drivers/staging/media/atomisp/Makefile | 16 +- + drivers/staging/media/atomisp/TODO | 3 - + drivers/staging/media/atomisp/i2c/Kconfig | 12 - + drivers/staging/media/atomisp/i2c/Makefile | 1 - + drivers/staging/media/atomisp/i2c/atomisp-gc0310.c | 26 +- + drivers/staging/media/atomisp/i2c/ov5693/Makefile | 2 - + drivers/staging/media/atomisp/i2c/ov5693/ad5823.h | 63 - + .../media/atomisp/i2c/ov5693/atomisp-ov5693.c | 1763 ---------- + drivers/staging/media/atomisp/i2c/ov5693/ov5693.h | 1331 ------- + .../staging/media/atomisp/include/linux/atomisp.h | 10 - + drivers/staging/media/atomisp/pci/atomisp_cmd.c | 44 +- + drivers/staging/media/atomisp/pci/atomisp_cmd.h | 13 - + .../media/atomisp/pci/atomisp_compat_css20.c | 15 +- + .../media/atomisp/pci/atomisp_csi2_bridge.c | 7 +- + drivers/staging/media/atomisp/pci/atomisp_fops.c | 7 +- + drivers/staging/media/atomisp/pci/atomisp_ioctl.c | 21 +- + drivers/staging/media/atomisp/pci/atomisp_subdev.c | 48 - + drivers/staging/media/atomisp/pci/atomisp_subdev.h | 2 - + drivers/staging/media/atomisp/pci/atomisp_v4l2.c | 19 - + .../pci/css_2401_system/host/isys_irq_local.h | 3 - + .../pci/css_2401_system/host/isys_irq_private.h | 2 - + .../atomisp/pci/css_2401_system/isys_irq_global.h | 2 - + .../atomisp/pci/hive_isp_css_common/debug_global.h | 7 - + .../atomisp/pci/hive_isp_css_common/host/dma.c | 266 -- + .../pci/hive_isp_css_common/host/dma_local.h | 116 - + .../pci/hive_isp_css_common/host/input_formatter.c | 2 - + .../pci/hive_isp_css_common/host/input_system.c | 446 --- + .../atomisp/pci/hive_isp_css_common/host/irq.c | 19 - + .../pci/hive_isp_css_common/host/irq_local.h | 8 - + .../atomisp/pci/hive_isp_css_common/host/isp.c | 60 - + .../pci/hive_isp_css_common/host/isp_local.h | 31 - + .../atomisp/pci/hive_isp_css_common/host/sp.c | 47 - + .../pci/hive_isp_css_common/host/sp_local.h | 26 - + .../pci/hive_isp_css_include/host/csi_rx_public.h | 2 - + .../pci/hive_isp_css_include/host/dma_public.h | 13 - + .../pci/hive_isp_css_include/host/irq_public.h | 10 - + .../pci/hive_isp_css_include/host/isp_public.h | 13 - + .../hive_isp_css_include/host/isys_dma_public.h | 2 - + .../hive_isp_css_include/host/isys_irq_public.h | 2 - + .../pci/hive_isp_css_include/host/isys_public.h | 38 - + .../hive_isp_css_include/host/pixelgen_public.h | 2 - + .../pci/hive_isp_css_include/host/sp_public.h | 16 - + .../atomisp/pci/hive_isp_css_include/isys_irq.h | 2 - + .../staging/media/atomisp/pci/ia_css_acc_types.h | 6 +- + drivers/staging/media/atomisp/pci/ia_css_mipi.h | 16 - + .../staging/media/atomisp/pci/input_system_local.h | 7 +- + .../media/atomisp/pci/input_system_private.h | 7 +- + .../media/atomisp/pci/input_system_public.h | 4 +- + .../pci/isp/kernels/raw/raw_1.0/ia_css_raw.host.c | 21 +- + .../media/atomisp/pci/isp2400_input_system_local.h | 198 +- + .../atomisp/pci/isp2400_input_system_private.h | 4 +- + .../atomisp/pci/isp2400_input_system_public.h | 42 +- + .../media/atomisp/pci/isp2401_input_system_local.h | 88 +- + .../atomisp/pci/isp2401_input_system_private.h | 112 +- + .../media/atomisp/pci/runtime/binary/src/binary.c | 15 +- + .../pci/runtime/debug/interface/ia_css_debug.h | 85 - + .../atomisp/pci/runtime/debug/src/ia_css_debug.c | 1495 +------- + .../media/atomisp/pci/runtime/ifmtr/src/ifmtr.c | 2 - + .../pci/runtime/isys/interface/ia_css_isys.h | 9 +- + .../pci/runtime/isys/interface/ia_css_isys_comm.h | 2 - + .../atomisp/pci/runtime/isys/src/csi_rx_rmgr.c | 2 - + .../atomisp/pci/runtime/isys/src/isys_dma_rmgr.c | 2 - + .../media/atomisp/pci/runtime/isys/src/isys_init.c | 35 +- + .../pci/runtime/isys/src/isys_stream2mmio_rmgr.c | 2 - + .../media/atomisp/pci/runtime/isys/src/rx.c | 265 +- + .../atomisp/pci/runtime/isys/src/virtual_isys.c | 8 +- + .../runtime/pipeline/interface/ia_css_pipeline.h | 2 - + .../atomisp/pci/runtime/pipeline/src/pipeline.c | 2 - + drivers/staging/media/atomisp/pci/sh_css.c | 236 +- + .../staging/media/atomisp/pci/sh_css_internal.h | 41 +- + drivers/staging/media/atomisp/pci/sh_css_mipi.c | 29 - + drivers/staging/media/atomisp/pci/sh_css_params.c | 41 +- + drivers/staging/media/atomisp/pci/sh_css_sp.c | 62 +- + drivers/staging/media/atomisp/pci/sh_css_sp.h | 4 - + .../media/deprecated/atmel/atmel-isc-base.c | 4 - + drivers/staging/media/ipu3/ipu3-css-params.c | 44 +- + drivers/staging/media/ipu3/ipu3.c | 6 - + drivers/staging/media/omap4iss/iss_csi2.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus.c | 2 +- + drivers/staging/media/sunxi/cedrus/cedrus_hw.c | 24 +- + drivers/staging/media/tegra-video/csi.c | 4 +- + drivers/staging/media/tegra-video/vip.c | 2 +- + include/linux/platform_data/cros_ec_commands.h | 66 +- + include/media/cec.h | 2 +- + include/media/ipu-bridge.h | 2 +- + include/media/mipi-csi2.h | 1 + + include/media/v4l2-dev.h | 2 +- + include/media/v4l2-device.h | 4 +- + include/media/v4l2-event.h | 2 +- + include/media/v4l2-mc.h | 6 + + include/media/v4l2-subdev.h | 13 +- + include/media/videobuf-core.h | 233 -- + include/media/videobuf-dma-contig.h | 30 - + include/media/videobuf-dma-sg.h | 102 - + include/media/videobuf-vmalloc.h | 43 - + include/uapi/linux/npcm-video.h | 41 + + include/uapi/linux/v4l2-controls.h | 6 + + include/uapi/linux/videodev2.h | 1 + + 499 files changed, 17338 insertions(+), 18166 deletions(-) + create mode 100644 Documentation/admin-guide/media/mgb4.rst + create mode 100644 Documentation/devicetree/bindings/media/i2c/onnn,mt9m114.yaml + create mode 100644 Documentation/devicetree/bindings/media/i2c/ovti,ov5642.yaml + delete mode 100644 Documentation/devicetree/bindings/media/nokia,n900-ir + create mode 100644 Documentation/devicetree/bindings/media/nuvoton,npcm-ece.yaml + create mode 100644 Documentation/devicetree/bindings/media/nuvoton,npcm-vcd.yaml + create mode 100644 Documentation/devicetree/bindings/media/ti,j721e-csi2rx-shim.yaml + create mode 100644 Documentation/devicetree/bindings/soc/nuvoton/nuvoton,gfxi.yaml + delete mode 100644 Documentation/driver-api/media/v4l2-videobuf.rst + create mode 100644 Documentation/userspace-api/media/drivers/camera-sensor.rst + create mode 100644 Documentation/userspace-api/media/drivers/npcm-video.rst + create mode 100644 drivers/media/i2c/mt9m114.c + create mode 100644 drivers/media/pci/mgb4/Kconfig + create mode 100644 drivers/media/pci/mgb4/Makefile + create mode 100644 drivers/media/pci/mgb4/mgb4_cmt.c + create mode 100644 drivers/media/pci/mgb4/mgb4_cmt.h + create mode 100644 drivers/media/pci/mgb4/mgb4_core.c + create mode 100644 drivers/media/pci/mgb4/mgb4_core.h + create mode 100644 drivers/media/pci/mgb4/mgb4_dma.c + create mode 100644 drivers/media/pci/mgb4/mgb4_dma.h + create mode 100644 drivers/media/pci/mgb4/mgb4_i2c.c + create mode 100644 drivers/media/pci/mgb4/mgb4_i2c.h + create mode 100644 drivers/media/pci/mgb4/mgb4_io.h + create mode 100644 drivers/media/pci/mgb4/mgb4_regs.c + create mode 100644 drivers/media/pci/mgb4/mgb4_regs.h + create mode 100644 drivers/media/pci/mgb4/mgb4_sysfs.h + create mode 100644 drivers/media/pci/mgb4/mgb4_sysfs_in.c + create mode 100644 drivers/media/pci/mgb4/mgb4_sysfs_out.c + create mode 100644 drivers/media/pci/mgb4/mgb4_sysfs_pci.c + create mode 100644 drivers/media/pci/mgb4/mgb4_trigger.c + create mode 100644 drivers/media/pci/mgb4/mgb4_trigger.h + create mode 100644 drivers/media/pci/mgb4/mgb4_vin.c + create mode 100644 drivers/media/pci/mgb4/mgb4_vin.h + create mode 100644 drivers/media/pci/mgb4/mgb4_vout.c + create mode 100644 drivers/media/pci/mgb4/mgb4_vout.h + create mode 100644 drivers/media/platform/nuvoton/Kconfig + create mode 100644 drivers/media/platform/nuvoton/Makefile + create mode 100644 drivers/media/platform/nuvoton/npcm-regs.h + create mode 100644 drivers/media/platform/nuvoton/npcm-video.c + create mode 100644 drivers/media/platform/ti/j721e-csi2rx/Makefile + create mode 100644 drivers/media/platform/ti/j721e-csi2rx/j721e-csi2rx.c + delete mode 100644 drivers/media/rc/ir-rx51.c + delete mode 100644 drivers/media/v4l2-core/videobuf-core.c + delete mode 100644 drivers/media/v4l2-core/videobuf-dma-contig.c + delete mode 100644 drivers/media/v4l2-core/videobuf-dma-sg.c + delete mode 100644 drivers/media/v4l2-core/videobuf-vmalloc.c + delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/Makefile + delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ad5823.h + delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/atomisp-ov5693.c + delete mode 100644 drivers/staging/media/atomisp/i2c/ov5693/ov5693.h + delete mode 100644 drivers/staging/media/atomisp/pci/hive_isp_css_include/host/isys_public.h + delete mode 100644 include/media/videobuf-core.h + delete mode 100644 include/media/videobuf-dma-contig.h + delete mode 100644 include/media/videobuf-dma-sg.h + delete mode 100644 include/media/videobuf-vmalloc.h + create mode 100644 include/uapi/linux/npcm-video.h +$ git am -3 ../patches/0001-v4l-dvb-next-fix-up-for-bad-automatic-merge.patch +Applying: v4l-dvb-next: fix up for bad automatic merge. +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/media/platform/qcom/camss/camss.c +$ git add -A . +$ git commit -v -a --amend +[master e2af1a1a999d] Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git + Date: Mon Oct 16 10:01:11 2023 +1100 +Merging pm/linux-next (8134843f53ba Merge branch 'thermal-intel' 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/osl.c +Auto-merging include/linux/pm.h +Auto-merging kernel/power/swap.c +Merge made by the 'ort' strategy. + .../devicetree/bindings/thermal/thermal-zones.yaml | 2 +- + Documentation/driver-api/thermal/intel_dptf.rst | 64 ++ + Documentation/firmware-guide/acpi/enumeration.rst | 43 + + MAINTAINERS | 2 +- + drivers/acpi/ac.c | 2 +- + drivers/acpi/acpi_fpdt.c | 45 +- + drivers/acpi/acpi_lpss.c | 21 +- + drivers/acpi/acpi_video.c | 2 +- + drivers/acpi/apei/ghes.c | 23 +- + drivers/acpi/battery.c | 2 +- + drivers/acpi/bus.c | 4 +- + drivers/acpi/hed.c | 2 +- + drivers/acpi/nfit/core.c | 2 +- + drivers/acpi/osi.c | 2 +- + drivers/acpi/osl.c | 28 +- + drivers/acpi/pci_root.c | 6 +- + drivers/acpi/prmt.c | 2 +- + drivers/acpi/property.c | 20 +- + drivers/acpi/resource.c | 84 +- + drivers/acpi/scan.c | 1 + + drivers/acpi/thermal.c | 889 ++++++++++----------- + drivers/acpi/utils.c | 68 +- + drivers/acpi/video_detect.c | 84 +- + drivers/acpi/x86/s2idle.c | 5 +- + drivers/cpufreq/cpufreq.c | 3 +- + drivers/cpufreq/cpufreq_conservative.c | 3 +- + drivers/cpufreq/cpufreq_userspace.c | 74 +- + drivers/cpufreq/intel_pstate.c | 6 +- + drivers/pci/pcie/aer.c | 10 + + drivers/platform/surface/surface_acpi_notify.c | 10 +- + drivers/thermal/amlogic_thermal.c | 8 +- + drivers/thermal/armada_thermal.c | 6 +- + drivers/thermal/broadcom/bcm2835_thermal.c | 6 +- + drivers/thermal/broadcom/ns-thermal.c | 6 +- + drivers/thermal/da9062-thermal.c | 5 +- + drivers/thermal/dove_thermal.c | 6 +- + drivers/thermal/gov_bang_bang.c | 27 +- + drivers/thermal/gov_fair_share.c | 35 +- + drivers/thermal/gov_power_allocator.c | 120 ++- + drivers/thermal/gov_step_wise.c | 50 +- + drivers/thermal/gov_user_space.c | 8 +- + drivers/thermal/hisi_thermal.c | 6 +- + drivers/thermal/imx8mm_thermal.c | 6 +- + drivers/thermal/imx_thermal.c | 6 +- + drivers/thermal/intel/int340x_thermal/Makefile | 3 + + .../intel/int340x_thermal/int3400_thermal.c | 5 +- + .../intel/int340x_thermal/int3401_thermal.c | 6 +- + .../intel/int340x_thermal/int3402_thermal.c | 6 +- + .../intel/int340x_thermal/int3403_thermal.c | 6 +- + .../intel/int340x_thermal/int3406_thermal.c | 5 +- + .../intel/int340x_thermal/int340x_thermal_zone.c | 80 +- + .../int340x_thermal/processor_thermal_device.c | 85 +- + .../int340x_thermal/processor_thermal_device.h | 33 +- + .../int340x_thermal/processor_thermal_device_pci.c | 123 ++- + .../processor_thermal_device_pci_legacy.c | 3 +- + .../intel/int340x_thermal/processor_thermal_mbox.c | 193 ++--- + .../processor_thermal_power_floor.c | 126 +++ + .../int340x_thermal/processor_thermal_wt_hint.c | 255 ++++++ + .../int340x_thermal/processor_thermal_wt_req.c | 136 ++++ + drivers/thermal/intel/intel_powerclamp.c | 2 +- + drivers/thermal/k3_bandgap.c | 6 +- + drivers/thermal/k3_j72xx_bandgap.c | 6 +- + drivers/thermal/kirkwood_thermal.c | 6 +- + drivers/thermal/mediatek/lvts_thermal.c | 6 +- + drivers/thermal/qcom/tsens.c | 6 +- + drivers/thermal/rcar_gen3_thermal.c | 6 +- + drivers/thermal/rcar_thermal.c | 6 +- + drivers/thermal/rockchip_thermal.c | 6 +- + drivers/thermal/rzg2l_thermal.c | 6 +- + drivers/thermal/samsung/exynos_tmu.c | 6 +- + drivers/thermal/spear_thermal.c | 6 +- + drivers/thermal/sprd_thermal.c | 5 +- + drivers/thermal/st/stm_thermal.c | 6 +- + drivers/thermal/tegra/soctherm.c | 6 +- + drivers/thermal/tegra/tegra-bpmp-thermal.c | 6 +- + drivers/thermal/thermal_core.c | 137 ++-- + drivers/thermal/thermal_core.h | 9 +- + drivers/thermal/thermal_helpers.c | 8 +- + drivers/thermal/thermal_sysfs.c | 3 +- + drivers/thermal/thermal_trip.c | 36 +- + drivers/thermal/ti-soc-thermal/ti-bandgap.c | 6 +- + drivers/thermal/uniphier_thermal.c | 6 +- + include/acpi/acpi_bus.h | 11 +- + include/acpi/actbl1.h | 3 + + include/acpi/ghes.h | 4 + + include/linux/cpufreq.h | 8 - + include/linux/pm.h | 43 +- + include/linux/pnp.h | 8 +- + include/linux/thermal.h | 20 +- + kernel/power/snapshot.c | 16 +- + kernel/power/swap.c | 4 +- + kernel/sched/cpufreq_schedutil.c | 66 +- + .../x86/intel_pstate_tracer/intel_pstate_tracer.py | 12 +- + tools/testing/selftests/Makefile | 2 + + .../selftests/thermal/intel/power_floor/Makefile | 12 + + .../thermal/intel/power_floor/power_floor_test.c | 108 +++ + .../selftests/thermal/intel/workload_hint/Makefile | 12 + + .../intel/workload_hint/workload_hint_test.c | 157 ++++ + 98 files changed, 2390 insertions(+), 1261 deletions(-) + create mode 100644 drivers/thermal/intel/int340x_thermal/processor_thermal_power_floor.c + create mode 100644 drivers/thermal/intel/int340x_thermal/processor_thermal_wt_hint.c + create mode 100644 drivers/thermal/intel/int340x_thermal/processor_thermal_wt_req.c + create mode 100644 tools/testing/selftests/thermal/intel/power_floor/Makefile + create mode 100644 tools/testing/selftests/thermal/intel/power_floor/power_floor_test.c + create mode 100644 tools/testing/selftests/thermal/intel/workload_hint/Makefile + create mode 100644 tools/testing/selftests/thermal/intel/workload_hint/workload_hint_test.c +Merging cpufreq-arm/cpufreq/arm/linux-next (21135104a67e cpufreq: ARM_BRCMSTB_AVS_CPUFREQ cannot be used with ARM_SCMI_CPUFREQ) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Merge made by the 'ort' strategy. + .../bindings/cpufreq/cpufreq-qcom-hw.yaml | 2 + + .../bindings/cpufreq/qcom-cpufreq-nvmem.yaml | 3 + + drivers/cpufreq/Kconfig.arm | 2 +- + drivers/cpufreq/cpufreq-dt-platdev.c | 3 + + drivers/cpufreq/pmac32-cpufreq.c | 7 +- + drivers/cpufreq/tegra194-cpufreq.c | 153 +++++++++++++++------ + drivers/cpufreq/ti-cpufreq.c | 1 + + 7 files changed, 121 insertions(+), 50 deletions(-) +Merging cpupower/cpupower (0bb80ecc33a8 Linux 6.6-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 (e50fa1a5ac52 PM / devfreq: exynos-ppmu: Use device_get_match_data()) +$ 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/devfreq.c | 14 ++-- + drivers/devfreq/event/exynos-ppmu.c | 13 +--- + drivers/devfreq/event/rockchip-dfi.c | 127 ++++++++++++++++++++--------------- + drivers/devfreq/mtk-cci-devfreq.c | 6 +- + 4 files changed, 84 insertions(+), 76 deletions(-) +Merging pmdomain/next (38a88d52dd37 pmdomain: Use device_get_match_data()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Auto-merging MAINTAINERS +Auto-merging drivers/soc/apple/Kconfig +CONFLICT (content): Merge conflict in drivers/soc/apple/Kconfig +Auto-merging drivers/soc/bcm/Kconfig +Auto-merging drivers/soc/renesas/Kconfig +Resolved 'drivers/soc/apple/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d1766ba2fa0f] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/power/mediatek,power-controller.yaml | 6 + + .../devicetree/bindings/power/qcom,rpmpd.yaml | 1 + + MAINTAINERS | 6 +- + drivers/Kconfig | 2 + + drivers/firmware/imx/Kconfig | 6 - + drivers/pmdomain/Kconfig | 21 ++ + drivers/{soc => pmdomain}/actions/Kconfig | 0 + drivers/pmdomain/actions/owl-sps.c | 16 +- + drivers/pmdomain/amlogic/Kconfig | 39 ++++ + drivers/pmdomain/amlogic/meson-secure-pwrc.c | 127 +++++++++-- + drivers/pmdomain/apple/Kconfig | 18 ++ + drivers/pmdomain/bcm/Kconfig | 42 ++++ + drivers/pmdomain/imx/Kconfig | 29 +++ + drivers/pmdomain/imx/gpc.c | 7 +- + drivers/pmdomain/mediatek/Kconfig | 29 +++ + drivers/pmdomain/mediatek/mt6795-pm-domains.h | 16 +- + drivers/pmdomain/mediatek/mt8167-pm-domains.h | 20 +- + drivers/pmdomain/mediatek/mt8173-pm-domains.h | 16 +- + drivers/pmdomain/mediatek/mt8183-pm-domains.h | 125 ++++++----- + drivers/pmdomain/mediatek/mt8186-pm-domains.h | 236 ++++++++++++--------- + drivers/pmdomain/mediatek/mt8188-pm-domains.h | 223 ++++++++++++------- + drivers/pmdomain/mediatek/mt8192-pm-domains.h | 112 ++++++---- + drivers/pmdomain/mediatek/mt8195-pm-domains.h | 199 ++++++++++------- + drivers/pmdomain/mediatek/mt8365-pm-domains.h | 197 +++++++++++++++++ + drivers/pmdomain/mediatek/mtk-pm-domains.c | 165 +++++++++----- + drivers/pmdomain/mediatek/mtk-pm-domains.h | 51 +++-- + drivers/pmdomain/qcom/Kconfig | 41 ++++ + drivers/pmdomain/qcom/rpmhpd.c | 18 ++ + drivers/pmdomain/renesas/Kconfig | 109 ++++++++++ + drivers/pmdomain/renesas/rmobile-sysc.c | 2 +- + drivers/pmdomain/rockchip/Kconfig | 16 ++ + drivers/pmdomain/rockchip/pm-domains.c | 13 +- + drivers/pmdomain/samsung/Kconfig | 8 + + drivers/pmdomain/st/Kconfig | 5 + + drivers/pmdomain/st/Makefile | 2 +- + drivers/{soc => pmdomain}/starfive/Kconfig | 4 +- + drivers/pmdomain/starfive/jh71xx-pmu.c | 139 +++++++++--- + drivers/pmdomain/sunxi/Kconfig | 10 + + drivers/pmdomain/tegra/Kconfig | 6 + + drivers/pmdomain/ti/Kconfig | 22 ++ + drivers/pmdomain/ti/Makefile | 2 +- + drivers/pmdomain/ti/ti_sci_pm_domains.c | 8 +- + drivers/pmdomain/xilinx/Kconfig | 10 + + drivers/soc/Kconfig | 2 - + drivers/soc/amlogic/Kconfig | 35 --- + drivers/soc/apple/Kconfig | 13 -- + drivers/soc/bcm/Kconfig | 51 ----- + drivers/soc/imx/Kconfig | 19 -- + drivers/soc/mediatek/Kconfig | 23 -- + drivers/soc/qcom/Kconfig | 37 ---- + drivers/soc/renesas/Kconfig | 105 --------- + drivers/soc/rockchip/Kconfig | 12 -- + drivers/soc/samsung/Kconfig | 4 - + drivers/soc/sunxi/Kconfig | 9 - + drivers/soc/tegra/Kconfig | 5 - + drivers/soc/ti/Kconfig | 12 -- + drivers/soc/xilinx/Kconfig | 9 - + include/dt-bindings/power/mediatek,mt8365-power.h | 19 ++ + include/dt-bindings/power/starfive,jh7110-pmu.h | 6 +- + include/linux/soc/mediatek/infracfg.h | 41 ++++ + 60 files changed, 1657 insertions(+), 869 deletions(-) + create mode 100644 drivers/pmdomain/Kconfig + rename drivers/{soc => pmdomain}/actions/Kconfig (100%) + create mode 100644 drivers/pmdomain/amlogic/Kconfig + create mode 100644 drivers/pmdomain/apple/Kconfig + create mode 100644 drivers/pmdomain/bcm/Kconfig + create mode 100644 drivers/pmdomain/imx/Kconfig + create mode 100644 drivers/pmdomain/mediatek/Kconfig + create mode 100644 drivers/pmdomain/mediatek/mt8365-pm-domains.h + create mode 100644 drivers/pmdomain/qcom/Kconfig + create mode 100644 drivers/pmdomain/renesas/Kconfig + create mode 100644 drivers/pmdomain/rockchip/Kconfig + create mode 100644 drivers/pmdomain/samsung/Kconfig + create mode 100644 drivers/pmdomain/st/Kconfig + rename drivers/{soc => pmdomain}/starfive/Kconfig (84%) + create mode 100644 drivers/pmdomain/sunxi/Kconfig + create mode 100644 drivers/pmdomain/tegra/Kconfig + create mode 100644 drivers/pmdomain/ti/Kconfig + create mode 100644 drivers/pmdomain/xilinx/Kconfig + create mode 100644 include/dt-bindings/power/mediatek,mt8365-power.h +Merging opp/opp/linux-next (4cd8fe213512 OPP: No need to defer probe from _opp_attach_genpd()) +$ 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 +Merge made by the 'ort' strategy. + .../devicetree/bindings/opp/opp-v2-kryo-cpu.yaml | 14 +- + drivers/opp/core.c | 171 ++++++--------------- + drivers/opp/debugfs.c | 2 +- + drivers/opp/of.c | 72 +++++---- + drivers/opp/opp.h | 2 - + include/linux/pm_opp.h | 9 ++ + 6 files changed, 105 insertions(+), 165 deletions(-) +Merging thermal/thermal/linux-next (edd220b33f47 thermal: core: Drop thermal_zone_device_register()) +$ 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 (eb53c01873ca MAINTAINERS: Update dlm maintainer and web page) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/teigland/linux-dlm.git dlm/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + MAINTAINERS | 4 ++-- + fs/dlm/debug_fs.c | 18 +++++++----------- + fs/dlm/lowcomms.c | 12 ++++++++++++ + fs/dlm/midcomms.c | 39 ++++++++++++++++++++++++++++++++------- + 4 files changed, 53 insertions(+), 20 deletions(-) +Merging rdma/for-next (5ac388db27c4 RDMA/irdma: Add support to re-register a memory region) +$ 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/core/nldev.c +Auto-merging drivers/infiniband/hw/hfi1/file_ops.c +Auto-merging drivers/infiniband/hw/mlx5/main.c +Auto-merging drivers/infiniband/hw/mlx5/mr.c +CONFLICT (content): Merge conflict in drivers/infiniband/hw/mlx5/mr.c +Auto-merging drivers/infiniband/sw/siw/siw_cm.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/cmd.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en_main.c +Resolved 'drivers/infiniband/hw/mlx5/mr.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 3c37c8f6f1ac] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git +$ git diff -M --stat --summary HEAD^.. + drivers/infiniband/core/cache.c | 2 +- + drivers/infiniband/core/device.c | 4 +- + drivers/infiniband/core/nldev.c | 26 +- + drivers/infiniband/core/rw.c | 2 +- + drivers/infiniband/core/sa_query.c | 4 +- + drivers/infiniband/core/sysfs.c | 14 +- + drivers/infiniband/core/user_mad.c | 4 +- + drivers/infiniband/core/uverbs_std_types_device.c | 3 +- + drivers/infiniband/core/verbs.c | 7 +- + drivers/infiniband/hw/bnxt_re/qplib_tlv.h | 2 +- + drivers/infiniband/hw/hfi1/affinity.c | 2 +- + drivers/infiniband/hw/hfi1/affinity.h | 2 +- + drivers/infiniband/hw/hfi1/aspm.h | 2 +- + drivers/infiniband/hw/hfi1/chip.c | 6 +- + drivers/infiniband/hw/hfi1/chip.h | 2 +- + drivers/infiniband/hw/hfi1/chip_registers.h | 2 +- + drivers/infiniband/hw/hfi1/common.h | 2 +- + drivers/infiniband/hw/hfi1/debugfs.c | 2 +- + drivers/infiniband/hw/hfi1/debugfs.h | 2 +- + drivers/infiniband/hw/hfi1/device.c | 2 +- + drivers/infiniband/hw/hfi1/device.h | 2 +- + drivers/infiniband/hw/hfi1/driver.c | 2 +- + drivers/infiniband/hw/hfi1/efivar.c | 2 +- + drivers/infiniband/hw/hfi1/efivar.h | 2 +- + drivers/infiniband/hw/hfi1/eprom.c | 2 +- + drivers/infiniband/hw/hfi1/eprom.h | 2 +- + drivers/infiniband/hw/hfi1/exp_rcv.c | 2 +- + drivers/infiniband/hw/hfi1/exp_rcv.h | 2 +- + drivers/infiniband/hw/hfi1/fault.c | 2 +- + drivers/infiniband/hw/hfi1/fault.h | 2 +- + drivers/infiniband/hw/hfi1/file_ops.c | 2 +- + drivers/infiniband/hw/hfi1/firmware.c | 2 +- + drivers/infiniband/hw/hfi1/hfi.h | 2 +- + drivers/infiniband/hw/hfi1/init.c | 2 +- + drivers/infiniband/hw/hfi1/intr.c | 2 +- + drivers/infiniband/hw/hfi1/iowait.h | 2 +- + drivers/infiniband/hw/hfi1/ipoib_tx.c | 2 +- + drivers/infiniband/hw/hfi1/mad.c | 2 +- + drivers/infiniband/hw/hfi1/mad.h | 2 +- + drivers/infiniband/hw/hfi1/mmu_rb.c | 2 +- + drivers/infiniband/hw/hfi1/mmu_rb.h | 2 +- + drivers/infiniband/hw/hfi1/opa_compat.h | 2 +- + drivers/infiniband/hw/hfi1/pcie.c | 11 +- + drivers/infiniband/hw/hfi1/pio.c | 2 +- + drivers/infiniband/hw/hfi1/pio.h | 2 +- + drivers/infiniband/hw/hfi1/pio_copy.c | 2 +- + drivers/infiniband/hw/hfi1/platform.c | 2 +- + drivers/infiniband/hw/hfi1/platform.h | 2 +- + drivers/infiniband/hw/hfi1/qp.c | 2 +- + drivers/infiniband/hw/hfi1/qp.h | 2 +- + drivers/infiniband/hw/hfi1/qsfp.c | 2 +- + drivers/infiniband/hw/hfi1/qsfp.h | 2 +- + drivers/infiniband/hw/hfi1/rc.c | 2 +- + drivers/infiniband/hw/hfi1/ruc.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.c | 2 +- + drivers/infiniband/hw/hfi1/sdma.h | 2 +- + drivers/infiniband/hw/hfi1/sdma_txreq.h | 2 +- + drivers/infiniband/hw/hfi1/sysfs.c | 2 +- + drivers/infiniband/hw/hfi1/trace.c | 2 +- + drivers/infiniband/hw/hfi1/trace.h | 2 +- + drivers/infiniband/hw/hfi1/trace_ctxts.h | 2 +- + drivers/infiniband/hw/hfi1/trace_dbg.h | 2 +- + drivers/infiniband/hw/hfi1/trace_ibhdrs.h | 2 +- + drivers/infiniband/hw/hfi1/trace_misc.h | 2 +- + drivers/infiniband/hw/hfi1/trace_mmu.h | 2 +- + drivers/infiniband/hw/hfi1/trace_rc.h | 2 +- + drivers/infiniband/hw/hfi1/trace_rx.h | 2 +- + drivers/infiniband/hw/hfi1/trace_tx.h | 2 +- + drivers/infiniband/hw/hfi1/uc.c | 2 +- + drivers/infiniband/hw/hfi1/ud.c | 2 +- + drivers/infiniband/hw/hfi1/user_exp_rcv.c | 2 +- + drivers/infiniband/hw/hfi1/user_exp_rcv.h | 4 +- + drivers/infiniband/hw/hfi1/user_pages.c | 2 +- + drivers/infiniband/hw/hfi1/user_sdma.c | 2 +- + drivers/infiniband/hw/hfi1/user_sdma.h | 2 +- + drivers/infiniband/hw/hfi1/verbs.c | 2 +- + drivers/infiniband/hw/hfi1/verbs.h | 2 +- + drivers/infiniband/hw/hfi1/verbs_txreq.c | 2 +- + drivers/infiniband/hw/hfi1/verbs_txreq.h | 2 +- + drivers/infiniband/hw/hfi1/vnic.h | 2 +- + drivers/infiniband/hw/hfi1/vnic_main.c | 2 +- + drivers/infiniband/hw/hfi1/vnic_sdma.c | 2 +- + drivers/infiniband/hw/hns/hns_roce_device.h | 6 + + drivers/infiniband/hw/hns/hns_roce_hw_v2.c | 56 ++- + drivers/infiniband/hw/hns/hns_roce_main.c | 2 + + drivers/infiniband/hw/hns/hns_roce_restrack.c | 49 ++ + drivers/infiniband/hw/hns/hns_roce_srq.c | 85 +++- + drivers/infiniband/hw/irdma/cm.c | 2 +- + drivers/infiniband/hw/irdma/cm.h | 2 +- + drivers/infiniband/hw/irdma/ctrl.c | 2 +- + drivers/infiniband/hw/irdma/defs.h | 2 +- + drivers/infiniband/hw/irdma/hmc.c | 2 +- + drivers/infiniband/hw/irdma/hmc.h | 2 +- + drivers/infiniband/hw/irdma/hw.c | 2 +- + drivers/infiniband/hw/irdma/i40iw_hw.c | 2 +- + drivers/infiniband/hw/irdma/i40iw_hw.h | 2 +- + drivers/infiniband/hw/irdma/i40iw_if.c | 4 +- + drivers/infiniband/hw/irdma/icrdma_hw.c | 2 +- + drivers/infiniband/hw/irdma/icrdma_hw.h | 2 +- + drivers/infiniband/hw/irdma/irdma.h | 2 +- + drivers/infiniband/hw/irdma/main.c | 2 +- + drivers/infiniband/hw/irdma/main.h | 2 +- + drivers/infiniband/hw/irdma/osdep.h | 2 +- + drivers/infiniband/hw/irdma/pble.c | 2 +- + drivers/infiniband/hw/irdma/pble.h | 2 +- + drivers/infiniband/hw/irdma/protos.h | 2 +- + drivers/infiniband/hw/irdma/puda.c | 2 +- + drivers/infiniband/hw/irdma/puda.h | 2 +- + drivers/infiniband/hw/irdma/trace.c | 2 +- + drivers/infiniband/hw/irdma/trace.h | 2 +- + drivers/infiniband/hw/irdma/trace_cm.h | 2 +- + drivers/infiniband/hw/irdma/type.h | 2 +- + drivers/infiniband/hw/irdma/uda.c | 2 +- + drivers/infiniband/hw/irdma/uda.h | 2 +- + drivers/infiniband/hw/irdma/uda_d.h | 2 +- + drivers/infiniband/hw/irdma/uk.c | 2 +- + drivers/infiniband/hw/irdma/user.h | 2 +- + drivers/infiniband/hw/irdma/utils.c | 2 +- + drivers/infiniband/hw/irdma/verbs.c | 234 +++++++-- + drivers/infiniband/hw/irdma/verbs.h | 4 +- + drivers/infiniband/hw/irdma/ws.c | 2 +- + drivers/infiniband/hw/irdma/ws.h | 2 +- + drivers/infiniband/hw/mlx5/mad.c | 13 + + drivers/infiniband/hw/mlx5/main.c | 23 +- + drivers/infiniband/hw/mlx5/mlx5_ib.h | 21 +- + drivers/infiniband/hw/mlx5/mr.c | 324 ++++++------ + drivers/infiniband/hw/mlx5/qp.c | 2 +- + drivers/infiniband/hw/mlx5/umr.c | 4 +- + drivers/infiniband/hw/mthca/mthca_memfree.h | 2 +- + drivers/infiniband/hw/qib/qib_iba7322.c | 2 +- + drivers/infiniband/hw/usnic/usnic_uiom.h | 2 +- + drivers/infiniband/sw/rdmavt/ah.c | 2 +- + drivers/infiniband/sw/rdmavt/ah.h | 2 +- + drivers/infiniband/sw/rdmavt/cq.c | 2 +- + drivers/infiniband/sw/rdmavt/cq.h | 2 +- + drivers/infiniband/sw/rdmavt/mad.c | 2 +- + drivers/infiniband/sw/rdmavt/mad.h | 2 +- + drivers/infiniband/sw/rdmavt/mcast.c | 2 +- + drivers/infiniband/sw/rdmavt/mcast.h | 2 +- + drivers/infiniband/sw/rdmavt/mmap.c | 2 +- + drivers/infiniband/sw/rdmavt/mmap.h | 2 +- + drivers/infiniband/sw/rdmavt/mr.c | 2 +- + drivers/infiniband/sw/rdmavt/mr.h | 2 +- + drivers/infiniband/sw/rdmavt/pd.c | 2 +- + drivers/infiniband/sw/rdmavt/pd.h | 2 +- + drivers/infiniband/sw/rdmavt/qp.c | 2 +- + drivers/infiniband/sw/rdmavt/qp.h | 2 +- + drivers/infiniband/sw/rdmavt/rc.c | 2 +- + drivers/infiniband/sw/rdmavt/srq.c | 2 +- + drivers/infiniband/sw/rdmavt/srq.h | 2 +- + drivers/infiniband/sw/rdmavt/trace.c | 2 +- + drivers/infiniband/sw/rdmavt/trace.h | 2 +- + drivers/infiniband/sw/rdmavt/trace_cq.h | 2 +- + drivers/infiniband/sw/rdmavt/trace_mr.h | 2 +- + drivers/infiniband/sw/rdmavt/trace_qp.h | 2 +- + drivers/infiniband/sw/rdmavt/trace_rc.h | 2 +- + drivers/infiniband/sw/rdmavt/trace_rvt.h | 2 +- + drivers/infiniband/sw/rdmavt/trace_tx.h | 2 +- + drivers/infiniband/sw/rdmavt/vt.c | 2 +- + drivers/infiniband/sw/rdmavt/vt.h | 2 +- + drivers/infiniband/sw/siw/iwarp.h | 2 +- + drivers/infiniband/sw/siw/siw.h | 4 +- + drivers/infiniband/sw/siw/siw_cm.c | 2 +- + drivers/infiniband/sw/siw/siw_cm.h | 2 +- + drivers/infiniband/sw/siw/siw_cq.c | 2 +- + drivers/infiniband/sw/siw/siw_main.c | 2 +- + drivers/infiniband/sw/siw/siw_mem.c | 2 +- + drivers/infiniband/sw/siw/siw_mem.h | 2 +- + drivers/infiniband/sw/siw/siw_qp.c | 2 +- + drivers/infiniband/sw/siw/siw_qp_rx.c | 2 +- + drivers/infiniband/sw/siw/siw_qp_tx.c | 2 +- + drivers/infiniband/sw/siw/siw_verbs.c | 2 +- + drivers/infiniband/sw/siw/siw_verbs.h | 2 +- + drivers/infiniband/ulp/ipoib/ipoib_ethtool.c | 2 + + drivers/infiniband/ulp/rtrs/rtrs-clt.c | 7 +- + drivers/infiniband/ulp/rtrs/rtrs.c | 2 +- + drivers/infiniband/ulp/srp/ib_srp.h | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/cmd.c | 70 +++ + drivers/net/ethernet/mellanox/mlx5/core/en.h | 8 + + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.c | 3 +- + .../ethernet/mellanox/mlx5/core/en_accel/ipsec.h | 25 +- + .../mellanox/mlx5/core/en_accel/ipsec_fs.c | 122 ++++- + .../mellanox/mlx5/core/en_accel/ipsec_offload.c | 3 +- + drivers/net/ethernet/mellanox/mlx5/core/en_main.c | 63 +++ + drivers/net/ethernet/mellanox/mlx5/core/fs_core.c | 10 +- + .../net/ethernet/mellanox/mlx5/core/lib/devcom.h | 1 + + .../mellanox/mlx5/core/lib/ipsec_fs_roce.c | 542 ++++++++++++++++++++- + .../mellanox/mlx5/core/lib/ipsec_fs_roce.h | 14 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 6 + + .../net/ethernet/mellanox/mlx5/core/mlx5_core.h | 22 + + drivers/net/ethernet/mellanox/mlx5/core/port.c | 3 +- + include/linux/mlx5/device.h | 2 + + include/linux/mlx5/driver.h | 2 + + include/linux/mlx5/mlx5_ifc.h | 71 ++- + include/linux/mlx5/port.h | 3 +- + include/rdma/ib_mad.h | 2 + + include/rdma/ib_verbs.h | 8 +- + include/uapi/rdma/hns-abi.h | 12 +- + include/uapi/rdma/ib_user_ioctl_verbs.h | 3 +- + include/uapi/rdma/rdma_netlink.h | 2 + + include/uapi/rdma/siw-abi.h | 2 +- + 201 files changed, 1752 insertions(+), 470 deletions(-) +Merging net-next/main (c49bba011b51 Merge branch 'ptp-multiple-readers') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Auto-merging Documentation/netlink/specs/devlink.yaml +Auto-merging MAINTAINERS +Auto-merging arch/arm64/net/bpf_jit_comp.c +Auto-merging drivers/Kconfig +Auto-merging drivers/net/dsa/bcm_sf2.c +Auto-merging drivers/net/ethernet/broadcom/tg3.c +Auto-merging drivers/net/ethernet/intel/i40e/i40e_common.c +Auto-merging drivers/net/ethernet/intel/ice/ice_lib.c +Auto-merging drivers/net/ethernet/intel/ice/ice_main.c +Auto-merging drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c +Auto-merging drivers/net/virtio_net.c +Auto-merging drivers/net/xen-netback/interface.c +Auto-merging include/linux/fortify-string.h +Auto-merging include/linux/kasan.h +Auto-merging include/net/sock.h +Auto-merging kernel/bpf/core.c +Auto-merging kernel/bpf/task_iter.c +Auto-merging net/core/pktgen.c +Auto-merging net/core/skbuff.c +Auto-merging net/ipv4/tcp.c +Auto-merging net/mac80211/key.c +CONFLICT (content): Merge conflict in net/mac80211/key.c +Auto-merging net/netfilter/nf_tables_api.c +Auto-merging net/smc/af_smc.c +Auto-merging net/tls/tls_main.c +Auto-merging net/tls/tls_sw.c +Auto-merging net/wireless/core.c +Auto-merging net/xfrm/xfrm_policy.c +Auto-merging tools/net/ynl/generated/Makefile +Resolved 'net/mac80211/key.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 69d9743e0f6e] Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git +$ git diff -M --stat --summary HEAD^.. + Documentation/bpf/prog_flow_dissector.rst | 2 +- + .../bindings/arm/mediatek/mediatek,mt7622-wed.yaml | 1 + + Documentation/devicetree/bindings/mfd/syscon.yaml | 2 + + .../devicetree/bindings/net/dsa/microchip,ksz.yaml | 20 + + Documentation/devicetree/bindings/net/fsl,fec.yaml | 1 + + .../bindings/net/loongson,ls1b-gmac.yaml | 114 + + .../bindings/net/loongson,ls1c-emac.yaml | 113 + + .../devicetree/bindings/net/snps,dwmac.yaml | 5 + + .../devicetree/bindings/net/ti,icssg-prueth.yaml | 8 + + .../soc/mediatek/mediatek,mt7986-wo-ccif.yaml | 1 + + Documentation/driver-api/dpll.rst | 551 +++ + Documentation/driver-api/index.rst | 1 + + Documentation/netlink/genetlink-c.yaml | 18 +- + Documentation/netlink/genetlink-legacy.yaml | 22 +- + Documentation/netlink/genetlink.yaml | 18 +- + Documentation/netlink/netlink-raw.yaml | 14 +- + Documentation/netlink/specs/devlink.yaml | 10 - + Documentation/netlink/specs/dpll.yaml | 510 +++ + Documentation/netlink/specs/ethtool.yaml | 3 - + Documentation/netlink/specs/handshake.yaml | 8 +- + Documentation/netlink/specs/netdev.yaml | 21 +- + .../networking/device_drivers/appletalk/cops.rst | 80 - + .../networking/device_drivers/appletalk/index.rst | 18 - + .../networking/device_drivers/ethernet/index.rst | 1 + + .../device_drivers/ethernet/intel/idpf.rst | 160 + + Documentation/networking/device_drivers/index.rst | 1 - + Documentation/networking/index.rst | 1 - + Documentation/networking/ip-sysctl.rst | 18 + + Documentation/networking/ipddp.rst | 78 - + Documentation/networking/msg_zerocopy.rst | 13 +- + Documentation/networking/netconsole.rst | 22 +- + Documentation/networking/pktgen.rst | 12 + + Documentation/networking/xdp-rx-metadata.rst | 7 + + Documentation/process/7.AdvancedTopics.rst | 18 + + Documentation/process/maintainer-netdev.rst | 15 + + MAINTAINERS | 33 +- + arch/arm/net/bpf_jit_32.c | 280 +- + arch/arm/net/bpf_jit_32.h | 4 + + arch/arm64/net/bpf_jit_comp.c | 2 +- + arch/s390/net/bpf_jit_comp.c | 2 +- + arch/x86/net/bpf_jit_comp.c | 148 +- + drivers/Kconfig | 2 + + drivers/Makefile | 1 + + drivers/atm/fore200e.c | 8 +- + drivers/dpll/Kconfig | 7 + + drivers/dpll/Makefile | 9 + + drivers/dpll/dpll_core.c | 798 ++++ + drivers/dpll/dpll_core.h | 89 + + drivers/dpll/dpll_netlink.c | 1423 +++++++ + drivers/dpll/dpll_netlink.h | 13 + + drivers/dpll/dpll_nl.c | 164 + + drivers/dpll/dpll_nl.h | 51 + + drivers/infiniband/ulp/ipoib/ipoib_ib.c | 4 +- + drivers/net/Makefile | 1 - + drivers/net/Space.c | 6 - + drivers/net/appletalk/Kconfig | 102 - + drivers/net/appletalk/Makefile | 7 - + drivers/net/appletalk/cops.c | 1005 ----- + drivers/net/appletalk/cops.h | 61 - + drivers/net/appletalk/cops_ffdrv.h | 532 --- + drivers/net/appletalk/cops_ltdrv.h | 241 -- + drivers/net/appletalk/ipddp.c | 345 -- + drivers/net/appletalk/ipddp.h | 28 - + drivers/net/can/Kconfig | 1 + + drivers/net/can/at91_can.c | 998 ++--- + drivers/net/can/dev/dev.c | 51 +- + drivers/net/can/dev/rx-offload.c | 2 +- + drivers/net/can/dev/skb.c | 6 +- + drivers/net/can/sja1000/peak_pci.c | 2 +- + drivers/net/can/sja1000/sja1000.c | 2 +- + drivers/net/can/usb/etas_es58x/es58x_core.c | 1 + + drivers/net/can/usb/etas_es58x/es58x_core.h | 6 +- + drivers/net/can/usb/etas_es58x/es58x_devlink.c | 57 +- + drivers/net/dsa/b53/b53_mmap.c | 6 +- + drivers/net/dsa/b53/b53_srab.c | 8 +- + drivers/net/dsa/bcm_sf2.c | 8 +- + drivers/net/dsa/dsa_loop.c | 9 + + drivers/net/dsa/hirschmann/hellcreek.c | 8 +- + drivers/net/dsa/lantiq_gswip.c | 11 +- + drivers/net/dsa/microchip/Makefile | 2 +- + drivers/net/dsa/microchip/ksz8795_reg.h | 21 - + drivers/net/dsa/microchip/ksz9477.c | 79 + + drivers/net/dsa/microchip/ksz9477.h | 38 + + drivers/net/dsa/microchip/ksz9477_acl.c | 1436 +++++++ + drivers/net/dsa/microchip/ksz9477_reg.h | 20 - + drivers/net/dsa/microchip/ksz9477_tc_flower.c | 281 ++ + drivers/net/dsa/microchip/ksz_common.c | 521 ++- + drivers/net/dsa/microchip/ksz_common.h | 31 + + drivers/net/dsa/mt7530-mmio.c | 7 +- + drivers/net/dsa/mt7530.c | 14 +- + drivers/net/dsa/mv88e6xxx/pcs-639x.c | 2 +- + drivers/net/dsa/ocelot/ocelot_ext.c | 8 +- + drivers/net/dsa/ocelot/seville_vsc9953.c | 8 +- + drivers/net/dsa/qca/qca8k-common.c | 3 +- + drivers/net/dsa/realtek/realtek-smi.c | 8 +- + drivers/net/dsa/realtek/rtl8365mb.c | 3 +- + drivers/net/dsa/realtek/rtl8366-core.c | 8 +- + drivers/net/dsa/realtek/rtl8366rb.c | 44 +- + drivers/net/dsa/rzn1_a5psw.c | 8 +- + drivers/net/dsa/sja1105/sja1105_clocking.c | 21 +- + drivers/net/dsa/vitesse-vsc73xx-core.c | 49 +- + drivers/net/dsa/vitesse-vsc73xx-platform.c | 8 +- + drivers/net/dsa/xrs700x/xrs700x.c | 18 +- + drivers/net/ethernet/8390/ax88796.c | 6 +- + drivers/net/ethernet/8390/mcf8390.c | 5 +- + drivers/net/ethernet/8390/ne.c | 5 +- + drivers/net/ethernet/actions/owl-emac.c | 6 +- + drivers/net/ethernet/aeroflex/greth.c | 6 +- + drivers/net/ethernet/allwinner/sun4i-emac.c | 5 +- + drivers/net/ethernet/altera/altera_tse.h | 2 +- + drivers/net/ethernet/altera/altera_tse_main.c | 19 +- + drivers/net/ethernet/amazon/ena/ena_netdev.c | 2 +- + drivers/net/ethernet/amd/au1000_eth.c | 6 +- + drivers/net/ethernet/amd/pds_core/core.c | 43 +- + drivers/net/ethernet/amd/pds_core/core.h | 7 + + drivers/net/ethernet/amd/pds_core/dev.c | 11 +- + drivers/net/ethernet/amd/pds_core/main.c | 50 + + drivers/net/ethernet/amd/sunlance.c | 6 +- + drivers/net/ethernet/amd/xgbe/xgbe-platform.c | 48 +- + drivers/net/ethernet/apm/xgene-v2/main.c | 6 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.c | 21 +- + drivers/net/ethernet/apm/xgene/xgene_enet_main.h | 3 +- + drivers/net/ethernet/apple/macmace.c | 6 +- + drivers/net/ethernet/arc/emac_arc.c | 6 +- + drivers/net/ethernet/arc/emac_rockchip.c | 5 +- + drivers/net/ethernet/asix/ax88796c_ioctl.c | 2 +- + drivers/net/ethernet/atheros/ag71xx.c | 8 +- + drivers/net/ethernet/atheros/atl1c/atl1c.h | 3 - + drivers/net/ethernet/atheros/atl1c/atl1c_main.c | 80 +- + drivers/net/ethernet/atheros/atlx/atl1.c | 4 +- + drivers/net/ethernet/atheros/atlx/atl2.c | 2 +- + drivers/net/ethernet/broadcom/asp2/bcmasp.c | 8 +- + drivers/net/ethernet/broadcom/bcm4908_enet.c | 6 +- + drivers/net/ethernet/broadcom/bcm63xx_enet.c | 14 +- + drivers/net/ethernet/broadcom/bcmsysport.c | 6 +- + drivers/net/ethernet/broadcom/bgmac-platform.c | 6 +- + drivers/net/ethernet/broadcom/bnxt/Makefile | 1 + + drivers/net/ethernet/broadcom/bnxt/bnxt.c | 150 +- + drivers/net/ethernet/broadcom/bnxt/bnxt.h | 10 + + drivers/net/ethernet/broadcom/bnxt/bnxt_hsi.h | 541 ++- + drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.c | 241 ++ + drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.h | 30 + + drivers/net/ethernet/broadcom/bnxt/bnxt_sriov.c | 12 +- + drivers/net/ethernet/broadcom/genet/bcmgenet.c | 26 +- + drivers/net/ethernet/broadcom/sb1250-mac.c | 6 +- + drivers/net/ethernet/broadcom/tg3.c | 81 +- + drivers/net/ethernet/broadcom/tg3.h | 3 + + drivers/net/ethernet/brocade/bna/bfa_ioc.c | 2 +- + drivers/net/ethernet/cadence/macb_main.c | 6 +- + drivers/net/ethernet/calxeda/xgmac.c | 6 +- + drivers/net/ethernet/cavium/liquidio/lio_ethtool.c | 18 +- + drivers/net/ethernet/cavium/liquidio/lio_main.c | 2 +- + drivers/net/ethernet/cavium/liquidio/lio_vf_rep.c | 3 +- + .../net/ethernet/cavium/liquidio/octeon_device.c | 11 +- + drivers/net/ethernet/cavium/octeon/octeon_mgmt.c | 5 +- + drivers/net/ethernet/chelsio/cxgb3/l2t.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/clip_tbl.h | 2 +- + .../ethernet/chelsio/cxgb4/cxgb4_tc_u32_parse.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/l2t.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/sched.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4/sge.c | 2 +- + drivers/net/ethernet/chelsio/cxgb4/smt.h | 2 +- + drivers/net/ethernet/chelsio/cxgb4vf/sge.c | 2 +- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.c | 43 +- + .../chelsio/inline_crypto/ch_ktls/chcr_ktls.h | 36 +- + drivers/net/ethernet/cirrus/cs89x0.c | 5 +- + drivers/net/ethernet/cirrus/ep93xx_eth.c | 8 +- + drivers/net/ethernet/cirrus/mac89x0.c | 5 +- + drivers/net/ethernet/cortina/gemini.c | 12 +- + drivers/net/ethernet/davicom/dm9000.c | 6 +- + drivers/net/ethernet/dec/tulip/tulip.h | 2 +- + drivers/net/ethernet/dnet.c | 6 +- + drivers/net/ethernet/engleder/tsnep_main.c | 6 +- + drivers/net/ethernet/ethoc.c | 6 +- + drivers/net/ethernet/ezchip/nps_enet.c | 2 +- + drivers/net/ethernet/faraday/ftgmac100.c | 5 +- + drivers/net/ethernet/faraday/ftmac100.c | 5 +- + drivers/net/ethernet/freescale/enetc/enetc.c | 2 +- + drivers/net/ethernet/freescale/enetc/enetc.h | 2 +- + drivers/net/ethernet/freescale/enetc/enetc_qos.c | 2 +- + drivers/net/ethernet/freescale/fec_main.c | 20 +- + .../net/ethernet/freescale/fs_enet/fs_enet-main.c | 18 +- + drivers/net/ethernet/freescale/fs_enet/mii-fec.c | 10 +- + drivers/net/ethernet/freescale/fsl_pq_mdio.c | 12 +- + drivers/net/ethernet/google/gve/gve_main.c | 4 +- + drivers/net/ethernet/hisilicon/hip04_eth.c | 6 +- + drivers/net/ethernet/hisilicon/hisi_femac.c | 6 +- + drivers/net/ethernet/hisilicon/hix5hd2_gmac.c | 17 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_main.c | 6 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_ppe.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_dsaf_rcb.h | 2 +- + drivers/net/ethernet/hisilicon/hns/hns_enet.c | 5 +- + drivers/net/ethernet/hisilicon/hns3/hnae3.h | 5 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.c | 1 + + .../hisilicon/hns3/hns3_common/hclge_comm_cmd.h | 2 + + drivers/net/ethernet/hisilicon/hns3/hns3_debugfs.c | 3 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.c | 116 +- + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_err.h | 2 + + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.c | 3 +- + .../ethernet/hisilicon/hns3/hns3pf/hclge_main.h | 2 + + .../net/ethernet/hisilicon/hns3/hns3pf/hclge_mbx.c | 2 +- + drivers/net/ethernet/hisilicon/hns_mdio.c | 5 +- + drivers/net/ethernet/huawei/hinic/hinic_tx.c | 8 +- + drivers/net/ethernet/i825xx/sni_82596.c | 5 +- + drivers/net/ethernet/ibm/ehea/ehea_main.c | 10 +- + drivers/net/ethernet/ibm/emac/core.c | 6 +- + drivers/net/ethernet/ibm/emac/mal.c | 8 +- + drivers/net/ethernet/ibm/emac/rgmii.c | 6 +- + drivers/net/ethernet/ibm/emac/tah.c | 6 +- + drivers/net/ethernet/ibm/emac/zmii.c | 6 +- + drivers/net/ethernet/ibm/ibmveth.c | 2 +- + drivers/net/ethernet/ibm/ibmvnic.c | 5 +- + drivers/net/ethernet/intel/Kconfig | 14 + + drivers/net/ethernet/intel/Makefile | 1 + + drivers/net/ethernet/intel/i40e/Makefile | 3 +- + drivers/net/ethernet/intel/i40e/i40e.h | 216 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.c | 8 +- + drivers/net/ethernet/intel/i40e/i40e_adminq.h | 3 +- + drivers/net/ethernet/intel/i40e/i40e_adminq_cmd.h | 2 + + drivers/net/ethernet/intel/i40e/i40e_alloc.h | 24 +- + drivers/net/ethernet/intel/i40e/i40e_client.c | 1 - + drivers/net/ethernet/intel/i40e/i40e_common.c | 69 +- + drivers/net/ethernet/intel/i40e/i40e_dcb.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_dcb_nl.c | 2 +- + drivers/net/ethernet/intel/i40e/i40e_ddp.c | 24 +- + drivers/net/ethernet/intel/i40e/i40e_debug.h | 47 + + drivers/net/ethernet/intel/i40e/i40e_debugfs.c | 3 +- + drivers/net/ethernet/intel/i40e/i40e_devlink.c | 224 + + drivers/net/ethernet/intel/i40e/i40e_devlink.h | 18 + + drivers/net/ethernet/intel/i40e/i40e_diag.h | 5 +- + drivers/net/ethernet/intel/i40e/i40e_ethtool.c | 10 +- + drivers/net/ethernet/intel/i40e/i40e_hmc.c | 16 +- + drivers/net/ethernet/intel/i40e/i40e_hmc.h | 4 + + drivers/net/ethernet/intel/i40e/i40e_io.h | 16 + + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.c | 9 +- + drivers/net/ethernet/intel/i40e/i40e_lan_hmc.h | 2 + + drivers/net/ethernet/intel/i40e/i40e_main.c | 125 +- + drivers/net/ethernet/intel/i40e/i40e_nvm.c | 2 + + drivers/net/ethernet/intel/i40e/i40e_osdep.h | 59 - + drivers/net/ethernet/intel/i40e/i40e_prototype.h | 12 +- + drivers/net/ethernet/intel/i40e/i40e_ptp.c | 3 +- + drivers/net/ethernet/intel/i40e/i40e_register.h | 5 + + drivers/net/ethernet/intel/i40e/i40e_txrx.c | 9 +- + drivers/net/ethernet/intel/i40e/i40e_txrx.h | 1 + + drivers/net/ethernet/intel/i40e/i40e_txrx_common.h | 2 + + drivers/net/ethernet/intel/i40e/i40e_type.h | 60 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.c | 4 +- + drivers/net/ethernet/intel/i40e/i40e_virtchnl_pf.h | 4 +- + drivers/net/ethernet/intel/i40e/i40e_xsk.c | 4 - + drivers/net/ethernet/intel/i40e/i40e_xsk.h | 4 + + drivers/net/ethernet/intel/iavf/iavf.h | 18 +- + drivers/net/ethernet/intel/iavf/iavf_main.c | 102 +- + drivers/net/ethernet/intel/iavf/iavf_txrx.c | 46 +- + drivers/net/ethernet/intel/iavf/iavf_virtchnl.c | 81 +- + drivers/net/ethernet/intel/ice/Makefile | 2 +- + drivers/net/ethernet/intel/ice/ice.h | 20 +- + drivers/net/ethernet/intel/ice/ice_adminq_cmd.h | 258 +- + drivers/net/ethernet/intel/ice/ice_common.c | 662 ++- + drivers/net/ethernet/intel/ice/ice_common.h | 51 +- + drivers/net/ethernet/intel/ice/ice_ddp.c | 39 +- + drivers/net/ethernet/intel/ice/ice_dpll.c | 2120 ++++++++++ + drivers/net/ethernet/intel/ice/ice_dpll.h | 114 + + drivers/net/ethernet/intel/ice/ice_ethtool.c | 2 +- + drivers/net/ethernet/intel/ice/ice_gnss.c | 3 + + drivers/net/ethernet/intel/ice/ice_hw_autogen.h | 1 + + drivers/net/ethernet/intel/ice/ice_lag.c | 48 +- + drivers/net/ethernet/intel/ice/ice_lib.c | 41 +- + drivers/net/ethernet/intel/ice/ice_main.c | 19 +- + drivers/net/ethernet/intel/ice/ice_ptp.c | 675 ++- + drivers/net/ethernet/intel/ice/ice_ptp.h | 41 +- + drivers/net/ethernet/intel/ice/ice_ptp_hw.c | 758 +++- + drivers/net/ethernet/intel/ice/ice_ptp_hw.h | 96 +- + drivers/net/ethernet/intel/ice/ice_sched.c | 56 +- + drivers/net/ethernet/intel/ice/ice_sched.h | 6 +- + drivers/net/ethernet/intel/ice/ice_switch.c | 63 +- + drivers/net/ethernet/intel/ice/ice_txrx_lib.c | 2 +- + drivers/net/ethernet/intel/ice/ice_type.h | 23 +- + drivers/net/ethernet/intel/ice/ice_vf_lib.h | 3 + + drivers/net/ethernet/intel/ice/ice_virtchnl.c | 69 +- + drivers/net/ethernet/intel/ice/ice_xsk.c | 22 +- + drivers/net/ethernet/intel/idpf/Makefile | 18 + + drivers/net/ethernet/intel/idpf/idpf.h | 968 +++++ + drivers/net/ethernet/intel/idpf/idpf_controlq.c | 621 +++ + drivers/net/ethernet/intel/idpf/idpf_controlq.h | 130 + + .../net/ethernet/intel/idpf/idpf_controlq_api.h | 169 + + .../net/ethernet/intel/idpf/idpf_controlq_setup.c | 171 + + drivers/net/ethernet/intel/idpf/idpf_dev.c | 165 + + drivers/net/ethernet/intel/idpf/idpf_devids.h | 10 + + drivers/net/ethernet/intel/idpf/idpf_ethtool.c | 1369 +++++++ + drivers/net/ethernet/intel/idpf/idpf_lan_pf_regs.h | 124 + + drivers/net/ethernet/intel/idpf/idpf_lan_txrx.h | 293 ++ + drivers/net/ethernet/intel/idpf/idpf_lan_vf_regs.h | 128 + + drivers/net/ethernet/intel/idpf/idpf_lib.c | 2379 +++++++++++ + drivers/net/ethernet/intel/idpf/idpf_main.c | 279 ++ + drivers/net/ethernet/intel/idpf/idpf_mem.h | 20 + + .../net/ethernet/intel/idpf/idpf_singleq_txrx.c | 1183 ++++++ + drivers/net/ethernet/intel/idpf/idpf_txrx.c | 4289 ++++++++++++++++++++ + drivers/net/ethernet/intel/idpf/idpf_txrx.h | 1023 +++++ + drivers/net/ethernet/intel/idpf/idpf_vf_dev.c | 163 + + drivers/net/ethernet/intel/idpf/idpf_virtchnl.c | 3791 +++++++++++++++++ + drivers/net/ethernet/intel/idpf/virtchnl2.h | 1273 ++++++ + .../net/ethernet/intel/idpf/virtchnl2_lan_desc.h | 451 ++ + drivers/net/ethernet/intel/igb/igb_main.c | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_main.c | 2 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_sriov.c | 7 +- + drivers/net/ethernet/intel/ixgbe/ixgbe_xsk.c | 2 +- + drivers/net/ethernet/korina.c | 6 +- + drivers/net/ethernet/lantiq_etop.c | 6 +- + drivers/net/ethernet/lantiq_xrx200.c | 6 +- + drivers/net/ethernet/litex/litex_liteeth.c | 6 +- + drivers/net/ethernet/marvell/mv643xx_eth.c | 11 +- + drivers/net/ethernet/marvell/mvmdio.c | 6 +- + drivers/net/ethernet/marvell/mvneta.c | 8 +- + drivers/net/ethernet/marvell/mvneta_bm.c | 6 +- + drivers/net/ethernet/marvell/mvpp2/mvpp2_main.c | 12 +- + .../net/ethernet/marvell/octeon_ep/octep_cn9k_pf.c | 168 +- + .../net/ethernet/marvell/octeon_ep/octep_config.h | 22 +- + .../ethernet/marvell/octeon_ep/octep_ctrl_net.c | 24 +- + .../ethernet/marvell/octeon_ep/octep_ctrl_net.h | 18 + + .../net/ethernet/marvell/octeon_ep/octep_main.c | 213 +- + .../net/ethernet/marvell/octeon_ep/octep_main.h | 13 +- + .../marvell/octeon_ep/octep_regs_cn9k_pf.h | 4 + + drivers/net/ethernet/marvell/octeontx2/af/cgx.c | 8 +- + drivers/net/ethernet/marvell/octeontx2/af/mbox.h | 11 +- + drivers/net/ethernet/marvell/octeontx2/af/npc.h | 8 + + drivers/net/ethernet/marvell/octeontx2/af/ptp.c | 88 +- + .../net/ethernet/marvell/octeontx2/af/rvu_cgx.c | 7 +- + .../ethernet/marvell/octeontx2/af/rvu_debugfs.c | 53 + + .../net/ethernet/marvell/octeontx2/af/rvu_npc_fs.c | 62 + + .../net/ethernet/marvell/octeontx2/nic/otx2_ptp.c | 31 +- + .../net/ethernet/marvell/octeontx2/nic/otx2_tc.c | 58 + + drivers/net/ethernet/marvell/pxa168_eth.c | 5 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.c | 9 +- + drivers/net/ethernet/mediatek/mtk_eth_soc.h | 2 +- + drivers/net/ethernet/mediatek/mtk_ppe.c | 4 +- + drivers/net/ethernet/mediatek/mtk_ppe.h | 19 +- + drivers/net/ethernet/mediatek/mtk_ppe_offload.c | 10 +- + drivers/net/ethernet/mediatek/mtk_wed.c | 1432 +++++-- + drivers/net/ethernet/mediatek/mtk_wed.h | 57 + + drivers/net/ethernet/mediatek/mtk_wed_debugfs.c | 400 +- + drivers/net/ethernet/mediatek/mtk_wed_mcu.c | 98 +- + drivers/net/ethernet/mediatek/mtk_wed_regs.h | 369 +- + drivers/net/ethernet/mediatek/mtk_wed_wo.h | 3 +- + drivers/net/ethernet/mellanox/mlx4/en_rx.c | 2 +- + drivers/net/ethernet/mellanox/mlx4/fw.c | 2 +- + drivers/net/ethernet/mellanox/mlx5/core/Kconfig | 8 + + drivers/net/ethernet/mellanox/mlx5/core/Makefile | 3 + + drivers/net/ethernet/mellanox/mlx5/core/dev.c | 17 + + drivers/net/ethernet/mellanox/mlx5/core/devlink.c | 11 - + drivers/net/ethernet/mellanox/mlx5/core/dpll.c | 432 ++ + .../net/ethernet/mellanox/mlx5/core/en/devlink.c | 8 + + drivers/net/ethernet/mellanox/mlx5/core/en/xdp.c | 2 +- + .../ethernet/mellanox/mlx5/core/esw/bridge_mcast.c | 11 +- + drivers/net/ethernet/mellanox/mlx5/core/esw/qos.c | 96 +- + drivers/net/ethernet/mellanox/mlx5/core/health.c | 2 + + .../net/ethernet/mellanox/mlx5/core/lag/mpesw.c | 18 +- + drivers/net/ethernet/mellanox/mlx5/core/main.c | 2 +- + .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.c | 15 - + .../net/ethernet/mellanox/mlx5/core/sf/dev/dev.h | 6 + + .../ethernet/mellanox/mlx5/core/sf/dev/driver.c | 26 + + .../net/ethernet/mellanox/mlx5/core/sf/devlink.c | 244 +- + .../mellanox/mlx5/core/steering/dr_action.c | 35 +- + .../mellanox/mlx5/core/steering/dr_types.h | 1 + + .../ethernet/mellanox/mlx5/core/steering/fs_dr.c | 9 +- + .../ethernet/mellanox/mlxbf_gige/mlxbf_gige_main.c | 6 +- + drivers/net/ethernet/mellanox/mlxsw/core.h | 2 +- + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.c | 72 +- + .../ethernet/mellanox/mlxsw/core_acl_flex_keys.h | 15 +- + drivers/net/ethernet/mellanox/mlxsw/core_env.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/core_hwmon.c | 2 +- + .../ethernet/mellanox/mlxsw/core_linecard_dev.c | 9 +- + drivers/net/ethernet/mellanox/mlxsw/core_thermal.c | 3 +- + drivers/net/ethernet/mellanox/mlxsw/i2c.c | 4 +- + drivers/net/ethernet/mellanox/mlxsw/pci.c | 9 +- + drivers/net/ethernet/mellanox/mlxsw/reg.h | 6 +- + .../ethernet/mellanox/mlxsw/spectrum2_mr_tcam.c | 20 +- + .../mellanox/mlxsw/spectrum_acl_bloom_filter.c | 2 +- + .../mellanox/mlxsw/spectrum_acl_flex_keys.c | 30 +- + drivers/net/ethernet/mellanox/mlxsw/spectrum_cnt.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_ethtool.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_router.c | 2 +- + .../net/ethernet/mellanox/mlxsw/spectrum_span.c | 2 +- + drivers/net/ethernet/micrel/ks8842.c | 5 +- + drivers/net/ethernet/micrel/ks8851_par.c | 6 +- + drivers/net/ethernet/microchip/lan743x_main.c | 6 + + .../net/ethernet/microchip/lan966x/lan966x_main.c | 6 +- + .../net/ethernet/microchip/sparx5/sparx5_ethtool.c | 3 +- + .../net/ethernet/microchip/sparx5/sparx5_main.c | 6 +- + .../net/ethernet/microchip/vcap/vcap_api_debugfs.c | 2 +- + drivers/net/ethernet/moxa/moxart_ether.c | 6 +- + drivers/net/ethernet/mscc/ocelot_vsc7514.c | 6 +- + drivers/net/ethernet/natsemi/jazzsonic.c | 6 +- + drivers/net/ethernet/natsemi/macsonic.c | 6 +- + drivers/net/ethernet/natsemi/xtsonic.c | 6 +- + drivers/net/ethernet/netronome/nfp/crypto/ipsec.c | 45 +- + drivers/net/ethernet/netronome/nfp/nfd3/xsk.c | 2 +- + drivers/net/ethernet/netronome/nfp/nfp_net_repr.h | 2 +- + .../net/ethernet/netronome/nfp/nfpcore/nfp_nsp.h | 2 +- + .../ethernet/netronome/nfp/nfpcore/nfp_resource.c | 2 +- + drivers/net/ethernet/ni/nixge.c | 11 +- + drivers/net/ethernet/nxp/lpc_eth.c | 6 +- + drivers/net/ethernet/pensando/ionic/ionic_dev.h | 3 +- + drivers/net/ethernet/pensando/ionic/ionic_lif.c | 12 + + drivers/net/ethernet/pensando/ionic/ionic_main.c | 4 +- + drivers/net/ethernet/pensando/ionic/ionic_txrx.c | 77 +- + drivers/net/ethernet/qlogic/qed/qed_debug.c | 7 +- + drivers/net/ethernet/qualcomm/emac/emac.c | 6 +- + drivers/net/ethernet/realtek/r8169_main.c | 4 + + drivers/net/ethernet/renesas/ravb_main.c | 6 +- + drivers/net/ethernet/renesas/rswitch.c | 6 +- + drivers/net/ethernet/renesas/sh_eth.c | 6 +- + .../net/ethernet/samsung/sxgbe/sxgbe_platform.c | 6 +- + drivers/net/ethernet/seeq/sgiseeq.c | 6 +- + drivers/net/ethernet/sfc/efx_channels.c | 2 +- + drivers/net/ethernet/sfc/mae.c | 62 +- + drivers/net/ethernet/sfc/mcdi.c | 3 +- + drivers/net/ethernet/sfc/ptp.c | 27 +- + drivers/net/ethernet/sfc/siena/efx_channels.c | 2 +- + drivers/net/ethernet/sfc/tc.c | 337 +- + drivers/net/ethernet/sfc/tc.h | 8 + + drivers/net/ethernet/sfc/tc_conntrack.c | 91 +- + drivers/net/ethernet/sgi/ioc3-eth.c | 6 +- + drivers/net/ethernet/sgi/meth.c | 6 +- + drivers/net/ethernet/smsc/smc91x.c | 6 +- + drivers/net/ethernet/smsc/smsc911x.c | 6 +- + drivers/net/ethernet/socionext/netsec.c | 8 +- + drivers/net/ethernet/socionext/sni_ave.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/Kconfig | 11 + + drivers/net/ethernet/stmicro/stmmac/Makefile | 1 + + .../net/ethernet/stmicro/stmmac/dwmac-anarion.c | 10 +- + .../ethernet/stmicro/stmmac/dwmac-dwc-qos-eth.c | 15 +- + .../net/ethernet/stmicro/stmmac/dwmac-generic.c | 15 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-imx.c | 13 +- + .../net/ethernet/stmicro/stmmac/dwmac-ingenic.c | 33 +- + .../net/ethernet/stmicro/stmmac/dwmac-intel-plat.c | 34 +- + .../net/ethernet/stmicro/stmmac/dwmac-ipq806x.c | 27 +- + .../net/ethernet/stmicro/stmmac/dwmac-loongson1.c | 209 + + .../net/ethernet/stmicro/stmmac/dwmac-lpc18xx.c | 19 +- + .../net/ethernet/stmicro/stmmac/dwmac-mediatek.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-meson.c | 25 +- + .../net/ethernet/stmicro/stmmac/dwmac-meson8b.c | 53 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-rk.c | 14 +- + .../net/ethernet/stmicro/stmmac/dwmac-socfpga.c | 16 +- + .../net/ethernet/stmicro/stmmac/dwmac-starfive.c | 10 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sti.c | 14 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-stm32.c | 148 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sun8i.c | 6 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-sunxi.c | 23 +- + drivers/net/ethernet/stmicro/stmmac/dwmac-tegra.c | 10 +- + .../net/ethernet/stmicro/stmmac/dwmac-visconti.c | 18 +- + drivers/net/ethernet/stmicro/stmmac/stmmac_main.c | 10 + + .../net/ethernet/stmicro/stmmac/stmmac_platform.c | 75 +- + .../net/ethernet/stmicro/stmmac/stmmac_platform.h | 5 - + drivers/net/ethernet/stmicro/stmmac/stmmac_ptp.c | 2 +- + .../net/ethernet/stmicro/stmmac/stmmac_selftests.c | 2 +- + drivers/net/ethernet/sun/niu.c | 5 +- + drivers/net/ethernet/sun/sunbmac.c | 6 +- + drivers/net/ethernet/sun/sunqe.c | 6 +- + drivers/net/ethernet/sunplus/spl2sw_driver.c | 6 +- + drivers/net/ethernet/ti/Kconfig | 9 +- + drivers/net/ethernet/ti/Makefile | 1 - + drivers/net/ethernet/ti/cpmac.c | 1251 ------ + drivers/net/ethernet/ti/cpsw_priv.c | 2 +- + drivers/net/ethernet/ti/davinci_emac.c | 18 +- + drivers/net/ethernet/ti/davinci_mdio.c | 6 +- + drivers/net/ethernet/ti/icssg/icssg_config.c | 14 + + drivers/net/ethernet/ti/icssg/icssg_prueth.c | 35 +- + drivers/net/ethernet/ti/icssg/icssg_prueth.h | 2 + + drivers/net/ethernet/ti/netcp_core.c | 5 +- + drivers/net/ethernet/toshiba/spider_net.c | 2 +- + drivers/net/ethernet/toshiba/tc35815.c | 10 +- + drivers/net/ethernet/tundra/tsi108_eth.c | 6 +- + drivers/net/ethernet/via/via-rhine.c | 6 +- + drivers/net/ethernet/via/via-velocity.c | 6 +- + drivers/net/ethernet/wangxun/libwx/wx_ethtool.c | 169 + + drivers/net/ethernet/wangxun/libwx/wx_ethtool.h | 8 + + drivers/net/ethernet/wangxun/libwx/wx_hw.c | 191 + + drivers/net/ethernet/wangxun/libwx/wx_hw.h | 9 + + drivers/net/ethernet/wangxun/libwx/wx_lib.c | 20 +- + drivers/net/ethernet/wangxun/libwx/wx_type.h | 82 + + drivers/net/ethernet/wangxun/ngbe/ngbe_ethtool.c | 5 + + drivers/net/ethernet/wangxun/ngbe/ngbe_hw.c | 2 + + drivers/net/ethernet/wangxun/ngbe/ngbe_main.c | 2 + + drivers/net/ethernet/wangxun/ngbe/ngbe_mdio.c | 119 +- + drivers/net/ethernet/wangxun/ngbe/ngbe_type.h | 3 - + drivers/net/ethernet/wangxun/txgbe/txgbe_ethtool.c | 5 + + drivers/net/ethernet/wangxun/txgbe/txgbe_hw.c | 2 + + drivers/net/ethernet/wangxun/txgbe/txgbe_main.c | 2 + + drivers/net/ethernet/wangxun/txgbe/txgbe_phy.c | 56 +- + drivers/net/ethernet/wiznet/w5100-spi.c | 12 +- + drivers/net/ethernet/wiznet/w5100.c | 10 +- + drivers/net/ethernet/wiznet/w5300.c | 5 +- + drivers/net/ethernet/xilinx/ll_temac_main.c | 5 +- + drivers/net/ethernet/xilinx/xilinx_axienet_main.c | 6 +- + drivers/net/ethernet/xilinx/xilinx_emaclite.c | 8 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 74 +- + drivers/net/fjes/fjes_main.c | 2 +- + drivers/net/gtp.c | 4 +- + drivers/net/hamradio/Kconfig | 15 +- + drivers/net/hyperv/netvsc.c | 18 +- + drivers/net/ipa/ipa_power.c | 2 +- + drivers/net/macsec.c | 6 +- + drivers/net/mdio/mdio-aspeed.c | 6 +- + drivers/net/mdio/mdio-bcm-iproc.c | 6 +- + drivers/net/mdio/mdio-bcm-unimac.c | 6 +- + drivers/net/mdio/mdio-gpio.c | 6 +- + drivers/net/mdio/mdio-hisi-femac.c | 6 +- + drivers/net/mdio/mdio-ipq4019.c | 6 +- + drivers/net/mdio/mdio-ipq8064.c | 7 +- + drivers/net/mdio/mdio-moxart.c | 6 +- + drivers/net/mdio/mdio-mscc-miim.c | 6 +- + drivers/net/mdio/mdio-mux-bcm-iproc.c | 6 +- + drivers/net/mdio/mdio-mux-bcm6368.c | 6 +- + drivers/net/mdio/mdio-mux-gpio.c | 5 +- + drivers/net/mdio/mdio-mux-meson-g12a.c | 6 +- + drivers/net/mdio/mdio-mux-meson-gxl.c | 6 +- + drivers/net/mdio/mdio-mux-mmioreg.c | 6 +- + drivers/net/mdio/mdio-mux-multiplexer.c | 6 +- + drivers/net/mdio/mdio-octeon.c | 5 +- + drivers/net/mdio/mdio-sun4i.c | 6 +- + drivers/net/mdio/mdio-xgene.c | 25 +- + drivers/net/netconsole.c | 155 +- + drivers/net/phy/Kconfig | 4 +- + drivers/net/phy/amd.c | 33 +- + drivers/net/phy/ax88796b.c | 2 +- + drivers/net/phy/broadcom.c | 156 +- + drivers/net/phy/dp83867.c | 137 + + drivers/net/phy/nxp-tja11xx.c | 6 +- + drivers/net/phy/phy.c | 207 +- + drivers/net/phy/sfp.c | 41 +- + drivers/net/ppp/pppoe.c | 2 +- + drivers/net/usb/r8152.c | 85 +- + drivers/net/virtio_net.c | 134 +- + drivers/net/vxlan/vxlan_core.c | 209 +- + drivers/net/wan/ixp4xx_hss.c | 4 +- + drivers/net/wireless/ath/ar5523/ar5523.c | 2 +- + drivers/net/wireless/ath/ath10k/ce.h | 2 +- + drivers/net/wireless/ath/ath10k/debug.c | 2 +- + drivers/net/wireless/ath/ath10k/htt.h | 3 +- + drivers/net/wireless/ath/ath10k/htt_rx.c | 1 - + drivers/net/wireless/ath/ath10k/htt_tx.c | 16 +- + drivers/net/wireless/ath/ath10k/pci.c | 2 +- + drivers/net/wireless/ath/ath11k/core.c | 108 +- + drivers/net/wireless/ath/ath11k/core.h | 2 - + drivers/net/wireless/ath/ath11k/dp.c | 2 +- + drivers/net/wireless/ath/ath11k/dp_rx.c | 23 +- + drivers/net/wireless/ath/ath11k/hal.c | 8 +- + drivers/net/wireless/ath/ath11k/hal_rx.c | 31 +- + drivers/net/wireless/ath/ath11k/hal_rx.h | 18 +- + drivers/net/wireless/ath/ath11k/hal_tx.c | 2 +- + drivers/net/wireless/ath/ath11k/mac.c | 71 +- + drivers/net/wireless/ath/ath11k/mhi.c | 1 + + drivers/net/wireless/ath/ath11k/pci.c | 24 +- + drivers/net/wireless/ath/ath11k/spectral.c | 28 +- + drivers/net/wireless/ath/ath11k/wmi.c | 8 +- + drivers/net/wireless/ath/ath12k/core.c | 60 +- + drivers/net/wireless/ath/ath12k/core.h | 4 + + drivers/net/wireless/ath/ath12k/dp.c | 1 + + drivers/net/wireless/ath/ath12k/dp_mon.c | 12 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 30 +- + drivers/net/wireless/ath/ath12k/dp_tx.c | 12 +- + drivers/net/wireless/ath/ath12k/hal.c | 12 +- + drivers/net/wireless/ath/ath12k/hw.c | 12 + + drivers/net/wireless/ath/ath12k/hw.h | 4 + + drivers/net/wireless/ath/ath12k/mac.c | 145 +- + drivers/net/wireless/ath/ath12k/mac.h | 2 + + drivers/net/wireless/ath/ath12k/peer.h | 3 + + drivers/net/wireless/ath/ath12k/rx_desc.h | 91 +- + drivers/net/wireless/ath/ath12k/wmi.c | 93 +- + drivers/net/wireless/ath/ath12k/wmi.h | 25 + + drivers/net/wireless/ath/ath5k/base.c | 4 +- + drivers/net/wireless/ath/ath5k/pci.c | 4 +- + drivers/net/wireless/ath/ath6kl/cfg80211.c | 8 +- + drivers/net/wireless/ath/ath6kl/main.c | 4 +- + drivers/net/wireless/ath/ath6kl/txrx.c | 2 +- + drivers/net/wireless/ath/ath9k/ar9003_phy.c | 11 +- + drivers/net/wireless/ath/ath9k/debug.c | 2 +- + drivers/net/wireless/ath/ath9k/hif_usb.c | 34 +- + drivers/net/wireless/ath/ath9k/htc_drv_debug.c | 2 +- + drivers/net/wireless/ath/wcn36xx/dxe.c | 6 +- + drivers/net/wireless/ath/wcn36xx/smd.c | 20 +- + drivers/net/wireless/ath/wcn36xx/smd.h | 2 +- + drivers/net/wireless/ath/wcn36xx/testmode.c | 2 +- + drivers/net/wireless/ath/wil6210/cfg80211.c | 3 +- + drivers/net/wireless/ath/wil6210/wmi.c | 2 - + .../broadcom/brcm80211/brcmfmac/cfg80211.c | 5 +- + .../broadcom/brcm80211/brcmfmac/firmware.h | 2 +- + .../broadcom/brcm80211/brcmfmac/fwil_types.h | 2 +- + drivers/net/wireless/intel/ipw2x00/libipw.h | 2 +- + drivers/net/wireless/intel/iwlegacy/4965-mac.c | 2 +- + drivers/net/wireless/intel/iwlegacy/common.c | 2 +- + drivers/net/wireless/intel/iwlwifi/cfg/bz.c | 10 +- + drivers/net/wireless/intel/iwlwifi/cfg/sc.c | 8 +- + drivers/net/wireless/intel/iwlwifi/dvm/commands.h | 33 +- + drivers/net/wireless/intel/iwlwifi/dvm/dev.h | 14 +- + drivers/net/wireless/intel/iwlwifi/dvm/mac80211.c | 6 +- + drivers/net/wireless/intel/iwlwifi/dvm/rs.h | 12 +- + drivers/net/wireless/intel/iwlwifi/dvm/tt.h | 9 +- + drivers/net/wireless/intel/iwlwifi/fw/acpi.c | 18 + + drivers/net/wireless/intel/iwlwifi/fw/acpi.h | 5 + + drivers/net/wireless/intel/iwlwifi/fw/api/d3.h | 46 +- + .../net/wireless/intel/iwlwifi/fw/api/dbg-tlv.h | 1 + + drivers/net/wireless/intel/iwlwifi/fw/api/debug.h | 22 + + .../net/wireless/intel/iwlwifi/fw/api/nvm-reg.h | 6 +- + .../net/wireless/intel/iwlwifi/fw/api/offload.h | 6 +- + drivers/net/wireless/intel/iwlwifi/fw/api/power.h | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rfi.h | 7 +- + drivers/net/wireless/intel/iwlwifi/fw/api/rx.h | 16 +- + drivers/net/wireless/intel/iwlwifi/fw/api/txq.h | 4 +- + drivers/net/wireless/intel/iwlwifi/fw/dbg.c | 25 + + drivers/net/wireless/intel/iwlwifi/fw/dbg.h | 1 + + drivers/net/wireless/intel/iwlwifi/fw/debugfs.c | 8 +- + drivers/net/wireless/intel/iwlwifi/fw/file.h | 30 +- + drivers/net/wireless/intel/iwlwifi/fw/notif-wait.h | 3 +- + drivers/net/wireless/intel/iwlwifi/fw/rs.c | 1 - + drivers/net/wireless/intel/iwlwifi/iwl-config.h | 5 - + .../wireless/intel/iwlwifi/iwl-context-info-gen3.h | 10 +- + drivers/net/wireless/intel/iwlwifi/iwl-csr.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.c | 2 + + drivers/net/wireless/intel/iwlwifi/iwl-dbg-tlv.h | 5 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.c | 51 +- + drivers/net/wireless/intel/iwlwifi/iwl-drv.h | 2 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.c | 5 +- + .../net/wireless/intel/iwlwifi/iwl-eeprom-parse.h | 4 +- + drivers/net/wireless/intel/iwlwifi/iwl-fh.h | 13 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.c | 80 +- + drivers/net/wireless/intel/iwlwifi/iwl-nvm-parse.h | 19 +- + drivers/net/wireless/intel/iwlwifi/iwl-prph.h | 1 + + drivers/net/wireless/intel/iwlwifi/iwl-trans.h | 15 +- + drivers/net/wireless/intel/iwlwifi/mvm/constants.h | 1 + + drivers/net/wireless/intel/iwlwifi/mvm/d3.c | 165 +- + drivers/net/wireless/intel/iwlwifi/mvm/fw.c | 26 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac-ctxt.c | 20 +- + drivers/net/wireless/intel/iwlwifi/mvm/mac80211.c | 79 +- + .../net/wireless/intel/iwlwifi/mvm/mld-mac80211.c | 4 +- + drivers/net/wireless/intel/iwlwifi/mvm/mld-sta.c | 23 +- + drivers/net/wireless/intel/iwlwifi/mvm/mvm.h | 63 +- + drivers/net/wireless/intel/iwlwifi/mvm/nvm.c | 12 +- + drivers/net/wireless/intel/iwlwifi/mvm/ops.c | 10 +- + drivers/net/wireless/intel/iwlwifi/mvm/power.c | 5 + + drivers/net/wireless/intel/iwlwifi/mvm/rs.h | 23 +- + drivers/net/wireless/intel/iwlwifi/mvm/rxmq.c | 11 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.c | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/sta.h | 5 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.c | 2 +- + .../net/wireless/intel/iwlwifi/mvm/time-event.h | 9 +- + drivers/net/wireless/intel/iwlwifi/mvm/tx.c | 104 +- + drivers/net/wireless/intel/iwlwifi/pcie/drv.c | 3 + + drivers/net/wireless/intel/iwlwifi/pcie/internal.h | 59 +- + drivers/net/wireless/intel/iwlwifi/pcie/rx.c | 12 +- + drivers/net/wireless/intel/iwlwifi/pcie/trans.c | 45 +- + drivers/net/wireless/intel/iwlwifi/queue/tx.h | 6 +- + drivers/net/wireless/marvell/mwifiex/11h.c | 4 +- + drivers/net/wireless/marvell/mwifiex/cfg80211.c | 3 +- + drivers/net/wireless/marvell/mwifiex/main.h | 4 +- + drivers/net/wireless/marvell/mwifiex/pcie.c | 322 +- + drivers/net/wireless/marvell/mwifiex/sdio.c | 10 - + drivers/net/wireless/marvell/mwifiex/sdio.h | 4 - + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7915/mmio.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 9 +- + drivers/net/wireless/mediatek/mt76/mt7996/init.c | 3 +- + drivers/net/wireless/microchip/wilc1000/cfg80211.c | 4 +- + drivers/net/wireless/microchip/wilc1000/netdev.c | 20 +- + drivers/net/wireless/microchip/wilc1000/netdev.h | 2 + + drivers/net/wireless/purelifi/plfxlc/mac.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/cfg80211.c | 4 +- + drivers/net/wireless/quantenna/qtnfmac/commands.c | 5 +- + drivers/net/wireless/quantenna/qtnfmac/core.c | 2 +- + drivers/net/wireless/quantenna/qtnfmac/event.c | 4 +- + drivers/net/wireless/ralink/rt2x00/rt2800lib.c | 10 +- + .../net/wireless/realtek/rtl8xxxu/rtl8xxxu_core.c | 2 + + .../net/wireless/realtek/rtlwifi/rtl8188ee/dm.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/hw.c | 5 - + .../wireless/realtek/rtlwifi/rtl8192c/dm_common.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/hw.c | 5 - + .../net/wireless/realtek/rtlwifi/rtl8192de/dm.c | 18 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/hw.c | 4 - + .../net/wireless/realtek/rtlwifi/rtl8723ae/dm.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/hw.c | 5 - + .../net/wireless/realtek/rtlwifi/rtl8723be/hw.c | 6 - + .../net/wireless/realtek/rtlwifi/rtl8821ae/hw.c | 5 - + drivers/net/wireless/realtek/rtlwifi/wifi.h | 2 +- + drivers/net/wireless/realtek/rtw88/debug.c | 4 +- + drivers/net/wireless/realtek/rtw88/rtw8822cu.c | 4 +- + drivers/net/wireless/realtek/rtw89/chan.c | 1576 ++++++- + drivers/net/wireless/realtek/rtw89/chan.h | 34 + + drivers/net/wireless/realtek/rtw89/core.c | 336 +- + drivers/net/wireless/realtek/rtw89/core.h | 396 +- + drivers/net/wireless/realtek/rtw89/debug.c | 272 +- + drivers/net/wireless/realtek/rtw89/fw.c | 665 ++- + drivers/net/wireless/realtek/rtw89/fw.h | 144 +- + drivers/net/wireless/realtek/rtw89/mac.c | 154 +- + drivers/net/wireless/realtek/rtw89/mac.h | 27 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 3 +- + drivers/net/wireless/realtek/rtw89/mac_be.c | 223 + + drivers/net/wireless/realtek/rtw89/pci.c | 3 +- + drivers/net/wireless/realtek/rtw89/phy.c | 419 +- + drivers/net/wireless/realtek/rtw89/phy.h | 123 +- + drivers/net/wireless/realtek/rtw89/phy_be.c | 568 +++ + drivers/net/wireless/realtek/rtw89/reg.h | 326 +- + drivers/net/wireless/realtek/rtw89/regd.c | 4 +- + drivers/net/wireless/realtek/rtw89/rtw8851b.c | 12 +- + .../net/wireless/realtek/rtw89/rtw8851b_table.c | 1347 +++--- + .../net/wireless/realtek/rtw89/rtw8851b_table.h | 3 - + drivers/net/wireless/realtek/rtw89/rtw8852a.c | 7 +- + .../net/wireless/realtek/rtw89/rtw8852a_table.c | 2 + + .../net/wireless/realtek/rtw89/rtw8852a_table.h | 1 - + drivers/net/wireless/realtek/rtw89/rtw8852b.c | 12 +- + .../net/wireless/realtek/rtw89/rtw8852b_table.c | 333 +- + .../net/wireless/realtek/rtw89/rtw8852b_table.h | 3 - + drivers/net/wireless/realtek/rtw89/rtw8852c.c | 26 +- + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.c | 107 +- + drivers/net/wireless/realtek/rtw89/rtw8852c_rfk.h | 3 + + .../wireless/realtek/rtw89/rtw8852c_rfk_table.c | 42 +- + .../net/wireless/realtek/rtw89/rtw8852c_table.c | 3782 +++++++++++++++-- + .../net/wireless/realtek/rtw89/rtw8852c_table.h | 3 - + drivers/net/wireless/realtek/rtw89/txrx.h | 271 ++ + drivers/net/wireless/realtek/rtw89/wow.c | 4 +- + drivers/net/wireless/st/cw1200/txrx.c | 2 +- + drivers/net/wireless/ti/wl12xx/main.c | 6 +- + drivers/net/wireless/ti/wl18xx/main.c | 2 +- + drivers/net/wireless/ti/wlcore/event.c | 2 +- + drivers/net/wireless/ti/wlcore/main.c | 12 +- + drivers/net/wireless/ti/wlcore/wlcore.h | 2 +- + drivers/net/wireless/virtual/mac80211_hwsim.c | 58 +- + drivers/net/wireless/virtual/mac80211_hwsim.h | 19 +- + drivers/net/wwan/t7xx/t7xx_hif_dpmaif_rx.c | 2 +- + drivers/net/wwan/t7xx/t7xx_state_monitor.c | 3 +- + drivers/net/wwan/t7xx/t7xx_state_monitor.h | 2 +- + drivers/net/wwan/wwan_core.c | 5 +- + drivers/net/xen-netback/interface.c | 5 +- + drivers/ptp/Kconfig | 1 + + drivers/ptp/ptp_chardev.c | 129 +- + drivers/ptp/ptp_clock.c | 45 +- + drivers/ptp/ptp_ocp.c | 369 +- + drivers/ptp/ptp_private.h | 28 +- + drivers/ptp/ptp_sysfs.c | 15 +- + drivers/ssb/main.c | 2 +- + drivers/staging/rtl8723bs/os_dep/ioctl_cfg80211.c | 9 +- + drivers/vhost/vsock.c | 21 +- + include/linux/avf/virtchnl.h | 15 +- + include/linux/bpf.h | 40 +- + include/linux/bpf_verifier.h | 9 +- + include/linux/brcmphy.h | 10 + + include/linux/can/dev.h | 4 + + include/linux/ceph/mon_client.h | 2 +- + include/linux/compiler_types.h | 32 +- + include/linux/dpll.h | 170 + + include/linux/filter.h | 64 +- + include/linux/fortify-string.h | 4 - + include/linux/ieee80211.h | 103 +- + include/linux/igmp.h | 2 +- + include/linux/ipv6.h | 50 +- + include/linux/kasan.h | 2 + + include/linux/mlx5/device.h | 1 + + include/linux/mlx5/driver.h | 2 + + include/linux/mlx5/fs.h | 1 + + include/linux/mlx5/mlx5_ifc.h | 60 +- + include/linux/netdevice.h | 73 +- + include/linux/overflow.h | 35 + + include/linux/pds/pds_core_if.h | 1 + + include/linux/phy.h | 1 + + include/linux/posix-clock.h | 35 +- + include/linux/soc/mediatek/mtk_wed.h | 76 +- + include/linux/socket.h | 1 + + include/linux/stmmac.h | 1 + + include/linux/tcp.h | 22 +- + include/linux/udp.h | 66 +- + include/linux/virtio_vsock.h | 10 + + include/net/Space.h | 1 - + include/net/af_vsock.h | 7 + + include/net/bluetooth/bluetooth.h | 2 +- + include/net/cfg80211.h | 219 +- + include/net/devlink.h | 9 +- + include/net/dsa.h | 13 +- + include/net/dst.h | 4 +- + include/net/flow_offload.h | 2 +- + include/net/if_inet6.h | 2 +- + include/net/inet_connection_sock.h | 5 +- + include/net/inet_sock.h | 10 + + include/net/ip.h | 16 +- + include/net/ip6_route.h | 19 +- + include/net/ip_fib.h | 2 +- + include/net/ipv6.h | 36 +- + include/net/mac80211.h | 58 +- + include/net/mana/hw_channel.h | 2 +- + include/net/mana/mana.h | 2 +- + include/net/netfilter/nf_conntrack.h | 14 +- + include/net/netfilter/nf_tables.h | 5 +- + include/net/netns/ipv4.h | 1 + + include/net/nexthop.h | 8 +- + include/net/pkt_sched.h | 8 +- + include/net/regulatory.h | 1 + + include/net/route.h | 4 +- + include/net/sch_generic.h | 1 + + include/net/sock.h | 41 +- + include/net/tcp.h | 8 +- + include/net/tls.h | 21 +- + include/net/udp_tunnel.h | 14 +- + include/net/udplite.h | 14 +- + include/net/xdp.h | 19 +- + include/net/xdp_sock.h | 2 + + include/net/xfrm.h | 2 +- + include/trace/events/mptcp.h | 2 +- + .../trace/events/vsock_virtio_transport_common.h | 12 +- + include/uapi/linux/bpf.h | 9 +- + include/uapi/linux/devlink.h | 1 + + include/uapi/linux/dpll.h | 207 + + include/uapi/linux/if_link.h | 2 +- + include/uapi/linux/netdev.h | 16 + + include/uapi/linux/nl80211.h | 39 +- + include/uapi/linux/pkt_sched.h | 15 +- + include/uapi/linux/ptp_clock.h | 2 + + include/uapi/linux/tcp.h | 12 + + include/uapi/linux/vm_sockets.h | 17 + + kernel/bpf/bpf_struct_ops.c | 26 +- + kernel/bpf/btf.c | 34 +- + kernel/bpf/core.c | 37 +- + kernel/bpf/helpers.c | 61 + + kernel/bpf/memalloc.c | 30 +- + kernel/bpf/offload.c | 18 +- + kernel/bpf/syscall.c | 6 +- + kernel/bpf/task_iter.c | 40 +- + kernel/bpf/trampoline.c | 4 +- + kernel/bpf/verifier.c | 643 ++- + kernel/time/posix-clock.c | 36 +- + lib/test_bpf.c | 371 ++ + mm/kasan/kasan.h | 1 - + net/Kconfig | 11 +- + net/appletalk/Kconfig | 30 + + net/appletalk/aarp.c | 2 +- + net/appletalk/ddp.c | 36 - + net/ax25/af_ax25.c | 2 +- + net/bluetooth/l2cap_sock.c | 2 +- + net/bridge/br_fdb.c | 29 +- + net/bridge/br_private.h | 3 +- + net/can/j1939/socket.c | 2 +- + net/can/raw.c | 5 +- + net/ceph/mon_client.c | 2 +- + net/core/Makefile | 1 + + net/core/dev.c | 43 +- + net/core/dst.c | 10 +- + net/core/gso_test.c | 274 ++ + net/core/netdev-genl.c | 12 +- + net/core/pktgen.c | 102 +- + net/core/rtnetlink.c | 63 +- + net/core/skbuff.c | 22 +- + net/core/sock.c | 178 +- + net/core/xdp.c | 4 +- + net/dccp/ipv4.c | 2 +- + net/dccp/ipv6.c | 10 +- + net/dccp/timer.c | 4 +- + net/devlink/core.c | 217 + + net/devlink/dev.c | 50 + + net/devlink/devl_internal.h | 34 +- + net/devlink/linecard.c | 80 +- + net/devlink/netlink.c | 26 + + net/devlink/port.c | 55 +- + net/dsa/port.c | 20 +- + net/dsa/port.h | 3 +- + net/dsa/slave.c | 9 +- + net/dsa/tag_ksz.c | 8 + + net/handshake/genl.c | 2 +- + net/handshake/netlink.c | 2 +- + net/handshake/tlshd.c | 6 +- + net/ipv4/datagram.c | 6 +- + net/ipv4/igmp.c | 2 - + net/ipv4/inet_diag.c | 4 +- + net/ipv4/ip_forward.c | 4 +- + net/ipv4/ip_output.c | 15 +- + net/ipv4/ip_sockglue.c | 194 +- + net/ipv4/ping.c | 13 +- + net/ipv4/raw.c | 19 +- + net/ipv4/route.c | 6 +- + net/ipv4/sysctl_net_ipv4.c | 9 + + net/ipv4/tcp.c | 12 +- + net/ipv4/tcp_bbr.c | 13 +- + net/ipv4/tcp_input.c | 65 +- + net/ipv4/tcp_ipv4.c | 12 +- + net/ipv4/tcp_metrics.c | 22 +- + net/ipv4/tcp_minisocks.c | 6 +- + net/ipv4/tcp_output.c | 42 +- + net/ipv4/tcp_timer.c | 21 +- + net/ipv4/udp.c | 92 +- + net/ipv4/udp_offload.c | 4 +- + net/ipv4/udp_tunnel_core.c | 2 +- + net/ipv4/udp_tunnel_nic.c | 11 +- + net/ipv4/udplite.c | 1 - + net/ipv4/xfrm4_input.c | 4 +- + net/ipv6/addrconf.c | 38 +- + net/ipv6/af_inet6.c | 9 +- + net/ipv6/datagram.c | 15 +- + net/ipv6/icmp.c | 4 +- + net/ipv6/inet6_connection_sock.c | 2 +- + net/ipv6/ip6_flowlabel.c | 8 +- + net/ipv6/ip6_output.c | 52 +- + net/ipv6/ip6_udp_tunnel.c | 5 +- + net/ipv6/ipv6_sockglue.c | 242 +- + net/ipv6/mcast.c | 6 +- + net/ipv6/ndisc.c | 4 +- + net/ipv6/ping.c | 4 +- + net/ipv6/raw.c | 16 +- + net/ipv6/route.c | 6 +- + net/ipv6/tcp_ipv6.c | 25 +- + net/ipv6/udp.c | 46 +- + net/ipv6/udplite.c | 1 - + net/ipv6/xfrm6_input.c | 4 +- + net/l2tp/l2tp_core.c | 6 +- + net/l2tp/l2tp_eth.c | 34 +- + net/l2tp/l2tp_ip6.c | 6 +- + net/mac80211/Kconfig | 11 + + net/mac80211/Makefile | 2 + + net/mac80211/agg-rx.c | 63 +- + net/mac80211/agg-tx.c | 63 +- + net/mac80211/airtime.c | 10 +- + net/mac80211/cfg.c | 490 +-- + net/mac80211/chan.c | 156 +- + net/mac80211/debugfs.c | 11 +- + net/mac80211/debugfs_key.c | 20 +- + net/mac80211/debugfs_netdev.c | 133 +- + net/mac80211/debugfs_sta.c | 4 +- + net/mac80211/driver-ops.c | 31 +- + net/mac80211/driver-ops.h | 127 +- + net/mac80211/drop.h | 49 +- + net/mac80211/ethtool.c | 20 +- + net/mac80211/ht.c | 60 +- + net/mac80211/ibss.c | 104 +- + net/mac80211/ieee80211_i.h | 220 +- + net/mac80211/iface.c | 170 +- + net/mac80211/key.c | 155 +- + net/mac80211/key.h | 11 +- + net/mac80211/link.c | 56 +- + net/mac80211/main.c | 91 +- + net/mac80211/mesh.c | 16 +- + net/mac80211/mesh_pathtbl.c | 2 +- + net/mac80211/mlme.c | 666 +-- + net/mac80211/ocb.c | 19 +- + net/mac80211/offchannel.c | 103 +- + net/mac80211/pm.c | 13 +- + net/mac80211/rc80211_minstrel_ht.c | 7 +- + net/mac80211/rx.c | 104 +- + net/mac80211/s1g.c | 15 +- + net/mac80211/scan.c | 226 +- + net/mac80211/spectmgmt.c | 13 +- + net/mac80211/sta_info.c | 111 +- + net/mac80211/sta_info.h | 26 +- + net/mac80211/status.c | 102 +- + net/mac80211/tdls.c | 86 +- + net/mac80211/tests/Makefile | 3 + + net/mac80211/tests/elems.c | 101 + + net/mac80211/tests/module.c | 10 + + net/mac80211/trace.h | 11 +- + net/mac80211/tx.c | 73 +- + net/mac80211/util.c | 248 +- + net/mac80211/wep.c | 9 +- + net/mac80211/wpa.c | 42 +- + net/mptcp/sockopt.c | 10 +- + net/netfilter/ipvs/ip_vs_sync.c | 16 +- + net/netfilter/nf_conntrack_core.c | 18 - + net/netfilter/nf_conntrack_helper.c | 7 +- + net/netfilter/nf_conntrack_proto_tcp.c | 7 +- + net/netfilter/nf_nat_proto.c | 64 +- + net/netfilter/nf_tables_api.c | 123 +- + net/netlink/policy.c | 15 +- + net/netrom/af_netrom.c | 2 +- + net/openvswitch/actions.c | 27 +- + net/openvswitch/meter.h | 4 +- + net/packet/internal.h | 2 +- + net/rose/af_rose.c | 2 +- + net/sched/cls_route.c | 37 +- + net/sched/em_meta.c | 2 +- + net/sched/sch_fq.c | 385 +- + net/sched/sch_frag.c | 4 +- + net/sched/sch_generic.c | 9 +- + net/sched/sch_netem.c | 2 +- + net/sctp/ipv6.c | 9 +- + net/sctp/protocol.c | 4 +- + net/sctp/sm_make_chunk.c | 2 +- + net/smc/af_smc.c | 2 +- + net/tipc/link.c | 4 +- + net/tls/tls.h | 12 +- + net/tls/tls_device.c | 101 +- + net/tls/tls_device_fallback.c | 23 +- + net/tls/tls_main.c | 62 +- + net/tls/tls_sw.c | 204 +- + net/vmw_vsock/af_vsock.c | 66 +- + net/vmw_vsock/virtio_transport.c | 97 +- + net/vmw_vsock/virtio_transport_common.c | 305 +- + net/vmw_vsock/vsock_loopback.c | 6 + + net/wireless/Kconfig | 11 + + net/wireless/Makefile | 1 + + net/wireless/ap.c | 24 +- + net/wireless/chan.c | 55 +- + net/wireless/core.c | 72 +- + net/wireless/core.h | 60 +- + net/wireless/ibss.c | 76 +- + net/wireless/lib80211_crypt_tkip.c | 12 +- + net/wireless/mesh.c | 28 +- + net/wireless/mlme.c | 21 +- + net/wireless/nl80211.c | 536 +-- + net/wireless/ocb.c | 43 +- + net/wireless/pmsr.c | 4 +- + net/wireless/rdev-ops.h | 2 +- + net/wireless/reg.c | 99 +- + net/wireless/reg.h | 16 +- + net/wireless/scan.c | 74 +- + net/wireless/sme.c | 59 +- + net/wireless/sysfs.c | 4 +- + net/wireless/tests/Makefile | 3 + + net/wireless/tests/fragmentation.c | 157 + + net/wireless/tests/module.c | 10 + + net/wireless/trace.h | 78 +- + net/wireless/util.c | 57 +- + net/wireless/wext-compat.c | 43 +- + net/wireless/wext-sme.c | 59 +- + net/x25/af_x25.c | 2 +- + net/xdp/xsk.c | 4 +- + net/xdp/xsk_buff_pool.c | 3 + + net/xfrm/xfrm_policy.c | 2 +- + samples/bpf/Makefile | 4 + + tools/bpf/bpftool/gen.c | 2 +- + tools/include/uapi/linux/bpf.h | 9 +- + tools/include/uapi/linux/netdev.h | 16 + + tools/lib/bpf/bpf_helpers.h | 1 + + tools/lib/bpf/btf.c | 160 + + tools/lib/bpf/libbpf.c | 166 +- + tools/net/ynl/Makefile | 1 - + tools/net/ynl/generated/Makefile | 6 +- + tools/net/ynl/generated/handshake-user.h | 10 +- + tools/net/ynl/generated/netdev-user.c | 19 + + tools/net/ynl/generated/netdev-user.h | 3 + + tools/net/ynl/samples/Makefile | 3 + + tools/net/ynl/samples/netdev.c | 8 +- + tools/net/ynl/ynl-gen-c.py | 23 +- + tools/testing/selftests/bpf/DENYLIST.aarch64 | 1 + + tools/testing/selftests/bpf/DENYLIST.s390x | 1 + + tools/testing/selftests/bpf/bpf_experimental.h | 319 ++ + tools/testing/selftests/bpf/prog_tests/btf.c | 4 +- + .../testing/selftests/bpf/prog_tests/exceptions.c | 409 ++ + .../selftests/bpf/prog_tests/fill_link_info.c | 2 +- + .../bpf/prog_tests/kprobe_multi_testmod_test.c | 20 +- + .../testing/selftests/bpf/prog_tests/libbpf_str.c | 6 +- + .../testing/selftests/bpf/prog_tests/linked_list.c | 4 +- + .../bpf/prog_tests/module_fentry_shadow.c | 5 + + .../selftests/bpf/prog_tests/percpu_alloc.c | 125 + + .../selftests/bpf/prog_tests/preempted_bpf_ma_op.c | 89 + + tools/testing/selftests/bpf/prog_tests/tailcalls.c | 269 +- + tools/testing/selftests/bpf/progs/exceptions.c | 368 ++ + .../selftests/bpf/progs/exceptions_assert.c | 135 + + tools/testing/selftests/bpf/progs/exceptions_ext.c | 72 + + .../testing/selftests/bpf/progs/exceptions_fail.c | 347 ++ + .../selftests/bpf/progs/percpu_alloc_array.c | 183 + + .../bpf/progs/percpu_alloc_cgrp_local_storage.c | 105 + + .../selftests/bpf/progs/percpu_alloc_fail.c | 164 + + .../selftests/bpf/progs/preempted_bpf_ma_op.c | 106 + + .../selftests/bpf/progs/tailcall_bpf2bpf_fentry.c | 18 + + .../selftests/bpf/progs/tailcall_bpf2bpf_fexit.c | 18 + + tools/testing/selftests/bpf/progs/verifier_bswap.c | 3 +- + tools/testing/selftests/bpf/progs/verifier_gotol.c | 3 +- + tools/testing/selftests/bpf/progs/verifier_ldsx.c | 3 +- + tools/testing/selftests/bpf/progs/verifier_movsx.c | 3 +- + tools/testing/selftests/bpf/progs/verifier_sdiv.c | 3 +- + .../selftests/bpf/test_bpftool_synctypes.py | 9 + + tools/testing/selftests/bpf/test_xsk.sh | 40 +- + tools/testing/selftests/bpf/trace_helpers.c | 142 +- + tools/testing/selftests/bpf/trace_helpers.h | 8 +- + tools/testing/selftests/bpf/xsk_prereqs.sh | 10 +- + tools/testing/selftests/bpf/xskxceiver.c | 529 ++- + tools/testing/selftests/bpf/xskxceiver.h | 44 +- + .../selftests/drivers/net/netdevsim/devlink.sh | 21 +- + tools/testing/selftests/net/Makefile | 1 + + tools/testing/selftests/net/fdb_flush.sh | 812 ++++ + tools/testing/selftests/net/mptcp/mptcp_connect.sh | 2 +- + tools/testing/selftests/net/rtnetlink.sh | 985 ++--- + tools/testing/selftests/netfilter/nf_nat_edemux.sh | 46 +- + tools/testing/selftests/ptp/ptpchmaskfmt.sh | 14 + + tools/testing/selftests/ptp/testptp.c | 19 +- + tools/testing/selftests/tc-testing/README | 65 +- + tools/testing/selftests/tc-testing/TdcPlugin.py | 4 +- + tools/testing/selftests/tc-testing/TdcResults.py | 3 +- + .../selftests/tc-testing/plugin-lib/nsPlugin.py | 194 +- + .../selftests/tc-testing/plugin-lib/rootPlugin.py | 4 +- + .../tc-testing/plugin-lib/valgrindPlugin.py | 5 +- + .../tc-testing/tc-tests/actions/connmark.json | 45 + + .../tc-testing/tc-tests/actions/csum.json | 69 + + .../selftests/tc-testing/tc-tests/actions/ct.json | 54 + + .../tc-testing/tc-tests/actions/ctinfo.json | 36 + + .../tc-testing/tc-tests/actions/gact.json | 75 + + .../tc-testing/tc-tests/actions/gate.json | 36 + + .../selftests/tc-testing/tc-tests/actions/ife.json | 144 + + .../tc-testing/tc-tests/actions/mirred.json | 72 + + .../tc-testing/tc-tests/actions/mpls.json | 159 + + .../selftests/tc-testing/tc-tests/actions/nat.json | 81 + + .../tc-testing/tc-tests/actions/pedit.json | 198 + + .../tc-testing/tc-tests/actions/police.json | 102 + + .../tc-testing/tc-tests/actions/sample.json | 87 + + .../tc-testing/tc-tests/actions/simple.json | 27 + + .../tc-testing/tc-tests/actions/skbedit.json | 90 + + .../tc-testing/tc-tests/actions/skbmod.json | 54 + + .../tc-testing/tc-tests/actions/tunnel_key.json | 117 + + .../tc-testing/tc-tests/actions/vlan.json | 108 + + .../selftests/tc-testing/tc-tests/actions/xt.json | 24 + + .../selftests/tc-testing/tc-tests/filters/bpf.json | 10 +- + .../selftests/tc-testing/tc-tests/filters/fw.json | 315 +- + .../tc-testing/tc-tests/filters/matchall.json | 141 +- + .../tc-testing/tc-tests/filters/route.json | 25 + + .../selftests/tc-testing/tc-tests/filters/u32.json | 25 + + .../tc-testing/tc-tests/infra/actions.json | 144 +- + .../tc-testing/tc-tests/infra/filter.json | 9 +- + .../selftests/tc-testing/tc-tests/qdiscs/cake.json | 82 +- + .../selftests/tc-testing/tc-tests/qdiscs/cbs.json | 38 +- + .../tc-testing/tc-tests/qdiscs/choke.json | 30 +- + .../tc-testing/tc-tests/qdiscs/codel.json | 34 +- + .../selftests/tc-testing/tc-tests/qdiscs/drr.json | 10 +- + .../selftests/tc-testing/tc-tests/qdiscs/etf.json | 18 +- + .../selftests/tc-testing/tc-tests/qdiscs/ets.json | 284 +- + .../selftests/tc-testing/tc-tests/qdiscs/fifo.json | 98 +- + .../selftests/tc-testing/tc-tests/qdiscs/fq.json | 68 +- + .../tc-testing/tc-tests/qdiscs/fq_codel.json | 54 +- + .../tc-testing/tc-tests/qdiscs/fq_pie.json | 5 +- + .../selftests/tc-testing/tc-tests/qdiscs/gred.json | 28 +- + .../selftests/tc-testing/tc-tests/qdiscs/hfsc.json | 26 +- + .../selftests/tc-testing/tc-tests/qdiscs/hhf.json | 36 +- + .../selftests/tc-testing/tc-tests/qdiscs/htb.json | 46 +- + .../tc-testing/tc-tests/qdiscs/ingress.json | 36 +- + .../tc-testing/tc-tests/qdiscs/netem.json | 62 +- + .../tc-testing/tc-tests/qdiscs/pfifo_fast.json | 18 +- + .../selftests/tc-testing/tc-tests/qdiscs/plug.json | 30 +- + .../selftests/tc-testing/tc-tests/qdiscs/prio.json | 85 +- + .../selftests/tc-testing/tc-tests/qdiscs/qfq.json | 39 +- + .../selftests/tc-testing/tc-tests/qdiscs/red.json | 34 +- + .../selftests/tc-testing/tc-tests/qdiscs/sfb.json | 48 +- + .../selftests/tc-testing/tc-tests/qdiscs/sfq.json | 40 +- + .../tc-testing/tc-tests/qdiscs/skbprio.json | 16 +- + .../selftests/tc-testing/tc-tests/qdiscs/tbf.json | 36 +- + .../selftests/tc-testing/tc-tests/qdiscs/teql.json | 34 +- + tools/testing/selftests/tc-testing/tdc.py | 250 +- + tools/testing/vsock/.gitignore | 1 + + tools/testing/vsock/Makefile | 11 +- + tools/testing/vsock/msg_zerocopy_common.c | 87 + + tools/testing/vsock/msg_zerocopy_common.h | 18 + + tools/testing/vsock/util.c | 311 +- + tools/testing/vsock/util.h | 8 + + tools/testing/vsock/vsock_perf.c | 80 +- + tools/testing/vsock/vsock_test.c | 341 +- + tools/testing/vsock/vsock_test_zerocopy.c | 358 ++ + tools/testing/vsock/vsock_test_zerocopy.h | 15 + + tools/testing/vsock/vsock_uring_test.c | 342 ++ + 1149 files changed, 68966 insertions(+), 18377 deletions(-) + create mode 100644 Documentation/devicetree/bindings/net/loongson,ls1b-gmac.yaml + create mode 100644 Documentation/devicetree/bindings/net/loongson,ls1c-emac.yaml + create mode 100644 Documentation/driver-api/dpll.rst + create mode 100644 Documentation/netlink/specs/dpll.yaml + delete mode 100644 Documentation/networking/device_drivers/appletalk/cops.rst + delete mode 100644 Documentation/networking/device_drivers/appletalk/index.rst + create mode 100644 Documentation/networking/device_drivers/ethernet/intel/idpf.rst + delete mode 100644 Documentation/networking/ipddp.rst + create mode 100644 drivers/dpll/Kconfig + create mode 100644 drivers/dpll/Makefile + create mode 100644 drivers/dpll/dpll_core.c + create mode 100644 drivers/dpll/dpll_core.h + create mode 100644 drivers/dpll/dpll_netlink.c + create mode 100644 drivers/dpll/dpll_netlink.h + create mode 100644 drivers/dpll/dpll_nl.c + create mode 100644 drivers/dpll/dpll_nl.h + delete mode 100644 drivers/net/appletalk/Kconfig + delete mode 100644 drivers/net/appletalk/Makefile + delete mode 100644 drivers/net/appletalk/cops.c + delete mode 100644 drivers/net/appletalk/cops.h + delete mode 100644 drivers/net/appletalk/cops_ffdrv.h + delete mode 100644 drivers/net/appletalk/cops_ltdrv.h + delete mode 100644 drivers/net/appletalk/ipddp.c + delete mode 100644 drivers/net/appletalk/ipddp.h + create mode 100644 drivers/net/dsa/microchip/ksz9477_acl.c + create mode 100644 drivers/net/dsa/microchip/ksz9477_tc_flower.c + create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.c + create mode 100644 drivers/net/ethernet/broadcom/bnxt/bnxt_hwmon.h + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_debug.h + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_devlink.c + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_devlink.h + create mode 100644 drivers/net/ethernet/intel/i40e/i40e_io.h + delete mode 100644 drivers/net/ethernet/intel/i40e/i40e_osdep.h + create mode 100644 drivers/net/ethernet/intel/ice/ice_dpll.c + create mode 100644 drivers/net/ethernet/intel/ice/ice_dpll.h + create mode 100644 drivers/net/ethernet/intel/idpf/Makefile + create mode 100644 drivers/net/ethernet/intel/idpf/idpf.h + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_controlq.c + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_controlq.h + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_controlq_api.h + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_controlq_setup.c + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_dev.c + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_devids.h + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_ethtool.c + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_lan_pf_regs.h + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_lan_txrx.h + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_lan_vf_regs.h + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_lib.c + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_main.c + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_mem.h + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_singleq_txrx.c + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_txrx.c + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_txrx.h + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_vf_dev.c + create mode 100644 drivers/net/ethernet/intel/idpf/idpf_virtchnl.c + create mode 100644 drivers/net/ethernet/intel/idpf/virtchnl2.h + create mode 100644 drivers/net/ethernet/intel/idpf/virtchnl2_lan_desc.h + create mode 100644 drivers/net/ethernet/mellanox/mlx5/core/dpll.c + create mode 100644 drivers/net/ethernet/stmicro/stmmac/dwmac-loongson1.c + delete mode 100644 drivers/net/ethernet/ti/cpmac.c + create mode 100644 include/linux/dpll.h + create mode 100644 include/uapi/linux/dpll.h + create mode 100644 net/appletalk/Kconfig + create mode 100644 net/core/gso_test.c + create mode 100644 net/mac80211/tests/Makefile + create mode 100644 net/mac80211/tests/elems.c + create mode 100644 net/mac80211/tests/module.c + create mode 100644 net/wireless/tests/Makefile + create mode 100644 net/wireless/tests/fragmentation.c + create mode 100644 net/wireless/tests/module.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/exceptions.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/percpu_alloc.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/preempted_bpf_ma_op.c + create mode 100644 tools/testing/selftests/bpf/progs/exceptions.c + create mode 100644 tools/testing/selftests/bpf/progs/exceptions_assert.c + create mode 100644 tools/testing/selftests/bpf/progs/exceptions_ext.c + create mode 100644 tools/testing/selftests/bpf/progs/exceptions_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/percpu_alloc_array.c + create mode 100644 tools/testing/selftests/bpf/progs/percpu_alloc_cgrp_local_storage.c + create mode 100644 tools/testing/selftests/bpf/progs/percpu_alloc_fail.c + create mode 100644 tools/testing/selftests/bpf/progs/preempted_bpf_ma_op.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_fentry.c + create mode 100644 tools/testing/selftests/bpf/progs/tailcall_bpf2bpf_fexit.c + create mode 100755 tools/testing/selftests/net/fdb_flush.sh + create mode 100644 tools/testing/selftests/ptp/ptpchmaskfmt.sh + create mode 100644 tools/testing/vsock/msg_zerocopy_common.c + create mode 100644 tools/testing/vsock/msg_zerocopy_common.h + create mode 100644 tools/testing/vsock/vsock_test_zerocopy.c + create mode 100644 tools/testing/vsock/vsock_test_zerocopy.h + create mode 100644 tools/testing/vsock/vsock_uring_test.c +Merging bpf-next/for-next (0e10fd4b7a6d Merge branch 'Open-coded task_vma iter') +$ 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 arch/s390/net/bpf_jit_comp.c +Auto-merging include/linux/bpf.h +Auto-merging include/linux/filter.h +Auto-merging kernel/bpf/syscall.c +Auto-merging kernel/bpf/task_iter.c +Auto-merging kernel/bpf/verifier.c +Auto-merging kernel/trace/trace_kprobe.c +Auto-merging net/ipv4/af_inet.c +Auto-merging net/ipv4/ping.c +Auto-merging net/ipv4/tcp_ipv4.c +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv6/tcp_ipv6.c +Auto-merging tools/testing/selftests/bpf/prog_tests/sockmap_basic.c +Auto-merging tools/testing/selftests/bpf/prog_tests/timer.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/net.rst | 1 + + Documentation/bpf/libbpf/program_types.rst | 10 + + Documentation/networking/filter.rst | 4 +- + arch/s390/net/bpf_jit_comp.c | 265 ++++++--- + include/linux/bpf-cgroup-defs.h | 5 + + include/linux/bpf-cgroup.h | 90 +-- + include/linux/bpf.h | 20 +- + include/linux/filter.h | 3 +- + include/linux/trace_events.h | 6 +- + include/net/ipv6_stubs.h | 5 + + include/uapi/linux/bpf.h | 29 +- + kernel/bpf/bpf_iter.c | 2 - + kernel/bpf/btf.c | 1 + + kernel/bpf/cgroup.c | 28 +- + kernel/bpf/helpers.c | 8 +- + kernel/bpf/stackmap.c | 2 +- + kernel/bpf/syscall.c | 29 +- + kernel/bpf/task_iter.c | 91 +++ + kernel/bpf/verifier.c | 7 +- + kernel/trace/bpf_trace.c | 10 +- + kernel/trace/trace_kprobe.c | 14 +- + kernel/trace/trace_syscalls.c | 4 +- + net/core/filter.c | 67 ++- + net/ipv4/af_inet.c | 9 +- + net/ipv4/ping.c | 2 +- + net/ipv4/tcp_ipv4.c | 2 +- + net/ipv4/udp.c | 9 +- + net/ipv6/af_inet6.c | 10 +- + net/ipv6/ping.c | 2 +- + net/ipv6/tcp_ipv6.c | 2 +- + net/ipv6/udp.c | 6 +- + net/unix/af_unix.c | 35 +- + samples/bpf/Makefile | 3 + + samples/bpf/syscall_tp_user.c | 45 +- + tools/bpf/bpftool/Documentation/bpftool-cgroup.rst | 16 +- + tools/bpf/bpftool/Documentation/bpftool-prog.rst | 8 +- + tools/bpf/bpftool/bash-completion/bpftool | 14 +- + tools/bpf/bpftool/cgroup.c | 16 +- + tools/bpf/bpftool/gen.c | 58 +- + tools/bpf/bpftool/link.c | 6 + + tools/bpf/bpftool/prog.c | 7 +- + tools/include/uapi/linux/bpf.h | 29 +- + tools/lib/bpf/bpf_tracing.h | 2 - + tools/lib/bpf/elf.c | 139 ++++- + tools/lib/bpf/libbpf.c | 32 +- + tools/lib/bpf/libbpf.h | 73 +++ + tools/lib/bpf/libbpf.map | 7 + + tools/lib/bpf/ringbuf.c | 85 ++- + tools/testing/selftests/bpf/DENYLIST.aarch64 | 1 + + tools/testing/selftests/bpf/DENYLIST.s390x | 25 - + tools/testing/selftests/bpf/Makefile | 37 +- + tools/testing/selftests/bpf/bpf_experimental.h | 8 + + tools/testing/selftests/bpf/bpf_kfuncs.h | 14 + + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 5 + + .../selftests/bpf/bpf_testmod/bpf_testmod_kfunc.h | 2 + + tools/testing/selftests/bpf/cgroup_helpers.c | 38 +- + tools/testing/selftests/bpf/config | 1 + + tools/testing/selftests/bpf/liburandom_read.map | 15 + + .../selftests/bpf/map_tests/map_in_map_batch_ops.c | 4 +- + tools/testing/selftests/bpf/network_helpers.c | 34 ++ + tools/testing/selftests/bpf/network_helpers.h | 1 + + .../selftests/bpf/prog_tests/bloom_filter_map.c | 4 +- + tools/testing/selftests/bpf/prog_tests/bpf_iter.c | 26 +- + .../selftests/bpf/prog_tests/connect_ping.c | 4 +- + .../testing/selftests/bpf/prog_tests/fib_lookup.c | 83 ++- + tools/testing/selftests/bpf/prog_tests/iters.c | 58 ++ + .../testing/selftests/bpf/prog_tests/linked_list.c | 2 +- + .../testing/selftests/bpf/prog_tests/lwt_helpers.h | 3 +- + tools/testing/selftests/bpf/prog_tests/missed.c | 138 +++++ + .../selftests/bpf/prog_tests/queue_stack_map.c | 2 +- + tools/testing/selftests/bpf/prog_tests/ringbuf.c | 26 + + .../selftests/bpf/prog_tests/ringbuf_multi.c | 15 + + .../selftests/bpf/prog_tests/section_names.c | 45 ++ + tools/testing/selftests/bpf/prog_tests/sock_addr.c | 612 +++++++++++++++++++++ + .../selftests/bpf/prog_tests/sockmap_basic.c | 8 +- + .../selftests/bpf/prog_tests/sockmap_helpers.h | 2 +- + .../selftests/bpf/prog_tests/sockmap_listen.c | 170 ++---- + tools/testing/selftests/bpf/prog_tests/timer.c | 4 + + tools/testing/selftests/bpf/prog_tests/uprobe.c | 95 ++++ + .../selftests/bpf/prog_tests/xdp_metadata.c | 2 +- + .../{bpf_iter_task_vma.c => bpf_iter_task_vmas.c} | 0 + tools/testing/selftests/bpf/progs/bpf_misc.h | 3 + + .../selftests/bpf/progs/connect_unix_prog.c | 40 ++ + .../selftests/bpf/progs/getpeername_unix_prog.c | 39 ++ + .../selftests/bpf/progs/getsockname_unix_prog.c | 39 ++ + tools/testing/selftests/bpf/progs/iters_task_vma.c | 43 ++ + tools/testing/selftests/bpf/progs/missed_kprobe.c | 30 + + .../selftests/bpf/progs/missed_kprobe_recursion.c | 48 ++ + .../selftests/bpf/progs/missed_tp_recursion.c | 41 ++ + tools/testing/selftests/bpf/progs/profiler.inc.h | 2 +- + .../selftests/bpf/progs/recvmsg_unix_prog.c | 39 ++ + .../selftests/bpf/progs/sendmsg_unix_prog.c | 40 ++ + tools/testing/selftests/bpf/progs/test_ldsx_insn.c | 9 +- + tools/testing/selftests/bpf/progs/test_uprobe.c | 61 ++ + tools/testing/selftests/bpf/progs/test_vmlinux.c | 4 +- + tools/testing/selftests/bpf/progs/timer.c | 63 ++- + tools/testing/selftests/bpf/progs/verifier_bswap.c | 3 +- + tools/testing/selftests/bpf/progs/verifier_gotol.c | 3 +- + tools/testing/selftests/bpf/progs/verifier_ldsx.c | 149 ++--- + tools/testing/selftests/bpf/progs/verifier_movsx.c | 3 +- + tools/testing/selftests/bpf/progs/verifier_sdiv.c | 3 +- + tools/testing/selftests/bpf/progs/xsk_xdp_progs.c | 22 +- + tools/testing/selftests/bpf/test_loader.c | 4 +- + tools/testing/selftests/bpf/test_progs.c | 2 +- + tools/testing/selftests/bpf/test_progs.h | 2 + + tools/testing/selftests/bpf/urandom_read.c | 15 +- + tools/testing/selftests/bpf/urandom_read_lib1.c | 22 + + tools/testing/selftests/bpf/xdp_features.c | 4 +- + tools/testing/selftests/bpf/xdp_hw_metadata.c | 2 +- + tools/testing/selftests/bpf/xsk.c | 3 +- + tools/testing/selftests/bpf/xsk.h | 2 +- + tools/testing/selftests/bpf/xsk_xdp_common.h | 12 + + tools/testing/selftests/bpf/xsk_xdp_metadata.h | 5 - + tools/testing/selftests/bpf/xskxceiver.c | 523 +++++++++++------- + tools/testing/selftests/bpf/xskxceiver.h | 13 +- + 115 files changed, 3338 insertions(+), 757 deletions(-) + create mode 100644 tools/testing/selftests/bpf/liburandom_read.map + create mode 100644 tools/testing/selftests/bpf/prog_tests/missed.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/sock_addr.c + create mode 100644 tools/testing/selftests/bpf/prog_tests/uprobe.c + rename tools/testing/selftests/bpf/progs/{bpf_iter_task_vma.c => bpf_iter_task_vmas.c} (100%) + create mode 100644 tools/testing/selftests/bpf/progs/connect_unix_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/getpeername_unix_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/getsockname_unix_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/iters_task_vma.c + create mode 100644 tools/testing/selftests/bpf/progs/missed_kprobe.c + create mode 100644 tools/testing/selftests/bpf/progs/missed_kprobe_recursion.c + create mode 100644 tools/testing/selftests/bpf/progs/missed_tp_recursion.c + create mode 100644 tools/testing/selftests/bpf/progs/recvmsg_unix_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/sendmsg_unix_prog.c + create mode 100644 tools/testing/selftests/bpf/progs/test_uprobe.c + create mode 100644 tools/testing/selftests/bpf/xsk_xdp_common.h + delete mode 100644 tools/testing/selftests/bpf/xsk_xdp_metadata.h +Merging ipsec-next/master (efedce336d71 Merge branch 'xfrm: policy: replace session decode with flow dissector') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Auto-merging include/net/ipv6_stubs.h +Auto-merging net/ipv4/udp.c +Auto-merging net/ipv6/af_inet6.c +Auto-merging net/netfilter/nf_nat_proto.c +Auto-merging net/xfrm/xfrm_interface_core.c +Auto-merging net/xfrm/xfrm_policy.c +Merge made by the 'ort' strategy. + include/net/gro.h | 2 +- + include/net/ipv6_stubs.h | 3 + + include/net/xfrm.h | 18 +-- + include/uapi/linux/xfrm.h | 3 +- + net/ipv4/esp4_offload.c | 6 +- + net/ipv4/icmp.c | 2 +- + net/ipv4/ip_vti.c | 4 +- + net/ipv4/netfilter.c | 2 +- + net/ipv4/udp.c | 16 +++ + net/ipv4/xfrm4_input.c | 94 +++++++++++--- + net/ipv6/af_inet6.c | 1 + + net/ipv6/esp6_offload.c | 10 +- + net/ipv6/icmp.c | 2 +- + net/ipv6/ip6_vti.c | 4 +- + net/ipv6/netfilter.c | 2 +- + net/ipv6/xfrm6_input.c | 94 +++++++++++--- + net/netfilter/nf_nat_proto.c | 2 +- + net/xfrm/xfrm_input.c | 6 +- + net/xfrm/xfrm_interface_core.c | 4 +- + net/xfrm/xfrm_policy.c | 287 ++++++++++++++++------------------------- + 20 files changed, 323 insertions(+), 239 deletions(-) +Merging mlx5-next/mlx5-next (82f9378c443c net/mlx5: Handle IPsec steering upon master unbind/bind) +$ git merge -m Merge branch 'mlx5-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mellanox/linux.git mlx5-next/mlx5-next +Already up to date. +Merging netfilter-next/main (35715ac13a77 Merge branch 'tls-cleanups') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netfilter/nf-next.git netfilter-next/main +Already up to date. +Merging ipvs-next/main (35715ac13a77 Merge branch 'tls-cleanups') +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/horms/ipvs-next.git ipvs-next/main +Already up to date. +Merging bluetooth/master (8fa4c368ba69 Bluetooth: ISO: Copy BASE if service data matches EIR_BAA_SERVICE_UUID) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + drivers/bluetooth/btqca.c | 68 +++++++++++++++++++ + drivers/bluetooth/btqca.h | 5 +- + drivers/bluetooth/btrtl.c | 10 +-- + drivers/bluetooth/btusb.c | 9 +++ + drivers/bluetooth/hci_qca.c | 11 +++ + drivers/bluetooth/hci_vhci.c | 3 + + include/net/bluetooth/hci.h | 3 + + include/net/bluetooth/hci_core.h | 74 ++++++++++++++------- + include/net/bluetooth/hci_mon.h | 2 +- + include/net/bluetooth/hci_sync.h | 2 + + net/bluetooth/amp.c | 3 +- + net/bluetooth/hci_conn.c | 126 +++++++++++++++++++++++++---------- + net/bluetooth/hci_core.c | 3 + + net/bluetooth/hci_event.c | 140 +++++++++++++++++++++++++-------------- + net/bluetooth/hci_sock.c | 3 +- + net/bluetooth/hci_sync.c | 58 ++++++++-------- + net/bluetooth/iso.c | 38 ++++++++--- + net/bluetooth/msft.c | 20 ++---- + 18 files changed, 400 insertions(+), 178 deletions(-) +Merging wireless-next/for-next (b650981501bf wifi: rtw89: mac: do bf_monitor only if WiFi 6 chips) +$ 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 +Auto-merging include/linux/pci_ids.h +Merge made by the 'ort' strategy. + drivers/net/wireless/ath/ath10k/debug.c | 47 +- + drivers/net/wireless/ath/ath10k/mac.c | 26 +- + drivers/net/wireless/ath/ath10k/snoc.c | 18 +- + drivers/net/wireless/ath/ath10k/spectral.c | 26 +- + drivers/net/wireless/ath/ath11k/mac.c | 27 +- + drivers/net/wireless/ath/ath12k/core.c | 69 + + drivers/net/wireless/ath/ath12k/core.h | 21 +- + drivers/net/wireless/ath/ath12k/debug.c | 2 +- + drivers/net/wireless/ath/ath12k/dp_rx.c | 12 +- + drivers/net/wireless/ath/ath12k/mac.c | 65 +- + drivers/net/wireless/ath/ath12k/mhi.c | 11 +- + drivers/net/wireless/ath/ath12k/qmi.c | 5 + + drivers/net/wireless/ath/ath12k/wmi.h | 3 + + drivers/net/wireless/ath/carl9170/usb.c | 10 +- + drivers/net/wireless/ath/dfs_pattern_detector.c | 21 +- + drivers/net/wireless/atmel/atmel.c | 72 - + .../wireless/broadcom/brcm80211/brcmfmac/fweh.c | 6 +- + drivers/net/wireless/intersil/hostap/hostap.h | 1 - + .../net/wireless/intersil/hostap/hostap_download.c | 3 +- + .../net/wireless/intersil/hostap/hostap_ioctl.c | 228 -- + drivers/net/wireless/intersil/hostap/hostap_main.c | 3 - + drivers/net/wireless/intersil/hostap/hostap_wlan.h | 2 +- + drivers/net/wireless/intersil/p54/p54.h | 2 +- + drivers/net/wireless/mediatek/mt76/Kconfig | 1 + + drivers/net/wireless/mediatek/mt76/Makefile | 1 + + drivers/net/wireless/mediatek/mt76/debugfs.c | 2 - + drivers/net/wireless/mediatek/mt76/dma.c | 14 +- + drivers/net/wireless/mediatek/mt76/eeprom.c | 7 +- + drivers/net/wireless/mediatek/mt76/mac80211.c | 62 +- + drivers/net/wireless/mediatek/mt76/mt76.h | 36 +- + drivers/net/wireless/mediatek/mt76/mt7603/beacon.c | 80 +- + drivers/net/wireless/mediatek/mt76/mt7603/core.c | 2 + + drivers/net/wireless/mediatek/mt76/mt7603/init.c | 8 + + drivers/net/wireless/mediatek/mt76/mt7603/mac.c | 52 +- + drivers/net/wireless/mediatek/mt76/mt7603/main.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7603/regs.h | 5 + + drivers/net/wireless/mediatek/mt76/mt7615/init.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7615/main.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7615/mcu.c | 2 +- + .../net/wireless/mediatek/mt76/mt7615/pci_mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt76_connac.h | 6 + + .../net/wireless/mediatek/mt76/mt76_connac3_mac.h | 18 +- + .../net/wireless/mediatek/mt76/mt76_connac_mac.c | 28 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.c | 191 +- + .../net/wireless/mediatek/mt76/mt76_connac_mcu.h | 60 +- + .../net/wireless/mediatek/mt76/mt76x02_beacon.c | 8 +- + drivers/net/wireless/mediatek/mt76/mt76x02_mmio.c | 11 +- + .../net/wireless/mediatek/mt76/mt76x02_usb_core.c | 13 +- + drivers/net/wireless/mediatek/mt76/mt76x02_util.c | 4 +- + drivers/net/wireless/mediatek/mt76/mt7915/init.c | 24 +- + drivers/net/wireless/mediatek/mt76/mt7915/mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7915/main.c | 53 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.c | 79 +- + drivers/net/wireless/mediatek/mt76/mt7915/mcu.h | 18 +- + drivers/net/wireless/mediatek/mt76/mt7915/mt7915.h | 4 + + drivers/net/wireless/mediatek/mt76/mt7915/regs.h | 1 + + drivers/net/wireless/mediatek/mt76/mt7915/soc.c | 5 +- + drivers/net/wireless/mediatek/mt76/mt7921/init.c | 54 +- + drivers/net/wireless/mediatek/mt76/mt7921/mac.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/main.c | 69 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.c | 155 +- + drivers/net/wireless/mediatek/mt76/mt7921/mcu.h | 13 + + drivers/net/wireless/mediatek/mt76/mt7921/mt7921.h | 18 +- + drivers/net/wireless/mediatek/mt76/mt7921/pci.c | 2 + + .../net/wireless/mediatek/mt76/mt7921/pci_mac.c | 2 +- + .../net/wireless/mediatek/mt76/mt7921/sdio_mcu.c | 2 +- + drivers/net/wireless/mediatek/mt76/mt7921/usb.c | 12 +- + drivers/net/wireless/mediatek/mt76/mt7925/Kconfig | 30 + + drivers/net/wireless/mediatek/mt76/mt7925/Makefile | 9 + + .../net/wireless/mediatek/mt76/mt7925/debugfs.c | 319 ++ + drivers/net/wireless/mediatek/mt76/mt7925/init.c | 235 ++ + drivers/net/wireless/mediatek/mt76/mt7925/mac.c | 1452 +++++++++ + drivers/net/wireless/mediatek/mt76/mt7925/mac.h | 23 + + drivers/net/wireless/mediatek/mt76/mt7925/main.c | 1454 +++++++++ + drivers/net/wireless/mediatek/mt76/mt7925/mcu.c | 3174 ++++++++++++++++++++ + drivers/net/wireless/mediatek/mt76/mt7925/mcu.h | 537 ++++ + drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h | 309 ++ + drivers/net/wireless/mediatek/mt76/mt7925/pci.c | 586 ++++ + .../net/wireless/mediatek/mt76/mt7925/pci_mac.c | 148 + + .../net/wireless/mediatek/mt76/mt7925/pci_mcu.c | 53 + + drivers/net/wireless/mediatek/mt76/mt7925/regs.h | 92 + + drivers/net/wireless/mediatek/mt76/mt7925/usb.c | 332 ++ + drivers/net/wireless/mediatek/mt76/mt792x.h | 38 +- + drivers/net/wireless/mediatek/mt76/mt792x_core.c | 30 +- + drivers/net/wireless/mediatek/mt76/mt792x_dma.c | 49 +- + drivers/net/wireless/mediatek/mt76/mt792x_usb.c | 9 + + drivers/net/wireless/mediatek/mt76/mt7996/init.c | 50 +- + drivers/net/wireless/mediatek/mt76/mt7996/mac.c | 115 +- + drivers/net/wireless/mediatek/mt76/mt7996/main.c | 65 +- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.c | 359 ++- + drivers/net/wireless/mediatek/mt76/mt7996/mcu.h | 37 +- + drivers/net/wireless/mediatek/mt76/mt7996/mt7996.h | 2 +- + drivers/net/wireless/mediatek/mt76/mt7996/regs.h | 8 + + drivers/net/wireless/mediatek/mt76/tx.c | 108 +- + drivers/net/wireless/realtek/rtlwifi/core.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8188ee/trx.h | 1 - + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.c | 9 +- + .../net/wireless/realtek/rtlwifi/rtl8192ce/trx.h | 1 - + .../net/wireless/realtek/rtlwifi/rtl8192cu/hw.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192cu/trx.h | 5 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/fw.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192de/trx.h | 1 - + .../net/wireless/realtek/rtlwifi/rtl8192ee/dm.c | 7 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8192ee/trx.h | 1 - + .../net/wireless/realtek/rtlwifi/rtl8192se/fw.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/trx.c | 2 +- + .../net/wireless/realtek/rtlwifi/rtl8192se/trx.h | 4 +- + .../wireless/realtek/rtlwifi/rtl8723ae/hal_btc.c | 16 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.c | 8 +- + .../net/wireless/realtek/rtlwifi/rtl8723ae/trx.h | 1 - + .../net/wireless/realtek/rtlwifi/rtl8723be/dm.c | 7 +- + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.c | 1 - + .../net/wireless/realtek/rtlwifi/rtl8723be/trx.h | 1 - + .../net/wireless/realtek/rtlwifi/rtl8821ae/dm.c | 6 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.c | 5 +- + .../net/wireless/realtek/rtlwifi/rtl8821ae/trx.h | 1 - + drivers/net/wireless/realtek/rtlwifi/wifi.h | 3 +- + drivers/net/wireless/realtek/rtw88/main.h | 4 +- + drivers/net/wireless/realtek/rtw88/regd.c | 24 +- + drivers/net/wireless/realtek/rtw88/regd.h | 2 + + drivers/net/wireless/realtek/rtw88/rtw8821c.c | 67 + + drivers/net/wireless/realtek/rtw88/rtw8821c.h | 1 + + .../net/wireless/realtek/rtw88/rtw8821c_table.c | 1154 +++++-- + .../net/wireless/realtek/rtw88/rtw8822c_table.c | 1239 ++++---- + drivers/net/wireless/realtek/rtw88/usb.c | 9 +- + drivers/net/wireless/realtek/rtw89/coex.c | 23 +- + drivers/net/wireless/realtek/rtw89/core.c | 127 +- + drivers/net/wireless/realtek/rtw89/core.h | 11 +- + drivers/net/wireless/realtek/rtw89/debug.c | 14 + + drivers/net/wireless/realtek/rtw89/mac.c | 57 +- + drivers/net/wireless/realtek/rtw89/mac.h | 22 +- + drivers/net/wireless/realtek/rtw89/mac80211.c | 16 +- + drivers/net/wireless/realtek/rtw89/mac_be.c | 174 ++ + drivers/net/wireless/realtek/rtw89/phy.c | 70 +- + drivers/net/wireless/realtek/rtw89/phy.h | 5 + + drivers/net/wireless/realtek/rtw89/reg.h | 79 + + drivers/net/wireless/silabs/wfx/data_tx.c | 125 +- + drivers/net/wireless/silabs/wfx/data_tx.h | 21 +- + drivers/net/wireless/silabs/wfx/hif_tx.c | 43 + + drivers/net/wireless/silabs/wfx/hif_tx.h | 1 + + drivers/net/wireless/silabs/wfx/main.c | 5 + + drivers/net/wireless/silabs/wfx/queue.c | 38 +- + drivers/net/wireless/silabs/wfx/queue.h | 1 + + drivers/net/wireless/silabs/wfx/scan.c | 66 +- + drivers/net/wireless/silabs/wfx/scan.h | 6 + + drivers/net/wireless/silabs/wfx/sta.c | 41 +- + drivers/net/wireless/silabs/wfx/sta.h | 1 - + drivers/net/wireless/silabs/wfx/wfx.h | 8 +- + include/linux/pci_ids.h | 2 + + include/net/ieee80211_radiotap.h | 6 + + 154 files changed, 12734 insertions(+), 2292 deletions(-) + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/Kconfig + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/Makefile + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/debugfs.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/init.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/mac.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/mac.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/main.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/mcu.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/mcu.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/mt7925.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/pci.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/pci_mac.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/pci_mcu.c + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/regs.h + create mode 100644 drivers/net/wireless/mediatek/mt76/mt7925/usb.c +Merging wpan-next/master (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-next/master +Already up to date. +Merging wpan-staging/staging (18b849f12dcc ieee802154: ca8210: Remove stray gpiod_unexport() call) +$ git merge -m Merge branch 'staging' of git://git.kernel.org/pub/scm/linux/kernel/git/wpan/wpan-next.git wpan-staging/staging +Already up to date. +Merging mtd/mtd/next (3cff177fc279 mtd: map_ram: prevent use of point and unpoint when NO_XIP is set) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Auto-merging drivers/mtd/nand/raw/marvell_nand.c +Merge made by the 'ort' strategy. + drivers/mtd/chips/map_ram.c | 8 ++++++-- + drivers/mtd/lpddr/lpddr_cmds.c | 2 +- + drivers/mtd/nand/raw/atmel/nand-controller.c | 2 +- + drivers/mtd/nand/raw/denali.h | 2 +- + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 2 +- + drivers/mtd/nand/raw/marvell_nand.c | 2 +- + drivers/mtd/nand/raw/meson_nand.c | 2 +- + drivers/mtd/nand/raw/renesas-nand-controller.c | 2 +- + drivers/mtd/nand/raw/sunxi_nand.c | 2 +- + include/linux/mtd/cfi.h | 2 +- + include/linux/mtd/qinfo.h | 2 +- + 11 files changed, 16 insertions(+), 12 deletions(-) +Merging nand/nand/next (48919c6c4838 mtd: rawnand: remove 'nand_exit_status_op()' prototype) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Merge made by the 'ort' strategy. + drivers/mtd/nand/raw/internals.h | 1 - + drivers/mtd/nand/raw/omap2.c | 8 ++++---- + drivers/mtd/nand/raw/tegra_nand.c | 4 ++++ + 3 files changed, 8 insertions(+), 5 deletions(-) +Merging spi-nor/spi-nor/next (8f407eda173f mtd: spi-nor: atmel: add at25ff321a entry) +$ 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/Makefile | 2 - + drivers/mtd/spi-nor/atmel.c | 121 ++++++++---- + drivers/mtd/spi-nor/catalyst.c | 24 --- + drivers/mtd/spi-nor/core.c | 63 +++--- + drivers/mtd/spi-nor/core.h | 138 ++++++------- + drivers/mtd/spi-nor/eon.c | 74 +++++-- + drivers/mtd/spi-nor/esmt.c | 29 ++- + drivers/mtd/spi-nor/everspin.c | 28 ++- + drivers/mtd/spi-nor/fujitsu.c | 21 -- + drivers/mtd/spi-nor/gigadevice.c | 82 ++++---- + drivers/mtd/spi-nor/intel.c | 23 ++- + drivers/mtd/spi-nor/issi.c | 118 +++++++---- + drivers/mtd/spi-nor/macronix.c | 220 ++++++++++++++------- + drivers/mtd/spi-nor/micron-st.c | 411 ++++++++++++++++++++++++++------------- + drivers/mtd/spi-nor/spansion.c | 392 +++++++++++++++++++++++-------------- + drivers/mtd/spi-nor/sst.c | 164 ++++++++++------ + drivers/mtd/spi-nor/swp.c | 13 +- + drivers/mtd/spi-nor/sysfs.c | 6 +- + drivers/mtd/spi-nor/winbond.c | 288 +++++++++++++++++---------- + drivers/mtd/spi-nor/xilinx.c | 32 ++- + drivers/mtd/spi-nor/xmc.c | 19 +- + 21 files changed, 1395 insertions(+), 873 deletions(-) + delete mode 100644 drivers/mtd/spi-nor/catalyst.c + delete mode 100644 drivers/mtd/spi-nor/fujitsu.c +Merging crypto/master (5b90073defd1 crypto: hisilicon/qm - alloc buffer to set and get xqc) +$ 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 fs/crypto/keysetup_v1.c +Auto-merging fs/ubifs/ubifs.h +Auto-merging net/mptcp/subflow.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/debugfs-driver-qat | 24 +- + Documentation/ABI/testing/sysfs-driver-qat | 2 + + .../devicetree/bindings/crypto/fsl-imx-sahara.yaml | 43 +- + .../bindings/crypto/qcom,inline-crypto-engine.yaml | 1 + + .../devicetree/bindings/crypto/qcom,prng.yaml | 26 +- + .../devicetree/bindings/rng/amlogic,meson-rng.yaml | 1 + + .../devicetree/bindings/rng/st,stm32-rng.yaml | 20 +- + arch/x86/crypto/aesni-intel_asm.S | 4 +- + arch/x86/crypto/aesni-intel_avx-x86_64.S | 4 +- + arch/x86/crypto/aesni-intel_glue.c | 52 +- + arch/x86/crypto/sha1_ssse3_glue.c | 12 + + arch/x86/crypto/sha256_ssse3_glue.c | 12 + + crypto/Kconfig | 63 +- + crypto/Makefile | 6 +- + crypto/adiantum.c | 10 +- + crypto/aead.c | 6 + + crypto/ahash.c | 2 + + crypto/api.c | 2 +- + crypto/arc4.c | 60 +- + crypto/asymmetric_keys/mscode_parser.c | 6 - + crypto/asymmetric_keys/pkcs7_parser.c | 6 - + crypto/asymmetric_keys/x509_akid.asn1 | 24 +- + crypto/asymmetric_keys/x509_cert_parser.c | 6 - + crypto/authenc.c | 8 +- + crypto/authencesn.c | 8 +- + crypto/cbc.c | 159 ++--- + crypto/ccm.c | 9 +- + crypto/chacha20poly1305.c | 8 +- + crypto/cryptd.c | 14 +- + crypto/crypto_engine.c | 8 +- + crypto/ctr.c | 14 +- + crypto/cts.c | 12 +- + crypto/deflate.c | 61 +- + crypto/ecb.c | 206 +++++-- + crypto/essiv.c | 20 +- + crypto/gcm.c | 9 +- + crypto/hctr2.c | 8 +- + crypto/jitterentropy-kcapi.c | 17 +- + crypto/jitterentropy.c | 263 +++++---- + crypto/jitterentropy.h | 5 +- + crypto/lrw.c | 12 +- + crypto/lskcipher.c | 641 +++++++++++++++++++++ + crypto/pcrypt.c | 4 + + crypto/skcipher.c | 75 ++- + crypto/skcipher.h | 30 + + crypto/testmgr.c | 31 +- + crypto/testmgr.h | 75 --- + crypto/xts.c | 10 +- + drivers/char/hw_random/bcm2835-rng.c | 4 +- + drivers/char/hw_random/core.c | 6 + + drivers/char/hw_random/geode-rng.c | 6 +- + drivers/char/hw_random/hisi-rng.c | 2 - + drivers/char/hw_random/imx-rngc.c | 10 +- + drivers/char/hw_random/ks-sa-rng.c | 26 +- + drivers/char/hw_random/meson-rng.c | 80 ++- + drivers/char/hw_random/mpfs-rng.c | 2 - + drivers/char/hw_random/n2-drv.c | 10 +- + drivers/char/hw_random/nomadik-rng.c | 1 + + drivers/char/hw_random/octeon-rng.c | 6 +- + drivers/char/hw_random/st-rng.c | 1 + + drivers/char/hw_random/stm32-rng.c | 519 ++++++++++++++--- + drivers/char/hw_random/xgene-rng.c | 1 - + drivers/char/hw_random/xiphera-trng.c | 2 - + drivers/crypto/aspeed/aspeed-hace.c | 10 +- + drivers/crypto/caam/caamalg.c | 3 +- + drivers/crypto/caam/caamalg_qi2.c | 3 +- + drivers/crypto/cavium/nitrox/nitrox_hal.c | 2 +- + drivers/crypto/ccp/dbc.c | 74 ++- + drivers/crypto/ccp/dbc.h | 29 +- + drivers/crypto/ccp/psp-dev.c | 122 +++- + drivers/crypto/ccp/psp-dev.h | 55 ++ + drivers/crypto/ccp/sp-dev.h | 4 + + drivers/crypto/ccp/sp-pci.c | 22 +- + drivers/crypto/ccp/tee-dev.c | 48 +- + drivers/crypto/ccp/tee-dev.h | 15 +- + drivers/crypto/hisilicon/debugfs.c | 79 +-- + drivers/crypto/hisilicon/hpre/hpre_crypto.c | 25 +- + drivers/crypto/hisilicon/hpre/hpre_main.c | 21 +- + drivers/crypto/hisilicon/qm.c | 401 ++++++------- + drivers/crypto/hisilicon/qm_common.h | 6 +- + drivers/crypto/hisilicon/sec2/sec_crypto.c | 32 +- + drivers/crypto/hisilicon/sec2/sec_main.c | 29 +- + drivers/crypto/hisilicon/zip/zip_crypto.c | 290 ++-------- + drivers/crypto/hisilicon/zip/zip_main.c | 23 +- + .../crypto/intel/keembay/keembay-ocs-hcu-core.c | 11 +- + .../crypto/intel/qat/qat_4xxx/adf_4xxx_hw_data.c | 56 +- + drivers/crypto/intel/qat/qat_4xxx/adf_drv.c | 35 +- + drivers/crypto/intel/qat/qat_c3xxx/adf_drv.c | 1 + + drivers/crypto/intel/qat/qat_c3xxxvf/adf_drv.c | 1 + + drivers/crypto/intel/qat/qat_c62x/adf_drv.c | 1 + + drivers/crypto/intel/qat/qat_c62xvf/adf_drv.c | 1 + + drivers/crypto/intel/qat/qat_common/Makefile | 4 + + .../intel/qat/qat_common/adf_accel_devices.h | 16 +- + drivers/crypto/intel/qat/qat_common/adf_admin.c | 87 ++- + .../crypto/intel/qat/qat_common/adf_cfg_services.h | 34 ++ + .../crypto/intel/qat/qat_common/adf_cfg_strings.h | 1 + + .../crypto/intel/qat/qat_common/adf_cnv_dbgfs.c | 299 ++++++++++ + .../crypto/intel/qat/qat_common/adf_cnv_dbgfs.h | 11 + + .../crypto/intel/qat/qat_common/adf_common_drv.h | 4 + + drivers/crypto/intel/qat/qat_common/adf_dbgfs.c | 6 + + .../crypto/intel/qat/qat_common/adf_fw_counters.c | 2 +- + drivers/crypto/intel/qat/qat_common/adf_gen4_pm.c | 26 +- + drivers/crypto/intel/qat/qat_common/adf_gen4_pm.h | 50 +- + .../intel/qat/qat_common/adf_gen4_pm_debugfs.c | 265 +++++++++ + drivers/crypto/intel/qat/qat_common/adf_init.c | 41 +- + drivers/crypto/intel/qat/qat_common/adf_pm_dbgfs.c | 48 ++ + drivers/crypto/intel/qat/qat_common/adf_pm_dbgfs.h | 12 + + drivers/crypto/intel/qat/qat_common/adf_sysfs.c | 32 +- + .../intel/qat/qat_common/adf_transport_debug.c | 4 +- + .../intel/qat/qat_common/icp_qat_fw_init_admin.h | 41 ++ + .../crypto/intel/qat/qat_common/qat_comp_algs.c | 129 +---- + drivers/crypto/intel/qat/qat_common/qat_uclo.c | 2 +- + drivers/crypto/intel/qat/qat_dh895xcc/adf_drv.c | 1 + + drivers/crypto/intel/qat/qat_dh895xccvf/adf_drv.c | 1 + + drivers/crypto/qcom-rng.c | 65 ++- + drivers/crypto/vmx/aesp8-ppc.pl | 141 +++-- + .../chelsio/inline_crypto/ch_ipsec/chcr_ipsec.c | 2 - + .../chelsio/inline_crypto/ch_ipsec/chcr_ipsec.h | 1 - + .../ethernet/chelsio/inline_crypto/chtls/chtls.h | 1 - + drivers/net/wireguard/cookie.c | 2 +- + drivers/net/wireguard/netlink.c | 2 +- + drivers/net/wireguard/noise.c | 2 +- + fs/crypto/keysetup_v1.c | 2 +- + fs/ubifs/auth.c | 3 +- + fs/ubifs/replay.c | 1 - + fs/ubifs/ubifs.h | 2 +- + include/crypto/aead.h | 12 + + include/crypto/akcipher.h | 4 +- + include/crypto/engine.h | 2 +- + include/crypto/internal/skcipher.h | 130 +++-- + include/crypto/sig.h | 2 +- + include/crypto/skcipher.h | 296 +++++++++- + include/linux/crypto.h | 3 +- + include/linux/hisi_acc_qm.h | 38 +- + include/linux/hw_random.h | 1 + + include/linux/oid_registry.h | 8 - + include/linux/verification.h | 1 + + kernel/padata.c | 2 +- + net/bluetooth/smp.c | 3 +- + net/ipv4/ah4.c | 2 +- + net/ipv6/ah6.c | 2 +- + net/mptcp/subflow.c | 2 +- + net/sunrpc/auth_gss/gss_krb5_crypto.c | 2 +- + net/sunrpc/auth_gss/gss_krb5_unseal.c | 2 - + net/xfrm/Kconfig | 1 + + net/xfrm/xfrm_algo.c | 19 +- + security/integrity/evm/evm_main.c | 3 +- + security/keys/encrypted-keys/encrypted.c | 2 +- + tools/crypto/ccp/dbc.c | 17 +- + tools/crypto/ccp/dbc.py | 8 +- + tools/crypto/ccp/test_dbc.py | 45 +- + 151 files changed, 4261 insertions(+), 1860 deletions(-) + create mode 100644 crypto/lskcipher.c + create mode 100644 crypto/skcipher.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_cfg_services.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_cnv_dbgfs.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_cnv_dbgfs.h + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_gen4_pm_debugfs.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_pm_dbgfs.c + create mode 100644 drivers/crypto/intel/qat/qat_common/adf_pm_dbgfs.h +Merging drm/drm-next (389af786f92e Merge tag 'drm-intel-next-2023-09-29' of git://anongit.freedesktop.org/drm/drm-intel into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging MAINTAINERS +Auto-merging drivers/accel/ivpu/ivpu_drv.c +Auto-merging drivers/accel/ivpu/ivpu_drv.h +Auto-merging drivers/accel/ivpu/ivpu_fw.c +CONFLICT (content): Merge conflict in drivers/accel/ivpu/ivpu_fw.c +Auto-merging drivers/accel/ivpu/ivpu_hw_40xx.c +Auto-merging drivers/accel/ivpu/ivpu_ipc.c +Auto-merging drivers/gpu/drm/Kconfig +Auto-merging drivers/gpu/drm/drm_atomic_helper.c +Auto-merging drivers/gpu/drm/i915/gt/gen8_engine_cs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_engine_cs.c +Auto-merging drivers/gpu/drm/i915/gt/intel_execlists_submission.c +Auto-merging drivers/gpu/drm/i915/gt/intel_lrc.c +Auto-merging drivers/gpu/drm/i915/gt/selftest_migrate.c +Auto-merging drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Auto-merging drivers/gpu/drm/i915/i915_gem.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/msm_mdss.c +Auto-merging drivers/gpu/drm/nouveau/nouveau_drv.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/nouveau/nouveau_drv.h +Auto-merging drivers/gpu/drm/nouveau/nouveau_exec.c +Auto-merging drivers/gpu/drm/nouveau/nvkm/engine/disp/uconn.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/qxl/qxl_drv.c +Auto-merging drivers/gpu/drm/tiny/simpledrm.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_gem.c +Auto-merging drivers/hid/Kconfig +Auto-merging drivers/video/fbdev/Kconfig +Auto-merging drivers/video/fbdev/core/Kconfig +Resolved 'drivers/accel/ivpu/ivpu_fw.c' using previous resolution. +Resolved 'drivers/gpu/drm/nouveau/nouveau_drv.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a651162d9e03] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + Documentation/accel/qaic/qaic.rst | 10 + + .../bindings/display/bridge/analogix,anx7814.yaml | 1 + + .../bindings/display/panel/jdi,lpm102a188a.yaml | 94 +++ + .../bindings/display/panel/panel-simple.yaml | 2 + + .../display/rockchip/rockchip,dw-mipi-dsi.yaml | 2 + + .../bindings/display/rockchip/rockchip-vop.yaml | 1 + + Documentation/driver-api/dma-buf.rst | 30 +- + Documentation/gpu/drm-uapi.rst | 7 + + Documentation/gpu/rfc/xe.rst | 89 +-- + .../userspace-api/dma-buf-alloc-exchange.rst | 389 +++++++++ + Documentation/userspace-api/index.rst | 1 + + MAINTAINERS | 13 +- + drivers/accel/drm_accel.c | 35 +- + drivers/accel/ivpu/ivpu_drv.c | 65 +- + drivers/accel/ivpu/ivpu_drv.h | 18 +- + drivers/accel/ivpu/ivpu_fw.c | 6 +- + drivers/accel/ivpu/ivpu_fw.h | 2 +- + drivers/accel/ivpu/ivpu_hw_37xx.c | 75 +- + drivers/accel/ivpu/ivpu_hw_37xx_reg.h | 187 ++--- + drivers/accel/ivpu/ivpu_hw_40xx.c | 7 + + drivers/accel/ivpu/ivpu_ipc.c | 13 +- + drivers/accel/ivpu/ivpu_mmu.c | 117 ++- + drivers/accel/ivpu/ivpu_mmu_context.c | 18 +- + drivers/accel/ivpu/ivpu_mmu_context.h | 2 + + drivers/accel/ivpu/ivpu_pm.c | 16 +- + drivers/accel/ivpu/ivpu_pm.h | 2 +- + drivers/accel/qaic/qaic.h | 13 +- + drivers/accel/qaic/qaic_data.c | 187 ++++- + drivers/accel/qaic/qaic_drv.c | 125 ++- + drivers/gpu/drm/Kconfig | 7 + + drivers/gpu/drm/Makefile | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 58 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 20 +- + drivers/gpu/drm/arm/display/komeda/d71/d71_dev.c | 2 +- + drivers/gpu/drm/arm/display/komeda/komeda_drv.c | 9 + + drivers/gpu/drm/arm/display/komeda/komeda_kms.c | 7 + + drivers/gpu/drm/arm/display/komeda/komeda_kms.h | 1 + + .../drm/arm/display/komeda/komeda_pipeline_state.c | 9 +- + drivers/gpu/drm/arm/hdlcd_drv.c | 6 + + drivers/gpu/drm/arm/malidp_drv.c | 6 + + drivers/gpu/drm/armada/armada_drv.c | 8 + + drivers/gpu/drm/aspeed/aspeed_gfx_drv.c | 7 + + drivers/gpu/drm/ast/ast_drv.c | 6 + + drivers/gpu/drm/atmel-hlcdc/atmel_hlcdc_dc.c | 6 + + drivers/gpu/drm/bridge/Kconfig | 2 + + drivers/gpu/drm/bridge/analogix/analogix-anx78xx.c | 11 +- + drivers/gpu/drm/bridge/analogix/anx7625.c | 3 + + drivers/gpu/drm/bridge/cadence/Kconfig | 1 + + drivers/gpu/drm/bridge/ite-it66121.c | 33 +- + drivers/gpu/drm/bridge/lontium-lt8912b.c | 22 +- + drivers/gpu/drm/bridge/lvds-codec.c | 12 +- + drivers/gpu/drm/bridge/panel.c | 19 +- + drivers/gpu/drm/bridge/samsung-dsim.c | 20 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi-cec.c | 6 +- + drivers/gpu/drm/bridge/synopsys/dw-hdmi.c | 2 - + drivers/gpu/drm/bridge/synopsys/dw-mipi-dsi.c | 2 - + drivers/gpu/drm/bridge/tc358768.c | 385 ++++++--- + drivers/gpu/drm/display/drm_dp_cec.c | 23 +- + drivers/gpu/drm/display/drm_dp_helper.c | 8 +- + drivers/gpu/drm/display/drm_dp_mst_topology.c | 168 ++-- + drivers/gpu/drm/drm_atomic.c | 4 +- + drivers/gpu/drm/drm_atomic_helper.c | 3 + + drivers/gpu/drm/drm_auth.c | 3 +- + drivers/gpu/drm/drm_bridge.c | 4 +- + drivers/gpu/drm/drm_buddy.c | 136 +++- + drivers/gpu/drm/drm_client.c | 4 +- + drivers/gpu/drm/drm_connector.c | 11 +- + drivers/gpu/drm/drm_crtc_internal.h | 2 +- + drivers/gpu/drm/drm_debugfs.c | 200 +++-- + drivers/gpu/drm/drm_drv.c | 28 +- + drivers/gpu/drm/drm_edid.c | 40 +- + drivers/gpu/drm/drm_file.c | 40 +- + drivers/gpu/drm/drm_framebuffer.c | 4 +- + drivers/gpu/drm/{drm_gpuva_mgr.c => drm_gpuvm.c} | 407 +++++----- + drivers/gpu/drm/drm_internal.h | 31 +- + drivers/gpu/drm/drm_ioctl.c | 3 + + drivers/gpu/drm/drm_mode_config.c | 2 - + drivers/gpu/drm/drm_sysfs.c | 22 +- + drivers/gpu/drm/fsl-dcu/fsl_dcu_drm_drv.c | 8 + + drivers/gpu/drm/gma500/gma_display.h | 1 - + drivers/gpu/drm/gma500/psb_drv.h | 9 +- + drivers/gpu/drm/gma500/psb_intel_drv.h | 14 - + drivers/gpu/drm/gma500/psb_irq.c | 5 + + drivers/gpu/drm/hisilicon/hibmc/hibmc_drm_drv.c | 6 + + drivers/gpu/drm/hisilicon/kirin/kirin_drm_drv.c | 9 + + drivers/gpu/drm/hyperv/hyperv_drm_drv.c | 6 + + drivers/gpu/drm/i915/Makefile | 2 + + drivers/gpu/drm/i915/display/g4x_dp.c | 10 +- + drivers/gpu/drm/i915/display/g4x_hdmi.c | 6 +- + drivers/gpu/drm/i915/display/hsw_ips.c | 1 + + drivers/gpu/drm/i915/display/i9xx_plane.c | 1 + + drivers/gpu/drm/i915/display/icl_dsi.c | 13 +- + drivers/gpu/drm/i915/display/intel_atomic.c | 2 + + drivers/gpu/drm/i915/display/intel_atomic_plane.c | 14 +- + drivers/gpu/drm/i915/display/intel_audio.c | 6 +- + drivers/gpu/drm/i915/display/intel_audio.h | 3 +- + drivers/gpu/drm/i915/display/intel_bios.c | 26 +- + drivers/gpu/drm/i915/display/intel_cdclk.c | 107 ++- + drivers/gpu/drm/i915/display/intel_color.c | 154 +++- + drivers/gpu/drm/i915/display/intel_color.h | 2 + + drivers/gpu/drm/i915/display/intel_color_regs.h | 286 +++++++ + drivers/gpu/drm/i915/display/intel_combo_phy.c | 17 +- + drivers/gpu/drm/i915/display/intel_connector.c | 6 +- + drivers/gpu/drm/i915/display/intel_connector.h | 2 +- + drivers/gpu/drm/i915/display/intel_crt.c | 64 +- + drivers/gpu/drm/i915/display/intel_crtc.c | 118 ++- + drivers/gpu/drm/i915/display/intel_crtc.h | 6 +- + .../gpu/drm/i915/display/intel_crtc_state_dump.c | 3 + + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 203 ++--- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 14 +- + drivers/gpu/drm/i915/display/intel_cx0_phy_regs.h | 13 + + drivers/gpu/drm/i915/display/intel_ddi.c | 38 +- + drivers/gpu/drm/i915/display/intel_display.c | 480 +++++++---- + drivers/gpu/drm/i915/display/intel_display.h | 8 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 4 + + .../gpu/drm/i915/display/intel_display_device.c | 100 ++- + .../gpu/drm/i915/display/intel_display_device.h | 31 +- + .../gpu/drm/i915/display/intel_display_driver.c | 8 + + drivers/gpu/drm/i915/display/intel_display_irq.c | 4 +- + drivers/gpu/drm/i915/display/intel_display_power.c | 10 +- + drivers/gpu/drm/i915/display/intel_display_power.h | 1 - + .../gpu/drm/i915/display/intel_display_power_map.c | 63 +- + .../drm/i915/display/intel_display_power_well.c | 52 +- + .../drm/i915/display/intel_display_power_well.h | 1 + + drivers/gpu/drm/i915/display/intel_display_types.h | 49 +- + drivers/gpu/drm/i915/display/intel_display_wa.c | 48 ++ + drivers/gpu/drm/i915/display/intel_display_wa.h | 13 + + drivers/gpu/drm/i915/display/intel_dmc.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 887 ++++++++++++++++----- + drivers/gpu/drm/i915/display/intel_dp.h | 34 +- + drivers/gpu/drm/i915/display/intel_dp_aux.c | 49 +- + drivers/gpu/drm/i915/display/intel_dp_aux_regs.h | 80 +- + drivers/gpu/drm/i915/display/intel_dp_hdcp.c | 87 +- + .../gpu/drm/i915/display/intel_dp_link_training.c | 14 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 174 ++-- + drivers/gpu/drm/i915/display/intel_dpll.c | 54 +- + drivers/gpu/drm/i915/display/intel_dpt.c | 2 +- + drivers/gpu/drm/i915/display/intel_drrs.c | 1 + + drivers/gpu/drm/i915/display/intel_dsb.c | 217 ++++- + drivers/gpu/drm/i915/display/intel_dsb.h | 9 +- + drivers/gpu/drm/i915/display/intel_dsb_regs.h | 31 + + drivers/gpu/drm/i915/display/intel_dvo.c | 11 +- + drivers/gpu/drm/i915/display/intel_fb.c | 61 +- + drivers/gpu/drm/i915/display/intel_fb_pin.c | 3 +- + drivers/gpu/drm/i915/display/intel_fbc.c | 23 +- + drivers/gpu/drm/i915/display/intel_fbc.h | 2 + + drivers/gpu/drm/i915/display/intel_fdi.c | 169 +++- + drivers/gpu/drm/i915/display/intel_fdi.h | 8 + + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 34 +- + drivers/gpu/drm/i915/display/intel_frontbuffer.h | 4 + + drivers/gpu/drm/i915/display/intel_gmbus.c | 5 +- + drivers/gpu/drm/i915/display/intel_hdcp.c | 33 +- + drivers/gpu/drm/i915/display/intel_hdmi.c | 121 +-- + drivers/gpu/drm/i915/display/intel_hotplug.c | 85 +- + drivers/gpu/drm/i915/display/intel_hotplug_irq.c | 24 +- + drivers/gpu/drm/i915/display/intel_link_bw.c | 212 +++++ + drivers/gpu/drm/i915/display/intel_link_bw.h | 37 + + drivers/gpu/drm/i915/display/intel_lspcon.c | 14 +- + drivers/gpu/drm/i915/display/intel_lvds.c | 33 +- + drivers/gpu/drm/i915/display/intel_overlay.c | 2 + + drivers/gpu/drm/i915/display/intel_panel.c | 17 +- + drivers/gpu/drm/i915/display/intel_plane_initial.c | 1 + + drivers/gpu/drm/i915/display/intel_pmdemand.c | 2 +- + drivers/gpu/drm/i915/display/intel_psr.c | 52 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 383 ++++----- + drivers/gpu/drm/i915/display/intel_sdvo_regs.h | 2 +- + drivers/gpu/drm/i915/display/intel_sprite.c | 1 + + drivers/gpu/drm/i915/display/intel_tc.c | 66 +- + drivers/gpu/drm/i915/display/intel_tc.h | 3 +- + drivers/gpu/drm/i915/display/intel_vblank.c | 14 + + drivers/gpu/drm/i915/display/intel_vblank.h | 1 + + drivers/gpu/drm/i915/display/intel_vdsc.c | 628 +++++++-------- + drivers/gpu/drm/i915/display/intel_vdsc_regs.h | 371 +++------ + drivers/gpu/drm/i915/display/intel_vrr.c | 20 +- + drivers/gpu/drm/i915/display/intel_vrr.h | 1 + + drivers/gpu/drm/i915/display/skl_universal_plane.c | 13 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 32 +- + drivers/gpu/drm/i915/display/skl_watermark.h | 2 + + drivers/gpu/drm/i915/gem/i915_gem_clflush.c | 3 +- + drivers/gpu/drm/i915/gem/i915_gem_create.c | 4 +- + drivers/gpu/drm/i915/gem/i915_gem_domain.c | 2 +- + drivers/gpu/drm/i915/gem/i915_gem_execbuffer.c | 24 +- + drivers/gpu/drm/i915/gem/i915_gem_object.c | 1 + + drivers/gpu/drm/i915/gem/i915_gem_object.h | 89 --- + .../gpu/drm/i915/gem/i915_gem_object_frontbuffer.h | 103 +++ + drivers/gpu/drm/i915/gem/i915_gem_phys.c | 1 + + .../drm/i915/gem/selftests/i915_gem_client_blt.c | 39 +- + drivers/gpu/drm/i915/gem/selftests/mock_context.c | 2 +- + drivers/gpu/drm/i915/gt/gen8_engine_cs.c | 10 +- + drivers/gpu/drm/i915/gt/gen8_ppgtt.c | 36 +- + drivers/gpu/drm/i915/gt/intel_engine_cs.c | 4 +- + drivers/gpu/drm/i915/gt/intel_engine_pm.c | 2 +- + drivers/gpu/drm/i915/gt/intel_engine_regs.h | 1 + + .../gpu/drm/i915/gt/intel_execlists_submission.c | 4 +- + drivers/gpu/drm/i915/gt/intel_gt.c | 5 + + drivers/gpu/drm/i915/gt/intel_gt.h | 69 +- + drivers/gpu/drm/i915/gt/intel_gt_mcr.c | 6 +- + drivers/gpu/drm/i915/gt/intel_gt_pm_debugfs.c | 1 - + drivers/gpu/drm/i915/gt/intel_gt_regs.h | 10 +- + drivers/gpu/drm/i915/gt/intel_gtt.h | 4 +- + drivers/gpu/drm/i915/gt/intel_lrc.c | 74 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 23 +- + drivers/gpu/drm/i915/gt/intel_rc6.c | 9 +- + drivers/gpu/drm/i915/gt/intel_reset.c | 34 +- + drivers/gpu/drm/i915/gt/intel_reset.h | 2 + + drivers/gpu/drm/i915/gt/intel_rps.c | 2 +- + drivers/gpu/drm/i915/gt/intel_workarounds.c | 411 +++------- + drivers/gpu/drm/i915/gt/selftest_migrate.c | 2 +- + .../drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.c | 20 +- + .../drm/i915/gt/uc/intel_gsc_uc_heci_cmd_submit.h | 6 + + drivers/gpu/drm/i915/gt/uc/intel_guc.c | 64 +- + drivers/gpu/drm/i915/gt/uc/intel_guc.h | 15 + + drivers/gpu/drm/i915/gt/uc/intel_guc_ct.c | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.c | 63 -- + drivers/gpu/drm/i915/gt/uc/intel_guc_slpc.h | 2 - + drivers/gpu/drm/i915/gt/uc/intel_guc_submission.c | 6 +- + drivers/gpu/drm/i915/gt/uc/intel_uc_fw.c | 32 +- + drivers/gpu/drm/i915/i915_debugfs.c | 12 +- + drivers/gpu/drm/i915/i915_driver.c | 10 +- + drivers/gpu/drm/i915/i915_driver.h | 4 +- + drivers/gpu/drm/i915/i915_drv.h | 49 +- + drivers/gpu/drm/i915/i915_gem.c | 2 +- + drivers/gpu/drm/i915/i915_getparam.c | 2 +- + drivers/gpu/drm/i915/i915_gpu_error.c | 4 +- + drivers/gpu/drm/i915/i915_irq.c | 2 + + drivers/gpu/drm/i915/i915_pci.c | 1 - + drivers/gpu/drm/i915/i915_perf.c | 110 +-- + drivers/gpu/drm/i915/i915_perf_types.h | 6 - + drivers/gpu/drm/i915/i915_reg.h | 281 +------ + drivers/gpu/drm/i915/i915_ttm_buddy_manager.c | 23 +- + drivers/gpu/drm/i915/i915_vma.c | 1 + + drivers/gpu/drm/i915/i915_vma_resource.c | 2 +- + drivers/gpu/drm/i915/intel_clock_gating.c | 60 +- + drivers/gpu/drm/i915/intel_device_info.c | 28 - + drivers/gpu/drm/i915/intel_device_info.h | 5 - + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 1 + + drivers/gpu/drm/i915/intel_runtime_pm.c | 1 - + drivers/gpu/drm/i915/intel_runtime_pm.h | 4 +- + drivers/gpu/drm/i915/intel_step.c | 1 + + drivers/gpu/drm/i915/pxp/intel_pxp.c | 40 +- + drivers/gpu/drm/i915/pxp/intel_pxp.h | 2 +- + .../gpu/drm/i915/pxp/intel_pxp_cmd_interface_43.h | 4 +- + drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.c | 9 +- + drivers/gpu/drm/i915/pxp/intel_pxp_gsccs.h | 10 +- + drivers/gpu/drm/i915/pxp/intel_pxp_pm.c | 18 +- + drivers/gpu/drm/i915/pxp/intel_pxp_pm.h | 5 +- + drivers/gpu/drm/i915/pxp/intel_pxp_tee.c | 13 +- + drivers/gpu/drm/i915/pxp/intel_pxp_types.h | 9 + + drivers/gpu/drm/i915/selftests/igt_spinner.c | 3 + + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 2 + + drivers/gpu/drm/i915/soc/intel_pch.c | 12 +- + drivers/gpu/drm/i915/soc/intel_pch.h | 2 + + drivers/gpu/drm/imx/dcss/dcss-drv.c | 8 + + drivers/gpu/drm/imx/dcss/dcss-kms.c | 7 + + drivers/gpu/drm/imx/dcss/dcss-kms.h | 1 + + drivers/gpu/drm/imx/ipuv3/dw_hdmi-imx.c | 6 +- + drivers/gpu/drm/imx/ipuv3/imx-drm-core.c | 13 +- + drivers/gpu/drm/imx/ipuv3/imx-ldb.c | 5 +- + drivers/gpu/drm/imx/ipuv3/imx-tve.c | 5 +- + drivers/gpu/drm/imx/ipuv3/ipuv3-crtc.c | 5 +- + drivers/gpu/drm/imx/ipuv3/parallel-display.c | 6 +- + drivers/gpu/drm/ingenic/ingenic-drm-drv.c | 70 +- + drivers/gpu/drm/ingenic/ingenic-ipu.c | 5 +- + drivers/gpu/drm/logicvc/logicvc_drm.c | 9 + + drivers/gpu/drm/loongson/lsdc_drv.c | 6 + + drivers/gpu/drm/loongson/lsdc_pixpll.c | 6 +- + drivers/gpu/drm/mcde/mcde_drv.c | 9 + + drivers/gpu/drm/mgag200/mgag200_drv.c | 8 + + drivers/gpu/drm/msm/adreno/adreno_device.c | 5 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 6 +- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 6 +- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 5 +- + drivers/gpu/drm/msm/dp/dp_display.c | 6 +- + drivers/gpu/drm/msm/dsi/dsi.c | 6 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 6 +- + drivers/gpu/drm/msm/hdmi/hdmi_phy.c | 6 +- + drivers/gpu/drm/msm/msm_drv.c | 6 +- + drivers/gpu/drm/msm/msm_mdss.c | 6 +- + drivers/gpu/drm/nouveau/Kconfig | 1 + + drivers/gpu/drm/nouveau/dispnv04/disp.c | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 532 +++++++----- + drivers/gpu/drm/nouveau/dispnv50/disp.h | 6 +- + drivers/gpu/drm/nouveau/dispnv50/head.h | 1 + + drivers/gpu/drm/nouveau/dispnv50/headc57d.c | 14 + + drivers/gpu/drm/nouveau/include/nvif/conn.h | 20 +- + drivers/gpu/drm/nouveau/include/nvif/if0011.h | 21 +- + drivers/gpu/drm/nouveau/include/nvif/if0012.h | 251 +++++- + drivers/gpu/drm/nouveau/include/nvif/outp.h | 96 ++- + drivers/gpu/drm/nouveau/include/nvkm/core/memory.h | 1 + + .../gpu/drm/nouveau/include/nvkm/subdev/instmem.h | 2 +- + drivers/gpu/drm/nouveau/nouveau_backlight.c | 90 +-- + drivers/gpu/drm/nouveau/nouveau_bios.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_connector.c | 251 +++--- + drivers/gpu/drm/nouveau/nouveau_connector.h | 3 +- + drivers/gpu/drm/nouveau/nouveau_debugfs.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_display.c | 8 +- + drivers/gpu/drm/nouveau/nouveau_dp.c | 345 +++++++- + drivers/gpu/drm/nouveau/nouveau_drm.c | 5 +- + drivers/gpu/drm/nouveau/nouveau_encoder.h | 30 +- + drivers/gpu/drm/nouveau/nouveau_exec.c | 4 +- + drivers/gpu/drm/nouveau/nouveau_uvmm.c | 42 +- + drivers/gpu/drm/nouveau/nouveau_uvmm.h | 8 +- + drivers/gpu/drm/nouveau/nvif/client.c | 2 +- + drivers/gpu/drm/nouveau/nvif/conn.c | 36 +- + drivers/gpu/drm/nouveau/nvif/disp.c | 2 +- + drivers/gpu/drm/nouveau/nvif/outp.c | 414 ++++++++-- + drivers/gpu/drm/nouveau/nvkm/core/firmware.c | 3 +- + drivers/gpu/drm/nouveau/nvkm/core/memory.c | 15 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/base.c | 146 +--- + drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.c | 10 - + drivers/gpu/drm/nouveau/nvkm/engine/disp/conn.h | 2 - + drivers/gpu/drm/nouveau/nvkm/engine/disp/dp.c | 362 +++------ + drivers/gpu/drm/nouveau/nvkm/engine/disp/g84.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/g94.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/ga102.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/gf119.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gk104.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/gm107.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/gm200.c | 17 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/gp100.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/gt215.c | 38 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/gv100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/ior.h | 15 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/mcp89.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/nv50.c | 182 ++++- + drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.c | 146 +++- + drivers/gpu/drm/nouveau/nvkm/engine/disp/outp.h | 43 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/tu102.c | 1 + + drivers/gpu/drm/nouveau/nvkm/engine/disp/uconn.c | 67 +- + drivers/gpu/drm/nouveau/nvkm/engine/disp/uoutp.c | 508 +++++++++--- + drivers/gpu/drm/nouveau/nvkm/engine/gr/gf100.c | 10 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/base.c | 7 +- + .../gpu/drm/nouveau/nvkm/subdev/devinit/tu102.c | 12 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/base.c | 19 +- + drivers/gpu/drm/nouveau/nvkm/subdev/instmem/priv.h | 1 + + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmgp100.c | 2 +- + drivers/gpu/drm/nouveau/nvkm/subdev/mmu/vmmtu102.c | 2 +- + drivers/gpu/drm/omapdrm/omap_drv.c | 8 + + drivers/gpu/drm/panel/Kconfig | 11 + + drivers/gpu/drm/panel/Makefile | 1 + + .../gpu/drm/panel/panel-asus-z00t-tm5p5-n35596.c | 9 - + drivers/gpu/drm/panel/panel-boe-bf060y8m-aj0.c | 9 - + drivers/gpu/drm/panel/panel-jdi-fhd-r63452.c | 9 - + drivers/gpu/drm/panel/panel-jdi-lpm102a188a.c | 551 +++++++++++++ + drivers/gpu/drm/panel/panel-jdi-lt070me05000.c | 4 - + drivers/gpu/drm/panel/panel-novatek-nt35950.c | 9 - + drivers/gpu/drm/panel/panel-novatek-nt36523.c | 12 - + drivers/gpu/drm/panel/panel-orisetech-otm8009a.c | 17 - + drivers/gpu/drm/panel/panel-raydium-rm68200.c | 38 - + drivers/gpu/drm/panel/panel-samsung-s6e63m0.c | 25 - + .../drm/panel/panel-samsung-s6e88a0-ams452ef01.c | 10 - + drivers/gpu/drm/panel/panel-samsung-sofef00.c | 9 - + drivers/gpu/drm/panel/panel-sharp-ls060t1sx01.c | 10 - + drivers/gpu/drm/panel/panel-simple.c | 29 + + drivers/gpu/drm/panel/panel-sony-td4353-jdi.c | 9 - + .../gpu/drm/panel/panel-sony-tulip-truly-nt35521.c | 18 - + .../gpu/drm/panel/panel-startek-kd070fhfid015.c | 11 - + drivers/gpu/drm/panel/panel-truly-nt35597.c | 20 - + drivers/gpu/drm/panel/panel-visionox-r66451.c | 16 - + drivers/gpu/drm/panel/panel-visionox-rm69299.c | 8 - + drivers/gpu/drm/panel/panel-visionox-vtdr6130.c | 9 - + drivers/gpu/drm/panfrost/panfrost_gpu.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_job.c | 4 +- + drivers/gpu/drm/panfrost/panfrost_mmu.c | 4 +- + drivers/gpu/drm/pl111/pl111_drv.c | 7 + + drivers/gpu/drm/qxl/qxl_drv.c | 7 + + drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 6 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 20 + + drivers/gpu/drm/rockchip/rockchip_drm_vop.c | 24 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 39 +- + drivers/gpu/drm/rockchip/rockchip_vop_reg.c | 55 ++ + drivers/gpu/drm/solomon/ssd130x.c | 241 ++++-- + drivers/gpu/drm/solomon/ssd130x.h | 4 +- + drivers/gpu/drm/sti/sti_drv.c | 7 + + drivers/gpu/drm/stm/drv.c | 7 + + drivers/gpu/drm/sun4i/sun4i_drv.c | 6 + + drivers/gpu/drm/tegra/dc.c | 9 +- + drivers/gpu/drm/tegra/dsi.c | 1 + + drivers/gpu/drm/tegra/hdmi.c | 3 +- + drivers/gpu/drm/tegra/rgb.c | 16 +- + drivers/gpu/drm/tegra/sor.c | 1 + + drivers/gpu/drm/tests/drm_format_helper_test.c | 813 +++++++++++++++++-- + drivers/gpu/drm/tilcdc/tilcdc_drv.c | 11 +- + drivers/gpu/drm/tiny/bochs.c | 6 + + drivers/gpu/drm/tiny/cirrus.c | 6 + + drivers/gpu/drm/tiny/repaper.c | 2 +- + drivers/gpu/drm/tiny/simpledrm.c | 105 +++ + drivers/gpu/drm/tve200/tve200_drv.c | 7 + + drivers/gpu/drm/vboxvideo/vbox_drv.c | 10 + + drivers/gpu/drm/vc4/vc4_drv.c | 36 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 7 - + drivers/gpu/drm/vmwgfx/vmwgfx_gem.c | 6 +- + drivers/hid/Kconfig | 8 +- + drivers/hid/hid-picolcd_fb.c | 73 +- + drivers/media/cec/core/cec-adap.c | 5 + + drivers/media/cec/core/cec-notifier.c | 5 + + drivers/staging/fbtft/Kconfig | 6 +- + drivers/staging/fbtft/fbtft-core.c | 99 +-- + drivers/video/fbdev/Kconfig | 35 +- + drivers/video/fbdev/Makefile | 17 +- + drivers/video/fbdev/au1200fb.c | 9 - + drivers/video/fbdev/bw2.c | 17 +- + drivers/video/fbdev/cg14.c | 19 +- + drivers/video/fbdev/cg3.c | 17 +- + drivers/video/fbdev/cg6.c | 17 +- + drivers/video/fbdev/core/Kconfig | 6 + + drivers/video/fbdev/core/Makefile | 2 + + drivers/video/fbdev/core/fb_internal.h | 17 + + drivers/video/fbdev/core/fb_logo.c | 508 ++++++++++++ + drivers/video/fbdev/core/fbcon.c | 2 + + drivers/video/fbdev/core/fbmem.c | 542 +------------ + drivers/video/fbdev/ffb.c | 17 +- + drivers/video/fbdev/hyperv_fb.c | 48 +- + drivers/video/fbdev/leo.c | 19 +- + drivers/video/fbdev/mmp/fb/mmpfb.c | 7 - + drivers/video/fbdev/p9100.c | 18 +- + drivers/video/fbdev/sbuslib.h | 37 +- + drivers/video/fbdev/smscufx.c | 85 +- + drivers/video/fbdev/tcx.c | 20 +- + drivers/video/fbdev/udlfb.c | 89 +-- + include/drm/bridge/samsung-dsim.h | 1 + + include/drm/display/drm_dp_helper.h | 6 + + include/drm/display/drm_dp_mst_helper.h | 23 +- + include/drm/drm_accel.h | 9 +- + include/drm/drm_atomic.h | 2 +- + include/drm/drm_bridge.h | 6 +- + include/drm/drm_buddy.h | 6 +- + include/drm/drm_client.h | 2 +- + include/drm/drm_connector.h | 11 +- + include/drm/drm_debugfs.h | 13 +- + include/drm/drm_device.h | 14 +- + include/drm/drm_drv.h | 8 + + include/drm/drm_edid.h | 1 + + include/drm/drm_file.h | 17 +- + include/drm/{drm_gpuva_mgr.h => drm_gpuvm.h} | 155 ++-- + include/drm/i915_pciids.h | 22 +- + include/linux/fb.h | 5 - + include/uapi/drm/ivpu_accel.h | 18 +- + include/uapi/drm/qaic_accel.h | 24 +- + 440 files changed, 12685 insertions(+), 7226 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/jdi,lpm102a188a.yaml + create mode 100644 Documentation/userspace-api/dma-buf-alloc-exchange.rst + rename drivers/gpu/drm/{drm_gpuva_mgr.c => drm_gpuvm.c} (78%) + create mode 100644 drivers/gpu/drm/i915/display/intel_color_regs.h + create mode 100644 drivers/gpu/drm/i915/display/intel_display_wa.c + create mode 100644 drivers/gpu/drm/i915/display/intel_display_wa.h + create mode 100644 drivers/gpu/drm/i915/display/intel_link_bw.c + create mode 100644 drivers/gpu/drm/i915/display/intel_link_bw.h + create mode 100644 drivers/gpu/drm/i915/gem/i915_gem_object_frontbuffer.h + create mode 100644 drivers/gpu/drm/panel/panel-jdi-lpm102a188a.c + create mode 100644 drivers/video/fbdev/core/fb_logo.c + rename include/drm/{drm_gpuva_mgr.h => drm_gpuvm.h} (78%) +Merging drm-ci/topic/drm-ci (ad6bfe1b66a5 drm: ci: docs: fix build warning - add missing escape) +$ git merge -m Merge branch 'topic/drm-ci' of git://git.freedesktop.org/git/drm/drm.git drm-ci/topic/drm-ci +Already up to date. +Merging drm-misc/for-linux-next (0ddd30471a5d drm/panel: st7703: Fix timings when entering/exiting sleep) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Auto-merging MAINTAINERS +CONFLICT (modify/delete): arch/ia64/include/asm/fb.h deleted in HEAD and modified in drm-misc/for-linux-next. Version drm-misc/for-linux-next of arch/ia64/include/asm/fb.h left in tree. +Auto-merging drivers/accel/ivpu/ivpu_drv.c +Auto-merging drivers/accel/ivpu/ivpu_fw.c +Auto-merging drivers/accel/ivpu/ivpu_gem.h +Auto-merging drivers/accel/ivpu/ivpu_ipc.c +Auto-merging drivers/accel/ivpu/ivpu_job.c +Auto-merging drivers/gpu/drm/panel/panel-simple.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_device.h +Auto-merging drivers/gpu/drm/panfrost/panfrost_drv.c +Auto-merging drivers/gpu/drm/panfrost/panfrost_gem.h +Auto-merging drivers/gpu/drm/tiny/simpledrm.c +Auto-merging drivers/gpu/drm/vmwgfx/vmwgfx_surface.c +Auto-merging drivers/usb/typec/altmodes/displayport.c +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/ia64/include/asm/fb.h +rm 'arch/ia64/include/asm/fb.h' +$ git commit --no-edit -v -a +[master e76958f42f6d] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/lvds-data-mapping.yaml | 84 ++++ + .../devicetree/bindings/display/lvds.yaml | 77 +--- + .../display/panel/leadtek,ltk050h3146w.yaml | 1 + + .../bindings/display/panel/newvision,nv3051d.yaml | 5 +- + .../bindings/display/panel/panel-simple.yaml | 26 +- + .../bindings/display/panel/raydium,rm692e5.yaml | 73 ++++ + Documentation/gpu/drivers.rst | 1 + + Documentation/gpu/drm-mm.rst | 20 +- + Documentation/gpu/drm-uapi.rst | 77 ++++ + Documentation/gpu/drm-usage-stats.rst | 1 + + Documentation/gpu/panfrost.rst | 40 ++ + MAINTAINERS | 24 +- + arch/m68k/include/asm/fb.h | 19 +- + arch/mips/include/asm/fb.h | 11 +- + arch/powerpc/include/asm/fb.h | 18 +- + arch/sparc/include/asm/fb.h | 15 +- + arch/x86/include/asm/fb.h | 12 +- + arch/x86/video/fbdev.c | 15 +- + drivers/accel/ivpu/Makefile | 3 +- + drivers/accel/ivpu/ivpu_debugfs.c | 50 +-- + drivers/accel/ivpu/ivpu_debugfs.h | 8 +- + drivers/accel/ivpu/ivpu_drv.c | 6 +- + drivers/accel/ivpu/ivpu_fw.c | 18 +- + drivers/accel/ivpu/ivpu_fw_log.c | 6 +- + drivers/accel/ivpu/ivpu_gem.c | 30 +- + drivers/accel/ivpu/ivpu_gem.h | 22 +- + drivers/accel/ivpu/ivpu_ipc.c | 6 +- + drivers/accel/ivpu/ivpu_job.c | 8 +- + drivers/accel/ivpu/ivpu_pm.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 2 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 38 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu10_hwmgr.h | 2 +- + drivers/gpu/drm/bridge/adv7511/adv7511_drv.c | 4 +- + drivers/gpu/drm/bridge/chipone-icn6211.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt9211.c | 2 +- + drivers/gpu/drm/bridge/lontium-lt9611uxc.c | 2 +- + .../drm/bridge/megachips-stdpxxxx-ge-b850v3-fw.c | 57 +-- + drivers/gpu/drm/bridge/samsung-dsim.c | 60 ++- + drivers/gpu/drm/bridge/tc358767.c | 2 +- + drivers/gpu/drm/bridge/ti-dlpc3433.c | 2 +- + drivers/gpu/drm/bridge/ti-sn65dsi83.c | 2 +- + drivers/gpu/drm/display/drm_dp_helper.c | 39 +- + drivers/gpu/drm/drm_bridge_connector.c | 38 +- + drivers/gpu/drm/drm_connector.c | 6 +- + drivers/gpu/drm/drm_file.c | 8 +- + drivers/gpu/drm/drm_framebuffer.c | 64 +--- + drivers/gpu/drm/drm_vblank_work.c | 3 + + drivers/gpu/drm/exynos/exynos_drm_dsi.c | 2 +- + drivers/gpu/drm/gma500/oaktrail_lvds_i2c.c | 2 +- + drivers/gpu/drm/i915/display/intel_display_core.h | 3 + + .../gpu/drm/i915/display/intel_display_debugfs.c | 3 +- + drivers/gpu/drm/i915/display/intel_dp.c | 27 +- + drivers/gpu/drm/i915/display/intel_fb.c | 2 +- + drivers/gpu/drm/i915/selftests/i915_request.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 2 +- + drivers/gpu/drm/nouveau/dispnv50/disp.c | 4 +- + drivers/gpu/drm/nouveau/nvkm/engine/pm/priv.h | 2 +- + drivers/gpu/drm/panel/Kconfig | 9 + + drivers/gpu/drm/panel/Makefile | 1 + + drivers/gpu/drm/panel/panel-arm-versatile.c | 2 + + drivers/gpu/drm/panel/panel-ilitek-ili9322.c | 8 +- + drivers/gpu/drm/panel/panel-leadtek-ltk050h3146w.c | 97 ++++- + drivers/gpu/drm/panel/panel-newvision-nv3051d.c | 7 + + drivers/gpu/drm/panel/panel-raydium-rm692e5.c | 423 +++++++++++++++++++++ + drivers/gpu/drm/panel/panel-simple.c | 53 +++ + drivers/gpu/drm/panel/panel-sitronix-st7703.c | 38 +- + drivers/gpu/drm/panel/panel-tpo-tpg110.c | 2 + + drivers/gpu/drm/panfrost/Makefile | 2 + + drivers/gpu/drm/panfrost/panfrost_debugfs.c | 21 + + drivers/gpu/drm/panfrost/panfrost_debugfs.h | 14 + + drivers/gpu/drm/panfrost/panfrost_devfreq.c | 8 + + drivers/gpu/drm/panfrost/panfrost_devfreq.h | 3 + + drivers/gpu/drm/panfrost/panfrost_device.c | 2 + + drivers/gpu/drm/panfrost/panfrost_device.h | 13 + + drivers/gpu/drm/panfrost/panfrost_drv.c | 60 ++- + drivers/gpu/drm/panfrost/panfrost_gem.c | 30 ++ + drivers/gpu/drm/panfrost/panfrost_gem.h | 5 + + drivers/gpu/drm/panfrost/panfrost_gpu.c | 41 ++ + drivers/gpu/drm/panfrost/panfrost_gpu.h | 4 + + drivers/gpu/drm/panfrost/panfrost_job.c | 24 ++ + drivers/gpu/drm/panfrost/panfrost_job.h | 5 + + drivers/gpu/drm/panfrost/panfrost_mmu.c | 1 + + drivers/gpu/drm/panfrost/panfrost_regs.h | 5 + + drivers/gpu/drm/rockchip/cdn-dp-core.c | 17 +- + drivers/gpu/drm/rockchip/dw-mipi-dsi-rockchip.c | 3 +- + drivers/gpu/drm/rockchip/rockchip_drm_vop2.c | 6 +- + drivers/gpu/drm/rockchip/rockchip_lvds.c | 2 +- + drivers/gpu/drm/rockchip/rockchip_vop2_reg.c | 2 +- + drivers/gpu/drm/solomon/ssd130x.c | 17 +- + drivers/gpu/drm/tegra/drm.h | 3 - + drivers/gpu/drm/tegra/gem.c | 32 +- + drivers/gpu/drm/tegra/hub.c | 2 +- + drivers/gpu/drm/tests/drm_format_helper_test.c | 284 ++++++++++++++ + drivers/gpu/drm/tiny/simpledrm.c | 2 +- + drivers/gpu/drm/v3d/v3d_drv.h | 2 +- + drivers/gpu/drm/vc4/vc4_drv.h | 2 +- + drivers/gpu/drm/virtio/virtgpu_drv.h | 2 +- + drivers/gpu/drm/vmwgfx/vmwgfx_surface.c | 2 +- + drivers/gpu/host1x/channel.c | 26 ++ + drivers/gpu/host1x/channel.h | 4 + + drivers/gpu/host1x/context.c | 4 +- + drivers/gpu/host1x/dev.c | 32 +- + drivers/gpu/host1x/dev.h | 3 +- + drivers/gpu/host1x/hw/intr_hw.c | 46 ++- + drivers/usb/typec/altmodes/displayport.c | 17 +- + drivers/video/fbdev/core/fb_chrdev.c | 3 +- + include/asm-generic/fb.h | 12 +- + include/drm/bridge/samsung-dsim.h | 5 +- + include/drm/display/drm_dp_helper.h | 12 +- + include/drm/drm_connector.h | 6 +- + include/drm/drm_fourcc.h | 5 +- + include/drm/drm_framebuffer.h | 5 - + include/drm/drm_gem.h | 9 + + include/linux/iosys-map.h | 4 +- + 114 files changed, 1983 insertions(+), 526 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/lvds-data-mapping.yaml + create mode 100644 Documentation/devicetree/bindings/display/panel/raydium,rm692e5.yaml + create mode 100644 Documentation/gpu/panfrost.rst + create mode 100644 drivers/gpu/drm/panel/panel-raydium-rm692e5.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_debugfs.c + create mode 100644 drivers/gpu/drm/panfrost/panfrost_debugfs.h +$ git am -3 ../patches/0001-fix-up-for-drm-Add-HPD-state-to-drm_connector_oob_ho.patch +Applying: fix up for "drm: Add HPD state to drm_connector_oob_hotplug_event()" +$ git reset HEAD^ +Unstaged changes after reset: +M drivers/usb/typec/altmodes/displayport.c +$ git add -A . +$ git commit -v -a --amend +[master 2b1e61ae8b97] Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc + Date: Mon Oct 16 11:02:13 2023 +1100 +Merging amdgpu/drm-next (cd90511557fd drm/amdgpu/vkms: fix a possible null pointer dereference) + 219223eca4d8 ("drm/amdgpu: fix SI failure due to doorbells allocation") + 31220ee9dc5a ("drm/amdgpu: add missing NULL check") + ef013f6fcd8a ("drm/amd/display: Don't set dpms_off for seamless boot") +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Auto-merging Documentation/gpu/amdgpu/driver-misc.rst +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c +Auto-merging drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc21.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_crat.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_crat.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_topology.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_topology.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +Auto-merging drivers/gpu/drm/amd/display/dc/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/hwss/dcn30/dcn30_hwseq.h +Auto-merging drivers/gpu/drm/amd/display/dc/inc/core_types.h +Auto-merging drivers/gpu/drm/amd/display/dc/link/link_factory.c +Auto-merging drivers/gpu/drm/amd/display/modules/freesync/freesync.c +Auto-merging drivers/gpu/drm/amd/include/amd_shared.h +Auto-merging drivers/gpu/drm/amd/include/kgd_kfd_interface.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/include/kgd_kfd_interface.h +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.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/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c' +Resolved 'drivers/gpu/drm/amd/amdgpu/psp_v13_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_crat.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_svm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_topology.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' +Resolved 'drivers/gpu/drm/amd/display/dc/core/dc.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/hwss/dce110/dce110_hwseq.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/hwss/dcn20/dcn20_hwseq.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/include/kgd_kfd_interface.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/amdgpu_pm.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h' +Resolved 'drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h' +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c'. +Recorded resolution for 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c'. +Recorded resolution for 'drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h'. +Recorded resolution for 'drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h'. +Recorded resolution for 'drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c'. +[master 1f0d719d4db7] Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/amdgpu/driver-misc.rst | 18 + + Documentation/gpu/amdgpu/thermal.rst | 30 + + drivers/gpu/drm/amd/amdgpu/Makefile | 22 +- + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 78 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 52 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 57 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 409 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 178 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 14 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c | 15 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 97 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.c | 166 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fru_eeprom.h | 11 + + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 208 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 215 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 186 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 61 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 100 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 402 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 12 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 93 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 37 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 29 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 862 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.h | 228 + + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_uvd.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vkms.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 58 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 656 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h | 91 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 27 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v3_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 19 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 1 - + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 132 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 74 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 89 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 58 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.c | 516 + + .../link_fpga.h => amdgpu/gfxhub_v11_5_0.h} | 15 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 16 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 5 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 302 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 208 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 361 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 4 - + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 4 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 5 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 622 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.h | 35 + + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 6 +- + 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_v1_8.c | 17 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 4 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 7 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c | 5 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 589 + + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.h | 29 + + drivers/gpu/drm/amd/amdgpu/mmhub_v9_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h | 12 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 6 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 8 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 6 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 294 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_11.h | 33 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 10 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 11 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 10 +- + drivers/gpu/drm/amd/amdgpu/nv.c | 10 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 4 + + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 24 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 52 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 28 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 20 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 22 +- + drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c | 19 +- + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 22 + + drivers/gpu/drm/amd/amdgpu/smuio_v13_0_3.c | 6 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 28 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 44 +- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 375 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 127 + + drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c | 424 + + drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/uvd_v3_1.c | 8 + + drivers/gpu/drm/amd/amdgpu/uvd_v4_2.c | 8 + + drivers/gpu/drm/amd/amdgpu/uvd_v5_0.c | 8 + + drivers/gpu/drm/amd/amdgpu/uvd_v6_0.c | 8 + + drivers/gpu/drm/amd/amdgpu/uvd_v7_0.c | 8 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 9 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 1779 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.h | 35 + + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 14 +- + drivers/gpu/drm/amd/amdgpu/vpe_6_1_fw_if.h | 217 + + drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c | 289 + + drivers/gpu/drm/amd/amdgpu/vpe_v6_1.h | 29 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 31 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 129 +- + drivers/gpu/drm/amd/amdkfd/kfd_doorbell.c | 10 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 156 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 28 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 4 +- + .../gpu/drm/amd/amdkfd/kfd_process_queue_manager.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 217 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 44 +- + drivers/gpu/drm/amd/display/Makefile | 1 + + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 380 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 2 - + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 58 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 69 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 22 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 19 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 4 +- + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 53 +- + drivers/gpu/drm/amd/display/dc/Makefile | 7 +- + drivers/gpu/drm/amd/display/dc/basics/Makefile | 9 +- + .../display/dc/{dml/calcs => basics}/bw_fixed.c | 13 +- + .../dc/{dml/calcs => basics}/calcs_logger.h | 0 + .../dc/{dml/calcs => basics}/custom_float.c | 90 +- + .../display/dc/{dml/calcs => basics}/dce_calcs.c | 0 + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 3 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 46 +- + .../amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 8 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 18 + + .../amd/display/dc/clk_mgr/dce120/dce120_clk_mgr.c | 2 +- + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 2 - + .../gpu/drm/amd/display/dc/clk_mgr/dcn32/dalsmc.h | 11 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 64 + + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c | 154 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 1142 + + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.h | 63 + + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 471 + + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h | 203 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 480 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 + + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 23 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 1709 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 51 +- + drivers/gpu/drm/amd/display/dc/dc.h | 88 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 138 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 59 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 7 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 7 - + drivers/gpu/drm/amd/display/dc/dc_stream.h | 9 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 16 +- + drivers/gpu/drm/amd/display/dc/dce/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 9 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 4 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dce_dmcu.c | 3 +- + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 4 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 6 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 13 +- + drivers/gpu/drm/amd/display/dc/dce100/Makefile | 2 +- + .../drm/amd/display/dc/dce100/dce100_resource.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce110/Makefile | 2 +- + .../drm/amd/display/dc/dce110/dce110_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce112/Makefile | 2 +- + .../drm/amd/display/dc/dce112/dce112_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dce120/Makefile | 1 - + .../drm/amd/display/dc/dce120/dce120_resource.c | 6 +- + .../drm/amd/display/dc/dce60/dce60_hw_sequencer.c | 4 +- + drivers/gpu/drm/amd/display/dc/dce80/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dce80/dce80_resource.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn10/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 12 +- + .../display/dc/dcn10/dcn10_hw_sequencer_debug.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_init.c | 4 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 33 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 30 + + .../gpu/drm/amd/display/dc/dcn10/dcn10_resource.c | 4 +- + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 24 +- + drivers/gpu/drm/amd/display/dc/dcn20/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 64 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 9 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 36 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 4 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_vmid.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn201/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn201/dcn201_init.c | 6 +- + .../drm/amd/display/dc/dcn201/dcn201_resource.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn21/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 9 +- + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 13 +- + drivers/gpu/drm/amd/display/dc/dcn30/Makefile | 1 - + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 104 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 8 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 17 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 1 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn301/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 8 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn302/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn302/dcn302_init.c | 2 +- + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn303/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn303/dcn303_init.c | 2 +- + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn31/Makefile | 2 +- + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.h | 10 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 32 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 6 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 5 +- + drivers/gpu/drm/amd/display/dc/dcn314/Makefile | 2 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 3 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.h | 6 + + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 22 +- + .../display/dc/dcn314/dcn314_dio_stream_encoder.h | 40 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 6 +- + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 7 +- + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 7 +- + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn32/Makefile | 2 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 14 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 6 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 10 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h | 4 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 27 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h | 3 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 168 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 15 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 50 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 45 +- + drivers/gpu/drm/amd/display/dc/dcn35/Makefile | 20 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c | 796 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.h | 190 + + .../amd/display/dc/dcn35/dcn35_dio_link_encoder.c | 267 + + .../amd/display/dc/dcn35/dcn35_dio_link_encoder.h | 137 + + .../display/dc/dcn35/dcn35_dio_stream_encoder.c | 528 + + .../display/dc/dcn35/dcn35_dio_stream_encoder.h | 326 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.c | 51 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.h | 55 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.c | 58 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.h | 57 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.c | 58 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.h | 59 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c | 609 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.h | 153 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.c | 104 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.h | 59 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.c | 169 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.h | 32 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.c | 57 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.h | 73 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.c | 51 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.h | 65 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.c | 288 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.h | 72 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.c | 539 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.h | 193 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_resource.c | 2119 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_resource.h | 308 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 5 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 31 +- + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.h | 10 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 2 + + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 827 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 3 - + .../dc/dml/dcn32/display_mode_vba_util_32.c | 4 - + .../gpu/drm/amd/display/dc/dml/dcn321/dcn321_fpu.c | 81 + + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 509 + + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.h | 42 + + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 91 + + drivers/gpu/drm/amd/display/dc/dml2/cmntypes.h | 92 + + .../drm/amd/display/dc/dml2/display_mode_core.c | 10296 ++++ + .../drm/amd/display/dc/dml2/display_mode_core.h | 201 + + .../display/dc/dml2/display_mode_core_structs.h | 1970 + + .../amd/display/dc/dml2/display_mode_lib_defines.h | 75 + + .../drm/amd/display/dc/dml2/display_mode_util.c | 796 + + .../drm/amd/display/dc/dml2/display_mode_util.h | 74 + + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.c | 861 + + .../amd/display/dc/dml2/dml2_dc_resource_mgmt.h | 48 + + .../gpu/drm/amd/display/dc/dml2/dml2_dc_types.h | 40 + + .../drm/amd/display/dc/dml2/dml2_internal_types.h | 121 + + .../drm/amd/display/dc/dml2/dml2_mall_phantom.c | 913 + + .../drm/amd/display/dc/dml2/dml2_mall_phantom.h | 50 + + drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.c | 308 + + drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.h | 47 + + .../amd/display/dc/dml2/dml2_translation_helper.c | 1201 + + .../amd/display/dc/dml2/dml2_translation_helper.h | 39 + + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c | 480 + + drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.h | 144 + + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c | 745 + + drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h | 212 + + drivers/gpu/drm/amd/display/dc/dml2/dml_assert.h | 30 + + .../gpu/drm/amd/display/dc/dml2/dml_depedencies.h | 31 + + .../amd/display/dc/dml2/dml_display_rq_dlg_calc.c | 585 + + .../amd/display/dc/dml2/dml_display_rq_dlg_calc.h | 63 + + drivers/gpu/drm/amd/display/dc/dml2/dml_logging.h | 29 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 + + drivers/gpu/drm/amd/display/dc/hwss/Makefile | 183 + + .../drm/amd/display/dc/{ => hwss}/dce/dce_hwseq.c | 0 + .../drm/amd/display/dc/{ => hwss}/dce/dce_hwseq.h | 20 + + .../dce100/dce100_hwseq.c} | 4 +- + .../dce100/dce100_hwseq.h} | 0 + .../dce110/dce110_hwseq.c} | 39 +- + .../dce110/dce110_hwseq.h} | 0 + .../dce112/dce112_hwseq.c} | 4 +- + .../dce112/dce112_hwseq.h} | 0 + .../dce120/dce120_hwseq.c} | 4 +- + .../dce120/dce120_hwseq.h} | 0 + .../dce80/dce80_hwseq.c} | 6 +- + .../dce80/dce80_hwseq.h} | 0 + .../dcn10/dcn10_hwseq.c} | 37 +- + .../dcn10/dcn10_hwseq.h} | 0 + .../amd/display/dc/{ => hwss}/dcn20/dcn20_hwseq.c | 196 +- + .../amd/display/dc/{ => hwss}/dcn20/dcn20_hwseq.h | 11 +- + .../display/dc/{ => hwss}/dcn201/dcn201_hwseq.c | 2 +- + .../display/dc/{ => hwss}/dcn201/dcn201_hwseq.h | 0 + .../amd/display/dc/{ => hwss}/dcn21/dcn21_hwseq.c | 2 +- + .../amd/display/dc/{ => hwss}/dcn21/dcn21_hwseq.h | 0 + .../amd/display/dc/{ => hwss}/dcn30/dcn30_hwseq.c | 47 +- + .../amd/display/dc/{ => hwss}/dcn30/dcn30_hwseq.h | 3 + + .../display/dc/{ => hwss}/dcn301/dcn301_hwseq.c | 0 + .../display/dc/{ => hwss}/dcn301/dcn301_hwseq.h | 0 + .../display/dc/{ => hwss}/dcn302/dcn302_hwseq.c | 0 + .../display/dc/{ => hwss}/dcn302/dcn302_hwseq.h | 0 + .../display/dc/{ => hwss}/dcn303/dcn303_hwseq.c | 0 + .../display/dc/{ => hwss}/dcn303/dcn303_hwseq.h | 0 + .../amd/display/dc/{ => hwss}/dcn31/dcn31_hwseq.c | 2 +- + .../amd/display/dc/{ => hwss}/dcn31/dcn31_hwseq.h | 0 + .../display/dc/{ => hwss}/dcn314/dcn314_hwseq.c | 7 +- + .../display/dc/{ => hwss}/dcn314/dcn314_hwseq.h | 0 + .../amd/display/dc/{ => hwss}/dcn32/dcn32_hwseq.c | 111 +- + .../amd/display/dc/{ => hwss}/dcn32/dcn32_hwseq.h | 9 + + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c | 1205 + + .../drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h | 85 + + .../amd/display/dc/{inc => hwss}/hw_sequencer.h | 81 +- + .../dc/{inc => hwss}/hw_sequencer_private.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 39 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 10 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 18 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 14 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/pg_cntl.h | 52 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 5 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/link.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 291 +- + drivers/gpu/drm/amd/display/dc/irq/Makefile | 9 + + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 12 +- + .../amd/display/dc/irq/dce120/irq_service_dce120.c | 12 +- + .../amd/display/dc/irq/dce60/irq_service_dce60.c | 12 +- + .../amd/display/dc/irq/dce80/irq_service_dce80.c | 12 +- + .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 14 +- + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 14 +- + .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 14 +- + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 16 +- + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 16 +- + .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 16 +- + .../amd/display/dc/irq/dcn303/irq_service_dcn303.c | 14 +- + .../amd/display/dc/irq/dcn31/irq_service_dcn31.c | 16 +- + .../amd/display/dc/irq/dcn314/irq_service_dcn314.c | 16 +- + .../amd/display/dc/irq/dcn315/irq_service_dcn315.c | 16 +- + .../amd/display/dc/irq/dcn32/irq_service_dcn32.c | 16 +- + .../amd/display/dc/irq/dcn35/irq_service_dcn35.c | 427 + + .../amd/display/dc/irq/dcn35/irq_service_dcn35.h | 34 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.h | 2 +- + drivers/gpu/drm/amd/display/dc/link/Makefile | 4 +- + .../amd/display/dc/link/accessories/link_dp_cts.c | 117 +- + .../amd/display/dc/link/accessories/link_fpga.c | 95 - + .../drm/amd/display/dc/link/hwss/link_hwss_dpia.c | 2 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 9 + + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 61 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 4 +- + .../drm/amd/display/dc/link/protocols/link_ddc.c | 2 + + .../display/dc/link/protocols/link_dp_capability.c | 14 +- + .../dc/link/protocols/link_dp_irq_handler.c | 2 + + .../amd/display/dc/link/protocols/link_dp_phy.c | 3 +- + .../dc/link/protocols/link_edp_panel_control.c | 52 +- + .../dc/link/protocols/link_edp_panel_control.h | 3 + + drivers/gpu/drm/amd/display/dc/os_types.h | 1 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 52 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 222 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 62 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h | 17 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 552 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.h | 282 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 94 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 2 + + .../drm/amd/display/include/ddc_service_types.h | 1 + + drivers/gpu/drm/amd/display/include/logger_types.h | 143 +- + .../drm/amd/display/modules/color/color_gamma.c | 115 +- + .../drm/amd/display/modules/freesync/freesync.c | 9 +- + .../gpu/drm/amd/display/modules/inc/mod_stats.h | 2 +- + .../drm/amd/display/modules/power/power_helpers.c | 20 +- + drivers/gpu/drm/amd/include/amd_shared.h | 5 + + .../amd/include/asic_reg/dcn/dcn_3_5_0_offset.h | 15255 +++++ + .../amd/include/asic_reg/dcn/dcn_3_5_0_sh_mask.h | 53412 +++++++++++++++++ + .../drm/amd/include/asic_reg/gc/gc_11_5_0_offset.h | 10000 ++++ + .../amd/include/asic_reg/gc/gc_11_5_0_sh_mask.h | 36531 ++++++++++++ + .../include/asic_reg/mmhub/mmhub_3_3_0_offset.h | 1395 + + .../include/asic_reg/mmhub/mmhub_3_3_0_sh_mask.h | 6722 +++ + .../amd/include/asic_reg/mp/mp_13_0_6_sh_mask.h | 28 + + .../drm/amd/include/asic_reg/mp/mp_14_0_0_offset.h | 359 + + .../amd/include/asic_reg/mp/mp_14_0_0_sh_mask.h | 534 + + .../amd/include/asic_reg/nbio/nbio_7_11_0_offset.h | 9394 +++ + .../include/asic_reg/nbio/nbio_7_11_0_sh_mask.h | 57846 +++++++++++++++++++ + .../amd/include/asic_reg/umc/umc_12_0_0_offset.h | 33 + + .../amd/include/asic_reg/umc/umc_12_0_0_sh_mask.h | 95 + + .../amd/include/asic_reg/vcn/vcn_4_0_0_offset.h | 422 + + .../amd/include/asic_reg/vcn/vcn_4_0_0_sh_mask.h | 882 + + .../amd/include/asic_reg/vcn/vcn_4_0_5_offset.h | 1797 + + .../amd/include/asic_reg/vcn/vcn_4_0_5_sh_mask.h | 8614 +++ + .../amd/include/asic_reg/vpe/vpe_6_1_0_offset.h | 1553 + + .../amd/include/asic_reg/vpe/vpe_6_1_0_sh_mask.h | 4393 ++ + .../drm/amd/include/ivsrcid/vpe/irqsrcs_vpe_6_1.h | 40 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 16 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 165 +- + drivers/gpu/drm/amd/include/pptable.h | 4 +- + drivers/gpu/drm/amd/include/soc15_hw_ip.h | 1 + + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 2 + + drivers/gpu/drm/amd/include/umsch_mm_4_0_api_def.h | 437 + + drivers/gpu/drm/amd/pm/Makefile | 1 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 36 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 923 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 19 +- + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h | 16 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c | 4 +- + .../drm/amd/pm/powerplay/hwmgr/vega10_thermal.c | 4 +- + .../drm/amd/pm/powerplay/hwmgr/vega20_thermal.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/Makefile | 2 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 184 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 27 +- + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_6.h | 91 + + .../pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0_0.h | 282 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_pmfw.h | 6 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 10 +- + .../amd/pm/swsmu/inc/pmfw_if/smu_v14_0_0_pmfw.h | 157 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v14_0_0_ppsmc.h | 143 + + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 23 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 4 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h | 230 + + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 272 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 75 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 120 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 36 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 72 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 276 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 36 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 489 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 1035 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 438 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 18 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/Makefile | 30 + + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 1727 + + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 1269 + + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.h | 28 + + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 + + drivers/gpu/drm/radeon/evergreen.c | 7 +- + drivers/gpu/drm/radeon/pptable.h | 2 +- + drivers/gpu/drm/radeon/radeon.h | 4 - + drivers/gpu/drm/radeon/radeon_connectors.c | 2 + + drivers/gpu/drm/radeon/radeon_drv.c | 2 - + drivers/gpu/drm/radeon/radeon_fence.c | 111 +- + drivers/gpu/drm/radeon/radeon_gem.c | 16 - + drivers/gpu/drm/radeon/radeon_ttm.c | 2 - + include/uapi/drm/amdgpu_drm.h | 36 +- + include/uapi/linux/kfd_ioctl.h | 3 + + 565 files changed, 266145 insertions(+), 5408 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.c + rename drivers/gpu/drm/amd/{display/dc/link/accessories/link_fpga.h => amdgpu/gfxhub_v11_5_0.h} (84%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_11.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v12_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v12_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vpe_6_1_fw_if.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vpe_v6_1.h + rename drivers/gpu/drm/amd/display/dc/{dml/calcs => basics}/bw_fixed.c (94%) + rename drivers/gpu/drm/amd/display/dc/{dml/calcs => basics}/calcs_logger.h (100%) + rename drivers/gpu/drm/amd/display/dc/{dml/calcs => basics}/custom_float.c (66%) + rename drivers/gpu/drm/amd/display/dc/{dml/calcs => basics}/dce_calcs.c (100%) + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/cmntypes.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/display_mode_core.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/display_mode_core_structs.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/display_mode_lib_defines.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/display_mode_util.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/display_mode_util.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_resource_mgmt.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml2_dc_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml2_internal_types.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml2_mall_phantom.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml2_mall_phantom.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml2_policy.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml2_translation_helper.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml2_utils.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml2_wrapper.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml_assert.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml_depedencies.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml_display_rq_dlg_calc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml_display_rq_dlg_calc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml2/dml_logging.h + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/Makefile + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dce/dce_hwseq.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dce/dce_hwseq.h (98%) + rename drivers/gpu/drm/amd/display/dc/{dce100/dce100_hw_sequencer.c => hwss/dce100/dce100_hwseq.c} (98%) + rename drivers/gpu/drm/amd/display/dc/{dce100/dce100_hw_sequencer.h => hwss/dce100/dce100_hwseq.h} (100%) + rename drivers/gpu/drm/amd/display/dc/{dce110/dce110_hw_sequencer.c => hwss/dce110/dce110_hwseq.c} (99%) + rename drivers/gpu/drm/amd/display/dc/{dce110/dce110_hw_sequencer.h => hwss/dce110/dce110_hwseq.h} (100%) + rename drivers/gpu/drm/amd/display/dc/{dce112/dce112_hw_sequencer.c => hwss/dce112/dce112_hwseq.c} (98%) + rename drivers/gpu/drm/amd/display/dc/{dce112/dce112_hw_sequencer.h => hwss/dce112/dce112_hwseq.h} (100%) + rename drivers/gpu/drm/amd/display/dc/{dce120/dce120_hw_sequencer.c => hwss/dce120/dce120_hwseq.c} (98%) + rename drivers/gpu/drm/amd/display/dc/{dce120/dce120_hw_sequencer.h => hwss/dce120/dce120_hwseq.h} (100%) + rename drivers/gpu/drm/amd/display/dc/{dce80/dce80_hw_sequencer.c => hwss/dce80/dce80_hwseq.c} (94%) + rename drivers/gpu/drm/amd/display/dc/{dce80/dce80_hw_sequencer.h => hwss/dce80/dce80_hwseq.h} (100%) + rename drivers/gpu/drm/amd/display/dc/{dcn10/dcn10_hw_sequencer.c => hwss/dcn10/dcn10_hwseq.c} (99%) + rename drivers/gpu/drm/amd/display/dc/{dcn10/dcn10_hw_sequencer.h => hwss/dcn10/dcn10_hwseq.h} (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn20/dcn20_hwseq.c (96%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn20/dcn20_hwseq.h (97%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn201/dcn201_hwseq.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn201/dcn201_hwseq.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn21/dcn21_hwseq.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn21/dcn21_hwseq.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn30/dcn30_hwseq.c (95%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn30/dcn30_hwseq.h (98%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn301/dcn301_hwseq.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn301/dcn301_hwseq.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn302/dcn302_hwseq.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn302/dcn302_hwseq.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn303/dcn303_hwseq.c (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn303/dcn303_hwseq.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn31/dcn31_hwseq.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn31/dcn31_hwseq.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn314/dcn314_hwseq.c (99%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn314/dcn314_hwseq.h (100%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn32/dcn32_hwseq.c (94%) + rename drivers/gpu/drm/amd/display/dc/{ => hwss}/dcn32/dcn32_hwseq.h (94%) + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/hwss/dcn35/dcn35_hwseq.h + rename drivers/gpu/drm/amd/display/dc/{inc => hwss}/hw_sequencer.h (93%) + rename drivers/gpu/drm/amd/display/dc/{inc => hwss}/hw_sequencer_private.h (98%) + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/pg_cntl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn35/irq_service_dcn35.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn35/irq_service_dcn35.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/link/accessories/link_fpga.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_5_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_5_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_3_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_3_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_12_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_12_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_5_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_5_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vpe/vpe_6_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vpe/vpe_6_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/vpe/irqsrcs_vpe_6_1.h + create mode 100644 drivers/gpu/drm/amd/include/umsch_mm_4_0_api_def.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0_0.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v14_0_0_pmfw.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v14_0_0_ppsmc.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/inc/smu_v14_0.h + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu14/Makefile + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c + create mode 100644 drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.h +$ git reset --hard HEAD^ +HEAD is now at 2b1e61ae8b97 Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc +Merging next-20231009 version of amdgpu +$ git merge -m next-20231009/amdgpu c8e7df374ba2ce715ed7f3ceba34efdbfffcb0a9 +Auto-merging Documentation/gpu/amdgpu/driver-misc.rst +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_device.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_display.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c +Auto-merging drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c +Auto-merging drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/psp_v13_0.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc15.c +Auto-merging drivers/gpu/drm/amd/amdgpu/soc21.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_crat.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_crat.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_device_queue_manager.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_priv.h +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_svm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_svm.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_topology.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdkfd/kfd_topology.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c +Auto-merging drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c +Auto-merging drivers/gpu/drm/amd/display/dc/Makefile +Auto-merging drivers/gpu/drm/amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c +Auto-merging drivers/gpu/drm/amd/display/dc/core/dc.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/core/dc.c +Auto-merging drivers/gpu/drm/amd/display/dc/dc.h +Auto-merging drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h +Auto-merging drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn301/dcn301_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn314/dcn314_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c +Auto-merging drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c +Auto-merging drivers/gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c +Auto-merging drivers/gpu/drm/amd/display/dc/inc/core_types.h +Auto-merging drivers/gpu/drm/amd/display/dc/link/link_factory.c +Auto-merging drivers/gpu/drm/amd/include/amd_shared.h +Auto-merging drivers/gpu/drm/amd/include/kgd_kfd_interface.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/include/kgd_kfd_interface.h +Auto-merging drivers/gpu/drm/amd/pm/amdgpu_pm.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/amdgpu_pm.c +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h +Auto-merging drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.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/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_device.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdgpu/psp_v13_0.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_crat.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_svm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/amdkfd/kfd_topology.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c' using previous resolution. +Recorded preimage for 'drivers/gpu/drm/amd/display/dc/core/dc.c' +Resolved 'drivers/gpu/drm/amd/display/dc/dce110/dce110_hw_sequencer.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/display/dc/dcn32/dcn32_resource.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/include/kgd_kfd_interface.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/amdgpu_pm.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c' using previous resolution. +Resolved 'drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpu/drm/amd/display/dc/core/dc.c'. +[master 26abd32a4148] next-20231009/amdgpu +$ git diff -M --stat --summary HEAD^.. + Documentation/gpu/amdgpu/driver-misc.rst | 6 + + Documentation/gpu/amdgpu/thermal.rst | 30 + + drivers/gpu/drm/amd/amdgpu/Makefile | 22 +- + drivers/gpu/drm/amd/amdgpu/aldebaran.c | 39 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 69 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v11.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gfx_v9.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 43 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.c | 17 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_bo_list.h | 18 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_connectors.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ctx.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 362 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 174 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_display.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell.h | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_doorbell_mgr.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 86 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_fdinfo.c | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_fence.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gem.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.h | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.c | 207 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gmc.h | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ids.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ih.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_irq.c | 45 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_kms.c | 193 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.c | 186 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mca.h | 61 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 11 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_mode.h | 4 + + drivers/gpu/drm/amd/amdgpu/amdgpu_nbio.h | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_object.c | 32 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 66 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 57 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ras_eeprom.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_res_cursor.h | 1 - + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.c | 12 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_reset.h | 16 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ring.h | 5 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_sdma.c | 9 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_smuio.h | 7 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ttm.c | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.c | 84 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_ucode.h | 36 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.h | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c | 873 + + drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.h | 218 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.c | 22 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vcn.h | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_virt.c | 4 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 58 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 31 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm_pt.c | 10 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c | 673 + + drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h | 91 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.c | 28 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_xcp.h | 1 + + drivers/gpu/drm/amd/amdgpu/amdgpu_xgmi.c | 27 +- + drivers/gpu/drm/amd/amdgpu/aqua_vanjaram.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v1_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v2_1.c | 2 +- + drivers/gpu/drm/amd/amdgpu/athub_v3_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/atom.c | 19 +- + drivers/gpu/drm/amd/amdgpu/atombios_encoders.c | 1 - + drivers/gpu/drm/amd/amdgpu/cik_sdma.c | 11 +- + drivers/gpu/drm/amd/amdgpu/dce_v10_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v11_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/dce_v8_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 132 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 71 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_0.c | 89 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_2.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gfx_v9_4_3.c | 48 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.c | 516 + + .../link_fpga.h => amdgpu/gfxhub_v11_5_0.h} | 15 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v1_2.c | 13 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_0.c | 3 + + drivers/gpu/drm/amd/amdgpu/gfxhub_v2_1.c | 4 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gfxhub_v3_0_3.c | 3 +- + drivers/gpu/drm/amd/amdgpu/gmc_v10_0.c | 302 +- + drivers/gpu/drm/amd/amdgpu/gmc_v11_0.c | 208 +- + drivers/gpu/drm/amd/amdgpu/gmc_v6_0.c | 6 +- + drivers/gpu/drm/amd/amdgpu/gmc_v7_0.c | 32 +- + drivers/gpu/drm/amd/amdgpu/gmc_v8_0.c | 33 +- + drivers/gpu/drm/amd/amdgpu/gmc_v9_0.c | 361 +- + drivers/gpu/drm/amd/amdgpu/hdp_v4_0.c | 18 +- + drivers/gpu/drm/amd/amdgpu/hdp_v6_0.c | 20 +- + drivers/gpu/drm/amd/amdgpu/ih_v6_0.c | 4 - + drivers/gpu/drm/amd/amdgpu/imu_v11_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v2_5.c | 4 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v3_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_3.c | 5 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c | 622 + + drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.h | 35 + + drivers/gpu/drm/amd/amdgpu/mes_v10_1.c | 10 +- + drivers/gpu/drm/amd/amdgpu/mes_v11_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_0.c | 12 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0.c | 5 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_1.c | 5 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_0_2.c | 3 +- + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c | 589 + + drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.h | 29 + + drivers/gpu/drm/amd/amdgpu/mmsch_v4_0.h | 12 +- + drivers/gpu/drm/amd/amdgpu/mxgpu_ai.h | 6 +- + drivers/gpu/drm/amd/amdgpu/navi10_ih.c | 8 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 2 +- + drivers/gpu/drm/amd/amdgpu/nbio_v4_3.c | 6 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c | 296 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_11.h | 33 + + drivers/gpu/drm/amd/amdgpu/nbio_v7_2.c | 10 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_4.c | 4 +- + drivers/gpu/drm/amd/amdgpu/nbio_v7_9.c | 3 - + drivers/gpu/drm/amd/amdgpu/nv.c | 10 +- + drivers/gpu/drm/amd/amdgpu/psp_gfx_if.h | 3 + + drivers/gpu/drm/amd/amdgpu/psp_v10_0.c | 7 +- + drivers/gpu/drm/amd/amdgpu/psp_v11_0.c | 2 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0_4.c | 2 +- + drivers/gpu/drm/amd/amdgpu/sdma_v2_4.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v3_0.c | 11 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_0.c | 52 +- + drivers/gpu/drm/amd/amdgpu/sdma_v4_4_2.c | 19 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_0.c | 15 +- + drivers/gpu/drm/amd/amdgpu/sdma_v5_2.c | 20 +- + drivers/gpu/drm/amd/amdgpu/sdma_v6_0.c | 22 +- + drivers/gpu/drm/amd/amdgpu/sienna_cichlid.c | 22 +- + drivers/gpu/drm/amd/amdgpu/smu_v13_0_10.c | 19 +- + drivers/gpu/drm/amd/amdgpu/smuio_v13_0.c | 22 + + drivers/gpu/drm/amd/amdgpu/smuio_v13_0_3.c | 6 + + drivers/gpu/drm/amd/amdgpu/soc15.c | 28 +- + drivers/gpu/drm/amd/amdgpu/soc21.c | 26 +- + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 367 + + drivers/gpu/drm/amd/amdgpu/umc_v12_0.h | 127 + + drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c | 409 + + drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.h | 30 + + drivers/gpu/drm/amd/amdgpu/vcn_v2_5.c | 9 +- + drivers/gpu/drm/amd/amdgpu/vcn_v3_0.c | 14 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0.c | 9 +- + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c | 1779 + + drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.h | 35 + + drivers/gpu/drm/amd/amdgpu/vega20_ih.c | 14 +- + drivers/gpu/drm/amd/amdgpu/vpe_6_1_fw_if.h | 217 + + drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c | 289 + + drivers/gpu/drm/amd/amdgpu/vpe_v6_1.h | 29 + + drivers/gpu/drm/amd/amdkfd/kfd_chardev.c | 24 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 31 +- + drivers/gpu/drm/amd/amdkfd/kfd_device.c | 19 +- + .../gpu/drm/amd/amdkfd/kfd_device_queue_manager.c | 126 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v10.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v11.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_int_process_v9.c | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.c | 156 +- + drivers/gpu/drm/amd/amdkfd/kfd_migrate.h | 6 +- + drivers/gpu/drm/amd/amdkfd/kfd_mqd_manager.c | 28 +- + drivers/gpu/drm/amd/amdkfd/kfd_packet_manager_v9.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_priv.h | 4 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.c | 217 +- + drivers/gpu/drm/amd/amdkfd/kfd_svm.h | 12 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 44 +- + drivers/gpu/drm/amd/display/amdgpu_dm/Makefile | 14 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.c | 722 +- + drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm.h | 14 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_crc.c | 3 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_debugfs.c | 58 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_hdcp.c | 1 + + .../drm/amd/display/amdgpu_dm/amdgpu_dm_helpers.c | 69 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_irq.c | 22 +- + .../amd/display/amdgpu_dm/amdgpu_dm_mst_types.c | 30 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_plane.c | 19 +- + .../drm/amd/display/amdgpu_dm/amdgpu_dm_replay.c | 4 +- + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c | 215 + + .../gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h | 36 + + drivers/gpu/drm/amd/display/amdgpu_dm/dc_fpu.c | 52 +- + drivers/gpu/drm/amd/display/dc/Makefile | 1 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser.c | 3 + + drivers/gpu/drm/amd/display/dc/bios/bios_parser2.c | 46 +- + .../amd/display/dc/bios/command_table_helper2.c | 1 + + drivers/gpu/drm/amd/display/dc/clk_mgr/Makefile | 8 + + drivers/gpu/drm/amd/display/dc/clk_mgr/clk_mgr.c | 18 + + .../amd/display/dc/clk_mgr/dcn201/dcn201_clk_mgr.c | 2 - + .../gpu/drm/amd/display/dc/clk_mgr/dcn32/dalsmc.h | 11 +- + .../amd/display/dc/clk_mgr/dcn32/dcn32_clk_mgr.c | 64 + + .../dc/clk_mgr/dcn32/dcn32_clk_mgr_smu_msg.c | 154 +- + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c | 1063 + + .../amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.h | 63 + + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c | 471 + + .../drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h | 183 + + drivers/gpu/drm/amd/display/dc/core/dc.c | 495 +- + drivers/gpu/drm/amd/display/dc/core/dc_debug.c | 2 + + .../gpu/drm/amd/display/dc/core/dc_hw_sequencer.c | 23 + + drivers/gpu/drm/amd/display/dc/core/dc_resource.c | 1534 +- + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 99 +- + drivers/gpu/drm/amd/display/dc/dc.h | 83 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.c | 138 +- + drivers/gpu/drm/amd/display/dc/dc_dmub_srv.h | 4 + + drivers/gpu/drm/amd/display/dc/dc_dp_types.h | 59 +- + drivers/gpu/drm/amd/display/dc/dc_helper.c | 7 + + drivers/gpu/drm/amd/display/dc/dc_hw_types.h | 7 - + drivers/gpu/drm/amd/display/dc/dc_stream.h | 13 +- + drivers/gpu/drm/amd/display/dc/dc_types.h | 16 +- + drivers/gpu/drm/amd/display/dc/dce/dce_abm.h | 9 +- + drivers/gpu/drm/amd/display/dc/dce/dce_audio.c | 4 + + .../gpu/drm/amd/display/dc/dce/dce_clock_source.c | 7 +- + drivers/gpu/drm/amd/display/dc/dce/dce_hwseq.h | 20 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.c | 4 + + drivers/gpu/drm/amd/display/dc/dce/dce_i2c_hw.h | 6 + + drivers/gpu/drm/amd/display/dc/dce/dmub_psr.c | 10 +- + .../amd/display/dc/dce110/dce110_hw_sequencer.c | 30 +- + .../gpu/drm/amd/display/dc/dcn10/dcn10_hubbub.h | 12 +- + .../drm/amd/display/dc/dcn10/dcn10_hw_sequencer.c | 21 +- + .../drm/amd/display/dc/dcn10/dcn10_link_encoder.h | 33 + + drivers/gpu/drm/amd/display/dc/dcn10/dcn10_optc.h | 30 + + .../amd/display/dc/dcn10/dcn10_stream_encoder.h | 24 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_dccg.h | 64 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hubp.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.c | 168 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_hwseq.h | 11 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_init.c | 3 - + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.c | 22 +- + .../gpu/drm/amd/display/dc/dcn20/dcn20_resource.h | 4 +- + drivers/gpu/drm/amd/display/dc/dcn20/dcn20_vmid.c | 3 + + .../drm/amd/display/dc/dcn201/dcn201_resource.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_hubp.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn21/dcn21_init.c | 3 - + .../gpu/drm/amd/display/dc/dcn21/dcn21_resource.c | 1 + + .../gpu/drm/amd/display/dc/dcn30/dcn30_cm_common.c | 104 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.c | 23 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dwb.h | 4 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_dwb_cm.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.c | 41 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hwseq.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_init.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.c | 17 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_mpc.h | 1 - + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_optc.c | 2 +- + .../gpu/drm/amd/display/dc/dcn30/dcn30_resource.c | 3 + + .../gpu/drm/amd/display/dc/dcn301/dcn301_init.c | 2 +- + .../drm/amd/display/dc/dcn301/dcn301_resource.c | 3 + + .../drm/amd/display/dc/dcn302/dcn302_resource.c | 3 + + .../drm/amd/display/dc/dcn303/dcn303_resource.c | 3 + + .../display/dc/dcn31/dcn31_hpo_dp_link_encoder.h | 10 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_hubbub.c | 32 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.c | 6 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hubp.h | 3 + + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_hwseq.c | 3 +- + drivers/gpu/drm/amd/display/dc/dcn31/dcn31_init.c | 2 +- + .../gpu/drm/amd/display/dc/dcn31/dcn31_resource.c | 3 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.c | 3 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_dccg.h | 6 + + .../display/dc/dcn314/dcn314_dio_stream_encoder.c | 22 +- + .../display/dc/dcn314/dcn314_dio_stream_encoder.h | 40 + + .../gpu/drm/amd/display/dc/dcn314/dcn314_hwseq.c | 5 +- + .../gpu/drm/amd/display/dc/dcn314/dcn314_init.c | 2 +- + .../drm/amd/display/dc/dcn314/dcn314_resource.c | 5 + + .../drm/amd/display/dc/dcn315/dcn315_resource.c | 5 +- + .../drm/amd/display/dc/dcn316/dcn316_resource.c | 1 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_dccg.c | 1 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.c | 14 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_hubbub.h | 6 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.c | 109 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_hwseq.h | 9 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_init.c | 4 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_mmhubbub.h | 4 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.h | 2 - + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.c | 27 +- + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_optc.h | 3 + + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.c | 105 +- + .../gpu/drm/amd/display/dc/dcn32/dcn32_resource.h | 15 +- + .../amd/display/dc/dcn32/dcn32_resource_helpers.c | 50 +- + .../drm/amd/display/dc/dcn321/dcn321_resource.c | 2 + + drivers/gpu/drm/amd/display/dc/dcn35/Makefile | 20 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c | 796 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.h | 190 + + .../amd/display/dc/dcn35/dcn35_dio_link_encoder.c | 267 + + .../amd/display/dc/dcn35/dcn35_dio_link_encoder.h | 137 + + .../display/dc/dcn35/dcn35_dio_stream_encoder.c | 528 + + .../display/dc/dcn35/dcn35_dio_stream_encoder.h | 326 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.c | 51 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.h | 55 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.c | 58 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.h | 57 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.c | 58 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.h | 59 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c | 609 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.h | 153 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.c | 104 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.h | 59 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.c | 1205 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.h | 85 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.c | 169 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.h | 32 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.c | 57 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.h | 73 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.c | 51 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.h | 65 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.c | 288 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.h | 72 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.c | 538 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.h | 193 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_resource.c | 2111 + + .../gpu/drm/amd/display/dc/dcn35/dcn35_resource.h | 308 + + drivers/gpu/drm/amd/display/dc/dml/Makefile | 3 + + .../gpu/drm/amd/display/dc/dml/dcn20/dcn20_fpu.c | 8 +- + .../display/dc/dml/dcn314/display_mode_vba_314.c | 2 + + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.c | 732 +- + .../gpu/drm/amd/display/dc/dml/dcn32/dcn32_fpu.h | 3 - + .../dc/dml/dcn32/display_mode_vba_util_32.c | 4 - + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c | 531 + + .../gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.h | 44 + + drivers/gpu/drm/amd/display/dc/gpio/hw_factory.c | 1 + + drivers/gpu/drm/amd/display/dc/gpio/hw_translate.c | 1 + + drivers/gpu/drm/amd/display/dc/inc/core_types.h | 25 + + drivers/gpu/drm/amd/display/dc/inc/hw/clk_mgr.h | 10 +- + .../drm/amd/display/dc/inc/hw/clk_mgr_internal.h | 18 +- + drivers/gpu/drm/amd/display/dc/inc/hw/dccg.h | 14 + + drivers/gpu/drm/amd/display/dc/inc/hw/dchubbub.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw/dwb.h | 4 + + drivers/gpu/drm/amd/display/dc/inc/hw/mpc.h | 6 + + drivers/gpu/drm/amd/display/dc/inc/hw/pg_cntl.h | 52 + + .../gpu/drm/amd/display/dc/inc/hw/stream_encoder.h | 5 + + .../drm/amd/display/dc/inc/hw/timing_generator.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/hw_sequencer.h | 77 +- + .../drm/amd/display/dc/inc/hw_sequencer_private.h | 2 + + drivers/gpu/drm/amd/display/dc/inc/link.h | 1 + + drivers/gpu/drm/amd/display/dc/inc/resource.h | 284 +- + drivers/gpu/drm/amd/display/dc/irq/Makefile | 9 + + .../amd/display/dc/irq/dce110/irq_service_dce110.c | 12 +- + .../amd/display/dc/irq/dce120/irq_service_dce120.c | 12 +- + .../amd/display/dc/irq/dce60/irq_service_dce60.c | 12 +- + .../amd/display/dc/irq/dce80/irq_service_dce80.c | 12 +- + .../amd/display/dc/irq/dcn10/irq_service_dcn10.c | 14 +- + .../amd/display/dc/irq/dcn20/irq_service_dcn20.c | 14 +- + .../amd/display/dc/irq/dcn201/irq_service_dcn201.c | 14 +- + .../amd/display/dc/irq/dcn21/irq_service_dcn21.c | 16 +- + .../amd/display/dc/irq/dcn30/irq_service_dcn30.c | 16 +- + .../amd/display/dc/irq/dcn302/irq_service_dcn302.c | 16 +- + .../amd/display/dc/irq/dcn303/irq_service_dcn303.c | 14 +- + .../amd/display/dc/irq/dcn31/irq_service_dcn31.c | 16 +- + .../amd/display/dc/irq/dcn314/irq_service_dcn314.c | 16 +- + .../amd/display/dc/irq/dcn315/irq_service_dcn315.c | 16 +- + .../amd/display/dc/irq/dcn32/irq_service_dcn32.c | 16 +- + .../amd/display/dc/irq/dcn35/irq_service_dcn35.c | 427 + + .../amd/display/dc/irq/dcn35/irq_service_dcn35.h | 34 + + drivers/gpu/drm/amd/display/dc/irq/irq_service.h | 2 +- + drivers/gpu/drm/amd/display/dc/link/Makefile | 4 +- + .../amd/display/dc/link/accessories/link_fpga.c | 95 - + .../drm/amd/display/dc/link/hwss/link_hwss_dpia.c | 2 + + .../gpu/drm/amd/display/dc/link/link_detection.c | 9 + + drivers/gpu/drm/amd/display/dc/link/link_dpms.c | 61 +- + drivers/gpu/drm/amd/display/dc/link/link_factory.c | 4 +- + .../drm/amd/display/dc/link/protocols/link_ddc.c | 2 + + .../display/dc/link/protocols/link_dp_capability.c | 14 +- + .../dc/link/protocols/link_dp_irq_handler.c | 2 + + .../amd/display/dc/link/protocols/link_dp_phy.c | 3 +- + .../dc/link/protocols/link_edp_panel_control.c | 52 +- + .../dc/link/protocols/link_edp_panel_control.h | 3 + + drivers/gpu/drm/amd/display/dc/os_types.h | 1 + + drivers/gpu/drm/amd/display/dmub/dmub_srv.h | 52 +- + drivers/gpu/drm/amd/display/dmub/inc/dmub_cmd.h | 219 +- + drivers/gpu/drm/amd/display/dmub/src/Makefile | 1 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.c | 62 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn32.h | 17 +- + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c | 552 + + drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.h | 282 + + drivers/gpu/drm/amd/display/dmub/src/dmub_srv.c | 95 +- + drivers/gpu/drm/amd/display/include/dal_types.h | 2 + + .../drm/amd/display/include/ddc_service_types.h | 1 + + drivers/gpu/drm/amd/display/include/logger_types.h | 143 +- + .../drm/amd/display/modules/color/color_gamma.c | 115 +- + .../gpu/drm/amd/display/modules/inc/mod_stats.h | 2 +- + .../drm/amd/display/modules/power/power_helpers.c | 20 +- + drivers/gpu/drm/amd/include/amd_shared.h | 4 + + .../amd/include/asic_reg/dcn/dcn_3_5_0_offset.h | 15255 +++++ + .../amd/include/asic_reg/dcn/dcn_3_5_0_sh_mask.h | 53412 +++++++++++++++++ + .../drm/amd/include/asic_reg/gc/gc_11_5_0_offset.h | 10000 ++++ + .../amd/include/asic_reg/gc/gc_11_5_0_sh_mask.h | 36531 ++++++++++++ + .../include/asic_reg/mmhub/mmhub_3_3_0_offset.h | 1395 + + .../include/asic_reg/mmhub/mmhub_3_3_0_sh_mask.h | 6722 +++ + .../amd/include/asic_reg/mp/mp_13_0_6_sh_mask.h | 28 + + .../drm/amd/include/asic_reg/mp/mp_14_0_0_offset.h | 359 + + .../amd/include/asic_reg/mp/mp_14_0_0_sh_mask.h | 534 + + .../amd/include/asic_reg/nbio/nbio_7_11_0_offset.h | 9391 +++ + .../include/asic_reg/nbio/nbio_7_11_0_sh_mask.h | 57846 +++++++++++++++++++ + .../amd/include/asic_reg/umc/umc_12_0_0_offset.h | 33 + + .../amd/include/asic_reg/umc/umc_12_0_0_sh_mask.h | 95 + + .../amd/include/asic_reg/vcn/vcn_4_0_0_offset.h | 422 + + .../amd/include/asic_reg/vcn/vcn_4_0_0_sh_mask.h | 882 + + .../amd/include/asic_reg/vcn/vcn_4_0_5_offset.h | 1797 + + .../amd/include/asic_reg/vcn/vcn_4_0_5_sh_mask.h | 8614 +++ + .../amd/include/asic_reg/vpe/vpe_6_1_0_offset.h | 1553 + + .../amd/include/asic_reg/vpe/vpe_6_1_0_sh_mask.h | 4393 ++ + .../drm/amd/include/ivsrcid/vpe/irqsrcs_vpe_6_1.h | 40 + + drivers/gpu/drm/amd/include/kgd_kfd_interface.h | 16 +- + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 20 +- + drivers/gpu/drm/amd/include/soc15_hw_ip.h | 1 + + drivers/gpu/drm/amd/include/soc15_ih_clientid.h | 2 + + drivers/gpu/drm/amd/include/umsch_mm_4_0_api_def.h | 437 + + drivers/gpu/drm/amd/pm/amdgpu_dpm.c | 35 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 911 +- + drivers/gpu/drm/amd/pm/inc/amdgpu_dpm.h | 19 +- + drivers/gpu/drm/amd/pm/legacy-dpm/si_dpm.c | 2 +- + .../gpu/drm/amd/pm/powerplay/hwmgr/smu7_thermal.c | 4 +- + .../drm/amd/pm/powerplay/hwmgr/vega10_thermal.c | 4 +- + .../drm/amd/pm/powerplay/hwmgr/vega20_thermal.c | 4 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 117 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 13 +- + .../pm/swsmu/inc/pmfw_if/smu13_driver_if_v13_0_6.h | 91 + + .../amd/pm/swsmu/inc/pmfw_if/smu_v13_0_6_ppsmc.h | 10 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_types.h | 13 +- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 4 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/arcturus_ppt.c | 197 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/navi10_ppt.c | 50 +- + .../drm/amd/pm/swsmu/smu11/sienna_cichlid_ppt.c | 81 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/smu_v11_0.c | 36 +- + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 24 +- + drivers/gpu/drm/amd/pm/swsmu/smu12/renoir_ppt.c | 8 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/aldebaran_ppt.c | 214 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 24 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 426 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_4_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_5_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 893 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 369 +- + .../gpu/drm/amd/pm/swsmu/smu13/yellow_carp_ppt.c | 18 +- + drivers/gpu/drm/radeon/evergreen.c | 7 +- + drivers/gpu/drm/radeon/radeon.h | 4 - + drivers/gpu/drm/radeon/radeon_drv.c | 2 - + drivers/gpu/drm/radeon/radeon_fence.c | 111 +- + drivers/gpu/drm/radeon/radeon_gem.c | 16 - + drivers/gpu/drm/radeon/radeon_ttm.c | 2 - + include/uapi/drm/amdgpu_drm.h | 36 +- + include/uapi/linux/kfd_ioctl.h | 3 + + 448 files changed, 241110 insertions(+), 4706 deletions(-) + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_umsch_mm.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/amdgpu_vpe.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/gfxhub_v11_5_0.c + rename drivers/gpu/drm/amd/{display/dc/link/accessories/link_fpga.h => amdgpu/gfxhub_v11_5_0.h} (84%) + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/jpeg_v4_0_5.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/mmhub_v3_3.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_11.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/nbio_v7_11.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v12_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umc_v12_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/umsch_mm_v4_0.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vcn_v4_0_5.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vpe_6_1_fw_if.h + create mode 100644 drivers/gpu/drm/amd/amdgpu/vpe_v6_1.c + create mode 100644 drivers/gpu/drm/amd/amdgpu/vpe_v6_1.h + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.c + create mode 100644 drivers/gpu/drm/amd/display/amdgpu_dm/amdgpu_dm_wb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_clk_mgr.h + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/clk_mgr/dcn35/dcn35_smu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/Makefile + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dccg.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_link_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_stream_encoder.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dio_stream_encoder.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dpp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dsc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_dwb.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hwseq.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_init.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_mmhubbub.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_opp.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_optc.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_pg_cntl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dcn35/dcn35_resource.h + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.c + create mode 100644 drivers/gpu/drm/amd/display/dc/dml/dcn35/dcn35_fpu.h + create mode 100644 drivers/gpu/drm/amd/display/dc/inc/hw/pg_cntl.h + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn35/irq_service_dcn35.c + create mode 100644 drivers/gpu/drm/amd/display/dc/irq/dcn35/irq_service_dcn35.h + delete mode 100644 drivers/gpu/drm/amd/display/dc/link/accessories/link_fpga.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.c + create mode 100644 drivers/gpu/drm/amd/display/dmub/src/dmub_dcn35.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_5_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/dcn/dcn_3_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_5_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/gc/gc_11_5_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_3_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mmhub/mmhub_3_3_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/mp/mp_14_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/nbio/nbio_7_11_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_12_0_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/umc/umc_12_0_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_5_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vcn/vcn_4_0_5_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vpe/vpe_6_1_0_offset.h + create mode 100644 drivers/gpu/drm/amd/include/asic_reg/vpe/vpe_6_1_0_sh_mask.h + create mode 100644 drivers/gpu/drm/amd/include/ivsrcid/vpe/irqsrcs_vpe_6_1.h + create mode 100644 drivers/gpu/drm/amd/include/umsch_mm_4_0_api_def.h +Merging drm-intel/for-linux-next (34d8311f4a1c drm/i915/dsb: Re-instate DSB for LUT updates) +$ 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_display_debugfs.c +Auto-merging drivers/gpu/drm/i915/display/intel_dp.c +Auto-merging drivers/gpu/drm/i915/i915_drv.h +Merge made by the 'ort' strategy. + Documentation/gpu/i915.rst | 27 +- + drivers/gpu/drm/i915/Makefile | 49 +- + drivers/gpu/drm/i915/display/g4x_dp.h | 26 + + drivers/gpu/drm/i915/display/g4x_hdmi.h | 12 + + drivers/gpu/drm/i915/display/hsw_ips.h | 35 + + drivers/gpu/drm/i915/display/i9xx_plane.h | 23 + + drivers/gpu/drm/i915/display/i9xx_wm.h | 17 + + drivers/gpu/drm/i915/display/intel_color.c | 4 +- + drivers/gpu/drm/i915/display/intel_crt.c | 2 +- + drivers/gpu/drm/i915/display/intel_crt.h | 14 + + drivers/gpu/drm/i915/display/intel_cx0_phy.c | 10 +- + drivers/gpu/drm/i915/display/intel_cx0_phy.h | 3 +- + drivers/gpu/drm/i915/display/intel_ddi.c | 2 +- + drivers/gpu/drm/i915/display/intel_display.c | 14 +- + .../gpu/drm/i915/display/intel_display_debugfs.c | 9 +- + .../gpu/drm/i915/display/intel_display_device.c | 60 +- + .../gpu/drm/i915/display/intel_display_device.h | 10 + + drivers/gpu/drm/i915/display/intel_dmc.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp.c | 2 +- + drivers/gpu/drm/i915/display/intel_dp_mst.c | 11 +- + drivers/gpu/drm/i915/display/intel_dpio_phy.h | 96 ++ + drivers/gpu/drm/i915/display/intel_dpll.c | 3 +- + drivers/gpu/drm/i915/display/intel_dpll_mgr.c | 987 +++++++++++---------- + drivers/gpu/drm/i915/display/intel_dpll_mgr.h | 33 +- + drivers/gpu/drm/i915/display/intel_dsb.c | 18 +- + drivers/gpu/drm/i915/display/intel_dsi_vbt.c | 3 + + drivers/gpu/drm/i915/display/intel_dvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_dvo.h | 6 + + drivers/gpu/drm/i915/display/intel_fbc.c | 160 +++- + drivers/gpu/drm/i915/display/intel_frontbuffer.c | 1 + + drivers/gpu/drm/i915/display/intel_hdcp.c | 8 +- + drivers/gpu/drm/i915/display/intel_hdcp_gsc.c | 617 +------------ + drivers/gpu/drm/i915/display/intel_hdcp_gsc.h | 1 + + .../gpu/drm/i915/display/intel_hdcp_gsc_message.c | 592 ++++++++++++ + .../gpu/drm/i915/display/intel_hdcp_gsc_message.h | 72 ++ + drivers/gpu/drm/i915/display/intel_hdmi.c | 2 +- + drivers/gpu/drm/i915/display/intel_hotplug.c | 2 +- + drivers/gpu/drm/i915/display/intel_lpe_audio.h | 18 + + drivers/gpu/drm/i915/display/intel_lspcon.c | 15 +- + drivers/gpu/drm/i915/display/intel_lvds.h | 19 + + .../gpu/drm/i915/display/intel_modeset_verify.c | 134 +-- + .../gpu/drm/i915/display/intel_modeset_verify.h | 11 +- + drivers/gpu/drm/i915/display/intel_overlay.h | 35 + + drivers/gpu/drm/i915/display/intel_panel.c | 2 +- + drivers/gpu/drm/i915/display/intel_pch_display.h | 53 ++ + drivers/gpu/drm/i915/display/intel_pch_refclk.c | 7 +- + drivers/gpu/drm/i915/display/intel_pch_refclk.h | 23 + + drivers/gpu/drm/i915/display/intel_psr.c | 30 +- + drivers/gpu/drm/i915/display/intel_psr.h | 3 +- + drivers/gpu/drm/i915/display/intel_sdvo.c | 2 +- + drivers/gpu/drm/i915/display/intel_sdvo.h | 13 + + drivers/gpu/drm/i915/display/intel_snps_phy.c | 7 +- + drivers/gpu/drm/i915/display/intel_snps_phy.h | 3 +- + drivers/gpu/drm/i915/display/intel_sprite.h | 8 + + drivers/gpu/drm/i915/display/intel_tv.c | 2 +- + drivers/gpu/drm/i915/display/intel_tv.h | 6 + + drivers/gpu/drm/i915/display/intel_vga.c | 18 +- + drivers/gpu/drm/i915/display/skl_universal_plane.c | 9 +- + drivers/gpu/drm/i915/display/skl_watermark.c | 8 +- + drivers/gpu/drm/i915/display/skl_watermark.h | 4 +- + drivers/gpu/drm/i915/display/vlv_dsi.c | 130 +++ + drivers/gpu/drm/i915/display/vlv_dsi.h | 13 + + drivers/gpu/drm/i915/display/vlv_dsi_pll.h | 9 + + drivers/gpu/drm/i915/gt/intel_gt.c | 10 +- + drivers/gpu/drm/i915/gt/intel_mocs.c | 4 +- + drivers/gpu/drm/i915/gvt/gvt.h | 9 +- + drivers/gpu/drm/i915/gvt/interrupt.c | 17 + + drivers/gpu/drm/i915/gvt/interrupt.h | 31 +- + drivers/gpu/drm/i915/gvt/mmio_context.c | 8 + + drivers/gpu/drm/i915/gvt/mmio_context.h | 10 - + drivers/gpu/drm/i915/i915_driver.c | 1 + + drivers/gpu/drm/i915/i915_drv.h | 24 +- + drivers/gpu/drm/i915/i915_params.c | 5 - + drivers/gpu/drm/i915/i915_params.h | 1 - + drivers/gpu/drm/i915/i915_pmu.c | 9 +- + drivers/gpu/drm/i915/i915_reg.h | 9 + + drivers/gpu/drm/i915/intel_device_info.c | 22 - + drivers/gpu/drm/i915/intel_gvt_mmio_table.c | 3 +- + drivers/gpu/drm/i915/intel_step.c | 5 + + drivers/gpu/drm/i915/intel_step.h | 1 + + drivers/gpu/drm/i915/selftests/mock_gem_device.c | 1 - + drivers/gpu/drm/i915/soc/intel_gmch.c | 14 + + drivers/gpu/drm/i915/soc/intel_gmch.h | 2 + + include/drm/i915_pciids.h | 6 +- + include/uapi/drm/i915_drm.h | 8 +- + 85 files changed, 2293 insertions(+), 1424 deletions(-) + create mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.c + create mode 100644 drivers/gpu/drm/i915/display/intel_hdcp_gsc_message.h +Merging drm-tegra/for-next (2429b3c529da drm/tegra: Avoid potential 32-bit integer overflow) +$ git merge -m Merge branch 'for-next' of https://gitlab.freedesktop.org/drm/tegra.git drm-tegra/for-next +Already up to date. +Merging drm-msm/msm-next (d3b4075b173f drm/msm/dp: use correct lifetime device for devm_drm_bridge_add) +$ 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/adreno_device.c +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h +Auto-merging drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c +Auto-merging drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c +Auto-merging drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c +Auto-merging drivers/gpu/drm/msm/dp/dp_display.c +Auto-merging drivers/gpu/drm/msm/dsi/dsi.c +Auto-merging drivers/gpu/drm/msm/hdmi/hdmi.c +Auto-merging drivers/gpu/drm/msm/msm_drv.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/msm/msm_drv.c +Auto-merging drivers/gpu/drm/msm/msm_drv.h +Resolved 'drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h' using previous resolution. +Resolved 'drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c' using previous resolution. +Resolved 'drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c' using previous resolution. +Resolved 'drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c' using previous resolution. +Resolved 'drivers/gpu/drm/msm/msm_drv.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master ec1b612ce02b] Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/msm/dp-controller.yaml | 1 + + .../devicetree/bindings/display/msm/gmu.yaml | 47 +- + .../devicetree/bindings/display/msm/gpu.yaml | 4 +- + .../bindings/display/msm/qcom,msm8998-mdss.yaml | 6 + + .../bindings/display/msm/qcom,qcm2290-mdss.yaml | 6 + + .../bindings/display/msm/qcom,sc7180-mdss.yaml | 8 + + .../bindings/display/msm/qcom,sc7280-mdss.yaml | 10 + + .../bindings/display/msm/qcom,sc8280xp-mdss.yaml | 4 + + .../bindings/display/msm/qcom,sdm845-mdss.yaml | 8 + + .../bindings/display/msm/qcom,sm6115-mdss.yaml | 6 + + .../bindings/display/msm/qcom,sm6125-mdss.yaml | 6 + + .../bindings/display/msm/qcom,sm6350-mdss.yaml | 6 + + .../bindings/display/msm/qcom,sm6375-mdss.yaml | 6 + + .../bindings/display/msm/qcom,sm8150-mdss.yaml | 6 + + .../bindings/display/msm/qcom,sm8250-mdss.yaml | 6 + + .../bindings/display/msm/qcom,sm8350-mdss.yaml | 8 + + .../bindings/display/msm/qcom,sm8450-mdss.yaml | 8 + + .../bindings/display/msm/qcom,sm8550-mdss.yaml | 8 + + drivers/gpu/drm/msm/Makefile | 1 + + drivers/gpu/drm/msm/adreno/a6xx.xml.h | 9 + + drivers/gpu/drm/msm/adreno/a6xx_gmu.c | 199 +++++-- + drivers/gpu/drm/msm/adreno/a6xx_gmu.h | 3 + + drivers/gpu/drm/msm/adreno/a6xx_gmu.xml.h | 8 + + drivers/gpu/drm/msm/adreno/a6xx_gpu.c | 663 +++++++++++++++++++-- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.c | 52 +- + drivers/gpu/drm/msm/adreno/a6xx_gpu_state.h | 61 +- + drivers/gpu/drm/msm/adreno/a6xx_hfi.c | 88 +++ + drivers/gpu/drm/msm/adreno/adreno_device.c | 34 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.c | 7 +- + drivers/gpu/drm/msm/adreno/adreno_gpu.h | 32 +- + .../drm/msm/disp/dpu1/catalog/dpu_3_0_msm8998.h | 4 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_4_0_sdm845.h | 4 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_0_sm8150.h | 8 - + .../drm/msm/disp/dpu1/catalog/dpu_5_1_sc8180x.h | 10 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_5_4_sm6125.h | 3 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_0_sm8250.h | 8 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_2_sc7180.h | 3 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_3_sm6115.h | 1 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_4_sm6350.h | 3 - + .../drm/msm/disp/dpu1/catalog/dpu_6_5_qcm2290.h | 1 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_6_9_sm6375.h | 1 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_0_sm8350.h | 8 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_7_2_sc7280.h | 6 - + .../drm/msm/disp/dpu1/catalog/dpu_8_0_sc8280xp.h | 13 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_8_1_sm8450.h | 12 - + .../gpu/drm/msm/disp/dpu1/catalog/dpu_9_0_sm8550.h | 12 - + drivers/gpu/drm/msm/disp/dpu1/dpu_core_irq.h | 8 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_crtc.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder.c | 55 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_encoder_phys.h | 6 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_cmd.c | 62 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_vid.c | 4 +- + .../gpu/drm/msm/disp/dpu1/dpu_encoder_phys_wb.c | 16 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.c | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_catalog.h | 20 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.c | 160 +++-- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_interrupts.h | 20 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.c | 58 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_intf.h | 1 + + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.c | 43 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_hw_pingpong.h | 3 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_kms.c | 139 ++--- + drivers/gpu/drm/msm/disp/dpu1/dpu_rm.c | 2 +- + drivers/gpu/drm/msm/disp/dpu1/dpu_trace.h | 72 ++- + drivers/gpu/drm/msm/disp/mdp4/mdp4_kms.c | 112 ++-- + drivers/gpu/drm/msm/disp/mdp5/mdp5_kms.c | 106 ++-- + drivers/gpu/drm/msm/disp/mdp5/mdp5_smp.c | 2 +- + drivers/gpu/drm/msm/dp/dp_display.c | 60 +- + drivers/gpu/drm/msm/dp/dp_display.h | 1 + + drivers/gpu/drm/msm/dp/dp_drm.c | 21 +- + drivers/gpu/drm/msm/dp/dp_drm.h | 2 +- + drivers/gpu/drm/msm/dp/dp_link.c | 38 +- + drivers/gpu/drm/msm/dp/dp_panel.c | 132 +--- + drivers/gpu/drm/msm/dp/dp_panel.h | 11 +- + drivers/gpu/drm/msm/dsi/dsi.c | 33 +- + drivers/gpu/drm/msm/dsi/dsi.h | 4 +- + drivers/gpu/drm/msm/dsi/dsi.xml.h | 1 + + drivers/gpu/drm/msm/dsi/dsi_host.c | 31 +- + drivers/gpu/drm/msm/dsi/dsi_manager.c | 30 +- + drivers/gpu/drm/msm/hdmi/hdmi.c | 22 +- + drivers/gpu/drm/msm/hdmi/hdmi.h | 5 +- + drivers/gpu/drm/msm/hdmi/hdmi_bridge.c | 30 +- + drivers/gpu/drm/msm/hdmi/hdmi_hpd.c | 3 +- + drivers/gpu/drm/msm/msm_debugfs.c | 12 +- + drivers/gpu/drm/msm/msm_drv.c | 365 +----------- + drivers/gpu/drm/msm/msm_drv.h | 17 +- + drivers/gpu/drm/msm/msm_kms.c | 345 +++++++++++ + drivers/gpu/drm/msm/msm_kms.h | 3 + + drivers/gpu/drm/msm/msm_ringbuffer.h | 2 + + 89 files changed, 2165 insertions(+), 1305 deletions(-) + create mode 100644 drivers/gpu/drm/msm/msm_kms.c +Merging drm-msm-lumag/msm-next-lumag (d3b4075b173f drm/msm/dp: use correct lifetime device for devm_drm_bridge_add) +$ 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 etnaviv/etnaviv/next (925b10728f20 drm/etnaviv: disable MLCG and pulse eater on GPU reset) +$ 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.c | 95 ++++++++++++++++++++----------- + drivers/gpu/drm/etnaviv/etnaviv_gem.c | 12 ++-- + drivers/gpu/drm/etnaviv/etnaviv_gpu.c | 13 ++++- + drivers/gpu/drm/etnaviv/etnaviv_mmu.c | 4 +- + drivers/gpu/drm/etnaviv/etnaviv_perfmon.c | 4 +- + 5 files changed, 84 insertions(+), 44 deletions(-) +Merging fbdev/for-next (c1a8d1d0edb7 fbdev: atyfb: only use ioremap_uc() on i386 and ia64) +$ 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/aty/atyfb_base.c | 4 ++++ + drivers/video/fbdev/mmp/hw/mmp_ctrl.h | 2 +- + include/video/mmp_disp.h | 2 +- + 3 files changed, 6 insertions(+), 2 deletions(-) +Merging regmap/for-next (7b4d73072bcc Merge remote-tracking branch 'regmap/for-6.7' into regmap-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Merge made by the 'ort' strategy. + drivers/base/regmap/regmap-debugfs.c | 2 +- + drivers/base/regmap/regmap.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging sound/for-next (2b17b489e47a ALSA: scarlett2: Add Focusrite Clarett 2Pre and 4Pre USB support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Auto-merging MAINTAINERS +Auto-merging sound/pci/hda/cs35l41_hda.c +Auto-merging sound/pci/hda/cs35l56_hda.c +Auto-merging sound/pci/hda/hda_intel.c +Auto-merging sound/pci/hda/patch_realtek.c +Auto-merging sound/usb/mixer_scarlett_gen2.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + include/sound/hda_register.h | 2 + + include/sound/hdaudio.h | 5 +- + include/sound/hdaudio_ext.h | 3 + + sound/aoa/aoa-gpio.h | 1 - + sound/aoa/aoa.h | 1 - + sound/aoa/codecs/onyx.c | 1 + + sound/aoa/codecs/onyx.h | 1 - + sound/aoa/codecs/tas.c | 2 +- + sound/aoa/fabrics/layout.c | 3 +- + sound/aoa/soundbus/core.c | 2 + + sound/aoa/soundbus/i2sbus/control.c | 1 - + sound/aoa/soundbus/i2sbus/core.c | 1 + + sound/aoa/soundbus/i2sbus/i2sbus.h | 1 - + sound/aoa/soundbus/soundbus.h | 2 +- + sound/drivers/aloop.c | 76 +++++- + sound/hda/ext/hdac_ext_stream.c | 43 ++++ + sound/hda/hdac_stream.c | 23 +- + sound/pci/hda/Kconfig | 18 ++ + sound/pci/hda/Makefile | 4 + + sound/pci/hda/cirrus_scodec.c | 73 ++++++ + sound/pci/hda/cirrus_scodec.h | 13 ++ + sound/pci/hda/cirrus_scodec_test.c | 370 ++++++++++++++++++++++++++++++ + sound/pci/hda/cs35l41_hda.c | 132 +++++++++-- + sound/pci/hda/cs35l41_hda.h | 3 + + sound/pci/hda/cs35l56_hda.c | 24 +- + sound/pci/hda/hda_codec.c | 2 +- + sound/pci/hda/hda_component.h | 4 + + sound/pci/hda/hda_controller.c | 2 +- + sound/pci/hda/hda_intel.c | 2 +- + sound/pci/hda/patch_realtek.c | 83 ++++++- + sound/pci/intel8x0m.c | 2 +- + sound/soc/intel/avs/pcm.c | 2 +- + sound/soc/intel/avs/probes.c | 2 +- + sound/soc/intel/skylake/skl-pcm.c | 14 +- + sound/usb/mixer_quirks.c | 5 + + sound/usb/mixer_scarlett_gen2.c | 251 ++++++++++++++------ + sound/usb/usx2y/usbusx2y.h | 2 +- + sound/usb/usx2y/usbusx2yaudio.c | 2 +- + tools/testing/selftests/alsa/alsa-local.h | 10 + + tools/testing/selftests/alsa/conf.c | 100 ++++---- + tools/testing/selftests/alsa/pcm-test.c | 10 + + 42 files changed, 1130 insertions(+), 169 deletions(-) + create mode 100644 sound/pci/hda/cirrus_scodec.c + create mode 100644 sound/pci/hda/cirrus_scodec.h + create mode 100644 sound/pci/hda/cirrus_scodec_test.c +Merging ieee1394/for-next (a464d2f75fa1 firewire: Annotate struct fw_node with __counted_by) +$ git merge -m Merge branch 'for-next' of https://git.kernel.org/pub/scm/linux/kernel/git/ieee1394/linux1394.git ieee1394/for-next +Merge made by the 'ort' strategy. + drivers/firewire/core.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging sound-asoc/for-next (e38ab5e537b0 Merge remote-tracking branch 'asoc/for-6.7' 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 MAINTAINERS +Auto-merging sound/pci/hda/cs35l41_hda.c +CONFLICT (content): Merge conflict in sound/pci/hda/cs35l41_hda.c +Auto-merging sound/soc/intel/avs/pcm.c +Auto-merging sound/soc/intel/skylake/skl-pcm.c +Auto-merging sound/soc/ti/ams-delta.c +Resolved 'sound/pci/hda/cs35l41_hda.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 018e1e44855a] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/sound/audio-graph-port.yaml | 20 +- + .../devicetree/bindings/sound/audio-graph.yaml | 9 +- + .../devicetree/bindings/sound/awinic,aw87390.yaml | 58 ++ + .../devicetree/bindings/sound/awinic,aw88395.yaml | 32 +- + .../devicetree/bindings/sound/cirrus,cs42l43.yaml | 4 +- + .../devicetree/bindings/sound/dai-params.yaml | 11 +- + .../devicetree/bindings/sound/dialog,da7219.yaml | 1 + + .../devicetree/bindings/sound/fsl,qmc-audio.yaml | 1 + + .../bindings/sound/mediatek,mt8188-mt6359.yaml | 1 + + .../devicetree/bindings/sound/nxp,tfa9879.yaml | 44 ++ + .../devicetree/bindings/sound/pcm512x.txt | 9 +- + .../bindings/sound/qcom,lpass-tx-macro.yaml | 18 + + .../devicetree/bindings/sound/realtek,rt5616.yaml | 49 ++ + .../devicetree/bindings/sound/richtek,rtq9128.yaml | 61 ++ + Documentation/devicetree/bindings/sound/rt5616.txt | 32 - + .../bindings/sound/starfive,jh7110-pwmdac.yaml | 76 ++ + .../devicetree/bindings/sound/tfa9879.txt | 23 - + .../devicetree/bindings/sound/ti,pcm3168a.yaml | 1 + + Documentation/devicetree/bindings/sound/wm8782.txt | 7 + + Documentation/sound/soc/codec-to-codec.rst | 8 +- + Documentation/sound/soc/dpcm.rst | 3 +- + MAINTAINERS | 13 +- + arch/arm/mach-omap2/board-n8x0.c | 10 + + arch/arm/mach-omap2/pdata-quirks.c | 10 + + arch/sh/boards/mach-ecovec24/setup.c | 2 +- + arch/sh/boards/mach-se/7724/setup.c | 2 +- + drivers/gpio/gpiolib-of.c | 4 + + drivers/soundwire/intel.c | 2 +- + drivers/soundwire/intel_ace2x.c | 2 +- + drivers/soundwire/stream.c | 2 +- + include/linux/platform_data/omap-twl4030.h | 3 - + include/sound/cs35l41.h | 4 +- + include/sound/cs35l56.h | 3 +- + include/sound/graph_card.h | 16 +- + include/sound/max9768.h | 4 - + include/sound/simple_card.h | 6 +- + include/sound/simple_card_utils.h | 106 +-- + include/sound/soc-acpi-intel-match.h | 2 + + include/sound/soc-acpi.h | 7 + + include/sound/soc-card.h | 41 +- + include/sound/soc-dapm.h | 2 +- + include/sound/soc.h | 47 +- + include/sound/sof.h | 12 +- + include/sound/sof/ipc4/header.h | 32 +- + include/sound/tas2781-dsp.h | 5 + + sound/arm/pxa2xx-pcm-lib.c | 8 +- + sound/pci/hda/cs35l41_hda.c | 23 +- + sound/soc/amd/acp-config.c | 70 ++ + sound/soc/amd/acp-da7219-max98357a.c | 28 +- + sound/soc/amd/acp-es8336.c | 6 +- + sound/soc/amd/acp-pcm-dma.c | 2 +- + sound/soc/amd/acp-rt5645.c | 6 +- + sound/soc/amd/acp/Makefile | 2 +- + sound/soc/amd/acp/acp-legacy-common.c | 8 +- + sound/soc/amd/acp/acp-legacy-mach.c | 102 ++- + sound/soc/amd/acp/acp-mach-common.c | 62 +- + sound/soc/amd/acp/acp-mach.h | 67 ++ + sound/soc/amd/acp/acp-renoir.c | 4 + + sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c | 444 ++++++++++++ + sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.h | 12 + + sound/soc/amd/acp3x-rt5682-max9836.c | 12 +- + sound/soc/amd/ps/pci-ps.c | 2 +- + sound/soc/amd/ps/ps-sdw-dma.c | 2 +- + sound/soc/amd/raven/acp3x-i2s.c | 2 +- + sound/soc/amd/raven/acp3x-pcm-dma.c | 6 +- + sound/soc/amd/vangogh/acp5x-i2s.c | 2 +- + sound/soc/amd/vangogh/acp5x-mach.c | 12 +- + sound/soc/amd/vangogh/acp5x-pcm-dma.c | 6 +- + sound/soc/apple/mca.c | 28 +- + sound/soc/atmel/atmel-classd.c | 10 +- + sound/soc/atmel/atmel-pcm-dma.c | 8 +- + sound/soc/atmel/atmel-pcm-pdc.c | 4 +- + sound/soc/atmel/atmel-pdmic.c | 12 +- + sound/soc/atmel/atmel_wm8904.c | 5 +- + sound/soc/atmel/mchp-i2s-mcc.c | 2 +- + sound/soc/atmel/mikroe-proto.c | 2 +- + sound/soc/atmel/sam9g20_wm8731.c | 2 +- + sound/soc/atmel/sam9x5_wm8731.c | 2 +- + sound/soc/atmel/tse850-pcm5142.c | 1 - + sound/soc/au1x/db1200.c | 4 +- + sound/soc/au1x/dbdma2.c | 4 +- + sound/soc/au1x/dma.c | 4 +- + sound/soc/au1x/psc-ac97.c | 2 +- + sound/soc/bcm/bcm63xx-pcm-whistler.c | 28 +- + sound/soc/bcm/cygnus-pcm.c | 24 +- + sound/soc/bcm/cygnus-ssp.c | 2 +- + sound/soc/cirrus/edb93xx.c | 6 +- + sound/soc/codecs/Kconfig | 30 +- + sound/soc/codecs/Makefile | 4 + + sound/soc/codecs/adau1701.c | 1 - + sound/soc/codecs/adau1977-spi.c | 1 - + sound/soc/codecs/ak4104.c | 2 +- + sound/soc/codecs/ak4118.c | 2 +- + sound/soc/codecs/ak4375.c | 2 +- + sound/soc/codecs/ak4458.c | 2 +- + sound/soc/codecs/ak4613.c | 2 +- + sound/soc/codecs/ak4642.c | 30 +- + sound/soc/codecs/ak5386.c | 7 +- + sound/soc/codecs/ak5558.c | 2 +- + sound/soc/codecs/audio-iio-aux.c | 17 +- + sound/soc/codecs/aw87390.c | 463 ++++++++++++ + sound/soc/codecs/aw87390.h | 85 +++ + sound/soc/codecs/aw88261.c | 42 +- + sound/soc/codecs/aw88261.h | 4 +- + sound/soc/codecs/aw88395/aw88395.c | 9 +- + sound/soc/codecs/aw88395/aw88395.h | 2 +- + sound/soc/codecs/aw88395/aw88395_device.c | 47 +- + sound/soc/codecs/aw88395/aw88395_device.h | 6 +- + sound/soc/codecs/aw88395/aw88395_lib.c | 25 +- + sound/soc/codecs/aw88395/aw88395_reg.h | 1 + + sound/soc/codecs/cs35l32.c | 2 +- + sound/soc/codecs/cs35l33.c | 2 - + sound/soc/codecs/cs35l34.c | 2 +- + sound/soc/codecs/cs35l35.c | 3 +- + sound/soc/codecs/cs35l36.c | 3 +- + sound/soc/codecs/cs35l41-i2c.c | 13 +- + sound/soc/codecs/cs35l41-lib.c | 60 +- + sound/soc/codecs/cs35l41-spi.c | 11 +- + sound/soc/codecs/cs35l41.c | 94 +-- + sound/soc/codecs/cs35l41.h | 1 - + sound/soc/codecs/cs35l45-tables.c | 3 + + sound/soc/codecs/cs35l45.c | 193 ++++- + sound/soc/codecs/cs35l45.h | 36 +- + sound/soc/codecs/cs35l56-i2c.c | 3 +- + sound/soc/codecs/cs35l56-sdw.c | 2 +- + sound/soc/codecs/cs35l56-shared.c | 68 +- + sound/soc/codecs/cs35l56-spi.c | 3 +- + sound/soc/codecs/cs35l56.c | 16 +- + sound/soc/codecs/cs4270.c | 2 +- + sound/soc/codecs/cs4271.c | 22 +- + sound/soc/codecs/cs42l42.c | 1 - + sound/soc/codecs/cs42l43-jack.c | 38 +- + sound/soc/codecs/cs42l43-sdw.c | 6 +- + sound/soc/codecs/cs42l43.c | 2 +- + sound/soc/codecs/cs42l56.c | 2 +- + sound/soc/codecs/cs42xx8-i2c.c | 16 +- + sound/soc/codecs/cs43130.c | 3 +- + sound/soc/codecs/cs4349.c | 2 +- + sound/soc/codecs/cs47l15.c | 4 +- + sound/soc/codecs/cs47l24.c | 6 +- + sound/soc/codecs/cs47l35.c | 6 +- + sound/soc/codecs/cs47l85.c | 6 +- + sound/soc/codecs/cs47l90.c | 6 +- + sound/soc/codecs/cs47l92.c | 4 +- + sound/soc/codecs/da7213.c | 32 +- + sound/soc/codecs/da7218.c | 29 +- + sound/soc/codecs/da7218.h | 2 +- + sound/soc/codecs/da7219.c | 2 +- + sound/soc/codecs/da9055.c | 1 - + sound/soc/codecs/es8316.c | 50 +- + sound/soc/codecs/es8316.h | 3 + + sound/soc/codecs/es8328.c | 1 - + sound/soc/codecs/gtm601.c | 2 +- + sound/soc/codecs/hdac_hda.c | 29 + + sound/soc/codecs/hdac_hda.h | 1 + + sound/soc/codecs/hdac_hdmi.c | 13 +- + sound/soc/codecs/lpass-macro-common.c | 2 +- + sound/soc/codecs/lpass-macro-common.h | 2 + + sound/soc/codecs/lpass-tx-macro.c | 22 +- + sound/soc/codecs/lpass-wsa-macro.c | 3 + + sound/soc/codecs/max9768.c | 41 +- + sound/soc/codecs/max98357a.c | 1 - + sound/soc/codecs/max98373-i2c.c | 17 - + sound/soc/codecs/max98373.c | 35 +- + sound/soc/codecs/max98373.h | 2 +- + sound/soc/codecs/max98388.c | 3 +- + sound/soc/codecs/max98396.c | 1 - + sound/soc/codecs/max98520.c | 2 - + sound/soc/codecs/max98927.c | 2 - + sound/soc/codecs/mt6351.c | 2 +- + sound/soc/codecs/mt6358.c | 2 +- + sound/soc/codecs/mt6359-accdet.c | 4 - + sound/soc/codecs/mt6359.c | 2 +- + sound/soc/codecs/nau8540.c | 2 +- + sound/soc/codecs/nau8821.c | 3 + + sound/soc/codecs/pcm1681.c | 2 - + sound/soc/codecs/pcm512x-i2c.c | 4 + + sound/soc/codecs/pcm512x.c | 36 +- + sound/soc/codecs/rt1015.c | 13 + + sound/soc/codecs/rt5677-spi.c | 4 +- + sound/soc/codecs/rt715.c | 2 - + sound/soc/codecs/rtq9128.c | 780 +++++++++++++++++++++ + sound/soc/codecs/sgtl5000.c | 2 +- + sound/soc/codecs/sma1303.c | 2 +- + sound/soc/codecs/sta32x.c | 3 +- + sound/soc/codecs/sta350.c | 3 +- + sound/soc/codecs/tas2781-fmwlib.c | 234 +++---- + sound/soc/codecs/tas5086.c | 6 +- + sound/soc/codecs/tas571x.c | 15 +- + sound/soc/codecs/tlv320aic32x4-i2c.c | 19 +- + sound/soc/codecs/tlv320aic32x4-spi.c | 18 +- + sound/soc/codecs/tlv320aic32x4.c | 5 +- + sound/soc/codecs/tlv320aic32x4.h | 3 +- + sound/soc/codecs/uda1334.c | 2 +- + sound/soc/codecs/wm5110.c | 6 +- + sound/soc/codecs/wm8510.c | 2 +- + sound/soc/codecs/wm8523.c | 2 +- + sound/soc/codecs/wm8524.c | 2 +- + sound/soc/codecs/wm8580.c | 28 +- + sound/soc/codecs/wm8711.c | 2 +- + sound/soc/codecs/wm8728.c | 2 +- + sound/soc/codecs/wm8731-i2c.c | 2 +- + sound/soc/codecs/wm8731-spi.c | 2 +- + sound/soc/codecs/wm8737.c | 2 +- + sound/soc/codecs/wm8741.c | 2 +- + sound/soc/codecs/wm8750.c | 2 +- + sound/soc/codecs/wm8753.c | 2 +- + sound/soc/codecs/wm8770.c | 2 +- + sound/soc/codecs/wm8776.c | 2 +- + sound/soc/codecs/wm8782.c | 63 +- + sound/soc/codecs/wm8804.c | 1 - + sound/soc/codecs/wm_adsp.c | 10 +- + sound/soc/dwc/dwc-i2s.c | 2 +- + sound/soc/dwc/dwc-pcm.c | 4 +- + sound/soc/fsl/efika-audio-fabric.c | 4 +- + sound/soc/fsl/eukrea-tlv320.c | 6 +- + sound/soc/fsl/fsl-asoc-card.c | 29 +- + sound/soc/fsl/fsl_asrc_dma.c | 10 +- + sound/soc/fsl/fsl_aud2htx.c | 3 +- + sound/soc/fsl/fsl_dma.c | 2 +- + sound/soc/fsl/fsl_mqs.c | 2 +- + sound/soc/fsl/fsl_rpmsg.c | 3 +- + sound/soc/fsl/fsl_sai.c | 3 +- + sound/soc/fsl/fsl_spdif.c | 24 +- + sound/soc/fsl/fsl_ssi.c | 16 +- + sound/soc/fsl/imx-audmix.c | 18 +- + sound/soc/fsl/imx-audmux.c | 1 - + sound/soc/fsl/imx-card.c | 9 +- + sound/soc/fsl/imx-hdmi.c | 4 +- + sound/soc/fsl/imx-pcm-rpmsg.c | 14 +- + sound/soc/fsl/imx-rpmsg.c | 7 +- + sound/soc/fsl/imx-sgtl5000.c | 2 +- + sound/soc/fsl/imx-spdif.c | 2 +- + sound/soc/fsl/mpc5200_dma.c | 25 +- + sound/soc/fsl/mpc5200_psc_ac97.c | 3 +- + sound/soc/fsl/mpc5200_psc_i2s.c | 7 +- + sound/soc/fsl/mpc8610_hpcd.c | 8 +- + sound/soc/fsl/p1022_ds.c | 8 +- + sound/soc/fsl/p1022_rdk.c | 8 +- + sound/soc/fsl/pcm030-audio-fabric.c | 3 +- + sound/soc/generic/audio-graph-card.c | 116 ++- + .../soc/generic/audio-graph-card2-custom-sample.c | 32 +- + sound/soc/generic/audio-graph-card2.c | 110 ++- + sound/soc/generic/simple-card-utils.c | 219 +++--- + sound/soc/generic/simple-card.c | 149 ++-- + sound/soc/generic/test-component.c | 4 +- + sound/soc/google/chv3-i2s.c | 22 +- + sound/soc/img/img-i2s-in.c | 2 +- + sound/soc/img/img-i2s-out.c | 2 +- + sound/soc/intel/atom/sst-mfld-platform-pcm.c | 12 +- + sound/soc/intel/avs/avs.h | 38 +- + sound/soc/intel/avs/board_selection.c | 2 +- + sound/soc/intel/avs/boards/da7219.c | 21 +- + sound/soc/intel/avs/boards/es8336.c | 26 +- + sound/soc/intel/avs/boards/i2s_test.c | 57 +- + sound/soc/intel/avs/boards/max98357a.c | 18 +- + sound/soc/intel/avs/boards/max98373.c | 20 +- + sound/soc/intel/avs/boards/max98927.c | 20 +- + sound/soc/intel/avs/boards/nau8825.c | 26 +- + sound/soc/intel/avs/boards/rt274.c | 22 +- + sound/soc/intel/avs/boards/rt286.c | 27 +- + sound/soc/intel/avs/boards/rt298.c | 26 +- + sound/soc/intel/avs/boards/rt5663.c | 26 +- + sound/soc/intel/avs/boards/rt5682.c | 26 +- + sound/soc/intel/avs/boards/ssm4567.c | 22 +- + sound/soc/intel/avs/cldma.h | 4 +- + sound/soc/intel/avs/core.c | 5 + + sound/soc/intel/avs/debugfs.c | 4 + + sound/soc/intel/avs/ipc.c | 52 +- + sound/soc/intel/avs/loader.c | 4 + + sound/soc/intel/avs/messages.c | 112 +-- + sound/soc/intel/avs/messages.h | 4 +- + sound/soc/intel/avs/path.c | 31 +- + sound/soc/intel/avs/pcm.c | 76 +- + sound/soc/intel/avs/registers.h | 4 +- + sound/soc/intel/avs/topology.c | 100 ++- + sound/soc/intel/avs/utils.h | 65 ++ + sound/soc/intel/boards/Kconfig | 28 +- + sound/soc/intel/boards/Makefile | 13 +- + sound/soc/intel/boards/bdw-rt5650.c | 6 +- + sound/soc/intel/boards/bdw-rt5677.c | 10 +- + sound/soc/intel/boards/bdw_rt286.c | 8 +- + sound/soc/intel/boards/bxt_da7219_max98357a.c | 8 +- + sound/soc/intel/boards/bxt_rt298.c | 10 +- + sound/soc/intel/boards/bytcht_cx2072x.c | 10 +- + sound/soc/intel/boards/bytcht_da7213.c | 12 +- + sound/soc/intel/boards/bytcht_es8316.c | 8 +- + sound/soc/intel/boards/bytcht_nocodec.c | 4 +- + sound/soc/intel/boards/bytcr_rt5640.c | 10 +- + sound/soc/intel/boards/bytcr_rt5651.c | 10 +- + sound/soc/intel/boards/bytcr_wm5102.c | 6 +- + sound/soc/intel/boards/cht_bsw_max98090_ti.c | 8 +- + sound/soc/intel/boards/cht_bsw_nau8824.c | 8 +- + sound/soc/intel/boards/cht_bsw_rt5645.c | 16 +- + sound/soc/intel/boards/cht_bsw_rt5672.c | 10 +- + sound/soc/intel/boards/cml_rt1011_rt5682.c | 12 +- + sound/soc/intel/boards/ehl_rt5660.c | 8 +- + sound/soc/intel/boards/glk_rt5682_max98357a.c | 12 +- + sound/soc/intel/boards/hsw_rt5640.c | 4 +- + sound/soc/intel/boards/kbl_da7219_max98357a.c | 8 +- + sound/soc/intel/boards/kbl_da7219_max98927.c | 10 +- + sound/soc/intel/boards/kbl_rt5660.c | 8 +- + sound/soc/intel/boards/kbl_rt5663_max98927.c | 12 +- + .../soc/intel/boards/kbl_rt5663_rt5514_max98927.c | 12 +- + sound/soc/intel/boards/skl_hda_dsp_generic.c | 4 +- + sound/soc/intel/boards/skl_nau88l25_max98357a.c | 14 +- + sound/soc/intel/boards/skl_nau88l25_ssm4567.c | 18 +- + sound/soc/intel/boards/skl_rt286.c | 10 +- + sound/soc/intel/boards/sof_cirrus_common.c | 2 +- + sound/soc/intel/boards/sof_cirrus_common.h | 9 +- + sound/soc/intel/boards/sof_cs42l42.c | 67 +- + .../boards/{sof_da7219_max98373.c => sof_da7219.c} | 371 ++++++---- + sound/soc/intel/boards/sof_es8336.c | 14 +- + sound/soc/intel/boards/sof_maxim_common.c | 8 +- + sound/soc/intel/boards/sof_maxim_common.h | 13 +- + sound/soc/intel/boards/sof_nau8825.c | 180 ++--- + sound/soc/intel/boards/sof_nuvoton_common.c | 73 ++ + sound/soc/intel/boards/sof_nuvoton_common.h | 22 + + sound/soc/intel/boards/sof_pcm512x.c | 14 +- + sound/soc/intel/boards/sof_realtek_common.c | 8 +- + sound/soc/intel/boards/sof_realtek_common.h | 37 +- + sound/soc/intel/boards/sof_rt5682.c | 489 +++++++------ + sound/soc/intel/boards/sof_sdw.c | 291 ++++---- + sound/soc/intel/boards/sof_sdw_common.h | 17 + + sound/soc/intel/boards/sof_sdw_cs42l42.c | 2 +- + sound/soc/intel/boards/sof_sdw_cs42l43.c | 145 ++++ + sound/soc/intel/boards/sof_sdw_hdmi.c | 2 +- + sound/soc/intel/boards/sof_sdw_maxim.c | 4 +- + sound/soc/intel/boards/sof_sdw_rt5682.c | 2 +- + sound/soc/intel/boards/sof_sdw_rt700.c | 2 +- + sound/soc/intel/boards/sof_sdw_rt711.c | 2 +- + sound/soc/intel/boards/sof_sdw_rt_amp.c | 4 +- + .../soc/intel/boards/sof_sdw_rt_sdca_jack_common.c | 2 +- + sound/soc/intel/boards/sof_ssp_amp.c | 120 ++-- + sound/soc/intel/boards/sof_ssp_common.c | 101 +++ + sound/soc/intel/boards/sof_ssp_common.h | 71 ++ + sound/soc/intel/boards/sof_wm8804.c | 4 +- + sound/soc/intel/catpt/pcm.c | 12 +- + sound/soc/intel/common/Makefile | 1 + + sound/soc/intel/common/soc-acpi-intel-adl-match.c | 19 + + sound/soc/intel/common/soc-acpi-intel-arl-match.c | 51 ++ + sound/soc/intel/common/soc-acpi-intel-jsl-match.c | 12 +- + sound/soc/intel/common/soc-acpi-intel-mtl-match.c | 78 +++ + sound/soc/intel/common/soc-acpi-intel-rpl-match.c | 7 + + sound/soc/intel/keembay/kmb_platform.c | 17 +- + sound/soc/intel/skylake/skl-pcm.c | 18 +- + sound/soc/intel/skylake/skl.c | 1 + + sound/soc/kirkwood/armada-370-db.c | 4 +- + sound/soc/kirkwood/kirkwood-dma.c | 2 +- + sound/soc/loongson/loongson_card.c | 4 +- + sound/soc/loongson/loongson_dma.c | 4 +- + sound/soc/mediatek/Kconfig | 1 + + sound/soc/mediatek/common/mtk-afe-fe-dai.c | 22 +- + .../soc/mediatek/common/mtk-afe-platform-driver.c | 4 +- + sound/soc/mediatek/common/mtk-dsp-sof-common.c | 113 ++- + sound/soc/mediatek/common/mtk-dsp-sof-common.h | 8 + + sound/soc/mediatek/mt2701/mt2701-afe-pcm.c | 6 +- + sound/soc/mediatek/mt2701/mt2701-cs42448.c | 60 +- + sound/soc/mediatek/mt2701/mt2701-wm8960.c | 6 +- + sound/soc/mediatek/mt6797/mt6797-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8173/mt8173-afe-pcm.c | 4 +- + sound/soc/mediatek/mt8173/mt8173-max98090.c | 7 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5514.c | 6 +- + sound/soc/mediatek/mt8173/mt8173-rt5650-rt5676.c | 8 +- + sound/soc/mediatek/mt8173/mt8173-rt5650.c | 10 +- + sound/soc/mediatek/mt8183/mt8183-afe-pcm.c | 6 +- + sound/soc/mediatek/mt8183/mt8183-da7219-max98357.c | 16 +- + .../mt8183/mt8183-mt6358-ts3a227-max98357.c | 20 +- + sound/soc/mediatek/mt8186/mt8186-afe-gpio.c | 1 - + sound/soc/mediatek/mt8186/mt8186-afe-pcm.c | 12 +- + sound/soc/mediatek/mt8186/mt8186-mt6366-common.c | 2 +- + .../mt8186/mt8186-mt6366-da7219-max98357.c | 16 +- + .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 15 +- + sound/soc/mediatek/mt8188/mt8188-afe-pcm.c | 8 +- + sound/soc/mediatek/mt8188/mt8188-mt6359.c | 383 +++++++++- + sound/soc/mediatek/mt8192/mt8192-afe-gpio.c | 1 - + sound/soc/mediatek/mt8192/mt8192-afe-pcm.c | 6 +- + .../mediatek/mt8192/mt8192-mt6359-rt1015-rt5682.c | 24 +- + sound/soc/mediatek/mt8195/mt8195-afe-pcm.c | 10 +- + sound/soc/mediatek/mt8195/mt8195-mt6359.c | 28 +- + sound/soc/meson/aiu-fifo.c | 2 +- + sound/soc/meson/axg-card.c | 12 +- + sound/soc/meson/axg-fifo.c | 4 +- + sound/soc/meson/axg-fifo.h | 2 +- + sound/soc/meson/axg-tdm.h | 2 +- + sound/soc/meson/gx-card.c | 2 +- + sound/soc/meson/meson-card-utils.c | 6 +- + sound/soc/meson/meson-codec-glue.c | 2 +- + sound/soc/mxs/mxs-saif.c | 1 - + sound/soc/mxs/mxs-sgtl5000.c | 7 +- + sound/soc/pxa/pxa2xx-i2s.c | 4 +- + sound/soc/pxa/spitz.c | 8 +- + sound/soc/qcom/apq8016_sbc.c | 9 +- + sound/soc/qcom/apq8096.c | 10 +- + sound/soc/qcom/common.c | 8 +- + sound/soc/qcom/lpass-apq8016.c | 6 +- + sound/soc/qcom/lpass-cdc-dma.c | 19 +- + sound/soc/qcom/lpass-cpu.c | 44 +- + sound/soc/qcom/lpass-ipq806x.c | 2 +- + sound/soc/qcom/lpass-platform.c | 87 +-- + sound/soc/qcom/lpass-sc7180.c | 6 +- + sound/soc/qcom/lpass-sc7280.c | 6 +- + sound/soc/qcom/lpass.h | 2 +- + sound/soc/qcom/qdsp6/q6afe-clocks.c | 1 + + sound/soc/qcom/qdsp6/q6afe-dai.c | 1 + + sound/soc/qcom/qdsp6/q6afe.c | 1 + + sound/soc/qcom/qdsp6/q6afe.h | 2 - + sound/soc/qcom/qdsp6/q6apm-dai.c | 6 +- + sound/soc/qcom/qdsp6/q6apm-lpass-dais.c | 1 + + sound/soc/qcom/qdsp6/q6apm.h | 1 - + sound/soc/qcom/qdsp6/q6asm-dai.c | 13 +- + sound/soc/qcom/qdsp6/q6asm.c | 1 + + sound/soc/qcom/qdsp6/q6asm.h | 1 - + sound/soc/qcom/qdsp6/q6dsp-lpass-clocks.c | 1 - + sound/soc/qcom/qdsp6/q6prm-clocks.c | 2 +- + sound/soc/qcom/qdsp6/q6routing.c | 9 +- + sound/soc/qcom/sc7180.c | 21 +- + sound/soc/qcom/sc7280.c | 30 +- + sound/soc/qcom/sc8280xp.c | 10 +- + sound/soc/qcom/sdm845.c | 38 +- + sound/soc/qcom/sdw.c | 8 +- + sound/soc/qcom/sm8250.c | 12 +- + sound/soc/qcom/storm.c | 4 +- + sound/soc/rockchip/rk3288_hdmi_analog.c | 52 +- + sound/soc/rockchip/rk3399_gru_sound.c | 28 +- + sound/soc/rockchip/rockchip_i2s.c | 10 +- + sound/soc/rockchip/rockchip_i2s_tdm.c | 24 +- + sound/soc/rockchip/rockchip_max98090.c | 12 +- + sound/soc/rockchip/rockchip_pdm.c | 7 +- + sound/soc/rockchip/rockchip_rt5645.c | 10 +- + sound/soc/samsung/aries_wm8994.c | 13 +- + sound/soc/samsung/arndale.c | 12 +- + sound/soc/samsung/bells.c | 16 +- + sound/soc/samsung/i2s.c | 14 +- + sound/soc/samsung/littlemill.c | 16 +- + sound/soc/samsung/lowland.c | 4 +- + sound/soc/samsung/midas_wm1811.c | 12 +- + sound/soc/samsung/odroid.c | 9 +- + sound/soc/samsung/pcm.c | 8 +- + sound/soc/samsung/smdk_spdif.c | 4 +- + sound/soc/samsung/smdk_wm8994.c | 32 +- + sound/soc/samsung/smdk_wm8994pcm.c | 6 +- + sound/soc/samsung/snow.c | 5 +- + sound/soc/samsung/spdif.c | 14 +- + sound/soc/samsung/speyside.c | 8 +- + sound/soc/samsung/tm2_wm5110.c | 24 +- + sound/soc/samsung/tobermory.c | 8 +- + sound/soc/sh/dma-sh7760.c | 34 +- + sound/soc/sh/fsi.c | 5 +- + sound/soc/sh/migor.c | 10 +- + sound/soc/sh/rcar/core.c | 8 +- + sound/soc/sh/rcar/rsnd.h | 4 +- + sound/soc/sh/rcar/src.c | 1 + + sound/soc/sh/rcar/ssi.c | 2 + + sound/soc/sh/rz-ssi.c | 5 +- + sound/soc/soc-component.c | 24 +- + sound/soc/soc-compress.c | 36 +- + sound/soc/soc-core.c | 20 +- + sound/soc/soc-dai.c | 8 +- + sound/soc/soc-dapm.c | 14 +- + sound/soc/soc-generic-dmaengine-pcm.c | 10 +- + sound/soc/soc-link.c | 14 +- + sound/soc/soc-pcm.c | 111 +-- + sound/soc/soc-topology.c | 6 +- + sound/soc/soc-utils.c | 6 +- + sound/soc/sof/Kconfig | 2 +- + sound/soc/sof/Makefile | 6 +- + sound/soc/sof/amd/acp-pcm.c | 2 +- + sound/soc/sof/amd/pci-rmb.c | 10 +- + sound/soc/sof/amd/pci-rn.c | 10 +- + sound/soc/sof/amd/pci-vangogh.c | 10 +- + sound/soc/sof/imx/imx8.c | 22 +- + sound/soc/sof/imx/imx8m.c | 12 +- + sound/soc/sof/imx/imx8ulp.c | 12 +- + sound/soc/sof/intel/Kconfig | 14 +- + sound/soc/sof/intel/Makefile | 3 +- + sound/soc/sof/intel/apl.c | 4 +- + sound/soc/sof/intel/bdw.c | 12 +- + sound/soc/sof/intel/byt.c | 32 +- + sound/soc/sof/intel/cnl.c | 4 +- + sound/soc/sof/intel/hda-codec.c | 1 + + sound/soc/sof/intel/hda-dai-ops.c | 26 +- + sound/soc/sof/intel/hda-dai.c | 12 +- + sound/soc/sof/intel/hda-loader.c | 44 +- + sound/soc/sof/intel/hda-pcm.c | 4 +- + sound/soc/sof/intel/hda-stream.c | 4 +- + sound/soc/sof/intel/hda.c | 16 +- + sound/soc/sof/intel/hda.h | 4 + + sound/soc/sof/intel/icl.c | 4 +- + sound/soc/sof/intel/mtl.c | 3 + + sound/soc/sof/intel/pci-apl.c | 36 +- + sound/soc/sof/intel/pci-cnl.c | 54 +- + sound/soc/sof/intel/pci-icl.c | 36 +- + sound/soc/sof/intel/pci-lnl.c | 10 +- + sound/soc/sof/intel/pci-mtl.c | 12 +- + sound/soc/sof/intel/pci-skl.c | 20 +- + sound/soc/sof/intel/pci-tgl.c | 144 ++-- + sound/soc/sof/intel/pci-tng.c | 10 +- + sound/soc/sof/intel/telemetry.c | 95 +++ + sound/soc/sof/intel/telemetry.h | 35 + + sound/soc/sof/intel/tgl.c | 5 +- + sound/soc/sof/ipc.c | 6 +- + sound/soc/sof/ipc3-dtrace.c | 2 +- + sound/soc/sof/ipc3-pcm.c | 6 +- + sound/soc/sof/ipc4-control.c | 175 ++++- + sound/soc/sof/ipc4-mtrace.c | 30 +- + sound/soc/sof/ipc4-pcm.c | 118 +++- + sound/soc/sof/ipc4-priv.h | 3 + + sound/soc/sof/ipc4-telemetry.c | 95 +++ + sound/soc/sof/ipc4-telemetry.h | 73 ++ + sound/soc/sof/ipc4-topology.c | 76 +- + sound/soc/sof/ipc4-topology.h | 22 +- + sound/soc/sof/ipc4.c | 36 +- + sound/soc/sof/mediatek/mt8186/mt8186.c | 24 +- + sound/soc/sof/mediatek/mt8195/mt8195.c | 14 +- + sound/soc/sof/nocodec.c | 2 +- + sound/soc/sof/ops.h | 4 +- + sound/soc/sof/pcm.c | 18 +- + sound/soc/sof/sof-acpi-dev.c | 12 +- + sound/soc/sof/sof-acpi-dev.h | 2 +- + sound/soc/sof/sof-audio.c | 7 + + sound/soc/sof/sof-client-ipc-msg-injector.c | 4 +- + sound/soc/sof/sof-client-probes.c | 6 +- + sound/soc/sof/sof-client.c | 27 +- + sound/soc/sof/sof-of-dev.c | 10 +- + sound/soc/sof/sof-of-dev.h | 2 +- + sound/soc/sof/sof-pci-dev.c | 10 +- + sound/soc/sof/xtensa/core.c | 11 + + sound/soc/sprd/sprd-pcm-compress.c | 4 +- + sound/soc/sprd/sprd-pcm-dma.c | 4 +- + sound/soc/starfive/Kconfig | 9 + + sound/soc/starfive/Makefile | 1 + + sound/soc/starfive/jh7110_pwmdac.c | 529 ++++++++++++++ + sound/soc/starfive/jh7110_tdm.c | 2 +- + sound/soc/stm/stm32_adfsdm.c | 24 +- + sound/soc/stm/stm32_i2s.c | 7 +- + sound/soc/stm/stm32_sai.c | 8 +- + sound/soc/stm/stm32_sai_sub.c | 10 +- + sound/soc/stm/stm32_spdifrx.c | 8 +- + sound/soc/sunxi/sun4i-codec.c | 16 +- + sound/soc/sunxi/sun4i-i2s.c | 2 +- + sound/soc/sunxi/sun4i-spdif.c | 7 +- + sound/soc/sunxi/sun50i-codec-analog.c | 3 +- + sound/soc/sunxi/sun50i-dmic.c | 4 +- + sound/soc/sunxi/sun8i-codec-analog.c | 1 - + sound/soc/sunxi/sun8i-codec.c | 2 +- + sound/soc/tegra/tegra186_asrc.c | 3 +- + sound/soc/tegra/tegra186_dspk.c | 2 +- + sound/soc/tegra/tegra20_spdif.c | 2 +- + sound/soc/tegra/tegra210_adx.c | 3 +- + sound/soc/tegra/tegra210_amx.c | 13 +- + sound/soc/tegra/tegra210_dmic.c | 2 +- + sound/soc/tegra/tegra210_i2s.c | 2 +- + sound/soc/tegra/tegra210_mixer.c | 3 +- + sound/soc/tegra/tegra210_mvc.c | 3 +- + sound/soc/tegra/tegra210_ope.c | 3 +- + sound/soc/tegra/tegra210_peq.c | 1 - + sound/soc/tegra/tegra210_sfc.c | 1 - + sound/soc/tegra/tegra30_i2s.c | 1 - + sound/soc/tegra/tegra_asoc_machine.c | 3 +- + sound/soc/tegra/tegra_audio_graph_card.c | 24 +- + sound/soc/tegra/tegra_pcm.c | 4 +- + sound/soc/tegra/tegra_wm8903.c | 4 +- + sound/soc/ti/ams-delta.c | 4 +- + sound/soc/ti/davinci-evm.c | 17 +- + sound/soc/ti/davinci-mcasp.c | 9 +- + sound/soc/ti/j721e-evm.c | 12 +- + sound/soc/ti/n810.c | 37 +- + sound/soc/ti/omap-abe-twl6040.c | 10 +- + sound/soc/ti/omap-dmic.c | 2 +- + sound/soc/ti/omap-hdmi.c | 2 +- + sound/soc/ti/omap-mcbsp-st.c | 2 +- + sound/soc/ti/omap-mcbsp.c | 18 +- + sound/soc/ti/omap-mcpdm.c | 4 +- + sound/soc/ti/omap-twl4030.c | 22 +- + sound/soc/ti/omap3pandora.c | 69 +- + sound/soc/ti/osk5912.c | 5 +- + sound/soc/ti/rx51.c | 25 +- + sound/soc/uniphier/aio-compress.c | 22 +- + sound/soc/uniphier/aio-dma.c | 12 +- + sound/soc/ux500/mop500_ab8500.c | 14 +- + sound/soc/ux500/ux500_pcm.c | 4 +- + sound/soc/xtensa/xtfpga-i2s.c | 4 +- + 583 files changed, 9350 insertions(+), 4299 deletions(-) + create mode 100644 Documentation/devicetree/bindings/sound/awinic,aw87390.yaml + create mode 100644 Documentation/devicetree/bindings/sound/nxp,tfa9879.yaml + create mode 100644 Documentation/devicetree/bindings/sound/realtek,rt5616.yaml + create mode 100644 Documentation/devicetree/bindings/sound/richtek,rtq9128.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/rt5616.txt + create mode 100644 Documentation/devicetree/bindings/sound/starfive,jh7110-pwmdac.yaml + delete mode 100644 Documentation/devicetree/bindings/sound/tfa9879.txt + create mode 100644 sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.c + create mode 100644 sound/soc/amd/acp/acp3x-es83xx/acp3x-es83xx.h + create mode 100644 sound/soc/codecs/aw87390.c + create mode 100644 sound/soc/codecs/aw87390.h + create mode 100644 sound/soc/codecs/rtq9128.c + create mode 100644 sound/soc/intel/avs/utils.h + rename sound/soc/intel/boards/{sof_da7219_max98373.c => sof_da7219.c} (55%) + create mode 100644 sound/soc/intel/boards/sof_nuvoton_common.c + create mode 100644 sound/soc/intel/boards/sof_nuvoton_common.h + create mode 100644 sound/soc/intel/boards/sof_sdw_cs42l43.c + create mode 100644 sound/soc/intel/boards/sof_ssp_common.c + create mode 100644 sound/soc/intel/boards/sof_ssp_common.h + create mode 100644 sound/soc/intel/common/soc-acpi-intel-arl-match.c + create mode 100644 sound/soc/sof/intel/telemetry.c + create mode 100644 sound/soc/sof/intel/telemetry.h + create mode 100644 sound/soc/sof/ipc4-telemetry.c + create mode 100644 sound/soc/sof/ipc4-telemetry.h + create mode 100644 sound/soc/starfive/jh7110_pwmdac.c +Merging modules/modules-next (3111add7f414 module: Annotate struct module_notes_attrs with __counted_by) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Auto-merging MAINTAINERS +Auto-merging include/linux/moduleparam.h +Auto-merging scripts/mod/modpost.c +CONFLICT (content): Merge conflict in scripts/mod/modpost.c +Resolved 'scripts/mod/modpost.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master fab2c7313c2b] Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git +$ git diff -M --stat --summary HEAD^.. + MAINTAINERS | 2 +- + include/linux/module_symbol.h | 2 +- + include/linux/moduleparam.h | 6 +++++- + kernel/module/decompress.c | 4 ++-- + kernel/module/stats.c | 2 +- + kernel/module/sysfs.c | 2 +- + 6 files changed, 11 insertions(+), 7 deletions(-) +$ git am -3 ../patches/0001-fix-up-for-module-Make-is_valid_name-return-bool.patch +Applying: fix up for "module: Make is_valid_name() return bool" +$ git reset HEAD^ +Unstaged changes after reset: +M scripts/mod/modpost.h +$ git add -A . +$ git commit -v -a --amend +[master 8549fe814190] Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git + Date: Mon Oct 16 11:56:32 2023 +1100 +Merging input/next (6cd256694afe Input: tegra-kbc - use device_get_match_data()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/dtor/input.git input/next +Auto-merging drivers/input/touchscreen/exc3000.c +Merge made by the 'ort' strategy. + drivers/input/evdev.c | 2 +- + drivers/input/input-leds.c | 2 +- + drivers/input/keyboard/adp5520-keys.c | 6 ++---- + drivers/input/keyboard/cros_ec_keyb.c | 16 +++++---------- + drivers/input/keyboard/ep93xx_keypad.c | 6 ++---- + drivers/input/keyboard/iqs62x-keys.c | 6 ++---- + drivers/input/keyboard/matrix_keypad.c | 6 ++---- + drivers/input/keyboard/omap-keypad.c | 6 ++---- + drivers/input/keyboard/omap4-keypad.c | 6 ++---- + drivers/input/keyboard/samsung-keypad.c | 6 ++---- + drivers/input/keyboard/sh_keysc.c | 6 ++---- + drivers/input/keyboard/spear-keyboard.c | 6 ++---- + drivers/input/keyboard/stmpe-keypad.c | 6 ++---- + drivers/input/keyboard/tegra-kbc.c | 7 ++----- + drivers/input/misc/88pm80x_onkey.c | 5 ++--- + drivers/input/misc/axp20x-pek.c | 11 +---------- + drivers/input/misc/da9052_onkey.c | 6 ++---- + drivers/input/misc/da9055_onkey.c | 6 ++---- + drivers/input/misc/ideapad_slidebar.c | 6 ++---- + drivers/input/misc/iqs269a.c | 10 ++-------- + drivers/input/misc/kxtj9.c | 29 ++++++++++++++++------------ + drivers/input/misc/m68kspkr.c | 6 ++---- + drivers/input/misc/max8997_haptic.c | 6 ++---- + drivers/input/misc/mc13783-pwrbutton.c | 6 ++---- + drivers/input/misc/palmas-pwrbutton.c | 6 ++---- + drivers/input/misc/pcap_keys.c | 6 ++---- + drivers/input/misc/pcf50633-input.c | 6 ++---- + drivers/input/misc/pcspkr.c | 6 ++---- + drivers/input/misc/pm8941-pwrkey.c | 6 ++---- + drivers/input/misc/soc_button_array.c | 6 ++---- + drivers/input/misc/sparcspkr.c | 12 ++++-------- + drivers/input/misc/wistron_btns.c | 6 ++---- + drivers/input/misc/wm831x-on.c | 6 ++---- + drivers/input/mouse/cyapa.c | 14 +++----------- + drivers/input/mouse/navpoint.c | 6 ++---- + drivers/input/rmi4/rmi_f34.c | 2 +- + drivers/input/serio/altera_ps2.c | 6 ++---- + drivers/input/serio/ams_delta_serio.c | 6 ++---- + drivers/input/serio/apbps2.c | 6 ++---- + drivers/input/serio/arc_ps2.c | 6 ++---- + drivers/input/serio/ct82c710.c | 6 ++---- + drivers/input/serio/i8042-sparcio.h | 6 ++---- + drivers/input/serio/i8042.c | 6 ++---- + drivers/input/serio/ioc3kbd.c | 6 ++---- + drivers/input/serio/maceps2.c | 6 ++---- + drivers/input/serio/olpc_apsp.c | 6 ++---- + drivers/input/serio/ps2-gpio.c | 5 ++--- + drivers/input/serio/q40kbd.c | 6 ++---- + drivers/input/serio/rpckbd.c | 6 ++---- + drivers/input/serio/sun4i-ps2.c | 6 ++---- + drivers/input/serio/xilinx_ps2.c | 6 ++---- + drivers/input/touchscreen/ad7877.c | 12 +++++------- + drivers/input/touchscreen/ad7879-i2c.c | 7 ++++--- + drivers/input/touchscreen/ad7879-spi.c | 7 ++++--- + drivers/input/touchscreen/ad7879.c | 10 ++++++---- + drivers/input/touchscreen/ad7879.h | 3 +++ + drivers/input/touchscreen/ads7846.c | 18 ++++++----------- + drivers/input/touchscreen/da9052_tsi.c | 6 ++---- + drivers/input/touchscreen/edt-ft5x06.c | 10 ++-------- + drivers/input/touchscreen/elants_i2c.c | 15 +++----------- + drivers/input/touchscreen/exc3000.c | 12 +++--------- + drivers/input/touchscreen/hideep.c | 15 +++----------- + drivers/input/touchscreen/hycon-hy46xx.c | 10 ++-------- + drivers/input/touchscreen/ili210x.c | 15 +++++--------- + drivers/input/touchscreen/ilitek_ts_i2c.c | 12 ++---------- + drivers/input/touchscreen/iqs5xx.c | 10 +++------- + drivers/input/touchscreen/mainstone-wm97xx.c | 6 ++---- + drivers/input/touchscreen/mc13783_ts.c | 6 ++---- + drivers/input/touchscreen/melfas_mip4.c | 13 ++----------- + drivers/input/touchscreen/pcap_ts.c | 6 ++---- + drivers/input/touchscreen/raydium_i2c_ts.c | 16 +++------------ + drivers/input/touchscreen/rohm_bu21023.c | 12 ++---------- + drivers/input/touchscreen/s6sy761.c | 10 ++-------- + drivers/input/touchscreen/stmfts.c | 10 ++-------- + drivers/input/touchscreen/stmpe-ts.c | 6 ++---- + drivers/input/touchscreen/sun4i-ts.c | 6 ++---- + drivers/input/touchscreen/ti_am335x_tsc.c | 5 ++--- + drivers/input/touchscreen/tsc2004.c | 7 ++++--- + drivers/input/touchscreen/tsc2005.c | 7 ++++--- + drivers/input/touchscreen/tsc200x-core.c | 18 +++++++---------- + drivers/input/touchscreen/tsc200x-core.h | 1 + + drivers/input/touchscreen/wdt87xx_i2c.c | 16 ++++----------- + drivers/input/touchscreen/wm831x-ts.c | 6 ++---- + drivers/input/touchscreen/wm97xx-core.c | 6 ++---- + include/linux/input.h | 2 +- + include/linux/input/mt.h | 2 +- + 86 files changed, 221 insertions(+), 451 deletions(-) +Merging block/for-next (b7f443536443 Merge branch 'for-6.7/block' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.dk/linux-block.git block/for-next +Auto-merging arch/alpha/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/alpha/kernel/syscalls/syscall.tbl +Auto-merging arch/arm/tools/syscall.tbl +CONFLICT (content): Merge conflict in arch/arm/tools/syscall.tbl +Auto-merging arch/arm64/include/asm/unistd.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd.h +Auto-merging arch/arm64/include/asm/unistd32.h +CONFLICT (content): Merge conflict in arch/arm64/include/asm/unistd32.h +CONFLICT (modify/delete): arch/ia64/kernel/syscalls/syscall.tbl deleted in HEAD and modified in block/for-next. Version block/for-next of arch/ia64/kernel/syscalls/syscall.tbl left in tree. +Auto-merging arch/m68k/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/m68k/kernel/syscalls/syscall.tbl +Auto-merging arch/microblaze/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/microblaze/kernel/syscalls/syscall.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n32.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_n64.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_n64.tbl +Auto-merging arch/mips/kernel/syscalls/syscall_o32.tbl +CONFLICT (content): Merge conflict in arch/mips/kernel/syscalls/syscall_o32.tbl +Auto-merging arch/parisc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/parisc/kernel/syscalls/syscall.tbl +Auto-merging arch/powerpc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/powerpc/kernel/syscalls/syscall.tbl +Auto-merging arch/s390/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/s390/kernel/syscalls/syscall.tbl +Auto-merging arch/sh/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sh/kernel/syscalls/syscall.tbl +Auto-merging arch/sparc/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/sparc/kernel/syscalls/syscall.tbl +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/entry/syscalls/syscall_32.tbl +CONFLICT (content): Merge conflict in arch/x86/entry/syscalls/syscall_32.tbl +Auto-merging arch/x86/entry/syscalls/syscall_64.tbl +Auto-merging arch/xtensa/kernel/syscalls/syscall.tbl +CONFLICT (content): Merge conflict in arch/xtensa/kernel/syscalls/syscall.tbl +Auto-merging drivers/md/md.c +Auto-merging drivers/md/md.h +Auto-merging drivers/md/raid5.c +Auto-merging include/linux/sched.h +Auto-merging include/linux/syscalls.h +Auto-merging include/uapi/asm-generic/unistd.h +CONFLICT (content): Merge conflict in include/uapi/asm-generic/unistd.h +Auto-merging io_uring/io_uring.c +Auto-merging io_uring/io_uring.h +Auto-merging io_uring/kbuf.c +Auto-merging kernel/exit.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sys_ni.c +Resolved 'arch/alpha/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/arm/tools/syscall.tbl' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd.h' using previous resolution. +Resolved 'arch/arm64/include/asm/unistd32.h' using previous resolution. +Resolved 'arch/m68k/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/microblaze/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n32.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_n64.tbl' using previous resolution. +Resolved 'arch/mips/kernel/syscalls/syscall_o32.tbl' using previous resolution. +Resolved 'arch/parisc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/powerpc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/s390/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sh/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/sparc/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'arch/x86/entry/syscalls/syscall_32.tbl' using previous resolution. +Resolved 'arch/xtensa/kernel/syscalls/syscall.tbl' using previous resolution. +Resolved 'include/uapi/asm-generic/unistd.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git rm -f arch/ia64/kernel/syscalls/syscall.tbl +rm 'arch/ia64/kernel/syscalls/syscall.tbl' +$ git commit --no-edit -v -a +[master c449f739e15b] Merge branch 'for-next' of git://git.kernel.dk/linux-block.git +$ git diff -M --stat --summary HEAD^.. + arch/alpha/kernel/syscalls/syscall.tbl | 3 + + arch/arm/tools/syscall.tbl | 3 + + arch/arm64/include/asm/unistd.h | 2 +- + arch/arm64/include/asm/unistd32.h | 6 + + arch/m68k/kernel/syscalls/syscall.tbl | 3 + + arch/microblaze/kernel/syscalls/syscall.tbl | 3 + + arch/mips/kernel/syscalls/syscall_n32.tbl | 3 + + arch/mips/kernel/syscalls/syscall_n64.tbl | 3 + + arch/mips/kernel/syscalls/syscall_o32.tbl | 3 + + arch/parisc/kernel/syscalls/syscall.tbl | 3 + + arch/powerpc/kernel/syscalls/syscall.tbl | 3 + + arch/s390/kernel/syscalls/syscall.tbl | 3 + + arch/sh/kernel/syscalls/syscall.tbl | 3 + + arch/sparc/kernel/syscalls/syscall.tbl | 3 + + arch/x86/Kconfig | 2 +- + arch/x86/entry/syscalls/syscall_32.tbl | 3 + + arch/x86/entry/syscalls/syscall_64.tbl | 3 + + arch/xtensa/kernel/syscalls/syscall.tbl | 3 + + block/badblocks.c | 1680 +++++++++++++++++++++------ + block/blk-flush.c | 11 +- + block/blk-mq-debugfs.c | 1 - + block/blk-mq.c | 45 +- + block/blk-mq.h | 57 +- + block/partitions/ibm.c | 98 +- + drivers/block/aoe/aoenet.c | 3 +- + drivers/block/null_blk/main.c | 22 +- + drivers/block/ublk_drv.c | 27 +- + drivers/block/virtio_blk.c | 2 - + drivers/cdrom/cdrom.c | 1 - + drivers/md/dm-raid.c | 17 +- + drivers/md/md-autodetect.c | 4 +- + drivers/md/md-bitmap.c | 61 +- + drivers/md/md-linear.c | 28 +- + drivers/md/md-linear.h | 2 +- + drivers/md/md.c | 805 +++++++------ + drivers/md/md.h | 52 +- + drivers/md/raid1.c | 6 +- + drivers/md/raid10.c | 3 - + drivers/md/raid5-cache.c | 64 +- + drivers/md/raid5.c | 59 +- + drivers/nvme/host/pci.c | 1 - + include/asm-generic/spinlock.h | 16 +- + include/linux/badblocks.h | 30 + + include/linux/blk-mq.h | 2 - + include/linux/cleanup.h | 39 +- + include/linux/io_uring.h | 18 + + include/linux/io_uring_types.h | 15 +- + include/linux/sched.h | 3 + + include/linux/sched/rt.h | 4 + + include/linux/syscalls.h | 10 + + include/uapi/asm-generic/unistd.h | 10 +- + include/uapi/linux/futex.h | 31 +- + include/uapi/linux/io_uring.h | 12 +- + io_uring/Makefile | 4 +- + io_uring/cancel.c | 10 + + io_uring/cancel.h | 4 + + io_uring/futex.c | 386 ++++++ + io_uring/futex.h | 36 + + io_uring/io_uring.c | 50 +- + io_uring/io_uring.h | 1 + + io_uring/kbuf.c | 58 +- + io_uring/opdef.c | 58 +- + io_uring/opdef.h | 2 + + io_uring/rsrc.c | 39 +- + io_uring/rw.c | 92 +- + io_uring/rw.h | 2 + + io_uring/uring_cmd.c | 49 +- + io_uring/waitid.c | 372 ++++++ + io_uring/waitid.h | 15 + + kernel/exit.c | 131 ++- + kernel/exit.h | 30 + + kernel/futex/core.c | 74 +- + kernel/futex/futex.h | 106 +- + kernel/futex/pi.c | 91 +- + kernel/futex/requeue.c | 23 +- + kernel/futex/syscalls.c | 235 +++- + kernel/futex/waitwake.c | 131 ++- + kernel/locking/rtmutex.c | 37 +- + kernel/locking/rwbase_rt.c | 8 + + kernel/locking/rwsem.c | 8 +- + kernel/locking/spinlock_rt.c | 6 + + kernel/locking/test-ww_mutex.c | 48 +- + kernel/locking/ww_rt_mutex.c | 2 +- + kernel/sched/core.c | 64 +- + kernel/sys_ni.c | 3 + + 85 files changed, 4183 insertions(+), 1286 deletions(-) + create mode 100644 io_uring/futex.c + create mode 100644 io_uring/futex.h + create mode 100644 io_uring/waitid.c + create mode 100644 io_uring/waitid.h + create mode 100644 kernel/exit.h +Merging device-mapper/for-next (1d99b7e95035 dm thin: Use the extent allocator for data blocks) +$ 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 +Auto-merging drivers/md/dm.c +Merge made by the 'ort' strategy. + drivers/md/dm-linear.c | 2 +- + drivers/md/dm-stripe.c | 2 +- + drivers/md/dm-thin-metadata.c | 72 ++- + drivers/md/dm-thin-metadata.h | 2 +- + drivers/md/dm-thin.c | 4 +- + drivers/md/dm.c | 11 +- + drivers/md/dm.h | 2 + + drivers/md/persistent-data/Makefile | 1 + + drivers/md/persistent-data/dm-extent-allocator.c | 639 +++++++++++++++++++++++ + drivers/md/persistent-data/dm-extent-allocator.h | 104 ++++ + drivers/md/persistent-data/dm-space-map-common.c | 2 +- + drivers/md/persistent-data/dm-space-map-disk.c | 23 + + drivers/md/persistent-data/dm-space-map.h | 8 + + 13 files changed, 854 insertions(+), 18 deletions(-) + create mode 100644 drivers/md/persistent-data/dm-extent-allocator.c + create mode 100644 drivers/md/persistent-data/dm-extent-allocator.h +Merging libata/for-next (2da4c5e24e86 ata: libata-core: Improve ata_dev_power_set_active()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Merge made by the 'ort' strategy. + drivers/ata/ahci.c | 6 ++ + drivers/ata/ahci_imx.c | 10 +-- + drivers/ata/ahci_xgene.c | 11 +-- + drivers/ata/libahci.c | 2 +- + drivers/ata/libata-core.c | 185 +++++++++++++++++++++++++++------------------ + drivers/ata/libata-eh.c | 54 +++++++------ + drivers/ata/libata-sata.c | 5 +- + drivers/ata/libata-scsi.c | 53 +++---------- + drivers/ata/libata-sff.c | 10 +-- + drivers/ata/libata.h | 2 + + drivers/ata/pata_cs5520.c | 2 +- + drivers/ata/sata_mv.c | 9 ++- + drivers/scsi/sd.c | 9 +-- + include/linux/libata.h | 25 +++--- + include/scsi/scsi_device.h | 1 - + 15 files changed, 200 insertions(+), 184 deletions(-) +Merging pcmcia/pcmcia-next (4f733de8b78a pcmcia: tcic: remove unneeded "&" in call to setup_timer()) +$ git merge -m Merge branch 'pcmcia-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brodo/linux.git pcmcia/pcmcia-next +Merge made by the 'ort' strategy. + drivers/pcmcia/cs.c | 1 + + drivers/pcmcia/ds.c | 14 +++++++++----- + drivers/pcmcia/pcmcia_resource.c | 2 +- + drivers/pcmcia/tcic.c | 2 +- + 4 files changed, 12 insertions(+), 7 deletions(-) +Merging mmc/next (a2b8fa785358 mmc: jz4740: Use device_get_match_data()) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + .../devicetree/bindings/mmc/npcm,sdhci.yaml | 45 +++++++ + .../devicetree/bindings/mmc/renesas,sdhi.yaml | 2 + + .../devicetree/bindings/mmc/sdhci-msm.yaml | 8 +- + .../bindings/mmc/starfive,jh7110-mmc.yaml | 2 - + drivers/memstick/host/jmb38x_ms.c | 2 +- + drivers/mmc/core/debugfs.c | 51 +++++++- + drivers/mmc/core/mmc.c | 7 +- + drivers/mmc/core/queue.c | 6 +- + drivers/mmc/host/Kconfig | 12 +- + drivers/mmc/host/Makefile | 1 + + drivers/mmc/host/atmel-mci.c | 9 +- + drivers/mmc/host/dw_mmc-starfive.c | 143 +++++++-------------- + drivers/mmc/host/jz4740_mmc.c | 15 +-- + drivers/mmc/host/mmc_hsq.c | 22 ++++ + drivers/mmc/host/mmc_hsq.h | 11 ++ + drivers/mmc/host/mmci.c | 3 +- + drivers/mmc/host/mmci.h | 2 + + drivers/mmc/host/sdhci-esdhc-imx.c | 52 +++++--- + drivers/mmc/host/sdhci-npcm.c | 94 ++++++++++++++ + drivers/mmc/host/sdhci-pci-core.c | 5 +- + drivers/mmc/host/sdhci-pci-gli.c | 14 ++ + drivers/mmc/host/sdhci-pltfm.c | 38 ++---- + drivers/mmc/host/vub300.c | 22 ++-- + include/linux/mmc/host.h | 1 + + 24 files changed, 383 insertions(+), 184 deletions(-) + create mode 100644 Documentation/devicetree/bindings/mmc/npcm,sdhci.yaml + create mode 100644 drivers/mmc/host/sdhci-npcm.c +Merging mfd/for-mfd-next (b5cd5e72a71e mfd: qcom-spmi-pmic: Switch to EXPORT_SYMBOL_GPL()) +$ 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 +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-driver-intel-m10-bmc | 4 +- + .../bindings/input/twl4030-pwrbutton.txt | 2 +- + Documentation/devicetree/bindings/mfd/max8998.txt | 125 -------- + .../devicetree/bindings/mfd/maxim,max5970.yaml | 5 + + .../devicetree/bindings/mfd/maxim,max8998.yaml | 324 +++++++++++++++++++++ + .../devicetree/bindings/mfd/mediatek,mt6357.yaml | 2 + + Documentation/devicetree/bindings/mfd/mt6397.txt | 4 +- + .../devicetree/bindings/mfd/qcom,spmi-pmic.yaml | 11 +- + .../devicetree/bindings/mfd/qcom,tcsr.yaml | 114 ++++++-- + .../devicetree/bindings/mfd/qcom-pm8xxx.yaml | 26 +- + .../devicetree/bindings/mfd/rockchip,rk805.yaml | 1 + + .../devicetree/bindings/mfd/rockchip,rk808.yaml | 1 + + .../devicetree/bindings/mfd/rockchip,rk809.yaml | 3 +- + .../devicetree/bindings/mfd/rockchip,rk818.yaml | 1 + + .../bindings/mfd/stericsson,db8500-prcmu.yaml | 2 +- + Documentation/devicetree/bindings/mfd/syscon.yaml | 2 + + .../devicetree/bindings/mfd/ti,lp87524-q1.yaml | 1 + + .../devicetree/bindings/mfd/ti,lp87561-q1.yaml | 1 + + .../devicetree/bindings/mfd/ti,lp87565-q1.yaml | 1 + + Documentation/devicetree/bindings/mfd/ti,twl.yaml | 67 +++++ + .../devicetree/bindings/mfd/twl-family.txt | 46 --- + .../devicetree/bindings/mfd/x-powers,axp152.yaml | 5 +- + drivers/mfd/arizona-i2c.c | 11 +- + drivers/mfd/atmel-hlcdc.c | 1 + + drivers/mfd/axp20x.c | 44 +-- + drivers/mfd/db8500-prcmu.c | 4 +- + drivers/mfd/dln2.c | 1 - + drivers/mfd/intel-lpss-pci.c | 13 + + drivers/mfd/iqs62x.c | 2 +- + drivers/mfd/lpc_ich.c | 127 ++++++-- + drivers/mfd/madera-i2c.c | 9 +- + drivers/mfd/max77541.c | 6 +- + drivers/mfd/max77620.c | 6 +- + drivers/mfd/max77686.c | 2 +- + drivers/mfd/max8907.c | 4 +- + drivers/mfd/max8997.c | 12 +- + drivers/mfd/max8998.c | 12 +- + drivers/mfd/mfd-core.c | 17 +- + drivers/mfd/palmas.c | 60 ++-- + drivers/mfd/qcom-spmi-pmic.c | 111 ++++--- + drivers/mfd/rk8xx-i2c.c | 6 +- + drivers/mfd/stm32-timers.c | 46 +++ + drivers/mfd/tps65086.c | 2 +- + drivers/mfd/tps65090.c | 2 +- + drivers/mfd/tps65218.c | 2 +- + drivers/mfd/tps6586x.c | 2 +- + drivers/mfd/tps65910.c | 2 +- + drivers/mfd/tps65912-core.c | 2 +- + drivers/mfd/twl-core.c | 18 +- + drivers/mfd/wcd934x.c | 2 +- + include/linux/mfd/abx500/ab8500.h | 6 - + include/linux/mfd/core.h | 2 +- + include/linux/mfd/lpc_ich.h | 7 +- + include/linux/mfd/stm32-timers.h | 11 + + 54 files changed, 894 insertions(+), 406 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/mfd/max8998.txt + create mode 100644 Documentation/devicetree/bindings/mfd/maxim,max8998.yaml + create mode 100644 Documentation/devicetree/bindings/mfd/ti,twl.yaml + delete mode 100644 Documentation/devicetree/bindings/mfd/twl-family.txt +Merging backlight/for-backlight-next (40da4737717b backlight: pwm_bl: Disable PWM on shutdown, suspend and remove) +$ git merge -m Merge branch 'for-backlight-next' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/backlight.git backlight/for-backlight-next +Merge made by the 'ort' strategy. + .../bindings/leds/backlight/mps,mp3309c.yaml | 73 ++++++++++++++++++++++ + drivers/video/backlight/pwm_bl.c | 22 +++++++ + 2 files changed, 95 insertions(+) + create mode 100644 Documentation/devicetree/bindings/leds/backlight/mps,mp3309c.yaml +Merging battery/for-next (b3c3a197baf2 power: supply: cpcap: Drop non-DT driver matching) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sre/linux-power-supply.git battery/for-next +Auto-merging Documentation/devicetree/bindings/vendor-prefixes.yaml +Auto-merging MAINTAINERS +Auto-merging drivers/power/reset/Kconfig +Auto-merging drivers/power/supply/Kconfig +Auto-merging drivers/power/supply/ab8500_btemp.c +Auto-merging drivers/power/supply/ab8500_chargalg.c +Auto-merging drivers/power/supply/mt6370-charger.c +Auto-merging drivers/power/supply/power_supply_sysfs.c +Auto-merging drivers/power/supply/rk817_charger.c +Merge made by the 'ort' strategy. + .../bindings/power/reset/gpio-poweroff.yaml | 6 + + .../bindings/power/reset/syscon-poweroff.yaml | 10 +- + .../bindings/power/supply/maxim,max17040.yaml | 31 ++ + .../bindings/power/supply/mitsumi,mm8013.yaml | 38 ++ + .../bindings/power/supply/qcom,pm8916-bms-vm.yaml | 83 +++++ + .../bindings/power/supply/qcom,pm8916-lbc.yaml | 128 +++++++ + .../bindings/power/supply/sbs,sbs-manager.yaml | 6 + + .../power/supply/stericsson,ab8500-battery.txt | 34 -- + .../devicetree/bindings/vendor-prefixes.yaml | 2 + + MAINTAINERS | 5 + + drivers/power/reset/Kconfig | 2 +- + drivers/power/reset/axxia-reset.c | 7 +- + drivers/power/reset/gpio-poweroff.c | 82 +++-- + drivers/power/reset/msm-poweroff.c | 7 +- + drivers/power/reset/nvmem-reboot-mode.c | 4 +- + drivers/power/reset/st-poweroff.c | 7 +- + drivers/power/reset/syscon-poweroff.c | 29 +- + drivers/power/reset/xgene-reboot.c | 7 +- + drivers/power/supply/88pm860x_battery.c | 8 +- + drivers/power/supply/Kconfig | 34 +- + drivers/power/supply/Makefile | 3 + + drivers/power/supply/ab8500_btemp.c | 6 +- + drivers/power/supply/ab8500_chargalg.c | 6 +- + drivers/power/supply/ab8500_charger.c | 6 +- + drivers/power/supply/ab8500_fg.c | 6 +- + drivers/power/supply/acer_a500_battery.c | 6 +- + drivers/power/supply/act8945a_charger.c | 6 +- + drivers/power/supply/axp20x_ac_power.c | 2 +- + drivers/power/supply/axp20x_usb_power.c | 2 +- + drivers/power/supply/bq24257_charger.c | 76 ++-- + drivers/power/supply/bq2515x_charger.c | 65 ++-- + drivers/power/supply/bq256xx_charger.c | 50 +-- + drivers/power/supply/charger-manager.c | 6 +- + drivers/power/supply/cpcap-battery.c | 6 +- + drivers/power/supply/cpcap-charger.c | 19 +- + drivers/power/supply/da9030_battery.c | 6 +- + drivers/power/supply/da9052-battery.c | 6 +- + drivers/power/supply/da9150-charger.c | 6 +- + drivers/power/supply/goldfish_battery.c | 5 +- + drivers/power/supply/ipaq_micro_battery.c | 6 +- + drivers/power/supply/isp1704_charger.c | 6 +- + drivers/power/supply/lp8788-charger.c | 6 +- + drivers/power/supply/max14577_charger.c | 6 +- + drivers/power/supply/max17040_battery.c | 27 ++ + drivers/power/supply/max17042_battery.c | 6 +- + drivers/power/supply/max77650-charger.c | 6 +- + drivers/power/supply/max77693_charger.c | 6 +- + drivers/power/supply/max8925_power.c | 5 +- + drivers/power/supply/mm8013.c | 317 +++++++++++++++++ + drivers/power/supply/mt6370-charger.c | 4 +- + drivers/power/supply/pcf50633-charger.c | 6 +- + drivers/power/supply/pm8916_bms_vm.c | 305 +++++++++++++++++ + drivers/power/supply/pm8916_lbc.c | 381 +++++++++++++++++++++ + drivers/power/supply/power_supply_core.c | 10 +- + drivers/power/supply/power_supply_sysfs.c | 12 +- + drivers/power/supply/qcom_pmi8998_charger.c | 3 +- + drivers/power/supply/qcom_smbb.c | 6 +- + drivers/power/supply/rk817_charger.c | 13 + + drivers/power/supply/rt5033_charger.c | 320 +++++++++++++++-- + drivers/power/supply/rx51_battery.c | 6 +- + drivers/power/supply/sbs-battery.c | 8 +- + drivers/power/supply/sc2731_charger.c | 6 +- + drivers/power/supply/tps65090-charger.c | 6 +- + drivers/power/supply/tps65217_charger.c | 6 +- + drivers/power/supply/twl4030_charger.c | 6 +- + drivers/power/supply/twl4030_madc_battery.c | 6 +- + drivers/power/supply/wm831x_backup.c | 6 +- + drivers/power/supply/wm831x_power.c | 5 +- + drivers/power/supply/wm8350_power.c | 5 +- + drivers/power/supply/wm97xx_battery.c | 5 +- + include/linux/power_supply.h | 1 - + 71 files changed, 1932 insertions(+), 403 deletions(-) + create mode 100644 Documentation/devicetree/bindings/power/supply/mitsumi,mm8013.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/qcom,pm8916-bms-vm.yaml + create mode 100644 Documentation/devicetree/bindings/power/supply/qcom,pm8916-lbc.yaml + delete mode 100644 Documentation/devicetree/bindings/power/supply/stericsson,ab8500-battery.txt + create mode 100644 drivers/power/supply/mm8013.c + create mode 100644 drivers/power/supply/pm8916_bms_vm.c + create mode 100644 drivers/power/supply/pm8916_lbc.c +Merging regulator/for-next (80e3e6f2037d Merge remote-tracking branch 'regulator/for-6.7' 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/maxim,max20086.yaml | 1 + + .../bindings/regulator/maxim,max77826.yaml | 2 + + .../regulator/mediatek,mt6358-regulator.yaml | 250 +++++++++++ + .../bindings/regulator/mt6358-regulator.txt | 350 --------------- + .../bindings/regulator/onnn,fan53880.yaml | 2 + + .../bindings/regulator/qcom,spmi-regulator.yaml | 68 ++- + drivers/regulator/da9062-regulator.c | 2 +- + drivers/regulator/da9063-regulator.c | 2 +- + drivers/regulator/fan53555.c | 9 +- + drivers/regulator/ltc3589.c | 61 ++- + drivers/regulator/max20086-regulator.c | 65 ++- + drivers/regulator/mc13xxx.h | 2 +- + drivers/regulator/mp5416.c | 10 +- + drivers/regulator/mp886x.c | 14 +- + drivers/regulator/mt6358-regulator.c | 494 +++++++++++---------- + drivers/regulator/pv88080-regulator.c | 58 +-- + drivers/regulator/qcom_spmi-regulator.c | 96 ++++ + drivers/regulator/rk808-regulator.c | 2 - + drivers/regulator/sy8824x.c | 26 +- + include/linux/mfd/mt6358/registers.h | 23 + + include/linux/regulator/mt6358-regulator.h | 3 + + 21 files changed, 789 insertions(+), 751 deletions(-) + create mode 100644 Documentation/devicetree/bindings/regulator/mediatek,mt6358-regulator.yaml + delete mode 100644 Documentation/devicetree/bindings/regulator/mt6358-regulator.txt +Merging security/next (e50856067289 lsm: fix a spelling mistake) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/lsm.git security/next +Auto-merging include/linux/fs.h +Auto-merging security/selinux/hooks.c +Merge made by the 'ort' strategy. + include/linux/cred.h | 59 ++++++++++++++++++++++++++++++++++++------- + include/linux/fs.h | 2 +- + include/linux/lsm_hook_defs.h | 10 ++++---- + include/linux/security.h | 20 +++++++-------- + kernel/cred.c | 26 +++++++++++-------- + security/apparmor/lsm.c | 4 +-- + security/commoncap.c | 4 +-- + security/security.c | 12 ++++----- + security/selinux/hooks.c | 10 ++++---- + security/tomoyo/tomoyo.c | 2 +- + 10 files changed, 97 insertions(+), 52 deletions(-) +Merging apparmor/apparmor-next (8884ba07786c apparmor: fix invalid reference on profile->disconnected) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Auto-merging security/apparmor/apparmorfs.c +Auto-merging security/apparmor/policy_unpack.c +Merge made by the 'ort' strategy. + security/apparmor/apparmorfs.c | 3 +++ + security/apparmor/audit.c | 1 + + security/apparmor/capability.c | 4 ++-- + security/apparmor/domain.c | 12 +++++++----- + security/apparmor/file.c | 6 +++--- + security/apparmor/include/file.h | 37 ------------------------------------- + security/apparmor/include/net.h | 1 - + security/apparmor/include/policy.h | 9 --------- + security/apparmor/include/task.h | 2 +- + security/apparmor/label.c | 26 ++++++++++++++------------ + security/apparmor/lib.c | 4 ++-- + security/apparmor/match.c | 4 ++-- + security/apparmor/policy.c | 22 +++++++++++++--------- + security/apparmor/policy_compat.c | 1 + + security/apparmor/policy_unpack.c | 7 ++++--- + security/apparmor/resource.c | 8 ++++---- + security/apparmor/task.c | 5 +---- + 17 files changed, 58 insertions(+), 94 deletions(-) +Merging integrity/next-integrity (c1f30e80ce2c ima: annotate iint mutex to avoid lockdep false positive warnings) +$ 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/iint.c +Merge made by the 'ort' strategy. + security/integrity/iint.c | 48 ++++++++++++++++++++++++++++++++++++----------- + 1 file changed, 37 insertions(+), 11 deletions(-) +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 (19c1c9916dbf selinux: simplify avtab_insert_node() prototype) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/selinux.git selinux/next +Merge made by the 'ort' strategy. + security/selinux/Kconfig | 10 ++++++++++ + security/selinux/Makefile | 2 ++ + security/selinux/ss/avtab.c | 37 +++++++++++-------------------------- + security/selinux/ss/hashtab.c | 5 +++++ + security/selinux/ss/hashtab.h | 1 + + security/selinux/ss/policydb.c | 6 +++--- + security/selinux/ss/sidtab.c | 2 +- + 7 files changed, 33 insertions(+), 30 deletions(-) +Merging smack/next (3ad49d37cf57 smackfs: Prevent underflow in smk_set_cipso()) +$ git merge -m Merge branch 'next' of git://github.com/cschaufler/smack-next smack/next +Already up to date. +Merging tomoyo/master (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'master' of https://scm.osdn.net/gitroot/tomoyo/tomoyo-test1.git tomoyo/master +Already up to date. +Merging tpmdd/next (1c8b86a3799f Merge tag 'xsa441-6.6-tag' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/jarkko/linux-tpmdd.git tpmdd/next +Already up to date. +Merging watchdog/master (db7673e6d578 Watchdog: marvell_gti_wdt: Remove redundant dev_err_probe() for platform_get_irq()) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Merge made by the 'ort' strategy. + drivers/watchdog/at91sam9_wdt.c | 20 +++++--------------- + drivers/watchdog/ath79_wdt.c | 19 ++++--------------- + drivers/watchdog/marvell_gti_wdt.c | 2 +- + drivers/watchdog/of_xilinx_wdt.c | 13 ++++++++++--- + drivers/watchdog/sunplus_wdt.c | 17 ++--------------- + 5 files changed, 22 insertions(+), 49 deletions(-) +Merging iommu/next (52e9fd0e9a6b Merge branches 'arm/tegra', 's390', 'x86/amd' and 'core' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git iommu/next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging arch/arm/configs/multi_v7_defconfig +Auto-merging arch/s390/pci/pci.c +Auto-merging drivers/iommu/Kconfig +CONFLICT (content): Merge conflict in drivers/iommu/Kconfig +Resolved 'drivers/iommu/Kconfig' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master b5e67afaf13c] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/joro/iommu.git +$ git diff -M --stat --summary HEAD^.. + Documentation/admin-guide/kernel-parameters.txt | 9 +- + arch/arm/configs/multi_v7_defconfig | 1 - + arch/arm/configs/tegra_defconfig | 1 - + arch/powerpc/kernel/iommu.c | 46 +- + arch/s390/include/asm/pci.h | 11 - + arch/s390/include/asm/pci_clp.h | 3 + + arch/s390/include/asm/pci_dma.h | 119 +-- + arch/s390/pci/Makefile | 2 +- + arch/s390/pci/pci.c | 35 +- + arch/s390/pci/pci_bus.c | 5 - + arch/s390/pci/pci_debug.c | 12 +- + arch/s390/pci/pci_dma.c | 735 ----------------- + arch/s390/pci/pci_event.c | 17 +- + arch/s390/pci/pci_sysfs.c | 19 +- + drivers/iommu/Kconfig | 15 +- + drivers/iommu/Makefile | 1 - + drivers/iommu/amd/Kconfig | 9 - + drivers/iommu/amd/Makefile | 1 - + drivers/iommu/amd/amd_iommu.h | 35 +- + drivers/iommu/amd/amd_iommu_types.h | 52 +- + drivers/iommu/amd/init.c | 121 +-- + drivers/iommu/amd/io_pgtable_v2.c | 8 +- + drivers/iommu/amd/iommu.c | 582 ++++++-------- + drivers/iommu/amd/iommu_v2.c | 996 ------------------------ + drivers/iommu/apple-dart.c | 5 +- + drivers/iommu/arm/arm-smmu/qcom_iommu.c | 45 +- + drivers/iommu/dma-iommu.c | 200 +++-- + drivers/iommu/exynos-iommu.c | 83 +- + drivers/iommu/fsl_pamu_domain.c | 41 +- + drivers/iommu/intel/iommu.c | 5 +- + drivers/iommu/iommu.c | 463 ++++++----- + drivers/iommu/iommufd/selftest.c | 19 +- + drivers/iommu/iova.c | 95 ++- + drivers/iommu/ipmmu-vmsa.c | 72 +- + drivers/iommu/msm_iommu.c | 35 +- + drivers/iommu/mtk_iommu.c | 35 +- + drivers/iommu/mtk_iommu_v1.c | 28 +- + drivers/iommu/omap-iommu.c | 69 +- + drivers/iommu/omap-iommu.h | 2 +- + drivers/iommu/rockchip-iommu.c | 59 +- + drivers/iommu/s390-iommu.c | 424 +++++++++- + drivers/iommu/sprd-iommu.c | 36 +- + drivers/iommu/sun50i-iommu.c | 80 +- + drivers/iommu/tegra-gart.c | 371 --------- + drivers/iommu/tegra-smmu.c | 58 +- + drivers/memory/tegra/mc.c | 34 - + drivers/memory/tegra/tegra20.c | 28 - + include/linux/amd-iommu.h | 120 --- + include/linux/iommu.h | 33 +- + include/soc/tegra/mc.h | 26 - + 50 files changed, 1681 insertions(+), 3620 deletions(-) + delete mode 100644 arch/s390/pci/pci_dma.c + delete mode 100644 drivers/iommu/amd/iommu_v2.c + delete mode 100644 drivers/iommu/tegra-gart.c +Merging audit/next (97f576eb38ae audit: Annotate struct audit_chunk with __counted_by) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Auto-merging kernel/audit_tree.c +Merge made by the 'ort' strategy. + kernel/audit_tree.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging devicetree/for-next (00d589ace5f4 dt-bindings: writing-schema: add example for multiple DT_SCHEMA_FILES) +$ 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/panel/panel-simple.yaml +Auto-merging MAINTAINERS +Auto-merging tools/testing/selftests/Makefile +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/psci.yaml | 1 + + .../panel/panel-simple-lvds-dual-ports.yaml | 118 +++++++++++++++++++++ + .../bindings/display/panel/panel-simple.yaml | 10 -- + .../bindings/interrupt-controller/qcom,pdc.yaml | 1 + + .../devicetree/bindings/writing-schema.rst | 5 +- + MAINTAINERS | 1 + + scripts/dtc/dt-extract-compatibles | 74 ++++++++++--- + tools/testing/selftests/Makefile | 1 + + tools/testing/selftests/dt/.gitignore | 1 + + tools/testing/selftests/dt/Makefile | 21 ++++ + tools/testing/selftests/dt/compatible_ignore_list | 1 + + tools/testing/selftests/dt/ktap_helpers.sh | 70 ++++++++++++ + .../testing/selftests/dt/test_unprobed_devices.sh | 83 +++++++++++++++ + 13 files changed, 360 insertions(+), 27 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/panel/panel-simple-lvds-dual-ports.yaml + create mode 100644 tools/testing/selftests/dt/.gitignore + create mode 100644 tools/testing/selftests/dt/Makefile + create mode 100644 tools/testing/selftests/dt/compatible_ignore_list + create mode 100644 tools/testing/selftests/dt/ktap_helpers.sh + create mode 100755 tools/testing/selftests/dt/test_unprobed_devices.sh +Merging dt-krzk/for-next (d896029c9726 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. +Merging mailbox/mailbox-for-next (a493208079e2 mailbox: qcom-ipcc: fix incorrect num_chans counting) +$ 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 (713e934b7415 Merge remote-tracking branch 'spi/for-6.7' into spi-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Merge made by the 'ort' strategy. + .../bindings/spi/allwinner,sun4i-a10-spi.yaml | 2 + + .../bindings/spi/allwinner,sun6i-a31-spi.yaml | 2 + + .../bindings/spi/arm,pl022-peripheral-props.yaml | 61 +++++ + .../bindings/spi/nvidia,tegra210-quad.yaml | 1 + + .../devicetree/bindings/spi/qcom,spi-qup.yaml | 13 ++ + .../devicetree/bindings/spi/renesas,rzv2m-csi.yaml | 9 + + .../devicetree/bindings/spi/rockchip-sfc.yaml | 2 + + .../devicetree/bindings/spi/snps,dw-apb-ssi.yaml | 2 + + .../bindings/spi/spi-peripheral-props.yaml | 6 + + .../devicetree/bindings/spi/spi-pl022.yaml | 51 ---- + .../devicetree/bindings/spi/st,stm32-spi.yaml | 20 -- + drivers/spi/Kconfig | 3 +- + drivers/spi/spi-ar934x.c | 22 +- + drivers/spi/spi-armada-3700.c | 23 +- + drivers/spi/spi-aspeed-smc.c | 16 +- + drivers/spi/spi-at91-usart.c | 22 +- + drivers/spi/spi-ath79.c | 11 +- + drivers/spi/spi-axi-spi-engine.c | 25 +- + drivers/spi/spi-bcm2835.c | 73 +++--- + drivers/spi/spi-bcm2835aux.c | 23 +- + drivers/spi/spi-cadence-quadspi.c | 45 +++- + drivers/spi/spi-cadence.c | 23 +- + drivers/spi/spi-cavium-thunderx.c | 8 +- + drivers/spi/spi-davinci.c | 11 +- + drivers/spi/spi-dw-bt1.c | 23 +- + drivers/spi/spi-dw-mmio.c | 31 +-- + drivers/spi/spi-fsl-dspi.c | 12 +- + drivers/spi/spi-geni-qcom.c | 6 +- + drivers/spi/spi-lantiq-ssc.c | 10 +- + drivers/spi/spi-lm70llp.c | 20 +- + drivers/spi/spi-lp8841-rtc.c | 56 ++--- + drivers/spi/spi-meson-spicc.c | 121 ++++------ + drivers/spi/spi-meson-spifc.c | 79 +++---- + drivers/spi/spi-microchip-core-qspi.c | 39 +--- + drivers/spi/spi-microchip-core.c | 83 +++---- + drivers/spi/spi-mpc512x-psc.c | 54 ++--- + drivers/spi/spi-mpc52xx-psc.c | 38 +-- + drivers/spi/spi-mpc52xx.c | 56 ++--- + drivers/spi/spi-mt65xx.c | 190 +++++++-------- + drivers/spi/spi-mt7621.c | 50 ++-- + drivers/spi/spi-mtk-nor.c | 14 +- + drivers/spi/spi-mtk-snfi.c | 67 +----- + drivers/spi/spi-mux.c | 2 +- + drivers/spi/spi-mxic.c | 68 +++--- + drivers/spi/spi-mxs.c | 70 +++--- + drivers/spi/spi-npcm-fiu.c | 14 +- + drivers/spi/spi-npcm-pspi.c | 68 +++--- + drivers/spi/spi-nxp-fspi.c | 30 +-- + drivers/spi/spi-oc-tiny.c | 30 +-- + drivers/spi/spi-omap-uwire.c | 32 +-- + drivers/spi/spi-omap2-mcspi.c | 259 +++++++++++---------- + drivers/spi/spi-orion.c | 11 +- + drivers/spi/spi-pci1xxxx.c | 2 +- + drivers/spi/spi-pic32-sqi.c | 27 +-- + drivers/spi/spi-pic32.c | 8 +- + drivers/spi/spi-pl022.c | 11 +- + drivers/spi/spi-qup.c | 50 +++- + drivers/spi/spi-rockchip.c | 30 +-- + drivers/spi/spi-rzv2m-csi.c | 127 ++++++---- + drivers/spi/spi-tegra20-slink.c | 2 + + drivers/spi/spi.c | 4 - + drivers/spi/spidev.c | 42 ++-- + include/linux/spi/spi.h | 27 ++- + 63 files changed, 1076 insertions(+), 1261 deletions(-) + create mode 100644 Documentation/devicetree/bindings/spi/arm,pl022-peripheral-props.yaml +Merging tip/master (541c0b0e9d0a Merge branch into tip/master: 'x86/tdx') +$ 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/kernel-parameters.txt +Auto-merging Documentation/admin-guide/sysctl/kernel.rst +Auto-merging arch/x86/Kconfig +Auto-merging arch/x86/include/asm/bitops.h +Auto-merging arch/x86/include/asm/smp.h +Auto-merging arch/x86/include/asm/svm.h +Auto-merging arch/x86/kernel/cpu/microcode/amd.c +Auto-merging arch/x86/kernel/fpu/xstate.c +Auto-merging arch/x86/kernel/setup.c +Auto-merging arch/x86/kernel/smpboot.c +CONFLICT (content): Merge conflict in arch/x86/kernel/smpboot.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/mm/numa.c +Auto-merging drivers/firmware/efi/libstub/x86-stub.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_topology.c +Auto-merging include/linux/mm.h +Auto-merging include/linux/mm_types.h +Auto-merging include/linux/pci_ids.h +CONFLICT (content): Merge conflict in include/linux/pci_ids.h +Auto-merging include/linux/sched.h +Auto-merging include/linux/sched/numa_balancing.h +Auto-merging include/linux/sched/signal.h +Auto-merging kernel/cpu.c +Auto-merging kernel/futex/requeue.c +Auto-merging kernel/sched/core.c +Auto-merging kernel/sched/fair.c +Auto-merging kernel/signal.c +Auto-merging kernel/sysctl.c +Auto-merging mm/mempolicy.c +Auto-merging tools/objtool/noreturns.h +Recorded preimage for 'arch/x86/kernel/smpboot.c' +Resolved 'include/linux/pci_ids.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'arch/x86/kernel/smpboot.c'. +[master 460e500d8d37] 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/hw-vuln/srso.rst | 24 +- + Documentation/admin-guide/kernel-parameters.txt | 11 + + Documentation/admin-guide/pm/intel_idle.rst | 17 +- + Documentation/admin-guide/sysctl/kernel.rst | 3 +- + Documentation/arch/x86/amd-memory-encryption.rst | 2 +- + Documentation/arch/x86/iommu.rst | 2 +- + Documentation/arch/x86/resctrl.rst | 16 +- + Documentation/arch/x86/topology.rst | 12 +- + Documentation/scheduler/sched-capacity.rst | 13 +- + Documentation/scheduler/sched-energy.rst | 29 +- + Documentation/scheduler/sched-rt-group.rst | 40 +- + arch/alpha/include/asm/local.h | 33 +- + arch/loongarch/include/asm/local.h | 27 +- + arch/mips/include/asm/local.h | 27 +- + arch/powerpc/include/asm/local.h | 12 +- + arch/powerpc/kernel/smp.c | 4 +- + arch/s390/kernel/topology.c | 2 +- + arch/x86/Kconfig | 59 +- + arch/x86/Makefile | 4 +- + arch/x86/boot/Makefile | 2 +- + arch/x86/boot/compressed/sev.c | 2 +- + arch/x86/boot/compressed/tdx.c | 6 +- + arch/x86/boot/compressed/vmlinux.lds.S | 6 +- + arch/x86/boot/header.S | 213 ++--- + arch/x86/boot/setup.ld | 14 +- + arch/x86/boot/tools/build.c | 273 +----- + arch/x86/coco/tdx/tdcall.S | 236 +---- + arch/x86/coco/tdx/tdx-shared.c | 28 +- + arch/x86/coco/tdx/tdx.c | 140 ++- + arch/x86/entry/common.c | 113 ++- + arch/x86/entry/entry.S | 2 +- + arch/x86/entry/entry_32.S | 2 +- + arch/x86/entry/entry_64.S | 84 +- + arch/x86/entry/entry_64_compat.S | 11 +- + arch/x86/entry/thunk_32.S | 2 +- + arch/x86/entry/thunk_64.S | 2 +- + arch/x86/entry/vdso/Makefile | 3 +- + arch/x86/entry/vdso/vsgx.S | 1 - + arch/x86/events/amd/uncore.c | 1093 ++++++++++++++-------- + arch/x86/events/core.c | 6 +- + arch/x86/events/intel/core.c | 485 +++++----- + arch/x86/events/intel/cstate.c | 3 + + arch/x86/events/intel/ds.c | 4 +- + arch/x86/events/intel/pt.c | 8 +- + arch/x86/events/intel/uncore.c | 2 +- + arch/x86/events/perf_event.h | 37 +- + arch/x86/events/rapl.c | 22 +- + arch/x86/hyperv/hv_vtl.c | 2 +- + arch/x86/hyperv/ivm.c | 12 +- + arch/x86/include/asm/Kbuild | 1 - + arch/x86/include/asm/alternative.h | 4 +- + arch/x86/include/asm/apic.h | 44 +- + arch/x86/include/asm/bitops.h | 9 + + arch/x86/include/asm/cacheinfo.h | 3 - + arch/x86/include/asm/cmpxchg.h | 6 + + arch/x86/include/asm/cpu.h | 20 +- + arch/x86/include/asm/elf.h | 3 +- + arch/x86/include/asm/hw_irq.h | 6 +- + arch/x86/include/asm/ia32.h | 16 +- + arch/x86/include/asm/local.h | 33 +- + arch/x86/include/asm/mem_encrypt.h | 4 +- + arch/x86/include/asm/microcode.h | 21 +- + arch/x86/include/asm/mpspec.h | 2 +- + arch/x86/include/asm/mshyperv.h | 4 +- + arch/x86/include/asm/msr-index.h | 16 +- + arch/x86/include/asm/nospec-branch.h | 73 +- + arch/x86/include/asm/percpu.h | 237 ++++- + arch/x86/include/asm/perf_event.h | 9 + + arch/x86/include/asm/pgtable.h | 8 + + arch/x86/include/asm/preempt.h | 6 +- + arch/x86/include/asm/processor.h | 63 +- + arch/x86/include/asm/prom.h | 5 + + arch/x86/include/asm/proto.h | 3 + + arch/x86/include/asm/shared/tdx.h | 91 +- + arch/x86/include/asm/smp.h | 4 +- + arch/x86/include/asm/sparsemem.h | 2 + + arch/x86/include/asm/spec-ctrl.h | 11 + + arch/x86/include/asm/svm.h | 6 - + arch/x86/include/asm/syscall.h | 6 +- + arch/x86/include/asm/tdx.h | 11 + + arch/x86/include/asm/topology.h | 12 +- + arch/x86/include/asm/x86_init.h | 2 +- + arch/x86/kernel/Makefile | 1 + + arch/x86/kernel/acpi/boot.c | 4 +- + arch/x86/kernel/amd_nb.c | 12 +- + arch/x86/kernel/apic/apic.c | 29 +- + arch/x86/kernel/apic/apic_common.c | 4 +- + arch/x86/kernel/apic/apic_flat_64.c | 10 +- + arch/x86/kernel/apic/apic_noop.c | 8 +- + arch/x86/kernel/apic/apic_numachip.c | 16 +- + arch/x86/kernel/apic/bigsmp_32.c | 6 +- + arch/x86/kernel/apic/ipi.c | 13 +- + arch/x86/kernel/apic/local.h | 7 +- + arch/x86/kernel/apic/probe_32.c | 12 +- + arch/x86/kernel/apic/x2apic_cluster.c | 1 + + arch/x86/kernel/apic/x2apic_phys.c | 7 +- + arch/x86/kernel/apic/x2apic_uv_x.c | 8 +- + arch/x86/kernel/asm-offsets.c | 33 +- + arch/x86/kernel/callthunks.c | 5 - + arch/x86/kernel/cpu/Makefile | 2 + + arch/x86/kernel/cpu/amd.c | 45 +- + arch/x86/kernel/cpu/bugs.c | 95 +- + arch/x86/kernel/cpu/cacheinfo.c | 49 +- + arch/x86/kernel/cpu/common.c | 134 ++- + arch/x86/kernel/cpu/cpu.h | 3 + + arch/x86/kernel/cpu/debugfs.c | 58 ++ + arch/x86/kernel/cpu/hygon.c | 48 +- + arch/x86/kernel/cpu/intel.c | 13 - + arch/x86/kernel/cpu/mce/apei.c | 4 +- + arch/x86/kernel/cpu/mce/core.c | 4 +- + arch/x86/kernel/cpu/microcode/amd.c | 155 ++- + arch/x86/kernel/cpu/microcode/core.c | 701 +++++++++----- + arch/x86/kernel/cpu/microcode/intel.c | 713 +++++--------- + arch/x86/kernel/cpu/microcode/internal.h | 36 +- + arch/x86/kernel/cpu/proc.c | 8 +- + arch/x86/kernel/cpu/resctrl/core.c | 11 +- + arch/x86/kernel/cpu/resctrl/ctrlmondata.c | 14 +- + arch/x86/kernel/cpu/resctrl/internal.h | 9 + + arch/x86/kernel/cpu/resctrl/rdtgroup.c | 28 +- + arch/x86/kernel/cpu/topology.c | 13 +- + arch/x86/kernel/cpu/zhaoxin.c | 14 - + arch/x86/kernel/devicetree.c | 6 +- + arch/x86/kernel/fpu/xstate.c | 1 - + arch/x86/kernel/ftrace_32.S | 2 +- + arch/x86/kernel/ftrace_64.S | 2 +- + arch/x86/kernel/head32.c | 6 +- + arch/x86/kernel/head64.c | 8 +- + arch/x86/kernel/head_32.S | 12 +- + arch/x86/kernel/head_64.S | 7 +- + arch/x86/kernel/hpet.c | 4 +- + arch/x86/kernel/idt.c | 7 + + arch/x86/kernel/irqflags.S | 2 +- + arch/x86/kernel/kvm.c | 6 +- + arch/x86/kernel/nmi.c | 22 +- + arch/x86/kernel/setup.c | 4 +- + arch/x86/kernel/sev.c | 2 +- + arch/x86/kernel/smpboot.c | 111 ++- + arch/x86/kernel/unwind_orc.c | 2 +- + arch/x86/kernel/vmlinux.lds.S | 10 +- + arch/x86/kernel/vsmp_64.c | 2 +- + arch/x86/kvm/svm/svm.c | 8 - + arch/x86/lib/checksum_32.S | 2 +- + arch/x86/lib/clear_page_64.S | 2 +- + arch/x86/lib/cmpxchg8b_emu.S | 2 +- + arch/x86/lib/copy_page_64.S | 2 +- + arch/x86/lib/copy_user_64.S | 2 +- + arch/x86/lib/copy_user_uncached_64.S | 2 +- + arch/x86/lib/csum-wrappers_64.c | 5 - + arch/x86/lib/getuser.S | 2 +- + arch/x86/lib/hweight.S | 22 +- + arch/x86/lib/memcpy_64.S | 2 +- + arch/x86/lib/memmove_32.S | 2 +- + arch/x86/lib/memmove_64.S | 2 +- + arch/x86/lib/memset_64.S | 2 +- + arch/x86/lib/putuser.S | 3 +- + arch/x86/lib/retpoline.S | 175 ++-- + arch/x86/mm/maccess.c | 19 +- + arch/x86/mm/mem_encrypt.c | 34 + + arch/x86/mm/mem_encrypt_amd.c | 36 - + arch/x86/mm/numa.c | 87 +- + arch/x86/mm/pti.c | 58 +- + arch/x86/platform/uv/uv_nmi.c | 104 +- + arch/x86/platform/uv/uv_time.c | 2 +- + arch/x86/virt/Makefile | 2 + + arch/x86/virt/vmx/Makefile | 2 + + arch/x86/virt/vmx/tdx/Makefile | 2 + + arch/x86/virt/vmx/tdx/seamcall.S | 61 ++ + arch/x86/virt/vmx/tdx/tdxcall.S | 230 +++-- + arch/x86/xen/apic.c | 10 +- + drivers/acpi/numa/srat.c | 11 +- + drivers/firmware/efi/libstub/Makefile | 7 - + drivers/firmware/efi/libstub/x86-stub.c | 46 +- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 2 +- + drivers/hwmon/fam15h_power.c | 7 +- + drivers/idle/intel_idle.c | 18 +- + drivers/irqchip/irq-renesas-rzg2l.c | 1 + + drivers/platform/x86/intel/ifs/load.c | 8 +- + drivers/scsi/lpfc/lpfc_init.c | 8 +- + drivers/virt/acrn/hsm.c | 2 +- + drivers/xen/events/events_fifo.c | 26 +- + drivers/xen/grant-table.c | 10 +- + include/linux/atomic/atomic-arch-fallback.h | 15 +- + include/linux/atomic/atomic-instrumented.h | 10 +- + include/linux/cpu.h | 2 + + include/linux/cpuhotplug.h | 1 - + include/linux/irqdomain.h | 2 +- + include/linux/list.h | 8 + + include/linux/mm.h | 4 +- + include/linux/mm_types.h | 31 +- + include/linux/numa.h | 14 +- + include/linux/objtool.h | 13 +- + include/linux/pci_ids.h | 1 + + include/linux/perf_event.h | 3 +- + include/linux/preempt.h | 15 +- + include/linux/resctrl.h | 4 +- + include/linux/rtc.h | 17 + + include/linux/sched.h | 7 +- + include/linux/sched/deadline.h | 4 + + include/linux/sched/numa_balancing.h | 10 + + include/linux/sched/signal.h | 3 +- + include/linux/sched/smt.h | 2 +- + include/linux/sched/types.h | 2 +- + include/linux/sched/vhost_task.h | 7 +- + include/linux/seqlock.h | 50 +- + include/linux/smp.h | 2 +- + include/linux/tick.h | 10 - + include/linux/topology.h | 2 +- + include/trace/events/csd.h | 8 +- + include/trace/events/sched.h | 57 ++ + include/uapi/linux/sched/types.h | 4 - + kernel/cpu.c | 18 +- + kernel/events/core.c | 145 +-- + kernel/events/ring_buffer.c | 6 + + kernel/freezer.c | 41 +- + kernel/futex/requeue.c | 2 +- + kernel/irq/generic-chip.c | 6 +- + kernel/locking/lock_events.c | 10 +- + kernel/locking/lockdep_proc.c | 2 +- + kernel/sched/build_utility.c | 1 - + kernel/sched/core.c | 629 ++++++------- + kernel/sched/cpudeadline.c | 2 +- + kernel/sched/deadline.c | 73 +- + kernel/sched/debug.c | 7 +- + kernel/sched/fair.c | 302 +++--- + kernel/sched/idle.c | 4 +- + kernel/sched/pelt.c | 2 +- + kernel/sched/psi.c | 26 +- + kernel/sched/rt.c | 95 +- + kernel/sched/sched.h | 40 +- + kernel/sched/stop_task.c | 4 +- + kernel/sched/topology.c | 188 ++-- + kernel/signal.c | 33 +- + kernel/smp.c | 26 +- + kernel/sysctl.c | 2 +- + kernel/time/alarmtimer.c | 11 + + kernel/time/tick-sched.c | 222 +++-- + kernel/up.c | 2 +- + lib/cpumask.c | 4 +- + lib/rcuref.c | 2 +- + mm/mempolicy.c | 18 +- + scripts/Makefile.vmlinux_o | 3 +- + scripts/atomic/gen-atomic-fallback.sh | 33 +- + scripts/atomic/gen-atomic-instrumented.sh | 3 +- + tools/objtool/arch/x86/decode.c | 6 +- + tools/objtool/check.c | 16 + + tools/objtool/noreturns.h | 1 + + tools/testing/selftests/x86/Makefile | 4 + + tools/testing/selftests/x86/nx_stack.c | 212 +++++ + 248 files changed, 5444 insertions(+), 4534 deletions(-) + create mode 100644 arch/x86/kernel/cpu/debugfs.c + create mode 100644 arch/x86/virt/Makefile + create mode 100644 arch/x86/virt/vmx/Makefile + create mode 100644 arch/x86/virt/vmx/tdx/Makefile + create mode 100644 arch/x86/virt/vmx/tdx/seamcall.S + create mode 100644 tools/testing/selftests/x86/nx_stack.c +Merging clockevents/timers/drivers/next (0a8b07c77ea0 clocksource: Explicitly include correct DT includes) +$ git merge -m Merge branch 'timers/drivers/next' of git://git.linaro.org/people/daniel.lezcano/linux.git clockevents/timers/drivers/next +Already up to date. +Merging edac/edac-for-next (0fd934580ea3 EDAC/versal: Add a Xilinx Versal memory controller driver) +$ git merge -m Merge branch 'edac-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ras/ras.git edac/edac-for-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../memory-controllers/xlnx,versal-ddrmc-edac.yaml | 57 ++ + MAINTAINERS | 7 + + drivers/edac/Kconfig | 12 + + drivers/edac/Makefile | 1 + + drivers/edac/versal_edac.c | 1071 ++++++++++++++++++++ + include/linux/firmware/xlnx-zynqmp.h | 12 + + 6 files changed, 1160 insertions(+) + create mode 100644 Documentation/devicetree/bindings/memory-controllers/xlnx,versal-ddrmc-edac.yaml + create mode 100644 drivers/edac/versal_edac.c +Merging irqchip/irq/irqchip-next (19b5a44bee16 irqchip: Add support for Amlogic-C3 SoCs) +$ 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 (fc1653abba0d Merge probes/for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/trace/linux-trace.git ftrace/for-next +Auto-merging Documentation/filesystems/proc.rst +Auto-merging init/main.c +Merge made by the 'ort' strategy. + Documentation/filesystems/proc.rst | 5 ++++- + fs/proc/Makefile | 1 + + fs/proc/raw_cmdline.c | 25 +++++++++++++++++++++++++ + include/linux/init.h | 3 ++- + init/main.c | 2 +- + 5 files changed, 33 insertions(+), 3 deletions(-) + create mode 100644 fs/proc/raw_cmdline.c +Merging rcu/rcu/next (c06828f759e8 srcu: Explain why callbacks invocations can't run concurrently) +$ 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 MAINTAINERS +Auto-merging arch/arm64/kernel/smp.c +Auto-merging arch/powerpc/kernel/smp.c +Auto-merging arch/s390/kernel/smp.c +Auto-merging arch/x86/kernel/nmi.c +Auto-merging arch/x86/kernel/smpboot.c +Auto-merging include/linux/interrupt.h +Auto-merging kernel/cpu.c +Auto-merging kernel/rcu/tree.c +Auto-merging kernel/smp.c +Auto-merging mm/slab_common.c +Merge made by the 'ort' strategy. + .../Expedited-Grace-Periods.rst | 2 +- + .../Memory-Ordering/TreeRCU-callback-registry.svg | 9 - + .../RCU/Design/Memory-Ordering/TreeRCU-gp-fqs.svg | 4 +- + .../RCU/Design/Memory-Ordering/TreeRCU-gp.svg | 13 +- + .../RCU/Design/Memory-Ordering/TreeRCU-hotplug.svg | 4 +- + .../RCU/Design/Requirements/Requirements.rst | 4 +- + Documentation/RCU/checklist.rst | 25 ++- + Documentation/RCU/listRCU.rst | 9 + + Documentation/RCU/torture.rst | 2 +- + Documentation/RCU/whatisRCU.rst | 4 +- + Documentation/admin-guide/kernel-parameters.txt | 75 ++++++- + Documentation/memory-barriers.txt | 7 + + MAINTAINERS | 2 +- + arch/arm64/kernel/smp.c | 4 +- + arch/powerpc/kernel/smp.c | 2 +- + arch/s390/kernel/smp.c | 2 +- + arch/x86/kernel/smpboot.c | 2 +- + include/linux/interrupt.h | 2 +- + include/linux/rcu_notifier.h | 32 +++ + include/linux/rculist.h | 2 +- + include/linux/rcupdate.h | 2 - + include/linux/rcutiny.h | 2 +- + include/linux/rcutree.h | 17 +- + include/linux/slab.h | 5 +- + include/linux/torture.h | 8 +- + kernel/cpu.c | 13 +- + kernel/locking/locktorture.c | 216 +++++++++++++----- + kernel/rcu/rcu.h | 17 +- + kernel/rcu/rcu_segcblist.c | 4 +- + kernel/rcu/rcutorture.c | 37 +++- + kernel/rcu/refscale.c | 6 +- + kernel/rcu/srcutiny.c | 1 + + kernel/rcu/srcutree.c | 92 +++++--- + kernel/rcu/tasks.h | 15 +- + kernel/rcu/tiny.c | 1 + + kernel/rcu/tree.c | 242 +++++++++++++++------ + kernel/rcu/tree.h | 4 + + kernel/rcu/tree_exp.h | 6 +- + kernel/rcu/tree_stall.h | 135 ++++++++---- + kernel/rcu/update.c | 9 +- + kernel/smp.c | 13 +- + kernel/torture.c | 75 +++---- + mm/slab_common.c | 41 +--- + mm/util.c | 4 +- + scripts/checkpatch.pl | 9 - + tools/include/nolibc/Makefile | 1 + + tools/include/nolibc/arch-aarch64.h | 3 - + tools/include/nolibc/arch-i386.h | 4 +- + tools/include/nolibc/arch-loongarch.h | 4 +- + tools/include/nolibc/arch-riscv.h | 3 - + tools/include/nolibc/arch-x86_64.h | 42 ++++ + tools/include/nolibc/crt.h | 24 +- + tools/include/nolibc/nolibc.h | 4 +- + tools/include/nolibc/stdarg.h | 16 ++ + tools/include/nolibc/stdio.h | 3 +- + tools/include/nolibc/string.h | 38 ++-- + tools/include/nolibc/sys.h | 57 +++-- + tools/testing/selftests/nolibc/.gitignore | 1 + + tools/testing/selftests/nolibc/Makefile | 57 +++-- + .../testing/selftests/nolibc/nolibc-test-linkage.c | 26 +++ + .../testing/selftests/nolibc/nolibc-test-linkage.h | 9 + + tools/testing/selftests/nolibc/nolibc-test.c | 28 ++- + .../testing/selftests/rcutorture/bin/functions.sh | 29 +++ + .../selftests/rcutorture/bin/kvm-recheck.sh | 2 +- + tools/testing/selftests/rcutorture/bin/kvm.sh | 17 +- + .../selftests/rcutorture/bin/parse-console.sh | 9 +- + tools/testing/selftests/rcutorture/bin/torture.sh | 2 +- + .../selftests/rcutorture/configs/rcu/TRACE02 | 1 + + 68 files changed, 1093 insertions(+), 467 deletions(-) + create mode 100644 include/linux/rcu_notifier.h + create mode 100644 tools/include/nolibc/stdarg.h + create mode 100644 tools/testing/selftests/nolibc/nolibc-test-linkage.c + create mode 100644 tools/testing/selftests/nolibc/nolibc-test-linkage.h + mode change 100644 => 100755 tools/testing/selftests/rcutorture/bin/functions.sh +Merging kvm/next (ba8c993c3748 x86/cpu: amd: fix warning in W=1 build) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm/next +Already up to date. +Merging kvm-arm/next (cad9fde0c878 Merge branch kvm-arm64/mops into kvmarm/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 arch/arm64/include/asm/kvm_arm.h +Auto-merging arch/arm64/kvm/arch_timer.c +Auto-merging arch/arm64/kvm/hyp/vhe/switch.c +Auto-merging arch/arm64/kvm/sys_regs.c +Auto-merging include/kvm/arm_arch_timer.h +Auto-merging include/uapi/linux/kvm.h +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 52 ++++++ + Documentation/virt/kvm/arm/index.rst | 1 + + Documentation/virt/kvm/arm/vcpu-features.rst | 48 +++++ + Documentation/virt/kvm/devices/arm-vgic-v3.rst | 7 + + arch/arm64/include/asm/kvm_arm.h | 4 +- + arch/arm64/include/asm/kvm_emulate.h | 15 +- + arch/arm64/include/asm/kvm_host.h | 39 ++++- + arch/arm64/include/asm/kvm_mmu.h | 37 +++- + arch/arm64/include/asm/kvm_nested.h | 3 +- + arch/arm64/include/asm/tlbflush.h | 8 +- + arch/arm64/include/asm/traps.h | 54 +++++- + arch/arm64/include/uapi/asm/kvm.h | 32 ++++ + arch/arm64/kernel/traps.c | 48 +---- + arch/arm64/kvm/arch_timer.c | 6 +- + arch/arm64/kvm/arm.c | 169 ++++++++++++++---- + arch/arm64/kvm/hyp/include/hyp/switch.h | 17 ++ + arch/arm64/kvm/hyp/include/nvhe/fixed_config.h | 3 +- + arch/arm64/kvm/hyp/nvhe/switch.c | 2 + + arch/arm64/kvm/hyp/pgtable.c | 2 +- + arch/arm64/kvm/hyp/vhe/switch.c | 1 + + arch/arm64/kvm/hypercalls.c | 36 ++-- + arch/arm64/kvm/mmu.c | 79 +-------- + arch/arm64/kvm/pmu-emul.c | 2 +- + arch/arm64/kvm/reset.c | 56 ++---- + arch/arm64/kvm/sys_regs.c | 194 +++++++++++++++++---- + arch/arm64/kvm/vgic/vgic-debug.c | 6 +- + arch/arm64/kvm/vgic/vgic-irqfd.c | 2 +- + arch/arm64/kvm/vgic/vgic-its.c | 49 +++--- + arch/arm64/kvm/vgic/vgic-kvm-device.c | 8 +- + arch/arm64/kvm/vgic/vgic-mmio-v3.c | 156 +++++++---------- + arch/arm64/kvm/vgic/vgic.c | 12 +- + include/kvm/arm_arch_timer.h | 2 +- + include/kvm/arm_pmu.h | 2 +- + include/kvm/arm_psci.h | 2 +- + include/kvm/arm_vgic.h | 4 +- + include/uapi/linux/kvm.h | 2 + + .../selftests/kvm/aarch64/page_fault_test.c | 5 +- + 37 files changed, 741 insertions(+), 424 deletions(-) + create mode 100644 Documentation/virt/kvm/arm/vcpu-features.rst +Merging kvms390/next (899e2206f46a KVM: s390: pv: Allow AP-instructions for pv-guests) +$ 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-ppc/topic/ppc-kvm (476652297f94 docs: powerpc: Document nested KVM on POWER) +$ git merge -m Merge branch 'topic/ppc-kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git kvm-ppc/topic/ppc-kvm +CONFLICT (file location): Documentation/powerpc/kvm-nested.rst added in kvm-ppc/topic/ppc-kvm inside a directory that was renamed in HEAD, suggesting it should perhaps be moved to Documentation/arch/powerpc/kvm-nested.rst. +Auto-merging arch/powerpc/Kconfig.debug +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a417975646fb] Merge branch 'topic/ppc-kvm' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/arch/powerpc/index.rst | 1 + + Documentation/arch/powerpc/kvm-nested.rst | 634 ++++++++++++++++ + arch/powerpc/Kconfig.debug | 12 + + arch/powerpc/include/asm/guest-state-buffer.h | 995 ++++++++++++++++++++++++++ + arch/powerpc/include/asm/hvcall.h | 30 + + arch/powerpc/include/asm/kvm_book3s.h | 220 +++++- + arch/powerpc/include/asm/kvm_book3s_64.h | 8 +- + arch/powerpc/include/asm/kvm_booke.h | 10 + + arch/powerpc/include/asm/kvm_host.h | 22 +- + arch/powerpc/include/asm/kvm_ppc.h | 102 ++- + arch/powerpc/include/asm/plpar_wrappers.h | 267 ++++++- + arch/powerpc/kvm/Makefile | 4 + + arch/powerpc/kvm/book3s.c | 38 +- + arch/powerpc/kvm/book3s_64_mmu_hv.c | 7 +- + arch/powerpc/kvm/book3s_64_mmu_radix.c | 31 +- + arch/powerpc/kvm/book3s_64_vio.c | 4 +- + arch/powerpc/kvm/book3s_hv.c | 360 +++++++--- + arch/powerpc/kvm/book3s_hv.h | 76 ++ + arch/powerpc/kvm/book3s_hv_builtin.c | 11 +- + arch/powerpc/kvm/book3s_hv_nested.c | 44 +- + arch/powerpc/kvm/book3s_hv_nestedv2.c | 994 +++++++++++++++++++++++++ + arch/powerpc/kvm/book3s_hv_p9_entry.c | 4 +- + arch/powerpc/kvm/book3s_hv_ras.c | 4 +- + arch/powerpc/kvm/book3s_hv_rm_mmu.c | 8 +- + arch/powerpc/kvm/book3s_hv_rm_xics.c | 4 +- + arch/powerpc/kvm/book3s_hv_uvmem.c | 2 +- + arch/powerpc/kvm/book3s_xive.c | 12 +- + arch/powerpc/kvm/emulate_loadstore.c | 6 +- + arch/powerpc/kvm/guest-state-buffer.c | 621 ++++++++++++++++ + arch/powerpc/kvm/powerpc.c | 76 +- + arch/powerpc/kvm/test-guest-state-buffer.c | 328 +++++++++ + 31 files changed, 4671 insertions(+), 264 deletions(-) + create mode 100644 Documentation/arch/powerpc/kvm-nested.rst + create mode 100644 arch/powerpc/include/asm/guest-state-buffer.h + create mode 100644 arch/powerpc/kvm/book3s_hv_nestedv2.c + create mode 100644 arch/powerpc/kvm/guest-state-buffer.c + create mode 100644 arch/powerpc/kvm/test-guest-state-buffer.c +Merging kvm-riscv/riscv_kvm_next (62d0c458f828 KVM: riscv: selftests: get-reg-list print_reg should never fail) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../devicetree/bindings/riscv/extensions.yaml | 12 ++ + MAINTAINERS | 1 + + arch/riscv/include/asm/csr.h | 18 ++ + arch/riscv/include/asm/hwcap.h | 2 + + arch/riscv/include/asm/kvm_host.h | 18 ++ + arch/riscv/include/uapi/asm/kvm.h | 11 + + arch/riscv/kernel/cpufeature.c | 2 + + arch/riscv/kvm/vcpu.c | 68 ++++-- + arch/riscv/kvm/vcpu_onereg.c | 72 ++++++- + tools/testing/selftests/kvm/riscv/get-reg-list.c | 233 +++++++++++++-------- + 10 files changed, 332 insertions(+), 105 deletions(-) +Merging kvm-x86/next (2bf2d3d16b8d Merge branches 'apic', 'docs', 'fpu', 'misc', 'mmu', 'pmu', 'selftests', 'svm' and 'xen') + 27526efb5cff ("KVM: x86: Constrain guest-supported xfeatures only at KVM_GET_XSAVE{2}") + 2d287ec65e79 ("x86/fpu: Allow caller to constrain xfeatures when copying to uabi buffer") + afb2c7e27a7f ("KVM: selftests: Force load all supported XSAVE state in state test") + d7b8762ec4a3 ("KVM: selftests: Load XSAVE state into untouched vCPU during state test") + ff0654c71fb6 ("KVM: selftests: Touch relevant XSAVE state in guest for state test") +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Auto-merging Documentation/virt/kvm/api.rst +Auto-merging arch/x86/kernel/fpu/xstate.c +Auto-merging arch/x86/kvm/cpuid.c +Auto-merging arch/x86/kvm/mmu/mmu.c +Auto-merging arch/x86/kvm/svm/svm.c +Auto-merging arch/x86/kvm/x86.c +Merge made by the 'ort' strategy. + Documentation/virt/kvm/api.rst | 36 +++- + Documentation/virt/kvm/x86/mmu.rst | 43 ++++- + arch/x86/include/asm/kvm-x86-ops.h | 3 +- + arch/x86/include/asm/kvm_host.h | 19 +- + arch/x86/kvm/Kconfig | 11 ++ + arch/x86/kvm/cpuid.c | 7 +- + arch/x86/kvm/cpuid.h | 3 +- + arch/x86/kvm/lapic.c | 30 +-- + arch/x86/kvm/mmu.h | 7 + + arch/x86/kvm/mmu/mmu.c | 25 ++- + arch/x86/kvm/mtrr.c | 2 +- + arch/x86/kvm/smm.c | 1 - + arch/x86/kvm/svm/svm.c | 50 ++--- + arch/x86/kvm/vmx/vmx.c | 25 ++- + arch/x86/kvm/x86.c | 213 +++++++++++++++++---- + arch/x86/kvm/x86.h | 1 + + arch/x86/kvm/xen.c | 59 +++++- + tools/testing/selftests/kvm/Makefile | 1 + + tools/testing/selftests/kvm/x86_64/hwcr_msr_test.c | 47 +++++ + 19 files changed, 445 insertions(+), 138 deletions(-) + create mode 100644 tools/testing/selftests/kvm/x86_64/hwcr_msr_test.c +Merging xen-tip/linux-next (0fc6ff5a0f04 xen/efi: refactor deprecated strncpy) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Already up to date. +Merging percpu/for-next (3fcf62f24c80 Merge branch 'for-6.6' 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 (ef3e4fbc60e3 Merge branch 'for-6.6-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. + rust/bindings/bindings_helper.h | 1 + + rust/helpers.c | 13 + + rust/kernel/lib.rs | 3 + + rust/kernel/sync/arc.rs | 46 ++- + rust/kernel/workqueue.rs | 679 ++++++++++++++++++++++++++++++++++++++++ + scripts/Makefile.build | 2 +- + 6 files changed, 741 insertions(+), 3 deletions(-) + create mode 100644 rust/kernel/workqueue.rs +Merging drivers-x86/for-next (8abba0894466 platform/x86: msi-ec: Add more EC configs) +$ 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 arch/x86/include/asm/msr-index.h +Auto-merging drivers/platform/mellanox/mlxbf-tmfifo.c +Auto-merging drivers/platform/surface/surface_acpi_notify.c +Auto-merging drivers/platform/x86/intel/ifs/load.c +Auto-merging drivers/platform/x86/intel/ifs/runtest.c +Auto-merging drivers/platform/x86/msi-ec.c +Auto-merging drivers/platform/x86/think-lmi.c +Auto-merging drivers/platform/x86/thinkpad_acpi.c +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-class-firmware-attributes | 30 + + .../admin-guide/laptops/thinkpad-acpi.rst | 20 + + arch/x86/include/asm/msr-index.h | 1 + + drivers/gpio/gpiolib-acpi.c | 30 +- + drivers/platform/mellanox/mlxbf-bootctl.c | 6 +- + drivers/platform/mellanox/mlxbf-pmc.c | 688 ++++++++++++++++++++- + drivers/platform/mellanox/mlxbf-tmfifo.c | 6 +- + drivers/platform/mellanox/mlxreg-hotplug.c | 6 +- + drivers/platform/mellanox/mlxreg-io.c | 6 +- + drivers/platform/mellanox/mlxreg-lc.c | 8 +- + drivers/platform/mellanox/nvsw-sn2201.c | 6 +- + drivers/platform/surface/surface3-wmi.c | 5 +- + drivers/platform/surface/surface_acpi_notify.c | 6 +- + drivers/platform/surface/surface_aggregator_cdev.c | 5 +- + .../platform/surface/surface_aggregator_registry.c | 5 +- + drivers/platform/surface/surface_dtx.c | 5 +- + drivers/platform/surface/surface_gpe.c | 6 +- + drivers/platform/surface/surface_hotplug.c | 6 +- + drivers/platform/x86/amd/pmc/pmc.c | 9 +- + drivers/platform/x86/asus-wmi.c | 133 ++++ + drivers/platform/x86/asus-wmi.h | 1 + + .../x86/hp/hp-bioscfg/biosattr-interface.c | 2 +- + drivers/platform/x86/intel/bytcrc_pwrsrc.c | 5 +- + drivers/platform/x86/intel/ifs/core.c | 15 +- + drivers/platform/x86/intel/ifs/ifs.h | 64 +- + drivers/platform/x86/intel/ifs/load.c | 158 ++++- + drivers/platform/x86/intel/ifs/runtest.c | 72 ++- + .../platform/x86/intel/int3472/clk_and_regulator.c | 54 +- + drivers/platform/x86/intel/int3472/common.h | 7 +- + drivers/platform/x86/intel/int3472/discrete.c | 101 ++- + drivers/platform/x86/intel/int3472/led.c | 24 +- + .../x86/intel/speed_select_if/isst_if_mmio.c | 21 +- + .../x86/intel/speed_select_if/isst_tpmi_core.c | 21 +- + drivers/platform/x86/intel/tpmi.c | 81 ++- + .../intel/uncore-frequency/uncore-frequency-tpmi.c | 18 +- + drivers/platform/x86/mlx-platform.c | 31 +- + drivers/platform/x86/msi-ec.c | 483 ++++++++++++++- + drivers/platform/x86/msi-ec.h | 4 +- + drivers/platform/x86/sel3350-platform.c | 6 +- + .../x86/siemens/simatic-ipc-batt-apollolake.c | 6 +- + .../x86/siemens/simatic-ipc-batt-elkhartlake.c | 6 +- + .../platform/x86/siemens/simatic-ipc-batt-f7188x.c | 6 +- + drivers/platform/x86/siemens/simatic-ipc-batt.c | 9 +- + drivers/platform/x86/siemens/simatic-ipc-batt.h | 4 +- + drivers/platform/x86/think-lmi.c | 214 +++++-- + drivers/platform/x86/think-lmi.h | 16 + + drivers/platform/x86/thinkpad_acpi.c | 88 +++ + drivers/platform/x86/x86-android-tablets/asus.c | 1 + + drivers/platform/x86/x86-android-tablets/core.c | 132 ++-- + drivers/platform/x86/x86-android-tablets/lenovo.c | 29 +- + drivers/platform/x86/x86-android-tablets/other.c | 11 +- + .../x86/x86-android-tablets/x86-android-tablets.h | 7 +- + include/linux/intel_tpmi.h | 6 + + include/linux/platform_data/x86/asus-wmi.h | 4 + + include/linux/surface_aggregator/controller.h | 2 +- + include/trace/events/intel_ifs.h | 16 +- + 56 files changed, 2265 insertions(+), 447 deletions(-) +Merging chrome-platform/for-next (466f70fb1b10 platform/chrome: kunit: make EC protocol tests independent) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform/for-next +Merge made by the 'ort' strategy. + drivers/platform/chrome/Kconfig | 6 +++--- + drivers/platform/chrome/Makefile | 5 ++--- + drivers/platform/chrome/cros_ec.h | 2 ++ + drivers/platform/chrome/cros_ec_chardev.c | 6 ++---- + drivers/platform/chrome/cros_ec_debugfs.c | 6 ++---- + drivers/platform/chrome/cros_ec_lightbar.c | 6 ++---- + drivers/platform/chrome/cros_ec_lpc.c | 6 ++---- + drivers/platform/chrome/cros_ec_proto.c | 2 +- + drivers/platform/chrome/cros_ec_proto_test.c | 3 ++- + .../{cros_kunit_util.c => cros_ec_proto_test_util.c} | 4 +--- + .../{cros_kunit_util.h => cros_ec_proto_test_util.h} | 0 + drivers/platform/chrome/cros_ec_sysfs.c | 6 ++---- + drivers/platform/chrome/cros_ec_typec.c | 18 +++++++++--------- + drivers/platform/chrome/cros_ec_vbc.c | 6 ++---- + drivers/platform/chrome/cros_typec_switch.c | 5 ++--- + drivers/platform/chrome/cros_typec_vdm.c | 2 +- + drivers/platform/chrome/cros_typec_vdm.h | 2 +- + drivers/platform/chrome/cros_usbpd_logger.c | 6 ++---- + drivers/platform/chrome/cros_usbpd_notify.c | 12 ++++-------- + drivers/platform/chrome/wilco_ec/core.c | 5 ++--- + drivers/platform/chrome/wilco_ec/debugfs.c | 6 ++---- + drivers/platform/chrome/wilco_ec/event.c | 2 +- + drivers/platform/chrome/wilco_ec/telemetry.c | 6 ++---- + include/linux/platform_data/cros_ec_proto.h | 2 +- + 24 files changed, 50 insertions(+), 74 deletions(-) + rename drivers/platform/chrome/{cros_kunit_util.c => cros_ec_proto_test_util.c} (98%) + rename drivers/platform/chrome/{cros_kunit_util.h => cros_ec_proto_test_util.h} (100%) +Merging chrome-platform-firmware/for-firmware-next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-firmware-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chrome-platform/linux.git chrome-platform-firmware/for-firmware-next +Already up to date. +Merging hsi/for-next (0bb80ecc33a8 Linux 6.6-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 (e0e29e434cdc leds: trigger: netdev: Move size check in set_device_name) +$ 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/led-core.c +Auto-merging drivers/leds/trigger/ledtrig-netdev.c +Merge made by the 'ort' strategy. + .../testing/sysfs-class-led-driver-turris-omnia | 14 + + Documentation/devicetree/bindings/leds/common.yaml | 4 +- + .../devicetree/bindings/leds/kinetic,ktd202x.yaml | 171 ++++++ + drivers/leds/Kconfig | 1 + + drivers/leds/blink/leds-lgm-sso.c | 6 +- + drivers/leds/flash/leds-aat1290.c | 6 +- + drivers/leds/flash/leds-ktd2692.c | 6 +- + drivers/leds/flash/leds-lm3601x.c | 2 +- + drivers/leds/flash/leds-max77693.c | 6 +- + drivers/leds/flash/leds-mt6360.c | 7 +- + drivers/leds/flash/leds-mt6370-flash.c | 2 +- + drivers/leds/flash/leds-qcom-flash.c | 5 +- + drivers/leds/flash/leds-rt8515.c | 6 +- + drivers/leds/flash/leds-sgm3140.c | 6 +- + drivers/leds/led-core.c | 5 + + drivers/leds/leds-88pm860x.c | 6 +- + drivers/leds/leds-adp5520.c | 6 +- + drivers/leds/leds-aw200xx.c | 4 +- + drivers/leds/leds-clevo-mail.c | 5 +- + drivers/leds/leds-cr0014114.c | 2 +- + drivers/leds/leds-da903x.c | 6 +- + drivers/leds/leds-da9052.c | 6 +- + drivers/leds/leds-el15203000.c | 2 +- + drivers/leds/leds-gpio.c | 2 +- + drivers/leds/leds-lm3533.c | 6 +- + drivers/leds/leds-lm3692x.c | 2 +- + drivers/leds/leds-lm3697.c | 2 +- + drivers/leds/leds-lp3952.c | 4 +- + drivers/leds/leds-lp55xx-common.c | 4 +- + drivers/leds/leds-mc13783.c | 6 +- + drivers/leds/leds-mlxreg.c | 6 +- + drivers/leds/leds-mt6323.c | 6 +- + drivers/leds/leds-nic78bx.c | 6 +- + drivers/leds/leds-pca955x.c | 67 +-- + drivers/leds/leds-powernv.c | 5 +- + drivers/leds/leds-pwm.c | 2 +- + drivers/leds/leds-rb532.c | 5 +- + drivers/leds/leds-regulator.c | 5 +- + drivers/leds/leds-sc27xx-bltc.c | 5 +- + drivers/leds/leds-sunfire.c | 8 +- + drivers/leds/leds-tca6507.c | 8 +- + drivers/leds/leds-turris-omnia.c | 351 ++++++++++-- + drivers/leds/leds-wm831x-status.c | 6 +- + drivers/leds/leds-wm8350.c | 5 +- + drivers/leds/rgb/Kconfig | 13 + + drivers/leds/rgb/Makefile | 1 + + drivers/leds/rgb/leds-ktd202x.c | 625 +++++++++++++++++++++ + drivers/leds/rgb/leds-mt6370-rgb.c | 2 +- + drivers/leds/rgb/leds-qcom-lpg.c | 8 +- + .../leds/simple/simatic-ipc-leds-gpio-apollolake.c | 8 +- + drivers/leds/simple/simatic-ipc-leds-gpio-core.c | 4 +- + .../simple/simatic-ipc-leds-gpio-elkhartlake.c | 7 +- + drivers/leds/simple/simatic-ipc-leds-gpio-f7188x.c | 8 +- + drivers/leds/simple/simatic-ipc-leds-gpio.h | 6 +- + drivers/leds/trigger/Kconfig | 5 +- + drivers/leds/trigger/ledtrig-cpu.c | 4 +- + drivers/leds/trigger/ledtrig-gpio.c | 137 ++--- + drivers/leds/trigger/ledtrig-netdev.c | 6 +- + 58 files changed, 1305 insertions(+), 324 deletions(-) + create mode 100644 Documentation/devicetree/bindings/leds/kinetic,ktd202x.yaml + create mode 100644 drivers/leds/rgb/leds-ktd202x.c +Merging ipmi/for-next (b00839ca4cca ipmi: refactor deprecated strncpy) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Merge made by the 'ort' strategy. + drivers/char/ipmi/ipmi_msghandler.c | 11 +++-------- + drivers/char/ipmi/ipmi_ssif.c | 2 +- + 2 files changed, 4 insertions(+), 9 deletions(-) +Merging driver-core/driver-core-next (36b2d7dd5a8a driver core: platform: Annotate struct irq_affinity_devres with __counted_by) +$ 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/pci/pci-sysfs.c +Auto-merging fs/kernfs/file.c +Merge made by the 'ort' strategy. + drivers/base/core.c | 1 + + drivers/base/platform.c | 71 +++++++++++++++++---------------- + drivers/base/test/Kconfig | 4 +- + drivers/base/test/property-entry-test.c | 4 ++ + drivers/pci/pci-sysfs.c | 26 +++++++++++- + fs/debugfs/file.c | 2 +- + fs/kernfs/file.c | 29 +++++++++++++- + fs/sysfs/file.c | 13 ++++++ + include/linux/device.h | 8 ++-- + include/linux/fwnode.h | 2 + + include/linux/ioport.h | 12 +++--- + include/linux/kernfs.h | 1 + + include/linux/property.h | 3 +- + include/linux/sysfs.h | 2 + + kernel/resource.c | 51 +++++++++++------------ + 15 files changed, 151 insertions(+), 78 deletions(-) +Merging usb/usb-next (1034cc423f1b gpio: update Intel LJCA USB GPIO driver) +$ 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 arch/arm64/boot/dts/qcom/sm8550-mtp.dts +Auto-merging arch/arm64/boot/dts/qcom/sm8550-qrd.dts +Auto-merging drivers/i2c/busses/Kconfig +Auto-merging drivers/platform/chrome/cros_ec_typec.c +Auto-merging drivers/power/supply/tps65217_charger.c +Auto-merging drivers/spi/Kconfig +Auto-merging drivers/usb/dwc3/core.c +Auto-merging drivers/usb/gadget/legacy/inode.c +Auto-merging drivers/usb/host/xhci.h +Auto-merging drivers/usb/misc/onboard_usb_hub.c +Auto-merging drivers/usb/misc/onboard_usb_hub.h +Auto-merging drivers/usb/typec/altmodes/displayport.c +Merge made by the 'ort' strategy. + Documentation/ABI/testing/configfs-usb-gadget-uac2 | 2 + + .../ABI/testing/sysfs-class-usb_power_delivery | 7 + + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 2 + + .../bindings/phy/qcom,snps-eusb2-phy.yaml | 7 +- + .../bindings/soc/qcom/qcom,pmic-glink.yaml | 19 + + .../devicetree/bindings/usb/ci-hdrc-usb2.yaml | 1 + + .../devicetree/bindings/usb/genesys,gl850g.yaml | 3 +- + .../devicetree/bindings/usb/gpio-sbu-mux.yaml | 1 + + .../devicetree/bindings/usb/qcom,dwc3.yaml | 36 + + .../devicetree/bindings/usb/realtek,rtd-dwc3.yaml | 80 ++ + .../devicetree/bindings/usb/snps,dwc3.yaml | 69 +- + .../devicetree/bindings/usb/ti,tps6598x.yaml | 81 +- + Documentation/driver-api/usb/dma.rst | 48 +- + Documentation/usb/gadget-testing.rst | 2 + + arch/arm64/boot/dts/qcom/sm8550-mtp.dts | 1 + + arch/arm64/boot/dts/qcom/sm8550-qrd.dts | 1 + + drivers/gpio/Kconfig | 4 +- + drivers/gpio/gpio-ljca.c | 244 +++--- + drivers/i2c/busses/Kconfig | 11 + + drivers/i2c/busses/Makefile | 1 + + drivers/i2c/busses/i2c-ljca.c | 343 ++++++++ + drivers/platform/chrome/cros_ec_typec.c | 28 + + drivers/power/supply/tps65217_charger.c | 2 +- + drivers/spi/Kconfig | 11 + + drivers/spi/Makefile | 1 + + drivers/spi/spi-ljca.c | 297 +++++++ + drivers/usb/Kconfig | 10 + + drivers/usb/c67x00/c67x00-hcd.h | 1 - + drivers/usb/chipidea/ci_hdrc_tegra.c | 16 +- + drivers/usb/chipidea/ci_hdrc_usb2.c | 11 +- + drivers/usb/chipidea/host.c | 48 +- + drivers/usb/core/hcd-pci.c | 3 +- + drivers/usb/dwc2/hcd.c | 2 +- + drivers/usb/dwc2/params.c | 21 +- + drivers/usb/dwc3/Kconfig | 11 + + drivers/usb/dwc3/Makefile | 1 + + drivers/usb/dwc3/core.c | 160 +++- + drivers/usb/dwc3/core.h | 15 + + drivers/usb/dwc3/dwc3-rtk.c | 475 +++++++++++ + drivers/usb/gadget/function/f_uac2.c | 16 +- + drivers/usb/gadget/function/u_ether.c | 2 +- + drivers/usb/gadget/function/u_uac2.h | 8 + + drivers/usb/gadget/legacy/inode.c | 17 +- + drivers/usb/gadget/legacy/raw_gadget.c | 11 + + drivers/usb/gadget/udc/core.c | 19 +- + drivers/usb/gadget/udc/fsl_qe_udc.c | 10 +- + drivers/usb/host/pci-quirks.c | 144 ++-- + drivers/usb/host/pci-quirks.h | 34 +- + drivers/usb/host/xhci-ext-caps.h | 27 + + drivers/usb/host/xhci-mtk-sch.c | 418 ++++++++-- + drivers/usb/host/xhci-mtk.h | 17 +- + drivers/usb/host/xhci.h | 27 - + drivers/usb/misc/Kconfig | 13 + + drivers/usb/misc/Makefile | 1 + + drivers/usb/misc/onboard_usb_hub.c | 7 +- + drivers/usb/misc/onboard_usb_hub.h | 1 + + drivers/usb/misc/usb-ljca.c | 902 +++++++++++++++++++++ + drivers/usb/misc/usbtest.c | 2 +- + drivers/usb/mon/mon_main.c | 23 +- + drivers/usb/musb/da8xx.c | 1 + + drivers/usb/musb/musb_dsps.c | 2 +- + drivers/usb/typec/altmodes/displayport.c | 5 +- + drivers/usb/typec/anx7411.c | 3 +- + drivers/usb/typec/mux/intel_pmc_mux.c | 25 + + drivers/usb/typec/pd.c | 10 +- + drivers/usb/typec/tcpm/tcpci_rt1711h.c | 46 +- + drivers/usb/typec/tcpm/tcpm.c | 4 +- + drivers/usb/typec/tipd/core.c | 694 +++++++++++++--- + drivers/usb/typec/tipd/tps6598x.h | 36 + + drivers/usb/typec/tipd/trace.h | 92 +++ + drivers/usb/typec/ucsi/displayport.c | 2 +- + drivers/usb/typec/ucsi/ucsi_ccg.c | 4 +- + drivers/usb/typec/ucsi/ucsi_glink.c | 54 +- + drivers/usb/usbip/stub_dev.c | 9 +- + drivers/usb/usbip/vhci_hcd.c | 55 +- + include/linux/usb.h | 16 - + include/linux/usb/composite.h | 8 + + include/linux/usb/gadget.h | 9 + + include/linux/usb/hcd.h | 17 + + include/linux/usb/ljca.h | 145 ++++ + include/linux/usb/pd.h | 1 + + include/linux/usb/pd_vdo.h | 1 + + include/linux/usb/renesas_usbhs.h | 10 - + include/linux/usb/typec_dp.h | 28 +- + include/linux/usb/typec_tbt.h | 1 + + 85 files changed, 4386 insertions(+), 667 deletions(-) + create mode 100644 Documentation/devicetree/bindings/usb/realtek,rtd-dwc3.yaml + create mode 100644 drivers/i2c/busses/i2c-ljca.c + create mode 100644 drivers/spi/spi-ljca.c + create mode 100644 drivers/usb/dwc3/dwc3-rtk.c + create mode 100644 drivers/usb/misc/usb-ljca.c + create mode 100644 include/linux/usb/ljca.h +Merging thunderbolt/next (274baf695b08 thunderbolt: Add DP IN added last in the head of the list of DP resources) +$ 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/switch.c +Auto-merging drivers/thunderbolt/tb.c +Merge made by the 'ort' strategy. + drivers/thunderbolt/clx.c | 47 ++++++++++--------- + drivers/thunderbolt/dma_test.c | 14 ++---- + drivers/thunderbolt/quirks.c | 3 ++ + drivers/thunderbolt/retimer.c | 1 + + drivers/thunderbolt/switch.c | 9 ++-- + drivers/thunderbolt/tb.c | 85 +++++++++++++++++++--------------- + drivers/thunderbolt/tb.h | 2 - + drivers/thunderbolt/tb_regs.h | 7 +-- + drivers/thunderbolt/tunnel.c | 102 +++++++++++++++-------------------------- + drivers/thunderbolt/tunnel.h | 24 +++++++++- + drivers/thunderbolt/usb4.c | 29 ------------ + include/linux/thunderbolt.h | 2 +- + 12 files changed, 151 insertions(+), 174 deletions(-) +Merging usb-serial/usb-next (8a749fd1a872 Linux 6.6-rc4) +$ 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 (dd976a97d15b tty/sysrq: replace smp_processor_id() with get_cpu()) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Auto-merging drivers/tty/hvc/hvcs.c +Auto-merging drivers/tty/serial/8250/8250_omap.c +Auto-merging drivers/tty/serial/8250/Kconfig +Auto-merging drivers/tty/serial/serial_core.c +CONFLICT (content): Merge conflict in drivers/tty/serial/serial_core.c +Auto-merging drivers/tty/tty_io.c +Auto-merging drivers/tty/vt/keyboard.c +Resolved 'drivers/tty/serial/serial_core.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master d47a4de47f97] Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git +$ git diff -M --stat --summary HEAD^.. + Documentation/ABI/testing/sysfs-tty | 15 +- + .../devicetree/bindings/serial/fsl-imx-uart.yaml | 2 + + .../devicetree/bindings/serial/fsl-mxs-auart.yaml | 13 +- + .../devicetree/bindings/serial/nxp,sc16is7xx.txt | 118 ----------- + .../devicetree/bindings/serial/nxp,sc16is7xx.yaml | 127 +++++++++++ + .../devicetree/bindings/serial/renesas,scif.yaml | 1 + + .../devicetree/bindings/serial/serial.yaml | 2 +- + Documentation/driver-api/tty/index.rst | 1 + + Documentation/driver-api/tty/tty_ioctl.rst | 10 + + drivers/tty/hvc/hvcs.c | 2 - + drivers/tty/mxser.c | 2 +- + drivers/tty/n_tty.c | 75 +++---- + drivers/tty/serial/21285.c | 8 +- + drivers/tty/serial/8250/8250_aspeed_vuart.c | 33 ++- + drivers/tty/serial/8250/8250_bcm7271.c | 69 +++--- + drivers/tty/serial/8250/8250_core.c | 14 +- + drivers/tty/serial/8250/8250_dma.c | 8 +- + drivers/tty/serial/8250/8250_dw.c | 35 +-- + drivers/tty/serial/8250/8250_exar.c | 63 ++++-- + drivers/tty/serial/8250/8250_fsl.c | 6 +- + drivers/tty/serial/8250/8250_mid.c | 18 +- + drivers/tty/serial/8250/8250_mtk.c | 8 +- + drivers/tty/serial/8250/8250_of.c | 44 ++-- + drivers/tty/serial/8250/8250_omap.c | 81 ++++--- + drivers/tty/serial/8250/8250_pci1xxxx.c | 10 +- + drivers/tty/serial/8250/8250_port.c | 111 +++++----- + drivers/tty/serial/8250/Kconfig | 2 +- + drivers/tty/serial/8250/Makefile | 44 ++-- + drivers/tty/serial/Makefile | 124 +++++------ + drivers/tty/serial/altera_jtaguart.c | 28 +-- + drivers/tty/serial/altera_uart.c | 20 +- + drivers/tty/serial/amba-pl010.c | 20 +- + drivers/tty/serial/amba-pl011.c | 74 +++---- + drivers/tty/serial/apbuart.c | 8 +- + drivers/tty/serial/ar933x_uart.c | 26 +-- + drivers/tty/serial/arc_uart.c | 16 +- + drivers/tty/serial/atmel_serial.c | 24 +-- + drivers/tty/serial/bcm63xx_uart.c | 22 +- + drivers/tty/serial/cpm_uart.c | 8 +- + drivers/tty/serial/digicolor-usart.c | 18 +- + drivers/tty/serial/dz.c | 32 +-- + drivers/tty/serial/fsl_linflexuart.c | 32 +-- + drivers/tty/serial/fsl_lpuart.c | 88 ++++---- + drivers/tty/serial/icom.c | 26 +-- + drivers/tty/serial/imx.c | 128 ++++++----- + drivers/tty/serial/ip22zilog.c | 36 ++-- + drivers/tty/serial/jsm/jsm_neo.c | 4 +- + drivers/tty/serial/jsm/jsm_tty.c | 16 +- + drivers/tty/serial/liteuart.c | 20 +- + drivers/tty/serial/lpc32xx_hs.c | 26 +-- + drivers/tty/serial/ma35d1_serial.c | 25 ++- + drivers/tty/serial/mcf.c | 20 +- + drivers/tty/serial/men_z135_uart.c | 8 +- + drivers/tty/serial/meson_uart.c | 34 +-- + drivers/tty/serial/milbeaut_usio.c | 16 +- + drivers/tty/serial/mpc52xx_uart.c | 12 +- + drivers/tty/serial/mps2-uart.c | 16 +- + drivers/tty/serial/msm_serial.c | 38 ++-- + drivers/tty/serial/mvebu-uart.c | 18 +- + drivers/tty/serial/omap-serial.c | 38 ++-- + drivers/tty/serial/owl-uart.c | 26 +-- + drivers/tty/serial/pch_uart.c | 10 +- + drivers/tty/serial/pic32_uart.c | 20 +- + drivers/tty/serial/pmac_zilog.c | 52 ++--- + drivers/tty/serial/pxa.c | 30 +-- + drivers/tty/serial/qcom_geni_serial.c | 8 +- + drivers/tty/serial/rda-uart.c | 34 +-- + drivers/tty/serial/rp2.c | 20 +- + drivers/tty/serial/sa1100.c | 20 +- + drivers/tty/serial/samsung_tty.c | 50 ++--- + drivers/tty/serial/sb1250-duart.c | 12 +- + drivers/tty/serial/sc16is7xx.c | 83 +++++--- + drivers/tty/serial/serial-tegra.c | 32 +-- + drivers/tty/serial/serial_core.c | 125 ++++++----- + drivers/tty/serial/serial_mctrl_gpio.c | 4 +- + drivers/tty/serial/serial_port.c | 4 +- + drivers/tty/serial/serial_txx9.c | 26 +-- + drivers/tty/serial/sh-sci.c | 68 +++--- + drivers/tty/serial/sifive.c | 16 +- + drivers/tty/serial/sprd_serial.c | 30 +-- + drivers/tty/serial/st-asc.c | 18 +- + drivers/tty/serial/stm32-usart.c | 51 +++-- + drivers/tty/serial/sunhv.c | 28 +-- + drivers/tty/serial/sunplus-uart.c | 26 +-- + drivers/tty/serial/sunsab.c | 34 +-- + drivers/tty/serial/sunsu.c | 46 ++-- + drivers/tty/serial/sunzilog.c | 42 ++-- + drivers/tty/serial/timbuart.c | 8 +- + drivers/tty/serial/uartlite.c | 18 +- + drivers/tty/serial/ucc_uart.c | 4 +- + drivers/tty/serial/vt8500_serial.c | 8 +- + drivers/tty/serial/xilinx_uartps.c | 56 ++--- + drivers/tty/sysrq.c | 3 +- + drivers/tty/tty.h | 13 +- + drivers/tty/tty_buffer.c | 5 +- + drivers/tty/tty_io.c | 36 ++-- + drivers/tty/tty_ioctl.c | 234 ++++++++++----------- + drivers/tty/tty_jobctrl.c | 17 +- + drivers/tty/tty_port.c | 6 +- + drivers/tty/vcc.c | 16 +- + drivers/tty/vt/consolemap.c | 2 +- + drivers/tty/vt/keyboard.c | 7 +- + drivers/tty/vt/vc_screen.c | 32 +-- + drivers/tty/vt/vt.c | 29 +-- + include/linux/serial_core.h | 91 +++++++- + include/linux/tty.h | 25 +-- + include/uapi/linux/serial_core.h | 21 +- + include/uapi/linux/serial_reg.h | 1 + + 108 files changed, 1807 insertions(+), 1683 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/serial/nxp,sc16is7xx.txt + create mode 100644 Documentation/devicetree/bindings/serial/nxp,sc16is7xx.yaml + create mode 100644 Documentation/driver-api/tty/tty_ioctl.rst +Merging char-misc/char-misc-next (d712d205210c rapidio: make all 'class' structures const) +$ 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 drivers/android/binderfs.c +Auto-merging drivers/char/hpet.c +Auto-merging drivers/char/mem.c +Auto-merging drivers/mcb/mcb-core.c +Auto-merging drivers/misc/ibmvmc.c +Merge made by the 'ort' strategy. + Documentation/process/stable-kernel-rules.rst | 13 ++ + drivers/accessibility/speakup/kobjects.c | 25 ++- + drivers/android/binderfs.c | 2 +- + drivers/char/hpet.c | 2 +- + drivers/char/mem.c | 4 + + drivers/comedi/Kconfig | 45 ++++- + drivers/comedi/drivers.c | 3 +- + drivers/comedi/drivers/8255.c | 2 +- + drivers/comedi/drivers/8255_pci.c | 15 +- + drivers/comedi/drivers/adl_pci9111.c | 8 +- + drivers/comedi/drivers/adl_pci9118.c | 8 +- + drivers/comedi/drivers/adv_pci1710.c | 8 +- + drivers/comedi/drivers/adv_pci_dio.c | 14 +- + drivers/comedi/drivers/aio_aio12_8.c | 10 +- + drivers/comedi/drivers/amplc_dio200_common.c | 104 +++++++++--- + drivers/comedi/drivers/amplc_dio200_pci.c | 12 +- + drivers/comedi/drivers/amplc_pc236_common.c | 2 +- + drivers/comedi/drivers/amplc_pci224.c | 8 +- + drivers/comedi/drivers/amplc_pci230.c | 10 +- + drivers/comedi/drivers/cb_das16_cs.c | 8 +- + drivers/comedi/drivers/cb_pcidas.c | 23 +-- + drivers/comedi/drivers/cb_pcidas64.c | 7 +- + drivers/comedi/drivers/cb_pcidda.c | 2 +- + drivers/comedi/drivers/cb_pcimdas.c | 12 +- + drivers/comedi/drivers/cb_pcimdda.c | 2 +- + drivers/comedi/drivers/comedi_8254.c | 236 ++++++++++++++++++-------- + drivers/comedi/drivers/comedi_8255.c | 135 ++++++++------- + drivers/comedi/drivers/daqboard2000.c | 4 +- + drivers/comedi/drivers/das08.c | 11 +- + drivers/comedi/drivers/das16.c | 10 +- + drivers/comedi/drivers/das16m1.c | 22 +-- + drivers/comedi/drivers/das1800.c | 8 +- + drivers/comedi/drivers/das6402.c | 8 +- + drivers/comedi/drivers/das800.c | 8 +- + drivers/comedi/drivers/dmm32at.c | 3 +- + drivers/comedi/drivers/me4000.c | 6 +- + drivers/comedi/drivers/ni_at_a2150.c | 8 +- + drivers/comedi/drivers/ni_at_ao.c | 8 +- + drivers/comedi/drivers/ni_atmio16d.c | 2 +- + drivers/comedi/drivers/ni_daq_dio24.c | 2 +- + drivers/comedi/drivers/ni_labpc_common.c | 51 +++--- + drivers/comedi/drivers/ni_mio_common.c | 74 +++++--- + drivers/comedi/drivers/pcl711.c | 8 +- + drivers/comedi/drivers/pcl724.c | 6 +- + drivers/comedi/drivers/pcl812.c | 10 +- + drivers/comedi/drivers/pcl816.c | 8 +- + drivers/comedi/drivers/pcl818.c | 8 +- + drivers/comedi/drivers/pcm3724.c | 2 +- + drivers/comedi/drivers/rtd520.c | 6 +- + drivers/mcb/mcb-core.c | 2 +- + drivers/misc/bcm-vk/bcm_vk_msg.c | 2 +- + drivers/misc/bcm-vk/bcm_vk_msg.h | 2 +- + drivers/misc/c2port/core.c | 2 +- + drivers/misc/eeprom/Kconfig | 14 -- + drivers/misc/eeprom/Makefile | 1 - + drivers/misc/eeprom/eeprom.c | 214 ----------------------- + drivers/misc/eeprom/idt_89hpesx.c | 11 +- + drivers/misc/ibmvmc.c | 4 +- + drivers/misc/ti-st/st_core.c | 7 +- + drivers/misc/ti-st/st_kim.c | 5 +- + drivers/rapidio/devices/rio_mport_cdev.c | 16 +- + drivers/rapidio/rio_cm.c | 18 +- + include/linux/comedi/comedi_8254.h | 51 ++++-- + include/linux/comedi/comedi_8255.h | 24 ++- + include/linux/comedi/comedidev.h | 2 +- + include/uapi/linux/mei.h | 14 +- + 66 files changed, 728 insertions(+), 654 deletions(-) + delete mode 100644 drivers/misc/eeprom/eeprom.c +Merging accel/habanalabs-next (4db74c0fdeb8 accel/habanalabs/gaudi2: fix spmu mask creation) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../ABI/testing/debugfs-driver-habanalabs | 82 ++-- + Documentation/ABI/testing/sysfs-driver-habanalabs | 64 +-- + MAINTAINERS | 1 + + drivers/accel/drm_accel.c | 21 +- + drivers/accel/habanalabs/common/command_buffer.c | 5 +- + .../accel/habanalabs/common/command_submission.c | 508 ++++++++++++--------- + drivers/accel/habanalabs/common/context.c | 9 +- + drivers/accel/habanalabs/common/debugfs.c | 22 +- + drivers/accel/habanalabs/common/device.c | 425 ++++++++++------- + drivers/accel/habanalabs/common/firmware_if.c | 45 +- + drivers/accel/habanalabs/common/habanalabs.h | 212 +++++---- + drivers/accel/habanalabs/common/habanalabs_drv.c | 186 ++++---- + drivers/accel/habanalabs/common/habanalabs_ioctl.c | 112 +++-- + drivers/accel/habanalabs/common/irq.c | 180 ++++++-- + drivers/accel/habanalabs/common/memory.c | 304 ++++++------ + drivers/accel/habanalabs/gaudi/gaudi.c | 17 +- + drivers/accel/habanalabs/gaudi/gaudiP.h | 2 +- + drivers/accel/habanalabs/gaudi/gaudi_coresight.c | 12 + + drivers/accel/habanalabs/gaudi2/gaudi2.c | 487 ++++++++++++++++---- + drivers/accel/habanalabs/gaudi2/gaudi2P.h | 4 +- + drivers/accel/habanalabs/gaudi2/gaudi2_coresight.c | 46 +- + drivers/accel/habanalabs/gaudi2/gaudi2_security.c | 21 +- + drivers/accel/habanalabs/goya/goya.c | 10 +- + drivers/accel/habanalabs/goya/goyaP.h | 2 +- + drivers/accel/habanalabs/goya/goya_coresight.c | 10 + + .../accel/habanalabs/include/gaudi/gaudi_fw_if.h | 32 -- + .../include/gaudi2/gaudi2_async_events.h | 7 + + .../include/gaudi2/gaudi2_async_ids_map_extended.h | 16 +- + .../common => include/linux/habanalabs}/cpucp_if.h | 36 +- + .../linux/habanalabs}/hl_boot_if.h | 7 + + include/trace/events/habanalabs.h | 45 +- + include/uapi/drm/habanalabs_accel.h | 68 +-- + 32 files changed, 1927 insertions(+), 1071 deletions(-) + rename {drivers/accel/habanalabs/include/common => include/linux/habanalabs}/cpucp_if.h (98%) + rename {drivers/accel/habanalabs/include/common => include/linux/habanalabs}/hl_boot_if.h (98%) +Merging coresight/next (c0a232f1e19e coresight: trbe: Fix TRBE potential sleep in atomic context) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Already up to date. +Merging fastrpc/for-next (9fffb8240581 misc: fastrpc: Clean buffers on remote invocation failures) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Merge made by the 'ort' strategy. + drivers/misc/fastrpc.c | 26 ++++++++++++-------------- + 1 file changed, 12 insertions(+), 14 deletions(-) +Merging fpga/for-next (33f9b8812262 fpga: versal: Add support for 44-bit DMA operations) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/fpga/linux-fpga.git fpga/for-next +Merge made by the 'ort' strategy. + drivers/fpga/altera-hps2fpga.c | 12 +++-------- + drivers/fpga/altera-ps-spi.c | 44 +++++--------------------------------- + drivers/fpga/versal-fpga.c | 2 +- + drivers/fpga/xilinx-pr-decoupler.c | 17 +++++---------- + 4 files changed, 14 insertions(+), 61 deletions(-) +Merging icc/icc-next (9330bf741fda Merge branch 'icc-misc' 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,msm8939.yaml | 74 ++ + .../bindings/interconnect/qcom,msm8996.yaml | 126 +++ + .../bindings/interconnect/qcom,qcm2290.yaml | 60 +- + .../bindings/interconnect/qcom,rpm-common.yaml | 28 + + .../devicetree/bindings/interconnect/qcom,rpm.yaml | 250 +---- + .../bindings/interconnect/qcom,rpmh.yaml | 1 + + .../bindings/interconnect/qcom,sdm660.yaml | 108 ++ + .../bindings/interconnect/qcom,sdx75-rpmh.yaml | 92 ++ + drivers/interconnect/imx/imx.h | 9 +- + drivers/interconnect/qcom/Kconfig | 9 + + drivers/interconnect/qcom/Makefile | 2 + + drivers/interconnect/qcom/icc-rpm-clocks.c | 6 + + drivers/interconnect/qcom/icc-rpm.c | 90 +- + drivers/interconnect/qcom/icc-rpm.h | 15 + + drivers/interconnect/qcom/msm8974.c | 4 +- + drivers/interconnect/qcom/msm8996.c | 8 +- + drivers/interconnect/qcom/osm-l3.c | 3 +- + drivers/interconnect/qcom/qcm2290.c | 9 +- + drivers/interconnect/qcom/qdu1000.c | 1 + + drivers/interconnect/qcom/sc7180.c | 1 + + drivers/interconnect/qcom/sc7280.c | 1 + + drivers/interconnect/qcom/sc8180x.c | 1 + + drivers/interconnect/qcom/sc8280xp.c | 1 + + drivers/interconnect/qcom/sdm660.c | 4 + + drivers/interconnect/qcom/sdm670.c | 1 + + drivers/interconnect/qcom/sdm845.c | 1 + + drivers/interconnect/qcom/sdx75.c | 1107 ++++++++++++++++++++ + drivers/interconnect/qcom/sdx75.h | 97 ++ + drivers/interconnect/qcom/sm6350.c | 1 + + drivers/interconnect/qcom/sm8150.c | 1 + + drivers/interconnect/qcom/sm8250.c | 1 + + drivers/interconnect/qcom/sm8350.c | 1 + + include/dt-bindings/interconnect/qcom,sdx75.h | 102 ++ + 33 files changed, 1898 insertions(+), 317 deletions(-) + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,msm8939.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,msm8996.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,rpm-common.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdm660.yaml + create mode 100644 Documentation/devicetree/bindings/interconnect/qcom,sdx75-rpmh.yaml + create mode 100644 drivers/interconnect/qcom/sdx75.c + create mode 100644 drivers/interconnect/qcom/sdx75.h + create mode 100644 include/dt-bindings/interconnect/qcom,sdx75.h +Merging iio/togreg (73006239ef23 iio: resolver: ad2s1210: remove of_match_ptr()) +$ git merge -m Merge branch 'togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio/togreg +Auto-merging MAINTAINERS +Auto-merging drivers/iio/adc/ad7192.c +Auto-merging drivers/iio/adc/imx8qxp-adc.c +Auto-merging drivers/iio/addac/Kconfig +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 75 + + .../ABI/testing/sysfs-bus-iio-adc-mcp3564 | 53 + + .../ABI/testing/sysfs-bus-iio-resolver-ad2s1210 | 27 + + .../bindings/iio/accel/kionix,kx022a.yaml | 14 +- + .../devicetree/bindings/iio/adc/lltc,ltc2497.yaml | 20 +- + .../bindings/iio/adc/microchip,mcp3564.yaml | 205 +++ + .../bindings/iio/adc/microchip,mcp3911.yaml | 6 + + .../devicetree/bindings/iio/adc/ti,ads1015.yaml | 3 + + .../bindings/iio/adc/ti,twl6030-gpadc.yaml | 43 + + .../bindings/iio/amplifiers/adi,hmc425a.yaml | 12 +- + .../bindings/iio/imu/invensense,mpu6050.yaml | 5 + + .../bindings/iio/pressure/rohm,bm1390.yaml | 52 + + .../bindings/iio/resolver/adi,ad2s1210.yaml | 177 +++ + MAINTAINERS | 19 +- + .../amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.c | 7 + + .../amd-sfh-hid/hid_descriptor/amd_sfh_hid_desc.h | 3 + + .../hid_descriptor/amd_sfh_hid_report_desc.h | 21 + + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_desc.c | 9 + + drivers/hid/amd-sfh-hid/sfh1_1/amd_sfh_interface.h | 15 + + drivers/iio/accel/Kconfig | 10 +- + drivers/iio/accel/adxl345.h | 21 +- + drivers/iio/accel/adxl345_core.c | 47 +- + drivers/iio/accel/adxl345_i2c.c | 20 +- + drivers/iio/accel/adxl345_spi.c | 20 +- + drivers/iio/accel/bma180.c | 27 +- + drivers/iio/accel/fxls8962af.h | 1 - + drivers/iio/accel/hid-sensor-accel-3d.c | 6 +- + drivers/iio/accel/kionix-kx022a-i2c.c | 24 +- + drivers/iio/accel/kionix-kx022a-spi.c | 19 +- + drivers/iio/accel/kionix-kx022a.c | 351 ++++- + drivers/iio/accel/kionix-kx022a.h | 114 +- + drivers/iio/accel/mma8452.c | 28 +- + drivers/iio/accel/msa311.c | 2 +- + drivers/iio/accel/mxc4005.c | 8 + + drivers/iio/adc/Kconfig | 29 +- + drivers/iio/adc/Makefile | 2 + + drivers/iio/adc/ab8500-gpadc.c | 6 +- + drivers/iio/adc/ad4130.c | 15 +- + drivers/iio/adc/ad7192.c | 269 ++-- + drivers/iio/adc/at91-sama5d2_adc.c | 6 +- + drivers/iio/adc/at91_adc.c | 114 +- + drivers/iio/adc/axp20x_adc.c | 6 +- + drivers/iio/adc/bcm_iproc_adc.c | 6 +- + drivers/iio/adc/dln2-adc.c | 5 +- + drivers/iio/adc/ep93xx_adc.c | 6 +- + drivers/iio/adc/exynos_adc.c | 6 +- + drivers/iio/adc/fsl-imx25-gcq.c | 6 +- + drivers/iio/adc/hx711.c | 6 +- + drivers/iio/adc/imx8qxp-adc.c | 6 +- + drivers/iio/adc/imx93_adc.c | 6 +- + drivers/iio/adc/ltc2309.c | 246 ++++ + drivers/iio/adc/ltc2497.c | 5 +- + drivers/iio/adc/max1363.c | 87 +- + drivers/iio/adc/mcp3564.c | 1513 +++++++++++++++++++ + drivers/iio/adc/mcp3911.c | 562 ++++++-- + drivers/iio/adc/meson_saradc.c | 22 +- + drivers/iio/adc/mp2629_adc.c | 6 +- + drivers/iio/adc/mt6577_auxadc.c | 72 +- + drivers/iio/adc/mxs-lradc-adc.c | 6 +- + drivers/iio/adc/npcm_adc.c | 6 +- + drivers/iio/adc/palmas_gpadc.c | 2 +- + drivers/iio/adc/qcom-pm8xxx-xoadc.c | 6 +- + drivers/iio/adc/rcar-gyroadc.c | 6 +- + drivers/iio/adc/spear_adc.c | 64 +- + drivers/iio/adc/stm32-adc-core.c | 15 +- + drivers/iio/adc/stm32-adc.c | 8 +- + drivers/iio/adc/stm32-dfsdm-adc.c | 6 +- + drivers/iio/adc/stm32-dfsdm-core.c | 6 +- + drivers/iio/adc/sun4i-gpadc-iio.c | 8 +- + drivers/iio/adc/ti-adc081c.c | 12 +- + drivers/iio/adc/ti-ads1015.c | 7 +- + drivers/iio/adc/ti_am335x_adc.c | 6 +- + drivers/iio/adc/twl4030-madc.c | 6 +- + drivers/iio/adc/twl6030-gpadc.c | 6 +- + drivers/iio/adc/vf610_adc.c | 6 +- + drivers/iio/addac/Kconfig | 1 + + drivers/iio/addac/ad74413r.c | 24 +- + drivers/iio/addac/stx104.c | 61 +- + drivers/iio/amplifiers/hmc425a.c | 17 + + drivers/iio/chemical/atlas-ezo-sensor.c | 6 +- + drivers/iio/chemical/atlas-sensor.c | 32 +- + drivers/iio/chemical/sgp30.c | 24 +- + drivers/iio/chemical/vz89x.c | 16 +- + drivers/iio/dac/dpot-dac.c | 6 +- + drivers/iio/dac/lpc18xx_dac.c | 6 +- + drivers/iio/dac/mcp4725.c | 42 +- + drivers/iio/dac/stm32-dac-core.c | 6 +- + drivers/iio/dac/stm32-dac.c | 9 +- + drivers/iio/dac/ti-dac5571.c | 48 +- + drivers/iio/dac/vf610_dac.c | 6 +- + drivers/iio/frequency/adf4350.c | 75 +- + drivers/iio/gyro/hid-sensor-gyro-3d.c | 6 +- + drivers/iio/humidity/hid-sensor-humidity.c | 6 +- + drivers/iio/iio_core.h | 3 - + drivers/iio/imu/adis16475.c | 175 ++- + drivers/iio/imu/inv_mpu6050/inv_mpu_aux.c | 13 + + drivers/iio/imu/inv_mpu6050/inv_mpu_core.c | 3 + + drivers/iio/imu/inv_mpu6050/inv_mpu_iio.h | 2 +- + drivers/iio/industrialio-core.c | 4 + + drivers/iio/industrialio-event.c | 55 + + drivers/iio/light/cm3605.c | 6 +- + drivers/iio/light/hid-sensor-als.c | 134 +- + drivers/iio/light/hid-sensor-prox.c | 6 +- + drivers/iio/light/lm3533-als.c | 6 +- + drivers/iio/light/opt4001.c | 2 +- + drivers/iio/magnetometer/ak8975.c | 97 +- + drivers/iio/magnetometer/hid-sensor-magn-3d.c | 6 +- + drivers/iio/magnetometer/yamaha-yas530.c | 4 +- + drivers/iio/orientation/hid-sensor-incl-3d.c | 6 +- + drivers/iio/orientation/hid-sensor-rotation.c | 6 +- + .../iio/position/hid-sensor-custom-intel-hinge.c | 6 +- + drivers/iio/potentiometer/ad5110.c | 21 +- + drivers/iio/potentiometer/ds1803.c | 13 +- + drivers/iio/pressure/Kconfig | 9 + + drivers/iio/pressure/Makefile | 1 + + drivers/iio/pressure/hid-sensor-press.c | 6 +- + drivers/iio/pressure/ms5637.c | 6 +- + drivers/iio/pressure/rohm-bm1390.c | 934 ++++++++++++ + drivers/iio/proximity/cros_ec_mkbp_proximity.c | 6 +- + drivers/iio/proximity/srf04.c | 6 +- + drivers/iio/proximity/sx9310.c | 46 +- + drivers/iio/resolver/Kconfig | 13 + + drivers/iio/resolver/Makefile | 1 + + drivers/iio/resolver/ad2s1210.c | 1519 ++++++++++++++++++++ + drivers/iio/temperature/hid-sensor-temperature.c | 6 +- + drivers/iio/temperature/mlx90614.c | 2 +- + drivers/iio/temperature/tmp117.c | 94 +- + drivers/iio/trigger/iio-trig-interrupt.c | 6 +- + drivers/iio/trigger/stm32-timer-trigger.c | 6 +- + drivers/staging/iio/Kconfig | 1 - + drivers/staging/iio/Makefile | 1 - + drivers/staging/iio/frequency/ad9832.c | 15 +- + drivers/staging/iio/frequency/ad9834.c | 21 +- + drivers/staging/iio/impedance-analyzer/ad5933.c | 22 +- + drivers/staging/iio/resolver/Kconfig | 18 - + drivers/staging/iio/resolver/Makefile | 6 - + drivers/staging/iio/resolver/ad2s1210.c | 716 --------- + include/linux/hid-sensor-ids.h | 4 + + include/linux/iio/iio.h | 12 +- + include/linux/iio/sw_device.h | 3 - + include/linux/iio/sw_trigger.h | 3 - + include/uapi/linux/iio/types.h | 4 + + tools/iio/iio_event_monitor.c | 8 + + tools/iio/iio_generic_buffer.c | 13 +- + 144 files changed, 7144 insertions(+), 1970 deletions(-) + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-adc-mcp3564 + create mode 100644 Documentation/ABI/testing/sysfs-bus-iio-resolver-ad2s1210 + create mode 100644 Documentation/devicetree/bindings/iio/adc/microchip,mcp3564.yaml + create mode 100644 Documentation/devicetree/bindings/iio/adc/ti,twl6030-gpadc.yaml + create mode 100644 Documentation/devicetree/bindings/iio/pressure/rohm,bm1390.yaml + create mode 100644 Documentation/devicetree/bindings/iio/resolver/adi,ad2s1210.yaml + create mode 100644 drivers/iio/adc/ltc2309.c + create mode 100644 drivers/iio/adc/mcp3564.c + create mode 100644 drivers/iio/pressure/rohm-bm1390.c + create mode 100644 drivers/iio/resolver/ad2s1210.c + delete mode 100644 drivers/staging/iio/resolver/Kconfig + delete mode 100644 drivers/staging/iio/resolver/Makefile + delete mode 100644 drivers/staging/iio/resolver/ad2s1210.c +Merging phy-next/next (03c866cab420 dt-bindings: phy: Convert PXA1928 USB/HSIC PHY to DT schema) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Auto-merging Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml +CONFLICT (content): Merge conflict in Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml +Resolved 'Documentation/devicetree/bindings/phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 00da87db6c6c] Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/phy/marvell,pxa1928-usb-phy.yaml | 47 ++++ + .../devicetree/bindings/phy/mediatek,dsi-phy.yaml | 1 + + .../devicetree/bindings/phy/phy-stih407-usb.txt | 24 -- + .../devicetree/bindings/phy/pxa1928-usb-phy.txt | 18 -- + .../bindings/phy/qcom,ipq5332-usb-hsphy.yaml | 4 +- + .../bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml | 287 --------------------- + .../bindings/phy/qcom,sc8280xp-qmp-ufs-phy.yaml | 2 + + .../phy/qcom,sc8280xp-qmp-usb3-uni-phy.yaml | 55 +++- + .../bindings/phy/qcom,snps-eusb2-repeater.yaml | 21 ++ + .../bindings/phy/st,stih407-usb2-phy.yaml | 63 +++++ + drivers/phy/allwinner/phy-sun4i-usb.c | 2 +- + drivers/phy/broadcom/phy-bcm-ns-usb3.c | 9 +- + drivers/phy/marvell/phy-berlin-usb.c | 7 +- + drivers/phy/motorola/phy-cpcap-usb.c | 7 - + drivers/phy/qualcomm/phy-qcom-eusb2-repeater.c | 146 ++++++++--- + drivers/phy/qualcomm/phy-qcom-m31.c | 59 ++++- + drivers/phy/qualcomm/phy-qcom-qmp-combo.c | 50 ++-- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-misc-v4.h | 17 ++ + drivers/phy/qualcomm/phy-qcom-qmp-pcs-usb-v6.h | 29 +-- + drivers/phy/qualcomm/phy-qcom-qmp-pcs-v6.h | 20 +- + drivers/phy/qualcomm/phy-qcom-qmp-ufs.c | 142 ++++++++++ + drivers/phy/qualcomm/phy-qcom-qmp-usb.c | 225 ++++++++-------- + drivers/phy/qualcomm/phy-qcom-qmp.h | 8 - + drivers/phy/ralink/phy-ralink-usb.c | 10 +- + drivers/phy/realtek/phy-rtk-usb2.c | 2 +- + drivers/phy/realtek/phy-rtk-usb3.c | 2 +- + drivers/phy/renesas/r8a779f0-ether-serdes.c | 16 +- + drivers/phy/rockchip/phy-rockchip-inno-usb2.c | 2 - + drivers/phy/rockchip/phy-rockchip-pcie.c | 11 +- + drivers/phy/rockchip/phy-rockchip-usb.c | 10 +- + drivers/phy/ti/phy-dm816x-usb.c | 11 +- + drivers/phy/ti/phy-omap-control.c | 9 +- + drivers/phy/ti/phy-omap-usb2.c | 11 +- + drivers/phy/ti/phy-ti-pipe3.c | 14 +- + 34 files changed, 715 insertions(+), 626 deletions(-) + create mode 100644 Documentation/devicetree/bindings/phy/marvell,pxa1928-usb-phy.yaml + delete mode 100644 Documentation/devicetree/bindings/phy/phy-stih407-usb.txt + delete mode 100644 Documentation/devicetree/bindings/phy/pxa1928-usb-phy.txt + delete mode 100644 Documentation/devicetree/bindings/phy/qcom,msm8996-qmp-usb3-phy.yaml + create mode 100644 Documentation/devicetree/bindings/phy/st,stih407-usb2-phy.yaml + create mode 100644 drivers/phy/qualcomm/phy-qcom-qmp-pcs-misc-v4.h +Merging soundwire/next (95b0f3aa71eb soundwire: qcom: Log clk_get("iface") failures) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Merge made by the 'ort' strategy. + drivers/soundwire/qcom.c | 18 +++++++++++++++--- + 1 file changed, 15 insertions(+), 3 deletions(-) +Merging extcon/extcon-next (da886ba84479 extcon: max77843: add device-tree compatible string) +$ 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. + .../bindings/usb/realtek,rtd-type-c.yaml | 82 + + drivers/extcon/Kconfig | 11 + + drivers/extcon/Makefile | 1 + + drivers/extcon/extcon-max77693.c | 7 + + drivers/extcon/extcon-max77843.c | 7 + + drivers/extcon/extcon-rtk-type-c.c | 1792 ++++++++++++++++++++ + 6 files changed, 1900 insertions(+) + create mode 100644 Documentation/devicetree/bindings/usb/realtek,rtd-type-c.yaml + create mode 100644 drivers/extcon/extcon-rtk-type-c.c +Merging gnss/gnss-next (0bb80ecc33a8 Linux 6.6-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 (bd885fcf28da vfio: Fix smatch errors in vfio_combine_iova_ranges()) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Merge made by the 'ort' strategy. + drivers/cdx/cdx.c | 32 ++++ + drivers/cdx/controller/cdx_controller.c | 4 + + drivers/cdx/controller/mcdi_functions.c | 58 +++++++ + drivers/cdx/controller/mcdi_functions.h | 13 ++ + drivers/gpu/drm/i915/gvt/kvmgt.c | 2 +- + drivers/vfio/cdx/main.c | 57 ++++++- + drivers/vfio/cdx/private.h | 2 + + drivers/vfio/pci/mlx5/cmd.c | 103 +++++++++--- + drivers/vfio/pci/mlx5/cmd.h | 28 +++- + drivers/vfio/pci/mlx5/main.c | 285 ++++++++++++++++++++++++-------- + drivers/vfio/vfio_main.c | 10 ++ + include/linux/cdx/cdx_bus.h | 18 ++ + include/uapi/linux/vfio.h | 47 ++++-- + samples/vfio-mdev/mbochs.c | 2 +- + samples/vfio-mdev/mdpy.c | 2 +- + 15 files changed, 543 insertions(+), 120 deletions(-) +Merging w1/for-next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-w1.git w1/for-next +Already up to date. +Merging staging/staging-next (25d367506a28 staging: rtl8192e: Remove unused file rtllib_debug.h) +$ 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/fieldbus/anybuss/arcx-anybus.c | 17 +- + drivers/staging/greybus/authentication.c | 19 +- + drivers/staging/greybus/fw-management.c | 19 +- + drivers/staging/greybus/raw.c | 19 +- + drivers/staging/ks7010/ks7010_sdio.c | 4 +- + drivers/staging/octeon/ethernet.c | 6 +- + drivers/staging/octeon/octeon-stubs.h | 50 +- + drivers/staging/pi433/pi433_if.c | 21 +- + drivers/staging/qlge/qlge_dbg.c | 6 +- + drivers/staging/rtl8192e/dot11d.c | 3 - + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.c | 173 +++---- + drivers/staging/rtl8192e/rtl8192e/r8192E_dev.h | 3 - + drivers/staging/rtl8192e/rtl8192e/rtl_cam.c | 110 ---- + drivers/staging/rtl8192e/rtl8192e/rtl_cam.h | 1 - + drivers/staging/rtl8192e/rtl8192e/rtl_core.c | 226 +-------- + drivers/staging/rtl8192e/rtl8192e/rtl_core.h | 8 - + drivers/staging/rtl8192e/rtl8192e/rtl_dm.c | 139 +---- + drivers/staging/rtl8192e/rtl8192e/rtl_dm.h | 2 - + drivers/staging/rtl8192e/rtl8192e/rtl_ps.c | 9 +- + drivers/staging/rtl8192e/rtl8192e/rtl_wx.c | 271 +--------- + drivers/staging/rtl8192e/rtl819x_BAProc.c | 250 ++++----- + drivers/staging/rtl8192e/rtl819x_HT.h | 2 +- + drivers/staging/rtl8192e/rtl819x_HTProc.c | 76 +-- + drivers/staging/rtl8192e/rtl819x_TS.h | 2 +- + drivers/staging/rtl8192e/rtl819x_TSProc.c | 150 +++--- + drivers/staging/rtl8192e/rtllib.h | 291 ++--------- + drivers/staging/rtl8192e/rtllib_crypt_ccmp.c | 17 +- + drivers/staging/rtl8192e/rtllib_crypt_tkip.c | 40 +- + drivers/staging/rtl8192e/rtllib_debug.h | 49 -- + drivers/staging/rtl8192e/rtllib_module.c | 6 +- + drivers/staging/rtl8192e/rtllib_rx.c | 433 +++++++--------- + drivers/staging/rtl8192e/rtllib_softmac.c | 487 +++--------------- + drivers/staging/rtl8192e/rtllib_softmac_wx.c | 51 +- + drivers/staging/rtl8192e/rtllib_tx.c | 563 ++++++++++----------- + drivers/staging/rtl8192e/rtllib_wx.c | 2 +- + drivers/staging/rtl8723bs/hal/rtl8723b_phycfg.c | 6 +- + drivers/staging/vc04_services/Makefile | 1 + + .../staging/vc04_services/bcm2835-audio/bcm2835.c | 26 +- + .../vc04_services/bcm2835-camera/bcm2835-camera.c | 23 +- + .../vc04_services/interface/vchiq_arm/vchiq_arm.c | 52 +- + .../vc04_services/interface/vchiq_arm/vchiq_bus.c | 100 ++++ + .../vc04_services/interface/vchiq_arm/vchiq_bus.h | 54 ++ + drivers/staging/vme_user/vme.c | 27 +- + drivers/staging/vme_user/vme_fake.c | 75 ++- + drivers/staging/vme_user/vme_tsi148.h | 160 +++--- + drivers/staging/vme_user/vme_user.c | 26 +- + drivers/staging/vt6655/baseband.c | 44 +- + drivers/staging/vt6655/card.c | 4 +- + drivers/staging/vt6655/channel.c | 4 +- + drivers/staging/vt6655/device.h | 2 +- + drivers/staging/vt6655/device_main.c | 6 +- + drivers/staging/vt6655/rf.c | 14 +- + drivers/staging/vt6655/rf.h | 2 +- + 53 files changed, 1359 insertions(+), 2792 deletions(-) + delete mode 100644 drivers/staging/rtl8192e/rtllib_debug.h + create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.c + create mode 100644 drivers/staging/vc04_services/interface/vchiq_arm/vchiq_bus.h +Merging counter-next/counter-next (631c15d5f14d counter: chrdev: remove a typo in header file comment) +$ git merge -m Merge branch 'counter-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wbg/counter.git counter-next/counter-next +Auto-merging drivers/counter/microchip-tcb-capture.c +Merge made by the 'ort' strategy. + include/uapi/linux/counter.h | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging mux/for-next (44c026a73be8 Linux 6.4-rc3) +$ git merge -m Merge branch 'for-next' of https://gitlab.com/peda-linux/mux.git mux/for-next +Already up to date. +Merging dmaengine/next (8bf914570650 dmaengine: mmp_tdma: drop unused variable 'of_id') +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Auto-merging MAINTAINERS +Auto-merging drivers/dma/fsl-edma-common.h +Auto-merging drivers/dma/fsl-edma-main.c +Auto-merging drivers/dma/mediatek/mtk-uart-apdma.c +Auto-merging drivers/dma/stm32-dma.c +Auto-merging drivers/dma/stm32-mdma.c +Merge made by the 'ort' strategy. + Documentation/ABI/stable/sysfs-driver-dma-idxd | 6 + + .../devicetree/bindings/dma/qcom,gpi.yaml | 2 + + MAINTAINERS | 8 + + drivers/dma/Kconfig | 2 +- + drivers/dma/altera-msgdma.c | 6 +- + drivers/dma/apple-admac.c | 8 +- + drivers/dma/at_hdmac.c | 8 +- + drivers/dma/at_xdmac.c | 6 +- + drivers/dma/bcm-sba-raid.c | 6 +- + drivers/dma/bcm2835-dma.c | 6 +- + drivers/dma/bestcomm/bestcomm.c | 6 +- + drivers/dma/dma-axi-dmac.c | 11 +- + drivers/dma/dma-jz4780.c | 6 +- + drivers/dma/dw-axi-dmac/dw-axi-dmac-platform.c | 6 +- + drivers/dma/dw/platform.c | 6 +- + drivers/dma/ep93xx_dma.c | 2 +- + drivers/dma/fsl-dpaa2-qdma/dpaa2-qdma.c | 1 - + drivers/dma/fsl-edma-common.h | 2 +- + drivers/dma/fsl-edma-main.c | 19 +-- + drivers/dma/fsl-qdma.c | 5 +- + drivers/dma/fsl_raid.c | 6 +- + drivers/dma/fsldma.c | 6 +- + drivers/dma/hisi_dma.c | 2 +- + drivers/dma/idma64.c | 6 +- + drivers/dma/idxd/Makefile | 6 +- + drivers/dma/idxd/cdev.c | 7 + + drivers/dma/idxd/dma.c | 6 + + drivers/dma/idxd/idxd.h | 9 + + drivers/dma/idxd/irq.c | 4 +- + drivers/dma/idxd/sysfs.c | 34 ++++ + drivers/dma/img-mdc-dma.c | 6 +- + drivers/dma/imx-dma.c | 6 +- + drivers/dma/imx-sdma.c | 5 +- + drivers/dma/k3dma.c | 30 ++-- + drivers/dma/mcf-edma-main.c | 6 +- + drivers/dma/mediatek/mtk-cqdma.c | 6 +- + drivers/dma/mediatek/mtk-hsdma.c | 6 +- + drivers/dma/mediatek/mtk-uart-apdma.c | 6 +- + drivers/dma/mmp_pdma.c | 10 +- + drivers/dma/mmp_tdma.c | 35 +--- + drivers/dma/moxart-dma.c | 11 +- + drivers/dma/mpc512x_dma.c | 6 +- + drivers/dma/mv_xor.c | 11 +- + drivers/dma/mv_xor_v2.c | 6 +- + drivers/dma/nbpfaxi.c | 6 +- + drivers/dma/owl-dma.c | 6 +- + drivers/dma/ppc4xx/adma.c | 5 +- + drivers/dma/pxa_dma.c | 26 ++- + drivers/dma/qcom/bam_dma.c | 8 +- + drivers/dma/qcom/hidma.c | 8 +- + drivers/dma/qcom/qcom_adm.c | 6 +- + drivers/dma/sa11x0-dma.c | 12 +- + drivers/dma/sf-pdma/sf-pdma.c | 6 +- + drivers/dma/sf-pdma/sf-pdma.h | 2 +- + drivers/dma/sh/rcar-dmac.c | 6 +- + drivers/dma/sh/rz-dmac.c | 6 +- + drivers/dma/sh/shdmac.c | 6 +- + drivers/dma/sh/usb-dmac.c | 8 +- + drivers/dma/sprd-dma.c | 22 ++- + drivers/dma/st_fdma.c | 18 +- + drivers/dma/st_fdma.h | 2 +- + drivers/dma/stm32-dma.c | 19 +-- + drivers/dma/stm32-mdma.c | 9 +- + drivers/dma/sun4i-dma.c | 6 +- + drivers/dma/sun6i-dma.c | 6 +- + drivers/dma/tegra186-gpc-dma.c | 8 +- + drivers/dma/tegra20-apb-dma.c | 6 +- + drivers/dma/tegra210-adma.c | 8 +- + drivers/dma/ti/cppi41.c | 5 +- + drivers/dma/ti/edma.c | 12 +- + drivers/dma/ti/omap-dma.c | 11 +- + drivers/dma/timb_dma.c | 5 +- + drivers/dma/txx9dmac.c | 10 +- + drivers/dma/uniphier-xdmac.c | 8 +- + drivers/dma/xgene-dma.c | 6 +- + drivers/dma/xilinx/xdma-regs.h | 2 + + drivers/dma/xilinx/xdma.c | 187 +++++++++++++++++++-- + drivers/dma/xilinx/xilinx_dma.c | 6 +- + drivers/dma/xilinx/xilinx_dpdma.c | 6 +- + drivers/dma/xilinx/zynqmp_dma.c | 6 +- + include/linux/dmaengine.h | 2 - + include/uapi/linux/idxd.h | 1 + + 82 files changed, 458 insertions(+), 382 deletions(-) +Merging cgroup/for-next (ca2332016d31 Merge branch 'for-6.6-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tj/cgroup.git cgroup/for-next +Auto-merging Documentation/admin-guide/cgroup-v2.rst +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging kernel/cgroup/cgroup.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/cgroup-v2.rst | 123 +- + Documentation/admin-guide/kernel-parameters.txt | 4 + + kernel/cgroup/cgroup.c | 30 +- + kernel/cgroup/cpuset.c | 1332 +++++++++++++++------ + tools/testing/selftests/cgroup/test_cpuset_prs.sh | 463 ++++--- + 5 files changed, 1432 insertions(+), 520 deletions(-) +Merging scsi/for-next (e2187116a4dc Merge branch 'misc' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jejb/scsi.git scsi/for-next +Auto-merging MAINTAINERS +Auto-merging drivers/scsi/hisi_sas/hisi_sas_v3_hw.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 - + drivers/scsi/Kconfig | 15 -- + drivers/scsi/esas2r/esas2r_ioctl.c | 16 +- + drivers/scsi/fnic/fnic_fcs.c | 11 +- + drivers/scsi/hisi_sas/hisi_sas.h | 3 +- + drivers/scsi/hisi_sas/hisi_sas_main.c | 7 +- + drivers/scsi/hisi_sas/hisi_sas_v3_hw.c | 116 ++++++-------- + drivers/scsi/imm.c | 70 ++++---- + drivers/scsi/imm.h | 4 - + drivers/scsi/libsas/sas_discover.c | 2 +- + drivers/scsi/libsas/sas_init.c | 4 +- + drivers/scsi/libsas/sas_internal.h | 12 ++ + drivers/scsi/pm8001/pm8001_hwi.c | 89 ++-------- + drivers/scsi/pm8001/pm8001_init.c | 285 ++++++++++++++++++--------------- + drivers/scsi/pm8001/pm8001_sas.h | 11 +- + drivers/scsi/pm8001/pm80xx_hwi.c | 59 +++---- + drivers/scsi/qla2xxx/qla_os.c | 5 +- + drivers/target/iscsi/Kconfig | 9 +- + drivers/target/target_core_user.c | 2 +- + drivers/ufs/core/ufshcd.c | 39 ++--- + drivers/ufs/host/cdns-pltfrm.c | 5 +- + drivers/ufs/host/tc-dwc-g210-pltfrm.c | 6 +- + drivers/ufs/host/ti-j721e-ufs.c | 6 +- + drivers/ufs/host/ufs-exynos.c | 15 +- + drivers/ufs/host/ufs-hisi.c | 5 +- + drivers/ufs/host/ufs-mediatek.c | 7 +- + drivers/ufs/host/ufs-qcom.c | 220 +++++++++++++++++++------ + drivers/ufs/host/ufs-qcom.h | 20 ++- + drivers/ufs/host/ufs-renesas.c | 6 +- + drivers/ufs/host/ufs-sprd.c | 5 +- + drivers/ufs/host/ufshcd-pltfrm.c | 15 +- + drivers/ufs/host/ufshcd-pltfrm.h | 2 +- + include/scsi/libsas.h | 17 -- + include/trace/events/ufs.h | 15 +- + include/ufs/ufs.h | 3 +- + include/ufs/ufshcd.h | 7 +- + 36 files changed, 574 insertions(+), 541 deletions(-) +Merging scsi-mkp/for-next (af46076d6640 Merge patch series "lpfc: Update lpfc to revision 14.2.0.15") +$ 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 MAINTAINERS +Auto-merging drivers/scsi/scsi.c +Auto-merging drivers/scsi/sd.c +Auto-merging drivers/target/target_core_device.c +Auto-merging drivers/ufs/core/ufshcd.c +Merge made by the 'ort' strategy. + MAINTAINERS | 1 + + drivers/infiniband/ulp/srpt/ib_srpt.c | 3 + + drivers/message/fusion/mptctl.c | 19 +- + drivers/message/fusion/mptfc.c | 94 +++-- + drivers/message/fusion/mptsas.c | 16 +- + drivers/message/fusion/mptscsih.c | 55 ++- + drivers/message/fusion/mptscsih.h | 1 + + drivers/scsi/aic7xxx/aic79xx_osm.c | 32 +- + drivers/scsi/aic7xxx/aic7xxx_osm.c | 131 +++---- + drivers/scsi/bnx2fc/bnx2fc.h | 1 + + drivers/scsi/bnx2fc/bnx2fc_hwi.c | 14 +- + drivers/scsi/bnx2fc/bnx2fc_io.c | 94 ++--- + drivers/scsi/cxgbi/libcxgbi.c | 2 +- + drivers/scsi/device_handler/scsi_dh_hp_sw.c | 81 ++--- + drivers/scsi/device_handler/scsi_dh_rdac.c | 21 +- + drivers/scsi/elx/efct/efct_lio.c | 5 + + drivers/scsi/ibmvscsi/ibmvfc.c | 493 +++++++++++++++++++-------- + drivers/scsi/ibmvscsi/ibmvfc.h | 50 ++- + drivers/scsi/ibmvscsi_tgt/ibmvscsi_tgt.c | 3 + + drivers/scsi/ips.c | 18 - + drivers/scsi/libfc/fc_lport.c | 6 + + drivers/scsi/lpfc/lpfc_els.c | 23 ++ + drivers/scsi/lpfc/lpfc_hbadisc.c | 8 +- + drivers/scsi/lpfc/lpfc_logmsg.h | 2 +- + drivers/scsi/lpfc/lpfc_nportdisc.c | 18 +- + drivers/scsi/lpfc/lpfc_nvme.c | 6 +- + drivers/scsi/lpfc/lpfc_sli.c | 4 +- + drivers/scsi/lpfc/lpfc_version.h | 2 +- + drivers/scsi/megaraid.c | 42 +-- + drivers/scsi/megaraid/megaraid_sas.h | 4 +- + drivers/scsi/megaraid/megaraid_sas_base.c | 4 +- + drivers/scsi/megaraid/megaraid_sas_fusion.c | 3 + + drivers/scsi/mpi3mr/mpi3mr_os.c | 63 ++-- + drivers/scsi/pmcraid.c | 60 +++- + drivers/scsi/qedf/qedf.h | 5 +- + drivers/scsi/qedf/qedf_io.c | 75 ++-- + drivers/scsi/qedf/qedf_main.c | 19 +- + drivers/scsi/qla1280.c | 42 +-- + drivers/scsi/qla2xxx/tcm_qla2xxx.c | 6 + + drivers/scsi/scsi.c | 2 +- + drivers/scsi/scsi_lib.c | 4 +- + drivers/scsi/scsi_transport_spi.c | 4 +- + drivers/scsi/sd.c | 44 +-- + drivers/scsi/sr.c | 3 +- + drivers/scsi/sym53c8xx_2/sym_glue.c | 189 ++++++---- + drivers/target/iscsi/iscsi_target.c | 6 - + drivers/target/iscsi/iscsi_target_configfs.c | 5 +- + drivers/target/iscsi/iscsi_target_erl1.c | 2 +- + drivers/target/iscsi/iscsi_target_tmr.c | 2 +- + drivers/target/loopback/tcm_loop.c | 4 +- + drivers/target/sbp/sbp_target.c | 3 + + drivers/target/target_core_alua.c | 1 - + drivers/target/target_core_configfs.c | 22 ++ + drivers/target/target_core_device.c | 1 + + drivers/target/target_core_fabric_configfs.c | 24 ++ + drivers/target/target_core_transport.c | 116 +++---- + drivers/target/tcm_fc/tfc_conf.c | 3 + + drivers/ufs/core/ufshcd.c | 43 ++- + drivers/ufs/host/ufs-qcom.c | 14 +- + drivers/ufs/host/ufshcd-pci.c | 5 +- + drivers/usb/gadget/function/f_tcm.c | 3 + + drivers/vhost/scsi.c | 5 +- + drivers/xen/xen-scsiback.c | 3 + + include/target/target_core_base.h | 10 + + include/target/target_core_fabric.h | 19 +- + 65 files changed, 1307 insertions(+), 756 deletions(-) +Merging vhost/linux-next (1acfe2c12258 virtio_ring: fix avail_wrap_counter in virtqueue_add_packed) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Already up to date. +Merging rpmsg/for-next (a7d272979d3a Merge branches 'hwspinlock' 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 +Auto-merging arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi +Auto-merging arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi +Merge made by the 'ort' strategy. + .../devicetree/bindings/remoteproc/mtk,scp.yaml | 176 ++++++- + .../devicetree/bindings/remoteproc/qcom,adsp.yaml | 20 +- + .../bindings/remoteproc/qcom,msm8996-mss-pil.yaml | 2 - + .../bindings/remoteproc/qcom,sc7180-pas.yaml | 81 +++- + .../bindings/remoteproc/qcom,sm6375-pas.yaml | 145 ++++++ + .../bindings/remoteproc/ti,pru-rproc.yaml | 23 + + arch/arm64/boot/dts/mediatek/mt8183-kukui.dtsi | 2 +- + arch/arm64/boot/dts/mediatek/mt8192-asurada.dtsi | 2 +- + drivers/hwspinlock/qcom_hwspinlock.c | 1 - + drivers/remoteproc/mtk_common.h | 39 +- + drivers/remoteproc/mtk_scp.c | 536 ++++++++++++++++----- + drivers/remoteproc/mtk_scp_ipi.c | 4 +- + drivers/remoteproc/qcom_q6v5_mss.c | 1 - + drivers/remoteproc/qcom_q6v5_pas.c | 19 + + drivers/remoteproc/st_remoteproc.c | 14 +- + drivers/remoteproc/stm32_rproc.c | 4 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 112 ++--- + 17 files changed, 931 insertions(+), 250 deletions(-) + create mode 100644 Documentation/devicetree/bindings/remoteproc/qcom,sm6375-pas.yaml +Merging gpio/for-next (0bb80ecc33a8 Linux 6.6-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 (8c85a102fc4e gpiolib: provide gpio_device_get_base()) +$ 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 MAINTAINERS +Auto-merging arch/arm/mach-omap1/board-ams-delta.c +Auto-merging drivers/gpio/Kconfig +Auto-merging drivers/gpio/gpio-ljca.c +CONFLICT (content): Merge conflict in drivers/gpio/gpio-ljca.c +Auto-merging drivers/gpio/gpio-sim.c +Auto-merging drivers/gpio/gpio-tb10x.c +Auto-merging drivers/gpio/gpiolib-of.c +Auto-merging drivers/i2c/muxes/i2c-mux-gpio.c +Auto-merging drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c +Recorded preimage for 'drivers/gpio/gpio-ljca.c' +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +Recorded resolution for 'drivers/gpio/gpio-ljca.c'. +[master ae11b6437f8e] Merge branch 'gpio/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git +$ git diff -M --stat --summary HEAD^.. + .../devicetree/bindings/gpio/fsl-imx-gpio.yaml | 8 + + .../devicetree/bindings/gpio/gpio-vf610.yaml | 40 ++- + .../devicetree/bindings/gpio/intel,ixp4xx-gpio.txt | 38 --- + .../bindings/gpio/intel,ixp4xx-gpio.yaml | 73 +++++ + .../devicetree/bindings/gpio/loongson,ls-gpio.yaml | 21 +- + Documentation/driver-api/gpio/consumer.rst | 4 + + MAINTAINERS | 2 +- + arch/arm/mach-omap1/board-ams-delta.c | 36 ++- + arch/arm/mach-omap1/board-palmte.c | 5 - + drivers/gpio/Kconfig | 4 +- + drivers/gpio/gpio-altera.c | 6 +- + drivers/gpio/gpio-amdpt.c | 6 +- + drivers/gpio/gpio-brcmstb.c | 6 +- + drivers/gpio/gpio-cadence.c | 6 +- + drivers/gpio/gpio-davinci.c | 9 +- + drivers/gpio/gpio-dln2.c | 6 +- + drivers/gpio/gpio-dwapb.c | 1 - + drivers/gpio/gpio-eic-sprd.c | 73 +++-- + drivers/gpio/gpio-f7188x.c | 138 ++++----- + drivers/gpio/gpio-ftgpio010.c | 6 +- + drivers/gpio/gpio-fxl6408.c | 2 +- + drivers/gpio/gpio-grgpio.c | 6 +- + drivers/gpio/gpio-hisi.c | 2 +- + drivers/gpio/gpio-loongson-64bit.c | 119 +++++++- + drivers/gpio/gpio-lpc18xx.c | 6 +- + drivers/gpio/gpio-mb86s7x.c | 7 +- + drivers/gpio/gpio-mm-lantiq.c | 6 +- + drivers/gpio/gpio-mmio.c | 4 +- + drivers/gpio/gpio-mockup.c | 88 +++--- + drivers/gpio/gpio-mpc5200.c | 8 +- + drivers/gpio/gpio-mpc8xxx.c | 6 +- + drivers/gpio/gpio-mvebu.c | 10 +- + drivers/gpio/gpio-omap.c | 9 +- + drivers/gpio/gpio-pca953x.c | 307 +++++++++------------ + drivers/gpio/gpio-rcar.c | 5 +- + drivers/gpio/gpio-rockchip.c | 6 +- + drivers/gpio/gpio-sim.c | 76 +++-- + drivers/gpio/gpio-tb10x.c | 6 +- + drivers/gpio/gpio-ts5500.c | 6 +- + drivers/gpio/gpio-uniphier.c | 6 +- + drivers/gpio/gpio-vf610.c | 56 +++- + drivers/gpio/gpio-xgene-sb.c | 7 +- + drivers/gpio/gpio-xgs-iproc.c | 6 +- + drivers/gpio/gpio-xilinx.c | 6 +- + drivers/gpio/gpio-zynq.c | 5 +- + drivers/gpio/gpiolib-acpi.c | 40 +-- + drivers/gpio/gpiolib-cdev.c | 4 +- + drivers/gpio/gpiolib-of.c | 86 ++++-- + drivers/gpio/gpiolib-swnode.c | 33 ++- + drivers/gpio/gpiolib-sysfs.c | 2 +- + drivers/gpio/gpiolib.c | 304 ++++++++++++++++---- + drivers/gpio/gpiolib.h | 14 +- + drivers/i2c/muxes/i2c-mux-gpio.c | 12 +- + drivers/mtd/nand/raw/ingenic/ingenic_nand_drv.c | 12 - + drivers/pinctrl/pinctrl-da9062.c | 7 +- + include/linux/gpio/consumer.h | 16 -- + include/linux/gpio/driver.h | 47 +++- + include/linux/platform_data/gpio-omap.h | 3 - + include/linux/platform_data/pca953x.h | 13 - + 59 files changed, 1106 insertions(+), 740 deletions(-) + delete mode 100644 Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.txt + create mode 100644 Documentation/devicetree/bindings/gpio/intel,ixp4xx-gpio.yaml +Merging gpio-intel/for-next (0bb80ecc33a8 Linux 6.6-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 (c766fd3059c0 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 arch/arm/boot/dts/qcom/qcom-msm8226.dtsi +Merge made by the 'ort' strategy. + .../bindings/pinctrl/amlogic,meson-pinctrl-a1.yaml | 1 + + .../bindings/pinctrl/nuvoton,npcm845-pinctrl.yaml | 216 ++ + .../bindings/pinctrl/qcom,mdm9607-tlmm.yaml | 3 +- + .../bindings/pinctrl/qcom,msm8226-pinctrl.yaml | 4 +- + .../bindings/pinctrl/qcom,sc7280-pinctrl.yaml | 4 + + .../bindings/pinctrl/realtek,rtd1315e-pinctrl.yaml | 188 ++ + .../bindings/pinctrl/realtek,rtd1319d-pinctrl.yaml | 187 ++ + .../bindings/pinctrl/realtek,rtd1619b-pinctrl.yaml | 186 ++ + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 1 + + .../bindings/pinctrl/renesas,rzv2m-pinctrl.yaml | 1 + + .../bindings/pinctrl/rockchip,pinctrl.yaml | 2 + + .../bindings/pinctrl/st,stm32-pinctrl.yaml | 3 +- + arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 33 + + drivers/pinctrl/Kconfig | 1 + + drivers/pinctrl/Makefile | 1 + + drivers/pinctrl/aspeed/pinctrl-aspeed-g4.c | 19 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g5.c | 19 +- + drivers/pinctrl/aspeed/pinctrl-aspeed-g6.c | 7 +- + drivers/pinctrl/berlin/berlin.c | 8 +- + drivers/pinctrl/cirrus/pinctrl-madera-core.c | 6 +- + drivers/pinctrl/core.c | 4 +- + drivers/pinctrl/freescale/pinctrl-mxs.c | 13 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 9 +- + drivers/pinctrl/mediatek/pinctrl-mt7981.c | 16 +- + drivers/pinctrl/mediatek/pinctrl-paris.c | 4 +- + drivers/pinctrl/meson/Kconfig | 6 + + drivers/pinctrl/meson/Makefile | 1 + + drivers/pinctrl/meson/pinctrl-amlogic-t7.c | 1611 +++++++++++++ + drivers/pinctrl/nomadik/pinctrl-abx500.c | 5 +- + drivers/pinctrl/nuvoton/Kconfig | 17 +- + drivers/pinctrl/nuvoton/Makefile | 1 + + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 15 +- + drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 2491 ++++++++++++++++++++ + drivers/pinctrl/nuvoton/pinctrl-wpcm450.c | 12 +- + drivers/pinctrl/pinctrl-amd.c | 6 +- + drivers/pinctrl/pinctrl-artpec6.c | 6 +- + drivers/pinctrl/pinctrl-as3722.c | 5 +- + drivers/pinctrl/pinctrl-cy8c95x0.c | 4 +- + drivers/pinctrl/pinctrl-mcp23s08.h | 8 + + drivers/pinctrl/pinctrl-mcp23s08_i2c.c | 93 +- + drivers/pinctrl/pinctrl-mcp23s08_spi.c | 97 +- + drivers/pinctrl/pinctrl-rockchip.c | 6 +- + drivers/pinctrl/pinctrl-single.c | 21 +- + drivers/pinctrl/pinctrl-stmfx.c | 16 +- + drivers/pinctrl/pinctrl-sx150x.c | 7 +- + drivers/pinctrl/pinctrl-tb10x.c | 6 +- + drivers/pinctrl/pinmux.c | 4 +- + drivers/pinctrl/qcom/pinctrl-apq8064.c | 2 +- + drivers/pinctrl/qcom/pinctrl-apq8084.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq4019.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq5018.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq5332.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq6018.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq8064.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq8074.c | 2 +- + drivers/pinctrl/qcom/pinctrl-ipq9574.c | 2 +- + drivers/pinctrl/qcom/pinctrl-lpass-lpi.c | 4 +- + drivers/pinctrl/qcom/pinctrl-lpass-lpi.h | 2 +- + drivers/pinctrl/qcom/pinctrl-mdm9607.c | 2 +- + drivers/pinctrl/qcom/pinctrl-mdm9615.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm.c | 4 +- + drivers/pinctrl/qcom/pinctrl-msm.h | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8226.c | 22 +- + drivers/pinctrl/qcom/pinctrl-msm8660.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8909.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8916.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8953.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8960.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8976.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8994.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8996.c | 16 +- + drivers/pinctrl/qcom/pinctrl-msm8998.c | 2 +- + drivers/pinctrl/qcom/pinctrl-msm8x74.c | 14 +- + drivers/pinctrl/qcom/pinctrl-qcm2290.c | 2 +- + drivers/pinctrl/qcom/pinctrl-qcs404.c | 2 +- + drivers/pinctrl/qcom/pinctrl-qdf2xxx.c | 2 +- + drivers/pinctrl/qcom/pinctrl-qdu1000.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sa8775p.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc7180.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc7280-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc7280.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc8180x.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc8280xp-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sc8280xp.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdm660.c | 16 +- + drivers/pinctrl/qcom/pinctrl-sdm670.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdm845.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdx55.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdx65.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sdx75.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm6115-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm6115.c | 14 +- + drivers/pinctrl/qcom/pinctrl-sm6125.c | 19 +- + drivers/pinctrl/qcom/pinctrl-sm6350.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm6375.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm7150.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8150.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8250-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8250.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8350-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8350.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8450-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8450.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8550-lpass-lpi.c | 2 +- + drivers/pinctrl/qcom/pinctrl-sm8550.c | 2 +- + drivers/pinctrl/qcom/pinctrl-spmi-gpio.c | 5 +- + drivers/pinctrl/qcom/pinctrl-spmi-mpp.c | 5 +- + drivers/pinctrl/qcom/pinctrl-ssbi-gpio.c | 6 +- + drivers/pinctrl/qcom/pinctrl-ssbi-mpp.c | 6 +- + drivers/pinctrl/realtek/Kconfig | 23 + + drivers/pinctrl/realtek/Makefile | 6 + + drivers/pinctrl/realtek/pinctrl-rtd.c | 596 +++++ + drivers/pinctrl/realtek/pinctrl-rtd.h | 124 + + drivers/pinctrl/realtek/pinctrl-rtd1315e.c | 1440 +++++++++++ + drivers/pinctrl/realtek/pinctrl-rtd1319d.c | 1610 +++++++++++++ + drivers/pinctrl/realtek/pinctrl-rtd1619b.c | 1601 +++++++++++++ + drivers/pinctrl/renesas/pfc-r8a7779.c | 2 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 17 +- + drivers/pinctrl/sprd/pinctrl-sprd-sc9860.c | 2 +- + drivers/pinctrl/sprd/pinctrl-sprd.c | 3 +- + drivers/pinctrl/sprd/pinctrl-sprd.h | 2 +- + drivers/pinctrl/sunxi/pinctrl-sun50i-h616.c | 380 ++- + drivers/pinctrl/tegra/pinctrl-tegra.c | 8 +- + drivers/pinctrl/ti/pinctrl-ti-iodelay.c | 11 +- + drivers/pinctrl/uniphier/pinctrl-uniphier-core.c | 2 +- + .../dt-bindings/gpio/amlogic,t7-periphs-pinctrl.h | 179 ++ + 126 files changed, 11265 insertions(+), 346 deletions(-) + create mode 100644 Documentation/devicetree/bindings/pinctrl/nuvoton,npcm845-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/realtek,rtd1315e-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/realtek,rtd1319d-pinctrl.yaml + create mode 100644 Documentation/devicetree/bindings/pinctrl/realtek,rtd1619b-pinctrl.yaml + create mode 100644 drivers/pinctrl/meson/pinctrl-amlogic-t7.c + create mode 100644 drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c + create mode 100644 drivers/pinctrl/realtek/Kconfig + create mode 100644 drivers/pinctrl/realtek/Makefile + create mode 100644 drivers/pinctrl/realtek/pinctrl-rtd.c + create mode 100644 drivers/pinctrl/realtek/pinctrl-rtd.h + create mode 100644 drivers/pinctrl/realtek/pinctrl-rtd1315e.c + create mode 100644 drivers/pinctrl/realtek/pinctrl-rtd1319d.c + create mode 100644 drivers/pinctrl/realtek/pinctrl-rtd1619b.c + create mode 100644 include/dt-bindings/gpio/amlogic,t7-periphs-pinctrl.h +Merging pinctrl-intel/for-next (8d751da9f1d7 pinctrl: intel: fetch community only when we need it) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/intel.git pinctrl-intel/for-next +Auto-merging drivers/pinctrl/core.c +Auto-merging drivers/pinctrl/pinmux.c +Merge made by the 'ort' strategy. + drivers/pinctrl/core.c | 2 +- + drivers/pinctrl/intel/pinctrl-baytrail.c | 21 +-- + drivers/pinctrl/intel/pinctrl-broxton.c | 3 +- + drivers/pinctrl/intel/pinctrl-cherryview.c | 157 +++++++++-------------- + drivers/pinctrl/intel/pinctrl-denverton.c | 7 + + drivers/pinctrl/intel/pinctrl-intel.c | 198 ++++++++++++----------------- + drivers/pinctrl/intel/pinctrl-intel.h | 2 +- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 34 +---- + drivers/pinctrl/intel/pinctrl-merrifield.c | 2 +- + drivers/pinctrl/intel/pinctrl-moorefield.c | 2 +- + drivers/pinctrl/pinconf-generic.c | 20 +-- + drivers/pinctrl/pinconf.c | 14 +- + drivers/pinctrl/pinctrl-utils.c | 6 +- + drivers/pinctrl/pinmux.c | 2 +- + include/linux/array_size.h | 13 ++ + include/linux/kernel.h | 7 +- + include/linux/pinctrl/machine.h | 2 +- + include/linux/string.h | 1 + + 18 files changed, 199 insertions(+), 294 deletions(-) + create mode 100644 include/linux/array_size.h +Merging pinctrl-renesas/renesas-pinctrl (583d80732055 pinctrl: renesas: rzn1: Convert to platform remove callback returning void) +$ 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 +Auto-merging Documentation/devicetree/bindings/pinctrl/renesas,rzg2l-pinctrl.yaml +Merge made by the 'ort' strategy. + .../bindings/pinctrl/renesas,rzg2l-pinctrl.yaml | 20 + + drivers/pinctrl/renesas/pfc-r8a7778.c | 38 ++ + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 702 ++++++++++++++++----- + drivers/pinctrl/renesas/pinctrl-rzn1.c | 6 +- + 4 files changed, 614 insertions(+), 152 deletions(-) +Merging pinctrl-samsung/for-next (8aec97decfd0 pinctrl: samsung: do not offset pinctrl numberspaces) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pinctrl/samsung.git pinctrl-samsung/for-next +Merge made by the 'ort' strategy. + drivers/pinctrl/samsung/pinctrl-exynos.c | 2 +- + drivers/pinctrl/samsung/pinctrl-exynos.h | 2 +- + drivers/pinctrl/samsung/pinctrl-samsung.c | 56 ++++++++++++++++--------------- + drivers/pinctrl/samsung/pinctrl-samsung.h | 4 +-- + 4 files changed, 33 insertions(+), 31 deletions(-) +Merging pwm/for-next (4bb36d126cb3 pwm: samsung: Document new member .channel in struct samsung_pwm_chip) + 8151b37b4183 ("pwm: Adapt sysfs API documentation to reality") +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/thierry.reding/linux-pwm.git pwm/for-next +Auto-merging drivers/gpio/gpio-mvebu.c +Auto-merging drivers/gpu/drm/bridge/ti-sn65dsi86.c +Auto-merging drivers/leds/rgb/leds-qcom-lpg.c +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/pwm/mxs-pwm.yaml | 13 +- + drivers/gpio/gpio-mvebu.c | 1 - + drivers/gpu/drm/bridge/ti-sn65dsi86.c | 1 - + drivers/leds/rgb/leds-qcom-lpg.c | 1 - + drivers/pwm/Kconfig | 20 ++- + drivers/pwm/Makefile | 1 + + drivers/pwm/core.c | 55 ++---- + drivers/pwm/pwm-ab8500.c | 1 - + drivers/pwm/pwm-apple.c | 1 - + drivers/pwm/pwm-atmel-hlcdc.c | 1 - + drivers/pwm/pwm-atmel-tcb.c | 1 - + drivers/pwm/pwm-atmel.c | 3 +- + drivers/pwm/pwm-bcm-iproc.c | 38 +--- + drivers/pwm/pwm-bcm-kona.c | 1 - + drivers/pwm/pwm-bcm2835.c | 38 ++-- + drivers/pwm/pwm-berlin.c | 63 ++----- + drivers/pwm/pwm-brcmstb.c | 49 ++--- + drivers/pwm/pwm-clk.c | 1 - + drivers/pwm/pwm-clps711x.c | 1 - + drivers/pwm/pwm-crc.c | 5 +- + drivers/pwm/pwm-cros-ec.c | 67 ++----- + drivers/pwm/pwm-dwc-core.c | 184 +++++++++++++++++++ + drivers/pwm/pwm-dwc.c | 197 +-------------------- + drivers/pwm/pwm-dwc.h | 60 +++++++ + drivers/pwm/pwm-ep93xx.c | 1 - + drivers/pwm/pwm-fsl-ftm.c | 1 - + drivers/pwm/pwm-hibvt.c | 1 - + drivers/pwm/pwm-img.c | 1 - + drivers/pwm/pwm-imx-tpm.c | 30 +--- + drivers/pwm/pwm-imx1.c | 1 - + drivers/pwm/pwm-imx27.c | 1 - + drivers/pwm/pwm-intel-lgm.c | 1 - + drivers/pwm/pwm-iqs620a.c | 1 - + drivers/pwm/pwm-jz4740.c | 46 ++--- + drivers/pwm/pwm-keembay.c | 1 - + drivers/pwm/pwm-lp3943.c | 22 +-- + drivers/pwm/pwm-lpc18xx-sct.c | 1 - + drivers/pwm/pwm-lpc32xx.c | 1 - + drivers/pwm/pwm-lpss.c | 1 - + drivers/pwm/pwm-mediatek.c | 1 - + drivers/pwm/pwm-meson.c | 1 - + drivers/pwm/pwm-microchip-core.c | 1 - + drivers/pwm/pwm-mtk-disp.c | 25 +-- + drivers/pwm/pwm-mxs.c | 1 - + drivers/pwm/pwm-ntxec.c | 1 - + drivers/pwm/pwm-omap-dmtimer.c | 3 +- + drivers/pwm/pwm-pca9685.c | 1 - + drivers/pwm/pwm-pxa.c | 3 +- + drivers/pwm/pwm-raspberrypi-poe.c | 1 - + drivers/pwm/pwm-rcar.c | 1 - + drivers/pwm/pwm-renesas-tpu.c | 23 ++- + drivers/pwm/pwm-rockchip.c | 1 - + drivers/pwm/pwm-rz-mtu3.c | 1 - + drivers/pwm/pwm-samsung.c | 152 ++++++++-------- + drivers/pwm/pwm-sifive.c | 1 - + drivers/pwm/pwm-sl28cpld.c | 1 - + drivers/pwm/pwm-spear.c | 41 ++--- + drivers/pwm/pwm-sprd.c | 29 ++- + drivers/pwm/pwm-sti.c | 30 ++-- + drivers/pwm/pwm-stm32-lp.c | 1 - + drivers/pwm/pwm-stm32.c | 1 - + drivers/pwm/pwm-stmpe.c | 1 - + drivers/pwm/pwm-sun4i.c | 1 - + drivers/pwm/pwm-sunplus.c | 1 - + drivers/pwm/pwm-tegra.c | 1 - + drivers/pwm/pwm-tiecap.c | 1 - + drivers/pwm/pwm-tiehrpwm.c | 1 - + drivers/pwm/pwm-twl-led.c | 2 - + drivers/pwm/pwm-twl.c | 2 - + drivers/pwm/pwm-visconti.c | 1 - + drivers/pwm/pwm-vt8500.c | 43 +---- + drivers/pwm/pwm-xilinx.c | 1 - + drivers/staging/greybus/pwm.c | 1 - + include/linux/pwm.h | 24 +-- + 74 files changed, 537 insertions(+), 776 deletions(-) + create mode 100644 drivers/pwm/pwm-dwc-core.c + create mode 100644 drivers/pwm/pwm-dwc.h +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 +Auto-merging ipc/ipc_sysctl.c +Auto-merging ipc/mq_sysctl.c +Auto-merging kernel/ucount.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/sysctl/kernel.rst | 14 ++++++++--- + ipc/ipc_sysctl.c | 37 +++++++++++++++++++++++++++-- + ipc/mq_sysctl.c | 36 ++++++++++++++++++++++++++++ + kernel/ucount.c | 16 ++++++------- + 4 files changed, 89 insertions(+), 14 deletions(-) +Merging ktest/for-next (7dc8e24f0e09 ktest: Restore stty setting at first in dodie) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rostedt/linux-ktest.git ktest/for-next +Already up to date. +Merging kselftest/next (508934b5d15a selftests/resctrl: Move run_benchmark() to a more fitting file) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Auto-merging Makefile +Auto-merging tools/testing/selftests/mm/mremap_test.c +Merge made by the 'ort' strategy. + Documentation/dev-tools/kselftest.rst | 6 +- + Makefile | 4 +- + tools/testing/selftests/cachestat/test_cachestat.c | 2 +- + tools/testing/selftests/capabilities/Makefile | 2 +- + tools/testing/selftests/capabilities/test_execve.c | 8 - + .../testing/selftests/capabilities/validate_cap.c | 8 - + .../clone3/clone3_cap_checkpoint_restore.c | 2 - + .../selftests/clone3/clone3_clear_sighand.c | 4 - + tools/testing/selftests/clone3/clone3_selftests.h | 13 -- + tools/testing/selftests/clone3/clone3_set_tid.c | 2 - + tools/testing/selftests/core/close_range_test.c | 28 ---- + tools/testing/selftests/damon/debugfs_attrs.sh | 0 + .../damon/debugfs_duplicate_context_creation.sh | 0 + .../selftests/damon/debugfs_empty_targets.sh | 0 + .../damon/debugfs_huge_count_read_write.sh | 0 + .../selftests/damon/debugfs_rm_non_contexts.sh | 0 + tools/testing/selftests/damon/debugfs_schemes.sh | 0 + .../testing/selftests/damon/debugfs_target_ids.sh | 0 + tools/testing/selftests/damon/lru_sort.sh | 0 + tools/testing/selftests/damon/reclaim.sh | 0 + tools/testing/selftests/damon/sysfs.sh | 0 + .../damon/sysfs_update_removed_scheme_dir.sh | 0 + tools/testing/selftests/dmabuf-heaps/.gitignore | 1 + + tools/testing/selftests/exec/execveat.c | 87 ++++++---- + tools/testing/selftests/firmware/fw_namespace.c | 4 - + tools/testing/selftests/kselftest.h | 32 +++- + tools/testing/selftests/kvm/include/test_util.h | 8 +- + tools/testing/selftests/mm/mremap_test.c | 2 +- + tools/testing/selftests/mm/pkey-helpers.h | 2 +- + tools/testing/selftests/openat2/openat2_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_fdinfo_test.c | 2 +- + tools/testing/selftests/pidfd/pidfd_test.c | 12 +- + tools/testing/selftests/resctrl/Makefile | 2 +- + tools/testing/selftests/resctrl/cache.c | 7 +- + tools/testing/selftests/resctrl/cat_test.c | 21 +-- + tools/testing/selftests/resctrl/cmt_test.c | 37 +++-- + tools/testing/selftests/resctrl/mba_test.c | 6 +- + tools/testing/selftests/resctrl/mbm_test.c | 9 +- + tools/testing/selftests/resctrl/resctrl.h | 24 ++- + tools/testing/selftests/resctrl/resctrl_tests.c | 182 ++++++++++++--------- + tools/testing/selftests/resctrl/resctrl_val.c | 86 ++++++++-- + tools/testing/selftests/resctrl/resctrlfs.c | 158 ++++++------------ + tools/testing/selftests/rseq/param_test.c | 20 +-- + tools/testing/selftests/sigaltstack/sas.c | 2 +- + .../selftests/static_keys/test_static_keys.sh | 8 +- + tools/testing/selftests/tdx/.gitignore | 1 + + tools/testing/selftests/timers/nsleep-lat.c | 26 ++- + tools/testing/selftests/timers/posix_timers.c | 81 ++++----- + tools/testing/selftests/uevent/uevent_filtering.c | 8 +- + tools/testing/selftests/user_events/.gitignore | 4 + + 50 files changed, 452 insertions(+), 461 deletions(-) + mode change 100644 => 100755 tools/testing/selftests/damon/debugfs_attrs.sh + mode change 100644 => 100755 tools/testing/selftests/damon/debugfs_duplicate_context_creation.sh + mode change 100644 => 100755 tools/testing/selftests/damon/debugfs_empty_targets.sh + mode change 100644 => 100755 tools/testing/selftests/damon/debugfs_huge_count_read_write.sh + mode change 100644 => 100755 tools/testing/selftests/damon/debugfs_rm_non_contexts.sh + mode change 100644 => 100755 tools/testing/selftests/damon/debugfs_schemes.sh + mode change 100644 => 100755 tools/testing/selftests/damon/debugfs_target_ids.sh + mode change 100644 => 100755 tools/testing/selftests/damon/lru_sort.sh + mode change 100644 => 100755 tools/testing/selftests/damon/reclaim.sh + mode change 100644 => 100755 tools/testing/selftests/damon/sysfs.sh + mode change 100644 => 100755 tools/testing/selftests/damon/sysfs_update_removed_scheme_dir.sh + create mode 100644 tools/testing/selftests/dmabuf-heaps/.gitignore + create mode 100644 tools/testing/selftests/tdx/.gitignore + create mode 100644 tools/testing/selftests/user_events/.gitignore +Merging kunit/test (0bb80ecc33a8 Linux 6.6-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 (8040345fdae4 kunit: test: Fix the possible memory leak in executor_test) +$ 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. + include/kunit/test.h | 14 +- + lib/kunit/assert.c | 14 +- + lib/kunit/debugfs.c | 36 ++- + lib/kunit/executor.c | 23 +- + lib/kunit/executor_test.c | 36 +-- + lib/kunit/kunit-example-test.c | 5 +- + lib/kunit/kunit-test.c | 56 ++++- + lib/kunit/string-stream-test.c | 525 +++++++++++++++++++++++++++++++++++++++-- + lib/kunit/string-stream.c | 100 ++++++-- + lib/kunit/string-stream.h | 16 +- + lib/kunit/test.c | 56 +---- + 11 files changed, 734 insertions(+), 147 deletions(-) +Merging livepatching/for-next (602bf1830798 Merge branch 'for-6.7' 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. + kernel/livepatch/core.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging rtc/rtc-next (dc71c03b0a29 dt-bindings: rtc: microcrystal,rv3032: Document wakeup-source property) +$ 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. + .../devicetree/bindings/rtc/cirrus,ep9301-rtc.yaml | 42 ++++++++++++++++++ + .../devicetree/bindings/rtc/epson,rtc7301.txt | 16 ------- + .../devicetree/bindings/rtc/epson,rtc7301.yaml | 51 ++++++++++++++++++++++ + .../devicetree/bindings/rtc/maxim,mcp795.txt | 11 ----- + .../bindings/rtc/microcrystal,rv3032.yaml | 2 + + .../devicetree/bindings/rtc/nxp,pcf2123.yaml | 47 ++++++++++++++++++++ + .../devicetree/bindings/rtc/nxp,pcf8523.txt | 18 -------- + .../devicetree/bindings/rtc/nxp,pcf8523.yaml | 45 +++++++++++++++++++ + .../devicetree/bindings/rtc/nxp,rtc-2123.txt | 17 -------- + .../devicetree/bindings/rtc/trivial-rtc.yaml | 2 + + drivers/rtc/Kconfig | 2 +- + drivers/rtc/rtc-at91rm9200.c | 14 +++--- + drivers/rtc/rtc-brcmstb-waketimer.c | 47 +++++++++++++++++--- + drivers/rtc/rtc-efi.c | 2 +- + drivers/rtc/rtc-ep93xx.c | 8 ++++ + drivers/rtc/rtc-imxdi.c | 14 +++--- + drivers/rtc/rtc-mv.c | 14 +++--- + drivers/rtc/rtc-omap.c | 8 ++-- + drivers/rtc/rtc-pcap.c | 6 --- + drivers/rtc/rtc-pcf85363.c | 2 +- + drivers/rtc/rtc-pxa.c | 13 ++++-- + drivers/rtc/rtc-r7301.c | 35 ++++++++++++++- + drivers/rtc/rtc-sh.c | 16 ++++--- + 23 files changed, 324 insertions(+), 108 deletions(-) + create mode 100644 Documentation/devicetree/bindings/rtc/cirrus,ep9301-rtc.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/epson,rtc7301.txt + create mode 100644 Documentation/devicetree/bindings/rtc/epson,rtc7301.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/maxim,mcp795.txt + create mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf2123.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf8523.txt + create mode 100644 Documentation/devicetree/bindings/rtc/nxp,pcf8523.yaml + delete mode 100644 Documentation/devicetree/bindings/rtc/nxp,rtc-2123.txt +Merging nvdimm/libnvdimm-for-next (dd6cad2dcb58 testing: nvdimm: make struct class structures constant) +$ 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 +Auto-merging drivers/dax/bus.c +Merge made by the 'ort' strategy. + drivers/dax/bus.c | 2 +- + drivers/nvdimm/nd.h | 2 +- + drivers/nvdimm/of_pmem.c | 8 +++++++- + drivers/nvdimm/region_devs.c | 10 +++++----- + tools/testing/nvdimm/test/ndtest.c | 17 +++++++++-------- + tools/testing/nvdimm/test/nfit.c | 14 +++++++------- + 6 files changed, 30 insertions(+), 23 deletions(-) +Merging at24/at24/for-next (4791146e9055 eeprom: at24: add ST M24C32-D Additional Write lockable page support) +$ 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 +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/eeprom/at24.yaml | 2 ++ + drivers/misc/eeprom/at24.c | 38 +++++----------------- + 2 files changed, 10 insertions(+), 30 deletions(-) +Merging ntb/ntb-next (9341b37ec17a ntb_perf: Fix printk format) +$ git merge -m Merge branch 'ntb-next' of https://github.com/jonmason/ntb.git ntb/ntb-next +Merge made by the 'ort' strategy. + drivers/ntb/hw/intel/ntb_hw_gen1.c | 2 +- + drivers/ntb/test/ntb_perf.c | 2 +- + 2 files changed, 2 insertions(+), 2 deletions(-) +Merging seccomp/for-next/seccomp (ce9ecca0238b Linux 6.6-rc2) +$ git merge -m Merge branch 'for-next/seccomp' of git://git.kernel.org/pub/scm/linux/kernel/git/kees/linux.git seccomp/for-next/seccomp +Already up to date. +Merging fsi/next (f04d61a379d6 fsi: fix some spelling mistakes in comment) +$ 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 (06c2afb862f9 Linux 6.5-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 (d79c910284d2 Merge branch 'nvmem-fixes' into nvmem-for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/mtd/mtd.yaml | 7 +++++- + .../bindings/mtd/partitions/nvmem-cells.yaml | 1 + + .../bindings/nvmem/amlogic,meson-gxbb-efuse.yaml | 1 + + .../bindings/nvmem/amlogic,meson6-efuse.yaml | 1 + + .../devicetree/bindings/nvmem/apple,efuses.yaml | 1 + + .../devicetree/bindings/nvmem/imx-ocotp.yaml | 1 + + .../devicetree/bindings/nvmem/mediatek,efuse.yaml | 1 + + .../bindings/nvmem/microchip,sama7g5-otpc.yaml | 1 + + .../devicetree/bindings/nvmem/mxs-ocotp.yaml | 1 + + .../bindings/nvmem/nvmem-deprecated-cells.yaml | 28 ++++++++++++++++++++++ + Documentation/devicetree/bindings/nvmem/nvmem.yaml | 9 ------- + .../devicetree/bindings/nvmem/qcom,qfprom.yaml | 1 + + .../devicetree/bindings/nvmem/qcom,sec-qfprom.yaml | 1 + + .../devicetree/bindings/nvmem/qcom,spmi-sdam.yaml | 1 + + .../devicetree/bindings/nvmem/rockchip,otp.yaml | 1 + + .../devicetree/bindings/nvmem/rockchip-efuse.yaml | 1 + + .../bindings/nvmem/socionext,uniphier-efuse.yaml | 1 + + .../bindings/nvmem/sunplus,sp7021-ocotp.yaml | 1 + + .../devicetree/bindings/nvmem/u-boot,env.yaml | 2 ++ + .../bindings/rtc/amlogic,meson6-rtc.yaml | 1 + + drivers/mtd/mtdcore.c | 3 ++- + drivers/nvmem/apple-efuses.c | 1 + + drivers/nvmem/core.c | 10 ++++---- + drivers/nvmem/imx-ocotp-scu.c | 1 + + drivers/nvmem/imx-ocotp.c | 7 +++--- + drivers/nvmem/meson-efuse.c | 1 + + drivers/nvmem/meson-mx-efuse.c | 1 + + drivers/nvmem/microchip-otpc.c | 1 + + drivers/nvmem/mtk-efuse.c | 1 + + drivers/nvmem/mxs-ocotp.c | 10 ++++---- + drivers/nvmem/qcom-spmi-sdam.c | 1 + + drivers/nvmem/qfprom.c | 7 +++--- + drivers/nvmem/rave-sp-eeprom.c | 1 + + drivers/nvmem/rockchip-efuse.c | 1 + + drivers/nvmem/sc27xx-efuse.c | 1 + + drivers/nvmem/sec-qfprom.c | 1 + + drivers/nvmem/sprd-efuse.c | 1 + + drivers/nvmem/stm32-romem.c | 8 ++++--- + drivers/nvmem/sunplus-ocotp.c | 1 + + drivers/nvmem/sunxi_sid.c | 1 + + drivers/nvmem/uniphier-efuse.c | 1 + + drivers/nvmem/zynqmp_nvmem.c | 1 + + drivers/rtc/nvmem.c | 1 + + drivers/w1/slaves/w1_ds250x.c | 1 + + include/linux/nvmem-provider.h | 4 ++-- + 45 files changed, 97 insertions(+), 32 deletions(-) + create mode 100644 Documentation/devicetree/bindings/nvmem/nvmem-deprecated-cells.yaml +Merging xarray/main (2a15de80dd0f idr: fix param name in idr_alloc_cyclic() doc) +$ git merge -m Merge branch 'main' of git://git.infradead.org/users/willy/xarray.git xarray/main +Already up to date. +Merging hyperv/hyperv-next (ce9ecca0238b Linux 6.6-rc2) +$ git merge -m Merge branch 'hyperv-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hyperv/linux.git hyperv/hyperv-next +Already up to date. +Merging auxdisplay/auxdisplay (35b464e32c8b auxdisplay: hd44780: move cursor home after clear display command) +$ git merge -m Merge branch 'auxdisplay' of https://github.com/ojeda/linux.git auxdisplay/auxdisplay +Already up to date. +Merging kgdb/kgdb/for-next (b6464883f45a kdb: move kdb_send_sig() declaration to a better header file) +$ 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 (0bb80ecc33a8 Linux 6.6-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 (06c2afb862f9 Linux 6.5-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 mhi/mhi-next (0724869ede9c bus: mhi: host: pci_generic: add support for Telit FE990 modem) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Already up to date. +Merging memblock/for-next (0f5e4adb608c memblock: report failures when memblock_can_resize is not set) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rppt/memblock.git memblock/for-next +Auto-merging mm/memblock.c +Merge made by the 'ort' strategy. + mm/memblock.c | 2 +- + 1 file changed, 1 insertion(+), 1 deletion(-) +Merging cxl/next (fe77cc2e5a6a cxl: Fix one kernel-doc comment) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/cxl/cxl.git cxl/next +Already up to date. +Merging zstd/zstd-next (2aa14b1ab2c4 zstd: import usptream v1.5.2) +$ git merge -m Merge branch 'zstd-next' of https://github.com/terrelln/linux.git zstd/zstd-next +Already up to date. +Merging efi/next (b691118f2c44 Merge remote-tracking branch 'linux-efi/urgent' into efi/next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi/next +Already up to date. +Merging unicode/for-next (b500d6d7243d unicode: Handle memory allocation failures in mkutf8data) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krisman/unicode.git unicode/for-next +Merge made by the 'ort' strategy. + fs/unicode/mkutf8data.c | 38 ++++++++++++++++++++++++-------------- + 1 file changed, 24 insertions(+), 14 deletions(-) +Merging slab/slab/for-next (e050a704f3c3 Merge branch 'slab/for-6.6/hotfixes' into slab/for-next) +$ git merge -m Merge branch 'slab/for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vbabka/slab.git slab/slab/for-next +Auto-merging mm/slab_common.c +Merge made by the 'ort' strategy. + mm/slab_common.c | 7 ++++-- + mm/slub.c | 73 ++++++++++++++++++++++++++++---------------------------- + 2 files changed, 41 insertions(+), 39 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 (96e033d649b3 landlock: Document Landlock's network support) +$ 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/userspace-api/landlock.rst | 93 +- + include/uapi/linux/landlock.h | 47 + + samples/landlock/sandboxer.c | 115 +- + security/landlock/Kconfig | 1 + + security/landlock/Makefile | 2 + + security/landlock/fs.c | 232 ++-- + security/landlock/limits.h | 6 + + security/landlock/net.c | 241 ++++ + security/landlock/net.h | 36 + + security/landlock/ruleset.c | 405 +++++-- + security/landlock/ruleset.h | 181 ++- + security/landlock/setup.c | 2 + + security/landlock/syscalls.c | 122 +- + tools/testing/selftests/landlock/base_test.c | 2 +- + tools/testing/selftests/landlock/common.h | 10 + + tools/testing/selftests/landlock/config | 4 + + tools/testing/selftests/landlock/fs_test.c | 75 +- + tools/testing/selftests/landlock/net_test.c | 1592 ++++++++++++++++++++++++++ + 18 files changed, 2816 insertions(+), 350 deletions(-) + create mode 100644 security/landlock/net.c + create mode 100644 security/landlock/net.h + create mode 100644 tools/testing/selftests/landlock/net_test.c +Merging rust/rust-next (a7135d107547 rust: Use grep -Ev rather than relying on GNU grep) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Auto-merging MAINTAINERS +Auto-merging rust/Makefile +Auto-merging rust/kernel/sync/arc.rs +Merge made by the 'ort' strategy. + Documentation/process/changes.rst | 2 +- + MAINTAINERS | 3 +- + rust/Makefile | 8 +- + rust/alloc/alloc.rs | 21 ---- + rust/alloc/boxed.rs | 56 +++++++---- + rust/alloc/lib.rs | 13 +-- + rust/alloc/raw_vec.rs | 30 ++++-- + rust/alloc/vec/drain_filter.rs | 199 -------------------------------------- + rust/alloc/vec/extract_if.rs | 115 ++++++++++++++++++++++ + rust/alloc/vec/mod.rs | 110 ++++++++++----------- + rust/alloc/vec/spec_extend.rs | 8 +- + rust/compiler_builtins.rs | 1 + + rust/kernel/init.rs | 20 ++-- + rust/kernel/print.rs | 1 + + rust/kernel/sync/arc.rs | 2 +- + rust/kernel/sync/condvar.rs | 1 - + rust/kernel/sync/lock.rs | 1 - + rust/kernel/task.rs | 2 +- + scripts/min-tool-version.sh | 2 +- + 19 files changed, 259 insertions(+), 336 deletions(-) + delete mode 100644 rust/alloc/vec/drain_filter.rs + create mode 100644 rust/alloc/vec/extract_if.rs +Merging sysctl/sysctl-next (ccee9a2a8c00 intel drm: Remove now superfluous sentinel element from ctl_table array) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Auto-merging arch/arm64/kernel/fpsimd.c +Auto-merging arch/s390/kernel/topology.c +Auto-merging arch/s390/mm/pgalloc.c +Auto-merging arch/x86/kernel/cpu/intel.c +Auto-merging drivers/char/hpet.c +Auto-merging drivers/gpu/drm/i915/i915_perf.c +Auto-merging drivers/md/md.c +Auto-merging drivers/misc/sgi-xp/xpc_main.c +Auto-merging drivers/tty/tty_io.c +Merge made by the 'ort' strategy. + arch/arm/kernel/isa.c | 4 ++-- + arch/arm64/kernel/armv8_deprecated.c | 8 +++----- + arch/arm64/kernel/fpsimd.c | 2 -- + arch/arm64/kernel/process.c | 1 - + arch/csky/abiv1/alignment.c | 1 - + arch/powerpc/kernel/idle.c | 1 - + arch/powerpc/platforms/pseries/mobility.c | 1 - + arch/riscv/kernel/vector.c | 1 - + arch/s390/appldata/appldata_base.c | 4 +--- + arch/s390/kernel/debug.c | 1 - + arch/s390/kernel/topology.c | 1 - + arch/s390/mm/cmm.c | 1 - + arch/s390/mm/pgalloc.c | 1 - + arch/x86/entry/vdso/vdso32-setup.c | 1 - + arch/x86/kernel/cpu/intel.c | 1 - + arch/x86/kernel/itmt.c | 1 - + drivers/base/firmware_loader/fallback_table.c | 1 - + drivers/char/hpet.c | 1 - + drivers/char/ipmi/ipmi_poweroff.c | 1 - + drivers/char/random.c | 1 - + drivers/gpu/drm/i915/i915_perf.c | 1 - + drivers/hv/hv_common.c | 1 - + drivers/infiniband/core/iwcm.c | 1 - + drivers/infiniband/core/ucma.c | 1 - + drivers/macintosh/mac_hid.c | 1 - + drivers/md/md.c | 1 - + drivers/misc/sgi-xp/xpc_main.c | 2 -- + drivers/net/vrf.c | 1 - + drivers/parport/procfs.c | 28 +++++++++++---------------- + drivers/perf/arm_pmuv3.c | 1 - + drivers/scsi/scsi_sysctl.c | 1 - + drivers/scsi/sg.c | 1 - + drivers/tty/tty_io.c | 1 - + drivers/xen/balloon.c | 1 - + 34 files changed, 17 insertions(+), 59 deletions(-) +Merging execve/for-next/execve (21ca59b365c0 binfmt_misc: enable sandboxed mounts) +$ 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 +Auto-merging fs/binfmt_elf_fdpic.c +Auto-merging fs/binfmt_misc.c +Auto-merging include/linux/mm.h +Auto-merging kernel/user_namespace.c +Auto-merging mm/mmap.c +Auto-merging mm/nommu.c +Merge made by the 'ort' strategy. + fs/binfmt_elf.c | 215 ++++++++--------------- + fs/binfmt_elf_fdpic.c | 20 ++- + fs/binfmt_misc.c | 386 ++++++++++++++++++++++++++++++++++------- + include/linux/binfmts.h | 10 ++ + include/linux/mm.h | 3 +- + include/linux/user_namespace.h | 8 + + include/uapi/linux/elf.h | 2 +- + kernel/user.c | 13 ++ + kernel/user_namespace.c | 3 + + mm/mmap.c | 6 - + mm/nommu.c | 5 - + 11 files changed, 443 insertions(+), 228 deletions(-) +Merging bitmap/bitmap-for-next (b9c957f55444 bitmap: move bitmap_*_region() functions to bitmap.h) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Auto-merging MAINTAINERS +Auto-merging lib/Makefile +Auto-merging lib/cpumask.c +Merge made by the 'ort' strategy. + MAINTAINERS | 2 + + include/linux/bitmap-str.h | 16 ++ + include/linux/bitmap.h | 86 ++++-- + include/linux/cpumask.h | 113 +++++--- + lib/Makefile | 2 +- + lib/bitmap-str.c | 510 ++++++++++++++++++++++++++++++++++ + lib/bitmap.c | 679 +-------------------------------------------- + lib/cpumask.c | 17 +- + lib/test_bitmap.c | 24 ++ + 9 files changed, 697 insertions(+), 752 deletions(-) + create mode 100644 include/linux/bitmap-str.h + create mode 100644 lib/bitmap-str.c +Merging hte/for-next (091ac92dc79e hte: tegra194: Switch to LATE_SIMPLE_DEV_PM_OPS()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Merge made by the 'ort' strategy. + drivers/hte/Kconfig | 4 ++-- + drivers/hte/hte-tegra194.c | 26 +++++++++++++------------- + drivers/hte/hte.c | 2 +- + 3 files changed, 16 insertions(+), 16 deletions(-) +Merging kspp/for-next/kspp (faed498d0db7 hardening: x86: drop reference to removed config AMD_IOMMU_V2) +$ 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 MAINTAINERS +Auto-merging drivers/block/drbd/drbd_int.h +Auto-merging drivers/cpufreq/cpufreq.c +Auto-merging drivers/md/dm-crypt.c +Auto-merging drivers/md/dm-raid.c +Auto-merging drivers/md/dm-stripe.c +Auto-merging drivers/usb/gadget/function/f_fs.c +Auto-merging drivers/usb/host/xhci.h +Auto-merging fs/afs/internal.h +Auto-merging include/linux/cred.h +Auto-merging kernel/cred.c +Merge made by the 'ort' strategy. + MAINTAINERS | 4 ++ + arch/arm/configs/hardening.config | 7 ++ + arch/arm64/configs/hardening.config | 22 ++++++ + arch/powerpc/configs/hardening.config | 10 +++ + arch/sparc/kernel/cpumap.c | 2 +- + arch/um/os-Linux/drivers/ethertap_user.c | 2 +- + arch/x86/configs/hardening.config | 14 ++++ + drivers/accel/ivpu/ivpu_job.h | 2 +- + drivers/auxdisplay/panel.c | 7 +- + drivers/block/drbd/drbd_int.h | 2 +- + drivers/bus/fsl-mc/dprc.c | 12 ++-- + drivers/cpufreq/cpufreq.c | 4 +- + drivers/cpuidle/dt_idle_states.c | 4 +- + drivers/edac/edac_mc_sysfs.c | 4 +- + drivers/firmware/tegra/bpmp-debugfs.c | 4 +- + drivers/gpu/drm/gud/gud_pipe.c | 2 +- + drivers/gpu/drm/nouveau/nouveau_svm.c | 5 +- + drivers/hid/hid-prodikeys.c | 8 +-- + drivers/hwmon/asus_wmi_sensors.c | 2 +- + drivers/hwmon/ibmpowernv.c | 2 +- + drivers/irqchip/irq-imx-intmux.c | 2 +- + drivers/isdn/capi/kcapi.c | 4 +- + drivers/isdn/mISDN/clock.c | 2 +- + drivers/mailbox/zynqmp-ipi-mailbox.c | 2 +- + drivers/md/dm-bio-prison-v1.c | 2 +- + drivers/md/dm-crypt.c | 2 +- + drivers/md/dm-raid.c | 2 +- + drivers/md/dm-stats.c | 2 +- + drivers/md/dm-stripe.c | 2 +- + drivers/misc/lkdtm/bugs.c | 30 +++++++- + drivers/thermal/qcom/tsens.h | 2 +- + drivers/usb/atm/usbatm.c | 3 +- + drivers/usb/gadget/function/f_fs.c | 2 +- + drivers/usb/gadget/function/f_midi.c | 4 +- + drivers/usb/host/ohci.h | 2 +- + drivers/usb/host/xhci.h | 2 +- + drivers/virt/acrn/acrn_drv.h | 2 +- + drivers/virt/acrn/mm.c | 2 +- + fs/afs/internal.h | 4 +- + fs/nfs/filelayout/filelayout.h | 2 +- + fs/nfs/flexfilelayout/flexfilelayout.h | 2 +- + fs/ocfs2/slot_map.c | 2 +- + include/linux/ceph/osd_client.h | 2 +- + include/linux/cred.h | 7 +- + include/linux/kvm_host.h | 2 +- + include/linux/platform_data/gsc_hwmon.h | 2 +- + init/version.c | 6 +- + kernel/configs/hardening.config | 98 +++++++++++++++++++++++++++ + kernel/cred.c | 2 +- + kernel/groups.c | 2 +- + lib/kobject_uevent.c | 8 +-- + scripts/gcc-plugins/randomize_layout_plugin.c | 11 ++- + tools/testing/selftests/lkdtm/config | 1 - + tools/testing/selftests/lkdtm/tests.txt | 3 +- + 54 files changed, 264 insertions(+), 78 deletions(-) + create mode 100644 arch/arm/configs/hardening.config + create mode 100644 arch/arm64/configs/hardening.config + create mode 100644 arch/powerpc/configs/hardening.config + create mode 100644 arch/x86/configs/hardening.config + create mode 100644 kernel/configs/hardening.config +Merging kspp-gustavo/for-next/kspp (4d8cbf6dbcda fs: omfs: Use flexible-array member in struct omfs_extent) +$ git merge -m Merge branch 'for-next/kspp' of git://git.kernel.org/pub/scm/linux/kernel/git/gustavoars/linux.git kspp-gustavo/for-next/kspp +Already up to date. +Merging nolibc/nolibc (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'nolibc' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git nolibc/nolibc +Already up to date. +Merging iommufd/for-next (c97d1b20d383 iommu/vt-d: Add domain_alloc_user op) +$ 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/intel/iommu.c +Auto-merging drivers/iommu/iommufd/selftest.c +Auto-merging include/linux/iommu.h +CONFLICT (content): Merge conflict in include/linux/iommu.h +Resolved 'include/linux/iommu.h' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 19bd092dc93a] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git +$ git diff -M --stat --summary HEAD^.. + drivers/iommu/intel/iommu.c | 28 +++++++++++++++++++++ + drivers/iommu/iommufd/device.c | 2 +- + drivers/iommu/iommufd/hw_pagetable.c | 31 ++++++++++++++++++------ + drivers/iommu/iommufd/iommufd_private.h | 3 ++- + drivers/iommu/iommufd/selftest.c | 19 +++++++++++++++ + include/linux/iommu.h | 11 ++++++++- + include/uapi/linux/iommufd.h | 12 ++++++++- + tools/testing/selftests/iommu/iommufd.c | 26 ++++++++++++++++---- + tools/testing/selftests/iommu/iommufd_fail_nth.c | 4 +-- + tools/testing/selftests/iommu/iommufd_utils.h | 11 ++++++--- + 10 files changed, 126 insertions(+), 21 deletions(-) +$ git am -3 ../patches/0001-Revert-rtc-at91rm9200-Convert-to-platform-remove-cal.patch +Applying: Revert "rtc: at91rm9200: Convert to platform remove callback returning void" diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..3899b37e6f25 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20231016 |