diff options
| -rw-r--r-- | Next/SHA1s | 371 | ||||
| -rw-r--r-- | Next/Trees | 373 | ||||
| -rw-r--r-- | Next/merge.log | 3273 | ||||
| -rw-r--r-- | localversion-next | 1 |
4 files changed, 4018 insertions, 0 deletions
diff --git a/Next/SHA1s b/Next/SHA1s new file mode 100644 index 000000000000..cd355c8ca958 --- /dev/null +++ b/Next/SHA1s @@ -0,0 +1,371 @@ +Name SHA1 +---- ---- +origin d2f51b3516dade79269ff45eae2a7668ae711b25 +fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +mm-hotfixes 27969c8df8962f211c68328358b4949033084a43 +kbuild-current 04714e55eb7210f1a9e7872c81e33b789bdce863 +arc-current 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm-current 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +arm64-fixes 4785aa8028536c2be656d22c74ec1995b97056f3 +arm-soc-fixes 736a4aad8a9fdcf577ffa33b33df240c67557af8 +davinci-current 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tee-fixes ceaa837f96adb69c0df0397937cd74991d5d821a +m68k-current 03191fb3db3d2585725bcffe0356d12fcfd27c4c +powerpc-fixes 47b8def9358c5eb888e78b24b7e5b7f2e2e97b8e +s390-fixes ffc253263a1375a65fa6c9f62a893e9767fbebfa +sparc 2d2b17d08bfc3d98cf93622e8c6543eaaf02dabe +fscrypt-current 4bcf6f827a79c59806c695dc280e763c5b6a6813 +fsverity-current a075bacde257f755bea0e53400c9f1cdd1b8e8e6 +net c1ed833e0b3b7b9edc82b97b73b2a8a10ceab241 +bpf d84b139f53e8fa8048f16814c6b2a53d7bc15c3d +ipsec de5724ca38fd5e442bae9c1fab31942b6544012d +netfilter 016b9332a3346e97a6cacffea0f9dc10e1235a75 +ipvs a63b6622120cd03a304796dbccb80655b3a21798 +wireless 55c900477f5b3897d9038446f72a281cae0efd86 +wpan 2d1c882d4434a27a026b98b602f232c7919849c5 +rdma-fixes 94f6f0550c625fab1f373bb86a6669b45e9748b3 +sound-current dc6e08b1a2ae262c23e14f5c259b4ca63a554e4f +sound-asoc-fixes 4bdcbc31ad2112385ad525b28972c45015e6ad70 +regmap-fixes f33804f1597d750eee723170af93dac35e84b8fc +regulator-fixes bc00d9f3813a40bc2d854ae0edab14c6b43a3219 +spi-fixes 14c4fb111a39babad2e81aa08a17991e96660603 +pci-current 27beb3ca347fa29fef5c23b351120239b8cf0612 +driver-core.current d2f51b3516dade79269ff45eae2a7668ae711b25 +tty.current d2f51b3516dade79269ff45eae2a7668ae711b25 +usb.current d2f51b3516dade79269ff45eae2a7668ae711b25 +usb-serial-fixes 52480e1f1a259c93d749ba3961af0bffedfe7a7a +phy 05d3ef8bba77c1b5f98d941d8b2d4aeab8118ef1 +staging.current d2f51b3516dade79269ff45eae2a7668ae711b25 +iio-fixes bce3ab29a6c0ce0071d06d99bd8dc943cd3d1e8e +counter-current 58720809f52779dc0f08e53e54b014209d13eebb +char-misc.current d2f51b3516dade79269ff45eae2a7668ae711b25 +soundwire-fixes 58720809f52779dc0f08e53e54b014209d13eebb +thunderbolt-fixes ec4405ed92036f5bb487b5c2f9a28f9e36a3e3d5 +input-current 5c15c60e7be615f05a45cd905093a54b11f461bc +crypto-current a312e07a65fb598ed239b940434392721385c722 +vfio-fixes c777b11d34e0f47dbbc4b018ef65ad030f2b283a +kselftest-fixes cf5a103c98a6fb9ee3164334cb5502df6360749b +modules-fixes f412eef03938d3a40d4f6f5a79d0f98ed89b596d +dmaengine-fixes 58720809f52779dc0f08e53e54b014209d13eebb +backlight-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +mtd-fixes f6ca3fb6978f94d95ee79f95085fc22e71ca17cc +mfd-fixes 88603b6dc419445847923fcb7fe5080067a30f98 +v4l-dvb-fixes c46f16f156ac58afcf4addc850bb5dfbca77b9fc +reset-fixes 3a2390c6777e3f6662980c6cfc25cafe9e4fef98 +mips-fixes 8a749fd1a8720d4619c91c8b6e7528c0a355c0aa +at91-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +omap-fixes 0b9a4a67c60d3e15b39a69d480a50ce7eeff9bc1 +kvm-fixes ffc253263a1375a65fa6c9f62a893e9767fbebfa +kvms390-fixes f87ef5723536a6545ed9c43e18b13a9faceb3c80 +hwmon-fixes 9da2901c47332b030ea4d2a2302bc7c0b83fc67c +nvdimm-fixes 33908660e814203e996f6e775d033c5c32fcf9a7 +cxl-fixes 8f61d48c83f6e3525a770e44692604595693f787 +btrfs-fixes db2fc5f63a3a597bc0cc4fd5175290d14de3209c +vfs-fixes dc32464a5fe4946fe1a4d8f8e29961dc411933c5 +dma-mapping-fixes d5090484b021794271280ab64d20253883b7f6fd +drivers-x86-fixes 3bde7ec13c971445faade32172cb0b4370b841d9 +samsung-krzk-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +pinctrl-samsung-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +devicetree-fixes 19007c629c63c76ae0f8adee9dc076bda4788b46 +dt-krzk-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +scsi-fixes 097c06394c835be0cf21e23f9bd13ff771601b63 +drm-fixes 44117828ed5c129a8146585e81262c0025daa50f +drm-intel-fixes 4cbed7702eb775cca22fff6827a549092cb59f61 +mmc-fixes 421b605edb1ce611dee06cf6fd9a1c1f2fd85ad0 +rtc-fixes 08279468a294d8c996a657ecc9e51bd5c084c75d +gnss-fixes 58720809f52779dc0f08e53e54b014209d13eebb +hyperv-fixes 42999c90461293233de9bb6e6c7d8a2db7281c1e +soc-fsl-fixes 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +risc-v-fixes 3fec323339a4a9801a54e8b282eb571965b67b23 +riscv-dt-fixes cf98fe6b579e55aa71b6197e34c112b51f0c2a66 +riscv-soc-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +fpga-fixes 03d4bf9ff34abbb24f4fbc674f2dcd057ebff309 +spdx d2f51b3516dade79269ff45eae2a7668ae711b25 +gpio-brgl-fixes 05d3ef8bba77c1b5f98d941d8b2d4aeab8118ef1 +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 9eab43facdadb7d00456c2657001ae2e5353c814 +broadcom-fixes 9abf2313adc1ca1b6180c508c25f22f9395cc780 +perf-current fed3a1be6433e15833068c701bfde7b422d8b988 +efi-fixes c03d21f05e76b25f907684bdf874308dcefab385 +zstd-fixes f064f4e5ecb151b3fce59762075658ac6f389532 +battery-fixes 8894b432548851f705f72ff135d3dcbd442a18d1 +uml-fixes 73a23d7710331a530e972903318528b75e5a5f58 +asahi-soc-fixes 568035b01cfb107af8d2e4bd2fb9aea22cf5b868 +iommufd-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +rust-fixes cfd96726e61136e68a168813cedc4084f626208b +v9fs-fixes 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +w1-fixes 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +pmdomain-fixes b131329b9bfbd1b4c0c5e088cb0c6ec03a12930f +overlayfs-fixes beae836e9c61ee039e367a94b14f7fea08f0ad4c +drm-misc-fixes 0e8b9f258baed25f1c5672613699247c76b007b5 +mm-stable ffc253263a1375a65fa6c9f62a893e9767fbebfa +mm-nonmm-stable ffc253263a1375a65fa6c9f62a893e9767fbebfa +mm 4f5e05649c22b86d2f6bc7d4fd674ab718fb1151 +kbuild 5f56cb030e4bcf14be2233332d5cd83fff62a376 +clang-format 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +perf fed3a1be6433e15833068c701bfde7b422d8b988 +compiler-attributes 5d0c230f1de8c7515b6567d9afba1f196fb4e2f4 +dma-mapping a409d9600959f3c4b2a48946304c8e01b8d04072 +asm-generic 550087a0ba91eb001c139f563a193b1e9ef5a8dd +arc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +arm c7368ddba2ffcc5d200122c5bb122c3825ecb976 +arm64 14dcf78a6c042dd9421b11485b394c6273568bca +arm-perf b805cafc604bfdb671fae7347a57f51154afa735 +arm-soc 1b52f65d88adb1fac2193ed5d38b51ad13c7be76 +amlogic 996fc07dce7991dd12ac0b7c378ce65080036492 +asahi-soc ffc253263a1375a65fa6c9f62a893e9767fbebfa +aspeed 3be891e01a89c6b9267034b6ca2dd31420c0b610 +at91 3cec9514911c4400a4b4ab778b9e92b60a14c677 +broadcom 62a3c97f8167c88a5623d45c8984927c82c286be +davinci 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +drivers-memory 09de3691daab15ae125cbf32f9f72fc90eada49d +imx-mxs fa81543ef85463e53bd2e3193a182ec1ff800ee9 +mediatek 9802b60bd6d895a8be9c44cc5f74bb11131aa8bc +mvebu 93e6b023e552e7af30ba89439a1486160779010f +omap cb1114df7bb08a0be22ae1652b0c5ff9602ed391 +qcom 2b05c2dc230b58fa09358009e83eb5556ab72dc1 +renesas fb39831a07ec1fd914da56caede80e2997f1dbc5 +reset 417a3a5ae44a14b4eeb3df514b2c006b19771f82 +rockchip 043d3ef3344a33654577e629b83d9608626971b4 +samsung-krzk b7df1b3a7a1b3061da0c982a42b4dc5182c41f0a +scmi 93a72958a9519cd2c3fe9e3509a2a50137fe43c7 +stm32 1aeb02d3f2c5a7a9f132ea748877012a48036d90 +sunxi c3f7c14856ebbeb8e9e19439b9f5ec66f88744b9 +tee 6a8b7e80105416cc7324fda295608ea2d3f98862 +tegra 650220c2b474332f78dbb20651f0e98d77af6fde +ti 2234981539e7b12fe56e0224460eb45111df0b55 +xilinx 7d2da28125ce2431451c50aab8f7c60ab01e12f1 +clk 0a6d7f8275f255eda823c0f0b61d024f6f5b483d +clk-imx 2838820800dcaa60f32bef715c7e2e87e049aebc +clk-renesas 4bce4bedbe6daa54cf701184601f913a0c00bb1c +csky 2c40c1c6adab90ee4660caf03722b3a3ec67767b +loongarch 99070159221b97e1f54d109b9d1dae123fd716b0 +m68k 03191fb3db3d2585725bcffe0356d12fcfd27c4c +m68knommu 2508b608f4028c6fe0d63698f64a9bfc3eb6b780 +microblaze 65d6e954e37872fd9afb5ef3fc0481bb3c2f20f4 +mips 4b7d3ab445653336db9854eedad812607760c015 +openrisc c289330331eb93bc6a3c68b9119ccd7d4285a4a2 +parisc-hd 8a32aa17c1cd48df1ddaa78e45abcb8c7a2220d6 +powerpc 303d77a6e1707498f09c9d8ee91b1dc07ca315a5 +soc-fsl fb9c384625dd604e8a5be1f42b35e83104b90670 +risc-v dbfbda3bd6bfb5189e05b9eab8dfaad2d1d23f62 +riscv-dt b99df62818919b84e970eea5aec60b0dbc57da18 +riscv-soc 22dedf8f4570897f15e156ac5547cef93e802182 +s390 02e790ee3077c0571794d0ab8f71413edbe129cc +sh 63f1ee206170ad2363aa25fd99bd5ae529c690ae +uml 974b808d85abbc03c3914af63d60d5816aabf2ca +xtensa a83a72730c330a57c1a07cd98603140f5fbe0bf9 +bcachefs c7046ed0cf9bb33599aa7e72e7b67bba4be42d64 +pidfd a901a3568fd26ca9c4a82d8bc5ed5b3ed844d451 +fscrypt 15baf55481de700f8c4494cddb80ec4f4575548b +afs 0a278bc196e784b4849c1581266421adbca1989f +btrfs c6e8f898f56fae2cb5bc4396bec480f23cd8b066 +ceph 87cbdc270d4836b3501218620fbd8b8049e82656 +cifs bc05fd25483b94bbd1efe400699891b99a332636 +configfs 4425c1d9b44ded655d2668e1ce95a62bccf7b21b +ecryptfs a3d78fe3e1ae8c6a1901635c54a1a799656f72c8 +erofs 1a0ac8bd7a4fa5b2f4ef14c3b1e9d6e5a5faae06 +exfat 1373ca10ec04afba9199de1fab01fde91338a78b +ext3 7f680e5f256f346a5d3cd83a17c84bb6bc950008 +ext4 91562895f8030cb9a0470b1db49de79346a69f91 +f2fs 1e7bef5f90ed69d903768d78369f251b77e5d2f5 +fsverity 919dc320956ea353a7fb2d84265195ad5ef525ac +fuse 513dfacefd712bcbfab64e1a9c9c3e0d51c2dca5 +gfs2 0cdc6f44e9fdc2d20d720145bf99a39f611f6d61 +jfs 5afb50b46a9897044ec98a827c5ab8fd85baad1e +ksmbd b5fcfb5619e6496243358c593c8b01803e07a69f +nfs f003a717ae9086b1e8a4663124a96862df7282e7 +nfs-anna 379e4adfddd6a2f95a4f2029b8ddcbacf92b21f9 +nfsd 3fd2ca5be07f6a43211591a45b43df9e7b6eba00 +ntfs3 e4494770a5cad3c9d1d2a65ed15d07656c0d9b82 +orangefs 31720a2b109b3080eb77e97b8f6f50a27b4ae599 +overlayfs 24e16e385f2272b1a9df51337a5c32d28a29c7ad +ubifs 75690493591fe283e4c92a3ba7c4420e9858abdb +v9fs ce07087964208eee2ca2f9ee4a98f8b5d9027fe6 +v9fs-ericvh 2dde18cd1d8fac735875f2e4987f11817cc0bc2c +xfs 14a537983b228cb050ceca3a5b743d01315dc4aa +zonefs 8812387d056957355ef1d026cd38bed3830649db +iomap 3ac974796e5d94509b85a403449132ea660127c2 +djw-vfs ce85a1e04645b1ed386b074297df27ab5b8801c0 +file-locks e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +iversion e0152e7481c6c63764d6ea8ee41af5cf9dfac5e9 +vfs-brauner c1279eea49893214ffbbb5da09ac7d77dd5f544d +vfs 1aee9158bc978f91701c5992e395efbc6da2de3c +printk b4908d68609b57ad1ba4b80bd72c4d2260387e31 +pci 27beb3ca347fa29fef5c23b351120239b8cf0612 +pstore a19d48f7c5d57c0f0405a7d4334d1d38fe9d3c1c +hid 55ec92989f9be9ee773d88fe3a81c185934e10d3 +i2c b871ee43a7335d3ab18a6c8dda325d62728c5915 +i3c 9fd00df05e81a2e1080ce6e9abc35533dca99d74 +dmi 13a0ac816d22aa47d6c393f14a99f39e49b960df +hwmon-staging 0f564130e5c76f1e5cf0008924f6a6cd138929d9 +jc_docs cf63348b4c45384d02126f86676d5afc75d661a7 +v4l-dvb 3e238417254bfdcc23fe207780b59cbb08656762 +v4l-dvb-next 3e238417254bfdcc23fe207780b59cbb08656762 +pm 742513f48261e9dd7c74e179f96afa1674acfe37 +cpufreq-arm 5b5b5806f22390808b8e8fa180fe35b003a4a74d +cpupower 6feb1a9641197ee630bf43b5c34ea1d9f8b4a0aa +devfreq 8f0cd531ee18c70f4655112c49f3c3e329636e7f +pmdomain 9e0cceadb7a5099c637e787191a9adbf9ec424cd +opp 5306fe37284c2034629e235a986a645f2e749ca8 +thermal 9618efe343ead954ca5c23856ae23d0a29e7d4b9 +dlm eb53c01873cab75d0bf42e6d685dc5ef3b68d884 +rdma 2ef422f063b74adcc4a4a9004b0a87bb55e0a836 +net-next ff269e2cd5adce4ae14f883fc9c8803bc43ee1e9 +bpf-next ff269e2cd5adce4ae14f883fc9c8803bc43ee1e9 +ipsec-next eefed7662ff223f70ba8b1af07f1a096a5ece588 +mlx5-next 82f9378c443c206d3f9e45844306e5270e7e4109 +netfilter-next ef113733c288eccadc105579b8e8c1bfdcc09ad1 +ipvs-next 9cdee063476988102bbc5e0e9551e10c5ed00d3e +bluetooth 0783375f2c56ca17719d5ec670e498dc661ea5c3 +wireless-next cc54d2e2c58a40a82dfd39afa95d3d27f3d6509d +wpan-next 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +wpan-staging 18b849f12dcc34ec4cb9c8fadeb503b069499ba4 +mtd 565fe150624ee77dc63a735cc1b3bff5101f38a3 +nand 5a985960a4dd041c21dbe9956958c1633d2da706 +spi-nor 6823a8383420263bc061865027836755615a275f +crypto a312e07a65fb598ed239b940434392721385c722 +drm 9ccde17d46554dbb2757c427f2cdf67688701f96 +drm-ci ad6bfe1b66a5c146ec236847eca7af4c8806d666 +drm-misc 94565e95e247c188fed4d3da1034402f3fb297de +amdgpu 6d5e0032a92df3a030cd47d91905310591466687 +drm-intel 9506fba463fcbdf8c8b7af3ec9ee34360df843fe +drm-tegra 2429b3c529da29d4277d519bd66d034842dcd70c +drm-msm b08d26dac1a1075c874f40ee02ec8ddc39e20146 +drm-msm-lumag d3b4075b173f033387b614297bb4d998cf22c8bd +etnaviv 925b10728f20c24516031060f3d01e4410c4a52a +fbdev 31b88945e0c8f98ffe9389b418760d707c420ea5 +regmap f33804f1597d750eee723170af93dac35e84b8fc +sound dc6e08b1a2ae262c23e14f5c259b4ca63a554e4f +ieee1394 c12d7aa7ffa4c61443241fbc1ee405acf4aa17de +sound-asoc 4bdcbc31ad2112385ad525b28972c45015e6ad70 +modules 4652b8e4f3ffa48c706ec334f048c217a7d9750d +input 28d3fe32354701decc3e76d89712569c269b5e4f +block 8aa6053114f3dedcf1acd34f4cbad7066d924258 +device-mapper 9793c269da6cd339757de6ba5b2c8681b54c99af +libata 0e533cba38011457b51f13b3b5afd33c693bfcca +pcmcia 4f733de8b78a209501041a4b0a44c83ece0e8933 +mmc 775d447cf0a7d47ee4d952ea36dedf0df6e8f82c +mfd 2b481822446e30943fb7c02744a7b49ebec0e696 +backlight d5272d39995f4150062a67e6f2cef556edece740 +battery 469d31745b9fb3a87424b311abb7cb530611404f +regulator 8af4b4efdac959c02e2a82b4e2fbb8f2c0b57c1e +security e508560672890b2873c89258b88fade1356392ce +apparmor 6cede10161be00d129a24e8b84c2674785a32cf8 +integrity b836c4d29f2744200b2af41e14bf50758dddc818 +safesetid 64b634830c919979de4b18163e15d30df66e64a8 +selinux f5bbdeda34c635ca8e893b481dc7865f378ea3f7 +smack 3ad49d37cf5759c3b8b68d02e3563f633d9c1aee +tomoyo 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tpmdd 03acb9ccec3f8cbcc0ed93c188b7a119ef30ef64 +watchdog 9d08e5909c81188eb1df26ef9d1c8df58ea5a44d +iommu e8cca466a84a75f8ff2a7a31173c99ee6d1c59d2 +audit 47846d51348dd62e5231a83be040981b17c955fa +devicetree fe612629746cf5cc7040529f780d46929605d0a6 +dt-krzk d896029c9726830232899944d1927847cfc6a2d1 +mailbox d09f466f71b6e5dc75659e22b711d8701699a6f6 +spi 14c4fb111a39babad2e81aa08a17991e96660603 +tip e2e7af5cc8abdb47d3ffe4923609e0f1505632ba +clockevents c28ca80ba3b531a79402d61046aef83272f86b08 +edac 6f15b178cd6315c997981f76c6ebed7ad39144c5 +irqchip 19b5a44bee16518104e8a159ab9a60788292fbd4 +ftrace e1742fa172d553ecc8e9077a713315404be36c13 +rcu 7939f0d7b28cf0482209674d90f15b9e75dbd68e +kvm 45b890f7689eb0aba454fc5831d2d79763781677 +kvm-arm 123f42f0ad6815014f54d0cc6eb9039c46ee2907 +kvms390 70fea30195168fd84e7076720c984f0ac1af5b09 +kvm-ppc b7bce570430e42229fb63f775fcbb10f38b83c71 +kvm-riscv d9c00f44e5de542340cce1d09e2c990e16c0ed3a +kvm-x86 45b890f7689eb0aba454fc5831d2d79763781677 +xen-tip ebbf7f07007803c3095de2e632f3e1e3d5794712 +percpu 3fcf62f24c80e2472f472778f317e062841c2d37 +workqueues d5ce8f4ed90bf34b9b2c5459665cee6ee79fe101 +drivers-x86 94ace9eda88229c73698b8dd8d3c06dd0831319c +chrome-platform 47ea0ddb1f5604ba3496baa19110aec6a3151f2e +chrome-platform-firmware 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +hsi 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +leds 1b929c02afd37871d5afb9d498426f83432e71c2 +leds-lj b9604be241587fb29c0f40450e53d0a37dc611b5 +ipmi bc3012f4e3a9765de81f454cb8f9bb16aafc6ff5 +driver-core d2f51b3516dade79269ff45eae2a7668ae711b25 +usb d2f51b3516dade79269ff45eae2a7668ae711b25 +thunderbolt a558892b3456d44f2a89d238f5d650f0574fa3b2 +usb-serial 8a749fd1a8720d4619c91c8b6e7528c0a355c0aa +tty d2f51b3516dade79269ff45eae2a7668ae711b25 +char-misc d2f51b3516dade79269ff45eae2a7668ae711b25 +accel 631808095a82e6b6f8410a95f8b12b8d0d38b161 +coresight 5ce62920de121561c8a3af6d8dcd4b57b29467f4 +fastrpc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +fpga d79eed22ba97c3031b2ef86f8b7ed0be2da5667d +icc d4c720a19e9ac3a907a8bf9a11c5a3a4e3e50a34 +iio 89e2233386a5670d15908628b63e611cb03b0d03 +phy-next d688c8264b8ed25edbdafac46ea2b41b2e77416a +soundwire 4ea2b6d3128ea4d502c4015df0dc16b7d1070954 +extcon b3edc3463d64bc469162138a6bec6913fbeef931 +gnss 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +vfio 2b88119e35b00d8cb418d86abbace3b90a993bd7 +w1 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +staging d2f51b3516dade79269ff45eae2a7668ae711b25 +counter-next 7904cdf1397c9391178ce53a7ebfa099c6bc4a59 +mux 44c026a73be8038f03dbdeef028b642880cf1511 +dmaengine 03f25d53b145bc2f7ccc82fc04e4482ed734f524 +cgroup b9a477034b11be3aedf402de9c7668ac9048d277 +scsi 88eed215d01642015c91cc6f3392d5de00266f7c +scsi-mkp a75a16c62a2540f11eeae4f2b50e95deefb652ea +vhost e07754e0a1ea2d63fb29574253d1fd7405607343 +rpmsg 6dc66a3096730db94a89b098da66887a390cc6af +gpio 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +gpio-brgl 5be55473a06475cc1128ccd93831ff57a068a81e +gpio-intel 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +pinctrl 63bffc2d3a99eaabc786c513eea71be3f597f175 +pinctrl-intel 8d751da9f1d790f1d5e4b109eb0ad4a366d5efc8 +pinctrl-renesas 583d8073205566468abf3a34000fccdd1d19c9cc +pinctrl-samsung 8aec97decfd0f444a69a765b2f00d64b42752824 +pwm 40592064a1a536adcced4ffea435c392eb9e7192 +userns 05bd6e0242b4c059ec6797e3d721ecca6d15ff8d +ktest 7dc8e24f0e09834341f84d37433840b353d64bc8 +kselftest 5247e6dbed0041147a83137f89cd45043301de5c +kunit 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +kunit-next 8040345fdae4cb256c5d981f91ae0f22bea8adcc +livepatching 602bf18307981f3bfd9ebf19921791a4256d3fd1 +rtc cfb67623ce281e045ec11e3eddb1b68b879b53a1 +nvdimm 9ea459e477dc09370cdd8ee13b61aefe8cd1f20a +at24 3774740fb22162d2c50e79629c4b3e11022ed7d9 +ntb 9341b37ec17a8793e8439e9b18354ba69556b786 +seccomp 31c65705a8cfa5f80d3824c686ab74b0409ee76d +fsi f04d61a379d65794d5d85168b84dcdf01d426f7c +slimbus 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +nvmem 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +xarray 2a15de80dd0f7e04a823291aa9eb49c5294f56af +hyperv ce9ecca0238b140b88f43859b211c9fdfd8e5b70 +auxdisplay 35b464e32c8bccef435e415db955787ead4ab44c +kgdb 23816724fdbd47c28bc998866fd7bc5ad9f0e535 +hmm 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +cfi 06c2afb862f9da8dc5efa4b6076a0e48c3fbaaa5 +mhi 12606ba1d46b34a241eb3d0956727e5379f0f626 +memblock 0f5e4adb608c79bedd8ced30f9ffdcfa01c37459 +cxl 5d09c63f11f083707b60c8ea0bb420651c47740f +zstd 2aa14b1ab2c41a4fe41efae80d58bb77da91f19f +efi 5329aa5101f73c451bcd48deaf3f296685849d9c +unicode b500d6d7243d2e0807a39a09c52fbe668b59b2c1 +slab 90f055df112162fd9e093c16be1c21f38c35b907 +random 512dee0c00ad9e9c7ae9f11fc6743702ea40caff +landlock f12f8f84509a084399444c4422661345a15cc713 +rust 3857af38e57a80b15b994e19d1f4301cac796481 +sysctl 8b793bcda61f6c3ed4f5b2ded7530ef6749580cb +execve 21ca59b365c091d583f36ac753eaa8baf947be6f +bitmap bdcb37a5d8de3253da48b120e3f10863696fb654 +hte fc62d5e214df2dd64f5d675f01b609d86a422a2b +kspp 9cca73d7b4bfec75b2fcef751015f31691afa792 +kspp-gustavo 4d8cbf6dbcdaebe949461b0a933ae4c71cb53edc +nolibc 0bb80ecc33a8fb5a682236443c1e740d5c917d1d +tsm f4738f56d1dc62aaba69b33702a5ab098f1b8c63 +iommufd b2b67c997bf74453f3469d8b54e4859f190943bd diff --git a/Next/Trees b/Next/Trees new file mode 100644 index 000000000000..0b2c7265701c --- /dev/null +++ b/Next/Trees @@ -0,0 +1,373 @@ +Trees included into this release: + +Name Type Url +---- ---- --- +origin git git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git#master +fixes git git://git.kernel.org/pub/scm/linux/kernel/git/sfr/next-fixes.git#fixes +mm-hotfixes git git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm#mm-hotfixes-unstable +kbuild-current git git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git#fixes +arc-current git git://git.kernel.org/pub/scm/linux/kernel/git/vgupta/arc.git#for-curr +arm-current git git://git.armlinux.org.uk/~rmk/linux-arm.git#fixes +arm64-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/arm64/linux#for-next/fixes +arm-soc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git#arm/fixes +davinci-current git git://git.kernel.org/pub/scm/linux/kernel/git/brgl/linux.git#davinci/for-current +drivers-memory-fixes git https://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux-mem-ctrl.git#fixes +tee-fixes git https://git.linaro.org/people/jens.wiklander/linux-tee.git#fixes +m68k-current git git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git#for-linus +powerpc-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git#fixes +s390-fixes git git://git.kernel.org/pub/scm/linux/kernel/git/s390/linux.git#fixes +sparc git git://git.kernel.org/pub/scm/linux/kernel/git/davem/sparc.git#master +fscrypt-current git git://git.kernel.org/pub/scm/fs/fscrypt/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 +tsm git git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux#tsm-next +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..29cf68f80ab6 --- /dev/null +++ b/Next/merge.log @@ -0,0 +1,3273 @@ +$ date -R +Tue, 07 Nov 2023 09:38:34 +1100 +$ git checkout master +Already on 'master' +$ git reset --hard stable +HEAD is now at 77fa2fbe87fc Merge tag 'for_linus' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost +Merging origin/master (d2f51b3516da Merge tag 'rtc-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/torvalds/linux.git origin/master +Updating 77fa2fbe87fc..d2f51b3516da +Fast-forward (no commit created; -m option ignored) + .../devicetree/bindings/mailbox/fsl,mu.yaml | 5 +- + .../bindings/mailbox/qcom,apcs-kpss-global.yaml | 2 + + .../devicetree/bindings/mailbox/qcom-ipcc.yaml | 1 + + .../bindings/mailbox/xlnx,zynqmp-ipi-mailbox.yaml | 6 + + .../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/mstar,ssd202d-rtc.yaml | 35 +++ + .../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/mailbox/bcm-pdc-mailbox.c | 10 +- + drivers/mailbox/imx-mailbox.c | 32 ++- + drivers/mailbox/mailbox-sti.c | 8 +- + drivers/mailbox/mtk-cmdq-mailbox.c | 80 ++++++- + drivers/mailbox/ti-msgmgr.c | 12 +- + drivers/rtc/Kconfig | 13 +- + drivers/rtc/Makefile | 1 + + 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 +- + drivers/rtc/rtc-ssd202d.c | 249 +++++++++++++++++++++ + 35 files changed, 737 insertions(+), 147 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/mstar,ssd202d-rtc.yaml + 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 + create mode 100644 drivers/rtc/rtc-ssd202d.c +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 (27969c8df896 kexec-fix-kexec_file-dependencies-fix) +$ 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 arch/powerpc/Kconfig +Auto-merging arch/riscv/Kconfig +Auto-merging arch/s390/Kconfig +Auto-merging arch/x86/Kconfig +Auto-merging include/linux/mmzone.h +Auto-merging kernel/Kconfig.kexec +Auto-merging mm/madvise.c +Auto-merging mm/shmem.c +Merge made by the 'ort' strategy. + arch/powerpc/Kconfig | 4 ++-- + arch/riscv/Kconfig | 4 +--- + arch/s390/Kconfig | 4 ++-- + arch/x86/Kconfig | 4 ++-- + include/linux/mmzone.h | 14 +++++++++++--- + kernel/Kconfig.kexec | 2 ++ + mm/madvise.c | 11 +++++++++++ + mm/shmem.c | 19 ++++++++++++++++++- + mm/sparse.c | 17 +++++++++-------- + 9 files changed, 58 insertions(+), 21 deletions(-) +Merging kbuild-current/fixes (04714e55eb72 kconfig: avoid an infinite loop in oldconfig/syncconfig) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild-current/fixes +Merge made by the 'ort' strategy. + scripts/kconfig/conf.c | 4 +++- + scripts/mod/modpost.c | 6 ++++-- + 2 files changed, 7 insertions(+), 3 deletions(-) +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 (736a4aad8a9f Merge tag 'renesas-fixes-for-v6.6-tag3' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/renesas-devel into arm/fixes) +$ git merge -m Merge branch 'arm/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc-fixes/arm/fixes +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 (03191fb3db3d m68k: lib: Include <linux/libgcc.h> for __muldi3()) +$ 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 (47b8def9358c powerpc/mm: Avoid calling arch_enter/leave_lazy_mmu() in set_ptes) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc-fixes/fixes +Already up to date. +Merging s390-fixes/fixes (ffc253263a13 Linux 6.6) +$ 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 (c1ed833e0b3b Merge branch 'smc-fixes') +$ 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 | 4 + + Documentation/networking/smc-sysctl.rst | 6 +- + drivers/net/dsa/lan9303_mdio.c | 4 +- + .../ethernet/marvell/octeontx2/nic/otx2_common.c | 15 +-- + .../ethernet/marvell/octeontx2/nic/otx2_common.h | 1 + + .../net/ethernet/marvell/octeontx2/nic/otx2_pf.c | 81 ++++++++------ + .../ethernet/marvell/octeontx2/nic/otx2_struct.h | 34 +++--- + .../net/ethernet/marvell/octeontx2/nic/otx2_txrx.c | 42 ++++++++ + drivers/net/ethernet/realtek/r8169_main.c | 4 +- + drivers/net/ethernet/stmicro/stmmac/dwxgmac2.h | 2 +- + .../net/ethernet/stmicro/stmmac/dwxgmac2_core.c | 14 ++- + drivers/net/ethernet/ti/am65-cpsw-nuss.c | 4 +- + drivers/net/ethernet/xscale/ixp4xx_eth.c | 3 +- + drivers/net/mdio/acpi_mdio.c | 1 + + drivers/net/mdio/fwnode_mdio.c | 1 + + drivers/net/mdio/mdio-aspeed.c | 1 + + drivers/net/mdio/mdio-bitbang.c | 1 + + drivers/net/mdio/of_mdio.c | 1 + + drivers/net/phy/bcm-phy-ptp.c | 1 + + drivers/net/phy/bcm87xx.c | 1 + + drivers/net/phy/phylink.c | 1 + + drivers/net/phy/sfp.c | 1 + + include/linux/ethtool.h | 4 +- + include/linux/idr.h | 6 +- + include/linux/tcp.h | 2 +- + include/net/flow.h | 2 +- + include/net/tcp_ao.h | 13 +-- + include/uapi/linux/nfsd_netlink.h | 6 +- + net/core/page_pool.c | 6 +- + net/dccp/ipv4.c | 6 +- + net/dccp/ipv6.c | 6 +- + net/devlink/netlink_gen.c | 2 +- + net/hsr/hsr_forward.c | 4 +- + net/ipv4/syncookies.c | 2 +- + net/ipv4/tcp_ao.c | 5 +- + net/ipv4/tcp_input.c | 7 +- + net/ipv4/tcp_output.c | 2 - + net/ipv4/tcp_sigpool.c | 8 +- + net/ipv6/syncookies.c | 7 +- + net/llc/llc_input.c | 10 +- + net/llc/llc_s_ac.c | 3 + + net/llc/llc_station.c | 3 + + net/netlink/diag.c | 1 + + net/rxrpc/conn_object.c | 2 +- + net/rxrpc/local_object.c | 2 +- + net/sched/act_api.c | 2 +- + net/sched/act_gate.c | 1 + + net/sched/cls_api.c | 9 +- + net/sched/cls_basic.c | 1 + + net/sched/cls_cgroup.c | 1 + + net/sched/cls_fw.c | 1 + + net/sched/cls_route.c | 1 + + net/sched/cls_u32.c | 1 + + net/sched/sch_cbs.c | 1 + + net/sched/sch_choke.c | 1 + + net/sched/sch_drr.c | 1 + + net/sched/sch_etf.c | 1 + + net/sched/sch_ets.c | 1 + + net/sched/sch_fifo.c | 1 + + net/sched/sch_gred.c | 1 + + net/sched/sch_hfsc.c | 1 + + net/sched/sch_htb.c | 1 + + net/sched/sch_ingress.c | 1 + + net/sched/sch_mqprio.c | 1 + + net/sched/sch_mqprio_lib.c | 1 + + net/sched/sch_multiq.c | 1 + + net/sched/sch_netem.c | 1 + + net/sched/sch_plug.c | 1 + + net/sched/sch_prio.c | 1 + + net/sched/sch_qfq.c | 1 + + net/sched/sch_red.c | 1 + + net/sched/sch_sfq.c | 1 + + net/sched/sch_skbprio.c | 1 + + net/sched/sch_taprio.c | 1 + + net/sched/sch_tbf.c | 1 + + net/sched/sch_teql.c | 1 + + net/smc/af_smc.c | 4 +- + net/smc/smc.h | 5 + + net/smc/smc_cdc.c | 11 +- + net/smc/smc_close.c | 5 +- + net/tipc/netlink.c | 4 +- + tools/net/ynl/generated/devlink-user.c | 2 + + tools/net/ynl/generated/nfsd-user.c | 120 +++++++++++++++++++-- + tools/net/ynl/generated/nfsd-user.h | 44 +++++++- + tools/net/ynl/ynl-gen-c.py | 7 +- + tools/testing/selftests/net/pmtu.sh | 2 +- + 86 files changed, 430 insertions(+), 146 deletions(-) +Merging bpf/master (d84b139f53e8 selftests/bpf: Fix broken build where char is unsigned) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf.git bpf/master +Merge made by the 'ort' strategy. + Documentation/bpf/kfuncs.rst | 6 +- + include/linux/btf.h | 11 +++ + kernel/bpf/bpf_iter.c | 6 +- + kernel/bpf/cgroup_iter.c | 6 +- + kernel/bpf/cpumask.c | 6 +- + kernel/bpf/helpers.c | 39 +++++---- + kernel/bpf/map_iter.c | 6 +- + kernel/bpf/task_iter.c | 22 +++-- + kernel/bpf/verifier.c | 33 ++++++-- + kernel/cgroup/rstat.c | 9 +-- + kernel/trace/bpf_trace.c | 6 +- + net/bpf/test_run.c | 7 +- + net/core/filter.c | 13 +-- + net/core/xdp.c | 6 +- + net/ipv4/fou_bpf.c | 6 +- + net/netfilter/nf_conntrack_bpf.c | 6 +- + net/netfilter/nf_nat_bpf.c | 6 +- + net/socket.c | 8 +- + net/xfrm/xfrm_interface_bpf.c | 6 +- + .../selftests/bpf/bpf_testmod/bpf_testmod.c | 6 +- + .../selftests/bpf/map_tests/map_percpu_stats.c | 20 ++--- + .../testing/selftests/bpf/prog_tests/cgroup_iter.c | 33 ++++++++ + tools/testing/selftests/bpf/prog_tests/iters.c | 1 + + .../testing/selftests/bpf/prog_tests/test_bpffs.c | 11 ++- + tools/testing/selftests/bpf/prog_tests/verifier.c | 2 + + tools/testing/selftests/bpf/progs/iters_css_task.c | 63 +++++++++++++++ + .../selftests/bpf/progs/iters_task_failure.c | 4 +- + .../selftests/bpf/progs/verifier_precision.c | 93 ++++++++++++++++++++++ + tools/testing/selftests/bpf/verifier/bpf_st_mem.c | 32 ++++++++ + tools/testing/selftests/bpf/xdp_hw_metadata.c | 2 +- + 30 files changed, 347 insertions(+), 128 deletions(-) + create mode 100644 tools/testing/selftests/bpf/progs/verifier_precision.c +Merging ipsec/master (de5724ca38fd xfrm: fix a data-race in xfrm_lookup_with_ifid()) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec.git ipsec/master +Already up to date. +Merging netfilter/main (016b9332a334 netlink: fill in missing MODULE_DESCRIPTION()) +$ 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 (a63b6622120c net/sched: act_ct: additional checks for outdated flows) +$ 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 (55c900477f5b net: fill in MODULE_DESCRIPTION()s under drivers/net/) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless.git wireless/for-next +Already up to date. +Merging 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 (dc6e08b1a2ae ALSA: hda: cs35l41: Fix missing error code in cs35l41_smart_amp()) +$ 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 (4bdcbc31ad21 ASoC: dapm: fix clock get name) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc-fixes/for-linus +Merge made by the 'ort' strategy. + sound/soc/amd/acp/acp-i2s.c | 4 ++-- + sound/soc/codecs/aw88395/aw88395.c | 2 +- + sound/soc/codecs/aw88399.c | 8 +++---- + sound/soc/codecs/aw88399.h | 2 +- + sound/soc/codecs/da7219-aad.c | 9 ++++++-- + sound/soc/codecs/hdmi-codec.c | 27 +++++++++++++++------- + sound/soc/codecs/rt712-sdca.c | 14 +++++------ + .../mediatek/mt8186/mt8186-mt6366-rt1019-rt5682s.c | 4 ++-- + sound/soc/rockchip/rockchip_i2s_tdm.c | 2 +- + sound/soc/soc-dapm.c | 2 +- + sound/soc/ti/omap-mcbsp.c | 6 +++-- + 11 files changed, 49 insertions(+), 31 deletions(-) +Merging regmap-fixes/for-linus (f33804f1597d Merge remote-tracking branch 'regmap/for-6.6' into regmap-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap-fixes/for-linus +Merge made by the 'ort' strategy. + drivers/base/regmap/regmap.c | 16 +++++++++------- + 1 file changed, 9 insertions(+), 7 deletions(-) +Merging regulator-fixes/for-linus (bc00d9f3813a regulator: qcom-rpmh: Fix smps4 regulator for pm8550ve) +$ 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 (14c4fb111a39 Merge remote-tracking branch 'spi/for-6.6' into spi-linus) +$ git merge -m Merge branch 'for-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi-fixes/for-linus +Auto-merging drivers/spi/Kconfig +Merge made by the 'ort' strategy. + drivers/spi/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging pci-current/for-linus (27beb3ca347f Merge tag 'pci-v6.7-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) +$ 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 (d2f51b3516da Merge tag 'rtc-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ 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 (d2f51b3516da Merge tag 'rtc-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ 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 (d2f51b3516da Merge tag 'rtc-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ 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 (52480e1f1a25 USB: serial: option: add Fibocom to DELL custom modem FM101R-GL) +$ git merge -m Merge branch 'usb-linus' of git://git.kernel.org/pub/scm/linux/kernel/git/johan/usb-serial.git usb-serial-fixes/usb-linus +Already up to date. +Merging phy/fixes (05d3ef8bba77 Linux 6.6-rc7) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy/fixes +Already up to date. +Merging staging.current/staging-linus (d2f51b3516da Merge tag 'rtc-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ 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 (bce3ab29a6c0 iio: common: ms_sensors: ms_sensors_i2c: fix humidity conversion time table) +$ git merge -m Merge branch 'fixes-togreg' of git://git.kernel.org/pub/scm/linux/kernel/git/jic23/iio.git iio-fixes/fixes-togreg +Auto-merging drivers/iio/accel/kionix-kx022a.c +Merge made by the 'ort' strategy. + drivers/iio/accel/kionix-kx022a.c | 37 ++++++++++++++++++-------- + drivers/iio/common/ms_sensors/ms_sensors_i2c.c | 4 +-- + 2 files changed, 28 insertions(+), 13 deletions(-) +Merging counter-current/counter-current (58720809f527 Linux 6.6-rc6) +$ 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 (d2f51b3516da Merge tag 'rtc-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ 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 (58720809f527 Linux 6.6-rc6) +$ 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 +Already up to date. +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 (a312e07a65fb crypto: adiantum - flush destination page before unmapping) +$ 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 (cf5a103c98a6 selftests/user_events: Fix abi_test for BE archs) +$ 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 (58720809f527 Linux 6.6-rc6) +$ 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 (f6ca3fb6978f mtd: rawnand: Ensure the nand chip supports cached reads) +$ git merge -m Merge branch 'mtd/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd-fixes/mtd/fixes +Already up to date. +Merging mfd-fixes/for-mfd-fixes (88603b6dc419 Linux 6.2-rc2) +$ git merge -m Merge branch 'for-mfd-fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/lee/mfd.git mfd-fixes/for-mfd-fixes +Already up to date. +Merging v4l-dvb-fixes/fixes (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 +Already up to date. +Merging kvm-fixes/master (ffc253263a13 Linux 6.6) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/virt/kvm/kvm.git kvm-fixes/master +Already up to date. +Merging kvms390-fixes/master (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 (9da2901c4733 hwmon: (pmbus/mp2975) Move PGOOD fix) +$ 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 (8f61d48c83f6 tools/testing/cxl: Slow down the mock firmware transfer) +$ 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 (db2fc5f63a3a Merge branch 'misc-6.7' 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 +Auto-merging fs/btrfs/ctree.c +Auto-merging fs/btrfs/inode.c +Auto-merging fs/btrfs/ioctl.c +Auto-merging fs/btrfs/volumes.c +Merge made by the 'ort' strategy. + fs/btrfs/ctree.c | 2 +- + fs/btrfs/extent-tree.c | 25 +++++++++++++++++-------- + fs/btrfs/extent-tree.h | 3 ++- + fs/btrfs/inode.c | 7 +++++++ + fs/btrfs/ioctl.c | 10 +++++----- + fs/btrfs/raid-stripe-tree.c | 2 +- + fs/btrfs/scrub.c | 10 +++++++--- + fs/btrfs/volumes.c | 6 +++--- + fs/btrfs/zoned.c | 7 ------- + 9 files changed, 43 insertions(+), 29 deletions(-) +Merging vfs-fixes/fixes (dc32464a5fe4 ceph_wait_on_conflict_unlink(): grab reference before dropping ->d_lock) +$ 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 (d5090484b021 swiotlb: do not try to allocate a TLB bigger than MAX_ORDER pages) +$ 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 (3bde7ec13c97 platform/x86: Add s2idle quirk for more Lenovo laptops) +$ git merge -m Merge branch 'fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86-fixes/fixes +Already up to date. +Merging samsung-krzk-fixes/fixes (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 (097c06394c83 scsi: qla2xxx: Fix double free of dsd_list during driver load) +$ 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 (44117828ed5c Merge tag 'amd-drm-fixes-6.6-2023-10-25' 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 (4cbed7702eb7 drm/i915/pmu: Check if pmu is closed before stopping event) +$ 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 (421b605edb1c Revert "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. + drivers/mmc/core/block.c | 4 +++- + drivers/mmc/core/card.h | 4 ++++ + drivers/mmc/core/mmc.c | 10 +++++++--- + drivers/mmc/core/quirks.h | 7 ++++--- + drivers/mmc/host/sdhci_am654.c | 2 +- + drivers/mmc/host/vub300.c | 1 + + include/linux/mmc/card.h | 2 ++ + 7 files changed, 22 insertions(+), 8 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 (58720809f527 Linux 6.6-rc6) +$ 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 +Already up to date. +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 (03d4bf9ff34a 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. +Merging spdx/spdx-linus (d2f51b3516da Merge tag 'rtc-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ 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 (05d3ef8bba77 Linux 6.6-rc7) +$ 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 +Already up to date. +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 (9eab43facdad soc: renesas: ARCH_R9A07G043 depends on !RISCV_ISA_ZICBOM) +$ 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 (fed3a1be6433 Merge tag 'perf-tools-fixes-for-v6.6-2-2023-10-20' into perf-tools-next) +$ git merge -m Merge branch 'perf-tools' of git://git.kernel.org/pub/scm/linux/kernel/git/perf/perf-tools perf-current/perf-tools +Already up to date. +Merging efi-fixes/urgent (c03d21f05e76 Merge 3rd batch of EFI fixes into efi/urgent) +$ git merge -m Merge branch 'urgent' of git://git.kernel.org/pub/scm/linux/kernel/git/efi/efi.git efi-fixes/urgent +Already up to date. +Merging zstd-fixes/zstd-linus (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 (cfd96726e611 rust: docs: fix logo replacement) +$ git merge -m Merge branch 'rust-fixes' of https://github.com/Rust-for-Linux/linux.git rust-fixes/rust-fixes +Already up to date. +Merging 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 (b131329b9bfb pmdomain: amlogic: Fix mask for the second NNA mem PD domain) +$ 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 (0e8b9f258bae drm/qxl: prevent memory leak) +$ git merge -m Merge branch 'for-linux-next-fixes' of git://anongit.freedesktop.org/drm/drm-misc drm-misc-fixes/for-linux-next-fixes +Merge made by the 'ort' strategy. + drivers/gpu/drm/drm_syncobj.c | 3 ++- + drivers/gpu/drm/qxl/qxl_display.c | 3 +++ + drivers/gpu/drm/vc4/tests/vc4_mock_crtc.c | 2 +- + drivers/gpu/drm/vc4/tests/vc4_mock_output.c | 2 +- + 4 files changed, 7 insertions(+), 3 deletions(-) +Merging mm-stable/mm-stable (ffc253263a13 Linux 6.6) +$ git merge -m Merge branch 'mm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-stable/mm-stable +Already up to date. +Merging mm-nonmm-stable/mm-nonmm-stable (ffc253263a13 Linux 6.6) +$ git merge -m Merge branch 'mm-nonmm-stable' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm-nonmm-stable/mm-nonmm-stable +Already up to date. +Merging mm/mm-everything (4f5e05649c22 mm: zswap: fix the lack of page lru flag in zswap_writeback_entry) +$ git merge -m Merge branch 'mm-everything' of git://git.kernel.org/pub/scm/linux/kernel/git/akpm/mm mm/mm-everything +Auto-merging arch/x86/mm/numa.c +Auto-merging include/linux/memblock.h +Auto-merging include/linux/swap.h +Auto-merging mm/memblock.c +Auto-merging mm/memcontrol.c +Auto-merging mm/page_alloc.c +Auto-merging mm/vmscan.c +Auto-merging mm/zswap.c +Merge made by the 'ort' strategy. + arch/x86/mm/numa.c | 33 +-------------------------------- + include/linux/memblock.h | 1 + + include/linux/swap.h | 6 ++++++ + mm/memblock.c | 21 +++++++++++++++++++++ + mm/memcontrol.c | 8 ++++++++ + mm/page_alloc.c | 44 ++++++++++++++++++++++++++++++++++++++++---- + mm/vmscan.c | 24 ++++++++++++++++++++++++ + mm/zswap.c | 5 +++++ + 8 files changed, 106 insertions(+), 36 deletions(-) +Merging kbuild/for-next (5f56cb030e4b kbuild: support 'userldlibs' syntax) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/masahiroy/linux-kbuild.git kbuild/for-next +Already up to date. +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 (fed3a1be6433 Merge tag 'perf-tools-fixes-for-v6.6-2-2023-10-20' into perf-tools-next) +$ 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 +Already up to date. +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 (a409d9600959 dma-mapping: fix dma_addressing_limited() if dma_range_map can't cover all system RAM) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/dma-mapping.git dma-mapping/for-next +Merge made by the 'ort' strategy. + include/linux/dma-mapping.h | 19 +++++-------------- + kernel/dma/direct.c | 40 ++++++++++++++++++++++++++++++++++++++++ + kernel/dma/direct.h | 1 + + kernel/dma/mapping.c | 22 ++++++++++++++++++++++ + kernel/dma/swiotlb.c | 25 ++++++++++++++++--------- + 5 files changed, 84 insertions(+), 23 deletions(-) +Merging asm-generic/master (550087a0ba91 hexagon: Remove unusable symbols from the ptrace.h uapi) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/arnd/asm-generic.git asm-generic/master +Already up to date. +Merging arc/for-next (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 +Already up to date. +Merging arm64/for-next/core (14dcf78a6c04 Merge branch 'for-next/cpus_have_const_cap' 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 +Already up to date. +Merging arm-perf/for-next/perf (b805cafc604b perf: hisi: Fix use-after-free when register pmu fails) +$ git merge -m Merge branch 'for-next/perf' of git://git.kernel.org/pub/scm/linux/kernel/git/will/linux.git arm-perf/for-next/perf +Already up to date. +Merging arm-soc/for-next (1b52f65d88ad Merge branch 'soc/defconfig' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/soc/soc.git arm-soc/for-next +Auto-merging arch/arm/boot/dts/qcom/qcom-msm8226.dtsi +Auto-merging drivers/soc/renesas/Kconfig +Merge made by the 'ort' strategy. + Documentation/devicetree/bindings/arm/qcom.yaml | 10 + + arch/arm/arm-soc-for-next-contents.txt | 269 +++++ + .../intel/ixp/intel-ixp42x-usrobotics-usr8200.dts | 22 + + arch/arm/boot/dts/qcom/Makefile | 5 + + .../dts/qcom/qcom-msm8226-microsoft-common.dtsi | 327 ++++++ + .../dts/qcom/qcom-msm8226-microsoft-dempsey.dts | 17 + + .../dts/qcom/qcom-msm8226-microsoft-makepeace.dts | 17 + + .../dts/qcom/qcom-msm8226-microsoft-moneypenny.dts | 23 + + arch/arm/boot/dts/qcom/qcom-msm8226.dtsi | 4 +- + .../qcom/qcom-msm8926-microsoft-superman-lte.dts | 53 + + .../boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts | 67 ++ + arch/arm/boot/dts/qcom/qcom-msm8974.dtsi | 80 +- + arch/arm64/boot/dts/qcom/ipq5018-rdp432-c2.dts | 12 + + arch/arm64/boot/dts/qcom/ipq5018.dtsi | 78 ++ + arch/arm64/boot/dts/qcom/ipq5332.dtsi | 23 +- + arch/arm64/boot/dts/qcom/ipq6018.dtsi | 4 +- + arch/arm64/boot/dts/qcom/ipq8074.dtsi | 4 +- + arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi | 147 +++ + arch/arm64/boot/dts/qcom/ipq9574-rdp418.dts | 63 +- + arch/arm64/boot/dts/qcom/ipq9574-rdp433.dts | 91 +- + arch/arm64/boot/dts/qcom/ipq9574-rdp449.dts | 65 +- + arch/arm64/boot/dts/qcom/ipq9574-rdp453.dts | 65 +- + arch/arm64/boot/dts/qcom/ipq9574-rdp454.dts | 66 +- + arch/arm64/boot/dts/qcom/ipq9574.dtsi | 25 +- + .../boot/dts/qcom/msm8916-alcatel-idol347.dts | 173 ++- + arch/arm64/boot/dts/qcom/msm8916-asus-z00l.dts | 21 + + .../boot/dts/qcom/msm8916-longcheer-l8150.dts | 31 +- + .../boot/dts/qcom/msm8916-longcheer-l8910.dts | 103 ++ + arch/arm64/boot/dts/qcom/msm8916-modem-qdsp6.dtsi | 148 +++ + .../dts/qcom/msm8916-samsung-a2015-common.dtsi | 71 ++ + .../boot/dts/qcom/msm8916-samsung-a3u-eur.dts | 10 +- + .../dts/qcom/msm8916-samsung-e2015-common.dtsi | 4 + + .../boot/dts/qcom/msm8916-samsung-grandmax.dts | 4 + + .../boot/dts/qcom/msm8916-samsung-gt5-common.dtsi | 92 +- + arch/arm64/boot/dts/qcom/msm8916-samsung-gt510.dts | 26 + + arch/arm64/boot/dts/qcom/msm8916-samsung-gt58.dts | 46 + + .../boot/dts/qcom/msm8916-samsung-j5-common.dtsi | 14 + + arch/arm64/boot/dts/qcom/msm8916-samsung-j5.dts | 4 + + .../boot/dts/qcom/msm8916-samsung-serranove.dts | 13 + + arch/arm64/boot/dts/qcom/msm8916-thwc-uf896.dts | 8 +- + arch/arm64/boot/dts/qcom/msm8916-thwc-ufi001c.dts | 8 +- + .../boot/dts/qcom/msm8916-wingtech-wt88047.dts | 74 ++ + .../arm64/boot/dts/qcom/msm8916-yiming-uz801v3.dts | 8 +- + arch/arm64/boot/dts/qcom/msm8916.dtsi | 49 + + .../boot/dts/qcom/msm8939-longcheer-l9100.dts | 55 + + arch/arm64/boot/dts/qcom/msm8939-samsung-a7.dts | 70 ++ + arch/arm64/boot/dts/qcom/msm8939.dtsi | 79 ++ + arch/arm64/boot/dts/qcom/pm7250b.dtsi | 2 +- + arch/arm64/boot/dts/qcom/qrb4210-rb2.dts | 1 - + arch/arm64/boot/dts/qcom/sa8775p.dtsi | 1106 ++++++++++++++++++++ + arch/arm64/boot/dts/qcom/sc7280.dtsi | 167 +++ + .../dts/qcom/sc8280xp-lenovo-thinkpad-x13s.dts | 11 + + arch/arm64/boot/dts/qcom/sdm670.dtsi | 2 +- + .../arm64/boot/dts/qcom/sdm845-oneplus-common.dtsi | 23 + + .../dts/qcom/sdm845-xiaomi-beryllium-common.dtsi | 22 + + .../dts/qcom/sm6375-sony-xperia-murray-pdx225.dts | 29 +- + arch/arm64/boot/dts/qcom/sm6375.dtsi | 43 + + arch/arm64/boot/dts/qcom/sm8450.dtsi | 5 + + arch/arm64/boot/dts/qcom/sm8550.dtsi | 5 + + 59 files changed, 3616 insertions(+), 448 deletions(-) + create mode 100644 arch/arm/arm-soc-for-next-contents.txt + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-common.dtsi + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-dempsey.dts + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-makepeace.dts + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8226-microsoft-moneypenny.dts + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-superman-lte.dts + create mode 100644 arch/arm/boot/dts/qcom/qcom-msm8926-microsoft-tesla.dts + create mode 100644 arch/arm64/boot/dts/qcom/ipq9574-rdp-common.dtsi + create mode 100644 arch/arm64/boot/dts/qcom/msm8916-modem-qdsp6.dtsi +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 +Merge made by the 'ort' strategy. +Merging asahi-soc/asahi-soc/for-next (ffc253263a13 Linux 6.6) +$ git merge -m Merge branch 'asahi-soc/for-next' of https://github.com/AsahiLinux/linux.git asahi-soc/asahi-soc/for-next +Already up to date. +Merging aspeed/for-next (3be891e01a89 Merge branches 'defconfig-for-v6.7', 'dt-for-v6.7' and 'soc-for-v6.7' into for-next) +$ 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. +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 (62a3c97f8167 Merge branch 'devicetree/next' into next) +$ git merge -m Merge branch 'next' of https://github.com/Broadcom/stblinux.git broadcom/next +Merge made by the 'ort' strategy. +Merging davinci/davinci/for-next (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 +Already up to date. +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 +Merge made by the 'ort' strategy. +Merging mediatek/for-next (9802b60bd6d8 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 +Merge made by the 'ort' strategy. +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 +Merge made by the 'ort' strategy. +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 (2b05c2dc230b 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 +Merge made by the 'ort' strategy. +Merging renesas/next (fb39831a07ec Merge branch 'renesas-fixes-for-v6.6' 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 drivers/soc/renesas/Kconfig +Merge made by the 'ort' strategy. +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 (043d3ef3344a Merge branch 'v6.8-clk/next' 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. + Documentation/devicetree/bindings/soc/rockchip/grf.yaml | 1 + + arch/arm64/boot/dts/rockchip/rk3328.dtsi | 2 +- + arch/arm64/boot/dts/rockchip/rk3399.dtsi | 6 ++++-- + drivers/clk/rockchip/clk-rk3568.c | 2 ++ + 4 files changed, 8 insertions(+), 3 deletions(-) +Merging samsung-krzk/for-next (b7df1b3a7a1b Merge branch 'next/dt' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/krzk/linux.git samsung-krzk/for-next +Merge made by the 'ort' strategy. +Merging scmi/for-linux-next (93a72958a951 Merge branch 'for-next/ffa/fixes' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux into for-linux-next) +$ git merge -m Merge branch 'for-linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/sudeep.holla/linux.git scmi/for-linux-next +Merge made by the 'ort' strategy. + drivers/firmware/arm_ffa/driver.c | 66 ++++++++++++++++++++++++++------------- + include/linux/arm_ffa.h | 2 ++ + 2 files changed, 46 insertions(+), 22 deletions(-) +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 +Already up to date. +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 +Merge made by the 'ort' strategy. +Merging ti/ti-next (2234981539e7 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 +Merge made by the 'ort' strategy. +Merging xilinx/for-next (7d2da28125ce Merge branch 'zynqmp/dt' 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 ++++---- + arch/arm64/boot/dts/xilinx/zynqmp-sm-k26-revA.dts | 8 +++---- + .../boot/dts/xilinx/zynqmp-zc1751-xm015-dc1.dts | 8 +++++-- + .../boot/dts/xilinx/zynqmp-zc1751-xm016-dc2.dts | 16 ++++++++----- + .../boot/dts/xilinx/zynqmp-zc1751-xm017-dc3.dts | 8 +++++-- + .../boot/dts/xilinx/zynqmp-zc1751-xm018-dc4.dts | 26 +++++++++++++--------- + .../boot/dts/xilinx/zynqmp-zc1751-xm019-dc5.dts | 8 +++++-- + arch/arm64/boot/dts/xilinx/zynqmp-zcu100-revC.dts | 4 ++-- + arch/arm64/boot/dts/xilinx/zynqmp.dtsi | 14 +++--------- + drivers/soc/xilinx/zynqmp_power.c | 6 ++--- + 10 files changed, 57 insertions(+), 50 deletions(-) +Merging clk/clk-next (0a6d7f8275f2 Merge branch 'clk-cleanup' into clk-next) +$ git merge -m Merge branch 'clk-next' of git://git.kernel.org/pub/scm/linux/kernel/git/clk/linux.git clk/clk-next +Already up to date. +Merging clk-imx/for-next (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 +Already up to date. +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 (2c40c1c6adab Merge tag 'usb-6.7-rc1' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb) +$ 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 (99070159221b LoongArch: Support PREEMPT_DYNAMIC with static keys) +$ 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 arch/loongarch/Kconfig +Merge made by the 'ort' strategy. + arch/loongarch/Kconfig | 1 + + 1 file changed, 1 insertion(+) +Merging m68k/for-next (03191fb3db3d m68k: lib: Include <linux/libgcc.h> for __muldi3()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/geert/linux-m68k.git m68k/for-next +Already up to date. +Merging m68knommu/for-next (2508b608f402 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 +Already up to date. +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 (4b7d3ab44565 MIPS: AR7: remove platform) +$ git merge -m Merge branch 'mips-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mips/linux.git mips/mips-next +Auto-merging MAINTAINERS +Auto-merging drivers/Kconfig +Auto-merging drivers/Makefile +Auto-merging drivers/tty/serial/8250/8250_port.c +Auto-merging drivers/watchdog/Kconfig +Merge made by the 'ort' strategy. + MAINTAINERS | 7 - + arch/arm/configs/pxa_defconfig | 1 - + arch/mips/Kbuild.platforms | 1 - + arch/mips/Kconfig | 22 - + arch/mips/ar7/Makefile | 11 - + arch/mips/ar7/Platform | 5 - + arch/mips/ar7/clock.c | 439 ----------- + arch/mips/ar7/gpio.c | 332 --------- + arch/mips/ar7/irq.c | 165 ----- + arch/mips/ar7/memory.c | 51 -- + arch/mips/ar7/platform.c | 722 ------------------- + arch/mips/ar7/prom.c | 256 ------- + arch/mips/ar7/setup.c | 93 --- + arch/mips/ar7/time.c | 31 - + arch/mips/boot/compressed/uart-16550.c | 5 - + 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/configs/ar7_defconfig | 119 --- + arch/mips/configs/fuloong2e_defconfig | 1 - + arch/mips/configs/jazz_defconfig | 4 - + arch/mips/configs/lemote2f_defconfig | 3 - + arch/mips/configs/malta_defconfig | 5 - + arch/mips/configs/malta_kvm_defconfig | 5 - + arch/mips/configs/maltaup_xpa_defconfig | 5 - + arch/mips/configs/rm200_defconfig | 4 - + arch/mips/include/asm/mach-ar7/ar7.h | 191 ----- + arch/mips/include/asm/mach-ar7/irq.h | 16 - + arch/mips/include/asm/mach-ar7/prom.h | 12 - + arch/mips/include/asm/mach-ar7/spaces.h | 22 - + 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 - + arch/mips/pci/fixup-lantiq.c | 2 +- + drivers/Kconfig | 2 - + drivers/Makefile | 1 - + drivers/mtd/parsers/Kconfig | 5 - + drivers/mtd/parsers/Makefile | 1 - + drivers/mtd/parsers/ar7part.c | 129 ---- + drivers/tty/serial/8250/8250_port.c | 7 - + drivers/vlynq/Kconfig | 21 - + drivers/vlynq/Makefile | 6 - + drivers/vlynq/vlynq.c | 799 --------------------- + drivers/watchdog/Kconfig | 6 - + drivers/watchdog/Makefile | 1 - + drivers/watchdog/ar7_wdt.c | 315 -------- + include/linux/vlynq.h | 149 ---- + 52 files changed, 5 insertions(+), 4033 deletions(-) + delete mode 100644 arch/mips/ar7/Makefile + delete mode 100644 arch/mips/ar7/Platform + delete mode 100644 arch/mips/ar7/clock.c + delete mode 100644 arch/mips/ar7/gpio.c + delete mode 100644 arch/mips/ar7/irq.c + delete mode 100644 arch/mips/ar7/memory.c + delete mode 100644 arch/mips/ar7/platform.c + delete mode 100644 arch/mips/ar7/prom.c + delete mode 100644 arch/mips/ar7/setup.c + delete mode 100644 arch/mips/ar7/time.c + delete mode 100644 arch/mips/configs/ar7_defconfig + delete mode 100644 arch/mips/include/asm/mach-ar7/ar7.h + delete mode 100644 arch/mips/include/asm/mach-ar7/irq.h + delete mode 100644 arch/mips/include/asm/mach-ar7/prom.h + delete mode 100644 arch/mips/include/asm/mach-ar7/spaces.h + delete mode 100644 arch/mips/include/asm/mach-loongson32/dma.h + delete mode 100644 arch/mips/include/asm/mach-loongson32/nand.h + delete mode 100644 drivers/mtd/parsers/ar7part.c + delete mode 100644 drivers/vlynq/Kconfig + delete mode 100644 drivers/vlynq/Makefile + delete mode 100644 drivers/vlynq/vlynq.c + delete mode 100644 drivers/watchdog/ar7_wdt.c + delete mode 100644 include/linux/vlynq.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 (8a32aa17c1cd fbdev: stifb: Make the STI next font pointer a 32-bit signed offset) +$ 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 (303d77a6e170 Merge branch 'topic/ppc-kvm' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/powerpc/linux.git powerpc/next +Already up to date. +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 (dbfbda3bd6bf riscv: mm: update T-Head memory type definitions) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git risc-v/for-next +Auto-merging arch/riscv/Kconfig +Auto-merging arch/riscv/Makefile +Auto-merging arch/riscv/configs/defconfig +Auto-merging arch/riscv/include/asm/csr.h +CONFLICT (content): Merge conflict in arch/riscv/include/asm/csr.h +Auto-merging arch/riscv/include/asm/hwcap.h +Auto-merging arch/riscv/include/asm/processor.h +Auto-merging arch/riscv/include/uapi/asm/hwprobe.h +Auto-merging arch/riscv/kernel/cpufeature.c +Auto-merging arch/riscv/kernel/irq.c +CONFLICT (content): Merge conflict in arch/riscv/kernel/irq.c +Auto-merging arch/riscv/kernel/setup.c +Auto-merging arch/riscv/kernel/signal.c +Auto-merging arch/riscv/kernel/sys_riscv.c +Auto-merging arch/riscv/kernel/traps.c +Auto-merging arch/riscv/kernel/vdso/Makefile +Auto-merging arch/riscv/mm/init.c +Auto-merging drivers/clocksource/timer-riscv.c +Resolved 'arch/riscv/include/asm/csr.h' using previous resolution. +Resolved 'arch/riscv/kernel/irq.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 8a23966313fd] Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/riscv/linux.git +$ git diff -M --stat --summary HEAD^.. + Documentation/arch/riscv/hwprobe.rst | 6 + + arch/riscv/Kconfig | 16 + + arch/riscv/Makefile | 4 + + arch/riscv/configs/defconfig | 54 ++++ + arch/riscv/include/asm/acpi.h | 6 + + arch/riscv/include/asm/asm-prototypes.h | 1 - + arch/riscv/include/asm/asm.h | 41 +++ + arch/riscv/include/asm/cpufeature.h | 19 ++ + arch/riscv/include/asm/entry-common.h | 14 + + arch/riscv/include/asm/errata_list.h | 20 +- + arch/riscv/include/asm/hwcap.h | 16 + + arch/riscv/include/asm/hwprobe.h | 7 +- + arch/riscv/include/asm/insn-def.h | 8 +- + arch/riscv/include/asm/irq_stack.h | 3 + + arch/riscv/include/asm/page.h | 4 +- + arch/riscv/include/asm/pgtable-32.h | 3 + + arch/riscv/include/asm/pgtable-64.h | 14 +- + arch/riscv/include/asm/pgtable-bits.h | 4 +- + arch/riscv/include/asm/pgtable.h | 3 +- + arch/riscv/include/asm/processor.h | 9 + + arch/riscv/include/asm/scs.h | 54 ++++ + arch/riscv/include/asm/thread_info.h | 16 +- + arch/riscv/include/asm/vdso/processor.h | 2 +- + arch/riscv/include/uapi/asm/hwprobe.h | 2 + + arch/riscv/kernel/Makefile | 2 +- + arch/riscv/kernel/acpi.c | 89 +++++- + arch/riscv/kernel/asm-offsets.c | 9 + + arch/riscv/kernel/cpufeature.c | 27 +- + arch/riscv/kernel/entry.S | 126 ++++---- + arch/riscv/kernel/fpu.S | 121 ++++++++ + arch/riscv/kernel/head.S | 19 +- + arch/riscv/kernel/irq.c | 56 ++-- + arch/riscv/kernel/kexec_relocate.S | 52 ++-- + arch/riscv/kernel/probes/simulate-insn.c | 2 +- + arch/riscv/kernel/probes/uprobes.c | 6 + + arch/riscv/kernel/process.c | 18 ++ + arch/riscv/kernel/setup.c | 4 + + arch/riscv/kernel/signal.c | 95 +++--- + arch/riscv/kernel/smpboot.c | 6 +- + arch/riscv/kernel/suspend_entry.S | 5 +- + arch/riscv/kernel/sys_riscv.c | 44 ++- + arch/riscv/kernel/traps.c | 98 ++---- + arch/riscv/kernel/traps_misaligned.c | 381 ++++++++++++++++++++---- + arch/riscv/kernel/vdso/Makefile | 2 +- + arch/riscv/kernel/vdso/hwprobe.c | 2 +- + arch/riscv/kernel/vdso/vdso.lds.S | 42 ++- + arch/riscv/lib/clear_page.S | 32 +- + arch/riscv/mm/cacheflush.c | 25 +- + arch/riscv/mm/dma-noncoherent.c | 8 +- + arch/riscv/mm/init.c | 2 + + arch/riscv/mm/pmem.c | 4 +- + arch/riscv/mm/ptdump.c | 56 ++-- + arch/riscv/purgatory/Makefile | 8 + + drivers/acpi/riscv/rhct.c | 93 +++++- + drivers/clocksource/timer-riscv.c | 17 +- + drivers/misc/lkdtm/cfi.c | 13 +- + tools/testing/selftests/riscv/hwprobe/Makefile | 9 +- + tools/testing/selftests/riscv/hwprobe/cbo.c | 228 ++++++++++++++ + tools/testing/selftests/riscv/hwprobe/hwprobe.c | 64 ++-- + tools/testing/selftests/riscv/hwprobe/hwprobe.h | 15 + + 60 files changed, 1620 insertions(+), 486 deletions(-) + create mode 100644 arch/riscv/include/asm/scs.h + create mode 100644 tools/testing/selftests/riscv/hwprobe/cbo.c + create mode 100644 tools/testing/selftests/riscv/hwprobe/hwprobe.h +Merging riscv-dt/riscv-dt-for-next (b99df6281891 riscv: dts: sophgo: remove address-cells from intc node) +$ git merge -m Merge branch 'riscv-dt-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/conor/linux.git riscv-dt/riscv-dt-for-next +Merge made by the 'ort' strategy. + arch/riscv/boot/dts/sophgo/cv1800b.dtsi | 1 - + 1 file changed, 1 deletion(-) +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 +Already up to date. +Merging s390/for-next (02e790ee3077 s390/mm: make pte_free_tlb() similar to pXd_free_tlb()) +$ 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/Kconfig +Merge made by the 'ort' strategy. + arch/s390/Kconfig | 1 + + arch/s390/boot/ipl_parm.c | 8 + + arch/s390/boot/startup.c | 44 ++++++ + arch/s390/boot/vmem.c | 17 ++ + arch/s390/include/asm/mmu.h | 2 - + arch/s390/include/asm/mmu_context.h | 1 - + arch/s390/include/asm/page-states.h | 59 +++++++ + arch/s390/include/asm/page.h | 1 - + arch/s390/include/asm/pgalloc.h | 1 - + arch/s390/include/asm/setup.h | 3 - + arch/s390/include/asm/stacktrace.h | 7 + + arch/s390/include/asm/tlb.h | 13 +- + arch/s390/kernel/early.c | 1 + + arch/s390/kernel/perf_event.c | 41 +++++ + arch/s390/kernel/stacktrace.c | 43 ++++++ + arch/s390/mm/gmap.c | 4 +- + arch/s390/mm/init.c | 4 - + arch/s390/mm/page-states.c | 213 +------------------------- + arch/s390/mm/pgalloc.c | 298 ++++-------------------------------- + arch/s390/mm/vmem.c | 4 +- + drivers/s390/crypto/ap_bus.c | 47 +++--- + drivers/s390/crypto/ap_bus.h | 1 - + drivers/s390/crypto/ap_queue.c | 36 +++-- + drivers/s390/crypto/zcrypt_card.c | 4 +- + drivers/s390/crypto/zcrypt_queue.c | 5 +- + 25 files changed, 320 insertions(+), 538 deletions(-) +Merging sh/for-next (63f1ee206170 locking/atomic: sh: Use generic_cmpxchg_local for arch_cmpxchg_local()) +$ 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 (c7046ed0cf9b bcachefs: Improve stripe checksum error message) +$ git merge -m Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git bcachefs/for-next +Auto-merging fs/bcachefs/btree_cache.c +CONFLICT (content): Merge conflict in fs/bcachefs/btree_cache.c +Auto-merging fs/bcachefs/btree_key_cache.c +CONFLICT (content): Merge conflict in fs/bcachefs/btree_key_cache.c +Auto-merging fs/bcachefs/btree_types.h +Auto-merging fs/bcachefs/fs.c +Auto-merging fs/bcachefs/sysfs.c +Resolved 'fs/bcachefs/btree_cache.c' using previous resolution. +Resolved 'fs/bcachefs/btree_key_cache.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master 2ae1136d27ae] Merge branch 'for-next' of https://evilpiepirate.org/git/bcachefs.git +$ git diff -M --stat --summary HEAD^.. + fs/bcachefs/Kconfig | 4 +- + fs/bcachefs/Makefile | 1 + + fs/bcachefs/alloc_background.c | 183 +++++------ + fs/bcachefs/alloc_background.h | 11 +- + fs/bcachefs/alloc_foreground.c | 38 ++- + fs/bcachefs/backpointers.c | 116 ++++--- + fs/bcachefs/backpointers.h | 11 +- + fs/bcachefs/bbpos.h | 17 +- + fs/bcachefs/bbpos_types.h | 18 ++ + fs/bcachefs/bcachefs.h | 23 +- + fs/bcachefs/bcachefs_format.h | 116 +++---- + fs/bcachefs/bkey.h | 22 +- + fs/bcachefs/bkey_methods.c | 165 +++++----- + fs/bcachefs/bkey_methods.h | 15 +- + fs/bcachefs/bkey_sort.c | 6 +- + fs/bcachefs/btree_cache.c | 23 +- + fs/bcachefs/btree_cache.h | 5 +- + fs/bcachefs/btree_gc.c | 148 +++++---- + fs/bcachefs/btree_io.c | 219 +++++++++----- + fs/bcachefs/btree_iter.c | 71 +++-- + fs/bcachefs/btree_iter.h | 8 +- + fs/bcachefs/btree_key_cache.c | 8 +- + fs/bcachefs/btree_locking.c | 44 ++- + fs/bcachefs/btree_locking.h | 18 +- + fs/bcachefs/btree_trans_commit.c | 35 +-- + fs/bcachefs/btree_types.h | 49 ++- + fs/bcachefs/btree_update_interior.c | 20 +- + fs/bcachefs/btree_update_interior.h | 6 +- + fs/bcachefs/buckets.c | 182 +++++++---- + fs/bcachefs/buckets.h | 15 + + fs/bcachefs/chardev.c | 4 +- + fs/bcachefs/compress.c | 28 +- + fs/bcachefs/compress.h | 36 ++- + fs/bcachefs/darray.h | 6 + + fs/bcachefs/data_update.c | 33 +- + fs/bcachefs/data_update.h | 1 + + fs/bcachefs/debug.c | 8 +- + fs/bcachefs/dirent.c | 68 ++--- + fs/bcachefs/dirent.h | 2 +- + fs/bcachefs/disk_groups.c | 146 ++++++--- + fs/bcachefs/disk_groups.h | 7 +- + fs/bcachefs/disk_groups_types.h | 18 ++ + fs/bcachefs/ec.c | 65 ++-- + fs/bcachefs/ec.h | 4 +- + fs/bcachefs/errcode.h | 4 + + fs/bcachefs/error.c | 32 +- + fs/bcachefs/error.h | 90 ++++-- + fs/bcachefs/extents.c | 409 ++++++++++++++++--------- + fs/bcachefs/extents.h | 51 ++-- + fs/bcachefs/fs-common.c | 2 +- + fs/bcachefs/fs-io-buffered.c | 19 +- + fs/bcachefs/fs-io-direct.c | 1 + + fs/bcachefs/fs-ioctl.c | 4 +- + fs/bcachefs/fs-ioctl.h | 28 +- + fs/bcachefs/fs.c | 9 +- + fs/bcachefs/fsck.c | 183 +++++++---- + fs/bcachefs/fsck.h | 1 + + fs/bcachefs/inode.c | 265 ++++++++++------ + fs/bcachefs/inode.h | 28 +- + fs/bcachefs/io_misc.c | 15 +- + fs/bcachefs/io_misc.h | 2 +- + fs/bcachefs/io_read.c | 6 +- + fs/bcachefs/io_write.c | 40 +-- + fs/bcachefs/journal.c | 19 ++ + fs/bcachefs/journal.h | 1 + + fs/bcachefs/journal_io.c | 299 ++++++++++-------- + fs/bcachefs/lru.c | 18 +- + fs/bcachefs/lru.h | 2 +- + fs/bcachefs/move.c | 417 +++++++++++++------------ + fs/bcachefs/move.h | 63 +++- + fs/bcachefs/move_types.h | 8 +- + fs/bcachefs/movinggc.c | 69 +++-- + fs/bcachefs/opts.c | 15 +- + fs/bcachefs/opts.h | 4 +- + fs/bcachefs/printbuf.c | 4 +- + fs/bcachefs/quota.c | 15 +- + fs/bcachefs/quota.h | 2 +- + fs/bcachefs/rebalance.c | 584 +++++++++++++++++++++--------------- + fs/bcachefs/rebalance.h | 9 +- + fs/bcachefs/rebalance_types.h | 31 +- + fs/bcachefs/recovery.c | 52 ++-- + fs/bcachefs/recovery_types.h | 6 +- + fs/bcachefs/reflink.c | 61 ++-- + fs/bcachefs/reflink.h | 6 +- + fs/bcachefs/replicas.c | 18 +- + fs/bcachefs/sb-clean.c | 5 +- + fs/bcachefs/sb-errors.c | 172 +++++++++++ + fs/bcachefs/sb-errors.h | 270 +++++++++++++++++ + fs/bcachefs/sb-errors_types.h | 16 + + fs/bcachefs/sb-members.c | 159 +++++++--- + fs/bcachefs/sb-members.h | 49 ++- + fs/bcachefs/six.c | 8 +- + fs/bcachefs/snapshot.c | 202 +++++++------ + fs/bcachefs/snapshot.h | 6 +- + fs/bcachefs/subvolume.c | 37 +-- + fs/bcachefs/subvolume.h | 2 +- + fs/bcachefs/super-io.c | 20 +- + fs/bcachefs/super-io.h | 40 +-- + fs/bcachefs/super.c | 125 ++++---- + fs/bcachefs/super_types.h | 12 - + fs/bcachefs/sysfs.c | 45 +-- + fs/bcachefs/trace.c | 1 + + fs/bcachefs/trace.h | 90 ++++-- + fs/bcachefs/util.c | 18 ++ + fs/bcachefs/util.h | 21 +- + fs/bcachefs/xattr.c | 54 ++-- + fs/bcachefs/xattr.h | 2 +- + include/linux/closure.h | 12 +- + lib/closure.c | 9 +- + 109 files changed, 3988 insertions(+), 2302 deletions(-) + create mode 100644 fs/bcachefs/bbpos_types.h + create mode 100644 fs/bcachefs/disk_groups_types.h + create mode 100644 fs/bcachefs/sb-errors.c + create mode 100644 fs/bcachefs/sb-errors.h + create mode 100644 fs/bcachefs/sb-errors_types.h +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 (15baf55481de fscrypt: track master key presence separately from secret) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/fscrypt/linux.git fscrypt/for-next +Already up to date. +Merging 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 +Already up to date. +Merging ceph/master (87cbdc270d48 libceph: check data length when sparse read finishes) +$ git merge -m Merge branch 'master' of git://github.com/ceph/ceph-client.git ceph/master +Auto-merging fs/ceph/addr.c +Auto-merging fs/ceph/caps.c +Auto-merging fs/ceph/crypto.c +Auto-merging fs/ceph/file.c +Auto-merging fs/ceph/inode.c +CONFLICT (content): Merge conflict in fs/ceph/inode.c +Auto-merging fs/ceph/mds_client.c +Auto-merging fs/ceph/snap.c +Auto-merging fs/ceph/super.h +Auto-merging fs/ceph/xattr.c +Auto-merging include/linux/ceph/osd_client.h +Resolved 'fs/ceph/inode.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master a47a61193078] Merge branch 'master' of git://github.com/ceph/ceph-client.git +$ git diff -M --stat --summary HEAD^.. + fs/ceph/acl.c | 12 +- + fs/ceph/addr.c | 299 +++++++------- + fs/ceph/cache.c | 2 +- + fs/ceph/caps.c | 761 +++++++++++++++++++++--------------- + fs/ceph/crypto.c | 43 +- + fs/ceph/debugfs.c | 10 +- + fs/ceph/dir.c | 242 +++++++----- + fs/ceph/export.c | 49 +-- + fs/ceph/file.c | 282 +++++++------ + fs/ceph/inode.c | 525 ++++++++++++++----------- + fs/ceph/ioctl.c | 21 +- + fs/ceph/locks.c | 57 +-- + fs/ceph/mds_client.c | 680 +++++++++++++++++++------------- + fs/ceph/mds_client.h | 13 +- + fs/ceph/mdsmap.c | 29 +- + {include/linux => fs}/ceph/mdsmap.h | 5 +- + fs/ceph/metric.c | 5 +- + fs/ceph/quota.c | 29 +- + fs/ceph/snap.c | 192 +++++---- + fs/ceph/super.c | 99 +++-- + fs/ceph/super.h | 23 +- + fs/ceph/xattr.c | 108 ++--- + fs/mnt_idmapping.c | 2 + + include/linux/ceph/ceph_debug.h | 38 ++ + include/linux/ceph/ceph_fs.h | 10 +- + include/linux/ceph/osd_client.h | 3 +- + include/linux/mnt_idmapping.h | 3 + + net/ceph/osd_client.c | 14 +- + 28 files changed, 2082 insertions(+), 1474 deletions(-) + rename {include/linux => fs}/ceph/mdsmap.h (92%) +Merging cifs/for-next (bc05fd25483b smb3: minor cleanup of session handling code) +$ 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/cifs_debug.c | 25 ++++- + fs/smb/client/cifsfs.h | 4 +- + fs/smb/client/cifsglob.h | 4 + + fs/smb/client/cifsproto.h | 10 +- + fs/smb/client/connect.c | 51 ++++++++-- + fs/smb/client/sess.c | 229 +++++++++++++++++++++++++++++++++++------- + fs/smb/client/smb2ops.c | 6 ++ + fs/smb/client/smb2pdu.c | 122 +++++++++++++++++++--- + fs/smb/client/smb2transport.c | 8 +- + fs/smb/client/transport.c | 2 +- + 10 files changed, 392 insertions(+), 69 deletions(-) +Merging configfs/for-next (4425c1d9b44d configfs: improve item creation performance) +$ git merge -m Merge branch 'for-next' of git://git.infradead.org/users/hch/configfs.git configfs/for-next +Auto-merging fs/configfs/inode.c +Merge made by the 'ort' strategy. + fs/configfs/configfs_internal.h | 4 ++-- + fs/configfs/dir.c | 42 +++++++++++++++++++++++++++++++---------- + fs/configfs/inode.c | 24 ----------------------- + 3 files changed, 34 insertions(+), 36 deletions(-) +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 (1a0ac8bd7a4f erofs: fix erofs_insert_workgroup() lockref usage) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/xiang/erofs.git erofs/dev +Already up to date. +Merging exfat/dev (1373ca10ec04 exfat: fix ctime is not updated) +$ 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/file.c | 1 + + fs/exfat/inode.c | 4 ++-- + 2 files changed, 3 insertions(+), 2 deletions(-) +Merging ext3/for_next (7f680e5f256f Pull ext2 conversion of directory code to folios.) +$ git merge -m Merge branch 'for_next' of git://git.kernel.org/pub/scm/linux/kernel/git/jack/linux-fs.git ext3/for_next +Merge made by the 'ort' strategy. +Merging ext4/dev (91562895f803 ext4: properly sync file size update after O_SYNC direct IO) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/tytso/ext4.git ext4/dev +Already up to date. +Merging f2fs/dev (1e7bef5f90ed f2fs: finish previous checkpoints before returning from remount) +$ git merge -m Merge branch 'dev' of git://git.kernel.org/pub/scm/linux/kernel/git/jaegeuk/f2fs.git f2fs/dev +Already up to date. +Merging fsverity/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 (513dfacefd71 fuse: share lookup state between submount and its parent) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mszeredi/fuse.git fuse/for-next +Auto-merging fs/fuse/fuse_i.h +Auto-merging fs/fuse/inode.c +Merge made by the 'ort' strategy. + Documentation/filesystems/fuse-io.rst | 3 +- + fs/fuse/file.c | 6 +-- + fs/fuse/fuse_i.h | 19 ++++++++- + fs/fuse/inode.c | 80 ++++++++++++++++++++++++++++++++--- + include/uapi/linux/fuse.h | 10 +++-- + 5 files changed, 102 insertions(+), 16 deletions(-) +Merging gfs2/for-next (0cdc6f44e9fd gfs2: don't withdraw if init_threads() got interrupted) +$ 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/aops.c +Auto-merging fs/gfs2/bmap.c +Auto-merging fs/gfs2/dir.c +Auto-merging fs/gfs2/glock.c +Auto-merging fs/gfs2/glops.c +Auto-merging fs/gfs2/inode.c +Auto-merging fs/gfs2/ops_fstype.c +Auto-merging fs/gfs2/quota.c +Auto-merging fs/gfs2/quota.h +Auto-merging fs/gfs2/super.c +Auto-merging fs/gfs2/super.h +Auto-merging fs/gfs2/xattr.c +Merge made by the 'ort' strategy. + fs/gfs2/acl.h | 8 ++-- + fs/gfs2/aops.c | 72 ++++++++++++++++---------------- + fs/gfs2/aops.h | 6 +-- + fs/gfs2/bmap.c | 17 +++++--- + fs/gfs2/bmap.h | 38 ++++++++--------- + fs/gfs2/dir.c | 2 +- + fs/gfs2/dir.h | 38 ++++++++--------- + fs/gfs2/file.c | 18 +++++--- + fs/gfs2/glock.c | 1 - + fs/gfs2/glock.h | 113 ++++++++++++++++++++++----------------------------- + fs/gfs2/glops.c | 13 ------ + fs/gfs2/glops.h | 4 +- + fs/gfs2/incore.h | 2 +- + fs/gfs2/inode.c | 33 +++++++++------ + fs/gfs2/inode.h | 56 ++++++++++++------------- + fs/gfs2/log.h | 46 ++++++++++----------- + fs/gfs2/lops.h | 22 +++++----- + fs/gfs2/meta_io.h | 20 ++++----- + fs/gfs2/ops_fstype.c | 28 ++++++------- + fs/gfs2/quota.c | 31 +++++++++----- + fs/gfs2/quota.h | 38 ++++++++--------- + fs/gfs2/recovery.h | 18 ++++---- + fs/gfs2/rgrp.c | 12 +++--- + fs/gfs2/rgrp.h | 81 ++++++++++++++++++------------------ + fs/gfs2/super.c | 29 +++++-------- + fs/gfs2/super.h | 50 +++++++++++------------ + fs/gfs2/trans.h | 22 +++++----- + fs/gfs2/util.h | 8 ++-- + fs/gfs2/xattr.c | 6 +-- + fs/gfs2/xattr.h | 12 +++--- + 30 files changed, 416 insertions(+), 428 deletions(-) +Merging jfs/jfs-next (5afb50b46a98 jfs: fix shift-out-of-bounds in dbJoin) +$ git merge -m Merge branch 'jfs-next' of git://github.com/kleikamp/linux-shaggy.git jfs/jfs-next +Auto-merging fs/jfs/jfs_mount.c +Merge made by the 'ort' strategy. + fs/jfs/jfs_dmap.c | 65 +++++++++++++++++++++++++++++++----------------------- + fs/jfs/jfs_dtree.c | 7 +++++- + fs/jfs/jfs_mount.c | 6 ++--- + 3 files changed, 47 insertions(+), 31 deletions(-) +Merging ksmbd/ksmbd-for-next (b5fcfb5619e6 ksmbd: fix kernel-doc comment of ksmbd_vfs_kern_path_locked()) +$ 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/smbacl.c | 29 ++++++++++++++++++++++++++--- + fs/smb/server/vfs.c | 7 ++++--- + 2 files changed, 30 insertions(+), 6 deletions(-) +Merging nfs/linux-next (f003a717ae90 nfs: Convert nfs_symlink() to use a folio) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/trondmy/nfs-2.6.git nfs/linux-next +Auto-merging Documentation/admin-guide/kernel-parameters.txt +Auto-merging fs/nfs/nfs4_fs.h +Auto-merging fs/nfs/nfs4proc.c +Auto-merging fs/nfs/super.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 7 +++ + fs/nfs/Kconfig | 2 +- + fs/nfs/delegation.c | 7 ++- + fs/nfs/delegation.h | 1 + + fs/nfs/dir.c | 29 +++++------- + fs/nfs/nfs3proc.c | 3 +- + fs/nfs/nfs4_fs.h | 2 + + fs/nfs/nfs4proc.c | 62 +++++++++++++++++++------ + fs/nfs/pnfs.c | 8 +++- + fs/nfs/pnfs.h | 5 +- + fs/nfs/proc.c | 3 +- + fs/nfs/super.c | 8 +++- + fs/nfs/write.c | 2 + + include/linux/nfs_fs_sb.h | 1 + + include/linux/nfs_xdr.h | 2 +- + include/linux/sunrpc/clnt.h | 1 + + net/sunrpc/clnt.c | 10 ++-- + net/sunrpc/rpcb_clnt.c | 4 ++ + net/sunrpc/xprt.c | 4 +- + net/sunrpc/xprtsock.c | 14 ++---- + 20 files changed, 121 insertions(+), 54 deletions(-) +Merging nfs-anna/linux-next (379e4adfddd6 NFSv4.1: fixup use EXCHGID4_FLAG_USE_PNFS_DS for DS server) +$ git merge -m Merge branch 'linux-next' of git://git.linux-nfs.org/projects/anna/linux-nfs.git nfs-anna/linux-next +Already up to date. +Merging nfsd/nfsd-next (3fd2ca5be07f 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 +Already up to date. +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 +Already up to date. +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 (24e16e385f22 ovl: add support for appending lowerdirs one by one) +$ 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 fs/overlayfs/super.c +Auto-merging fs/super.c +Merge made by the 'ort' strategy. + Documentation/filesystems/overlayfs.rst | 40 +++- + 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/params.c | 328 +++++++++++++++++--------------- + fs/overlayfs/params.h | 1 + + fs/overlayfs/readdir.c | 27 ++- + fs/overlayfs/super.c | 92 ++------- + fs/overlayfs/util.c | 117 +++++++++++- + fs/overlayfs/xattrs.c | 271 ++++++++++++++++++++++++++ + fs/super.c | 1 + + 16 files changed, 934 insertions(+), 537 deletions(-) + create mode 100644 fs/overlayfs/xattrs.c +Merging ubifs/next (75690493591f ubifs: ubifs_link: Fix wrong name len calculating when UBIFS is encrypted) +$ 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 (ce0708796420 9p/net: fix possible memory leak in p9_check_errors()) +$ 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 (14a537983b22 xfs: allow read IO and FICLONE to run concurrently) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git xfs/for-next +Auto-merging fs/xfs/libxfs/xfs_rtbitmap.c +CONFLICT (content): Merge conflict in fs/xfs/libxfs/xfs_rtbitmap.c +Auto-merging fs/xfs/xfs_bmap_util.c +Auto-merging fs/xfs/xfs_inode.c +Auto-merging fs/xfs/xfs_inode_item.c +Auto-merging fs/xfs/xfs_mount.h +Auto-merging fs/xfs/xfs_rtalloc.c +CONFLICT (content): Merge conflict in fs/xfs/xfs_rtalloc.c +Auto-merging fs/xfs/xfs_super.c +Resolved 'fs/xfs/libxfs/xfs_rtbitmap.c' using previous resolution. +Resolved 'fs/xfs/xfs_rtalloc.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master bf69c5188f18] Merge branch 'for-next' of git://git.kernel.org/pub/scm/fs/xfs/xfs-linux.git +$ git diff -M --stat --summary HEAD^.. + fs/xfs/libxfs/xfs_bmap.c | 45 +-- + fs/xfs/libxfs/xfs_format.h | 34 +- + fs/xfs/libxfs/xfs_rtbitmap.c | 805 ++++++++++++++++++++++------------------- + fs/xfs/libxfs/xfs_rtbitmap.h | 383 ++++++++++++++++++++ + fs/xfs/libxfs/xfs_sb.c | 2 + + fs/xfs/libxfs/xfs_sb.h | 2 +- + fs/xfs/libxfs/xfs_trans_resv.c | 10 +- + fs/xfs/libxfs/xfs_types.c | 4 +- + fs/xfs/libxfs/xfs_types.h | 10 +- + fs/xfs/scrub/bmap.c | 2 +- + fs/xfs/scrub/fscounters.c | 2 +- + fs/xfs/scrub/inode.c | 3 +- + fs/xfs/scrub/rtbitmap.c | 28 +- + fs/xfs/scrub/rtsummary.c | 72 ++-- + fs/xfs/scrub/trace.c | 1 + + fs/xfs/scrub/trace.h | 15 +- + fs/xfs/xfs_bmap_util.c | 74 ++-- + fs/xfs/xfs_file.c | 63 +++- + fs/xfs/xfs_fsmap.c | 15 +- + fs/xfs/xfs_inode.c | 24 ++ + fs/xfs/xfs_inode.h | 9 + + fs/xfs/xfs_inode_item.c | 3 +- + fs/xfs/xfs_ioctl.c | 5 +- + fs/xfs/xfs_linux.h | 12 + + fs/xfs/xfs_mount.h | 8 +- + fs/xfs/xfs_ondisk.h | 4 + + fs/xfs/xfs_reflink.c | 4 + + fs/xfs/xfs_rtalloc.c | 618 ++++++++++++++++--------------- + fs/xfs/xfs_rtalloc.h | 94 +---- + fs/xfs/xfs_super.c | 3 +- + fs/xfs/xfs_trans.c | 7 +- + 31 files changed, 1422 insertions(+), 939 deletions(-) + create mode 100644 fs/xfs/libxfs/xfs_rtbitmap.h +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 (3ac974796e5d iomap: fix short copy in iomap_write_iter()) +$ 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 (c1279eea4989 Merge branch 'vfs.f_fsid' 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 MAINTAINERS +Auto-merging block/bdev.c +Auto-merging drivers/md/dm.c +Auto-merging fs/bcachefs/fs-ioctl.c +Auto-merging fs/efivarfs/super.c +Auto-merging fs/erofs/super.c +Auto-merging fs/ext4/super.c +Auto-merging fs/f2fs/file.c +Auto-merging fs/f2fs/super.c +Auto-merging fs/fuse/inode.c +Auto-merging fs/hugetlbfs/inode.c +Auto-merging fs/notify/fanotify/fanotify_user.c +Auto-merging fs/overlayfs/util.c +Auto-merging fs/super.c +Auto-merging fs/xfs/xfs_super.c +Auto-merging include/linux/fs.h +Merge made by the 'ort' strategy. + Documentation/filesystems/nfs/exporting.rst | 7 +- + Documentation/filesystems/porting.rst | 21 ++ + MAINTAINERS | 3 +- + block/bdev.c | 87 ++++---- + drivers/md/dm.c | 4 +- + fs/affs/namei.c | 1 + + fs/bcachefs/fs-ioctl.c | 4 +- + fs/befs/linuxvfs.c | 1 + + fs/efivarfs/super.c | 2 + + fs/efs/super.c | 1 + + fs/erofs/super.c | 1 + + fs/exportfs/expfs.c | 57 ++--- + fs/ext2/super.c | 1 + + fs/ext4/ioctl.c | 4 +- + fs/ext4/super.c | 4 +- + fs/f2fs/file.c | 4 +- + fs/f2fs/super.c | 1 + + fs/fat/nfs.c | 1 + + fs/fhandle.c | 6 +- + fs/freevxfs/vxfs_super.c | 2 + + fs/fuse/inode.c | 7 +- + fs/hugetlbfs/inode.c | 2 + + fs/jffs2/super.c | 1 + + fs/jfs/super.c | 1 + + fs/libfs.c | 44 ++++ + fs/nfsd/export.c | 3 +- + fs/nilfs2/super.c | 8 - + fs/notify/fanotify/fanotify_user.c | 4 +- + fs/ntfs/namei.c | 1 + + fs/ntfs3/super.c | 1 + + fs/overlayfs/util.c | 2 +- + fs/smb/client/export.c | 11 +- + fs/squashfs/export.c | 1 + + fs/super.c | 325 ++++++++++++++-------------- + fs/ufs/super.c | 1 + + fs/xfs/xfs_fsops.c | 4 +- + fs/xfs/xfs_super.c | 19 +- + include/linux/blk_types.h | 7 +- + include/linux/blkdev.h | 19 +- + include/linux/exportfs.h | 50 ++++- + include/linux/fs.h | 1 - + 41 files changed, 411 insertions(+), 313 deletions(-) +Merging vfs/for-next (1aee9158bc97 nfsd: lock_rename() needs both directories to live on the same fs) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/viro/vfs.git vfs/for-next +Already up to date. +Merging printk/for-next (b4908d68609b 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/printk/linux.git printk/for-next +Merge made by the 'ort' strategy. +Merging pci/next (27beb3ca347f Merge tag 'pci-v6.7-changes' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pci/pci.git pci/next +Already up to date. +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 +Already up to date. +Merging hid/for-next (55ec92989f9b Merge branch 'for-6.6/upstream-fixes' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/hid/hid.git hid/for-next +Merge made by the 'ort' strategy. +Merging i2c/i2c/for-next (b871ee43a733 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. +Merging i3c/i3c/next (9fd00df05e81 i3c: master: handle IBIs in order they came) +$ git merge -m Merge branch 'i3c/next' of git://git.kernel.org/pub/scm/linux/kernel/git/i3c/linux.git i3c/i3c/next +Already up to date. +Merging dmi/dmi-for-next (13a0ac816d22 firmware: dmi: Fortify entry point length checks) +$ git merge -m Merge branch 'dmi-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jdelvare/staging.git dmi/dmi-for-next +Already up to date. +Merging hwmon-staging/hwmon-next (0f564130e5c7 hwmon: (aquacomputer_d5next) Check if temp sensors of legacy devices are connected) +$ git merge -m Merge branch 'hwmon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/groeck/linux-staging.git hwmon-staging/hwmon-next +Already up to date. +Merging jc_docs/docs-next (cf63348b4c45 scripts/kernel-doc: Fix the regex for matching -Werror flag) +$ git merge -m Merge branch 'docs-next' of git://git.lwn.net/linux.git jc_docs/docs-next +Already up to date. +Merging v4l-dvb/master (3e238417254b media: nuvoton: VIDEO_NPCM_VCD_ECE should depend on ARCH_NPCM) +$ git merge -m Merge branch 'master' of git://linuxtv.org/media_tree.git v4l-dvb/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/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/Kconfig | 2 + + 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 | 482 +-- + drivers/media/platform/qcom/camss/camss.h | 34 +- + drivers/media/platform/qcom/venus/core.c | 10 +- + drivers/media/platform/qcom/venus/hfi_cmds.h | 2 +- + drivers/media/platform/qcom/venus/hfi_msgs.c | 2 +- + drivers/media/platform/qcom/venus/hfi_parser.c | 15 + + drivers/media/platform/qcom/venus/hfi_venus.c | 10 + + 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 + + 505 files changed, 17372 insertions(+), 18179 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 +Merging v4l-dvb-next/master (3e238417254b media: nuvoton: VIDEO_NPCM_VCD_ECE should depend on ARCH_NPCM) +$ git merge -m Merge branch 'master' of git://linuxtv.org/mchehab/media-next.git v4l-dvb-next/master +Already up to date. +Merging pm/linux-next (742513f48261 Merge branch 'pm-cpufreq' into linux-next) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rafael/linux-pm.git pm/linux-next +Merge made by the 'ort' strategy. + drivers/cpufreq/cpufreq-dt-platdev.c | 3 ++ + drivers/cpufreq/qcom-cpufreq-nvmem.c | 60 +++++++++++++++++++++++ + tools/power/cpupower/man/cpupower-powercap-info.1 | 2 +- + 3 files changed, 64 insertions(+), 1 deletion(-) +Merging cpufreq-arm/cpufreq/arm/linux-next (5b5b5806f223 cpufreq: qcom-nvmem: Introduce cpufreq for ipq95xx) +$ git merge -m Merge branch 'cpufreq/arm/linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/vireshk/pm.git cpufreq-arm/cpufreq/arm/linux-next +Already up to date. +Merging cpupower/cpupower (6feb1a964119 cpupower: fix reference to nonexistent document) +$ 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 (8f0cd531ee18 dt-bindings: devfreq: event: rockchip,dfi: Add rk3588 support) +$ git merge -m Merge branch 'devfreq-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/linux.git devfreq/devfreq-next +Already up to date. +Merging pmdomain/next (9e0cceadb7a5 pmdomain: Merge branch fixes into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/linux-pm.git pmdomain/next +Already up to date. +Merging opp/opp/linux-next (5306fe37284c opp: ti: Use device_get_match_data()) +$ 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. + drivers/opp/ti-opp-supply.c | 13 +++---------- + 1 file changed, 3 insertions(+), 10 deletions(-) +Merging thermal/thermal/linux-next (9618efe343ea thermal/qcom/tsens: Drop ops_v0_1) +$ 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 +Already up to date. +Merging rdma/for-next (2ef422f063b7 IB/mlx5: Fix init stage error handling to avoid double free of same QP and UAF) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/rdma/rdma.git rdma/for-next +Already up to date. +Merging net-next/main (ff269e2cd5ad Merge tag 'net-next-6.7-followup' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'main' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next.git net-next/main +Already up to date. +Merging bpf-next/for-next (ff269e2cd5ad Merge tag 'net-next-6.7-followup' of git://git.kernel.org/pub/scm/linux/kernel/git/netdev/net-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/bpf/bpf-next.git bpf-next/for-next +Already up to date. +Merging ipsec-next/master (eefed7662ff2 xfrm: policy: fix layer 4 flowi decoding) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/klassert/ipsec-next.git ipsec-next/master +Already up to date. +Merging mlx5-next/mlx5-next (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 (ef113733c288 bareudp: use ports to lookup route) +$ 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 (9cdee0634769 netfilter: nf_tables: Carry reset boolean in nft_set_dump_ctx) +$ 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 (0783375f2c56 Bluetooth: ISO: Allow binding a PA sync socket) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/bluetooth/bluetooth-next.git bluetooth/master +Merge made by the 'ort' strategy. + net/bluetooth/hci_event.c | 8 +----- + net/bluetooth/iso.c | 67 +++++++++++++++++++++++++++++++++++++++++++---- + 2 files changed, 63 insertions(+), 12 deletions(-) +Merging wireless-next/for-next (cc54d2e2c58a MAINTAINERS: Remove linuxwwan@intel.com mailing list) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/wireless/wireless-next.git wireless-next/for-next +Already up to date. +Merging 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 (565fe150624e mtd: cfi_cmdset_0001: Byte swap OTP info) +$ git merge -m Merge branch 'mtd/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git mtd/mtd/next +Already up to date. +Merging nand/nand/next (5a985960a4dd mtd: rawnand: meson: check return value of devm_kasprintf()) +$ git merge -m Merge branch 'nand/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git nand/nand/next +Already up to date. +Merging spi-nor/spi-nor/next (6823a8383420 mtd: spi-nor: micron-st: use SFDP table for mt25qu512a) +$ git merge -m Merge branch 'spi-nor/next' of git://git.kernel.org/pub/scm/linux/kernel/git/mtd/linux.git spi-nor/spi-nor/next +Already up to date. +Merging crypto/master (a312e07a65fb crypto: adiantum - flush destination page before unmapping) +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/cryptodev-2.6.git crypto/master +Already up to date. +Merging drm/drm-next (9ccde17d4655 Merge tag 'amd-drm-next-6.7-2023-11-03' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git drm/drm-next +Auto-merging MAINTAINERS +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +CONFLICT (content): Merge conflict in drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c +Auto-merging drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c +Auto-merging drivers/gpu/drm/amd/amdkfd/kfd_topology.c +Resolved 'drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c' using previous resolution. +Automatic merge failed; fix conflicts and then commit the result. +$ git commit --no-edit -v -a +[master eaad163eff1c] Merge branch 'drm-next' of git://git.freedesktop.org/git/drm/drm.git +$ git diff -M --stat --summary HEAD^.. + .../bindings/display/renesas,shmobile-lcdc.yaml | 130 ++++ + .../bindings/display/solomon,ssd132x.yaml | 8 +- + .../userspace-api/media/v4l/subdev-formats.rst | 72 +++ + MAINTAINERS | 13 +- + drivers/gpu/drm/amd/amdgpu/amdgpu.h | 3 - + drivers/gpu/drm/amd/amdgpu/amdgpu_amdkfd_gpuvm.c | 79 ++- + drivers/gpu/drm/amd/amdgpu/amdgpu_bios.c | 5 + + drivers/gpu/drm/amd/amdgpu/amdgpu_cs.c | 7 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_device.c | 38 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_discovery.c | 26 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_dma_buf.c | 2 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_drv.c | 35 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_gfx.c | 2 + + drivers/gpu/drm/amd/amdgpu/amdgpu_mes.c | 16 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.c | 15 + + drivers/gpu/drm/amd/amdgpu/amdgpu_psp.h | 3 + + drivers/gpu/drm/amd/amdgpu/amdgpu_ras.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_umc.c | 6 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.c | 19 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vm.h | 3 +- + drivers/gpu/drm/amd/amdgpu/amdgpu_vram_mgr.c | 15 +- + drivers/gpu/drm/amd/amdgpu/gfx_v10_0.c | 28 +- + drivers/gpu/drm/amd/amdgpu/gfx_v11_0.c | 13 +- + drivers/gpu/drm/amd/amdgpu/nbio_v2_3.c | 5 +- + drivers/gpu/drm/amd/amdgpu/psp_v13_0.c | 78 +++ + drivers/gpu/drm/amd/amdgpu/umc_v12_0.c | 3 +- + drivers/gpu/drm/amd/amdkfd/kfd_crat.c | 66 ++- + drivers/gpu/drm/amd/amdkfd/kfd_topology.c | 18 +- + drivers/gpu/drm/amd/display/dc/core/dc.c | 1 - + drivers/gpu/drm/amd/display/dc/core/dc_stream.c | 4 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_dpp.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.c | 2 +- + drivers/gpu/drm/amd/display/dc/dcn30/dcn30_hubp.h | 5 + + drivers/gpu/drm/amd/display/dc/dcn32/dcn32_mpc.c | 3 + + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.c | 137 ++++- + drivers/gpu/drm/amd/display/dc/dcn35/dcn35_hubp.h | 14 + + drivers/gpu/drm/amd/display/dc/dml2/Makefile | 4 + + .../amd/include/asic_reg/mp/mp_13_0_2_sh_mask.h | 28 + + drivers/gpu/drm/amd/include/kgd_pp_interface.h | 30 +- + drivers/gpu/drm/amd/pm/amdgpu_pm.c | 27 +- + drivers/gpu/drm/amd/pm/powerplay/amd_powerplay.c | 3 + + .../gpu/drm/amd/pm/powerplay/hwmgr/pptable_v1_0.h | 4 +- + .../drm/amd/pm/powerplay/hwmgr/vega10_pptable.h | 24 +- + drivers/gpu/drm/amd/pm/swsmu/amdgpu_smu.c | 33 +- + drivers/gpu/drm/amd/pm/swsmu/inc/amdgpu_smu.h | 1 + + .../pm/swsmu/inc/pmfw_if/smu14_driver_if_v14_0_0.h | 120 +--- + drivers/gpu/drm/amd/pm/swsmu/inc/smu_v13_0.h | 2 + + drivers/gpu/drm/amd/pm/swsmu/smu11/vangogh_ppt.c | 17 +- + drivers/gpu/drm/amd/pm/swsmu/smu13/smu_v13_0.c | 13 + + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_0_ppt.c | 58 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_6_ppt.c | 2 +- + .../gpu/drm/amd/pm/swsmu/smu13/smu_v13_0_7_ppt.c | 27 +- + drivers/gpu/drm/amd/pm/swsmu/smu14/smu_v14_0.c | 4 +- + .../gpu/drm/amd/pm/swsmu/smu14/smu_v14_0_0_ppt.c | 260 ++------ + drivers/gpu/drm/amd/pm/swsmu/smu_cmn.c | 3 + + drivers/gpu/drm/radeon/atombios.h | 42 +- + drivers/gpu/drm/renesas/shmobile/Kconfig | 3 +- + drivers/gpu/drm/renesas/shmobile/Makefile | 3 +- + .../gpu/drm/renesas/shmobile/shmob_drm_backlight.c | 82 --- + .../gpu/drm/renesas/shmobile/shmob_drm_backlight.h | 19 - + drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.c | 656 +++++++++------------ + drivers/gpu/drm/renesas/shmobile/shmob_drm_crtc.h | 27 +- + drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.c | 181 +++--- + drivers/gpu/drm/renesas/shmobile/shmob_drm_drv.h | 18 +- + drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.c | 77 ++- + drivers/gpu/drm/renesas/shmobile/shmob_drm_kms.h | 9 +- + drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.c | 342 ++++++----- + drivers/gpu/drm/renesas/shmobile/shmob_drm_plane.h | 5 +- + drivers/gpu/drm/solomon/ssd130x.c | 2 +- + include/drm/amd_asic_type.h | 5 + + include/linux/platform_data/shmob_drm.h | 57 +- + include/uapi/linux/media-bus-format.h | 3 +- + 72 files changed, 1730 insertions(+), 1357 deletions(-) + create mode 100644 Documentation/devicetree/bindings/display/renesas,shmobile-lcdc.yaml + delete mode 100644 drivers/gpu/drm/renesas/shmobile/shmob_drm_backlight.c + delete mode 100644 drivers/gpu/drm/renesas/shmobile/shmob_drm_backlight.h +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 (94565e95e247 drm/ssd130x: Fix possible uninitialized usage of crtc_state variable) +$ git merge -m Merge branch 'for-linux-next' of git://anongit.freedesktop.org/drm/drm-misc drm-misc/for-linux-next +Already up to date. +Merging amdgpu/drm-next (6d5e0032a92d drm/amd/display: Enable fast update on blendTF change) +$ git merge -m Merge branch 'drm-next' of https://gitlab.freedesktop.org/agd5f/linux amdgpu/drm-next +Already up to date. +Merging drm-intel/for-linux-next (9506fba463fc drm/i915/tc: Fix -Wformat-truncation in intel_tc_port_init) +$ 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/i915_perf.c +Merge made by the 'ort' strategy. + drivers/gpu/drm/i915/display/intel_cdclk.c | 12 ++++++++++ + drivers/gpu/drm/i915/display/intel_dp.c | 2 +- + drivers/gpu/drm/i915/display/intel_tc.c | 11 ++++++--- + drivers/gpu/drm/i915/gem/i915_gem_context.c | 1 + + drivers/gpu/drm/i915/gt/intel_ggtt.c | 35 ++++++++++++++++++++--------- + drivers/gpu/drm/i915/gt/intel_rc6.c | 16 ++++++++----- + drivers/gpu/drm/i915/i915_debugfs_params.c | 9 +++++--- + drivers/gpu/drm/i915/i915_perf.c | 15 +++---------- + 8 files changed, 65 insertions(+), 36 deletions(-) +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 (b08d26dac1a1 drm/msm/a7xx: actually use a7xx state registers) +$ git merge -m Merge branch 'msm-next' of https://gitlab.freedesktop.org/drm/msm.git drm-msm/msm-next +Already up to date. +Merging drm-msm-lumag/msm-next-lumag (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 (31b88945e0c8 fbdev: imsttfb: fix a resource leak in probe) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/deller/linux-fbdev.git fbdev/for-next +Auto-merging drivers/video/fbdev/imsttfb.c +Auto-merging drivers/video/fbdev/via/viafbdev.c +Merge made by the 'ort' strategy. + drivers/video/fbdev/imsttfb.c | 35 ++++++++++++++++----------------- + drivers/video/fbdev/offb.c | 8 +++----- + drivers/video/fbdev/omap/omapfb_main.c | 30 +++++++++++----------------- + drivers/video/fbdev/omap2/omapfb/vrfb.c | 9 +-------- + drivers/video/fbdev/via/viafbdev.c | 2 +- + 5 files changed, 33 insertions(+), 51 deletions(-) +Merging regmap/for-next (f33804f1597d Merge remote-tracking branch 'regmap/for-6.6' into regmap-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/regmap.git regmap/for-next +Already up to date. +Merging sound/for-next (dc6e08b1a2ae ALSA: hda: cs35l41: Fix missing error code in cs35l41_smart_amp()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/tiwai/sound.git sound/for-next +Already up to date. +Merging ieee1394/for-next (c12d7aa7ffa4 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 +Already up to date. +Merging sound-asoc/for-next (4bdcbc31ad21 ASoC: dapm: fix clock get name) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/sound.git sound-asoc/for-next +Already up to date. +Merging modules/modules-next (4652b8e4f3ff Merge tag '6.7-rc-ksmbd-server-fixes' of git://git.samba.org/ksmbd) +$ git merge -m Merge branch 'modules-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git modules/modules-next +Already up to date. +Merging input/next (28d3fe323547 Input: walkera0701 - use module_parport_driver macro to simplify the code) +$ 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. + .../devicetree/bindings/input/fsl,scu-key.yaml | 2 ++ + .../input/touchscreen/cypress,tt21000.yaml | 3 +++ + drivers/input/evdev.c | 2 +- + drivers/input/input-leds.c | 2 +- + drivers/input/joystick/walkera0701.c | 13 +--------- + 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_bus.c | 2 +- + 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/cyttsp5.c | 19 ++++++++------ + 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 +- + 91 files changed, 240 insertions(+), 471 deletions(-) +Merging block/for-next (8aa6053114f3 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 +Merge made by the 'ort' strategy. +Merging device-mapper/for-next (9793c269da6c dm crypt: account large pages in cc->n_allocated_pages) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/device-mapper/linux-dm.git device-mapper/for-next +Already up to date. +Merging libata/for-next (0e533cba3801 dt-bindings: ata: tegra: Disallow undefined properties) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/dlemoal/libata.git libata/for-next +Already up to date. +Merging pcmcia/pcmcia-next (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 (775d447cf0a7 Merge branch 'fixes' into next) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/ulfh/mmc.git mmc/next +Merge made by the 'ort' strategy. + drivers/mmc/host/meson-mx-sdhc-mmc.c | 26 +++++--------------------- + 1 file changed, 5 insertions(+), 21 deletions(-) +Merging mfd/for-mfd-next (2b481822446e mfd: lpc_ich: Mark *_gpio_offsets data with const) +$ 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 +Already up to date. +Merging backlight/for-backlight-next (d5272d39995f dt-bindings: backlight: Add brightness-levels related common properties) +$ 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 +Already up to date. +Merging battery/for-next (469d31745b9f power: reset: vexpress: Use device_get_match_data()) +$ 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 +Already up to date. +Merging regulator/for-next (8af4b4efdac9 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. +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 +Already up to date. +Merging apparmor/apparmor-next (6cede10161be apparmor: Fix some kernel-doc comments) +$ git merge -m Merge branch 'apparmor-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jj/linux-apparmor apparmor/apparmor-next +Already up to date. +Merging integrity/next-integrity (b836c4d29f27 ima: detect changes to the backing overlay file) +$ git merge -m Merge branch 'next-integrity' of git://git.kernel.org/pub/scm/linux/kernel/git/zohar/linux-integrity integrity/next-integrity +Already up to date. +Merging 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 (f5bbdeda34c6 Automated merge of 'dev' into 'next') +$ 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. +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 (03acb9ccec3f keys: Remove unused extern declarations) +$ 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 (9d08e5909c81 dt-bindings: watchdog: Add support for Amlogic C3 and S4 SoCs) +$ git merge -m Merge branch 'master' of git://www.linux-watchdog.org/linux-watchdog-next.git watchdog/master +Merge made by the 'ort' strategy. + .../bindings/watchdog/amlogic,meson-gxbb-wdt.yaml | 12 ++- + .../devicetree/bindings/watchdog/aspeed-wdt.txt | 18 ++++- + .../bindings/watchdog/fsl-imx7ulp-wdt.yaml | 5 ++ + .../devicetree/bindings/watchdog/qcom-wdt.yaml | 2 + + drivers/watchdog/apple_wdt.c | 25 ++++++ + drivers/watchdog/aspeed_wdt.c | 11 +++ + drivers/watchdog/at91sam9_wdt.c | 20 ++--- + drivers/watchdog/ath79_wdt.c | 19 +---- + drivers/watchdog/gpio_wdt.c | 16 ++-- + drivers/watchdog/imx7ulp_wdt.c | 8 ++ + drivers/watchdog/imx_sc_wdt.c | 5 +- + drivers/watchdog/it87_wdt.c | 8 +- + drivers/watchdog/ixp4xx_wdt.c | 28 ++++++- + drivers/watchdog/marvell_gti_wdt.c | 14 +++- + drivers/watchdog/mlx_wdt.c | 1 + + drivers/watchdog/of_xilinx_wdt.c | 13 ++- + drivers/watchdog/sbsa_gwdt.c | 4 +- + drivers/watchdog/st_lpc_wdt.c | 11 +-- + drivers/watchdog/sunplus_wdt.c | 17 +--- + drivers/watchdog/wdat_wdt.c | 2 +- + include/dt-bindings/watchdog/aspeed-wdt.h | 92 ++++++++++++++++++++++ + 21 files changed, 248 insertions(+), 83 deletions(-) + create mode 100644 include/dt-bindings/watchdog/aspeed-wdt.h +Merging iommu/next (e8cca466a84a Merge branches 'iommu/fixes', 'arm/tegra', 'arm/smmu', 'virtio', 'x86/vt-d', 'x86/amd', 'core' and 's390' 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/powerpc/kernel/iommu.c +Auto-merging arch/s390/pci/pci.c +Auto-merging drivers/iommu/Kconfig +CONFLICT (content): Merge conflict in drivers/iommu/Kconfig +Auto-merging drivers/iommu/amd/Kconfig +Auto-merging drivers/iommu/amd/amd_iommu_types.h +Auto-merging drivers/iommu/amd/iommu.c +Auto-merging drivers/iommu/intel/iommu.c +Auto-merging drivers/iommu/intel/iommu.h +Auto-merging drivers/iommu/iommufd/selftest.c +CONFLICT (content): Merge conflict in drivers/iommu/iommufd/selftest.c +Auto-merging include/linux/iommu.h +CONFLICT (content): Merge conflict in include/linux/iommu.h +Resolved 'drivers/iommu/Kconfig' using previous resolution. +Resolved 'drivers/iommu/iommufd/selftest.c' using previous resolution. +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 f38d1ecfa023] 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 +- + .../devicetree/bindings/iommu/arm,smmu.yaml | 2 + + arch/arm/configs/multi_v7_defconfig | 1 - + arch/arm/configs/tegra_defconfig | 1 - + arch/powerpc/kernel/iommu.c | 53 +- + 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 | 746 --------------- + 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 | 581 +++++------- + drivers/iommu/amd/iommu_v2.c | 996 --------------------- + drivers/iommu/apple-dart.c | 142 +-- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3-sva.c | 71 +- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.c | 253 +++--- + drivers/iommu/arm/arm-smmu-v3/arm-smmu-v3.h | 17 +- + drivers/iommu/arm/arm-smmu/arm-smmu-qcom.c | 2 + + 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/debugfs.c | 215 ++++- + drivers/iommu/intel/iommu.c | 19 +- + drivers/iommu/intel/iommu.h | 14 + + drivers/iommu/iommu.c | 465 +++++----- + drivers/iommu/iommufd/selftest.c | 31 +- + 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/iommu/virtio-iommu.c | 4 +- + drivers/memory/tegra/mc.c | 34 - + drivers/memory/tegra/tegra20.c | 28 - + include/linux/amd-iommu.h | 120 --- + include/linux/iommu.h | 38 +- + include/soc/tegra/mc.h | 26 - + 58 files changed, 2148 insertions(+), 3918 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 (47846d51348d audit: don't take task_lock() in audit_exe_compare() code path) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/pcmoore/audit.git audit/next +Already up to date. +Merging devicetree/for-next (fe612629746c dt-bindings: soc: fsl: cpm_qe: cpm1-scc-qmc: Add support for QMC HDLC) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/robh/linux.git devicetree/for-next +Already up to date. +Merging dt-krzk/for-next (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 (d09f466f71b6 dt-bindings: mailbox: qcom-ipcc: document the SM8650 Inter-Processor Communication Controller) + d09f466f71b6 ("dt-bindings: mailbox: qcom-ipcc: document the SM8650 Inter-Processor Communication Controller") +$ git merge -m Merge branch 'mailbox-for-next' of git://git.linaro.org/landing-teams/working/fujitsu/integration.git mailbox/mailbox-for-next +Merge made by the 'ort' strategy. +Merging spi/for-next (14c4fb111a39 Merge remote-tracking branch 'spi/for-6.6' into spi-linus) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/broonie/spi.git spi/for-next +Already up to date. +Merging tip/master (e2e7af5cc8ab Merge branch into tip/master: 'x86/urgent') +$ git merge -m Merge branch 'master' of git://git.kernel.org/pub/scm/linux/kernel/git/tip/tip.git tip/master +Auto-merging MAINTAINERS +Auto-merging arch/x86/Kconfig +Merge made by the 'ort' strategy. + .../testing/sysfs-bus-event_source-devices-caps | 6 + + Documentation/arch/x86/boot.rst | 2 +- + MAINTAINERS | 14 ++ + arch/powerpc/perf/core-book3s.c | 2 +- + arch/x86/Kconfig | 12 ++ + arch/x86/entry/calling.h | 2 +- + arch/x86/entry/entry_32.S | 2 +- + arch/x86/entry/entry_64.S | 2 +- + arch/x86/events/amd/core.c | 2 +- + arch/x86/events/core.c | 4 +- + arch/x86/events/intel/core.c | 145 ++++++++++++++--- + arch/x86/events/intel/ds.c | 4 +- + arch/x86/events/intel/lbr.c | 85 +++++++++- + arch/x86/events/perf_event.h | 12 ++ + arch/x86/events/perf_event_flags.h | 2 + + arch/x86/include/asm/current.h | 7 + + arch/x86/include/asm/fpu/sched.h | 10 +- + arch/x86/include/asm/msr-index.h | 5 + + arch/x86/include/asm/percpu.h | 174 ++++++++++++++++----- + arch/x86/include/asm/perf_event.h | 4 + + arch/x86/include/asm/preempt.h | 2 +- + arch/x86/include/asm/processor.h | 3 + + arch/x86/kernel/cpu/common.c | 1 + + arch/x86/kernel/head_64.S | 2 +- + arch/x86/kernel/process_32.c | 7 +- + arch/x86/kernel/process_64.c | 7 +- + arch/x86/kernel/vmlinux.lds.S | 1 + + arch/x86/lib/cmpxchg16b_emu.S | 12 +- + arch/x86/lib/cmpxchg8b_emu.S | 30 ++-- + arch/x86/xen/xen-asm.S | 10 +- + drivers/irqchip/irq-gic-v3-its.c | 16 +- + include/linux/compiler.h | 2 +- + include/linux/perf_event.h | 22 ++- + include/uapi/linux/perf_event.h | 13 ++ + kernel/events/core.c | 8 + + 35 files changed, 514 insertions(+), 118 deletions(-) +Merging clockevents/timers/drivers/next (c28ca80ba3b5 clocksource: ep93xx: Add driver for Cirrus Logic EP93xx) +$ 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 (6f15b178cd63 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 +Already up to date. +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 (e1742fa172d5 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 +Merge made by the 'ort' strategy. +Merging rcu/rcu/next (7939f0d7b28c rcu: Restrict access to RCU CPU stall notifiers) +$ 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 kernel/rcu/tree.c +Merge made by the 'ort' strategy. + Documentation/admin-guide/kernel-parameters.txt | 6 ++++ + include/linux/rcu_notifier.h | 6 ++-- + kernel/rcu/Kconfig.debug | 25 ++++++++++++++ + kernel/rcu/rcu.h | 10 ++++-- + kernel/rcu/rcutorture.c | 18 +++++++---- + kernel/rcu/tasks.h | 32 ++++++++++++++++-- + kernel/rcu/tree.c | 43 ++++++++++++++++++------- + kernel/rcu/tree_stall.h | 11 ++++++- + kernel/rcu/update.c | 6 ++++ + 9 files changed, 129 insertions(+), 28 deletions(-) +Merging kvm/next (45b890f7689e Merge tag 'kvmarm-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ 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 (123f42f0ad68 Merge branch kvm-arm64/pmu_pmcr_n 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 +Already up to date. +Merging kvms390/next (70fea3019516 KVM: s390: add tracepoint in gmap notifier) +$ 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 (b7bce570430e powerpc/kvm: Force cast endianness of KVM shared regs) +$ 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 +Already up to date. +Merging kvm-riscv/riscv_kvm_next (d9c00f44e5de KVM: riscv: selftests: Add SBI DBCN extension to get-reg-list test) +$ git merge -m Merge branch 'riscv_kvm_next' of https://github.com/kvm-riscv/linux.git kvm-riscv/riscv_kvm_next +Already up to date. +Merging kvm-x86/next (45b890f7689e Merge tag 'kvmarm-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/kvmarm/kvmarm into HEAD) +$ git merge -m Merge branch 'next' of https://github.com/kvm-x86/linux.git kvm-x86/next +Already up to date. +Merging xen-tip/linux-next (ebbf7f070078 acpi/processor: sanitize _OSC/_PDC capabilities for Xen dom0) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/xen/tip.git xen-tip/linux-next +Auto-merging drivers/xen/events/events_base.c +Merge made by the 'ort' strategy. + arch/x86/include/asm/acpi.h | 14 ++++++++++++++ + arch/x86/include/asm/xen/hypervisor.h | 9 +++++++++ + drivers/xen/events/events_base.c | 12 ++++++++---- + drivers/xen/pcpu.c | 21 +++++++++++++++++++++ + 4 files changed, 52 insertions(+), 4 deletions(-) +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 (d5ce8f4ed90b 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/tj/wq.git workqueues/for-next +Merge made by the 'ort' strategy. +Merging drivers-x86/for-next (94ace9eda882 platform/x86: inspur-platform-profile: Add platform profile support) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pdx86/platform-drivers-x86.git drivers-x86/for-next +Already up to date. +Merging chrome-platform/for-next (47ea0ddb1f56 platform/chrome: cros_ec_lpc: Separate host command and irq disable) +$ 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 +Already up to date. +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 (b9604be24158 leds: lp5521: Add an error check in lp5521_post_init_device) +$ 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 +Already up to date. +Merging ipmi/for-next (bc3012f4e3a9 Merge tag 'v6.7-p1' of git://git.kernel.org/pub/scm/linux/kernel/git/herbert/crypto-2.6) +$ git merge -m Merge branch 'for-next' of git://github.com/cminyard/linux-ipmi.git ipmi/for-next +Already up to date. +Merging driver-core/driver-core-next (d2f51b3516da Merge tag 'rtc-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ 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 +Already up to date. +Merging usb/usb-next (d2f51b3516da Merge tag 'rtc-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ git merge -m Merge branch 'usb-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/usb.git usb/usb-next +Already up to date. +Merging thunderbolt/next (a558892b3456 thunderbolt: Fix one kernel-doc comment) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/westeri/thunderbolt.git thunderbolt/next +Already up to date. +Merging usb-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 (d2f51b3516da Merge tag 'rtc-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ git merge -m Merge branch 'tty-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/tty.git tty/tty-next +Already up to date. +Merging char-misc/char-misc-next (d2f51b3516da Merge tag 'rtc-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ git merge -m Merge branch 'char-misc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/char-misc.git char-misc/char-misc-next +Already up to date. +Merging accel/habanalabs-next (631808095a82 Merge tag 'amd-drm-next-6.7-2023-10-27' of https://gitlab.freedesktop.org/agd5f/linux into drm-next) +$ git merge -m Merge branch 'habanalabs-next' of git://git.kernel.org/pub/scm/linux/kernel/git/ogabbay/linux.git accel/habanalabs-next +Already up to date. +Merging coresight/next (5ce62920de12 coresight: etm4x: Fix width of CCITMIN field) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/coresight/linux.git coresight/next +Auto-merging MAINTAINERS +Merge made by the 'ort' strategy. + .../ABI/testing/sysfs-bus-coresight-devices-tmc | 16 + + .../ABI/testing/sysfs-bus-coresight-devices-tpdm | 159 +++++ + Documentation/arch/arm64/silicon-errata.rst | 10 + + .../bindings/arm/qcom,coresight-tpdm.yaml | 20 + + Documentation/trace/coresight/coresight.rst | 6 +- + MAINTAINERS | 1 - + drivers/hwtracing/coresight/coresight-core.c | 3 + + drivers/hwtracing/coresight/coresight-etm-perf.c | 6 +- + drivers/hwtracing/coresight/coresight-etm4x-core.c | 52 +- + drivers/hwtracing/coresight/coresight-etm4x.h | 2 +- + drivers/hwtracing/coresight/coresight-tmc-core.c | 15 +- + drivers/hwtracing/coresight/coresight-tmc-etr.c | 111 +++- + drivers/hwtracing/coresight/coresight-tmc.h | 3 + + drivers/hwtracing/coresight/coresight-tpda.c | 126 +++- + drivers/hwtracing/coresight/coresight-tpda.h | 2 + + drivers/hwtracing/coresight/coresight-tpdm.c | 718 ++++++++++++++++++++- + drivers/hwtracing/coresight/coresight-tpdm.h | 161 +++++ + drivers/hwtracing/coresight/coresight-trbe.c | 23 +- + drivers/hwtracing/coresight/coresight-trbe.h | 2 + + drivers/hwtracing/ptt/hisi_ptt.c | 33 +- + drivers/hwtracing/ptt/hisi_ptt.h | 1 + + include/linux/coresight.h | 1 + + 22 files changed, 1412 insertions(+), 59 deletions(-) +Merging fastrpc/for-next (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/fastrpc.git fastrpc/for-next +Already up to date. +Merging fpga/for-next (d79eed22ba97 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 +Already up to date. +Merging icc/icc-next (d4c720a19e9a Merge branch 'icc-platform-remove' into icc-next) +$ git merge -m Merge branch 'icc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djakov/icc.git icc/icc-next +Already up to date. +Merging iio/togreg (89e2233386a5 iio: proximity: sx9324: Switch to device_property_match_property_string()) +$ 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 include/linux/property.h +Merge made by the 'ort' strategy. + Documentation/ABI/testing/sysfs-bus-iio | 18 + + .../bindings/iio/adc/maxim,max34408.yaml | 139 ++ + .../devicetree/bindings/iio/imu/bosch,bmi323.yaml | 77 + + MAINTAINERS | 7 + + drivers/base/property.c | 37 +- + drivers/iio/adc/Kconfig | 11 + + drivers/iio/adc/Makefile | 1 + + drivers/iio/adc/max34408.c | 276 +++ + drivers/iio/frequency/adf4377.c | 16 +- + drivers/iio/frequency/admv1014.c | 31 +- + drivers/iio/imu/Kconfig | 1 + + drivers/iio/imu/Makefile | 1 + + drivers/iio/imu/bmi323/Kconfig | 33 + + drivers/iio/imu/bmi323/Makefile | 7 + + drivers/iio/imu/bmi323/bmi323.h | 209 ++ + drivers/iio/imu/bmi323/bmi323_core.c | 2139 ++++++++++++++++++++ + drivers/iio/imu/bmi323/bmi323_i2c.c | 121 ++ + drivers/iio/imu/bmi323/bmi323_spi.c | 92 + + drivers/iio/magnetometer/tmag5273.c | 10 +- + drivers/iio/proximity/sx9324.c | 24 +- + drivers/iio/resolver/ad2s1210.c | 160 +- + include/linux/property.h | 12 + + 22 files changed, 3341 insertions(+), 81 deletions(-) + create mode 100644 Documentation/devicetree/bindings/iio/adc/maxim,max34408.yaml + create mode 100644 Documentation/devicetree/bindings/iio/imu/bosch,bmi323.yaml + create mode 100644 drivers/iio/adc/max34408.c + create mode 100644 drivers/iio/imu/bmi323/Kconfig + create mode 100644 drivers/iio/imu/bmi323/Makefile + create mode 100644 drivers/iio/imu/bmi323/bmi323.h + create mode 100644 drivers/iio/imu/bmi323/bmi323_core.c + create mode 100644 drivers/iio/imu/bmi323/bmi323_i2c.c + create mode 100644 drivers/iio/imu/bmi323/bmi323_spi.c +Merging phy-next/next (d688c8264b8e phy: Remove duplicated include in phy-ralink-usb.c) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/phy/linux-phy.git phy-next/next +Already up to date. +Merging soundwire/next (4ea2b6d3128e soundwire: dmi-quirks: update HP Omen match) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/soundwire.git soundwire/next +Already up to date. +Merging extcon/extcon-next (b3edc3463d64 extcon: realtek: add the error handler for nvmem_cell_read) +$ git merge -m Merge branch 'extcon-next' of git://git.kernel.org/pub/scm/linux/kernel/git/chanwoo/extcon.git extcon/extcon-next +Already up to date. +Merging gnss/gnss-next (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 (2b88119e35b0 vfio/mtty: Enable migration support) +$ git merge -m Merge branch 'next' of git://github.com/awilliam/linux-vfio.git vfio/next +Already up to date. +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 (d2f51b3516da Merge tag 'rtc-6.7' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux) +$ git merge -m Merge branch 'staging-next' of git://git.kernel.org/pub/scm/linux/kernel/git/gregkh/staging.git staging/staging-next +Already up to date. +Merging counter-next/counter-next (7904cdf1397c 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 +Already up to date. +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 (03f25d53b145 dmaengine: stm32-mdma: correct desc prep when channel running) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/vkoul/dmaengine.git dmaengine/next +Already up to date. +Merging cgroup/for-next (b9a477034b11 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/tj/cgroup.git cgroup/for-next +Merge made by the 'ort' strategy. +Merging scsi/for-next (88eed215d016 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 +Merge made by the 'ort' strategy. +Merging scsi-mkp/for-next (a75a16c62a25 scsi: ufs: core: Leave space for ' +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mkp/scsi.git scsi-mkp/for-next +Already up to date. +Merging vhost/linux-next (e07754e0a1ea vhost-vdpa: fix use after free in vhost_vdpa_probe()) +$ git merge -m Merge branch 'linux-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mst/vhost.git vhost/linux-next +Auto-merging drivers/firmware/Kconfig +Merge made by the 'ort' strategy. + drivers/firmware/Kconfig | 2 +- + drivers/firmware/qemu_fw_cfg.c | 2 +- + drivers/vdpa/vdpa_sim/vdpa_sim_blk.c | 4 ++-- + drivers/vhost/vdpa.c | 1 - + drivers/virtio/virtio_pci_common.c | 6 +++--- + drivers/virtio/virtio_pci_modern_dev.c | 7 ++++--- + include/linux/virtio_pci_modern.h | 7 ------- + include/uapi/linux/virtio_pci.h | 11 +++++++++++ + 8 files changed, 22 insertions(+), 18 deletions(-) +Merging rpmsg/for-next (6dc66a309673 Merge branches 'hwspinlock-next', 'rpmsg-next' and 'rproc-next' into for-next) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/remoteproc/linux.git rpmsg/for-next +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 | 16 +- + drivers/remoteproc/stm32_rproc.c | 4 +- + drivers/remoteproc/xlnx_r5_remoteproc.c | 112 ++--- + drivers/rpmsg/rpmsg_core.c | 2 +- + drivers/rpmsg/rpmsg_ns.c | 2 +- + drivers/rpmsg/virtio_rpmsg_bus.c | 6 +- + 20 files changed, 938 insertions(+), 255 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 (5be55473a064 pinctrl: tegra: drop the wrapper around pinctrl_gpio_request()) +$ 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 +Merge made by the 'ort' strategy. + drivers/gpio/gpio-aspeed.c | 6 +- + drivers/gpio/gpio-em.c | 9 +- + drivers/gpio/gpio-mvebu.c | 4 +- + drivers/gpio/gpio-pxa.c | 4 +- + drivers/gpio/gpio-rcar.c | 4 +- + drivers/gpio/gpio-rockchip.c | 4 +- + drivers/gpio/gpio-tegra.c | 13 +- + drivers/gpio/gpio-vf610.c | 4 +- + drivers/gpio/gpiolib-cdev.c | 3 +- + drivers/gpio/gpiolib.c | 28 +---- + drivers/pinctrl/bcm/pinctrl-iproc-gpio.c | 6 +- + drivers/pinctrl/cirrus/pinctrl-cs42l43.c | 9 +- + drivers/pinctrl/cirrus/pinctrl-lochnagar.c | 2 +- + drivers/pinctrl/core.c | 133 +++++++++++---------- + drivers/pinctrl/intel/pinctrl-cherryview.c | 4 +- + drivers/pinctrl/intel/pinctrl-intel.c | 4 +- + drivers/pinctrl/intel/pinctrl-lynxpoint.c | 4 +- + drivers/pinctrl/mediatek/pinctrl-moore.c | 9 +- + drivers/pinctrl/mediatek/pinctrl-mtk-common.c | 10 +- + drivers/pinctrl/mediatek/pinctrl-paris.c | 4 +- + drivers/pinctrl/nuvoton/pinctrl-npcm7xx.c | 14 +-- + drivers/pinctrl/nuvoton/pinctrl-npcm8xx.c | 13 +- + drivers/pinctrl/pinctrl-as3722.c | 9 +- + drivers/pinctrl/pinctrl-axp209.c | 7 +- + drivers/pinctrl/pinctrl-cy8c95x0.c | 4 +- + drivers/pinctrl/pinctrl-ingenic.c | 19 ++- + drivers/pinctrl/pinctrl-ocelot.c | 10 +- + drivers/pinctrl/pinctrl-rk805.c | 10 +- + drivers/pinctrl/pinctrl-st.c | 13 +- + drivers/pinctrl/renesas/gpio.c | 8 +- + drivers/pinctrl/renesas/pinctrl-rzg2l.c | 4 +- + drivers/pinctrl/renesas/pinctrl-rzv2m.c | 4 +- + drivers/pinctrl/spear/pinctrl-plgpio.c | 8 +- + drivers/pinctrl/starfive/pinctrl-starfive-jh7100.c | 14 +-- + drivers/pinctrl/starfive/pinctrl-starfive-jh7110.c | 14 +-- + drivers/pinctrl/stm32/pinctrl-stm32.c | 20 +--- + drivers/pinctrl/vt8500/pinctrl-wmt.c | 9 +- + include/linux/gpio/driver.h | 3 - + include/linux/pinctrl/consumer.h | 57 +++++---- + 39 files changed, 196 insertions(+), 308 deletions(-) +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 (63bffc2d3a99 pinctrl: Use device_get_match_data()) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/linusw/linux-pinctrl.git pinctrl/for-next +Already up to date. +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 +Already up to date. +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 +Already up to date. +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 +Already up to date. +Merging pwm/for-next (40592064a1a5 pwm: samsung: Document new member .channel in struct samsung_pwm_chip) +$ 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 (5247e6dbed00 selftests/resctrl: Fix MBM test failure when MBA unavailable) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/shuah/linux-kselftest.git kselftest/next +Already up to date. +Merging kunit/test (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 +Already up to date. +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. +Merging rtc/rtc-next (cfb67623ce28 dt-bindings: rtc: Add Mstar SSD202D RTC) +$ git merge -m Merge branch 'rtc-next' of git://git.kernel.org/pub/scm/linux/kernel/git/abelloni/linux.git rtc/rtc-next +Already up to date. +Merging nvdimm/libnvdimm-for-next (9ea459e477dc libnvdimm: remove kernel-doc warnings:) +$ git merge -m Merge branch 'libnvdimm-for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/nvdimm/nvdimm.git nvdimm/libnvdimm-for-next +Already up to date. +Merging at24/at24/for-next (3774740fb221 eeprom: at24: add ST M24C64-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 +Already up to date. +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 (31c65705a8cf perf/benchmark: fix seccomp_unotify benchmark for 32-bit) +$ 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 (0bb80ecc33a8 Linux 6.6-rc1) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/srini/nvmem.git nvmem/for-next +Already up to date. +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 (23816724fdbd kdb: Corrects comment for kdballocenv) +$ 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 +Merge made by the 'ort' strategy. + kernel/debug/debug_core.c | 3 +++ + kernel/debug/kdb/kdb_main.c | 7 +++---- + 2 files changed, 6 insertions(+), 4 deletions(-) +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 (12606ba1d46b bus: mhi: ep: Do not allocate event ring element on stack) +$ git merge -m Merge branch 'mhi-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mani/mhi.git mhi/mhi-next +Merge made by the 'ort' strategy. + drivers/bus/mhi/ep/main.c | 68 ++++++++++++++++++++++++++++++++++------------- + 1 file changed, 50 insertions(+), 18 deletions(-) +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 (5d09c63f11f0 cxl/hdm: Remove broken error path) +$ 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 (5329aa5101f7 efivarfs: Add uid/gid mount options) +$ 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 (90f055df1121 mm/slub: refactor calculate_order() and calc_slab_order()) +$ 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 +Already up to date. +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 (f12f8f84509a selftests/landlock: Add tests for FS topology changes with network rules) +$ git merge -m Merge branch 'next' of git://git.kernel.org/pub/scm/linux/kernel/git/mic/linux.git landlock/next +Already up to date. +Merging rust/rust-next (3857af38e57a docs: rust: add "The Rust experiment" section) +$ git merge -m Merge branch 'rust-next' of https://github.com/Rust-for-Linux/linux.git rust/rust-next +Already up to date. +Merging sysctl/sysctl-next (8b793bcda61f watchdog: move softlockup_panic back to early_param) +$ git merge -m Merge branch 'sysctl-next' of git://git.kernel.org/pub/scm/linux/kernel/git/mcgrof/linux.git sysctl/sysctl-next +Already up to date. +Merging execve/for-next/execve (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 +Already up to date. +Merging bitmap/bitmap-for-next (bdcb37a5d8de buildid: reduce header file dependencies for module) +$ git merge -m Merge branch 'bitmap-for-next' of https://github.com/norov/linux.git bitmap/bitmap-for-next +Already up to date. +Merging hte/for-next (fc62d5e214df hte: Use kasprintf() instead of fixed buffer formatting) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/pateldipen1984/linux.git hte/for-next +Already up to date. +Merging kspp/for-next/kspp (9cca73d7b4bf hwmon: (acpi_power_meter) replace open-coded kmemdup_nul) +$ 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 +Already up to date. +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 tsm/tsm-next (f4738f56d1dc virt: tdx-guest: Add Quote generation support using TSM_REPORTS) +$ git merge -m Merge branch 'tsm-next' of git://git.kernel.org/pub/scm/linux/kernel/git/djbw/linux tsm/tsm-next +Already up to date. +Merging iommufd/for-next (b2b67c997bf7 iommufd: Organize the mock domain alloc functions closer to Joerg's tree) +$ git merge -m Merge branch 'for-next' of git://git.kernel.org/pub/scm/linux/kernel/git/jgg/iommufd.git iommufd/for-next +Already up to date. diff --git a/localversion-next b/localversion-next new file mode 100644 index 000000000000..7da66ea71ab2 --- /dev/null +++ b/localversion-next @@ -0,0 +1 @@ +-next-20231107 |